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

Timestamp:

01/15/2024 05:23:52 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Allow plugins to upload additional versions for review.

This is currently limited to new plugins, which is prior to the first human review.

Iterations upon this will open it to plugins in the pending state as well, which is during the human review.

See #7384.

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

@@ -52 +52 @@
         ob_start();
 
-        $uploader = new Upload_Handler();
-
         include_once ABSPATH . 'wp-admin/includes/template.php';
 
+        $uploader      = new Upload_Handler();
+        $upload_result = false;
+
         list( $submitted_plugins, $submitted_counts ) = self::get_submitted_plugins();
 
-        $upload_result = false;
-
         if (
-            ! empty( $_POST['_wpnonce'] )
-            && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' )
-            && 'upload' === $_POST['action']
-            && ! $submitted_counts->total
-            && ! empty( $_FILES['zip_file'] )
+            ! empty( $_POST['_wpnonce'] ) &&
+            ! empty( $_FILES['zip_file'] ) &&
+            (
+                // New submission.
+                ! $submitted_counts->total &&
+                empty( $_POST['plugin_id'] ) &&
+                wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' ) &&
+                'upload' === $_POST['action']
+            ) || (
+                // Existing submission
+                ! empty( $_POST['plugin_id'] ) &&
+                'upload-additional' === $_POST['action'] &&
+                wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload-' . $_POST['plugin_id'] )
+            )
         ) {
-            $upload_result = $uploader->process_upload();
+            $for_plugin    = absint( $_POST['plugin_id'] ?? 0 );
+            $upload_result = $uploader->process_upload( $for_plugin );
 
             if ( is_wp_error( $upload_result ) ) {
+                $type    = 'error';
                 $message = $upload_result->get_error_message();
             } else {
+                $type    = 'success';
                 $message = $upload_result;
             }
@@ -79 +90 @@
 
             if ( ! empty( $message ) ) {
-                echo "<div class='notice notice-warning notice-alt'><p>{$message}</p></div>\n";
+                echo "<div class='notice notice-{$type} notice-alt'><p>{$message}</p></div>\n";
             }
         }
 
-        if ( ! is_wp_error( $upload_result ) ) :
+        if ( ! is_wp_error( $upload_result ) || $submitted_counts->total ) :
             $plugins       = wp_count_posts( 'plugin', 'readable' );
             $oldest_plugin = get_posts( [ 'post_type' => 'plugin', 'post_status' => 'new', 'order' => 'ASC', 'orderby' => 'post_date_gmt', 'numberposts' => 1 ] );
