Changeset 468 for trunk/lib/PageNumbers.inc.php

Timestamp:

Feb 20, 2014 3:03:59 AM (10 years ago)

Author:

anonymous

Message:

Completed integrating ^{/branches/eli_branch into} /trunk. Changes include:

• Removed closing ?> from end of files
• Upgrade old-style contructor methods to use construct() instead.
• Class properties and methods defined as public, private, static or protected
• Ensure code runs under E_ALL with only mysql_* deprecated warnings
• Search for the '@' symbol anywhere it might be used to supress runtime errors, then replace with proper error recovery.
• Run the php cli -l option to check files for syntax errors.
• Bring tests up-to-date with latest version and methods of PHPUnit

Location:

trunk

Files:

• . (modified) (1 prop)
• lib/PageNumbers.inc.php (modified) (16 diffs)

trunk/lib/PageNumbers.inc.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -39 +39 @@
 class PageNumbers {
 
-    var $total_items;       // Total quantity of items.
-    var $total_pages;       // The total number of pages.
-    var $current_page = 1;  // Current page number.
-    var $first_item;        // The counter for the first item on this page (zero index).
-    var $last_item;         // The counter for the last item on this page (zero index).
-    var $max_num_links = 9; // The max number of links to show on page (odd numbers look best).
-    var $_num_links;        // The number of links to show on page.
-    var $_per_page = 25;    // Items per page.
+    public $total_items;       // Total quantity of items.
+    public $total_pages;       // The total number of pages.
+    public $current_page = 1;  // Current page number.
+    public $first_item;        // The counter for the first item on this page (zero index).
+    public $last_item;         // The counter for the last item on this page (zero index).
+    public $max_num_links = 9; // The max number of links to show on page (odd numbers look best).
+    private $_num_links;        // The number of links to show on page.
+    private $_per_page = 25;    // Items per page.
 
     // Flags to ensure all necessary values have been set before calling calculate().
-    var $set_per_page_initialized = false;
-    var $set_page_number_initialized = false;
-    var $set_total_items_initialized = false;
+    public $set_per_page_initialized = false;
+    public $set_page_number_initialized = false;
+    public $set_total_items_initialized = false;
 
     // These are initialized in the constructor.
-    var $per_page_options;
-    var $left_arrow;
-    var $left_arrow_disabled;
-    var $left_dbl_arrow;
-    var $left_dbl_arrow_disabled;
-    var $right_arrow;
-    var $right_arrow_disabled;
-    var $right_dbl_arrow;
-    var $right_dbl_arrow_disabled;
+    public $per_page_options;
+    public $left_arrow;
+    public $left_arrow_disabled;
+    public $left_dbl_arrow;
+    public $left_dbl_arrow_disabled;
+    public $right_arrow;
+    public $right_arrow_disabled;
+    public $right_dbl_arrow;
+    public $right_dbl_arrow_disabled;
 
     /**
      * PageNumbers constructor. All arguments are depreciated. Use set* functions instead.
      */
-    function PageNumbers()
+    public function __construct()
     {
         // Default options for the quantity per page links.
@@ -85 +85 @@
         // in special cases like using a /my/page/# scheme.
         $this->url_base = $_SERVER['PHP_SELF'] . '?page_number=';
-        
+
         $this->prefs = new Prefs($_SERVER['PHP_SELF']);
         $this->prefs->setParam(array('persistent' => false));
@@ -93 +93 @@
      * Set the number of items per page.
      */
-    function setPerPage($per_page, $default=25, $save_value=true)
+    public function setPerPage($per_page, $default=25, $save_value=true)
     {
         // (1) By provided argument, if valid.
@@ -115 +115 @@
      * Set the current page number.
      */
-    function setPageNumber($page_number, $save_value=true)
+    public function setPageNumber($page_number, $save_value=true)
     {
         // (1) By provided argument, if valid.
@@ -139 +139 @@
      * Set the total number of items.
      */
-    function setTotalItems($total_items)
+    public function setTotalItems($total_items)
     {
         if (is_numeric($total_items) && $total_items > 0) {
@@ -158 +158 @@
      * @access public
      */
-    function calculate()
+    public function calculate()
     {
         $app =& App::getInstance();
@@ -212 +212 @@
      * Returns the SQL code to limit query to items that are on current page.
      */
-    function getLimitSQL()
+    public function getLimitSQL()
     {
         $app =& App::getInstance();
@@ -230 +230 @@
      * @access public
      */
-    function printPerPageLinks($query_key='per_page')
+    public function printPerPageLinks($query_key='per_page')
     {
         $app =& App::getInstance();
@@ -260 +260 @@
      * @access public
      */
-    function getPageNumURL($page_number, $carry_args=null)
+    public function getPageNumURL($page_number, $carry_args=null)
     {
         $app =& App::getInstance();
@@ -266 +266 @@
         return $app->oHREF($this->url_base . $page_number, $carry_args);
     }
-    function printPageNumURL($page_number, $carry_args=null)
+    public function printPageNumURL($page_number, $carry_args=null)
     {
         echo $this->getPageNumURL($page_number, $carry_args);
@@ -276 +276 @@
      * @access public
      */
-    function getPageNumbersArray($carry_args=null)
+    public function getPageNumbersArray($carry_args=null)
     {
         $page_numbers = array();
@@ -296 +296 @@
      * @access public
      */
-    function getPageNumbers($carry_args=null)
+    public function getPageNumbers($carry_args=null)
     {
         $page_numbers_string = '';
@@ -361 +361 @@
     }
 
-    function printPageNumbers($carry_args=null)
+    public function printPageNumbers($carry_args=null)
     {
         echo $this->getPageNumbers($carry_args);
@@ -368 +368 @@
 }
 
-?>