Changeset 20279

Timestamp:

03/24/2012 04:54:58 AM (14 years ago)

Author:

markjaquith

Message:

Autocomplete site names in Network Admin. More user completion areas. props Japh, DrewAPicture. see #19810.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/css/wp-admin.dev.css (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (3 diffs)
• wp-admin/includes/dashboard.php (modified) (3 diffs)
• wp-admin/index.php (modified) (1 diff)
• wp-admin/js/site-search.dev.js (added)
• wp-admin/js/site-search.js (added)
• wp-admin/js/user-search.dev.js (modified) (1 diff)
• wp-admin/js/user-search.js (modified) (1 diff)
• wp-admin/network/site-users.php (modified) (1 diff)
• wp-admin/network/sites.php (modified) (1 diff)
• wp-admin/network/users.php (modified) (2 diffs)
• wp-admin/users.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -37 +37 @@
 $core_actions_get = array(
         'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
-        'autocomplete-user', 'dashboard-widgets',
+        'autocomplete-user', 'autocomplete-site', 'dashboard-widgets',
 );
 

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

@@ -901 +901 @@
 .ui-autocomplete li a.ui-state-hover {
         background-color: #f0f0b8;
+        cursor: pointer;
 }
 

trunk/wp-admin/includes/ajax-actions.php

@@ -161 +161 @@
         $return = array();
 
+        // Check the type of request
+        if ( isset( $_REQUEST['autocomplete_type'] ) )
+                $type = $_REQUEST['autocomplete_type'];
+        else
+                $type = 'add';
+
         // Exclude current users of this blog
         if ( isset( $_REQUEST['site_id'] ) )
@@ -167 +173 @@
                 $id = get_current_blog_id();
 
-        $this_blog_users = get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) );
+        $include_blog_users = ( $type == 'search' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
+        $exclude_blog_users = ( $type == 'add' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
 
         $users = get_users( array(
                 'blog_id' => false,
                 'search'  => '*' . $_REQUEST['term'] . '*',
-                'exclude' => $this_blog_users,
+                'include' => $include_blog_users,
+                'exclude' => $exclude_blog_users,
                 'search_columns' => array( 'user_login', 'user_nicename', 'user_email' ),
         ) );
@@ -205 +213 @@
         }
         wp_die();
+}
+
+function wp_ajax_autocomplete_site() {
+        if ( ! is_multisite()
+                || ! current_user_can( 'manage_sites' )
+                || wp_is_large_network( 'sites' )
+                || ! is_super_admin()
+        ) {
+                wp_die( -1 );
+        }
+
+        $return = array();
+
+        global $wpdb;
+        $like_escaped_term = '%' . like_escape( stripslashes( $_REQUEST['term'] ) ) . '%';
+        $sites = $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE ( domain LIKE %s OR path LIKE %s ) AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $like_escaped_term, $like_escaped_term ), ARRAY_A );
+
+        if ( empty( $sites ) )
+                wp_die( -1 );
+
+        foreach ( (array) $sites as $details ) {
+                $blogname = get_blog_option( $details['blog_id'], 'blogname' );
+                $return[] = array(
+                        'label' => sprintf( '%1$s (%2$s)', $blogname, $details['domain'] . $details['path'] ),
+                        'value' => $details['domain']
+                );
+        }
+
+        wp_die( json_encode( $return ) );
 }
 

trunk/wp-admin/includes/dashboard.php

@@ -417 +417 @@
                 $actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
 
+        if ( is_multisite()
+                && current_user_can( 'promote_users' )
+                && ! wp_is_large_network( 'users' )
+                && is_super_admin()
+                && is_network_admin()
+        ) {
+                wp_enqueue_script( 'user-search' );
+        }
+        if ( is_multisite()
+                && current_user_can( 'manage_sites' )
+                && ! wp_is_large_network( 'sites' )
+                && is_super_admin()
+                && is_network_admin()
+        ) {
+                wp_enqueue_script( 'site-search' );
+        }
+
         $c_users = get_user_count();
         $c_blogs = get_blog_count();
