Ticket #19810: 19810.7.patch

wp-includes/user.php

@@ -378 +378 @@
                                 'include' => array(),
                                 'exclude' => array(),
                                 'search' => '',
+                                'search_columns' => array(),
                                 'orderby' => 'login',
                                 'order' => 'ASC',
                                 'offset' => '',
@@ -476 +477 @@
                         if ( $wild )
                                 $search = trim($search, '*');
 
-                        if ( false !== strpos( $search, '@') )
-                                $search_columns = array('user_email');
-                        elseif ( is_numeric($search) )
-                                $search_columns = array('user_login', 'ID');
-                        elseif ( preg_match('|^https?://|', $search) )
-                                $search_columns = array('user_url');
-                        else
-                                $search_columns = array('user_login', 'user_nicename');
+                        $search_columns = array();
+                        if ( $qv['search_columns'] )
+                                $search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
+                        if ( ! $search_columns ) {
+                                if ( false !== strpos( $search, '@') )
+                                        $search_columns = array('user_email');
+                                elseif ( is_numeric($search) )
+                                        $search_columns = array('user_login', 'ID');
+                                elseif ( preg_match('|^https?://|', $search) )
+                                        $search_columns = array('user_url');
+                                else
+                                        $search_columns = array('user_login', 'user_nicename');
+                        }
 
                         $this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
                 }

wp-includes/script-loader.php

@@ -260 +260 @@
 
         $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 );
 
+        $scripts->add( 'user-search', "/wp-admin/js/user-search$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
+
         $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
 
         $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), false, 1 );

wp-admin/admin-ajax.php

@@ -34 +34 @@
 
 do_action( 'admin_init' );
 
-$core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'compression-test', 'imgedit-preview', 'oembed_cache' );
+$core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'compression-test', 'imgedit-preview', 'oembed_cache', 'autocomplete-user' );
 
 $core_actions_post = array(
         'oembed_cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',

wp-admin/includes/ajax-actions.php

@@ -146 +146 @@
         wp_die( $return );
 }
 
+function wp_ajax_autocomplete_user() {
+        if ( !current_user_can( 'promote_users' ) )
+                wp_die( -1 );
+//      if ( wp_is_large_network('users') )
+//              wp_die( -1 );
+        
+        $return = array();
+
+        // Exclude current users of this blog
+        if ( !is_network_admin() ) {
+                $this_blog_users = get_users( array( 'blog_id' => get_current_blog_id(), 'fields' => 'ID' ) );
+        } else {
+                global $id;
+                $this_blog_users = get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) );
+        }
+
+        $users = get_users( array(
+                'blog_id' => false,
+                'search'  => '*' . $_REQUEST['term'] . '*',
+                'exclude' => $this_blog_users,
+                'search_columns' => array( 'user_login', 'user_nicename', 'user_email' ),
+        ) );    
+
+        foreach ( $users as $user ) {
+                $return[] = array(
+                        /* translators: 1: user_login, 2: user_email */
+                        'label' => sprintf( __( '%1$s (%2$s)' ), $user->user_login, $user->user_email ),
+                        'value' => $user->user_login,
+                );
+        }
+
+        wp_die( json_encode( $return ) );
+}
+
 /*
  * Ajax helper.
  */

wp-admin/js/user-search.dev.js

@@ +1 @@
+(function($){   
+
+        $(document).ready(function() {
+
+                var ainput = $('#adduser-email, #newuser');
+                                
+                var options = {
+                        source: ajaxurl + '?action=autocomplete-user',
+                        appendTo: 'form#adduser',
+                        select: function( event, ui ){ $(ainput).val( ui.item.value ); },
+                        delay: 500, // milliseconds
+                        minLength: 2, // Don't want to match a crazy number of items.
+                };
+
+                a = $(ainput).autocomplete(options);
+        });
+
+})(jQuery);

wp-admin/user-new.php

@@ -178 +178 @@
 
 wp_enqueue_script('wp-ajax-response');
 wp_enqueue_script('user-profile');
+if ( is_multisite() && is_super_admin() )
+        wp_enqueue_script('user-search');
 
 require_once ('admin-header.php');
 

wp-admin/network/site-users.php

@@ -171 +171 @@
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 
+wp_enqueue_script('user-search');
+
 require('../admin-header.php'); ?>
 
 <div class="wrap">

wp-admin/css/wp-admin.dev.css

@@ -892 +892 @@
         margin: 0;
 }
 
+#wpcontent input[type="text"].ui-autocomplete-loading {
+        background: transparent url('../images/loading.gif') no-repeat right center;
+        visibility: visible;
+}
 
+ul#add-to-blog-users {
+        margin: 0 0 0 14px;
+}
+
+form#adduser ul.ui-autocomplete {
+        padding: 0;
+        margin: 0;
+        list-style: none;
+        position: absolute;
+        z-index: 10000;
+        border-width: 1px;
+        border-style: solid;
+
+        background-color: #ffffff;
+        border-color: gray;
+}
+
+form#adduser .ui-widget-content { 
+        background: #ececec;
+}
+
+form#adduser .ui-widget-content li { 
+        padding: 2px 5px;
+        white-space: nowrap;
+        text-align: left;
+        color: #101010;
+}
+
+form#adduser .ui-widget-content li a {
+        display: block;
+        height: 100%;
+        padding: 2px 5px;
+        color: #333;
+}
+
+form#adduser .ui-widget-content li a.ui-state-hover {
+        background-color: #f0f0b8;
+}
+
+form#adduser a.remove {
+        margin: 6px 0pt 0pt -12px;
+        cursor: pointer;
+        width: 10px;
+        height: 10px;
+        display: block;
+        float: left;
+        text-indent: -9999px;
+        overflow: hidden;
+        position: absolute;
+        background: transparent url(../images/xit.gif) no-repeat;
+}
+
+form#adduser a.remove:hover {
+        background: transparent url(../images/xit.gif) no-repeat -10px 0;
+}
+
+
 /*------------------------------------------------------------------------------
   3.0 - Actions
 ------------------------------------------------------------------------------*/