[Nagios-checkins] SF.net SVN: nagios:[128] nagiosvshell/branches/devel
Nagios network monitoring software is enterprise server monitoring
Brought to you by:
egalstad,
sawolf-nagios
From: <mgu...@us...> - 2011-02-01 22:16:47
|
Revision: 128 http://nagios.svn.sourceforge.net/nagios/?rev=128&view=rev Author: mguthrie88 Date: 2011-02-01 22:16:41 +0000 (Tue, 01 Feb 2011) Log Message: ----------- -bug fixes Modified Paths: -------------- nagiosvshell/branches/devel/controllers/controller.php nagiosvshell/branches/devel/controllers/status_functions.php nagiosvshell/branches/devel/views/config_viewer.php Modified: nagiosvshell/branches/devel/controllers/controller.php =================================================================== --- nagiosvshell/branches/devel/controllers/controller.php 2011-02-01 21:34:16 UTC (rev 127) +++ nagiosvshell/branches/devel/controllers/controller.php 2011-02-01 22:16:41 UTC (rev 128) @@ -85,7 +85,7 @@ if (isset($_GET['state_filter']) && trim($_GET['state_filter']) != '') { $state_filter = process_state_filter(htmlentities($_GET['state_filter'])); } if (isset($_GET['name_filter']) && trim($_GET['name_filter']) != '') { $name_filter = process_name_filter(htmlentities($_GET['name_filter'])); } - if (isset($_GET['objtype_filter'])&& trim($_GET['objtype_filter']) != '' ) { $objtype_filter = process_objtype_filter(htmlentiries($_GET['objtype_filter'])); } + if (isset($_GET['objtype_filter'])&& trim($_GET['objtype_filter']) != '' ) { $objtype_filter = process_objtype_filter(htmlentities($_GET['objtype_filter'])); } list($data, $html_output_function) = array(NULL, NULL); Modified: nagiosvshell/branches/devel/controllers/status_functions.php =================================================================== --- nagiosvshell/branches/devel/controllers/status_functions.php 2011-02-01 21:34:16 UTC (rev 127) +++ nagiosvshell/branches/devel/controllers/status_functions.php 2011-02-01 22:16:41 UTC (rev 128) @@ -139,12 +139,12 @@ function get_by_name($name, $data, $field='host_name') { + //echo $field; $name = preg_quote($name, '/'); - if(!array_key_exists($field, $data)) $field = 'host_name'; //bug fix for hosts that don't have any services -MG - return array_filter($data, create_function('$d', 'return preg_match("/'.$name.'/i", $d[\''.$field.'\']);')); + if(!array_key_exists($field, $data) && $_GET['type'] == 'hosts') $field = 'host_name'; //bug fix for hosts that don't have any services -MG + return array_filter($data, create_function('$d', 'return preg_match("/'.$name.'/i", $d[\''.$field.'\']);')); + } -} - //////////////////////////////////////////// // //FUNCTION: check_boolean Modified: nagiosvshell/branches/devel/views/config_viewer.php =================================================================== --- nagiosvshell/branches/devel/views/config_viewer.php 2011-02-01 21:34:16 UTC (rev 127) +++ nagiosvshell/branches/devel/views/config_viewer.php 2011-02-01 22:16:41 UTC (rev 128) @@ -12,10 +12,11 @@ $object_list = ''; - $name_filter = isset($_GET['name_filter']) ? $_GET['name_filter'] : ''; - $objtype_filter = isset($_GET['objtype_filter']) ? $_GET['objtype_filter'] : ''; - $type = isset($_GET['type']) ? $_GET['type'] : ''; + $name_filter = isset($_GET['name_filter']) ? htmlentities($_GET['name_filter']) : ''; + $objtype_filter = isset($_GET['objtype_filter']) ? htmlentities($_GET['objtype_filter']) : ''; + $type = isset($_GET['type']) ? htmlentities($_GET['type']) : ''; +/* //commented out, needs further revisions to be used on config pages. Only host filter works right now -MG $object_list .= <<<FILTERDIV <div class='resultFilter'> <form id='resultfilterform' action='{$_SERVER['PHP_SELF']}' method='get'> @@ -27,7 +28,9 @@ </form> </div> FILTERDIV; +*/ + $object_list .= "<ul class='configlist'>"; foreach($data as $a) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |