Changeset 6160

Timestamp:

12/12/2016 01:59:44 PM (8 years ago)

Author:

xknown

Message:

Branch 0.9: Fix PHP 7 compat issues w.r.t. the use of func_get_arg() and PHP 5.x constructors.

• func_get_arg() returns the current (modified) value of the given argument. Let's make sure the code behaves the same.
• Add PHP 5.x style constructors.
• Use preg_match instead of eregi

See #3033

Location:

branches/0.9

Files:

• bb-admin/admin-functions.php (modified) (6 diffs)
• bb-includes/capabilities.php (modified) (5 diffs)
• bb-includes/functions.php (modified) (2 diffs)
• bb-includes/gettext.php (modified) (3 diffs)

branches/0.9/bb-admin/admin-functions.php

@@ -248 +248 @@
     var $search_errors;
 
-    function BB_User_Search ($search_term = false, $page = 1 ) { // constructor
+    function __construct ($search_term = false, $page = 1 ) { // constructor
         $this->search_term = $search_term ? stripslashes($search_term) : false;
         $this->raw_page = ( '' == $page ) ? false : (int) $page;
@@ -258 +258 @@
         $this->prepare_vars_for_template_usage();
         $this->do_paging();
+    }
+
+    function BB_User_Search ($search_term = false, $page = 1 ) {
+        $this->__construct( $search_term, $page );
     }
 
@@ -403 +407 @@
     var $title = '';
 
-    function BB_Users_By_Role($role = '', $page = '') { // constructor
+    function __construct($role = '', $page = '') { // constructor
         $this->role = $role ? $role : 'member';
         $this->raw_page = ( '' == $page ) ? false : (int) $page;
@@ -411 +415 @@
         $this->query();
         $this->do_paging();
+    }
+
+    function BB_Users_By_Role($role = '', $page = '') {
+        $this->__construct($role, $page);
     }
 
@@ -435 +443 @@
         return false;
 
+    $_args = func_get_args();
     $defaults = array( 'forum_name' => '', 'forum_desc' => '', 'forum_parent' => 0, 'forum_order' => false );
     $args = wp_parse_args( $args, $defaults );
     if ( 1 < func_num_args() ) : // For back compat
-        $args['forum_name']  = func_get_arg(0);
-        $args['forum_desc']  = func_get_arg(1);
-        $args['forum_order'] = 2 < func_num_args() ? func_get_arg(2) : 0;
+        $args['forum_name']  = $_args[0];
+        $args['forum_desc']  = $_args[1];
+        $args['forum_order'] = 2 < func_num_args() ? $_args[2] : 0;
     endif;
 
@@ -480 +489 @@
         return false;
 
+    $_args = func_get_args();
     $defaults = array( 'forum_id' => 0, 'forum_name' => '', 'forum_desc' => '', 'forum_parent' => 0, 'forum_order' => 0 );
     $args = wp_parse_args( $args, $defaults );
     if ( 1 < func_num_args() ) : // For back compat
-        $args['forum_id']    = func_get_arg(0);
-        $args['forum_name']  = func_get_arg(1);
-        $args['forum_desc']  = 2 < func_num_args() ? func_get_arg(2) : '';
-        $args['forum_order'] = 3 < func_num_args() && is_numeric(func_get_arg(3)) ? func_get_arg(3) : 0;
+        $args['forum_id']    = $_args[0];
+        $args['forum_name']  = $_args[1];
+        $args['forum_desc']  = 2 < func_num_args() ? $_args[2] : '';
+        $args['forum_order'] = 3 < func_num_args() && is_numeric($_args[3]) ? $_args[3] : 0;
     endif;
 

branches/0.9/bb-includes/capabilities.php

@@ -8 +8 @@
     var $role_key;
 
-    function BB_Roles() {
+    function __construct() {
         global $bbdb;
         $this->role_key = $bbdb->prefix . 'user_roles';
@@ -21 +21 @@
             $this->role_names[$role] = $this->roles[$role]['name'];
         }
+    }
+
+    function BB_Roles() {
+        $this->__construct();
     }
 
@@ -214 +218 @@
     var $capabilities;
 
-    function BB_Role($role, $capabilities) {
+    function __construct($role, $capabilities) {
         $this->name = $role;
         $this->capabilities = $capabilities;
+    }
+
+    function BB_Role($role, $capabilities) {
+        $this->__construct($role, $capabilities);
     }
 
@@ -251 +259 @@
     var $allcaps = array();
 
-    function BB_User($id) {
+    function __construct($id) {
         global $bb_roles, $bbdb;
 
@@ -268 +276 @@
         }
         $this->get_role_caps();
+    }
+
+    function BB_User($id) {
+        $this->__construct($id);
     }
 

branches/0.9/bb-includes/functions.php

@@ -67 +67 @@
 
 function get_forums( $args = null ) {
+    $_args = func_get_args();
     if ( is_numeric($args) ) {
         $args = array( 'child_of' => $args, 'hierarchical' => 1, 'depth' => 0 );
@@ -72 +73 @@
         $args = array( 'callback' => $args );
         if ( 1 < func_num_args() )
-            $args['callback_args'] = func_get_arg(1);
+            $args['callback_args'] = $_args[1];
     }
 

branches/0.9/bb-includes/gettext.php

@@ -102 +102 @@
      * @param boolean enable_cache Enable or disable caching of strings (default on)
      */
-    function gettext_reader($Reader, $enable_cache = true) {
+    function __construct($Reader, $enable_cache = true) {
         // If there isn't a StreamReader, turn on short circuit mode.
         if (! $Reader || isset($Reader->error) ) {
@@ -136 +136 @@
         $this->originals = $this->readint();
         $this->translations = $this->readint();
+    }
+
+    function gettext_reader($Reader, $enable_cache = true) {
+        $this->__construct($Reader, $enable_cache);
     }
 
@@ -292 +296 @@
             }
             $header .= "\n"; //make sure our regex matches
-            if (eregi("plural-forms: ([^\n]*)\n", $header, $regs))
+            if (preg_match("/plural-forms: ([^\n]*)\n/i", $header, $regs))
                 $expr = $regs[1];
             else