Changeset 6045

Timestamp:

10/19/2017 12:06:14 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: Remove the upload form after a successful upload.

Make Upload_Handler::process_upload() return WP_Error on failure.

Fixes #2386.

Location:

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

Files:

• class-upload-handler.php (modified) (12 diffs)
• class-upload.php (modified) (2 diffs)

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

@@ -55 +55 @@
      * Runs various tests and creates plugin post.
      *
-     * @return string Failure or success message.
+     * @return string|WP_Error Confirmation message on success, WP_Error object on failure.
      */
     public function process_upload() {
@@ -76 +76 @@
             $error = __( 'Error: The plugin has no name.', 'wporg-plugins' );
 
-            /* translators: 1: plugin header line, 2: Codex URL */
-            return $error . ' ' . sprintf( __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
+            return new \WP_Error( 'no_name', $error . ' ' . sprintf(
+                /* translators: 1: plugin header line, 2: Codex URL */
+                __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
                 '<code>Plugin Name:</code>',
                 __( 'https://codex.wordpress.org/File_Header', 'wporg-plugins' )
-            );
+            ) );
         }
 
@@ -92 +93 @@
             $error = __( 'Error: The plugin has an unsupported name.', 'wporg-plugins' );
 
-            /* translators: %s: 'Plugin Name:' */
-            return $error . ' ' . sprintf( __( 'Plugin names can only contain latin letters (A-z), numbers, spaces, and hyphens. Please change the %s line in your main plugin file and upload it again.', 'wporg-plugins' ),
+            return new \WP_Error( 'unsupported_name', $error . ' ' . sprintf(
+                /* translators: %s: 'Plugin Name:' */
+                __( 'Plugin names can only contain latin letters (A-z), numbers, spaces, and hyphens. Please change the %s line in your main plugin file and upload it again.', 'wporg-plugins' ),
                 esc_html( $this->plugin['Name'] ),
                 '<code>Plugin Name:</code>'
-            );
+            ) );
         }
 
@@ -103 +105 @@
             $error = __( 'Error: The plugin has a reserved name.', 'wporg-plugins' );
             
-            /* translators: 1: plugin slug, 2: 'Plugin Name:' */
-            return $error . ' ' . sprintf( __( 'Your chosen plugin name - %1$s - has been reserved for use by WordPress. Please change the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ),
+            return new \WP_Error( 'reserved_name', $error . ' ' . sprintf(
+                /* translators: 1: plugin slug, 2: 'Plugin Name:' */
+                __( 'Your chosen plugin name - %1$s - has been reserved for use by WordPress. Please change the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ),
                 '<code>' . $this->plugin_slug . '</code>',
                 '<code>Plugin Name:</code>'
-            );
+            ) );
         }
 
@@ -116 +119 @@
             $error = __( 'Error: The plugin already exists.', 'wporg-plugins' );
             
-            /* translators: 1: plugin slug, 2: 'Plugin Name:' */
-            return $error . ' ' . sprintf( __( 'There is already a plugin called %1$s by a different author. Please change the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ),
+            return new \WP_Error( 'already_exists', $error . ' ' . sprintf(
+                /* translators: 1: plugin slug, 2: 'Plugin Name:' */
+                __( 'There is already a plugin called %1$s by a different author. Please change the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ),
                 '<code>' . $this->plugin_slug . '</code>',
                 '<code>Plugin Name:</code>'
-            );
+            ) );
         }
 
@@ -127 +131 @@
             $error = __( 'Error: The plugin has already been submitted.', 'wporg-plugins' );
             
-            /* translators: 1: plugin slug, 2: plugins@wordpress.org */
-            return $error . ' ' . sprintf( __( 'You have already submitted a plugin called %1$s. Please be patient and wait for a review. If you have made a mistake, please email <a href="mailto:%2$s">%2$s</a> and let us know.', 'wporg-plugins' ),
+            return new \WP_Error( 'already_submitted', $error . ' ' . sprintf(
+                /* translators: 1: plugin slug, 2: plugins@wordpress.org */
+                __( 'You have already submitted a plugin called %1$s. Please be patient and wait for a review. If you have made a mistake, please email <a href="mailto:%2$s">%2$s</a> and let us know.', 'wporg-plugins' ),
                 '<code>' . $this->plugin_slug . '</code>',
                 'plugins@wordpress.org'
-            );
+            ) );
         }
 
@@ -137 +142 @@
             $error = __( 'Error: The plugin has no description.', 'wporg-plugins' );
 
-            /* translators: 1: plugin header line, 2: Codex URL */
-            return $error . ' ' . sprintf( __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
+            return new \WP_Error( 'no_description', $error . ' ' . sprintf(
+                /* translators: 1: plugin header line, 2: Codex URL */
+                __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
                 '<code>Description:</code>',
                 __( 'https://codex.wordpress.org/File_Header', 'wporg-plugins' )
-            );
+            ) );
         }
 
