Changeset 16166

Timestamp:

11/03/2010 06:28:02 PM (16 years ago)

Author:

ryan

Message:

Drop Sites search action dropdown. Determine the search action from the search string. see #15170

Location:

trunk/wp-admin

Files:

• includes/class-wp-ms-sites-list-table.php (modified) (1 diff)
• network/sites.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -46 +46 @@
                 $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
 
-                if ( isset( $_REQUEST['searchaction'] ) ) {
-                        if ( 'name' == $_REQUEST['searchaction'] ) {
-                                if ( is_subdomain_install() ) {
-                                        $like_s = str_replace( '.' . $current_site->domain, '', $like_s );
-                                        $like_s .= '.' . $current_site->domain;
-                                        $query .= " AND {$wpdb->blogs}.domain LIKE '$like_s' ";
-                                } else {
-                                        if ( $like_s != trim('/', $current_site->path) )
-                                                $like_s = $current_site->path .= $like_s . '/';
-                                        $query .= " AND {$wpdb->blogs}.path LIKE '$like_s' ";
-                                }
-                        } elseif ( 'id' == $_REQUEST['searchaction'] ) {
-                                $query .= " AND {$wpdb->blogs}.blog_id = '{$like_s}' ";
-                        } elseif ( 'ip' == $_REQUEST['searchaction'] ) {
-                                $query = "SELECT *
-                                        FROM {$wpdb->blogs}, {$wpdb->registration_log}
-                                        WHERE site_id = '{$wpdb->siteid}'
-                                        AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
-                                        AND {$wpdb->registration_log}.IP LIKE ( '%{$like_s}%' )";
+                if ( empty($s) ) {
+                        // Nothing to do.
+                } elseif ( false !== strpos($s, '.') ) {
+                        // IP address
+                        $query = "SELECT *
+                                FROM {$wpdb->blogs}, {$wpdb->registration_log}
+                                WHERE site_id = '{$wpdb->siteid}'
+                                AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
+                                AND {$wpdb->registration_log}.IP LIKE ( '{$like_s}%' )";
+                } else {
+                        if ( is_subdomain_install() ) {
+                                $blog_s = str_replace( '.' . $current_site->domain, '', $like_s );
+                                $blog_s .= '.' . $current_site->domain;
+                                $query .= " AND ( {$wpdb->blogs}.domain LIKE '$blog_s' ";
+                        } else {
+                                if ( $like_s != trim('/', $current_site->path) )
+                                        $blog_s = $current_site->path .= $like_s . '/';
+                                else
+                                        $blog_s = $like_s;
+                                $query .= " AND  ( {$wpdb->blogs}.path LIKE '$blog_s' ";
                         }
+
+                        if ( is_numeric($s) )
+                                $query .= " OR {$wpdb->blogs}.blog_id = '{$like_s}' ";
+
+                        $query .= ' )';
                 }
 

trunk/wp-admin/network/sites.php

@@ -100 +100 @@
 <input type="hidden" name="action" value="blogs" />
 <input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" />
-<?php submit_button( __( 'Search Site by' ), 'button', 'submit', false ); ?>
-<select name="searchaction">
-        <option value="name" selected="selected"><?php _e( 'Name' ); ?></option>
-        <option value="id"><?php _e( 'ID' ); ?></option>
-        <option value="ip"><?php _e( 'IP address' ); ?></option>
-</select>
+<?php submit_button( __( 'Search Sites' ), 'button', 'submit', false ); ?>
 </p>
 </form>