appdb/ ./objectManager.php include/objectManag ...

[WineHQ]

ChangeSet ID:	31199
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	wineowner(a)winehq.org	2007/06/14 23:10:42

Modified files:
	.              : objectManager.php 
	include        : objectManager.php 

Log message:
	Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com>
	Remember multipage values when processing entries

Patch: http://cvs.winehq.org/patch.py?id=31199

Old revision  New revision  Changes     Path
 1.14          1.15          +2 -0       appdb/objectManager.php
 1.28          1.29          +40 -8      appdb/include/objectManager.php

Index: appdb/objectManager.php
diff -u -p appdb/objectManager.php:1.14 appdb/objectManager.php:1.15
--- appdb/objectManager.php:1.14	15 Jun 2007  4:10:42 -0000
+++ appdb/objectManager.php	15 Jun 2007  4:10:42 -0000
@@ -52,6 +52,8 @@ if($aClean['bIsRejected'] == 'true')
 } else
     $oObject->bIsRejected = false;
 
+$oObject->oMultiPage->getDataFromInput($aClean);
+
 $oOtherObject = new $oObject->sClass($oObject->iId);
 
 /* Certain actions must be performed before the header is set. */
Index: appdb/include/objectManager.php
diff -u -p appdb/include/objectManager.php:1.28 appdb/include/objectManager.php:1.29
--- appdb/include/objectManager.php:1.28	15 Jun 2007  4:10:42 -0000
+++ appdb/include/objectManager.php	15 Jun 2007  4:10:42 -0000
@@ -544,22 +544,34 @@ class ObjectManager
     /* Make an objectManager URL based on the object and optional parameters */
     function makeUrl($sAction = false, $iId = false, $sTitle = false)
     {
+        $sUrl = APPDB_ROOT."objectManager.php?";
+
+        $sIsQueue = $this->bIsQueue ? "true" : "false";
+        $sUrl .= "bIsQueue=$sIsQueue";
+        $sIsRejected = $this->bIsRejected ? "true" : "false";
+        $sUrl .= "&bIsRejected=$sIsRejected";
+
+        $sUrl .= "&sClass=".$this->sClass;
         if($iId)
-            $sId = "&iId=$iId";
+            $sUrl .= "&iId=$iId";
 
         if($sAction)
-            $sAction = "&sAction=$sAction";
+            $sUrl .= "&sAction=$sAction";
+
 
-        $sIsQueue = $this->bIsQueue ? "true" : "false";
-        $sIsRejected = $this->bIsRejected ? "true" : "false";
 
         if(!$sTitle)
             $sTitle = $this->sTitle;
 
-        $sTitle = urlencode($sTitle);
+        $sUrl .= "&sTitle=".urlencode($sTitle);
+
+        if($this->oMultiPage->bEnabled)
+        {
+            $sUrl .= "&iItemsPerPage=".$this->oMultiPage->iItemsPerPage;
+            $sUrl .= "&iPage=".$this->oMultiPage->iPage;
+        }
 
-        return APPDB_ROOT."objectManager.php?bIsQueue=$sIsQueue&sClass=$this->sClass".
-               "&sTitle=$sTitle$sId$sAction&bIsRejected=$sIsRejected";
+        return $sUrl;
     }
 
     /* Inserts the information in an objectManager object as form data, so that it
@@ -574,6 +586,14 @@ class ObjectManager
         $sReturn .= "<input type=\"hidden\" name=\"sClass\" value=\"".$this->sClass."\" />\n";
         $sReturn .= "<input type=\"hidden\" name=\"sTitle\" value=\"".$this->sTitle."\" />\n";
 
+        if($this->oMultiPage->bEnabled)
+        {
+            $sReturn .= "<input type=\"hidden\" name=\"iItemsPerPage\" value=\"".
+                    $this->oMultiPage->iItemsPerPage."\" />\n";
+            $sReturn .= "<input type=\"hidden\" name=\"iPage\" value=\"".
+                    $this->oMultiPage->iPage."\" />\n";
+        }
+
         return $sReturn;
     }
     /* Get id from form data */
@@ -709,7 +729,8 @@ class ObjectManager
 class MultiPage
 {
     var $iItemsPerPage;
-    var $iLowerLimit;
+    var $iLowerLimit; /* Internal; set by handleMultiPageControls.  We use iPage in the URls */
+    var $iPage;
     var $bEnabled;
 
     function MultiPage($bEnabled = FALSE, $iItemsPerPage = 0, $iLowerLimit = 0)
@@ -718,6 +739,17 @@ class MultiPage
         $this->iItemsPerPage = $iItemsPerPage;
         $this->iLowerLimit = $iLowerLimit;
     }
+
+    function getDataFromInput($aClean)
+    {
+        if($aClean['iItemsPerPage'] && $aClean['iPage'])
+            $this->bEnabled = TRUE;
+        else
+            return;
+
+        $this->iItemsPerPage = $aClean['iItemsPerPage'];
+        $this->iPage = $aClean['iPage'];
+    }
 }
 
 class TableRow