@@ -147 +153 @@
             $error = __( 'Error: The plugin has no version.', 'wporg-plugins' );
 
-            /* translators: 1: plugin header line, 2: Codex URL */
-            return $error . ' ' . sprintf( __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
+            return new \WP_Error( 'no_version', $error . ' ' . sprintf(
+                /* translators: 1: plugin header line, 2: Codex URL */
+                __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
                 '<code>Version:</code>',
                 __( 'https://codex.wordpress.org/File_Header', 'wporg-plugins' )
-            );
+            ) );
         }
 
@@ -157 +164 @@
             $error = __( 'Error: Plugin versions are expected to be numbers.', 'wporg-plugins' );
             
-            /* translators: %s: 'Version:' */
-            return $error . ' ' . sprintf( __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix the %s line in your main plugin file and upload the plugin again.', 'wporg-plugins' ),
+            return new \WP_Error( 'invalid_version', $error . ' ' . sprintf(
+                /* translators: %s: 'Version:' */
+                __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix the %s line in your main plugin file and upload the plugin again.', 'wporg-plugins' ),
                 '<code>Version:</code>'
-            );
+            ) );
         }
 
@@ -167 +175 @@
             $error = __( 'Error: Your plugin and author URIs are the same.', 'wporg-plugins' );
             
-            return $error . ' ' . __( 'A plugin URL is a page/site that provides details about this specific plugin. An author URL is a page/site that provides information about the author of the plugin. You are not required to provide both, so pick the one that best applies to your URL.', 'wporg-plugins' );
+            return new \WP_Error( 'plugin_author_uri', $error . ' ' .
+                __( 'A plugin URL is a page/site that provides details about this specific plugin. An author URL is a page/site that provides information about the author of the plugin. You are not required to provide both, so pick the one that best applies to your URL.', 'wporg-plugins' )
+            );
         }
 
@@ -174 +184 @@
             $error = __( 'Error: The plugin has no readme.', 'wporg-plugins' );
             
-            /* translators: 1: readme.txt, 2: readme.md */
-            return $error . ' ' . sprintf( __( 'The zip file must include a file named %1$s or %2$s. We recommend using %1$s as it will allow you to fully utilize our directory.', 'wporg-plugins' ),
+            return new \WP_Error( 'no_readme', $error . ' ' . sprintf(
+                /* translators: 1: readme.txt, 2: readme.md */
+                __( 'The zip file must include a file named %1$s or %2$s. We recommend using %1$s as it will allow you to fully utilize our directory.', 'wporg-plugins' ),
                 '<code>readme.txt</code>',
                 '<code>readme.md</code>'
-            );
+            ) );
         }
         $readme = new Parser( $readme );
@@ -189 +200 @@
             $error = __( 'Error: The plugin has failed the automated checks.', 'wporg-plugins' );
             
-            /* translators: 1: Plugin Check Plugin URL, 2: make.wordpress.org/plugins */
-            return $error . ' ' . sprintf( __( 'Please correct the problems with the plugin and upload it again. You can also use the <a href="%1$s">Plugin Check Plugin</a> to test your plugin before uploading. If you have any questions about this please post them to %2$s.', 'wporg-plugins' ),
+            return new \WP_Error( 'failed_checks', $error . ' ' . sprintf(
+                /* translators: 1: Plugin Check Plugin URL, 2: make.wordpress.org/plugins */
+                __( 'Please correct the problems with the plugin and upload it again. You can also use the <a href="%1$s">Plugin Check Plugin</a> to test your plugin before uploading. If you have any questions about this please post them to %2$s.', 'wporg-plugins' ),
                 '//wordpress.org/plugins/plugin-check/',
                 '<a href="https://make.wordpress.org/plugins">https://make.wordpress.org/plugins</a>'
-            );
+            ) );
         }
 

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

@@ -46 +46 @@
             }
 
+            $upload_result = false;
+
             if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' ) && 'upload' === $_POST['action'] ) :
                 if ( UPLOAD_ERR_OK === $_FILES['zip_file']['error'] ) :
-                    $uploader = new Upload_Handler;
-                    $message  = $uploader->process_upload();
+                    $uploader      = new Upload_Handler;
+                    $upload_result = $uploader->process_upload();
+
+                    if ( is_wp_error( $upload_result ) ) {
+                        $message = $upload_result->get_error_message();
+                    } else {
+                        $message = $upload_result;
+                    }
                 else :
                     $message = __( 'Error in file upload.', 'wporg-plugins' );
@@ -119 +127 @@
             <?php endif; // wp_verify_nonce() && 'upload' === $_POST['action'] ?>
 
-            <?php if ( ! $submitted_counts->total ) : ?>
+            <?php if ( ! $upload_result && ! $submitted_counts->total || is_wp_error( $upload_result ) ) : ?>
 
                 <form id="upload_form" class="plugin-upload-form" enctype="multipart/form-data" method="POST" action="">