Changeset 2077 for trunk/bp-messages/deprecated/bp-messages-deprecated.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/deprecated/bp-messages-deprecated.php (modified) (22 diffs)

trunk/bp-messages/deprecated/bp-messages-deprecated.php

@@ -4 +4 @@
  *
  * This file contains functions that are deprecated.
- * You should not under any circumstance use these functions as they are 
+ * You should not under any circumstance use these functions as they are
  * either no longer valid, or have been replaced with something much more awesome.
  *
@@ -13 +13 @@
  * Of course, things will still work if you use these functions but you will
  * be the laughing stock of the BuddyPress community. We will all point and laugh at
- * you. You'll also be making things harder for yourself in the long run, 
+ * you. You'll also be making things harder for yourself in the long run,
  * and you will miss out on lovely performance and functionality improvements.
- * 
+ *
  * If you've checked you are not using any deprecated functions and finished your little
  * dance, you can add the following line to your wp-config.php file to prevent any of
@@ -24 +24 @@
 function messages_deprecated_globals() {
     global $bp;
-    
+
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
@@ -31 +31 @@
     $bp->groups->image_base = BP_PLUGIN_URL . '/bp-messages/deprecated/images';
 }
-add_action( 'plugins_loaded', 'messages_deprecated_globals', 5 );   
+add_action( 'plugins_loaded', 'messages_deprecated_globals', 5 );
 add_action( 'admin_menu', 'messages_deprecated_globals', 2 );
 
@@ -50 +50 @@
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return $template;
-        
+
     /* Enqueue the structure CSS file to give basic positional formatting for components */
-    wp_enqueue_style( 'bp-messages-structure', BP_PLUGIN_URL . '/bp-messages/deprecated/css/structure.css' );   
+    wp_enqueue_style( 'bp-messages-structure', BP_PLUGIN_URL . '/bp-messages/deprecated/css/structure.css' );
 }
 add_action( 'bp_styles', 'messages_add_structure_css' );
@@ -62 +62 @@
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
-        
+
     check_ajax_referer( 'messages_send_message' );
-    
-    $result = messages_send_message($_REQUEST['send_to'], $_REQUEST['subject'], $_REQUEST['content'], $_REQUEST['thread_id'], true, false, true); 
+
+    $result = messages_send_message($_REQUEST['send_to'], $_REQUEST['subject'], $_REQUEST['content'], $_REQUEST['thread_id'], true, false, true);
 
     if ( $result['status'] ) { ?>
             <div class="avatar-box">
                 <?php echo bp_core_fetch_avatar( array( 'item_id' => $result['reply']->sender_id, 'type' => 'thumb' ) ); ?>
-    
+
                 <h3><?php echo bp_core_get_userlink($result['reply']->sender_id) ?></h3>
                 <small><?php echo bp_format_time($result['reply']->date_sent) ?></small>
@@ -90 +90 @@
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
-        
+
     if ( !isset($_POST['thread_ids']) ) {
         echo "-1[[split]]" . __('There was a problem marking messages as unread.', 'buddypress');
     } else {
         $thread_ids = explode( ',', $_POST['thread_ids'] );
-        
+
         for ( $i = 0; $i < count($thread_ids); $i++ ) {
             BP_Messages_Thread::mark_as_unread($thread_ids[$i]);
@@ -108 +108 @@
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
-        return false;   
-        
+        return false;
+
     if ( !isset($_POST['thread_ids']) ) {
         echo "-1[[split]]" . __('There was a problem marking messages as read.', 'buddypress');
@@ -128 +128 @@
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
-        
+
     if ( !isset($_POST['thread_ids']) ) {
         echo "-1[[split]]" . __( 'There was a problem deleting messages.', 'buddypress' );
@@ -137 +137 @@
             BP_Messages_Thread::delete($thread_ids[$i]);
         }
-        
+
         _e('Messages deleted.', 'buddypress');
     }
@@ -149 +149 @@
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
-        
+
     if ( !isset($_POST['notice_id']) ) {
         echo "-1[[split]]" . __('There was a problem closing the notice.', 'buddypress');
     } else {
         $notice_ids = get_usermeta( $userdata->ID, 'closed_notices' );
-    
+
         $notice_ids[] = (int) $_POST['notice_id'];
-        
+
         update_usermeta( $userdata->ID, 'closed_notices', $notice_ids );
     }
@@ -168 +168 @@
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
-            
+
     $friends = false;
 
@@ -183 +183 @@
             echo bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15 ) )  . ' ' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')
             ';
-        }       
+        }
     }
 }
