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

Timestamp:

Jun 3, 2006 7:47:48 PM (18 years ago)

Author:

scdev

Message:

Q - Merged branches/2.0singleton into trunk. Completed updating classes to use singleton methods. Implemented tests. Fixed some bugs. Changed some interfaces.

File:

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

trunk/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->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']);
         } 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->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']);
         } 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->set('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->set('sort_order', $this->order, $_SERVER['PHP_SELF']);
         }
     }
@@ -128 +132 @@
     function getSortOrderSQL()
     {
+        $app =& App::getInstance();
+        $db =& DB::getInstance();
+
         if (!isset($this->_columns[strtolower($this->sort_by)])) {
             $this->sort_by = $this->default_sort;
@@ -137 +144 @@
 
         if (!empty($this->_columns[strtolower($this->sort_by)][strtolower($this->order)])) {
-            return sprintf(' ORDER BY %s ', DB::escapeString($this->_columns[strtolower($this->sort_by)][strtolower($this->order)]));
+            return sprintf(' ORDER BY %s ', $db->escapeString($this->_columns[strtolower($this->sort_by)][strtolower($this->order)]));
         } else {
-            App::logMsg(sprintf('Could not find SQL to sort by %s %s.', $this->sort_by, $this->order), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Could not find SQL to sort by %s %s.', $this->sort_by, $this->order), LOG_WARNING, __FILE__, __LINE__);
             return '';
         }
@@ -155 +162 @@
     function printSortHeader($col, $col_name, $default_order='ASC')
     {
+        $app =& App::getInstance();
+
         if ($this->sort_by == $col) {
             if (strtolower($this->order) == 'desc') {
-                ?><a href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=ASC'); ?>" title="<?php echo _("Change to ascending sort order"); ?>"><?php echo $this->desc_widget; ?></a><?php echo $col_name; ?><?php
+                ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=ASC'); ?>" title="<?php echo _("Change to ascending sort order"); ?>"><?php echo $this->desc_widget; ?></a><?php echo $col_name; ?><?php
             } else {
-                ?><a href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=DESC'); ?>" title="<?php echo _("Change to descending sort order"); ?>"><?php echo $this->asc_widget; ?></a><?php echo $col_name; ?><?php
+                ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=DESC'); ?>" title="<?php echo _("Change to descending sort order"); ?>"><?php echo $this->asc_widget; ?></a><?php echo $col_name; ?><?php
             }
         } else {
-            ?><a href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=' . $default_order); ?>" title="<?php echo sprintf(_("Sort by %s"), $col_name); ?>"><?php echo $col_name; ?></a><?php
+            ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=' . $default_order); ?>" title="<?php echo sprintf(_("Sort by %s"), $col_name); ?>"><?php echo $col_name; ?></a><?php
         }
     }