Changeset 5003

Timestamp:

02/24/2017 07:36:00 PM (8 years ago)

Author:

coffee2code

Message:

Support Theme: For user profiles, spam/pending views, and single topic views, indicate moderator who flagged a user.

Props SergeyBiryukov.
Fixes #2493.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support

Files:

• bbpress/user-profile.php (modified) (1 diff)
• functions.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-profile.php

@@ -12 +12 @@
 <div id="bbp-user-profile" class="bbp-user-profile">
     <h2 class="entry-title"><?php esc_html_e( 'Profile', 'wporg-forums' ); ?></h2>
-    <div class="bbp-user-section">
+    <div class="bbp-user-section"><?php
+        if ( class_exists( 'WordPressdotorg\Forums\User_Moderation\Plugin' ) ) {
+            $is_user_flagged = WordPressdotorg\Forums\User_Moderation\Plugin::get_instance()->is_user_flagged( bbp_get_displayed_user_id() );
+            $moderator       = get_user_meta( bbp_get_displayed_user_id(), '_wporg_bbp_moderator', true );
+
+            if ( $is_user_flagged && $moderator ) {
+                printf(
+                    '<div class="bbp-template-notice info"><p>%s</p></div>',
+                    /* translators: %s: moderator's username */
+                    sprintf( __( 'This user has been flagged by %s.', 'wporg-forums' ), $moderator )
+                );
+            }
+        }
+        ?>
 
         <?php if ( bbp_get_displayed_user_field( 'description' ) ) : ?>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php

@@ -236 +236 @@
     $is_user_blocked = ! current_user_can( 'spectate' );
     $notice_class    = '';
-    $notice          = '';
+    $notices         = array();
 
     if ( $is_moderator && in_array( $post_status, array( 'archived', 'pending', 'spam' ) ) ) :
@@ -247 +247 @@
             if ( $reporter ) {
                 /* translators: %s: reporter's username */
-                $notice = sprintf( __( 'This post has been flagged as spam by %s.', 'wporg-forums' ), $reporter );
+                $notices[] = sprintf( __( 'This post has been flagged as spam by %s.', 'wporg-forums' ), $reporter );
             } else {
-                $notice = __( 'This post has been flagged as spam.', 'wporg-forums' );
+                $notices[] = __( 'This post has been flagged as spam.', 'wporg-forums' );
             }
         } elseif ( 'archived' === $post_status ) {
@@ -256 +256 @@
             if ( $moderator ) {
                 /* translators: %s: moderator's username */
-                $notice = sprintf( __( 'This post has been archived by %s.', 'wporg-forums' ), $moderator );
+                $notices[] = sprintf( __( 'This post has been archived by %s.', 'wporg-forums' ), $moderator );
             } else {
-                $notice = __( 'This post is currently archived.', 'wporg-forums' );
+                $notices[] = __( 'This post is currently archived.', 'wporg-forums' );
             }
         } else {
@@ -265 +265 @@
             if ( $moderator ) {
                 /* translators: %s: moderator's username */
-                $notice = sprintf( __( 'This post has been unapproved by %s.', 'wporg-forums' ), $moderator );
+                $notices[] = sprintf( __( 'This post has been unapproved by %s.', 'wporg-forums' ), $moderator );
             } else {
-                $notice = __( 'This post is currently pending.', 'wporg-forums' );
+                $notices[] = __( 'This post is currently pending.', 'wporg-forums' );
             }
         }
 
+        if ( class_exists( 'WordPressdotorg\Forums\User_Moderation\Plugin' ) ) :
+            $is_user_flagged = WordPressdotorg\Forums\User_Moderation\Plugin::get_instance()->is_user_flagged( get_post()->post_author );
+            $moderator       = get_user_meta( get_post()->post_author, '_wporg_bbp_moderator', true );
+
+            if ( $is_user_flagged && $moderator ) {
+                /* translators: %s: moderator's username */
+                $notices[] = sprintf( __( 'This user has been flagged by %s.', 'wporg-forums' ), $moderator );
+            }
+        endif;
+
     elseif ( in_array( $post_status, array( 'pending', 'spam' ) ) ) :
 
         if ( $is_user_blocked ) {
             // Blocked users get a generic message with no call to action or moderation timeframe.
-            $notice = __( 'This post has been held for moderation by our automated system.', 'wporg-forums' );
+            $notices[] = __( 'This post has been held for moderation by our automated system.', 'wporg-forums' );
         } elseif ( $hours_passed > 96 ) {
             $notice_class = 'warning';
-            $notice       = sprintf(
+            $notices[]    = sprintf(
                 /* translators: %s: https://make.wordpress.org/chat/ */
                 __( 'This post was held for moderation by our automated system but has taken longer than expected to get approved. Please come to the #forums channel on <a href="%s">WordPress Slack</a> and let us know. Provide a link to the post.', 'wporg-forums' ),
@@ -284 +294 @@
             );
         } else {
-            $notice = sprintf(
+            $notices[] = sprintf(
                 /* translators: %d: number of hours */
                 _n( 'This post has been held for moderation by our automated system. It will be reviewed within %d hour.', 'This post has been held for moderation by our automated system. It will be reviewed within %d hours.', 72, 'wporg-forums' ),
@@ -293 +303 @@
     endif;
 
-    if ( $notice ) {
+    if ( $notices ) {
         printf(
             '<div class="bbp-template-notice %s"><p>%s</p></div>',
             esc_attr( $notice_class ),
-            $notice
+            implode( '</p><p>', $notices )
         );
     }