Changeset 13575

Timestamp:

04/19/2024 02:56:22 AM (6 months ago)

Author:

dd32

Message:

Plugin Directory: Upload: Allow specifying a comment during the ZIP upload.

See #7598, #6853.

Location:

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

Files:

• admin/metabox/class-review-tools.php (modified) (2 diffs)
• shortcodes/class-upload-handler.php (modified) (5 diffs)
• shortcodes/class-upload.php (modified) (3 diffs)

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

@@ -141 +141 @@
 
                 printf(
-                    '<li>%1$s v%2$s <a href="%3$s" title="%4$s">%5$s</a> (%6$s) (<a href="%7$s" target="_blank">preview</a> | <a href="%8$s" target="_blank">pcp</a>)</li>',
+                    '<li>%1$s v%2$s <a href="%3$s" title="%4$s">%5$s</a> (%6$s) (<a href="%7$s" target="_blank">preview</a> | <a href="%8$s" target="_blank">pcp</a>)%9$s</li>',
                     esc_html( $zip_date ),
                     esc_html( $zip_file->version ),
@@ -149 +149 @@
                     esc_html( $zip_size ),
                     esc_url( $zip_preview ),
-                    esc_url( $zip_pcp )
+                    esc_url( $zip_pcp ),
+                    ( $zip_file->post_content ? '<br><div style="padding-left: 2em;">' . nl2br( $zip_file->post_content ) . '</div>' : '' )
                 );
             }

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

@@ -79 +79 @@
 
         $zip_file         = $_FILES['zip_file']['tmp_name'];
+        $upload_comment   = trim( wp_unslash( $_POST['comment'] ) );
         $has_upload_token = $this->has_valid_upload_token();
         $this->plugin_dir = Filesystem::unzip( $zip_file );
@@ -492 +493 @@
         }
 
-        $attachment = $this->save_zip_file( $plugin_post->ID );
+        $attachment = $this->save_zip_file( $plugin_post->ID, $upload_comment );
         if ( is_wp_error( $attachment ) ) {
             return $attachment;
+        }
+
+        // Store the uploaded comment as a plugin audit log.
+        if ( $upload_comment ) {
+            Tools::audit_log(
+                sprintf(
+                    "Upload Comment for <a href='%s'>%s</a>\n%s",
+                    wp_get_attachment_url( $attachment->ID ),
+                    esc_html( $attachment->submitted_name ),
+                    esc_html( $upload_comment )
+                ),
+                $plugin_post->ID,
+            );
         }
 
@@ -655 +669 @@
      * @return WP_Post|WP_Error Attachment post or upload error.
      */
-    public function save_zip_file( $post_id ) {
+    public function save_zip_file( $post_id, $upload_comment ) {
         $zip_hash = sha1_file( $_FILES['zip_file']['tmp_name'] );
         if ( in_array( $zip_hash, get_post_meta( $post_id, 'uploaded_zip_hash' ) ?: [], true ) ) {
@@ -669 +683 @@
 
         // Store the plugin details against the media as well.
-        $post_details  = array(
+        $post_details = array(
             'post_title'   => sprintf( '%s Version %s', $this->plugin['Name'], $this->plugin['Version'] ),
             'post_excerpt' => $this->plugin['Description'],
+            'post_content' => esc_html( $upload_comment )
         );
         $attachment = media_handle_upload( 'zip_file', $post_id, $post_details );
@@ -765 +780 @@
 
         $text = sprintf(
-            "New ZIP uploaded by %s, version %s.\n%s\n%s",
+            "New ZIP uploaded by %s, version %s.\nComment: %s\n%s",
             wp_get_current_user()->user_login,
             $attachment->version,
-            get_edit_post_link( $post ),
+            $attachment->post_content,
             wp_get_attachment_url( $attachment->ID )
         );

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

@@ -299 +299 @@
                                     <input type="hidden" name="plugin_id" value="<?php echo esc_attr( $plugin->ID ); ?>" />
 
+                                    <label>
+                                        <?php _e( 'Additional Information', 'wporg-plugins' ); ?><br>
+                                        <textarea name="comment" rows="3" cols="80"></textarea>
+                                    </label>
+                                    <br>
+
                                     <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() ); ?>" />
@@ -317 +323 @@
                                 echo '<li>' . sprintf( __( 'Version: %s', 'wporg-plugins' ), '<code>' . esc_html( $upload->version ) . '</code>' ) . '</li>';
                                 echo '<li>' . sprintf( __( 'Upload Date: %s', 'wporg-plugins' ), date_i18n( get_option( 'date_format' ), strtotime( $upload->post_date ) ) ) . '</li>';
+                                if ( $upload->post_content ) {
+                                    echo '<li>' . nl2br( wp_kses_post( $upload->post_content ) ) . '</li>';
+                                }
                                 if ( array_key_first( $attached_media) === $attachment_post_id ) {
                                     printf(
@@ -398 +407 @@
                 <p>
                     <label>
+                        <?php _e( 'Additional Information', 'wporg-plugins' ); ?><br>
+                        <textarea name="comment" rows="3" cols="80"><?php
+                            if ( ! empty( $_REQUEST['comment'] ) ) {
+                                echo esc_textarea( $_REQUEST['comment'] );
+                            }
+                        ?></textarea>
+                    </label>
+                </p>
+
+                <p>
+                    <label>
                         <input type="checkbox" name="requirements[faq]" required="required">
                         <?php