<!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>[6023] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php: Plugin Directory: Limit plugin submissions to one at a time.</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 { 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/6023">6023</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/6023","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-13 11:59:21 +0000 (Fri, 13 Oct 2017)</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: Limit plugin submissions to one at a time.
Remove the upload form if the developer already has a plugin in the review queue.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2386">#2386</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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_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 2017-10-13 08:56:56 UTC (rev 6022)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php 2017-10-13 11:59:21 UTC (rev 6023)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,6 +30,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_user_logged_in() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> include_once ABSPATH . 'wp-admin/includes/template.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submitted_plugins = self::get_submitted_plugins();
+ $submitted_counts = (object) array_fill_keys( array( 'new', 'pending' ), 0 );
+
+ $submitted_counts->total = count( $submitted_plugins );
+
+ foreach ( $submitted_plugins as $key => $plugin ) {
+ if ( 'new' === $plugin->post_status ) {
+ $submitted_plugins[ $key ]->status = __( 'Awaiting Review', 'wporg-plugins' );
+ $submitted_counts->new++;
+ } elseif ( 'pending' === $plugin->post_status ) {
+ $submitted_plugins[ $key ]->status = __( 'Being Reviewed', 'wporg-plugins' );
+ $submitted_counts->pending++;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' ) && 'upload' === $_POST['action'] ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( UPLOAD_ERR_OK === $_FILES['zip_file']['error'] ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $uploader = new Upload_Handler;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,36 +80,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $submitted_plugins = self::get_submitted_plugins();
- $submitted_counts = (object) array_fill_keys( array( 'new', 'pending' ), 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $submitted_counts->total ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $submitted_plugins as $key => $plugin ) {
- if ( 'new' === $plugin->post_status ) {
- $submitted_plugins[ $key ]->status = __( 'Awaiting Review', 'wporg-plugins' );
- $submitted_counts->new++;
- } elseif ( 'pending' === $plugin->post_status ) {
- $submitted_plugins[ $key ]->status = __( 'Being Reviewed', 'wporg-plugins' );
- $submitted_counts->pending++;
- }
- }
- ?>
-
- <?php if ( $submitted_counts->new + $submitted_counts->pending ) : ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <div class="plugin-queue-message notice notice-warning notice-alt">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 === ( $submitted_counts->new + $submitted_counts->pending ) ) {
- _e( 'You have 1 plugin in the review queue.', 'wporg-plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $submitted_counts->total ) {
+ _e( 'You have 1 plugin in the review queue. Please wait for it to be approved before submitting any more.', 'wporg-plugins' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'You have %1$s plugins in the review queue, %2$s is being actively reviewed.',
- 'You have %1$s plugins in the review queue, %2$s are being actively reviewed.',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'You have %1$s plugins in the review queue, %2$s is being actively reviewed. Please wait for them to be approved before submitting any more.',
+ 'You have %1$s plugins in the review queue, %2$s are being actively reviewed. Please wait for them to be approved before submitting any more.',
</ins><span class="cx" style="display: block; padding: 0 10px"> $submitted_counts->pending,
</span><span class="cx" style="display: block; padding: 0 10px"> 'wporg-plugins'
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<strong>' . ( $submitted_counts->new + $submitted_counts->pending ) . '</strong>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<strong>' . $submitted_counts->total . '</strong>',
</ins><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . $submitted_counts->pending . '</strong>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,50 +114,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; // $submitted_counts->total ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; // wp_verify_nonce() && 'upload' === $_POST['action'] ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form id="upload_form" class="plugin-upload-form" enctype="multipart/form-data" method="POST" action="">
- <?php wp_nonce_field( 'wporg-plugins-upload' ); ?>
- <input type="hidden" name="action" value="upload"/>
- <?php /* <fieldset>
- <legend><?php _e( 'Select categories (up to 3)', 'wporg-plugins' ); ?></legend>
- <ul class="category-checklist">
- <?php wp_terms_checklist( 0, array( 'taxonomy' => 'plugin_category' ) ); ?>
- </ul>
- </fieldset> */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! $submitted_counts->total ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="file" id="zip_file" class="plugin-file" name="zip_file" size="25" accept=".zip"/>
- <label class="button button-secondary" for="zip_file"><?php _e( 'Select File', 'wporg-plugins' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <form id="upload_form" class="plugin-upload-form" enctype="multipart/form-data" method="POST" action="">
+ <?php wp_nonce_field( 'wporg-plugins-upload' ); ?>
+ <input type="hidden" name="action" value="upload"/>
+ <?php /* <fieldset>
+ <legend><?php _e( 'Select categories (up to 3)', 'wporg-plugins' ); ?></legend>
+ <ul class="category-checklist">
+ <?php wp_terms_checklist( 0, array( 'taxonomy' => 'plugin_category' ) ); ?>
+ </ul>
+ </fieldset> */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input id="upload_button" class="button button-primary" type="submit" value="<?php esc_attr_e( 'Upload', 'wporg-plugins' ); ?>"/>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="file" id="zip_file" class="plugin-file" name="zip_file" size="25" accept=".zip"/>
+ <label class="button button-secondary" for="zip_file"><?php _e( 'Select File', 'wporg-plugins' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <small><?php printf( __( 'Maximum allowed file size: %s', 'wporg-plugins' ), esc_html( self::get_max_allowed_file_size() ) ); ?></small>
- </p>
- </form>
- <script>
- ( function ( $ ) {
- var $label = $( 'label.button' ),
- labelText = $label.text();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input id="upload_button" class="button button-primary" type="submit" value="<?php esc_attr_e( 'Upload', 'wporg-plugins' ); ?>"/>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#zip_file' )
- .on( 'change', function( event ) {
- var fileName = event.target.value.split( '\\' ).pop();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <small><?php printf( __( 'Maximum allowed file size: %s', 'wporg-plugins' ), esc_html( self::get_max_allowed_file_size() ) ); ?></small>
+ </p>
+ </form>
+ <script>
+ ( function ( $ ) {
+ var $label = $( 'label.button' ),
+ labelText = $label.text();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fileName ? $label.text( fileName ) : $label.text( labelText );
- } )
- .on( 'focus', function() { $label.addClass( 'focus' ); } )
- .on( 'blur', function() { $label.removeClass( 'focus' ); } );
- } ( window.jQuery ) );
- </script>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#zip_file' )
+ .on( 'change', function( event ) {
+ var fileName = event.target.value.split( '\\' ).pop();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fileName ? $label.text( fileName ) : $label.text( labelText );
+ } )
+ .on( 'focus', function() { $label.addClass( 'focus' ); } )
+ .on( 'blur', function() { $label.removeClass( 'focus' ); } );
+ } ( window.jQuery ) );
+ </script>
+
+ <?php endif; // ! $submitted_counts->total ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( 'Before you can upload a new plugin, <a href="%s">please log in</a>.', 'wporg-plugins' ), esc_url( 'https://login.wordpress.org/' ) ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; // is_user_logged_in()
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>