Changeset 2830

Timestamp:

03/28/2016 07:06:41 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Capability improvements.

• Fill built-in roles with custom caps.
• Let Plugin Reviewers be able to manage their own plugins like regular authors.

See #1570, #1571.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php

@@ -9 +9 @@
 class Capabilities {
 
+    /**
+     * Filters a user's capabilities depending on specific context and/or privilege.
+     *
+     * @param array  $required_caps Returns the user's actual capabilities.
+     * @param string $cap           Capability name.
+     * @param int    $user_id       The user ID.
+     * @param array  $context       Adds the context to the cap. Typically the object ID.
+     */
     public static function map_meta_cap( $required_caps, $cap, $user_id, $context ) {
         switch( $cap ) {
 
+            case 'plugin_edit':
             case 'plugin_add_committer':
             case 'plugin_remove_committer':
-            case 'plugin_edit':
                 $required_caps = array();
-                $post = self::get_post_from_context( $context );
-                if ( ! $post ) {
+                $post = get_post( $context[0] );
+                if ( ! $post instanceof \WP_Post ) {
                     $required_caps[] = 'do_not_allow';
                     break;
                 }
 
-                $user = new \WP_User( $user_id );
+                $user       = new \WP_User( $user_id );
                 $committers = Tools::get_plugin_committers( $post->post_name );
 
-                if ( $post->post_author === $user_id ) {
+                if ( $post->post_author === $user_id || in_array( $user->user_login, $committers, true ) ) {
                     $required_caps[] = 'plugin_edit_own';
-                } elseif ( in_array( $user->user_login, $committers, true ) ) {
-                    $required_caps[] = 'plugin_edit_own';
+
                 } else {
                     if ( 'pending' == $post->post_status ) {
                         $required_caps[] = 'plugin_edit_pending';
+
                     } else {
                         $required_caps[] = 'plugin_edit_others';
@@ -38 +46 @@
                 break;
 
-            // Don't allow any users to alter the post meta for plugins
+            // Don't allow any users to alter the post meta for plugins.
             case 'add_post_meta':
             case 'edit_post_meta':
@@ -45 +53 @@
                 if ( $post && 'plugin' == $post->post_type ) {
                     $required_caps[] = 'do_not_allow';
-                    break;
                 }
                 break;
@@ -63 +70 @@
     }
 
-    protected static function get_post_from_context( $context ) {
-        if ( ! $context ) {
-            return false;
-        }
-        $context = $context[0];
-
-        $post = false;
-        if ( is_int( $context ) ) {
-            $post = get_post( $context );
-        } elseif ( $context instanceof \WP_Post ) {
-            $post = $context;
-        } elseif ( is_string( $context ) ) {
-            $post = Plugin_Directory::get_plugin_post( $context );
-        }
-        if ( ! $post || 'plugin' != $post->post_type ) {
-            return false;
-        }
-        return $post;
-    }
-
     public static function add_roles() {
         $committer = array(
@@ -92 +79 @@
         );
 
-        $reviewer = array(
-            'read' => true,
-            'plugin_dashboard_access' => true,
+        $reviewer = array_merge( $committer, array(
             'plugin_edit_pending' => true,
             'plugin_approve' => true,
             'plugin_reject' => true,
-        );
+        ) );
 
         $admin = array_merge( $reviewer, array(
@@ -115 +100 @@
         add_role( 'plugin_reviewer',  'Plugin Reviewer',  $reviewer );
         add_role( 'plugin_admin',     'Plugin Admin',     $admin );
+
+        foreach( array( 'contributor', 'author', 'editor', 'administrator' ) as $role ) {
+            $wp_role = get_role( $role );
+
+            foreach ( $committer as $committer_cap ) {
+                $wp_role->add_cap( $committer_cap );
+            }
+
+            if ( in_array( $role, array( 'editor', 'administrator' ) ) ) {
+                foreach ( $admin as $admin_cap ) {
+                    $wp_role->add_cap( $admin_cap );
+                }
+            }
+        }
     }
 }