Changeset 3034

Timestamp:

04/28/2016 05:40:32 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Allow authors to update their plugin submissions.

If the initial version of a plugin does not satisfy review requirements, plugin
authors need a way to update their plugin for further review.
This now adds subsequent zip files by the same author to existing tickets and
adjusts logic and UI in a few places to handle multiple zip files.

See #1570.

Location:

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

Files:

• admin/class-status-transitions.php (modified) (2 diffs)
• admin/metabox/class-review-tools.php (modified) (1 diff)
• class-plugin-directory.php (modified) (1 diff)
• shortcodes/class-upload-handler.php (modified) (3 diffs)

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

@@ -79 +79 @@
         }
 
-        $attachment    = current( $attachments );
+        $attachment    = end( $attachments );
         $plugin_author = get_user_by( 'id', $post->post_author );
 
@@ -102 +102 @@
         ) );
 
-        // Delete zip.
-        wp_delete_attachment( $attachment->ID, true );
+        // Delete zips.
+        foreach ( $attachments as $attachment ) {
+            wp_delete_attachment( $attachment->ID, true );
+        }
 
         // Grant commit access.

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

@@ -9 +9 @@
 class Review_Tools {
     static function display() {
-        $post      = get_post();
-        $zip_files = get_attached_media( 'application/zip', $post );
+        $post = get_post();
 
-        if ( $zip_files ) {
-            $zip_file = current( $zip_files );
-            $zip_url  = wp_get_attachment_url( $zip_file->ID );
+        foreach ( get_attached_media( 'application/zip', $post ) as $zip_file ) {
+            $zip_url = wp_get_attachment_url( $zip_file->ID );
+
             printf( '<p>' . __( '<strong>Zip file:</strong> %s', 'wporg-plugins' ) . '</p>',
                 sprintf( '<a href="%s">%s</a>', esc_url( $zip_url ), esc_html( $zip_url ) )

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

@@ -514 +514 @@
             'post_type'   => 'plugin',
             'name'        => $plugin_slug,
-            'post_status' => array( 'publish', 'pending', 'disabled', 'closed' ),
+            'post_status' => array( 'publish', 'pending', 'disabled', 'closed', 'draft' ),
         ) );
         if ( ! $posts ) {

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

@@ -94 +94 @@
         }
 
-        // Is there already a plugin with the name name?
-        if ( Plugin_Directory::get_plugin_post( $this->plugin_slug ) ) {
+        $plugin_post = Plugin_Directory::get_plugin_post( $this->plugin_slug );
+
+        // Is there already a plugin by a different author?
+        if ( $plugin_post instanceof \WP_Post && $plugin_post->post_author != get_current_user_id() ) {
             /* translators: 1: plugin slug, 2: style.css */
             return sprintf( __( 'There is already a plugin called %1$s by a different author. Please change the name of your plugin and upload it again.', 'wporg-plugins' ),
@@ -158 +160 @@
         // Let's save everything and get things wrapped up.
 
-        $content = '';
-        foreach ( $readme->sections as $section => $section_content ) {
-            $content .= "\n\n<!--section={$section}-->\n{$section_content}";
-        }
-
-        // Add a Plugin Directory entry for this plugin.
-        $plugin_post = Plugin_Directory::create_plugin_post( array(
-            'title'       => $this->plugin['Name'],
-            'slug'        => $this->plugin_slug,
-            'status'      => 'draft',
-            'author'      => get_current_user_id(),
-            'content'     => $content,
-            'description' => $this->plugin['Description'],
-            'tags'        => $readme->tags,
-            'meta'        => array(
-                'tested'              => $readme->tested,
-                'requires'            => $readme->requires,
-                'stable_tag'          => $readme->stable_tag,
-                'upgrade_notice'      => $readme->upgrade_notice,
-                'contributors'        => $readme->contributors,
-                'screenshots'         => $readme->screenshots,
-                'donate_link'         => $readme->donate_link,
-                'sections'            => array_keys( $readme->sections ),
-                'version'             => $this->plugin['Version'],
-                'header_name'         => $this->plugin['Name'],
-                'header_plugin_uri'   => $this->plugin['PluginURI'],
-                'header_author'       => $this->plugin['Author'],
-                'header_author_uri'   => $this->plugin['AuthorURI'],
-                'header_textdomain'   => $this->plugin['TextDomain'],
-                'header_description'  => $this->plugin['Description'],
-                'assets_screenshots'       => array(),
-                'assets_icons'             => array(),
-                'assets_banners'           => array(),
-                'assets_banners_color'     => false,
-                'support_threads'          => 0,
-                'support_threads_resolved' => 0,
-            ),
-        ) );
-        if ( is_wp_error( $plugin_post ) ) {
-            return $plugin_post->get_error_message();
+        // Create a new post on first-time submissions.
+        if ( ! ( $plugin_post instanceof \WP_Post ) ) {
+            $content = '';
+            foreach ( $readme->sections as $section => $section_content ) {
+                $content .= "\n\n<!--section={$section}-->\n{$section_content}";
+            }
+
+            // Add a Plugin Directory entry for this plugin.
+            $plugin_post = Plugin_Directory::create_plugin_post( array(
+                'title'       => $this->plugin['Name'],
+                'slug'        => $this->plugin_slug,
+                'status'      => 'draft',
+                'author'      => get_current_user_id(),
+                'content'     => $content,
+                'description' => $this->plugin['Description'],
+                'tags'        => $readme->tags,
+                'meta'        => array(
+                    'tested'                   => $readme->tested,
+                    'requires'                 => $readme->requires,
+                    'stable_tag'               => $readme->stable_tag,
+                    'upgrade_notice'           => $readme->upgrade_notice,
+                    'contributors'             => $readme->contributors,
+                    'screenshots'              => $readme->screenshots,
+                    'donate_link'              => $readme->donate_link,
+                    'sections'                 => array_keys( $readme->sections ),
+                    'version'                  => $this->plugin['Version'],
+                    'header_name'              => $this->plugin['Name'],
+                    'header_plugin_uri'        => $this->plugin['PluginURI'],
+                    'header_author'            => $this->plugin['Author'],
+                    'header_author_uri'        => $this->plugin['AuthorURI'],
+                    'header_textdomain'        => $this->plugin['TextDomain'],
+                    'header_description'       => $this->plugin['Description'],
+                    'assets_screenshots'       => array(),
+                    'assets_icons'             => array(),
+                    'assets_banners'           => array(),
+                    'assets_banners_color'     => false,
+                    'support_threads'          => 0,
+                    'support_threads_resolved' => 0,
+                ),
+            ) );
+            if ( is_wp_error( $plugin_post ) ) {
+                return $plugin_post->get_error_message();
+            }
         }
 
@@ -294 +299 @@
      */
     public function save_zip_file( $post_id ) {
-        $_FILES['zip_file']['name'] = wp_generate_password( 12, false ) . '-' . $_FILES['zip_file']['name'];
+        $_FILES['zip_file']['name'] = date( 'd_H-i-s' ) . '_' . $_FILES['zip_file']['name'];
 
         add_filter( 'site_option_upload_filetypes', array( $this, 'whitelist_zip_files' ) );