From d6cd11df635941a4e7d35e6e45b4e59cb8bd4469 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 04 Sep 2015 07:57:19 -0400
Subject: [PATCH] default for mount backup_dir set to no
---
interface/web/monitor/show_monit.php | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/interface/web/monitor/show_monit.php b/interface/web/monitor/show_monit.php
index 3dd8f03..7bd69df 100644
--- a/interface/web/monitor/show_monit.php
+++ b/interface/web/monitor/show_monit.php
@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('monitor');
@@ -47,9 +47,9 @@
$app->tpl->setVar("list_head_txt", $title);
if($_SESSION["s"]["user"]["typ"] == 'admin'){
-
+
$app->uses('getconf');
- $server_config = $app->getconf->get_server_config($_SESSION['monitor']['server_id'],'server');
+ $server_config = $app->getconf->get_server_config($_SESSION['monitor']['server_id'], 'server');
$monit_url = trim($server_config['monit_url']);
if($monit_url != ''){
@@ -58,17 +58,17 @@
$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 .= '@';
-
+
$monit_url_parts = parse_url($monit_url);
-
+
$monit_url = $monit_url_parts['scheme'].'://'.$auth_string.$monit_url_parts['host'].(isset($monit_url_parts['port']) ? ':' . $monit_url_parts['port'] : '').(isset($monit_url_parts['path']) ? $monit_url_parts['path'] : '').(isset($monit_url_parts['query']) ? '?' . $monit_url_parts['query'] : '').(isset($monit_url_parts['fragment']) ? '#' . $monit_url_parts['fragment'] : '');
-
+
$app->tpl->setVar("monit_url", $monit_url);
} else {
$app->tpl->setVar("no_monit_url_defined_txt", $app->lng("no_monit_url_defined_txt"));
--
Gitblit v1.9.1