Changeset 3846

Timestamp:

06/05/06 16:52:21 (3 years ago)

Author:

ryan

Message:

Add more fine grained user management caps. Part 1. #2775

Files:

• trunk/wp-admin/admin-functions.php (modified) (1 diff)
• trunk/wp-admin/upgrade-functions.php (modified) (2 diffs)
• trunk/wp-admin/upgrade-schema.php (modified) (1 diff)
• trunk/wp-admin/user-edit.php (modified) (2 diffs)
• trunk/wp-admin/users.php (modified) (5 diffs)
• trunk/wp-includes/capabilities.php (modified) (1 diff)
• trunk/wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -739 +739 @@
-    $r .= "\n\t\t<td align='center'>$numposts</td>";
-    $r .= "\n\t\t<td>";
-current_user_can('edit_users')
+ current_user_can('edit_user', $user_object->ID) 
-        $r .= "<a href='user-edit.php?user_id=$user_object->ID' class='edit'>".__('Edit')."</a>";
-    $r .= "</td>\n\t</tr>";

trunk/wp-admin/upgrade-functions.php

@@ -174 +174 @@
-        upgrade_160();
-
-767
+845
-        upgrade_210();
-
@@ -493 +493 @@
-    }
-
-767
+845
-        populate_roles_210();
-    }

trunk/wp-admin/upgrade-schema.php

@@ -365 +365 @@
-    }
-
+    $role = get_role('administrator');
+    if ( ! empty($role) ) {
+        $role->add_cap('delete_users');
+        $role->add_cap('create_users');
+    }
+
-    $role = get_role('author');
-    if ( ! empty($role) ) {

trunk/wp-admin/user-edit.php

@@ -35 +35 @@
-check_admin_referer('update-user_' . $user_id);
-
-!current_user_can('edit_users')
+ !current_user_can('edit_user', $user_id) 
-    $errors = new WP_Error('head', __('You do not have permission to edit this user.'));
-else
@@ -50 +50 @@
-$profileuser = new WP_User($user_id);
-
-!current_user_can('edit_users')
+ !current_user_can('edit_user', $user_id) 
-    if ( !is_wp_error( $errors ) )
-        $errors = new WP_Error('head', __('You do not have permission to edit this user.'));

trunk/wp-admin/users.php

@@ -24 +24 @@
-    $update = 'promote';
-    foreach($userids as $id) {
+        if ( ! current_user_can('edit_user', $id) )
+            die(__('You can’t edit that user.'));
-        // The new role of the current user must also have edit_users caps
-        if($id == $current_user->id && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
@@ -46 +48 @@
-    }
-
-edit
+delete
-        die(__('You can’t delete users.'));
-
@@ -53 +55 @@
-    $update = 'del';
-    foreach ($userids as $id) {
+        if ( ! current_user_can('delete_user', $id) )
+            die(__('You can’t delete that user.'));
+ 
-        if($id == $current_user->id) {
-            $update = 'err_admin_del';
@@ -79 +84 @@
-    }
-
-edit
+delete
-        $error = new WP_Error('edit_users', __('You can’t delete users.'));
-
@@ -135 +140 @@
-    check_admin_referer('add-user');
-
+    if ( ! current_user_can('create_users') )
+        die(__('You can’t create users.'));
+
-    $user_id = add_user();
-    if ( is_wp_error( $user_id ) )

trunk/wp-includes/capabilities.php

@@ -273 +273 @@
-
-    switch ($cap) {
+    case 'delete_user':
+        $caps[] = 'delete_users';
+        break;
+    case 'edit_user':
+        $caps[] = 'edit_users';
+        break;
-    case 'delete_post':
-        $author_data = get_userdata($user_id);

trunk/wp-includes/version.php

@@ -3 +3 @@
-// This just holds the version number, in a separate file so we can bump it without cluttering the SVN
-
-1
-09
+2
+45
-
-?>