Changeset 5657

Timestamp:

07/12/2017 02:43:36 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Add "Always notify me via email of follow-up posts in any topics I reply to" checkbox to user profile.

Fixes #6.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc

Files:

• class-hooks.php (modified) (2 diffs)
• class-users.php (modified) (2 diffs)

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

@@ -51 +51 @@
 
     /**
-     * Check "Notify me of follow-up replies via email" checkbox for new topics by default.
+     * Check "Notify me of follow-up replies via email" box for new topics by default.
+     *
+     * If the user has enabled "Always notify me via email of follow-up posts" option
+     * in their profile, check the box for new replies as well.
      *
      * @param string $checked Checked value of topic subscription.
@@ -57 +60 @@
      */
     public function check_topic_subscription_checkbox( $checked ) {
-        if ( bbp_is_single_forum() || bbp_is_single_view() ) {
+        if (
+            bbp_is_single_forum() || bbp_is_single_view()
+        ||
+            get_user_option( 'auto_topic_subscription' )
+        ) {
             $checked = checked( true, true, false );
         }

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

@@ -6 +6 @@
 
     public function __construct() {
-        // Add a Custom Title input to user's profile.
-        add_action( 'bbp_user_edit_after_name', array( $this, 'add_custom_title_input' ) );
-
-        // Save Custom Title input value.
-        add_action( 'personal_options_update', array( $this, 'save_custom_title' ), 10, 2 );
-        add_action( 'edit_user_profile_update', array( $this, 'save_custom_title' ), 10, 2 );
+        // Add custom fields to user's profile.
+        add_action( 'bbp_user_edit_after_name',        array( $this, 'add_custom_title_input' ) );
+        add_action( 'bbp_user_edit_after',             array( $this, 'add_auto_topic_subscription_checkbox' ) );
+
+        // Save custom field values.
+        add_action( 'personal_options_update',         array( $this, 'save_custom_fields' ), 10, 2 );
+        add_action( 'edit_user_profile_update',        array( $this, 'save_custom_fields' ), 10, 2 );
 
         // Custom user contact methods.
-        add_filter( 'user_contactmethods', array( $this, 'custom_contact_methods' ) );
+        add_filter( 'user_contactmethods',             array( $this, 'custom_contact_methods' ) );
 
         // Only allow 3 published topics from a user in the first 24 hours.
-        add_action( 'bbp_new_topic_pre_insert', array( $this, 'limit_new_user_topics' ) );
+        add_action( 'bbp_new_topic_pre_insert',        array( $this, 'limit_new_user_topics' ) );
 
         // Add query vars and rewrite rules for user's topic and review queries.
-        add_filter( 'query_vars',            array( $this, 'add_query_vars' ) );
-        add_action( 'bbp_add_rewrite_rules', array( $this, 'add_rewrite_rules' ) );
+        add_filter( 'query_vars',                      array( $this, 'add_query_vars' ) );
+        add_action( 'bbp_add_rewrite_rules',           array( $this, 'add_rewrite_rules' ) );
 
         // Parse user's topic and review queries.
@@ -57 +58 @@
         }
         
+        $title = get_user_option( 'title', bbp_get_displayed_user_id() );
         ?>
         <div>
             <label for="title"><?php esc_html_e( 'Custom Title', 'wporg-forums' ); ?></label>
-            <input type="text" name="title" id="title" value="<?php echo esc_attr( get_user_option( 'title', bbpress()->displayed_user->ID ) ); ?>" class="regular-text" />
+            <input type="text" name="title" id="title" value="<?php echo esc_attr( $title ); ?>" class="regular-text" />
         </div>
-    <?php
-    }
-
-    /**
-     * Save Custom Title input value.
+        <?php
+    }
+
+    /**
+     * Add an auto topic subscription checkbox to user's profile.
+     */
+    public function add_auto_topic_subscription_checkbox() {
+        $auto_topic_subscription = get_user_option( 'auto_topic_subscription', bbp_get_displayed_user_id() );
+        ?>
+        <p>
+            <input name="auto_topic_subscription" id="auto_topic_subscription" type="checkbox" value="yes" <?php checked( $auto_topic_subscription ); ?> />
+            <label for="auto_topic_subscription"><?php esc_html_e( 'Always notify me via email of follow-up posts in any topics I reply to', 'wporg-forums' ); ?></label>
+        </p>
+        <?php
+    }
+
+    /**
+     * Save custom field values.
      *
      * @param int $user_id The user ID.
      */
-    public function save_custom_title( $user_id ) {
-        if ( ! current_user_can( 'moderate' ) || ! isset( $_POST['title'] ) ) {
-            return;
-        }
-
-        update_user_option( $user_id, 'title', sanitize_text_field( $_POST['title'] ) );
+    public function save_custom_fields( $user_id ) {
+        if ( current_user_can( 'moderate' ) && isset( $_POST['title'] ) ) {
+            update_user_option( $user_id, 'title', sanitize_text_field( $_POST['title'] ) );
+        }
+
+        $auto_topic_subscription = isset( $_POST['auto_topic_subscription'] );
+        update_user_option( $user_id, 'auto_topic_subscription', $auto_topic_subscription );
     }