Updated monitor/show_monit.php to use new proxy script.

Author: Till Brehm

interface/web/monitor/show_monit.php

@@ -48,11 +48,20 @@
 
 if($_SESSION["s"]["user"]["typ"] == 'admin'){
 
+	/*
 	$app->uses('getconf');
 	$server_config = $app->getconf->get_server_config($_SESSION['monitor']['server_id'], 'server');
-
 	$monit_url = trim($server_config['monit_url']);
+	*/
+	
+	$monit_url = sprintf(
+        '%s://%s/monitor/iframe_proxy.php?context=monit',
+        (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http',
+         $_SERVER['HTTP_HOST'] 
+    );
+	
 	if($monit_url != ''){
+		/*
 		$monit_url = str_replace('[SERVERNAME]', $_SESSION['monitor']['server_name'], $monit_url);
 		$monit_user = trim($server_config['monit_user']);
 		$monit_password = trim($server_config['monit_password']);
@@ -68,7 +77,7 @@
 		$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"));