Changeset 1651 for trunk/bp-messages/bp-messages-classes.php

Timestamp:

08/11/2009 10:59:21 PM (17 years ago)

Author:

apeatling

Message:

Re-factored message sending code.

File:

• trunk/bp-messages/bp-messages-classes.php (modified) (5 diffs)

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

@@ -278 +278 @@
         }
         
-        function check_access($id) {
-                global $wpdb, $bp;
-                
-                $sql = $wpdb->prepare("SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND user_id = %d", $id, $bp->loggedin_user->id );
-                $has_access = $wpdb->get_var($sql);
-
-                if ( $has_access )
-                        return true;
-
-                return false;
+        function check_access( $thread_id, $user_id = false ) {
+                global $wpdb, $bp;
+                
+                if ( !$user_id )
+                        $user_id = $bp->loggedin_user->id;
+                
+                return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND user_id = %d", $thread_id, $user_id ) );
         }
         
@@ -308 +305 @@
         var $message;
         var $date_sent;
-        var $message_order;
-        var $sender_is_group;
         
         var $thread_id;
@@ -336 +331 @@
                         $this->message = $message->message;
                         $this->date_sent = $message->date_sent;
-                        $this->message_order = $message->message_order;
-                        $this->sender_is_group = $message->sender_is_group;
                 }
 
@@ -349 +342 @@
                 $this->message = apply_filters( 'messages_message_content_before_save', $this->message, $this->id );
                 $this->date_sent = apply_filters( 'messages_message_date_sent_before_save', $this->date_sent, $this->id ); 
-                $this->message_order = apply_filters( 'messages_message_order_before_save', $this->message_order, $this->id ); 
-                $this->sender_is_group = apply_filters( 'messages_message_sender_is_group_before_save', $this->sender_is_group, $this->id );
 
                 do_action( 'messages_message_before_save', $this );
                 
                 // First insert the message into the messages table
-                if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( sender_id, subject, message, date_sent, message_order, sender_is_group ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d), %d, %d )", $this->sender_id, $this->subject, $this->message, $this->date_sent, $this->message_order, $this->sender_is_group ) ) )
+                if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( sender_id, subject, message, date_sent ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d) )", $this->sender_id, $this->subject, $this->message, $this->date_sent ) ) )
                         return false;
                         
@@ -418 +409 @@
                 do_action( 'messages_message_after_save', $this );
                 
-                return true;
+                return $this->thread_id;
         }