Changeset 9925

Timestamp:

06/11/2015 02:18:26 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Messages: Whitespace & type-casting in class-bp_messages-thread.php

File:

• trunk/src/bp-messages/classes/class-bp_messages-thread.php (modified) (23 diffs)

trunk/src/bp-messages/classes/class-bp_messages-thread.php

@@ -16 +16 @@
  */
 class BP_Messages_Thread {
+
     /**
      * The message thread ID.
@@ -138 +139 @@
      */
     public function populate( $thread_id = 0, $order = 'ASC', $args = array() ) {
-        global $wpdb;
-
-        if( 'ASC' != $order && 'DESC' != $order ) {
+
+        if ( 'ASC' !== $order && 'DESC' !== $order ) {
             $order = 'ASC';
         }
@@ -146 +146 @@
         // merge $args with our defaults
         $r = wp_parse_args( $args, array(
+            'user_id'           => bp_loggedin_user_id(),
             'update_meta_cache' => true
         ) );
 
         $this->messages_order = $order;
-        $this->thread_id      = $thread_id;
+        $this->thread_id      = (int) $thread_id;
 
         // get messages for thread
-        $this->messages = self::get_messages( $thread_id );
+        $this->messages = self::get_messages( $this->thread_id );
 
         if ( empty( $this->messages ) || is_wp_error( $this->messages ) ) {
@@ -165 +166 @@
 
         foreach ( (array) $this->messages as $key => $message ) {
-            $this->sender_ids[$message->sender_id] = $message->sender_id;
+            $this->sender_ids[ $message->sender_id ] = $message->sender_id;
         }
 
@@ -172 +173 @@
 
         // Get the unread count for the logged in user
-        if ( isset( $this->recipients[bp_loggedin_user_id()] ) ) {
-            $this->unread_count = $this->recipients[bp_loggedin_user_id()]->unread_count;
+        if ( isset( $this->recipients[ $r['user_id'] ] ) ) {
+            $this->unread_count = $this->recipients[ $r['user_id'] ]->unread_count;
         }
 
@@ -230 +231 @@
         }
 
+        $thread_id = (int) $thread_id;
+
         $recipients = wp_cache_get( 'thread_recipients_' . $thread_id, 'bp_messages' );
         if ( false === $recipients ) {
@@ -235 +238 @@
 
             $recipients = array();
-            $results    = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $thread_id ) );
+            $sql        = $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $thread_id );
+            $results    = $wpdb->get_results( $sql );
 
             foreach ( (array) $results as $recipient ) {
@@ -267 +271 @@
      */
     public static function get_messages( $thread_id = 0 ) {
-        $messages = wp_cache_get( $thread_id, 'bp_messages_threads' );
+        $thread_id = (int) $thread_id;
+        $messages  = wp_cache_get( $thread_id, 'bp_messages_threads' );
 
         if ( false === $messages ) {
@@ -309 +314 @@
      * @return bool
      */
-    public static function delete( $thread_id ) {
-        global $wpdb;
+    public static function delete( $thread_id = 0 ) {
+        global $wpdb;
+
+        $thread_id = (int) $thread_id;
 
         /**
@@ -353 +360 @@
             // Do something for each message ID
             foreach ( $message_ids as $message_id ) {
+
                 // Delete message meta
                 bp_messages_delete_meta( $message_id );
@@ -422 +430 @@
         }
 
-        $defaults = array(
+        $r = bp_parse_args( $args, array(
             'user_id'      => false,
             'box'          => 'inbox',
@@ -430 +438 @@
             'search_terms' => '',
             'meta_query'   => array()
-        );
-        $r = wp_parse_args( $args, $defaults );
+        ) );
 
         $pag_sql = $type_sql = $search_sql = $user_id_sql = $sender_sql = '';
@@ -495 +502 @@
         // Sort threads by date_sent
         foreach( (array) $thread_ids as $thread ) {
-            $sorted_threads[$thread->thread_id] = strtotime( $thread->date_sent );
+            $sorted_threads[ $thread->thread_id ] = strtotime( $thread->date_sent );
         }
 
         arsort( $sorted_threads );
 
-        $threads = false;
+        $threads = array();
         foreach ( (array) $sorted_threads as $thread_id => $date_sent ) {
             $threads[] = new BP_Messages_Thread( $thread_id, 'ASC', array(
@@ -517 +524 @@
          * }
          */
-        return apply_filters( 'bp_messages_thread_current_threads', array( 'threads' => &$threads, 'total' => (int) $total_threads ) );
+        return apply_filters( 'bp_messages_thread_current_threads', array(
+            'threads' => &$threads,
+            'total'   => (int) $total_threads
+        ) );
     }
 
@@ -561 +571 @@
      * @param int $thread_id The message thread ID.
      */
-    public static function mark_as_read( $thread_id ) {
+    public static function mark_as_read( $thread_id = 0 ) {
         global $wpdb;
 
         $bp  = buddypress();
         $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
-        $wpdb->query($sql);
+        $wpdb->query( $sql );
 
         wp_cache_delete( 'thread_recipients_' . $thread_id, 'bp_messages' );
@@ -579 +589 @@
      * @param int $thread_id The message thread ID.
      */
-    public static function mark_as_unread( $thread_id ) {
+    public static function mark_as_unread( $thread_id = 0 ) {
         global $wpdb;
 
         $bp  = buddypress();
         $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
-        $wpdb->query($sql);
+        $wpdb->query( $sql );
 
         wp_cache_delete( 'thread_recipients_' . $thread_id, 'bp_messages' );
@@ -605 +615 @@
         global $wpdb;
 
-        $exclude_sender = '';
-        if ( $box != 'sentbox' )
-            $exclude_sender = ' AND sender_only != 1';
-
-        if ( $type == 'unread' )
-            $type_sql = " AND unread_count != 0 ";
-        elseif ( $type == 'read' )
-            $type_sql = " AND unread_count = 0 ";
+        $exclude_sender = $type_sql = '';
+        if ( $box !== 'sentbox' ) {
+            $exclude_sender = 'AND sender_only != 1';
+        }
+
+        if ( $type === 'unread' ) {
+            $type_sql = 'AND unread_count != 0';
+        } elseif ( $type === 'read' ) {
+            $type_sql = 'AND unread_count = 0';
+        }
 
         $bp = buddypress();
 
-        return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0{$exclude_sender} {$type_sql}", $user_id ) );
+        return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0 {$exclude_sender} {$type_sql}", $user_id ) );
     }
 
@@ -635 +647 @@
         $sender_ids = $wpdb->get_col( $wpdb->prepare( "SELECT sender_id FROM {$bp->messages->table_name_messages} WHERE thread_id = %d", $thread_id ) );
 
-        if ( ! $sender_ids ) {
+        if ( empty( $sender_ids ) ) {
             return false;
         }
@@ -711 +723 @@
      */
     public static function check_access( $thread_id, $user_id = 0 ) {
+
         if ( empty( $user_id ) ) {
             $user_id = bp_loggedin_user_id();
@@ -717 +730 @@
         $recipients = self::get_recipients_for_thread( $thread_id );
 
-        if ( isset( $recipients[$user_id] ) && 0 == $recipients[$user_id]->is_deleted ) {
-            return $recipients[$user_id]->id;
+        if ( isset( $recipients[ $user_id ] ) && 0 == $recipients[ $user_id ]->is_deleted ) {
+            return $recipients[ $user_id ]->id;
         } else {
             return null;
@@ -734 +747 @@
      */
     public static function is_valid( $thread_id = 0 ) {
+
         // Bail if no thread ID is passed
         if ( empty( $thread_id ) ) {
@@ -763 +777 @@
      */
     public static function get_recipient_links( $recipients ) {
-        if ( count( $recipients ) >= 5 )
+
+        if ( count( $recipients ) >= 5 ) {
             return sprintf( __( '%s Recipients', 'buddypress' ), number_format_i18n( count( $recipients ) ) );
+        }
 
         $recipient_links = array();
@@ -806 +822 @@
             $message_ids = maybe_unserialize( $thread->message_ids );
 
-            if ( !empty( $message_ids ) ) {
+            if ( ! empty( $message_ids ) ) {
                 $message_ids = implode( ',', $message_ids );
 
                 // Add the thread_id to the messages table
-                if ( ! $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_messages} SET thread_id = %d WHERE id IN ({$message_ids})", $thread->id ) ) )
+                if ( ! $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_messages} SET thread_id = %d WHERE id IN ({$message_ids})", $thread->id ) ) ) {
                     $errors = true;
+                }
             }
         }
 
-        if ( $errors ) {
-            return false;
-        }
-
-        return true;
+        return (bool) ! $errors;
     }
 }