Changeset 153 for trunk/lib/SortOrder.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/SortOrder.inc.php (modified) (6 diffs)

trunk/lib/SortOrder.inc.php

@@ -39 +39 @@
         $this->default_sort = $default_sort;
         $this->default_order = $default_order;
+        
+        $this->prefs = new Prefs();
+        $this->prefs->setParam(array('persistent' => false));
     }
 
@@ -69 +72 @@
     function setDefault($default_sort = '', $default_order = '')
     {
-        $prefs =& Prefs::getInstance($_SERVER['PHP_SELF']);
-        $prefs->setParam(array('persistent' => false));
-
         // Which column to sort by?
         // (1) By GET or POST specification, if available.
@@ -79 +79 @@
         if (!empty($new_sort_by)) {
             $this->sort_by = $new_sort_by;
-            $prefs->set('sort_by', $this->sort_by);
-        } else if ($prefs->exists('sort_by')) {
-            $this->sort_by = $prefs->get('sort_by');
+            $this->prefs->set('sort_by', $this->sort_by);
+        } else if ($this->prefs->exists('sort_by')) {
+            $this->sort_by = $this->prefs->get('sort_by');
         } else {
             $this->sort_by = $default_sort;
@@ -93 +93 @@
         if (!empty($new_order)) {
             $this->order = $new_order;
-            $prefs->set('sort_order', $this->order);
-        } else if ($prefs->exists('sort_order')) {
-            $this->order = $prefs->get('sort_order');
+            $this->prefs->set('sort_order', $this->order);
+        } else if ($this->prefs->exists('sort_order')) {
+            $this->order = $this->prefs->get('sort_order');
         } else {
             $this->order = $default_order;
@@ -112 +112 @@
     function set($sort = null, $order = null)
     {
-        $prefs =& Prefs::getInstance($_SERVER['PHP_SELF']);
-        $prefs->setParam(array('persistent' => false));
-
         // Set new sort value.
         if (isset($sort)) {
             $this->sort_by = $sort;
-            $prefs->set('sort_by', $this->sort_by);
+            $this->prefs->set('sort_by', $this->sort_by);
         }
 
@@ -124 +121 @@
         if (isset($order)) {
             $this->order = $order;
-            $prefs->set('sort_order', $this->order);
+            $this->prefs->set('sort_order', $this->order);
         }
     }