Changeset 152 for trunk/lib/SortOrder.inc.php

Timestamp:

Jun 7, 2006 5:35:16 AM (18 years ago)

Author:

scdev

Message:

Q - In the middle of working on the Prefs and Cache instantiation mode...can't decide to use singleton pattern or global vars. Updated ImageThumb? to allow filenames with path elements such as 01/23/4567_file.jpg.

File:

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

trunk/lib/SortOrder.inc.php

@@ -69 +69 @@
     function setDefault($default_sort = '', $default_order = '')
     {
-        $prefs =& Prefs::getInstance();
+        $prefs =& Prefs::getInstance($_SERVER['PHP_SELF']);
+        $prefs->setParam(array('persistent' => false));
 
         // Which column to sort by?
@@ -78 +79 @@
         if (!empty($new_sort_by)) {
             $this->sort_by = $new_sort_by;
-            $prefs->set('sort_by', $this->sort_by, $_SERVER['PHP_SELF']);
-        } else if ($prefs->exists('sort_by', $_SERVER['PHP_SELF'])) {
-            $this->sort_by = $prefs->get('sort_by', $_SERVER['PHP_SELF']);
+            $prefs->set('sort_by', $this->sort_by);
+        } else if ($prefs->exists('sort_by')) {
+            $this->sort_by = $prefs->get('sort_by');
         } else {
             $this->sort_by = $default_sort;
@@ -92 +93 @@
         if (!empty($new_order)) {
             $this->order = $new_order;
-            $prefs->set('sort_order', $this->order, $_SERVER['PHP_SELF']);
-        } else if ($prefs->exists('sort_order', $_SERVER['PHP_SELF'])) {
-            $this->order = $prefs->get('sort_order', $_SERVER['PHP_SELF']);
+            $prefs->set('sort_order', $this->order);
+        } else if ($prefs->exists('sort_order')) {
+            $this->order = $prefs->get('sort_order');
         } else {
             $this->order = $default_order;
@@ -111 +112 @@
     function set($sort = null, $order = null)
     {
-        $prefs =& Prefs::getInstance();
+        $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, $_SERVER['PHP_SELF']);
+            $prefs->set('sort_by', $this->sort_by);
         }
 
@@ -122 +124 @@
         if (isset($order)) {
             $this->order = $order;
-            $prefs->set('sort_order', $this->order, $_SERVER['PHP_SELF']);
+            $prefs->set('sort_order', $this->order);
         }
     }