Changeset 14640

Timestamp:

01/23/2026 04:13:33 AM (9 months ago)

Author:

dd32

Message:

Add a helper method to allow other WordPress.org sites to add a note to a user, or block (disable) a user.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• mu-plugins/pub/user-helpers.php (added)
• plugins/support-forums/inc/class-audit-log.php (modified) (2 diffs)
• plugins/support-forums/inc/class-user-notes.php (modified) (7 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-audit-log.php

@@ -113 +113 @@
                 $where_from = ! ms_is_switched() ? home_url( '/' ) : $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
                 $where_from = explode( '?', $where_from )[0];
-                $where_from = preg_replace( '!^(?:https?://)?(.+?)/?[^/]*$!i', '$1', $where_from );
+                $where_from = wp_parse_url( $where_from, PHP_URL_HOST ) ?: $where_from;
 
                 // Add a user note about this action.
@@ -123 +123 @@
                 );
 
-                // Used in wporg-login to add context.
+                // Used in wporg-login & user-helpers to add context.
                 $note_text = apply_filters( 'wporg_bbp_forum_role_changed_note_text', $note_text, $user );
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-user-notes.php

@@ -88 +88 @@
          * Saves a note to a users meta data.
          *
-         * @param int    $user_id   The user ID.
-         * @param string $note_text The note text to add.
-         * @param int    $post_id   The support thread this text is related to. Optional.
-         * @param int    $note_id   The note ID to edit. Optional.
-         */
-        public function add_user_note( $user_id, $note_text, $post_id = 0, $note_id = 0 ) {
+         * @param int        $user_id   The user ID.
+         * @param string     $note_text The note text to add.
+         * @param int|string $post_id   The support thread, or URL, this note is related to. Optional.
+         * @param int        $note_id   The note ID to edit. Optional.
+         * @param int|null   $author    The user ID of the note author. Optional. Default null (current user).
+         * @param int|null   $site_id   The site ID where the note is being added. Optional. Default null (current site).
+         */
+        public function add_user_note( $user_id, $note_text, $post_id = 0, $note_id = 0, $author = null, $site_id = null ) {
                 // Make sure the user exists.
                 $user = get_userdata( $user_id );
@@ -100 +102 @@
                 }
 
+                $author  ??= wp_get_current_user()->user_nicename;
+                $site_id ??= get_current_blog_id();
+
+                if ( is_numeric( $author ) || $author instanceof \WP_User ) {
+                        $author = get_userdata( $author )->user_nicename;
+                }
+
                 // Get an array of existing notes, or create an array if there are none.
                 $user_notes = get_user_meta( $user_id, self::META, true );
@@ -106 +115 @@
                 }
 
-                $edit_note = isset( $user_notes[ $note_id ] );
+                $edit_note = $note_id && isset( $user_notes[ $note_id ] );
 
                 if ( ! $edit_note ) {
@@ -115 +124 @@
                                 'text'      => $note_text,
                                 'date'      => current_time( 'mysql' ),
-                                'post_id'   => $post_id,
-                                'site_id'   => get_current_blog_id(),
-                                'moderator' => wp_get_current_user()->user_nicename
+                                'post_id'   => 0,
+                                'site_id'   => $site_id,
+                                'moderator' => $author,
                         );
+
+                        // Associate the note with a post if provided.
+                        if ( is_numeric( $post_id ) && $post_id ) {
+                                $user_notes[ $note_id ]->post_id = $post_id;
+                        } elseif ( $post_id ) {
+                                $user_notes[ $note_id ]->url = esc_url_raw( $post_id );
+                        }
                 } else {
                         // Only keymasters or the note author can edit a note.
@@ -134 +150 @@
                         // Add site ID if missing.
                         if ( ! isset( $user_notes[ $note_id ]->site_id ) ) {
-                                $user_notes[ $note_id ]->site_id = get_current_blog_id();
+                                $user_notes[ $note_id ]->site_id = $site_id;
+                        }
+
+                        // Associate the note with a post if provided.
+                        if ( is_numeric( $post_id ) && $post_id ) {
+                                $user_notes[ $note_id ]->post_id = $post_id;
+                        } elseif ( $post_id ) {
+                                $user_notes[ $note_id ]->url = esc_url_raw( $post_id );
                         }
                 }
@@ -295 +318 @@
                 foreach ( $user_notes as $key => $note ) {
                         $post_site_id       = isset( $note->site_id ) ? (int) $note->site_id : get_current_blog_id();
-                        $post_permalink     = $this->get_user_note_post_permalink( $note->post_id, $user_id, $post_site_id );
+                        if ( ! empty( $note->url ) ) {
+                                $post_permalink = $note->url;
+                                $mod_url        = 'https://profiles.wordpress.org/' . urlencode( $note->moderator ) . '/';
+                        } else {
+                                $post_permalink = $this->get_user_note_post_permalink( $note->post_id, $user_id, $post_site_id );
+                                $mod_url        = get_home_url( $post_site_id, "/users/{$note->moderator}/" );
+                        }
                         $redirect_on_delete = $this->get_user_note_post_permalink( get_the_ID(), $user_id, get_current_blog_id() );
 
@@ -303 +332 @@
                                         __( 'By %1$s on <a href="%2$s">%3$s at %4$s</a>', 'wporg-forums' ),
                                         sprintf( '<a href="%s">%s</a>',
-                                                esc_url( get_home_url( $post_site_id, "/users/{$note->moderator}/" ) ),
+                                                esc_url( $mod_url ),
                                                 $note->moderator
                                         ),