[Nagios-checkins] SF.net SVN: nagios:[35] nagiosvshell/trunk/vshell/controllers/controller. php

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

Revision: 35
          http://nagios.svn.sourceforge.net/nagios/?rev=35&view=rev
Author:   dworth
Date:     2010-12-02 19:27:07 +0000 (Thu, 02 Dec 2010)

Log Message:
-----------
pagination code helper

due to new parameters in display_hosts(...) and display_services(...)
for pagination I've extracted the relevent pagination counting code
(that deals with parameters and cookies) into its own function can
called that to get $limit and $start

Modified Paths:
--------------
    nagiosvshell/trunk/vshell/controllers/controller.php

Modified: nagiosvshell/trunk/vshell/controllers/controller.php
===================================================================
--- nagiosvshell/trunk/vshell/controllers/controller.php	2010-12-02 19:27:02 UTC (rev 34)
+++ nagiosvshell/trunk/vshell/controllers/controller.php	2010-12-02 19:27:07 UTC (rev 35)
@@ -200,16 +200,17 @@
 			case 'view':
 			//build_table($array);
 			//check for start and stop variables for pagination
-			$start = isset($_GET['start']) ? htmlentities($_GET['start']) : 0;
-			//$stop = isset($_GET['stop']) ? htmlentities($_GET['stop']) : 0;
-			//create page limit variable site wide, default to 50 results  
-			$limit = isset($_COOKIE['limit']) ? $_COOKIE['limit'] : RESULTLIMIT;
-			if(isset($_POST['pagelimit']))
-			{	
-				//set a site-wide cookie for the display limit 
-				setcookie('limit', $_POST['pagelimit']);
-				$limit = $_POST['pagelimit'];
-			}
+//			$start = isset($_GET['start']) ? htmlentities($_GET['start']) : 0;
+//			//$stop = isset($_GET['stop']) ? htmlentities($_GET['stop']) : 0;
+//			//create page limit variable site wide, default to 50 results  
+//			$limit = isset($_COOKIE['limit']) ? $_COOKIE['limit'] : RESULTLIMIT;
+//			if(isset($_POST['pagelimit']))
+//			{	
+//				//set a site-wide cookie for the display limit 
+//				setcookie('limit', $_POST['pagelimit']);
+//				$limit = $_POST['pagelimit'];
+//			}
+			list($start, $limit) = get_pagination_values();
 					
 			switch($arg)
 			{
@@ -254,11 +255,22 @@
 	else
 	{
 		include_once(DIRBASE.'/views/tac.php');
+	}	
+}
+
+function get_pagination_values() {
+	$start = isset($_GET['start']) ? htmlentities($_GET['start']) : 0;
+	$limit = isset($_COOKIE['limit']) ? $_COOKIE['limit'] : RESULTLIMIT;
+	if(isset($_POST['pagelimit']))
+	{       
+		//set a site-wide cookie for the display limit 
+		setcookie('limit', $_POST['pagelimit']);
+		$limit = $_POST['pagelimit'];
 	}
-	
 
-	
+	return array($start, $limit);
 }
+
 ////////////////////////////////////////////////////////////
 //$username is obtained from $_SERVER authorized user for nagios 
 //
@@ -288,4 +300,4 @@
 	$authorizations[$auth] = 1;
 }
 
-?>
\ No newline at end of file
+?>


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