- Fixed FS#3118 - munin & monit logins not being urlencoded.
| | |
| | | $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 .= '@'; |
| | | |
| | |
| | | $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 .= '@'; |
| | | |