<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [3364] trunk: Allows admins to allow message Componse To:
autocomplete to include all members of the site.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3364</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-11-06 17:54:55 +0000 (Sat, 06 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesphp">trunk/bp-messages.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages.php (3363 => 3364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages.php 2010-11-06 16:53:37 UTC (rev 3363)
+++ trunk/bp-messages.php 2010-11-06 17:54:55 UTC (rev 3364)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> if ( !defined( 'BP_MESSAGES_SLUG' ) )
</span><span class="cx"> define ( 'BP_MESSAGES_SLUG', 'messages' );
</span><span class="cx">
</span><del>- /* For internal identification */
</del><ins>+ // For internal identification
</ins><span class="cx"> $bp->messages->id = 'messages';
</span><span class="cx">
</span><span class="cx"> $bp->messages->slug = BP_MESSAGES_SLUG;
</span><span class="lines">@@ -19,9 +19,12 @@
</span><span class="cx"> $bp->messages->table_name_recipients = $bp->table_prefix . 'bp_messages_recipients';
</span><span class="cx"> $bp->messages->format_notification_function = 'messages_format_notifications';
</span><span class="cx">
</span><del>- /* Register this in the active components array */
</del><ins>+ // Register this in the active components array
</ins><span class="cx"> $bp->active_components[$bp->messages->slug] = $bp->messages->id;
</span><span class="cx">
</span><ins>+ // Include all members in the To: autocomplete?
+ $bp->messages->autocomplete_all = defined( 'BP_MESSAGES_AUTOCOMPLETE_ALL' ) ? true : false;
+
</ins><span class="cx"> do_action( 'messages_setup_globals' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_setup_globals', 'messages_setup_globals' );
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (3363 => 3364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-11-06 16:53:37 UTC (rev 3363)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-11-06 17:54:55 UTC (rev 3364)
</span><span class="lines">@@ -536,20 +536,54 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_ajax_messages_delete', 'bp_dtheme_ajax_messages_delete' );
</span><span class="cx">
</span><del>-/* AJAX autocomplete your friends names on the compose screen */
</del><ins>+/**
+ * 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
+ */
</ins><span class="cx"> function bp_dtheme_ajax_messages_autocomplete_results() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Include everyone in the autocomplete, or just friends?
+ if ( $bp->messages->slug == $bp->current_component )
+ $autocomplete_all = $bp->messages->autocomplete_all;
+
</ins><span class="cx"> $friends = false;
</span><span class="cx">
</span><del>- // 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 );
</del><ins>+ $limit = $_GET['limit'] ? $_GET['limit'] : apply_filters( 'bp_autocomplete_max_results', 10 );
</ins><span class="cx">
</span><del>- $friends = apply_filters( 'bp_friends_autocomplete_list', $friends, $_GET['q'], $_GET['limit'] );
</del><ins>+ // 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 );
+ }
+ }
+
</ins><span class="cx">
</span><del>- if ( $friends['friends'] ) {
- foreach ( (array)$friends['friends'] as $user_id ) {
</del><ins>+ if ( $user_ids ) {
+ foreach ( $user_ids as $user_id ) {
</ins><span class="cx"> $ud = get_userdata($user_id);
</span><span class="cx"> $username = $ud->user_login;
</span><span class="cx"> echo bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15 ) ) . ' &nbsp;' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')
</span></span></pre>
</div>
</div>
</body>
</html>