<!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>[5511] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php: Plugin directory: list author's pending plugins on Add page, to reduce duplicate uploads.</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/5511">5511</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/5511","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tellyworth</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-24 22:41:12 +0000 (Wed, 24 May 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: list author's pending plugins on Add page, to reduce duplicate uploads.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2594">#2594</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-05-24 18:45:38 UTC (rev 5510)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php 2017-05-24 22:41:12 UTC (rev 5511)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Upload {
</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">+ * Retrieves plugins in the queue submitted by the current user.
+ *
+ * @return array An array of user's plugins.
+ */
+ public static function get_submitted_plugins() {
+ $plugins = get_posts( array(
+ 'post_type' => 'plugin',
+ 'post_status' => array( 'new', 'pending' ),
+ 'author' => get_current_user_id(),
+ 'orderby' => 'title',
+ 'order' => 'ASC',
+ 'posts_per_page' => -1,
+ ) );
+
+ return $plugins;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Renders the upload shortcode.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function display() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,16 +47,75 @@
</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"> <div class="plugin-queue-message notice notice-info notice-alt">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <?php
- printf( _n( 'Currently there is %1$s plugin in the review queue.', 'Currently there are %1$s plugins in the review queue, %2$s of which are awaiting their initial review.', ( $plugins->new + $plugins->pending ), 'wporg-plugins' ),
- '<strong>' . ( $plugins->new + $plugins->pending ) . '</strong>',
- '<strong>' . $plugins->new . '</strong>'
- );
- ?>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php
+ if ( 1 === ( $plugins->new + $plugins->pending ) ) {
+ _e( 'Currently there is 1 plugin in the review queue.', 'wporg-plugins' );
+ } else {
+ printf(
+ _n(
+ 'Currently there are %1$s plugins in the review queue, %2$s of which is awaiting its initial review.',
+ 'Currently there are %1$s plugins in the review queue, %2$s of which are awaiting their initial review.',
+ $plugins->new,
+ 'wporg-plugins'
+ ),
+ '<strong>' . ( $plugins->new + $plugins->pending ) . '</strong>',
+ '<strong>' . $plugins->new . '</strong>'
+ );
+ }
+ ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; 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 );
+
+ 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 ) : ?>
+
+ <div class="plugin-queue-message notice notice-warning notice-alt">
+ <p><?php
+ if ( 1 === ( $submitted_counts->new + $submitted_counts->pending ) ) {
+ _e( 'You have 1 plugin in the review queue.', 'wporg-plugins' );
+ } else {
+ printf(
+ _n(
+ '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.',
+ $submitted_counts->pending,
+ 'wporg-plugins'
+ ),
+ '<strong>' . ( $submitted_counts->new + $submitted_counts->pending ) . '</strong>',
+ '<strong>' . $submitted_counts->pending . '</strong>'
+ );
+ }
+ ?></p>
+
+ <ul><?php
+ foreach ( $submitted_plugins as $plugin ) {
+ echo '<li>' . esc_html( $plugin->post_title ) . ' — ' . $plugin->status . "</li>\n";
+ }
+ ?></ul>
+
+ <p><?php
+ /* translators: %s: plugins@wordpress.org */
+ printf( __( 'Please wait at least 7 business days before asking for an update status from <a href="mailto:%1$s">%1$s</a>.', 'wporg-plugins' ),
+ 'plugins@wordpress.org'
+ );
+ ?></p>
+ </div>
+
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="upload_form" class="plugin-upload-form" enctype="multipart/form-data" method="POST" action="">
</span></span></pre>
</div>
</div>
</body>
</html>