Changeset 2777 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-committers.php

Timestamp:

03/22/2016 06:21:26 AM (9 years ago)

Author:

dd32

Message:

Plugin Directory: Introduce the Plugin Committer/Review & Admin roles. Use the capabilities throughout the core flows of the admin.
This also has a few hacks to make plugin committers/authors only see plugins which they can manage, although a few core bugs remain which cause non-owner committers not to be able to edit plugins properly.

See #1571

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-committers.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-committers.php

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\Admin\Metabox;
 use WordPressdotorg\Plugin_Directory\Admin\List_Table;
+use WordPressdotorg\Plugin_Directory\Tools;
 
 /**
@@ -35 +36 @@
      */
     public static function add_committer() {
+        $login    = isset( $_POST['add_committer'] ) ? sanitize_user( $_POST['add_committer'] ) : '';
+        $post_id  = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
+
         check_ajax_referer( 'add-committer' );
 
-        $login    = isset( $_POST['add_committer'] ) ? sanitize_user( $_POST['add_committer'] ) : '';
-        $post_id  = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
-        $response = new \WP_Ajax_Response();
+        $response    = new \WP_Ajax_Response();
+        $plugin_slug = get_post( $post_id )->post_name;
 
         if ( ! $committer = get_user_by( 'login', $login ) ) {
@@ -49 +52 @@
         }
 
-        // @todo: Capabilities.
-        if ( ! current_user_can( 'add_committers', $post_id ) ) {
-            //  wp_die( -1 );
+        if ( ! current_user_can( 'plugin_add_committer', $post_id ) ) {
+                wp_die( -1 );
         }
-        global $post, $wpdb;
 
-        $post   = get_post( $post_id );
-        $result = $wpdb->insert( PLUGINS_TABLE_PREFIX . 'svn_access', array(
-            'path'   => "/{$post->post_name}",
-            'user'   => $login,
-            'access' => 'rw',
-        ) );
+        $result = Tools::grant_plugin_committer( $plugin_slug, $committer );
+
         if ( ! $result ) {
-            if ( 'Duplicate entry' === substr( $wpdb->last_error, 0, 15 ) ) {
-                $message = __( 'Duplicate committer detected.', 'wporg-plugins' );
-            } else {
-                $message = __( 'An error has occurred. Please reload the page and try again.', 'wporg-plugins' );
-            }
+            $message = __( 'An error has occurred. Please reload the page and try again.', 'wporg-plugins' );
 
             $response->add( array(
@@ -95 +88 @@
         check_ajax_referer( "remove-committer-$id" );
 
-        $response = new \WP_Ajax_Response();
+        $response    = new \WP_Ajax_Response();
+        $plugin_slug = get_post( $post_id )->post_name;
 
         if ( ! $committer = get_user_by( 'id', $id ) ) {
@@ -105 +99 @@
         }
 
-        // @todo: Capabilities.
-        if ( ! current_user_can( 'remove_committers', $post_id ) ) {
-            //  wp_die( -1 );
+        if ( ! current_user_can( 'plugin_remove_committer', $post_id ) ) {
+                wp_die( -1 );
         }
 
-        $plugin_slug = get_post( $post_id )->post_name;
-
-        $result = $GLOBALS['wpdb']->delete( PLUGINS_TABLE_PREFIX . 'svn_access', array(
-            'path' => "/{$plugin_slug}",
-            'user' => $committer->user_login,
-        ) );
+        $result = Tools::revoke_plugin_committer( $plugin_slug, $committer );
 
         wp_die( $result );