Skip to content

Fix save trp hash.ag #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexandergull wants to merge 3 commits into
base: fix
Choose a base branch
from
Open

Fix save trp hash.ag #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13ca0d9
Fix. TRP. Correctly save TRP hashes. Do not set hashes only if licens…
alexandergull Jan 5, 2026
da27a89
Merge branch 'fix' into fix_save_trp_hash.ag
alexandergull Jan 5, 2026
0cd650f
Fix. TRP. Cleantalk allowed moderation discussion state.
alexandergull Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions inc/cleantalk-public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,20 +1009,6 @@ function ct_set_approved($approved, $_comment)
return 1;
}

/**
* Public action 'comment_post' - Store cleantalk hash in comment meta
*
* @psalm-suppress UnusedParam
* @return void
*/
function ct_set_real_user_badge_automod_hash($comment_id)
{
$hash1 = ct_hash();
if ( ! empty($hash1) ) {
update_comment_meta($comment_id, 'ct_real_user_badge_automod_hash', ct_hash());
}
}

/**
* Public filter 'pre_comment_approved' - Mark comment unapproved always
* @return string
Expand Down
8 changes: 7 additions & 1 deletion inc/cleantalk-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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>';
Expand Down Expand Up @@ -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
*/
Expand Down
48 changes: 33 additions & 15 deletions lib/Cleantalk/Antispam/Integrations/CleantalkPreprocessComment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Cleantalk\Antispam\Integrations;

use Cleantalk\ApbctWP\CleantalkRealPerson;
use Cleantalk\ApbctWP\Sanitize;
use Cleantalk\ApbctWP\Variables\AltSessions;
use Cleantalk\ApbctWP\Variables\Cookie;
Expand Down Expand Up @@ -217,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(
Expand Down Expand Up @@ -250,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()
Expand All @@ -259,6 +260,7 @@ public function allow()
} else {
$this->setCommentPreStatusAndModifyEmail('not_approved');
}
$this->addActionSetTRPHash();
return;
}

Expand All @@ -271,6 +273,7 @@ public function allow()
!$is_allowed_because_of_inactive_license
) {
$this->setCommentPreStatusAndModifyEmail('approved');
$this->addActionSetTRPHash();
} else {
// moderation disabled - standard WP check
if (
Expand All @@ -280,6 +283,7 @@ public function allow()
} else {
$this->setCommentPreStatusAndModifyEmail('not_approved');
}
// thi is the only case when we do not set TRP hash!
}
} else {
//not new author - standard WP check
Expand All @@ -290,9 +294,18 @@ public function allow()
} else {
$this->setCommentPreStatusAndModifyEmail('not_approved');
}
$this->addActionSetTRPHash();
}
}

/**
* TRP hash should be set anyway if Cleantalk processed.
*/
private function addActionSetTRPHash()
{
add_action('comment_post', array(CleantalkRealPerson::class, 'setTRPHash'), 999, 2);
}

public function doBlock($message)
{
$ct_result = $this->base_call_result['ct_result'];
Expand Down Expand Up @@ -536,24 +549,20 @@ private function rerunWPcheckCommentFunction()
return $check_result;
}

/**
* @param $status
*
* @return void
*/
private function setCommentPreStatusAndModifyEmail($status)
{
if ($status !== 'approved' && $status !== 'not_approved') {
return;
}
if ( $status === 'approved' ) {
add_filter('pre_comment_approved', 'ct_set_approved', 999, 2);

// Always set hash for auto-moderated (approved) comments if cleantalk_allowed_moderation is enabled
if (
!empty($this->apbct->settings['cleantalk_allowed_moderation']) &&
$this->apbct->settings['cleantalk_allowed_moderation'] == '1'
) {
add_action('comment_post', 'ct_set_real_user_badge_automod_hash', 999, 2);
}
} else {
add_filter('pre_comment_approved', 'ct_set_not_approved', 999, 2);
}
$pre_comment_approved_callback_function = $status === 'approved'
? 'ct_set_approved'
: 'ct_set_not_approved';
add_filter('pre_comment_approved', $pre_comment_approved_callback_function, 999, 2);

// Modify the email notification
add_filter(
Expand All @@ -563,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';
}
}
51 changes: 40 additions & 11 deletions lib/Cleantalk/ApbctWP/CleantalkRealPerson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@

namespace Cleantalk\ApbctWP;

use Cleantalk\Antispam\Integrations\CleantalkPreprocessComment;

class CleantalkRealPerson
{
public static $meta_hash_name__old = 'ct_real_user_badge_hash';
public static $meta_hash_name__automod = 'ct_real_user_badge_automod_hash';
public static function getLocalizingData()
{
/** @psalm-suppress PossiblyUndefinedVariable */
Expand Down Expand Up @@ -41,23 +45,48 @@ public function publicCommentAddTrpClass($classes, $_css_class, $comment_id, $co
}

// Logic for show TRP badge
$show_trp = false;
$the_real_person = !empty($apbct->settings['comments__the_real_person']) && $apbct->settings['comments__the_real_person'] == '1';
$allowed_moderation = !empty($apbct->settings['cleantalk_allowed_moderation']) && $apbct->settings['cleantalk_allowed_moderation'] == '1';
$show_trp = $the_real_person && self::isTRPHashExist($comment_id) && $comment->comment_author;

if ($show_trp || $show_trp_on_roles) {
$classes[] = 'apbct-trp';
}
return $classes;
}

if ($the_real_person && $allowed_moderation) {
/**
* 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 (CleantalkPreprocessComment::firstCommentAutoModEnabled()) {
// Only for auto-moderated
$automod_hash = get_comment_meta((int)$comment_id, 'ct_real_user_badge_automod_hash', true);
$show_trp = $automod_hash && $comment->comment_author;
} elseif ($the_real_person && !$allowed_moderation) {
$trp_hash = get_comment_meta((int)$comment_id, self::$meta_hash_name__automod, true);
} else {
// Only for old
$old_hash = get_comment_meta((int)$comment_id, 'ct_real_user_badge_hash', true);
$show_trp = $old_hash && $comment->comment_author;
$trp_hash = get_comment_meta((int)$comment_id, self::$meta_hash_name__old, true);
}

if ($show_trp || $show_trp_on_roles) {
$classes[] = 'apbct-trp';
return !empty($trp_hash);
}

/**
* Save TRP hash for comment ID. Autodetect if cleantalk_allowed_moderation is enabled.
* @param int|string $comment_id
*
* @return void
*/
public static function setTRPHash($comment_id)
{
$hash = ct_hash();
if ( ! empty($hash) ) {
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);
}
}
return $classes;
}
}