Changeset 9350 for trunk/src/bp-messages/bp-messages-template.php

Timestamp:

01/12/2015 11:11:38 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Improvements to BP_Messages_Box_Template::__construct():

• Update $max to $r['max'] fixing potential for total_count to be incorrect.
• Strict comparisons where appropriate.
• Cast $r['max'] to int where appropriate.
• Bring surrounding code up to current coding standards.

Similar to r8578.

File:

• trunk/src/bp-messages/bp-messages-template.php (modified) (7 diffs)

trunk/src/bp-messages/bp-messages-template.php

@@ -120 +120 @@
          */
         public function __construct( $args = array() ) {
-                global $wpdb, $bp;
 
                 // Backward compatibility with old method of passing arguments
@@ -141 +140 @@
 
                 $r = wp_parse_args( $args, array(
-                        'user_id'  => bp_loggedin_user_id(),
-                        'box'      => 'inbox',
-                        'per_page' => 10,
-                        'max'      => false,
-                        'type'     => 'all',
+                        'user_id'      => bp_loggedin_user_id(),
+                        'box'          => 'inbox',
+                        'per_page'     => 10,
+                        'max'          => false,
+                        'type'         => 'all',
                         'search_terms' => '',
                         'page_arg'     => 'mpage',
@@ -151 +150 @@
                 ) );
 
-                $this->pag_page = isset( $_GET[ $r['page_arg'] ] ) ? intval( $_GET[ $r['page_arg'] ] ) : 1;
-                $this->pag_num  = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $r['per_page'];
+                $this->pag_page     = isset( $_GET[ $r['page_arg'] ] ) ? intval( $_GET[ $r['page_arg'] ] ) : 1;
+                $this->pag_num      = isset( $_GET['num']            ) ? intval( $_GET['num']            ) : $r['per_page'];
 
                 $this->user_id      = $r['user_id'];
@@ -159 +158 @@
                 $this->search_terms = $r['search_terms'];
 
-                if ( 'notices' == $this->box ) {
+                if ( 'notices' === $this->box ) {
                         $this->threads = BP_Messages_Notice::get_notices( array(
                                 'pag_num'  => $this->pag_num,
@@ -166 +165 @@
                 } else {
                         $threads = BP_Messages_Thread::get_current_threads_for_user( array(
-                                'user_id' => $this->user_id,
-                                'box'     => $this->box,
-                                'type'    => $this->type,
-                                'limit'   => $this->pag_num,
-                                'page'    => $this->pag_page,
+                                'user_id'      => $this->user_id,
+                                'box'          => $this->box,
+                                'type'         => $this->type,
+                                'limit'        => $this->pag_num,
+                                'page'         => $this->pag_page,
                                 'search_terms' => $this->search_terms,
                                 'meta_query'   => $r['meta_query'],
@@ -185 +184 @@
                         $total_notice_count = BP_Messages_Notice::get_total_notice_count();
 
-                        if ( ! $r['max'] || $r['max'] >= (int) $total_notice_count ) {
-                                if ( 'notices' == $this->box ) {
+                        if ( empty( $r['max'] ) || ( (int) $r['max'] >= (int) $total_notice_count ) ) {
+                                if ( 'notices' === $this->box ) {
                                         $this->total_thread_count = (int) $total_notice_count;
                                 }
@@ -193 +192 @@
                         }
 
-                        if ( $r['max'] ) {
-                                if ( $max >= count( $this->threads ) ) {
+                        if ( ! empty( $r['max'] ) ) {
+                                if ( (int) $r['max'] >= count( $this->threads ) ) {
                                         $this->thread_count = count( $this->threads );
                                 } else {