Changeset 8473

Timestamp:

03/17/2019 12:17:02 AM (11 months ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: Upload: Block plugin submissions if there are approved plugins that have not yet been used.

Props Ipstenu.
Fixes #4294.

File:

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

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

@@ -12 +12 @@
         $plugins = get_posts( array(
             'post_type'      => 'plugin',
-            'post_status'    => array( 'new', 'pending' ),
+            'post_status'    => array( 'new', 'pending', 'approved' ),
             'author'         => get_current_user_id(),
             'orderby'        => 'title',
@@ -32 +32 @@
 
             $submitted_plugins = self::get_submitted_plugins();
-            $submitted_counts  = (object) array_fill_keys( array( 'new', 'pending' ), 0 );
+            $submitted_counts  = (object) array_fill_keys( array( 'new', 'pending', 'approved' ), 0 );
 
             $submitted_counts->total = count( $submitted_plugins );
@@ -43 +43 @@
                     $submitted_plugins[ $key ]->status = __( 'Being Reviewed', 'wporg-plugins' );
                     $submitted_counts->pending++;
+                } elseif ( 'approved' === $plugin->post_status ) {
+                    $submitted_plugins[ $key ]->status = __( 'Approved', 'wporg-plugins' );
+                    $submitted_counts->approved++;
                 }
             }
@@ -101 +104 @@
                         <p>
                         <?php
-                        if ( 1 === $submitted_counts->total ) {
-                            esc_html_e( 'You already have a plugin in the review queue. Please wait for it to be approved before submitting any more.', 'wporg-plugins' );
-                        } else {
-                            printf(
-                                /* translators: 1: Total amount of plugins; 2: Amount of pending plugins. */
+                        if ( 0 !== $submitted_counts->approved ) {
+                            printf(
+                                /* translators: 1: Amount of approved plugins; 2: URL on how to use SVN */
                                 esc_html( _n(
-                                    'You have %1$s plugins in the review queue, %2$s is being actively reviewed. Please wait for them to be approved before submitting any more.',
-                                    'You have %1$s plugins in the review queue, %2$s are being actively reviewed. Please wait for them to be approved before submitting any more.',
+                                    'You have %1$s approved plugin that has not yet been used. We require developers to use the hosting we provide. Please upload your plugin via <a href="%2$s">SVN</a>.',
+                                    'You have %1$s approved plugins that have not yet been used. We require developers to use the hosting we provide. Please upload your plugins via <a href="%2$s">SVN</a>.',
+                                    $submitted_counts->approved,
+                                    'wporg-plugins'
+                                ) ),
+                                '<strong>' . $submitted_counts->approved . '</strong>',
+                                'https://developer.wordpress.org/plugins/wordpress-org/how-to-use-subversion/'
+                            );
+                        } elseif ( 0 !== $submitted_counts->pending ) {
+                            printf(
+                                /* translators: %s: Amount of pending plugins. */
+                                esc_html( _n(
+                                    'You have %s plugin being actively reviewed. You must complete this review before you can submit another plugin.',
+                                    'You have %s plugins being actively reviewed. You must complete their reviews before you can submit another plugin.',
                                     $submitted_counts->pending,
                                     'wporg-plugins'
                                 ) ),
-                                '<strong>' . $submitted_counts->total . '</strong>',
                                 '<strong>' . $submitted_counts->pending . '</strong>'
+                            );
+                        } elseif ( 0 !== $submitted_counts->new ) {
+                            printf(
+                                /* translators: %s: Amount of new plugins. */
+                                esc_html( _n(
+                                    'You have %s plugin that has been recently submitted but not yet reviewed. Please wait for your plugin to be reviewed and approved before submitting another.',
+                                    'You have %s plugins already submitted but not yet reviewed. Please wait for them to be reviewed and approved before submitting another plugin.',
+                                    $submitted_counts->new,
+                                    'wporg-plugins'
+                                ) ),
+                                '<strong>' . $submitted_counts->new . '</strong>'
                             );
                         }
@@ -121 +144 @@
                         <ul>
                         <?php
+                        // List of all plugins in progress.
                         foreach ( $submitted_plugins as $plugin ) {
                             echo '<li>' . esc_html( $plugin->post_title ) . ' &#8212; ' . $plugin->status . "</li>\n";
@@ -196 +220 @@
                 }
                 ?>
-        
+
             <?php endif; // ! $submitted_counts->total ?>