@@ -193 +193 @@
     global $message, $type;
     global $bp, $current_user;
-        
+
     messages_add_callback_values( $recipients, $subject, $content );
-    
+
     if ( isset( $_POST['send-notice'] ) ) {
         if ( messages_send_notice( $subject, $content, $from_template ) ) {
             bp_core_add_message( __('Notice posted successfully.', 'buddypress') );
         } else {
-            bp_core_add_message( __('There was an error posting that notice.', 'buddypress'), 'error' );            
+            bp_core_add_message( __('There was an error posting that notice.', 'buddypress'), 'error' );
         }
         bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/notices' );
         return true;
     }
-    
+
     $recipients = explode( ' ', $recipients );
-    
+
     // If there are no recipients
     if ( count( $recipients ) < 1 ) {
-        if ( !$from_ajax ) {    
+        if ( !$from_ajax ) {
             bp_core_add_message( __('Please enter at least one valid user to send this message to.', 'buddypress'), 'error' );
             bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
@@ -216 +216 @@
             return array('status' => 0, 'message' => __('There was an error sending the reply, please try again.', 'buddypress'));
         }
-        
+
     // If there is only 1 recipient and it is the logged in user.
     } else if ( 1 == count( $recipients ) && $recipients[0] == $current_user->user_login ) {
         bp_core_add_message( __('You must send your message to one or more users not including yourself.', 'buddypress'), 'error' );
-        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );   
-    
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
+
     // If the subject or content boxes are empty.
     } else if ( empty( $subject ) || empty( $content ) ) {
@@ -230 +230 @@
             return array('status' => 0, 'message' => __('Please make sure you have typed a message before sending a reply.', 'buddypress'));
         }
-        
+
     // Passed validation continue.
     } else {
@@ -237 +237 @@
         if ( $key = array_search( $current_user->user_login, $recipients ) )
             unset( $recipients[$key] );
-        
+
         $pmessage = new BP_Messages_Message;
 
@@ -245 +245 @@
         $pmessage->thread_id = $thread_id;
         $pmessage->date_sent = time();
-        
+
         if ( $is_reply ) {
             $thread = new BP_Messages_Thread($thread_id);
@@ -257 +257 @@
                 $message = __('Message could not be sent, please try again.', 'buddypress');
                 $type = 'error';
-        
+
                 if ( $from_ajax ) {
                     return array('status' => 0, 'message' => $message);
@@ -263 +263 @@
                     bp_core_add_message( $message, $type );
                     bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
-                } 
+                }
             } else {
                 $message = __('Message sent successfully!', 'buddypress');
                 $type = 'success';
-                
+
                 // Send screen notifications to the recipients
                 for ( $i = 0; $i < count($pmessage->recipients); $i++ ) {
                     if ( $pmessage->recipients[$i] != $bp->loggedin_user->id ) {
-                        bp_core_add_notification( $pmessage->id, $pmessage->recipients[$i], 'messages', 'new_message' );    
+                        bp_core_add_notification( $pmessage->id, $pmessage->recipients[$i], 'messages', 'new_message' );
                     }
                 }
-                
+
                 // Send email notifications to the recipients
                 require_once( BP_PLUGIN_DIR . '/bp-messages/bp-messages-notifications.php' );
@@ -280 +280 @@
 
                 do_action( 'messages_send_message', array( 'item_id' => $pmessage->id, 'recipient_ids' => $pmessage->recipients, 'thread_id' => $pmessage->thread_id, 'component_name' => $bp->messages->slug, 'component_action' => 'message_sent', 'is_private' => 1 ) );
-        
+
                 if ( $from_ajax ) {
                     return array('status' => 1, 'message' => $message, 'reply' => $pmessage);
@@ -291 +291 @@
             $message = __('Message could not be sent, please try again.', 'buddypress');
             $type = 'error';
-        
+
             if ( $from_ajax ) {
                 return array('status' => 0, 'message' => $message);