Changeset 153 for trunk/lib/PageNumbers.inc.php

Timestamp:

Jun 7, 2006 8:41:19 PM (18 years ago)

Author:

scdev

Message:

Q - decided to use standard instantiation for Prefs and Cache instead of singleton methods.

File:

• trunk/lib/PageNumbers.inc.php (modified) (5 diffs)

trunk/lib/PageNumbers.inc.php

@@ -65 +65 @@
         // in special cases like using a /my/page/# scheme.
         $this->url_base = $_SERVER['PHP_SELF'] . '?page_number=';
+        
+        $this->prefs = new Prefs();
+        $this->prefs->setParam(array('persistent' => false));
     }
 
@@ -72 +75 @@
     function setPerPage($per_page, $default=25, $save_value=true)
     {
-        $prefs =& Prefs::getInstance($_SERVER['PHP_SELF']);
-        $prefs->setParam(array('persistent' => false));
-    
         // (1) By provided argument, if valid.
         // (2) By saved preference, if available.
@@ -82 +82 @@
             $this->_per_page = $per_page;
             if ($save_value) {
-                $prefs->set('items_per_page', $this->_per_page);
-            }
-        } else if ($save_value && $prefs->exists('items_per_page')) {
-            $this->_per_page = (int)$prefs->get('items_per_page');
+                $this->prefs->set('items_per_page', $this->_per_page);
+            }
+        } else if ($save_value && $this->prefs->exists('items_per_page')) {
+            $this->_per_page = (int)$this->prefs->get('items_per_page');
         } else if (is_numeric($default) && $default > 0) {
             $this->_per_page = $default;
@@ -97 +97 @@
     function setPageNumber($page_number, $save_value=true)
     {
-        $prefs =& Prefs::getInstance($_SERVER['PHP_SELF']);
-        $prefs->setParam(array('persistent' => false));
-    
         // (1) By provided argument, if valid.
         // (2) By saved preference, if available.
@@ -111 +108 @@
             }
             if ($save_value) {
-                $prefs->set('page_number', $this->current_page);
-            }
-        } else if ($save_value && $prefs->exists('page_number')) {
-            $this->current_page = (int)$prefs->get('page_number');
+                $this->prefs->set('page_number', $this->current_page);
+            }
+        } else if ($save_value && $this->prefs->exists('page_number')) {
+            $this->current_page = (int)$this->prefs->get('page_number');
         }
         $this->set_page_number_initialized = true;