[Nagios-checkins] SF.net SVN: nagios:[70] nagiosvshell/branches/devel/views/services.php

[<dw...@us...>]

Revision: 70
          http://nagios.svn.sourceforge.net/nagios/?rev=70&view=rev
Author:   dworth
Date:     2010-12-26 16:50:16 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
bugfix for not showing all services

New filtering code and pagination were not cooperating.  Now all services are shown as expected

Modified Paths:
--------------
    nagiosvshell/branches/devel/views/services.php

Modified: nagiosvshell/branches/devel/views/services.php
===================================================================
--- nagiosvshell/branches/devel/views/services.php	2010-12-26 16:50:09 UTC (rev 69)
+++ nagiosvshell/branches/devel/views/services.php	2010-12-26 16:50:16 UTC (rev 70)
@@ -78,11 +78,19 @@
 	//creates notes for total results as well as form for setting page limits 
 	do_result_notes($start,$limit,$resultsCount,'services');
 
+	// Fixup post filtering indices
+	$curidx = 0;
+	foreach ($services as $id => $servinfo) {
+			unset($services[$id]);
+			$services[$curidx++] = $servinfo;
+	}
+
 	//process service array   
 	//service table rows 
 	$last_displayed_host = NULL;
 	for($i=$start; $i<=($start+$limit); $i++)
 	{
+		if ($i > $resultsCount) break;      //short circuit
 		if(!isset($services[$i])) continue; //skip undefined indexes of array
 
 		$tr = get_color_code($services[$i]);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.