Changeset 3364

Timestamp:

11/06/2010 05:54:55 PM (16 years ago)

Author:

boonebgorges

Message:

Allows admins to allow message Componse To: autocomplete to include all members of the site. Fixes #2419, props r-a-y for the initial patch

Location:

trunk

Files:

• bp-messages.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

trunk/bp-messages.php

@@ -11 +11 @@
                 define ( 'BP_MESSAGES_SLUG', 'messages' );
 
-        /* For internal identification */
+        // For internal identification
         $bp->messages->id = 'messages';
 
@@ -20 +20 @@
         $bp->messages->format_notification_function = 'messages_format_notifications';
 
-        /* Register this in the active components array */
+        // Register this in the active components array
         $bp->active_components[$bp->messages->slug] = $bp->messages->id;
+
+        // Include all members in the To: autocomplete?
+        $bp->messages->autocomplete_all = defined( 'BP_MESSAGES_AUTOCOMPLETE_ALL' ) ? true : false;
 
         do_action( 'messages_setup_globals' );

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -537 +537 @@
 add_action( 'wp_ajax_messages_delete', 'bp_dtheme_ajax_messages_delete' );
 
-/* AJAX autocomplete your friends names on the compose screen */
+/**
+ * bp_dtheme_ajax_messages_autocomplete_results()
+ *
+ * AJAX handler for autocomplete. Displays friends only, unless BP_MESSAGES_AUTOCOMPLETE_ALL is defined
+ *
+ * @global object $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ * @return none
+ */
 function bp_dtheme_ajax_messages_autocomplete_results() {
         global $bp;
 
+        // Include everyone in the autocomplete, or just friends?
+        if ( $bp->messages->slug == $bp->current_component )
+                $autocomplete_all = $bp->messages->autocomplete_all;
+        
         $friends = false;
 
-        // Get the friend ids based on the search terms
-        if ( function_exists( 'friends_search_friends' ) )
-                $friends = friends_search_friends( $_GET['q'], $bp->loggedin_user->id, $_GET['limit'], 1 );
-
-        $friends = apply_filters( 'bp_friends_autocomplete_list', $friends, $_GET['q'], $_GET['limit'] );
-
-        if ( $friends['friends'] ) {
-                foreach ( (array)$friends['friends'] as $user_id ) {
+        $limit = $_GET['limit'] ? $_GET['limit'] : apply_filters( 'bp_autocomplete_max_results', 10 );
+
+        // Get the user ids based on the search terms
+        if ( $autocomplete_all ) {
+                $users = BP_Core_User::search_users( $_GET['q'], $limit, $pag_page );
+                
+                if ( !empty( $users['users'] ) ) {
+                        // Build an array with the correct format
+                        $user_ids = array();
+                        foreach( $users['users'] as $user ) {
+                                if ( $user->id != $bp->loggedin_user->id )
+                                        $user_ids[] = $user->id;
+                        }
+                        
+                        $user_ids = apply_filters( 'bp_core_autocomplete_ids', $user_ids, $_GET['q'], $limit );
+                }
+        } else {
+                if ( function_exists( 'friends_search_friends' ) ) {
+                        $users = friends_search_friends( $_GET['q'], $bp->loggedin_user->id, $limit, 1 );
+                        
+                        // Keeping the bp_friends_autocomplete_list filter for backward compatibility
+                        $users = apply_filters( 'bp_friends_autocomplete_list', $users, $_GET['q'], $limit );
+                        
+                        if ( !empty( $users['friends'] ) )
+                                $user_ids = apply_filters( 'bp_friends_autocomplete_ids', $users['friends'], $_GET['q'], $limit );
+                }
+        }
+        
+
+        if ( $user_ids ) {
+                foreach ( $user_ids as $user_id ) {
                         $ud = get_userdata($user_id);
                         $username = $ud->user_login;