@@ -183 +194 @@
                     // List of all plugins in progress.
                     foreach ( $submitted_plugins as $plugin ) {
-                        $can_change_slug = ( 'new' === $plugin->post_status && ! $plugin->{'_wporg_plugin_original_slug'} );
+                        $can_change_slug   = ( 'new' === $plugin->post_status && ! $plugin->{'_wporg_plugin_original_slug'} );
+                        $can_upload_extras = in_array( $plugin->post_status, array( 'new', /* 'pending' */ ), true );
 
                         echo '<li>';
@@ -258 +270 @@
                             endif; // $can_change_slug
                             echo '</li>';
+
+                            echo '<li>';
+                            $attached_media = get_attached_media( 'application/zip', $plugin );
+
+                            echo '<strong>' . __( 'Submitted files:', 'wporg' ) . '</strong><ol>';
+                            foreach ( $attached_media as $upload ) {
+                                echo '<li><ul>';
+                                $filename = $upload->submitted_name ?: preg_replace( '!^[0-9-_]+!', '', basename( get_attached_file( $upload->ID ) ) );
+                                $version  = $upload->version ?: $plugin->version;
+
+                                echo '<li><code>' . esc_html( $filename ) . '</code></li>';
+                                echo '<li>' . sprintf( __( 'Version: %s', 'wporg-plugins' ), '<code>' . esc_html( $version ) . '</code>' ) . '</li>';
+                                echo '<li>' . sprintf( __( 'Upload Date: %s', 'wporg-plugins' ), date_i18n( get_option( 'date_format' ), strtotime( $upload->post_date ) ) ) . '</li>';
+                                echo '</ul></li>';
+                            }
+                            if ( $can_upload_extras ) {
+                                echo '<li class="unmarked-list"><a href="#" class="show-upload-additional hide-if-no-js">' . sprintf( __( 'Upload new version of %s for review.', 'wporg-plugins' ), esc_html( $plugin->post_title ) ) . '</a>';
+                            }
+                            echo '</ol>';
+
+                            if ( $can_upload_extras ) {
+                                ?>
+                                <form class="plugin-upload-form hidden" enctype="multipart/form-data" method="POST" action="">
+                                    <?php wp_nonce_field( 'wporg-plugins-upload-' . $plugin->ID ); ?>
+                                    <input type="hidden" name="action" value="upload-additional"/>
+                                    <input type="hidden" name="plugin_id" value="<?php echo esc_attr( $plugin->ID ); ?>" />
+
+                                    <label class="button button-secondary zip-file">
+                                        <input type="file" class="plugin-file" name="zip_file" size="25" accept=".zip" required data-maxbytes="<?php echo esc_attr( wp_max_upload_size() ); ?>" />
+                                        <span><?php _e( 'Select File', 'wporg-plugins' ); ?></span>
+                                    </label>
+
+                                    <input class="upload-button button button-primary" type="submit" value="<?php esc_attr_e( 'Upload', 'wporg-plugins' ) ?>"/>
+                                </form>
+                                <?php
+                            }
+                            echo '</li>';
                             echo '</ul>';
-                        
                         echo "</li>\n";
                     }
@@ -306 +354 @@
                     </ul>
                 </fieldset> */
-?>
-
-                <input type="file" id="zip_file" class="plugin-file" name="zip_file" size="25" accept=".zip" required data-maxbytes="<?php echo esc_attr( wp_max_upload_size() ); ?>" />
-                <label class="button button-secondary" for="zip_file"><?php _e( 'Select File', 'wporg-plugins' ); ?></label>
+                ?>
+
+                <label class="button button-secondary zip-file">
+                    <input type="file" class="plugin-file" name="zip_file" size="25" accept=".zip" required data-maxbytes="<?php echo esc_attr( wp_max_upload_size() ); ?>" />
+                    <span><?php _e( 'Select File', 'wporg-plugins' ); ?></span>
+                </label>
 
                 <p>
@@ -357 +407 @@
                 <input id="upload_button" class="button button-primary" type="submit" value="<?php esc_attr_e( 'Upload', 'wporg-plugins' ); ?>"/>
             </form>
-
-            <?php
-            $upload_script = '
-                ( function ( $ ) {
-                    var $label = $( "label.button" ),
-                        labelText = $label.text();
-                    $( "#zip_file" )
-                        .on( "change", function( event ) {
-                            var fileName = event.target.value.split( "\\\\" ).pop(),
-                                fileSize = event.target.files[0].size || 0;
-
-                            if ( fileSize > $(this).data( "maxbytes" ) ) {
-                                event.target.value = "";
-                                fileName = false;
-                            }
-
-                            fileName ? $label.text( fileName ) : $label.text( labelText );
-                        } )
-                        .on( "focus", function() { $label.addClass( "focus" ); } )
-                        .on( "blur", function() { $label.removeClass( "focus" ); } );
-                } ( window.jQuery ) );';
-
-            if ( ! wp_script_is( 'jquery', 'done' ) ) {
-                wp_enqueue_script( 'jquery' );
-                wp_add_inline_script( 'jquery-migrate', $upload_script );
-            } else {
-                printf( '<script>%s</script>', $upload_script );
-            }
-            ?>
-
         <?php endif; // ! $submitted_counts->total