Changeset 2995

Timestamp:

11/06/2005 03:58:52 AM (19 years ago)

Author:

ryan

Message:

Show Role in profile and user edit. Don't allow users with edit_users caps to demote themselves. Props: davidhouse, ringmaster. fixes #1825

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (2 diffs)
• wp-admin/profile.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/registration-functions.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -257 +257 @@
 
 function edit_user($user_id = 0) {
+    global $current_user, $wp_roles;
 
     if ($user_id != 0) {
@@ -277 +278 @@
         $pass2 = $_POST['pass2'];
 
+    if (isset ($_POST['role'])) {
+        if($user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap('edit_users'))
+            $user->role = $_POST['role'];
+    }
+
+    if (isset ($_POST['role'])) {
+        $user->role = $_POST['role'];
+    }
     if (isset ($_POST['email']))
         $user->user_email = wp_specialchars(trim($_POST['email']));

trunk/wp-admin/profile.php

@@ -31 +31 @@
 <input type="text" name="user_login" value="<?php echo $profiledata->user_login; ?>" disabled="disabled" />
 </label></p>
+
+<p><label><?php _e('Role: (no editing)') ?><br />
+<input type="text" name="role" value="<?php echo $wp_roles->role_names[$profileuser->roles[0]] ?>" disabled="disabled" /></label></p>
+
 <p><label><?php _e('First name:') ?><br />
 <input type="text" name="first_name" value="<?php echo $profiledata->first_name ?>" /></label></p>

trunk/wp-admin/user-edit.php

@@ -83 +83 @@
 <input type="text" name="user_login" value="<?php echo $profiledata->user_login; ?>" disabled="disabled" />
 </label></p>
+
+<p><label><?php _e('Role:') ?><br />
+<?php
+// print_r($profileuser);
+echo '<select name="role">';
+foreach($wp_roles->role_names as $role => $name) {
+    $selected = ($profileuser->roles[0] == $role) ? ' selected="selected"' : '';
+    echo "<option value=\"{$role}\"{$selected}>{$name}</option>";
+}
+echo '</select>';
+?></label></p>
+
 <p><label><?php _e('First name:') ?><br />
 <input type="text" name="first_name" value="<?php echo $profiledata->first_name ?>" /></label></p>

trunk/wp-includes/registration-functions.php

@@ -60 +60 @@
     update_usermeta( $user_id, 'aim', $aim );
     update_usermeta( $user_id, 'yim', $yim );
-    
+
+    if ($update && !empty($role)) {
+        $user = new WP_User($user_id);
+        $user->set_role($role);
+    }
+
     if ( !$update ) {
         $user = new WP_User($user_id);