@@ -441 +458 @@
         <form name="searchform" action="<?php echo network_admin_url('users.php'); ?>" method="get">
                 <p>
-                        <input type="search" name="s" value="" size="17" />
+                        <input type="search" name="s" value="" size="17" id="all-user-search-input" />
                         <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
                 </p>
@@ -448 +465 @@
         <form name="searchform" action="<?php echo network_admin_url('sites.php'); ?>" method="get">
                 <p>
-                        <input type="search" name="s" value="" size="17" />
+                        <input type="search" name="s" value="" size="17" id="site-search-input" />
                         <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
                 </p>

trunk/wp-admin/index.php

@@ -89 +89 @@
         '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
 );
-
+        
 include (ABSPATH . 'wp-admin/admin-header.php');
 

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

@@ -3 +3 @@
 
         $( '#adduser-email, #newuser' ).autocomplete({
-                source:   ajaxurl + '?action=autocomplete-user' + id,
+                source:   ajaxurl + '?action=autocomplete-user&autocomplete_type=add' + id,
+                delay:    500,
+                minLength: 2
+        });
+
+        $( '#user-search-input' ).autocomplete({
+                source:   ajaxurl + '?action=autocomplete-user&autocomplete_type=search' + id,
+                delay:    500,
+                minLength: 2
+        });
+
+        $( '#all-user-search-input' ).autocomplete({
+                source:   ajaxurl + '?action=autocomplete-user&autocomplete_type=search-all' + id,
                 delay:    500,
                 minLength: 2

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

@@ -1 @@
-jQuery(function(a){var b=typeof(current_site_id)!="undefined"?"&site_id="+current_site_id:"";a("#adduser-email, #newuser").autocomplete({source:ajaxurl+"?action=autocomplete-user"+b,delay:500,minLength:2})});
+jQuery(function($){var id=typeof(current_site_id)!="undefined"?"&site_id="+current_site_id:"";$("#adduser-email, #newuser").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=add"+id,delay:500,minLength:2});$("#user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search"+id,delay:500,minLength:2});$("#all-user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search-all"+id,delay:500,minLength:2})});

trunk/wp-admin/network/site-users.php

@@ -172 +172 @@
 $submenu_file = 'sites.php';
 
-if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) && !wp_is_large_network( 'users' ) )
+if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) )
         wp_enqueue_script( 'user-search' );
 

trunk/wp-admin/network/sites.php

@@ -283 +283 @@
 $wp_list_table->prepare_items();
 
+if ( ! wp_is_large_network( 'sites' ) )
+        wp_enqueue_script( 'site-search' );
+
 require_once( '../admin-header.php' );
 ?>

trunk/wp-admin/network/users.php

@@ -246 +246 @@
 );
 
+if ( is_multisite()
+        && current_user_can( 'promote_users' )
+        && ! wp_is_large_network( 'users' )
+        && is_super_admin()
+) {
+        wp_enqueue_script( 'user-search' );
+}
+
 require_once( '../admin-header.php' );
 
@@ -289 +297 @@
 
         <form action="" method="get" class="search-form">
-                <?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
+                <?php $wp_list_table->search_box( __( 'Search Users' ), 'all-user' ); ?>
         </form>
 

trunk/wp-admin/users.php

@@ -339 +339 @@
                 exit;
         }
+
+        if ( is_multisite()
+                && current_user_can( 'promote_users' )
+                && ! wp_is_large_network( 'users' )
+                && ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
+        ) {
+                wp_enqueue_script( 'user-search' );
+        }
+
         include('./admin-header.php');
 

trunk/wp-includes/script-loader.php

@@ -269 +269 @@
         $scripts->add( 'user-search', "/wp-admin/js/user-search$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
 
+        $scripts->add( 'site-search', "/wp-admin/js/site-search$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
+
         $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );