Changeset 132 for branches/2.0singleton/lib

Timestamp:

May 30, 2006 10:05:54 PM (18 years ago)

Author:

scdev

Message:

updated Prefs:: and SessionCache::

Location:

branches/2.0singleton/lib

Files:

• PageNumbers.inc.php (modified) (4 diffs)
• SortOrder.inc.php (modified) (5 diffs)

branches/2.0singleton/lib/PageNumbers.inc.php

@@ -72 +72 @@
     function setPerPage($per_page, $default=25, $save_value=true)
     {
-        // (1) By provided argument, if valid.
+        $prefs =& Prefs::getInstance();
+    
+        // (1) By provided argument, if valid.
         // (2) By saved preference, if available.
         // (3) Set to default value if provided and valid.
@@ -79 +81 @@
             $this->_per_page = $per_page;
             if ($save_value) {
-                Prefs::setValue('items_per_page', $this->_per_page, $_SERVER['PHP_SELF']);
-            }
-        } else if ($save_value && Prefs::exists('items_per_page', $_SERVER['PHP_SELF'])) {
-            $this->_per_page = (int)Prefs::getValue('items_per_page', $_SERVER['PHP_SELF']);
+                $prefs->setValue('items_per_page', $this->_per_page, $_SERVER['PHP_SELF']);
+            }
+        } else if ($save_value && $prefs->exists('items_per_page', $_SERVER['PHP_SELF'])) {
+            $this->_per_page = (int)$prefs->getValue('items_per_page', $_SERVER['PHP_SELF']);
         } else if (is_numeric($default) && $default > 0) {
             $this->_per_page = $default;
@@ -94 +96 @@
     function setPageNumber($page_number, $save_value=true)
     {
-        // (1) By provided argument, if valid.
+        $prefs =& Prefs::getInstance();
+    
+    // (1) By provided argument, if valid.
         // (2) By saved preference, if available.
         // (3) Don't change from what was provided at class instantiation.
@@ -105 +109 @@
             }
             if ($save_value) {
-                Prefs::setValue('page_number', $this->current_page, $_SERVER['PHP_SELF']);
-            }
-        } else if ($save_value && Prefs::exists('page_number', $_SERVER['PHP_SELF'])) {
-            $this->current_page = (int)Prefs::getValue('page_number', $_SERVER['PHP_SELF']);
+                $prefs->setValue('page_number', $this->current_page, $_SERVER['PHP_SELF']);
+            }
+        } else if ($save_value && $prefs->exists('page_number', $_SERVER['PHP_SELF'])) {
+            $this->current_page = (int)$prefs->getValue('page_number', $_SERVER['PHP_SELF']);
         }
         $this->set_page_number_initialized = true;

branches/2.0singleton/lib/SortOrder.inc.php

@@ -69 +69 @@
     function setDefault($default_sort = '', $default_order = '')
     {
+        $prefs =& Prefs::getInstance();
+
         // Which column to sort by?
         // (1) By GET or POST specification, if available.
@@ -76 +78 @@
         if (!empty($new_sort_by)) {
             $this->sort_by = $new_sort_by;
-            Prefs::setValue('sort_by', $this->sort_by, $_SERVER['PHP_SELF']);
-        } else if (Prefs::exists('sort_by', $_SERVER['PHP_SELF'])) {
-            $this->sort_by = Prefs::getValue('sort_by', $_SERVER['PHP_SELF']);
+            $prefs->setValue('sort_by', $this->sort_by, $_SERVER['PHP_SELF']);
+        } else if ($prefs->exists('sort_by', $_SERVER['PHP_SELF'])) {
+            $this->sort_by = $prefs->getValue('sort_by', $_SERVER['PHP_SELF']);
         } else {
             $this->sort_by = $default_sort;
@@ -90 +92 @@
         if (!empty($new_order)) {
             $this->order = $new_order;
-            Prefs::setValue('sort_order', $this->order, $_SERVER['PHP_SELF']);
-        } else if (Prefs::exists('sort_order', $_SERVER['PHP_SELF'])) {
-            $this->order = Prefs::getValue('sort_order', $_SERVER['PHP_SELF']);
+            $prefs->setValue('sort_order', $this->order, $_SERVER['PHP_SELF']);
+        } else if ($prefs->exists('sort_order', $_SERVER['PHP_SELF'])) {
+            $this->order = $prefs->getValue('sort_order', $_SERVER['PHP_SELF']);
         } else {
             $this->order = $default_order;
@@ -109 +111 @@
     function set($sort = null, $order = null)
     {
+        $prefs =& Prefs::getInstance();
+
         // Set new sort value.
         if (isset($sort)) {
             $this->sort_by = $sort;
-            Prefs::setValue('sort_by', $this->sort_by, $_SERVER['PHP_SELF']);
+            $prefs->setValue('sort_by', $this->sort_by, $_SERVER['PHP_SELF']);
         }
 
@@ -118 +122 @@
         if (isset($order)) {
             $this->order = $order;
-            Prefs::setValue('sort_order', $this->order, $_SERVER['PHP_SELF']);
+            $prefs->setValue('sort_order', $this->order, $_SERVER['PHP_SELF']);
         }
     }