Ticket #4192: 4192.patch

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

@@ -23 +23 @@
 
                 add_action( 'bbp_post_request',                     array( $this, 'add_user_note' ) );
                 add_action( 'bbp_get_request',                      array( $this, 'delete_user_note' ) );
+                add_action( 'bbp_user_edit_after',                  array( $this, 'edit_user_display_note_form' ) );
+                add_action( 'edit_user_profile_update',             array( $this, 'edit_user_add_user_note' ), 10, 2 );
 
                 add_action( 'bbp_theme_after_topic_author_details', array( $this, 'display_user_notes_toggle_link' ) );
                 add_action( 'bbp_theme_after_reply_author_details', array( $this, 'display_user_notes_toggle_link' ) );
@@ -43 +45 @@
                 wp_enqueue_script( 'wporg-bbp-user-notes', plugins_url( '/js/user-notes.js', __DIR__ ), array( 'jquery' ), '20170710', true );
         }
 
-        /**
-         * Checks if a user note is added and saves it to user's meta data.
-         *
-         * @param string $action Requested action.
-         */
-        public function add_user_note( $action = '' ) {
-                if ( 'wporg_bbp_add_user_note' !== $action || ! current_user_can( 'moderate' ) ) {
-                        return;
-                }
-
-                $user_id   = isset( $_POST['user_id'] ) ? (int) $_POST['user_id'] : 0;
-                $post_id   = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
-
-                $note_id   = isset( $_POST['note_id'] ) ? (int) $_POST['note_id'] : 0;
-                $note_text = isset( $_POST['note_text'] ) ? wp_kses( $_POST['note_text'], array( 'a' => array( 'href' => true ) ) ) : '';
-
-                if ( ! $user_id || ! $note_text ) {
-                        return;
-                }
-
-                // Make sure our nonces are in order.
-                if ( ! bbp_verify_nonce_request( sprintf( 'wporg-bbp-add-user-note_%d', $user_id ) ) ) {
-                        return;
-                }
-
+        public function save_user_note( $user_id, $note_text, $post_id = 0, $note_id = 0 ) {
                 // Make sure the user exists.
                 $user = get_userdata( $user_id );
                 if ( ! $user ) {
@@ -97 +75 @@
                         // Only keymasters or the note author can edit a note.
                         if (
                                 ! current_user_can( 'keep_gate' )
-                        &&
+                                &&
                                 $user_notes[ $note_id ]->moderator !== wp_get_current_user()->user_nicename
                         ) {
                                 return;
@@ -113 +91 @@
                 }
 
                 update_user_meta( $user_id, self::META, $user_notes );
+    }
+
+        /**
+         * Checks if a user note is added and saves it to user's meta data.
+         *
+         * @param string $action Requested action.
+         */
+        public function add_user_note( $action = '' ) {
+                if ( 'wporg_bbp_add_user_note' !== $action || ! current_user_can( 'moderate' ) ) {
+                        return;
+                }
+
+                $user_id   = isset( $_POST['user_id'] ) ? (int) $_POST['user_id'] : 0;
+                $post_id   = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
+
+                $note_id   = isset( $_POST['note_id'] ) ? (int) $_POST['note_id'] : 0;
+                $note_text = isset( $_POST['note_text'] ) ? wp_kses( $_POST['note_text'], array( 'a' => array( 'href' => true ) ) ) : '';
+
+                if ( ! $user_id || ! $note_text ) {
+                        return;
+                }
+
+                // Make sure our nonces are in order.
+                if ( ! bbp_verify_nonce_request( sprintf( 'wporg-bbp-add-user-note_%d', $user_id ) ) ) {
+                        return;
+                }
+
+                $this->save_user_note( $user_id, $note_text, $post_id, $note_id );
 
                 $redirect_url = set_url_scheme( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
 
@@ -409 +415 @@
                 <?php
         }
 
+        public function edit_user_display_note_form() {
+            if ( bbp_get_displayed_user_id() === get_current_user_id() ) {
+                return;
+        }
+        ?>
+        <fieldset class="bbp-form">
+            <div>
+                <label for="wporg-bbp-user-note-text"><?php esc_html_e( 'Add user note:', 'wporg-forums' ); ?></label>
+                <textarea name="note_text" id="wporg-bbp-user-note-text" cols="40" rows="5"></textarea>
+            </div>
+        </fieldset>
+        <?php
+    }
+
+    public function edit_user_add_user_note( $user_id ) {
+        if ( ! current_user_can( 'moderate' ) ) {
+            return;
+        }
+
+        if ( ! isset( $_POST['note_text'] ) || empty( $_POST['note_text'] ) ) {
+            return;
+        }
+
+        $this->save_user_note( $user_id, wp_kses( $_POST['note_text'], array( 'a' => array( 'href' => true ) ) ) );
+    }
+
         /**
          * Displays toggle link for notes to the author area of a post.
          */