Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
02/06/2009 03:07:48 AM (17 years ago)
Author:
apeatling
Message:

Converted $bp as an array to $bp as an object. See this post for more info: http://buddypress.org/forums/topic.php?id=1125

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-messages/bp-messages-classes.php

    r713 r1021  
    3838                global $wpdb, $bp;
    3939
    40                 $thread = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $id ) );
     40                $thread = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_threads} WHERE id = %d", $id ) );
    4141               
    4242                if ( $thread ) {
     
    6363                                        foreach ( $this->message_ids as $key => $message_id ) {
    6464                                                if ( $this->box == 'sentbox' ) {
    65                                                         if ( !messages_is_user_sender( $bp['loggedin_userid'], $message_id ) ) {
     65                                                        if ( !messages_is_user_sender( $bp->loggedin_user->id, $message_id ) ) {
    6666                                                                unset( $this->message_ids[$key] );
    6767                                                        } else {
     
    6969                                                        }                                               
    7070                                                } else {
    71                                                         if ( messages_is_user_sender( $bp['loggedin_userid'], $message_id ) ) {
     71                                                        if ( messages_is_user_sender( $bp->loggedin_user->id, $message_id ) ) {
    7272                                                                unset( $this->message_ids[$key] );
    7373                                                        } else {
     
    9494                                $this->unread_count = $this->get_unread();
    9595
    96                                 $last_message = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['messages']['table_name_messages'] . " WHERE id = %d", $this->last_message_id ) );       
     96                                $last_message = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_messages} WHERE id = %d", $this->last_message_id ) );
    9797                               
    9898                                if ( $last_message ) {
     
    111111                       
    112112                if ( $this->message_ids)
    113                         return $wpdb->get_results( "SELECT * FROM " . $bp['messages']['table_name_messages'] . " WHERE id IN (" . $wpdb->escape($this->message_ids) . ")" );
     113                        return $wpdb->get_results( "SELECT * FROM {$bp->messages->table_name_messages} WHERE id IN (" . $wpdb->escape($this->message_ids) . ")" );
    114114                else
    115115                        return false;
     
    119119                global $wpdb, $bp;
    120120
    121                 $sql = $wpdb->prepare( "SELECT unread_count FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d AND user_id = %d", $this->thread_id, $bp['loggedin_userid'] );
     121                $sql = $wpdb->prepare( "SELECT unread_count FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND user_id = %d", $this->thread_id, $bp->loggedin_user->id );
    122122                $unread_count = $wpdb->get_var($sql);
    123123               
     
    136136                global $wpdb, $bp;
    137137
    138                 $recipients = $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d", $this->thread_id ) );
     138                $recipients = $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $this->thread_id ) );
    139139
    140140                for ( $i = 0; $i < count($recipients); $i++ ) {
    141141                        $recipient = $recipients[$i];
    142142
    143                         if ( count($recipients) > 1 && $recipient != $bp['loggedin_userid'] )
     143                        if ( count($recipients) > 1 && $recipient != $bp->loggedin_user->id )
    144144                                $recipient_ids[] = $recipient;
    145145                }
     
    153153                global $wpdb, $bp;
    154154               
    155                 $delete_for_user = $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_recipients'] . " SET is_deleted = 1 WHERE thread_id = %d AND user_id = %d", $thread_id, $bp['loggedin_userid'] ) );
     155                $delete_for_user = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET is_deleted = 1 WHERE thread_id = %d AND user_id = %d", $thread_id, $bp->loggedin_user->id ) );
    156156               
    157157                // Check to see if any more recipients remain for this message
    158158                // if not, then delete the message from the database.
    159                 $recipients = $wpdb->get_results( $wpdb->prepare( "SELECT id FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d AND is_deleted = 0", $thread_id ) );
     159                $recipients = $wpdb->get_results( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND is_deleted = 0", $thread_id ) );
    160160
    161161                if ( !$recipients ) {
    162162                        // Get message ids:
    163                         $message_ids = $wpdb->get_var( $wpdb->prepare( "SELECT message_ids FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $thread_id ) );
     163                        $message_ids = $wpdb->get_var( $wpdb->prepare( "SELECT message_ids FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );
    164164                        $message_ids = unserialize($message_ids);
    165165                       
    166166                        // delete thread:
    167                         $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $thread_id ) );
     167                        $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );
    168168                       
    169169                        // delete messages:
    170170                        for ( $i = 0; $i < count($message_ids); $i++ ) {
    171                                 $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['messages']['table_name_messages'] . " WHERE id = %d", $message_ids[$i] ) );
     171                                $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_messages} WHERE id = %d", $message_ids[$i] ) );
    172172                        }
    173173                       
    174174                        // delete the recipients
    175                         $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['messages']['table_name_recipients'] . " WHERE id = %d", $thread_id ) );
     175                        $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_recipients} WHERE id = %d", $thread_id ) );
    176176                }
    177177
     
    186186                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    187187                       
    188                 $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 ORDER BY t.last_post_date DESC$pag_sql", $bp['loggedin_userid'] );
     188                $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 ORDER BY t.last_post_date DESC$pag_sql", $bp->loggedin_user->id );
    189189
    190190                if ( !$thread_ids = $wpdb->get_results($sql) )
     
    207207                global $wpdb, $bp;
    208208               
    209                 $sql = $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_recipients'] . " SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", $bp['loggedin_userid'], $thread_id );
     209                $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 );
    210210                $wpdb->query($sql);
    211211        }
     
    214214                global $wpdb, $bp;
    215215               
    216                 $sql = $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_recipients'] . " SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", $bp['loggedin_userid'], $thread_id );
     216                $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 );
    217217                $wpdb->query($sql);
    218218        }
     
    225225                        $exclude_sender = ' AND sender_only != 1';
    226226
    227                 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", $user_id ) );
     227                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", $user_id ) );
    228228        }
    229229       
     
    231231                global $wpdb, $bp;
    232232               
    233                 $sender_ids = $wpdb->get_var( $wpdb->prepare( "SELECT sender_ids FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $thread_id ) );     
     233                $sender_ids = $wpdb->get_var( $wpdb->prepare( "SELECT sender_ids FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );       
    234234               
    235235                if ( !$sender_ids )
     
    238238                $sender_ids = unserialize($sender_ids);
    239239               
    240                 return in_array( $bp['loggedin_userid'], $sender_ids );
     240                return in_array( $bp->loggedin_user->id, $sender_ids );
    241241        }
    242242
     
    244244                global $wpdb, $bp;
    245245
    246                 $sql = $wpdb->prepare("SELECT last_sender_id FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $thread_id);
     246                $sql = $wpdb->prepare("SELECT last_sender_id FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id);
    247247
    248248                if ( !$sender_id = $wpdb->get_var($sql) )
     
    255255                global $wpdb, $bp;
    256256
    257                 $sql = $wpdb->prepare( "SELECT unread_count FROM " . $bp['messages']['table_name_recipients'] . " WHERE user_id = %d AND is_deleted = 0", $bp['loggedin_userid'] );
     257                $sql = $wpdb->prepare( "SELECT unread_count FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0", $bp->loggedin_user->id );
    258258
    259259                if ( !$unread_counts = $wpdb->get_results($sql) )
     
    271271                global $wpdb, $bp;
    272272               
    273                 $sql = $wpdb->prepare("SELECT id FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d AND user_id = %d", $id, $bp['loggedin_userid'] );
     273                $sql = $wpdb->prepare("SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND user_id = %d", $id, $bp->loggedin_user->id );
    274274                $has_access = $wpdb->get_var($sql);
    275275
     
    308308
    309309                $this->date_sent = time();
    310                 $this->sender_id = $bp['loggedin_userid'];
     310                $this->sender_id = $bp->loggedin_user->id;
    311311
    312312                if ( $id ) {
     
    318318                global $wpdb, $bp;
    319319               
    320                 $sql = $wpdb->prepare("SELECT * FROM " . $bp['messages']['table_name_messages'] . " WHERE id = %d", $id);
     320                $sql = $wpdb->prepare("SELECT * FROM {$bp->messages->table_name_messages} WHERE id = %d", $id);
    321321
    322322                if ( $message = $wpdb->get_row($sql) ) {
     
    336336
    337337                // First insert the message into the messages table
    338                 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 ) ) )
     338                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 ) ) )
    339339                        return false;
    340340                       
     
    342342                if ( $this->thread_id ) {
    343343                        // Select and update the current message ids for the thread.
    344                         $the_ids = $wpdb->get_row( $wpdb->prepare( "SELECT message_ids, sender_ids FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $this->thread_id ) );
     344                        $the_ids = $wpdb->get_row( $wpdb->prepare( "SELECT message_ids, sender_ids FROM {$bp->messages->table_name_threads} WHERE id = %d", $this->thread_id ) );
    345345                        $message_ids = unserialize($the_ids->message_ids);
    346346                        $message_ids[] = $wpdb->insert_id;
     
    359359                       
    360360                        // Update the thread the message belongs to.
    361                         $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_threads'] . " SET message_ids = %s, sender_ids = %s, last_message_id = %d, last_sender_id = %d WHERE id = %d", $message_ids, $sender_ids, $wpdb->insert_id, $this->sender_id, $this->thread_id ) );
     361                        $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_threads} SET message_ids = %s, sender_ids = %s, last_message_id = %d, last_sender_id = %d WHERE id = %d", $message_ids, $sender_ids, $wpdb->insert_id, $this->sender_id, $this->thread_id ) );
    362362                                               
    363363                        // Find the recipients and update the unread counts for each
     
    366366                       
    367367                        for ( $i = 0; $i < count($this->recipients); $i++ ) {
    368                                 if ( $this->recipients[$i]->user_id != $bp['loggedin_userid'] )
    369                                         $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_recipients'] . " SET unread_count = unread_count + 1, sender_only = 0 WHERE thread_id = %d AND user_id = %d", $this->thread_id, $this->recipients[$i] ) );
     368                                if ( $this->recipients[$i]->user_id != $bp->loggedin_user->id )
     369                                        $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = unread_count + 1, sender_only = 0 WHERE thread_id = %d AND user_id = %d", $this->thread_id, $this->recipients[$i] ) );
    370370                        }
    371371                } else {
     
    373373                        $message_id = $wpdb->insert_id;
    374374                        $serialized_message_id = serialize( array( (int)$message_id ) );
    375                         $serialized_sender_id = serialize( array( (int)$bp['loggedin_userid'] ) );
    376                        
    377                         $sql = $wpdb->prepare( "INSERT INTO " . $bp['messages']['table_name_threads'] . " ( message_ids, sender_ids, first_post_date, last_post_date, last_message_id, last_sender_id ) VALUES ( %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), %d, %d )", $serialized_message_id, $serialized_sender_id, $this->date_sent, $this->date_sent, $message_id, $this->sender_id );
     375                        $serialized_sender_id = serialize( array( (int)$bp->loggedin_user->id ) );
     376                       
     377                        $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_threads} ( message_ids, sender_ids, first_post_date, last_post_date, last_message_id, last_sender_id ) VALUES ( %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), %d, %d )", $serialized_message_id, $serialized_sender_id, $this->date_sent, $this->date_sent, $message_id, $this->sender_id );
    378378                       
    379379                        if ( $wpdb->query($sql) === false )
     
    385385                        // Add a new entry for each recipient;
    386386                        for ( $i = 0; $i < count($this->recipients); $i++ ) {
    387                                 $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['messages']['table_name_recipients'] . " ( user_id, thread_id, unread_count ) VALUES ( %d, %d, 1 )", $this->recipients[$i], $this->thread_id ) );
     387                                $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_recipients} ( user_id, thread_id, unread_count ) VALUES ( %d, %d, 1 )", $this->recipients[$i], $this->thread_id ) );
    388388                        }
    389389                       
    390390                        if ( !in_array( $this->sender_id, $this->recipients ) ) {
    391391                                // Finally, add a recipient entry for the sender, as replies need to go to this person too.
    392                                 $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 ) );
     392                                $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 ) );
    393393                        }
    394394                }
     
    403403                global $bp, $wpdb;
    404404               
    405                 return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d", $this->thread_id ) );
     405                return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $this->thread_id ) );
    406406        }
    407407       
     
    425425                global $wpdb, $bp;
    426426               
    427                 $message_ids = $wpdb->get_var( $wpdb->prepare( "SELECT message_ids FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $thread_id ) );
     427                $message_ids = $wpdb->get_var( $wpdb->prepare( "SELECT message_ids FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );
    428428                $message_ids = implode( ',', unserialize($message_ids));
    429429
    430                 $sql = $wpdb->prepare( "SELECT id FROM " . $bp['messages']['table_name_messages'] . "  WHERE sender_id = %d AND id IN (" . $wpdb->escape($message_ids) . ") ORDER BY date_sent DESC LIMIT 1", $bp['loggedin_userid'] );
     430                $sql = $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages}  WHERE sender_id = %d AND id IN (" . $wpdb->escape($message_ids) . ") ORDER BY date_sent DESC LIMIT 1", $bp->loggedin_user->id );
    431431                return $wpdb->get_var($sql);
    432432        }       
     
    434434        function is_user_sender( $user_id, $message_id ) {
    435435                global $wpdb, $bp;
    436                 return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM " . $bp['messages']['table_name_messages'] . " WHERE sender_id = %d AND id = %d", $user_id, $message_id ) );
     436                return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND id = %d", $user_id, $message_id ) );
    437437        }
    438438       
    439439        function get_message_sender( $message_id ) {
    440440                global $wpdb, $bp;
    441                 return $wpdb->get_var( $wpdb->prepare( "SELECT sender_id FROM " . $bp['messages']['table_name_messages'] . " WHERE id = %d", $message_id ) );           
     441                return $wpdb->get_var( $wpdb->prepare( "SELECT sender_id FROM {$bp->messages->table_name_messages} WHERE id = %d", $message_id ) );             
    442442        }
    443443}
     
    460460                global $wpdb, $bp;
    461461               
    462                 $notice = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['messages']['table_name_notices'] . " WHERE id = %d", $this->id ) );
     462                $notice = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} WHERE id = %d", $this->id ) );
    463463               
    464464                if ( $notice ) {
     
    474474               
    475475                if ( !$this->id ) {
    476                         $sql = $wpdb->prepare( "INSERT INTO " . $bp['messages']['table_name_notices'] . " (subject, message, date_sent, is_active) VALUES (%s, %s, FROM_UNIXTIME(%d), %d)", $this->subject, $this->message, $this->date_sent, $this->is_active );       
     476                        $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_notices} (subject, message, date_sent, is_active) VALUES (%s, %s, FROM_UNIXTIME(%d), %d)", $this->subject, $this->message, $this->date_sent, $this->is_active );
    477477                } else {
    478                         $sql = $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_notices'] . " SET subject = %s, message = %s, is_active = %d WHERE id = %d", $this->subject, $this->message, $this->is_active, $this->id );                             
     478                        $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET subject = %s, message = %s, is_active = %d WHERE id = %d", $this->subject, $this->message, $this->is_active, $this->id );                               
    479479                }
    480480       
     
    486486                       
    487487                // Now deactivate all notices apart from the new one.
    488                 $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_notices'] . " SET is_active = 0 WHERE id != %d", $id ) );
    489                
    490                 update_usermeta( $bp['loggedin_userid'], 'last_activity', date( 'Y-m-d H:i:s' ) );
     488                $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET is_active = 0 WHERE id != %d", $id ) );
     489               
     490                update_usermeta( $bp->loggedin_user->id, 'last_activity', date( 'Y-m-d H:i:s' ) );
    491491               
    492492                return true;
     
    512512                global $wpdb, $bp;
    513513               
    514                 $sql = $wpdb->prepare( "DELETE FROM " . $bp['messages']['table_name_notices'] . " WHERE id = %d", $this->id );
     514                $sql = $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_notices} WHERE id = %d", $this->id );
    515515               
    516516                if ( !$wpdb->query($sql) )
     
    525525                global $wpdb, $bp;
    526526               
    527                 $notices = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['messages']['table_name_notices'] . " ORDER BY date_sent DESC" ) );
     527                $notices = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC" ) );
    528528                return $notices;
    529529        }
     
    532532                global $wpdb, $bp;
    533533               
    534                 $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp['messages']['table_name_notices'] ) );
     534                $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp->messages->table_name_notices ) );
    535535                return $notice_count;
    536536        }
     
    539539                global $wpdb, $bp;
    540540               
    541                 $notice_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM " . $bp['messages']['table_name_notices'] . " WHERE is_active = 1") );
     541                $notice_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_notices} WHERE is_active = 1") );
    542542                return new BP_Messages_Notice($notice_id);
    543543        }
Note: See TracChangeset for help on using the changeset viewer.