Changeset 6875 for trunk/wp-admin/includes/user.php

Timestamp:

02/16/2008 09:44:50 PM (19 years ago)

Author:

ryan

Message:

users.php redesign. WIP

File:

• trunk/wp-admin/includes/user.php (modified) (5 diffs)

trunk/wp-admin/includes/user.php

@@ -290 +290 @@
         var $search_term;
         var $page;
+        var $role;
         var $raw_page;
         var $users_per_page = 50;
@@ -300 +301 @@
         var $search_errors;
 
-        function WP_User_Search ($search_term = '', $page = '') { // constructor
+        function WP_User_Search ($search_term = '', $page = '', $role = '') { // constructor
                 $this->search_term = $search_term;
                 $this->raw_page = ( '' == $page ) ? false : (int) $page;
                 $this->page = (int) ( '' == $page ) ? 1 : $page;
+                $this->role = $role;
 
                 $this->prepare_query();
@@ -315 +317 @@
                 $this->first_user = ($this->page - 1) * $this->users_per_page;
                 $this->query_limit = 'LIMIT ' . $this->first_user . ',' . $this->users_per_page;
+                $search_sql = '';
                 if ( $this->search_term ) {
                         $searches = array();
@@ -323 +326 @@
                         $search_sql .= ')';
                 }
-                $this->query_from_where = "FROM $wpdb->users WHERE 1=1 $search_sql";
+                
+                $this->query_from_where = "FROM $wpdb->users";
+                if ( $this->role )
+                        $this->query_from_where .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id WHERE $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE '%$this->role%'";
+                else
+                        $this->query_from_where .= " WHERE 1=1";
+                $this->query_from_where .= " $search_sql";
 
         }
@@ -346 +355 @@
                                 'total' => ceil($this->total_users_for_query / $this->users_per_page),
                                 'current' => $this->page,
-                                'prev_text' => __('« Previous Page'),
-                                'next_text' => __('Next Page »'),
                                 'base' => 'users.php?%_%',
                                 'format' => 'userspage=%#%',