Changeset 12140

Timestamp:

10/20/2022 05:10:00 PM (2 years ago)

Author:

coffee2code

Message:

Photo Directory, User: Move Uploads::user_reached_concurrent_submission_limit() to User::has_reached_concurrent_submission_limit().

Location:

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

Files:

• moderation.php (modified) (1 diff)
• uploads.php (modified) (4 diffs)
• user.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/moderation.php

@@ -560 +560 @@
         $content .= '<p>';
         $content .= sprintf(
-            _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,
+            _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,
             count( $pending )
         );

sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/uploads.php

@@ -16 +16 @@
      */
     const MAX_LENGTH_DESCRIPTION = 250;
-
-    /**
-     * 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;
 
     /**
@@ -525 +515 @@
         // Check if user has reached submission limit.
         if ( $can ) {
-            $can = ! self::user_reached_concurrent_submission_limit();
+            $can = ! User::has_reached_concurrent_submission_limit();
             $reason = 'concurrent-submission-limit';
         }
@@ -849 +839 @@
 
     /**
-     * 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;
-    }
-
-
-    /**
      * Outputs a notice for users who are prevented from uploading and prevents
      * the upload form from being output.
@@ -914 +877 @@
             );
 
-            if ( self::user_reached_concurrent_submission_limit() ) {
+            if ( User::has_reached_concurrent_submission_limit() ) {
                 $content .= '<p>' . __( 'Thanks for your submissions! Please wait until a photo is approved by moderators before submitting again.', 'wporg-photos' ) . '</p>';
             } else {

sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/user.php

@@ -129 +129 @@
     }
 
+    /**
+     * 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;
+    }
+
 }