Changeset 136 for trunk/lib/PageNumbers.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/PageNumbers.inc.php (modified) (11 diffs)

trunk/lib/PageNumbers.inc.php

@@ -4 +4 @@
  * Code by Strangecode :: www.strangecode.com :: This document contains copyrighted information
  *
- * The PageNumbers:: class provides a common abstracted interface to the
+ * The PageNumbers class provides a common abstracted interface to the
  * multiple pages features. It sets the various numbers needed to display items
  * on a page, and includes functions for working with these numbers.
@@ -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->set('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->get('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->set('page_number', $this->current_page, $_SERVER['PHP_SELF']);
+            }
+        } else if ($save_value && $prefs->exists('page_number', $_SERVER['PHP_SELF'])) {
+            $this->current_page = (int)$prefs->get('page_number', $_SERVER['PHP_SELF']);
         }
         $this->set_page_number_initialized = true;
@@ -137 +141 @@
     function calculate()
     {
+        $app =& App::getInstance();
+
         if (!$this->set_per_page_initialized) {
-            App::logMsg(sprintf('set_per_page not initialized'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('set_per_page not initialized'), LOG_ERR, __FILE__, __LINE__);
         }
         if (!$this->set_page_number_initialized) {
-            App::logMsg(sprintf('set_page_number not initialized'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('set_page_number not initialized'), LOG_ERR, __FILE__, __LINE__);
         }
         if (!$this->set_total_items_initialized) {
-            App::logMsg(sprintf('set_total_items not initialized'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('set_total_items not initialized'), LOG_ERR, __FILE__, __LINE__);
         }
 
@@ -189 +195 @@
     function getLimitSQL()
     {
+        $app =& App::getInstance();
+        $db =& DB::getInstance();
+
         if (is_numeric($this->first_item) && is_numeric($this->_per_page)) {
-            return ' LIMIT ' . DB::escapeString($this->first_item) . ', ' . DB::escapeString($this->_per_page) . ' ';
-        } else {
-            App::logMsg(sprintf('Could not find SQL to LIMIT by %s %s.', $this->first_item, $this->_per_page), LOG_WARNING, __FILE__, __LINE__);
+            return ' LIMIT ' . $db->escapeString($this->first_item) . ', ' . $db->escapeString($this->_per_page) . ' ';
+        } else {
+            $app->logMsg(sprintf('Could not find SQL to LIMIT by %s %s.', $this->first_item, $this->_per_page), LOG_WARNING, __FILE__, __LINE__);
             return '';
         }
@@ -204 +213 @@
     function printPerPageLinks($query_key='per_page')
     {
+        $app =& App::getInstance();
+
         $sp = '';
         for ($i=0; $i<sizeof($this->per_page_options); $i++) {
@@ -209 +220 @@
                 printf('%s<a href="%s">%s</a>',
                     $sp,
-                    App::oHREF($_SERVER['PHP_SELF'] . '?' . $query_key . '=' . $this->per_page_options[$i]),
+                    $app->oHREF($_SERVER['PHP_SELF'] . '?' . $query_key . '=' . $this->per_page_options[$i]),
                     $this->per_page_options[$i]
                 );
@@ -220 +231 @@
 
     /**
-     * Outputs an App::oHREF compatible url that goes to the page $page_number.
+     * Outputs an $app->oHREF compatible url that goes to the page $page_number.
      * Depends on $this->base_url to build the url onto. This is used in the
      * page_number.ihtml template.
@@ -232 +243 @@
     function getPageNumURL($page_number, $carry_args=null)
     {
-        return App::oHREF($this->url_base . $page_number, $carry_args);
+        $app =& App::getInstance();
+
+        return $app->oHREF($this->url_base . $page_number, $carry_args);
     }
     function printPageNumURL($page_number, $carry_args=null)