Changeset 812 for trunk

Timestamp:

Mar 21, 2024 4:49:53 AM (5 weeks ago)

Author:

anonymous

Message:

Fix depreciation notices

Location:

trunk

Files:

• lib/App.inc.php (modified) (1 diff)
• lib/PageNumbers.inc.php (modified) (7 diffs)
• lib/SortOrder.inc.php (modified) (1 diff)
• polyfill/mysql.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -232 +232 @@
         // Use the unicode modifier like this:  preg_replace('/[^0-9]/' . $app->getParam('preg_u'), '', $str);
         'preg_u' => '',
+
+        // Prettify json when testing.
+        'json_options' => JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES,
     );
 

trunk/lib/PageNumbers.inc.php

@@ -64 +64 @@
     public $right_dbl_arrow;
     public $right_dbl_arrow_disabled;
+    public $url_base;
+    public $prefs;
 
     /**
@@ -91 +93 @@
     }
 
+    private function _validNumber($num)
+    {
+        if (!isset($num) || '' == $num) {
+            return false;
+        }
+        return preg_match('/^\d+$/', $num);
+    }
+
     /**
      * Set the number of items per page.
@@ -100 +110 @@
         // (3) Set to default value if provided and valid.
         // (4) Keep as Class default of 25.
-        if (is_numeric($per_page) && $per_page > 0) {
+        if ($this->_validNumber($per_page) && $per_page > 0) {
             $this->_per_page = $per_page;
             if ($save_value) {
@@ -107 +117 @@
         } else if ($save_value && $this->prefs->exists('items_per_page')) {
             $this->_per_page = (int)$this->prefs->get('items_per_page');
-        } else if (is_numeric($default) && $default > 0) {
+        } else if ($this->_validNumber($default) && $default > 0) {
             $this->_per_page = $default;
         }
@@ -121 +131 @@
         // (2) By saved preference, if available.
         // (3) Don't change from what was provided at class instantiation.
-        if (is_numeric($page_number)) {
+        if ($this->_validNumber($page_number)) {
             if ($page_number < 1) {
                 // FIXME: How to go back around to the last page? Hmmm. Set to 1 for now.
@@ -142 +152 @@
     public function setTotalItems($total_items)
     {
-        if (is_numeric($total_items) && $total_items > 0) {
+        if ($this->_validNumber($total_items) && $total_items > 0) {
             $this->total_items = $total_items;
         } else {
@@ -218 +228 @@
         $db =& DB::getInstance();
 
-        if (is_numeric($this->first_item) && is_numeric($this->_per_page)) {
+        if ($this->_validNumber($this->first_item) && $this->_validNumber($this->_per_page)) {
             return ' LIMIT ' . $db->escapeString($this->first_item) . ', ' . $db->escapeString($this->_per_page) . ' ';
         } else {

trunk/lib/SortOrder.inc.php

@@ -46 +46 @@
     public $default_order;
     public $base_url;
+    public $prefs;
 
     /**

trunk/polyfill/mysql.inc.php

@@ -833 +833 @@
         public function mysql_real_escape_string($string, $link = false)
         {
-            if ('' == $string) {
+            if ('' == (string)$string) {
                 return '';
             }
@@ -1216 +1216 @@
                     throw new MySQL2PDOException($this->_params[$link]['errno'] .': ' . $this->_params[$link]['error']);
                 } else {
-                    throw new MySQL2PDOException('No db at  instance #' . ($link - 1));
+                    throw new MySQL2PDOException('No db at instance #' . ($link - 1));
                 }
             }