Version 3.14.0 (#31)

Glomberg · alexandergull · svfcode · web-flow · commit 55d26041c1fe · 2025-07-15T10:46:44.000+03:00
* Fix. Options. CSite::GetList() usage fixed on non-variable reference cases. * Fix. Settings. Improved key validation rules. * Fix. Settings. Fixed settings tab render. * Upd. Settings. Add custom server option. (#30) * Upd. Settings. Add custom server option. * Upd. Settings. Custom server option refactoring. * Upd. Settings. Improved server option. * Fix. Settings. Complete deactivation fixed. * Fix. Common. Add topics creation details. * New. Constant. Ignore rule of 5 approved comments if "CLEANTALK__IGNORE_APPROVED_COMMENTS_COUNT_RULE" is defined * Fix. Remote Calls. Getting home url fixed. * Fix. Version. Agent version fixed. * Fix. Code. Github actions fixed. * Fix. Settings. Multisite Api-key saving fixed. * Fix. Version fixed. * Upd. Changelog updated. --------- Co-authored-by: alexandergull <alex.g@cleantalk.org> Co-authored-by: SVFCode <svfcode@mail.ru>
diff --git a/.github/workflows/releaseNotice.yml b/.github/workflows/releaseNotice.yml
@@ -1,4 +1,4 @@
-name: Notice about releases via Telegram
+name: Notice about releases via Matrix
 
 on:
   release:
@@ -9,15 +9,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: send telegram message on release
-        uses: appleboy/telegram-action@master
+      - name: Send Matrix message on release
+        uses: Glomberg/matrix-messenger-action@master
         with:
-          to: ${{ secrets.TELEGRAM_TO }}
-          token: ${{ secrets.TELEGRAM_TOKEN }}
+          server: ${{ secrets.MATRIX_SERVER }}
+          to: ${{ secrets.MATRIX_NEWS_ROOM }}
+          token: ${{ secrets.MATRIX_USER_TOKEN }}
           message: |
             ${{ github.event.repository.description }} <strong>v${{github.event.release.name}}</strong> released
-            ${{github.event.release.html_url}}
-            
-            ${{ github.event.release.body }}
-          format: html
-          disable_web_page_preview: true
+            <br>${{github.event.release.html_url}}
+            <br>
+            <br><pre>${{ github.event.release.body }}</pre>
diff --git a/.github/workflows/reviewNotice.yml b/.github/workflows/reviewNotice.yml
@@ -1,4 +1,4 @@
-name: Notice about review approved via Telegram
+name: Notice about review approved via Matrix
 
 on:
   pull_request_review:
@@ -13,15 +13,14 @@ jobs:
       - name: Convert date format
         id: date
         run: echo "::set-output name=date::$(date -d "${{ github.event.pull_request.created_at }}" +"%Y-%m-%d")"
-      - name: Send telegram message on review approved
-        uses: appleboy/telegram-action@master
+      - name: Send Matrix message on review approved
+        uses: Glomberg/matrix-messenger-action@master
         with:
-          to: ${{ secrets.TELEGRAM_PLUGINS_TO }}
-          token: ${{ secrets.TELEGRAM_REVIEWER_TOKEN }}
+          server: ${{ secrets.MATRIX_SERVER }}
+          to: ${{ secrets.MATRIX_EXTERNSION_ROOM }}
+          token: ${{ secrets.MATRIX_USER_TOKEN }}
           message: |
             💥🎉🎉🎉💥 Pull-request <a href="${{ github.event.pull_request.html_url }}"><strong>${{ github.event.pull_request.title }}</strong></a> 
             submitted by <strong>${{ github.event.pull_request.user.login }}</strong> at <strong>${{ steps.date.outputs.date }}</strong>
 
             was <strong>approved</strong> and is ready to merge <a href="${{ github.event.pull_request.html_url }}">➡️</a> !!!
-          format: html
-          disable_web_page_preview: true
diff --git a/cleantalk.antispam/default_option.php b/cleantalk.antispam/default_option.php
@@ -21,4 +21,5 @@
     'form_exclusions_fields__regexp' => 0,
     'form_exclusions_webform' => '',
     'complete_deactivation' => 0,
+    'use_custom_server' => '',
 );
diff --git a/cleantalk.antispam/description.en b/cleantalk.antispam/description.en
@@ -1,15 +1,11 @@
 <ul>
-    <li>* Fix. SFW. Update log on SFW pass fixed.</li>
-    <li>* Fix. SFW update. Temp tables fixes.</li>
-    <li>* Fix. SFW. Reduction to a number.</li>
-    <li>* Fix. Settings. Getting Access Key message fixed.</li>
-    <li>* New. Settings. Added option for sfw pass get param.</li>
-    <li>* Fix. USER variable is null.</li>
-    <li>* Fix. SFW. Writing logs fixed.</li>
-    <li>* Fix. Frontend data. Mouse moving collecting removed.</li>
-    <li>* New. Anti-spam. Bot detector support added.</li>
-    <li>* Fix. Options. JS code fixed.</li>
-    <li>* New. Options. Support different api key for multisite mode.</li>
-    <li>* Fix. SFW. Testing block page fixed.</li>
-    <li>* Fix. Settings. Multisite option getting fixed.</li>
+    <li>Fix. Options. CSite::GetList() usage fixed on non-variable reference cases.</li>
+    <li>Fix. Settings. Improved key validation rules.</li>
+    <li>Fix. Settings. Fixed settings tab render.</li>
+    <li>Upd. Settings. Add custom server option. (#30)</li>
+    <li>Fix. Settings. Complete deactivation fixed.</li>
+    <li>Fix. Common. Add topics creation details.</li>
+    <li>New. Constant. Ignore rule of 5 approved comments if "CLEANTALK__IGNORE_APPROVED_COMMENTS_COUNT_RULE" is defined</li>
+    <li>Fix. Remote Calls. Getting home url fixed.</li>
+    <li>Fix. Settings. Multisite Api-key saving fixed.</li>
 </ul>
diff --git a/cleantalk.antispam/description.ru b/cleantalk.antispam/description.ru
@@ -1,15 +1,11 @@
 <ul>
-    <li>* Fix. SFW. Update log on SFW pass fixed.</li>
-    <li>* Fix. SFW update. Temp tables fixes.</li>
-    <li>* Fix. SFW. Reduction to a number.</li>
-    <li>* Fix. Settings. Getting Access Key message fixed.</li>
-    <li>* New. Settings. Added option for sfw pass get param.</li>
-    <li>* Fix. USER variable is null.</li>
-    <li>* Fix. SFW. Writing logs fixed.</li>
-    <li>* Fix. Frontend data. Mouse moving collecting removed.</li>
-    <li>* New. Anti-spam. Bot detector support added.</li>
-    <li>* Fix. Options. JS code fixed.</li>
-    <li>* New. Options. Support different api key for multisite mode.</li>
-    <li>* Fix. SFW. Testing block page fixed.</li>
-    <li>* Fix. Settings. Multisite option getting fixed.</li>
+    <li>Fix. Options. CSite::GetList() usage fixed on non-variable reference cases.</li>
+    <li>Fix. Settings. Improved key validation rules.</li>
+    <li>Fix. Settings. Fixed settings tab render.</li>
+    <li>Upd. Settings. Add custom server option. (#30)</li>
+    <li>Fix. Settings. Complete deactivation fixed.</li>
+    <li>Fix. Common. Add topics creation details.</li>
+    <li>New. Constant. Ignore rule of 5 approved comments if "CLEANTALK__IGNORE_APPROVED_COMMENTS_COUNT_RULE" is defined</li>
+    <li>Fix. Remote Calls. Getting home url fixed.</li>
+    <li>Fix. Settings. Multisite Api-key saving fixed.</li>
 </ul>
diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
@@ -23,7 +23,7 @@
 use Cleantalk\ApbctBitrix\SFW;
 
 if ( ! defined( 'CLEANTALK_USER_AGENT' ) )
-    define( 'CLEANTALK_USER_AGENT', 'bitrix-3.12.0' );
+    define( 'CLEANTALK_USER_AGENT', 'bitrix-3.14.0' );
 
 define('APBCT_TBL_FIREWALL_DATA', 'cleantalk_sfw');      // Table with firewall data.
 define('APBCT_TBL_FIREWALL_LOG',  'cleantalk_sfw_logs'); // Table with firewall logs.
@@ -182,7 +182,14 @@ public static function OnPageStartHandler()
         if( ! $USER->IsAdmin() ){
 
             if ( $bot_detector ) {
-                Asset::getInstance()->addJs('https://moderate.cleantalk.org/ct-bot-detector-wrapper.js');
+                if (class_exists('COption')) {
+                    $use_custom_server = \COption::GetOptionString( 'cleantalk.antispam', 'use_custom_server', '' );
+                    if ($use_custom_server !== '') {
+                        Asset::getInstance()->addJs('https://moderate.' . $use_custom_server . '/ct-bot-detector-wrapper.js');
+                    } else {
+                        Asset::getInstance()->addJs('https://moderate.cleantalk.org/ct-bot-detector-wrapper.js');
+                    }
+                }
             }
 
             // Set cookies
@@ -771,19 +778,27 @@ static function OnBeforeMessageAddHandler(&$arFields) {
                     array('AUTHOR_ID'=>$arFields['AUTHOR_ID'], 'APPROVED'=>'Y'),
                     TRUE
                 );
-                if(intval($approved_messages) > 5) {
+                if(intval($approved_messages) > 5 && !defined('CLEANTALK__IGNORE_APPROVED_COMMENTS_COUNT_RULE')) {
                     return;
                 }
                 $aComment['sender_email'] = $USER->GetEmail();
             } else {
                 $aComment['sender_email'] = isset($arFields['EMAIL']) ? $arFields['EMAIL'] : '';
             }
 
-            $aComment['type'] = 'comment';
-            $aComment['sender_nickname'] = isset($arFields['AUTHOR_NAME']) ? $arFields['AUTHOR_NAME'] : '';
-            $aComment['subject'] = '';
-            $aComment['message'] = isset($arFields['POST_MESSAGE']) ? array($arFields['POST_MESSAGE']) : array();
-            $aComment['example'] = array();
+            if (isset($arFields['TITLE']) && isset($arFields['DESCRIPTION'])) {
+                $aComment['type'] = 'topic_add';
+                $aComment['sender_nickname'] = isset($arFields['LAST_POSTER_NAME']) ? $arFields['LAST_POSTER_NAME'] : '';
+                $aComment['subject'] = isset($arFields['TITLE']) ? array($arFields['TITLE']) : '';
+                $aComment['message'] = isset($arFields['DESCRIPTION']) ? array($arFields['DESCRIPTION']) : array();
+                $aComment['example'] = array();
+            } else {
+                $aComment['type'] = 'comment';
+                $aComment['sender_nickname'] = isset($arFields['AUTHOR_NAME']) ? $arFields['AUTHOR_NAME'] : '';
+                $aComment['subject'] = '';
+                $aComment['message'] = isset($arFields['POST_MESSAGE']) ? array($arFields['POST_MESSAGE']) : array();
+                $aComment['example'] = array();
+            }
 
             if(COption::GetOptionInt('cleantalk.antispam', 'form_send_example', 0) == 1){
                 $arTopic = CForumTopic::GetByID($arFields['TOPIC_ID']);
@@ -1263,7 +1278,17 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = n
             }
 
             $type = $arEntity['type'];
-            if($type != 'comment' && $type != 'webform' && $type != 'register' && $type != 'order' && $type != 'feedback_general_contact_form' && $type != 'private_message' && strpos($type, 'contact_form_bitrix') === false){
+            $allowed_types = array(
+                'topic_add',
+                'comment',
+                'webform',
+                'register',
+                'order',
+                'feedback_general_contact_form',
+                'private_message',
+            );
+
+            if(!in_array($type, $allowed_types) && strpos($type, 'contact_form_bitrix') === false){
                 CEventLog::Add(array(
                     'SEVERITY' => 'SECURITY',
                     'AUDIT_TYPE_ID' => 'CLEANTALK_E_INTERNAL',
@@ -1372,6 +1397,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = n
             );
 
             switch ($type) {
+                case 'topic_add':
                 case 'comment':
                     $timelabels_key = 'mail_error_comment';
                     if (is_array($arEntity['message'])) {
@@ -1382,11 +1408,10 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = n
                     }
                     $request_params['message'] = $arEntity['message'];
                     $request_params['example'] = $arEntity['example'];
-                    $request_params['post_info']['comment_type'] = 'comment';
+                    $request_params['post_info']['comment_type'] = $type;
 
                     $ct_request = new CleantalkRequest($request_params);
                     $ct_result = $ct->isAllowMessage($ct_request);
-
                     break;
 
                 case 'order':
@@ -1710,6 +1735,19 @@ static function GetCleanTalkResume($module, $id) {
      */
     private static function GetWorkServer() {
         global $DB;
+
+        if (class_exists('COption')) {
+            $use_custom_server = \COption::GetOptionString( 'cleantalk.antispam', 'use_custom_server', '' );
+            if ($use_custom_server !== '') {
+                return array(
+                    'work_url' => 'http://moderate.' . $use_custom_server,
+                    'server_url' => 'http://moderate.' . $use_custom_server,
+                    'server_ttl' => 0,
+                    'server_changed' => 0,
+                );
+            }
+        }
+
         $result = $DB->Query('SELECT work_url,server_url,server_ttl,server_changed FROM cleantalk_server LIMIT 1')->Fetch();
         if($result !== FALSE)
             return array(
@@ -1750,7 +1788,17 @@ private static function ExceptionList($value = null)
      */
     private static function SetWorkServer($work_url = 'https://moderate.cleantalk.org', $server_url = 'https://moderate.cleantalk.org', $server_ttl = 0, $server_changed = 0) {
         global $DB;
+
         $result = $DB->Query('SELECT count(*) AS count FROM cleantalk_server')->Fetch();
+
+        if (class_exists('COption')) {
+            $use_custom_server = \COption::GetOptionString( 'cleantalk.antispam', 'use_custom_server', '' );
+            if ($use_custom_server !== '') {
+                $work_url = 'http://moderate.' . $use_custom_server;
+                $server_url = 'http://moderate.' . $use_custom_server;
+            }
+        }
+
         if($result['count'] == 0){
             $arInsert = $DB->PrepareInsert(
                 'cleantalk_server',
diff --git a/cleantalk.antispam/install/index.php b/cleantalk.antispam/install/index.php
@@ -150,7 +150,9 @@ function DoUninstall() {
         //Complete deactivation removes all the options
         if ( Option::get( 'cleantalk.antispam', 'complete_deactivation') == 1 ) {
             $ct_option_names = array_keys(Option::getForModule('cleantalk.antispam'));
-            Option::delete('cleantalk.antispam',$ct_option_names);
+            foreach ( $ct_option_names as $option_name ) {
+                Option::delete('cleantalk.antispam', array('name' => $option_name));
+            }
         }
 
         if (IsModuleInstalled('blog')){
diff --git a/cleantalk.antispam/install/version.php b/cleantalk.antispam/install/version.php
@@ -1,5 +1,5 @@
 <?php
 $arModuleVersion = array(
-	"VERSION" => "3.13.0",
-	"VERSION_DATE" => "2024-10-14 10:00:00",
+	"VERSION" => "3.14.0",
+	"VERSION_DATE" => "2025-07-15 10:00:00",
 );
diff --git a/cleantalk.antispam/lang/en/options.php b/cleantalk.antispam/lang/en/options.php
@@ -54,4 +54,6 @@
 $MESS['CLEANTALK_WRONG_DEFAULT_SETTINGS'] = 'Can not load default options. Module name is incorrect.';
 $MESS['CLEANTALK_WRONG_CURRENT_SETTINGS'] = 'Can not load current options.';
 $MESS['CLEANTALK_RESET_OPTIONS_FAILED'] = 'Can not reset options to defaults.';
-$MESS['CLEANTALK_MULTISITE_LABEL_KEY'] = 'If you want to use specific Access Key for this website paste it here. Otherwise, leave it empty.';
+$MESS['CLEANTALK_MULTISITE_LABEL_KEY'] = 'If you want to use specific Access Key for this website paste it here. Otherwise, leave it empty.';
+$MESS['CLEANTALK_USE_CUSTOM_SERVER'] = 'Use custom server';
+$MESS['CLEANTALK_USE_CUSTOM_SERVER_DESCRIPTION'] = 'Use custom server for spam checking. You can enter cleantalk.ru and the plugin will use only ru servers. This option is for critical situations when it is impossible to choose the server automatically.';
diff --git a/cleantalk.antispam/lang/ru/options.php b/cleantalk.antispam/lang/ru/options.php
@@ -54,4 +54,7 @@
 $MESS['CLEANTALK_WRONG_DEFAULT_SETTINGS'] = 'Невоможно загрузить опции по умолчанию. Ошибка в имени модуля.';
 $MESS['CLEANTALK_WRONG_CURRENT_SETTINGS'] = 'Невоможно загрузить текущие опции.';
 $MESS['CLEANTALK_RESET_OPTIONS_FAILED'] = 'Невоможно сбросить опции.';
-$MESS['CLEANTALK_MULTISITE_LABEL_KEY'] = 'Если вы хотите использовать отдельный ключ доступа для этого сайта, вставьте его здесь. В противном случае оставьте поле пустым.';
+$MESS['CLEANTALK_MULTISITE_LABEL_KEY'] = 'Если вы хотите использовать отдельный ключ доступа для этого сайта, вставьте его здесь. В противном случае оставьте поле пустым.';
+$MESS['CLEANTALK_USE_CUSTOM_SERVER'] = 'Использовать кастомный сервер';
+$MESS['CLEANTALK_USE_CUSTOM_SERVER_DESCRIPTION'] = 'Использовать кастомный сервер для проверки спама. Можете ввести cleantalk.ru и плагин будет использовать только ru сервера. Опция для критических ситуаций, когда невозможен выбор сервера автоматически.';
+$MESS['CLEANTALK_SERVER_NOT_AVAILABLE'] = 'Указанные сервера не доступны, обратитесь в тех поддержку https://cleantalk.org/my/support/open';
diff --git a/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/Helper.php b/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/Helper.php
@@ -39,4 +39,16 @@ public static function SfwUpdate_DoFinisnAction()
     {
         \COption::SetOptionInt('cleantalk.antispam', 'sfw_last_update', time());
     }
-}
+
+    /**
+     * @inheritDoc
+     */
+    protected static function getSiteUrl()
+    {
+        return sprintf(
+            '%s://%s',
+            isset( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] === 'on' ? 'https' : 'http',
+            $_SERVER['HTTP_HOST']
+        );
+    }
+}
diff --git a/cleantalk.antispam/lib/Cleantalk/Common/API.php b/cleantalk.antispam/lib/Cleantalk/Common/API.php
@@ -16,7 +16,7 @@
 class API
 {
 	/* Default params  */
-	const URL = 'https://api.cleantalk.org';
+	public static $URL = 'https://api.cleantalk.org';
 	const AGENT = 'ct-php-lib-1.0';
 	
 	/**
@@ -205,7 +205,7 @@ public static function method__spam_check_cms($api_key, $data, $date = null, $do
 		
 		if($date) $request['date'] = $date;
 		
-		$result = static::send_request($request, self::URL, 20);
+		$result = static::send_request($request, self::$URL, 20);
 		$result = $do_check ? static::check_response($result, 'spam_check_cms') : $result;
 		
 		return $result;
@@ -234,7 +234,7 @@ public static function method__spam_check($api_key, $data, $date = null, $do_che
             $request['date'] = $date;
         }
 		
-		$result = static::send_request($request, self::URL, 10);
+		$result = static::send_request($request, self::$URL, 10);
 		$result = $do_check ? static::check_response($result, 'spam_check') : $result;
 		
 		return $result;
@@ -631,8 +631,13 @@ public static function method__request_checksums($api_key, $plugins_and_themes_t
 	 *
 	 * @return array|bool
 	 */
-	public static function send_request($data, $url = self::URL, $timeout = 10, $ssl = false, $ssl_path = '')
+	public static function send_request($data, $url = null, $timeout = 10, $ssl = false, $ssl_path = '')
 	{
+		// Set default URL if not provided
+		if ($url === null) {
+			$url = self::$URL;
+		}
+
 		// Possibility to switch agent vaersion
 		$data['agent'] = !empty($data['agent'])
 			? $data['agent']
@@ -650,6 +655,14 @@ public static function send_request($data, $url = self::URL, $timeout = 10, $ssl
 		}
 		
 		// Possibility to switch API url
+		if ($url == self::$URL) {
+			if (class_exists('COption')) {
+				$use_custom_server = \COption::GetOptionString( 'cleantalk.antispam', 'use_custom_server', '' );
+				if ($use_custom_server !== '') {
+					$url = 'https://api.' . $use_custom_server;
+				}
+			}
+		}
 		$url = defined('CLEANTALK_API_URL') ? CLEANTALK_API_URL : $url;
 		
 		if(function_exists('curl_init')){
diff --git a/cleantalk.antispam/lib/Cleantalk/Common/Helper.php b/cleantalk.antispam/lib/Cleantalk/Common/Helper.php
@@ -1348,10 +1348,11 @@ public static function http__request__rc_to_host($rc_action, $request_params, $p
     /**
      * Get site url for remote calls.
      *
-     * @return string@important This method can be overloaded in the CMS-based Helper class.
+     * @return string
      *
+     * @important This method can be overloaded in the CMS-based Helper class.
      */
-    private static function getSiteUrl()
+    protected static function getSiteUrl()
     {
         return ( isset( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://" . $_SERVER['HTTP_HOST'] . ( isset($_SERVER['SCRIPT_URL'] ) ? $_SERVER['SCRIPT_URL'] : '' );
     }
diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
