Changeset 12057

Timestamp:

09/08/2022 08:21:21 PM (2 years ago)

Author:

coffee2code

Message:

Photo Directory, User: Start to centralize user-related functions into the same include file.

• Moves Admin::count_user_rejections() to count_rejected()
• Moves Photos::count_user_published_photos() to count_published_photos()
• Moves Photos::count_user_pending_photos() to count_pending_photos()

Location:

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

Files:

• inc/admin.php (modified) (5 diffs)
• inc/badges.php (modified) (1 diff)
• inc/moderation.php (modified) (1 diff)
• inc/photo.php (modified) (1 diff)
• inc/user.php (added)
• photo-directory.php (modified) (1 diff)

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

@@ -54 +54 @@
         // Modify admin menu links for photo posts.
         add_action( 'admin_menu',                              [ __CLASS__, 'modify_admin_menu_links' ] );
-    }
-
-    /**
-     * Returns the count of the number of photo submissions from a user that were rejected.
-     *
-     * @param int $user_id The user ID.
-     * @return int
-     */
-    public static function count_user_rejections( $user_id ) {
-        global $wpdb;
-
-        return (int) $wpdb->get_var( $wpdb->prepare(
-            "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = %s AND post_status = %s AND post_author = %d",
-            Registrations::get_post_type(),
-            Rejection::get_post_status(),
-            $user_id
-        ) );
     }
 
@@ -533 +516 @@
         . sprintf(
             __( 'Approved: <strong>%s</strong>', 'wporg-photos' ),
-            sprintf( '<a href="%s">%d</a>', $approved_link, Photo::count_user_published_photos() )
+            sprintf( '<a href="%s">%d</a>', $approved_link, User::count_published_photos() )
         )
         . "</div>\n";
 
         // Show number of pending photos if there are any.
-        $pending_count = Photo::count_user_pending_photos();
+        $pending_count = User::count_pending_photos();
         if ( $pending_count ) {
             $pending_link = add_query_arg( [
@@ -763 +746 @@
 
         $author = get_user_by( 'id', $post->post_author );
-        $photos_count = Photo::count_user_published_photos( $author->ID );
+        $photos_count = User::count_published_photos( $author->ID );
         $account_created = explode( ' ', $author->user_registered )[0];
         ?>
@@ -801 +784 @@
                     ?></li>
                     <li><?php
-                        $rejected_count = self::count_user_rejections( $author->ID );
+                        $rejected_count = User::count_rejected_photos( $author->ID );
                         $link_args = [
                             'post_type'   => Registrations::get_post_type(),
@@ -816 +799 @@
                     ?></li>
                     <li><?php
-                        $pending_count = Photo::count_user_pending_photos( $author->ID );
+                        $pending_count = User::count_pending_photos( $author->ID );
                         $link_args = [
                             'post_type'   => Registrations::get_post_type(),

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

@@ -36 +36 @@
         } elseif ( 'publish' === $old_status && 'publish' !== $new_status ) {
             // If the user now has no published Photos, remove the badge.
-            if ( ! Photo::count_user_published_photos( $post->post_author ) ) {
+            if ( ! User::count_published_photos( $post->post_author ) ) {
                 remove_badge( 'photo-contributor', $post->post_author );
             }

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

@@ -463 +463 @@
 
         // Flag if this is user's first submission.
-        $published_photos_count = Photo::count_user_published_photos( $post->post_author );
+        $published_photos_count = User::count_published_photos( $post->post_author );
         if ( ! $published_photos_count ) {
             $flags[ 'no published photo' ] = 'possible';

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

@@ -424 +424 @@
 
     /**
-     * Returns a count of published photos for a user.
-     *
-     * @param int $user_id Optional. The user ID. If not defined, assumes global
-     *                     author. Default false.
-     * @return int
-     */
-    public static function count_user_published_photos( $user_id = false ) {
-        if (  ! $user_id ) {
-            global $authordata;
-
-            $user_id = $authordata->ID;
-        }
-
-        return count_user_posts( $user_id, Registrations::get_post_type(), true );
-    }
-
-    /**
-     * Returns a count of pending photos for a user.
-     *
-     * @param int $user_id Optional. The user ID. If not defined, assumes global
-     *                     author. Default false.
-     * @return int
-     */
-    public static function count_user_pending_photos( $user_id = false ) {
-        if (  ! $user_id ) {
-            global $authordata;
-
-            $user_id = $authordata->ID;
-        }
-
-        $pending = get_posts( [
-            'fields'         => 'ids',
-            'posts_per_page' => -1,
-            'author'         => $user_id,
-            'post_status'    => 'pending',
-            'post_type'      => Registrations::get_post_type(),
-        ] );
-
-        return count( $pending );
-    }
-
-    /**
      * Returns the full photo analysis data from cache or via API call.
      *

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

@@ -28 +28 @@
 require_once __DIR__ . '/inc/template-tags.php';
 require_once __DIR__ . '/inc/uploads.php';
+require_once __DIR__ . '/inc/user.php';
 require_once __DIR__ . '/inc/google-cloud-storage-stream-metadata.php';
 require_once __DIR__ . '/inc/google-cloud-storage.php';