nagios viewer working

Author: A. Täffner

interface/web/monitor/lib/lang/de.lng

@@ -155,6 +155,10 @@ $wb['no_permissions_to_view_monit_txt'] = 'Sie haben nicht die Berechtigung, auf
 $wb['Show Munin'] = 'Munin anzeigen';
 $wb['no_munin_url_defined_txt'] = 'Keine Munin-URL definiert.';
 $wb['no_permissions_to_view_munin_txt'] = 'Sie haben nicht die Berechtigung, auf Munin zuzugreifen.';
+$wb['Show Nagios/Check_MK'] = 'Nagios/Check_MK anzeigen';
+$wb['no_nagios_url_defined_txt'] = 'Keine Nagios-URL definiert.';
+$wb['no_permissions_to_view_nagios_txt'] = 'Sie haben nicht die Berechtigung, auf Nagios bzw. Check_MK zuzugreifen.';
+$wb['go_to_nagios_txt'] = 'Diese Anzeige in einem eigenen Fenster öffnen';
 $wb['no_data_database_size_txt'] = 'Derzeit stehen keine Daten über die Speicherverbrauch der Datenbanken zur Verfügung. Bitte später erneut Ãrüfen..';
 $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';

interface/web/monitor/lib/lang/en.lng

@@ -160,4 +160,8 @@ $wb['no_permissions_to_view_monit_txt'] = 'You are not allowed to access Monit.'
 $wb['Show Munin'] = 'Show Munin';
 $wb['no_munin_url_defined_txt'] = 'No Munin URL defined.';
 $wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.';
+$wb['Show Nagios/Check_MK'] = 'Show Nagios';
+$wb['no_nagios_url_defined_txt'] = 'No Nagios URL defined.';
+$wb['no_permissions_to_view_nagios_txt'] = 'You are not allowed to access Nagios/Check_MK.';
+$wb['go_to_nagios_txt'] = 'Open a new window containing this view';
 ?>

interface/web/monitor/show_nagios.php

@@ -65,19 +65,19 @@
 				$nagios_url .= $pathparts[0].'/check_mk/login.py?_login=1&_password='.rawurlencode($nagios_password).'&_username='.rawurlencode($nagios_user);
 				if (strlen(@$pathparts[1]) > 0) {
 					if (substr($pathparts[1], 0, 1) == '/') $pathparts[1] = substr($pathparts[1], 1, strlen($pathparts[1])-1);
-					$nagios_url .= '&_origtarget='.rawurlencode(str_replace('&', '%3D', str_replace('?', '%3F', $pathparts[1])));
+					$nagios_url .= '&_origtarget='.rawurlencode($pathparts[1]);
 				}
-				if (isset($nagios_url_parts['query'])) $nagios_url .= '?'.$nagios_url_parts['query'];
+				if (isset($nagios_url_parts['query'])) $nagios_url .= '?'.rawurlencode($nagios_url_parts['query']);
 
 			} else {
 				$nagios_url = $nagios_url_parts['scheme'].'://'.$auth_string.$nagios_url_parts['host'].(isset($nagios_url_parts['port']) ? ':' . $nagios_url_parts['port'] : '');
 				$pathparts = explode('/check_mk', $nagios_url_parts['path'], 2);
 				$nagios_url .= $pathparts[0].'/check_mk/login.py';
 				if (strlen(@$pathparts[1]) > 0) {
 					if (substr($pathparts[1], 0, 1) == '/') $pathparts[1] = substr($pathparts[1], 1, strlen($pathparts[1])-1);
-					$nagios_url .= '?_origtarget='.rawurlencode(str_replace('&', '%3D', str_replace('?', '%3F', $pathparts[1])));
+					$nagios_url .= '?_origtarget='.rawurlencode($pathparts[1]);
 				}
-				if (isset($nagios_url_parts['query'])) $nagios_url .= '?'.$nagios_url_parts['query'];
+				if (isset($nagios_url_parts['query'])) $nagios_url .= '?'.rawurlencode($nagios_url_parts['query']);
 			}
 
 		} else {

interface/web/monitor/templates/show_nagios.htm

@@ -5,6 +5,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
 
 <div class="panel panel_system">
 <tmpl_if name='nagios_url'>
+	<a href="{tmpl_var name='nagios_url'}" target="ispc_newtab_nagios">{tmpl_var name="go_to_nagios_txt"}</a><br />
     <iframe src="{tmpl_var name='nagios_url'}" width="100%" height="1000" frameborder="0" style="overflow:visible;"></iframe>
 <tmpl_else>
 	<div id="errorMsg"><h3>ERROR</h3><ol><li>{tmpl_var name="no_nagios_url_defined_txt"} {tmpl_var name="no_permissions_to_view_nagios_txt"}<br></li></ol></div>