Changeset 2077 for trunk/bp-messages.php

Timestamp:

11/02/2009 07:54:21 PM (16 years ago)

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

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

trunk/bp-messages.php

@@ -15 +15 @@
 if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
     require ( BP_PLUGIN_DIR . '/bp-messages/deprecated/bp-messages-deprecated.php' );
-    
+
 function messages_install() {
     global $wpdb, $bp;
-    
+
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-    
+
     $sql[] = "CREATE TABLE {$bp->messages->table_name_threads} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -33 +33 @@
                 KEY last_sender_id (last_sender_id)
                ) {$charset_collate};";
-    
+
     $sql[] = "CREATE TABLE {$bp->messages->table_name_recipients} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -56 +56 @@
                 KEY sender_id (sender_id)
                ) {$charset_collate};";
-    
+
     $sql[] = "CREATE TABLE {$bp->messages->table_name_notices} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -65 +65 @@
                 KEY is_active (is_active)
                ) {$charset_collate};";
-    
+
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
     dbDelta($sql);
-    
+
     add_site_option( 'bp-messages-db-version', BP_MESSAGES_DB_VERSION );
 }
@@ -77 +77 @@
     /* For internal identification */
     $bp->messages->id = 'messages';
-    
+
     $bp->messages->table_name_threads = $wpdb->base_prefix . 'bp_messages_threads';
     $bp->messages->table_name_messages = $wpdb->base_prefix . 'bp_messages_messages';
@@ -91 +91 @@
     do_action( 'messages_setup_globals' );
 }
-add_action( 'plugins_loaded', 'messages_setup_globals', 5 );    
+add_action( 'plugins_loaded', 'messages_setup_globals', 5 );
 add_action( 'admin_menu', 'messages_setup_globals', 2 );
 
