<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13575] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Upload: Allow specifying a comment during the ZIP upload.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/13575">13575</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/13575","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-04-19 02:56:22 +0000 (Fri, 19 Apr 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Upload: Allow specifying a comment during the ZIP upload.
See <a href="http://meta.trac.wordpress.org/ticket/7598">#7598</a>, <a href="http://meta.trac.wordpress.org/ticket/6853">#6853</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassreviewtoolsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassreviewtoolsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php 2024-04-19 02:17:14 UTC (rev 13574)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php 2024-04-19 02:56:22 UTC (rev 13575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $zip_pcp = Template::preview_link_zip( $slug, $zip_file->ID, 'pcp' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<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>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<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>',
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( $zip_date ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $zip_file->version ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $zip_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $zip_file->submitted_name ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $zip_size ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $zip_preview ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( $zip_pcp )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( $zip_pcp ),
+ ( $zip_file->post_content ? '<br><div style="padding-left: 2em;">' . nl2br( $zip_file->post_content ) . '</div>' : '' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</ul>';
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2024-04-19 02:17:14 UTC (rev 13574)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2024-04-19 02:56:22 UTC (rev 13575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $zip_file = $_FILES['zip_file']['tmp_name'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upload_comment = trim( wp_unslash( $_POST['comment'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_upload_token = $this->has_valid_upload_token();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->plugin_dir = Filesystem::unzip( $zip_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,11 +492,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment = $this->save_zip_file( $plugin_post->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment = $this->save_zip_file( $plugin_post->ID, $upload_comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $attachment ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $attachment;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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,
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Store metadata about the uploaded ZIP.
</span><span class="cx" style="display: block; padding: 0 10px"> // Count lines of PHP code, this is not 100% accurate but it's a good indicator.
</span><span class="cx" style="display: block; padding: 0 10px"> $lines_of_code = (int) shell_exec( sprintf( "find %s -type f -name '*.php' -exec cat {} + | wc -l", escapeshellarg( $this->plugin_dir ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,7 +668,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|WP_Error Attachment post or upload error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function save_zip_file( $post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function save_zip_file( $post_id, $upload_comment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $zip_hash = sha1_file( $_FILES['zip_file']['tmp_name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $zip_hash, get_post_meta( $post_id, 'uploaded_zip_hash' ) ?: [], true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'already_uploaded', __( "You've already uploaded that ZIP file.", 'wporg-plugins' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -668,9 +682,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'default_site_option_upload_filetypes', array( $this, 'whitelist_zip_files' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Store the plugin details against the media as well.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_details = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_details = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => sprintf( '%s Version %s', $this->plugin['Name'], $this->plugin['Version'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => $this->plugin['Description'],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_content' => esc_html( $upload_comment )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment = media_handle_upload( 'zip_file', $post_id, $post_details );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,10 +779,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "New ZIP uploaded by %s, version %s.\n%s\n%s",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "New ZIP uploaded by %s, version %s.\nComment: %s\n%s",
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_get_current_user()->user_login,
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment->version,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_edit_post_link( $post ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment->post_content,
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_get_attachment_url( $attachment->ID )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php 2024-04-19 02:17:14 UTC (rev 13574)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php 2024-04-19 02:56:22 UTC (rev 13575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,6 +298,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="upload-additional"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="plugin_id" value="<?php echo esc_attr( $plugin->ID ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label>
+ <?php _e( 'Additional Information', 'wporg-plugins' ); ?><br>
+ <textarea name="comment" rows="3" cols="80"></textarea>
+ </label>
+ <br>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <label class="button button-secondary zip-file">
</span><span class="cx" style="display: block; padding: 0 10px"> <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><span class="cx" style="display: block; padding: 0 10px"> <span><?php _e( 'Select File', 'wporg-plugins' ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,6 +322,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<li><code>' . esc_html( $upload->submitted_name ) . '</code></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<li>' . sprintf( __( 'Version: %s', 'wporg-plugins' ), '<code>' . esc_html( $upload->version ) . '</code>' ) . '</li>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<li>' . sprintf( __( 'Upload Date: %s', 'wporg-plugins' ), date_i18n( get_option( 'date_format' ), strtotime( $upload->post_date ) ) ) . '</li>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $upload->post_content ) {
+ echo '<li>' . nl2br( wp_kses_post( $upload->post_content ) ) . '</li>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( array_key_first( $attached_media) === $attachment_post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<li><a href="%s" class="%s" target="_blank">%s</a></li>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,6 +406,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?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>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="requirements[faq]" required="required">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span></span></pre>
</div>
</div>
</body>
</html>