<!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>[12140] sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc: Photo Directory, User: Move `Uploads::user_reached_concurrent_submission_limit()` to `User::has_reached_concurrent_submission_limit()`.</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/12140">12140</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/12140","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-20 17:10:00 +0000 (Thu, 20 Oct 2022)</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'>Photo Directory, User: Move `Uploads::user_reached_concurrent_submission_limit()` to `User::has_reached_concurrent_submission_limit()`.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincmoderationphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/moderation.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincuploadsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/uploads.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincuserphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincmoderationphp"></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/photo-directory/inc/moderation.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/photo-directory/inc/moderation.php 2022-10-20 17:06:27 UTC (rev 12139)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/moderation.php 2022-10-20 17:10:00 UTC (rev 12140)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,8 +559,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '<h2>' . __( 'Submissions awaiting moderation', 'wporg-photos' ) . "</h2>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '<p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _n( 'You can have up to <strong>%d</strong> photo in the moderation queue at a time. You currently have <strong>%d</strong>.', 'You can have up to <strong>%d</strong> photos in the moderation queue at a time. You currently have <strong>%d</strong>.', Uploads::MAX_PENDING_SUBMISSIONS,'wporg-photos' ),
- Uploads::MAX_PENDING_SUBMISSIONS,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _n( 'You can have up to <strong>%d</strong> photo in the moderation queue at a time. You currently have <strong>%d</strong>.', 'You can have up to <strong>%d</strong> photos in the moderation queue at a time. You currently have <strong>%d</strong>.', User::MAX_PENDING_SUBMISSIONS,'wporg-photos' ),
+ User::MAX_PENDING_SUBMISSIONS,
</ins><span class="cx" style="display: block; padding: 0 10px"> count( $pending )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= "</p>\n";
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincuploadsphp"></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/photo-directory/inc/uploads.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/photo-directory/inc/uploads.php 2022-10-20 17:06:27 UTC (rev 12139)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/uploads.php 2022-10-20 17:10:00 UTC (rev 12140)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,16 +17,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const MAX_LENGTH_DESCRIPTION = 250;
</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">- * Maximum number of pending/concurrent submissions.
- *
- * Once this threshold is met, a user will be unable to make another
- * submission until the current submission is approved or rejected.
- *
- * @var int
- */
- const MAX_PENDING_SUBMISSIONS = 5;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * The default maximum allowed file size in megabytes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see `get_maximum_photo_file_size()` for actually retrieving the maximum
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,7 +514,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if user has reached submission limit.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $can = ! self::user_reached_concurrent_submission_limit();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $can = ! User::has_reached_concurrent_submission_limit();
</ins><span class="cx" style="display: block; padding: 0 10px"> $reason = 'concurrent-submission-limit';
</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">@@ -848,33 +838,6 @@
</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">- * Determines if user has reached concurrent submission limit for pending
- * uploads (e.g. max number of photos awaiting moderation).
- *
- * @return bool True if use has exceeded pending sumission limit, else false.
- */
- public static function user_reached_concurrent_submission_limit() {
- $limit_reached = true;
-
- if ( is_user_logged_in() ) {
- $posts = get_posts( [
- 'fields' => 'ids',
- 'posts_per_page' => self::MAX_PENDING_SUBMISSIONS,
- 'author' => get_current_user_id(),
- 'post_status' => 'pending',
- 'post_type' => Registrations::get_post_type(),
- ] );
-
- if ( count( $posts ) < self::MAX_PENDING_SUBMISSIONS ) {
- $limit_reached = false;
- }
- }
-
- return $limit_reached;
- }
-
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Outputs a notice for users who are prevented from uploading and prevents
</span><span class="cx" style="display: block; padding: 0 10px"> * the upload form from being output.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -913,7 +876,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( __( 'Upload your photo', 'wporg-photos' ) )
</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">- if ( self::user_reached_concurrent_submission_limit() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( User::has_reached_concurrent_submission_limit() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= '<p>' . __( 'Thanks for your submissions! Please wait until a photo is approved by moderators before submitting again.', 'wporg-photos' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $valid_upload_mimetypes = implode( ',', array_values( self::restrict_upload_mimes() ) );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincuserphp"></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/photo-directory/inc/user.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/photo-directory/inc/user.php 2022-10-20 17:06:27 UTC (rev 12139)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/user.php 2022-10-20 17:10:00 UTC (rev 12140)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,6 +128,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $can;
</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">+ /**
+ * Determines if user has reached concurrent submission limit for pending
+ * uploads (e.g. max number of photos awaiting moderation).
+ *
+ * @param int $user_id Optional. The user ID. If not defined, assumes current
+ * user. Default false.
+ * @return bool True if user has exceeded pending sumission limit, else false.
+ */
+ public static function has_reached_concurrent_submission_limit( $user_id = false ) {
+ $limit_reached = true;
+
+ if ( ! $user_id ) {
+ $user_id = get_current_user_id();
+ }
+
+ if ( $user_id ) {
+ $posts = get_posts( [
+ 'fields' => 'ids',
+ 'posts_per_page' => self::MAX_PENDING_SUBMISSIONS,
+ 'author' => $user_id,
+ 'post_status' => 'pending',
+ 'post_type' => Registrations::get_post_type(),
+ ] );
+
+ if ( count( $posts ) < self::MAX_PENDING_SUBMISSIONS ) {
+ $limit_reached = false;
+ }
+ }
+
+ return $limit_reached;
+ }
+
</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"> add_action( 'plugins_loaded', [ __NAMESPACE__ . '\User', 'init' ] );
</span></span></pre>
</div>
</div>
</body>
</html>