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_monit.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/web/monitor/show_monit.php b/interface/web/monitor/show_monit.php
index 3dd8f03..0121a68 100644
--- a/interface/web/monitor/show_monit.php
+++ b/interface/web/monitor/show_monit.php
@@ -58,10 +58,10 @@
 		$monit_password = trim($server_config['monit_password']);
 		$auth_string = '';
 		if($monit_user != ''){
-			$auth_string = $monit_user;
+			$auth_string = rawurlencode($monit_user);
 		}
 		if($monit_user != '' && $monit_password != ''){
-			$auth_string .= ':'.$monit_password;
+			$auth_string .= ':'.rawurlencode($monit_password);
 		}
 		if($auth_string != '') $auth_string .= '@';
 	

--
Gitblit v1.9.1