Fix. TRP. Cleantalk allowed moderation discussion state.

Author: alexandergull

inc/cleantalk-settings.php

@@ -63,6 +63,7 @@ function apbct_settings_add_page()
         global $apbct;
 
         $filtered = ($value === '1' || $value === 1) ? '1' : '0';
+        //sync discussion and plugin settings
         if ($old_value !== $filtered) {
             $apbct->settings['cleantalk_allowed_moderation'] = $filtered;
             $apbct->saveSettings();
@@ -2101,7 +2102,7 @@ function apbct_discussion_settings__field__moderation()
                 name="cleantalk_allowed_moderation" 
                 id="cleantalk_allowed_moderation" 
                 value="1" ' .
-                checked('1', $apbct->settings['cleantalk_allowed_moderation'], false) .
+                checked('1', TT::toString($apbct->settings['cleantalk_allowed_moderation'], '0'), false) .
                 '/> ';
     $output .= esc_html__('Skip manual approving for the very first comment if a comment has been allowed by CleanTalk Anti-Spam protection.', 'cleantalk-spam-protect');
     $output .= '</label>';
@@ -2575,6 +2576,11 @@ function apbct_settings__validate($incoming_settings)
         $incoming_settings['data__email_decoder_obfuscation_custom_text'] = ContactsEncoder::getDefaultReplacingText();
     }
 
+    //sync discussion and plugin settings
+    if (isset($incoming_settings['cleantalk_allowed_moderation'])) {
+        update_option('cleantalk_allowed_moderation', TT::toString($incoming_settings['cleantalk_allowed_moderation'], '0'));
+    }
+
     /**
      * Triggered before returning the settings
      */

lib/Cleantalk/Antispam/Integrations/CleantalkPreprocessComment.php

@@ -218,7 +218,7 @@ public function allow()
     {
         $wp_comment_moderation_enabled = get_option('comment_moderation') === '1';
         $wp_auto_approve_for_user_who_has_approved_comment = get_option('comment_previously_approved') === '1';
-        $clentalk_option_skip_moderation_for_first_comment = get_option('cleantalk_allowed_moderation', 1) == 1;
+        $cleantalk_option_skip_moderation_for_first_comment = self::firstCommentAutoModEnabled();
         $is_allowed_because_of_inactive_license = false;
 
         $args            = array(
@@ -251,7 +251,7 @@ public function allow()
         // if anu of options is disabled - standard WP recheck and exit
         if (
             !$wp_auto_approve_for_user_who_has_approved_comment ||
-            !$clentalk_option_skip_moderation_for_first_comment
+            !$cleantalk_option_skip_moderation_for_first_comment
         ) {
             if (
                 $this->rerunWPcheckCommentFunction()
@@ -572,4 +572,13 @@ private function setCommentPreStatusAndModifyEmail($status)
             2
         ); // Add two blacklist links: by email and IP
     }
+
+    /**
+     * @return bool
+     */
+    public static function firstCommentAutoModEnabled()
+    {
+        global $apbct;
+        return !empty($apbct->settings['cleantalk_allowed_moderation']) && $apbct->settings['cleantalk_allowed_moderation'] == '1';
+    }
 }

lib/Cleantalk/ApbctWP/CleantalkRealPerson.php

@@ -2,6 +2,8 @@
 
 namespace Cleantalk\ApbctWP;
 
+use Cleantalk\Antispam\Integrations\CleantalkPreprocessComment;
+
 class CleantalkRealPerson
 {
     public static $meta_hash_name__old = 'ct_real_user_badge_hash';
@@ -52,23 +54,14 @@ public function publicCommentAddTrpClass($classes, $_css_class, $comment_id, $co
         return $classes;
     }
 
-    /**
-     * @return bool
-     */
-    private static function isAutomodEnabled()
-    {
-        global $apbct;
-        return !empty($apbct->settings['cleantalk_allowed_moderation']) && $apbct->settings['cleantalk_allowed_moderation'] == '1';
-    }
-
     /**
      * Check if TRP hash is saved for comment ID. Autodetect if cleantalk_allowed_moderation is enabled.
      * @param int|string $comment_id
      * @return bool
      */
     public static function isTRPHashExist($comment_id)
     {
-        if (self::isAutomodEnabled()) {
+        if (CleantalkPreprocessComment::firstCommentAutoModEnabled()) {
             // Only for auto-moderated
             $trp_hash = get_comment_meta((int)$comment_id, self::$meta_hash_name__automod, true);
         } else {
@@ -89,7 +82,7 @@ public static function setTRPHash($comment_id)
     {
         $hash = ct_hash();
         if ( ! empty($hash) ) {
-            if (self::isAutomodEnabled()) {
+            if (CleantalkPreprocessComment::firstCommentAutoModEnabled()) {
                 update_comment_meta((int)$comment_id, self::$meta_hash_name__automod, $hash);
             } else {
                 update_comment_meta((int)$comment_id, self::$meta_hash_name__old, $hash);