-function messages_check_installed() {   
+function messages_check_installed() {
     global $wpdb, $bp;
 
     if ( !is_site_admin() )
         return false;
-    
+
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
     if ( get_site_option('bp-messages-db-version') < BP_MESSAGES_DB_VERSION )
@@ -117 +117 @@
     /* Add 'Messages' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __('Messages', 'buddypress'), 'slug' => $bp->messages->slug, 'position' => 50, 'show_for_displayed_user' => false, 'screen_function' => 'messages_screen_inbox', 'default_subnav_slug' => 'inbox', 'item_css_id' => $bp->messages->id ) );
-    
+
     $messages_link = $bp->loggedin_user->domain . $bp->messages->slug . '/';
-    
+
     /* Add the subnav items to the profile */
     bp_core_new_subnav_item( array( 'name' => __( 'Inbox', 'buddypress' ) . $count_indicator, 'slug' => 'inbox', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_inbox', 'position' => 10, 'user_has_access' => bp_is_home() ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Sent Messages', 'buddypress' ), 'slug' => 'sentbox', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_sentbox', 'position' => 20, 'user_has_access' => bp_is_home() ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Compose', 'buddypress' ), 'slug' => 'compose', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_compose', 'position' => 30, 'user_has_access' => bp_is_home() ) );
-    
+
     if ( is_site_admin() )
         bp_core_new_subnav_item( array( 'name' => __( 'Notices', 'buddypress' ), 'slug' => 'notices', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_notices', 'position' => 90, 'user_has_access' => is_site_admin() ) );
@@ -130 +130 @@
     if ( $bp->current_component == $bp->messages->slug ) {
         if ( bp_is_home() ) {
-            $bp->bp_options_title = __( 'My Messages', 'buddypress' );          
+            $bp->bp_options_title = __( 'My Messages', 'buddypress' );
         } else {
             $bp_options_avatar =  bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
@@ -136 +136 @@
         }
     }
-    
+
     do_action( 'messages_setup_nav' );
 }
@@ -153 +153 @@
 function messages_screen_inbox() {
     do_action( 'messages_screen_inbox' );
-    bp_core_load_template( apply_filters( 'messages_template_inbox', 'messages/index' ) );  
+    bp_core_load_template( apply_filters( 'messages_template_inbox', 'messages/index' ) );
 }
 
@@ -163 +163 @@
 function messages_screen_compose() {
     global $bp;
-    
+
     // Remove any saved message data from a previous session.
     messages_remove_callback_values();
@@ -169 +169 @@
     /* Check if the message form has been submitted */
     if ( isset( $_POST['send'] ) ) {
-        
+
         /* Check the nonce */
         check_admin_referer( 'messages_send_message' );
-        
+
         /* Check we have what we need */
         if ( empty( $_POST['subject'] ) || empty( $_POST['content'] ) ) {
@@ -185 +185 @@
                 $typed_recipients = explode( ' ', $_POST['send_to_usernames'] );
                 $recipients = array_merge( (array) $autocomplete_recipients, (array) $typed_recipients );
-            
+
                 /* Send the message */
                 if ( $thread_id = messages_new_message( array( 'recipients' => $recipients, 'subject' => $_POST['subject'], 'content' => $_POST['content'] ) ) ) {
@@ -197 +197 @@
 
     }
-    
+
     do_action( 'messages_screen_compose' );
-    
+
     bp_core_load_template( apply_filters( 'messages_template_compose', 'messages/compose' ) );
 }
@@ -205 +205 @@
 function messages_screen_notices() {
     global $bp, $notice_id;
-        
+
     if ( !is_site_admin() )
         return false;
-        
+
     $notice_id = $bp->action_variables[1];
 
@@ -216 +216 @@
         if ( 'deactivate' == $bp->action_variables[0] ) {
             if ( !$notice->deactivate() ) {
-                bp_core_add_message( __('There was a problem deactivating that notice.', 'buddypress'), 'error' );  
+                bp_core_add_message( __('There was a problem deactivating that notice.', 'buddypress'), 'error' );
             } else {
                 bp_core_add_message( __('Notice deactivated.', 'buddypress') );
@@ -235 +235 @@
         bp_core_redirect( $bp->loggedin_user->domain . $bp->messages->slug . '/notices' );
     }
-    
+
     do_action( 'messages_screen_notices' );
-    
-    bp_core_load_template( apply_filters( 'messages_template_notices', 'messages/notices' ) );  
-}
-
-function messages_screen_notification_settings() { 
+
+    bp_core_load_template( apply_filters( 'messages_template_notices', 'messages/notices' ) );
+}
+
+function messages_screen_notification_settings() {
     global $current_user; ?>
     <table class="notification-settings" id="messages-notification-settings">
@@ -262 +262 @@
             <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
-        
+
         <?php do_action( 'messages_screen_notification_settings' ) ?>
     </table>
-<?php   
+<?php
 }
 add_action( 'bp_notification_settings', 'messages_screen_notification_settings', 2 );
@@ -280 +280 @@
 function messages_action_view_message() {
     global $bp, $thread_id;
-    
+
     if ( $bp->current_component != $bp->messages->slug || $bp->current_action != 'view' )
         return false;
-        
+
     $thread_id = $bp->action_variables[0];
-    
+
     if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access($thread_id) && !is_site_admin() ) )
         bp_core_redirect( $bp->displayed_user->domain . $bp->current_component );
-        
+
     /* Check if a new reply has been submitted */
     if ( isset( $_POST['send'] ) ) {
-        
+
         /* Check the nonce */
         check_admin_referer( 'messages_send_message', 'send_message_nonce' );
-        
+
         /* Send the reply */
         if ( messages_new_message( array( 'thread_id' => $thread_id, 'subject' => $_POST['subject'], 'content' => $_POST['content'] ) ) )
@@ -300 +300 @@
         else
             bp_core_add_message( __( 'There was a problem sending your reply, please try again', 'buddypress' ), 'error' );
-        
-        bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/view/' . $thread_id . '/' );     
-    }
-    
+
+        bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/view/' . $thread_id . '/' );
+    }
+
     /* Mark message read */
     messages_mark_thread_read( $thread_id );
-    
+
     do_action( 'messages_action_view_message' );
-    
+
     bp_core_new_subnav_item( array( 'name' => sprintf( __( 'From: %s', 'buddypress'), BP_Messages_Thread::get_last_sender($thread_id) ), 'slug' => 'view', 'parent_url' => $bp->loggedin_user->domain . $bp->messages->slug . '/', 'parent_slug' => $bp->messages->slug, 'screen_function' => true, 'position' => 40, 'user_has_access' => bp_is_home() ) );
     bp_core_load_template( apply_filters( 'messages_template_view_message', 'messages/view' ) );
@@ -316 +316 @@
 function messages_action_delete_message() {
     global $bp, $thread_id;
-    
+
     if ( $bp->current_component != $bp->messages->slug || 'notices' == $bp->current_action || $bp->action_variables[0] != 'delete' )
         return false;
-    
+
     $thread_id = $bp->action_variables[1];
 
@@ -341 +341 @@
 function messages_action_bulk_delete() {
     global $bp, $thread_ids;
-    
+
     if ( $bp->current_component != $bp->messages->slug || $bp->action_variables[0] != 'bulk-delete' )
         return false;
-    
+
     $thread_ids = $_POST['thread_ids'];
 
     if ( !$thread_ids || !messages_check_thread_access($thread_ids) ) {
-        bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/' . $bp->current_action );           
+        bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/' . $bp->current_action );
     } else {
         if ( !check_admin_referer( 'messages_delete_thread' ) )
             return false;
-            
+
         if ( !messages_delete_thread( $thread_ids ) ) {
             bp_core_add_message( __('There was an error deleting messages.', 'buddypress'), 'error' );
@@ -373 +373 @@
 function messages_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
     global $bp;
-    
+
     if ( 'new_message' == $action ) {
         if ( (int)$total_items > 1 )
-            return apply_filters( 'bp_messages_multiple_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="Inbox">' . sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );        
+            return apply_filters( 'bp_messages_multiple_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="Inbox">' . sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
         else
             return apply_filters( 'bp_messages_single_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="Inbox">' . sprintf( __('You have %d new message', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
     }
-    
+
     do_action( 'messages_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
-    
+
     return false;
 }
@@ -398 +398 @@
 function messages_new_message( $args = '' ) {
     global $bp;
-    
+
     $defaults = array(
         'thread_id' => false, // false for a new message, thread id for a reply to a thread.
@@ -409 +409 @@
 
     $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );   
-    
+    extract( $r, EXTR_SKIP );
+
     if ( !$sender_id || !$subject || !$content )
         return false;
-        
-    /* Create a new message object */   
+
+    /* Create a new message object */
     $message = new BP_Messages_Message;
     $message->thread_id = $thread_id;
@@ -425 +425 @@
     if ( $thread_id ) {
         $thread = new BP_Messages_Thread($thread_id);
-        $message->recipients = $thread->get_recipients();       
+        $message->recipients = $thread->get_recipients();
     } else {
         if ( empty( $recipients ) )
             return false;
-        
+
         /* Loop the recipients and convert all usernames to user_ids where needed */
         foreach( (array) $recipients as $recipient ) {
             if ( is_numeric( trim( $recipient ) ) )
                 $recipient_ids[] = (int)trim( $recipient );
-            
+
             if ( $recipient_id = bp_core_get_userid( trim( $recipient ) ) )
                 $recipient_ids[] = (int)$recipient_id;
@@ -445 +445 @@
         /* Remove duplicates */
         $recipient_ids = array_unique( (array)$recipient_ids );
-        
+
         if ( empty( $recipient_ids ) )
             return false;
-        
-        $message->recipients = $recipient_ids; 
-    }
-    
+
+        $message->recipients = $recipient_ids;
+    }
+
     if ( $message->send() ) {
         require_once( BP_PLUGIN_DIR . '/bp-messages/bp-messages-notifications.php' );
@@ -457 +457 @@
         // Send screen notifications to the recipients
         foreach ( (array)$message->recipients as $recipient ) {
-            bp_core_add_notification( $message->id, $recipient, 'messages', 'new_message' );    
-        }
-        
+            bp_core_add_notification( $message->id, $recipient, 'messages', 'new_message' );
+        }
+
         // Send email notifications to the recipients
         messages_notification_new_message( array( 'item_id' => $message->id, 'recipient_ids' => $message->recipients, 'thread_id' => $message->thread_id, 'component_name' => $bp->messages->slug, 'component_action' => 'message_sent', 'is_private' => 1 ) );
-    
+
         do_action( 'messages_message_sent', &$message );
-        
+
         return $message->thread_id;
     }
-    
+
     return false;
 }
@@ -483 +483 @@
         $notice->is_active = 1;
         $notice->save(); // send it.
-        
+
         do_action( 'messages_send_notice', $subject, $message );
-        
+
         return true;
     }
@@ -497 +497 @@
                 $error = 1;
         }
-        
+
         if ( $error )
             return false;
-        
+
         do_action( 'messages_delete_thread', $thread_ids );
-        
+
         return true;
     } else {
         if ( !BP_Messages_Thread::delete($thread_ids) )
             return false;
-        
+
         do_action( 'messages_delete_thread', $thread_ids );
-        
+
         return true;
     }
@@ -516 +516 @@
 function messages_check_thread_access( $thread_id, $user_id = false ) {
     global $bp;
-    
+
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
-    
+
     return BP_Messages_Thread::check_access( $thread_id, $user_id );
 }
@@ -528 +528 @@
 
 function messages_mark_thread_unread( $thread_id ) {
-    return BP_Messages_Thread::mark_as_unread( $thread_id );    
+    return BP_Messages_Thread::mark_as_unread( $thread_id );
 }
 
@@ -545 +545 @@
 function messages_get_unread_count( $user_id = false ) {
     global $bp;
-    
-    if ( !$user_id ) 
+
+    if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
-        
+
     return BP_Messages_Thread::get_inbox_count( $user_id );
 }