Changeset 2182

Timestamp:

12/15/2009 02:37:11 PM (17 years ago)

Author:

apeatling

Message:

Fixing messaging pagination counts.

Location:

trunk/bp-messages

Files:

• bp-messages-classes.php (modified) (3 diffs)
• bp-messages-templatetags.php (modified) (3 diffs)

trunk/bp-messages/bp-messages-classes.php

@@ -191 +191 @@
                         $type_sql = $wpdb->prepare( " AND r.unread_count = 0 " );
 
-                $sql = $wpdb->prepare( "SELECT r.thread_id FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_threads} t WHERE t.id = r.thread_id AND r.is_deleted = 0 AND r.user_id = %d$exclude_sender $type_sql ORDER BY t.last_post_date DESC$pag_sql", $bp->loggedin_user->id );
-
-                if ( !$thread_ids = $wpdb->get_results($sql) )
-                        return false;
+                $exclude_sender = false;
+                if ( 'inbox' == $box )
+                        $exclude_sender = $wpdb->prepare( " AND r.sender_only = 0" );
+
+                $thread_ids = $wpdb->get_col( $wpdb->prepare( "SELECT r.thread_id FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_threads} t WHERE t.id = r.thread_id AND r.is_deleted = 0 AND r.user_id = %d$exclude_sender $type_sql ORDER BY t.last_post_date DESC$pag_sql", $bp->loggedin_user->id ) );
+                $total_threads = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(r.thread_id) FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_threads} t WHERE t.id = r.thread_id AND r.is_deleted = 0 AND r.user_id = %d$exclude_sender $type_sql", $bp->loggedin_user->id ) );
 
                 $threads = false;
-
-                for ( $i = 0; $i < count($thread_ids); $i++ ) {
-                        $threads[$i] = new BP_Messages_Thread( $thread_ids[$i]->thread_id, false, $box );
-
-                        if ( !$threads[$i]->message_ids )
-                                unset($threads[$i]);
-                }
-
-                // reset keys
-                return array_reverse( array_reverse( $threads ) );
+                foreach ( $thread_ids as $thread_id ) {
+                        if ( 'sentbox' == $box && !BP_Messages_Thread::user_is_sender( $thread_id ) ) {
+                                $total_threads--;
+                                continue;
+                        }
+
+                        $threads[] = new BP_Messages_Thread( $thread_id, false, $box );
+                }
+
+                return array( 'threads' => &$threads, 'total' => (int)$total_threads );
         }
 
@@ -396 +398 @@
                                 return false;
 
-
                         $this->thread_id = $wpdb->insert_id;
 
@@ -406 +407 @@
                         if ( !in_array( $this->sender_id, (array)$this->recipients ) ) {
                                 // Finally, add a recipient entry for the sender, as replies need to go to this person too.
-                                $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_recipients} ( user_id, thread_id, unread_count, sender_only ) VALUES ( %d, %d, 0, 0 )", $this->sender_id, $this->thread_id ) );
+                                $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_recipients} ( user_id, thread_id, unread_count, sender_only ) VALUES ( %d, %d, 0, 1 )", $this->sender_id, $this->thread_id ) );
                         }
                 }

trunk/bp-messages/bp-messages-templatetags.php

@@ -28 +28 @@
                 if ( 'notices' == $this->box )
                         $this->threads = BP_Messages_Notice::get_notices();
-                else
-                        $this->threads = BP_Messages_Thread::get_current_threads_for_user( $this->user_id, $this->box, $this->pag_num, $this->pag_page, $type );
+                else {
+                        $threads = BP_Messages_Thread::get_current_threads_for_user( $this->user_id, $this->box, $this->pag_num, $this->pag_page, $type );
+
+                        $this->threads = $threads['threads'];
+                        $this->total_thread_count = $threads['total'];
+                }
 
                 if ( !$this->threads ) {
@@ -40 +44 @@
                                 if ( 'notices' == $this->box )
                                         $this->total_thread_count = (int)$total_notice_count;
-                                else
-                                        $this->total_thread_count = (int)BP_Messages_Thread::get_total_threads_for_user( $this->user_id, $this->box, $type );
                         } else {
                                 $this->total_thread_count = (int)$max;
@@ -61 +63 @@
                         'total' => ceil($this->total_thread_count / $this->pag_num),
                         'current' => $this->pag_page,
-                        'prev_text' => '«',
-                        'next_text' => '»',
+                        'prev_text' => '←',
+                        'next_text' => '→',
                         'mid_size' => 1
                 ));