From 7cf3e98090a3e9f0a9cc960d07c5f259adab6a19 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 08:39:08 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 interface/web/monitor/show_munin.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/web/monitor/show_munin.php b/interface/web/monitor/show_munin.php
index b193d58..5db6adf 100644
--- a/interface/web/monitor/show_munin.php
+++ b/interface/web/monitor/show_munin.php
@@ -58,10 +58,10 @@
 		$munin_password = trim($server_config['munin_password']);
 		$auth_string = '';
 		if($munin_user != ''){
-			$auth_string = $munin_user;
+			$auth_string = rawurlencode($munin_user);
 		}
 		if($munin_user != '' && $munin_password != ''){
-			$auth_string .= ':'.$munin_password;
+			$auth_string .= ':'.rawurlencode($munin_password);
 		}
 		if($auth_string != '') $auth_string .= '@';
 	

--
Gitblit v1.9.1