Commit 2c76f1a2 authored by Falko Timme's avatar Falko Timme
Browse files

- Fixed FS#3118 - munin & monit logins not being urlencoded.

parent 0c072eb0
...@@ -58,10 +58,10 @@ if($_SESSION["s"]["user"]["typ"] == 'admin'){ ...@@ -58,10 +58,10 @@ if($_SESSION["s"]["user"]["typ"] == 'admin'){
$monit_password = trim($server_config['monit_password']); $monit_password = trim($server_config['monit_password']);
$auth_string = ''; $auth_string = '';
if($monit_user != ''){ if($monit_user != ''){
$auth_string = $monit_user; $auth_string = rawurlencode($monit_user);
} }
if($monit_user != '' && $monit_password != ''){ if($monit_user != '' && $monit_password != ''){
$auth_string .= ':'.$monit_password; $auth_string .= ':'.rawurlencode($monit_password);
} }
if($auth_string != '') $auth_string .= '@'; if($auth_string != '') $auth_string .= '@';
......
...@@ -58,10 +58,10 @@ if($_SESSION["s"]["user"]["typ"] == 'admin'){ ...@@ -58,10 +58,10 @@ if($_SESSION["s"]["user"]["typ"] == 'admin'){
$munin_password = trim($server_config['munin_password']); $munin_password = trim($server_config['munin_password']);
$auth_string = ''; $auth_string = '';
if($munin_user != ''){ if($munin_user != ''){
$auth_string = $munin_user; $auth_string = rawurlencode($munin_user);
} }
if($munin_user != '' && $munin_password != ''){ if($munin_user != '' && $munin_password != ''){
$auth_string .= ':'.$munin_password; $auth_string .= ':'.rawurlencode($munin_password);
} }
if($auth_string != '') $auth_string .= '@'; if($auth_string != '') $auth_string .= '@';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment