From dd01c16ffaa3c37f96bd495f1cf24f84b213171c Mon Sep 17 00:00:00 2001
From: alexandergull <galyshev@cleantalk.org>
Date: Thu, 2 Nov 2023 14:13:42 +0500
Subject: [PATCH 01/16] Fix. SFW. Update log on SFW pass fixed.

---
 .../Cleantalk/Common/Firewall/Modules/SFW.php | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php
index 7d59252..2deb37b 100644
--- a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php
+++ b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php
@@ -28,12 +28,12 @@ class SFW extends FirewallModule {
 	public function __construct( $data_table, $params = array() )
     {
 		$this->db_data_table_name = $data_table ?: null;
-		
+
 		foreach( $params as $param_name => $param ){
 			$this->$param_name = isset( $this->$param_name ) ? $param : false;
 		}
 	}
-	
+
 	/**
 	 * Use this method to execute main logic of the module.
 	 *
@@ -51,7 +51,7 @@ public function check()
         } else {
             $ct_sfw_pass_key = Cookie::get( 'ct_sfw_pass_key');
         }
-		
+
 		// Skip by cookie
 		foreach( $this->ip_array as $current_ip ){
 
@@ -66,7 +66,7 @@ public function check()
                     }
 
                     // Do logging an one passed request
-                    $this->update_log( $current_ip, 'PASS_SFW' );
+                    $this->update_log( $current_ip, 'PASS_SFW', false );
 
                     if( $this->sfw_counter ){
                         // @ToDo have to implement the logic of incrementing and saving count of all handled requests.
@@ -81,11 +81,11 @@ public function check()
                 if( $status ) {
                     $results[] = array('ip' => $current_ip, 'is_personal' => false, 'status' => 'PASS_SFW__BY_WHITELIST',);
                 }
-					
+
 				return $results;
 			}
 		}
-		
+
 		// Common check
 		foreach( $this->ip_array as $origin => $current_ip )
 		{
@@ -96,7 +96,7 @@ public function check()
 				$needles[] = sprintf( "%u", bindec( $mask & base_convert( $current_ip_v4, 10, 2 ) ) );
 			}
 			$needles = array_unique( $needles );
-			
+
 			$db_results = $this->db->fetch_all("SELECT * FROM " . $this->db_data_table_name . "
 				WHERE network IN (". implode( ',', $needles ) .")
 				AND	network = " . $current_ip_v4 . " & mask 
@@ -104,7 +104,7 @@ public function check()
 				ORDER BY status DESC");
 
 			if ( ! empty( $db_results ) ) {
-				
+
 				foreach( $db_results as $db_result ){
 					$is_personal = isset($db_result['source']) && $db_result['source'] == 1 ? true : false;
 					if ( $db_result['status'] == 1 ) {
@@ -126,7 +126,7 @@ public function check()
         }
 		return $results;
 	}
-	
+
 	/**
 	 * Add entry to SFW log.
 	 * Writes to database.
@@ -139,7 +139,7 @@ public function update_log( $ip, $status, $is_personal )
 
 		$id   = md5( $ip . $this->module_name );
 		$time = time();
-		
+
 		$query = "INSERT INTO " . $this->db_log_table_name . "
 		SET
 			id = '$id',
@@ -158,7 +158,7 @@ public function update_log( $ip, $status, $is_personal )
 			ua_name = '" . addslashes(Server::get('HTTP_USER_AGENT')) . "'%s";
 
 		if ( $is_personal ) {
-			$is_personal_sql = ", source = '" . $is_personal . "'";
+			$is_personal_sql = ", source = '" . (int)$is_personal . "'";
 			$query = sprintf( $query, $is_personal_sql, $is_personal_sql);
 		} else {
 			$query = sprintf( $query, '', '');
@@ -195,9 +195,9 @@ public function actionsForPassed( $result )
      */
 	public function _die( $result )
     {
-		
+
 		parent::_die( $result );
-		
+
 		// Statistics
 		if( ! empty( $this->blocked_ips ) ){
 			reset($this->blocked_ips);
@@ -208,10 +208,10 @@ public function _die( $result )
 			$this->apbct->save('stats');
 			*/
 		}
-		
+
 		// File exists?
 		if( file_exists( __DIR__ . "/die_page_sfw.html" ) ){
-			
+
 			$sfw_die_page = file_get_contents( __DIR__ . "/die_page_sfw.html" );
 
             $net_count = $this->db->fetch( 'SELECT COUNT(*) as net_count FROM ' . $this->db_data_table_name );
@@ -231,12 +231,12 @@ public function _die( $result )
 				'{HOST}'                           => '',
 				'{GENERATED}'                      => '<p>The page was generated at&nbsp;' . date( 'D, d M Y H:i:s' ) . "</p>",
 				'{REQUEST_URI}'                    => Server::get( 'REQUEST_URI' ),
-				
+
 				// Cookie
 				'{COOKIE_PREFIX}'      => '',
 				'{COOKIE_DOMAIN}'      => $this->cookie_domain,
 				'{COOKIE_SFW}'         => $this->test ? $this->test_ip : $cookie_val,
-				
+
 				// Test
 				'{TEST_TITLE}'      => '',
 				'{REAL_IP__HEADER}' => '',
@@ -244,7 +244,7 @@ public function _die( $result )
 				'{TEST_IP}'         => '',
 				'{REAL_IP}'         => '',
 			);
-			
+
 			// Test
 			if($this->test){
 				$replaces['{TEST_TITLE}']      = $this->__( 'This is the testing page for SpamFireWall', 'cleantalk-spam-protect' );
@@ -253,7 +253,7 @@ public function _die( $result )
 				$replaces['{TEST_IP}']         = $this->test_ip;
 				$replaces['{REAL_IP}']         = $this->real_ip;
 			}
-			
+
 			// Debug
 			if($this->debug){
 				$debug = '<h1>Headers</h1>'
@@ -268,17 +268,17 @@ public function _die( $result )
 				         . var_export( $this->debug_data, true );
 			}
 			$replaces['{DEBUG}'] = isset( $debug ) ? $debug : '';
-			
+
 			foreach( $replaces as $place_holder => $replace ){
 				$sfw_die_page = str_replace( $place_holder, $replace, $sfw_die_page );
 			}
-			
+
 			die( $sfw_die_page );
-			
+
 		}
 
         die( "IP BLACKLISTED. Blocked by SFW " . $result['ip'] );
 
     }
 
-}
\ No newline at end of file
+}

From 64194febc2439fb6870ff06fcb6aab7d43a72876 Mon Sep 17 00:00:00 2001
From: alexandergull <galyshev@cleantalk.org>
Date: Thu, 2 Nov 2023 17:02:41 +0500
Subject: [PATCH 02/16] Fix. SFW update. Temp tables fixes.

---
 .../Common/Firewall/FirewallUpdater.php          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/FirewallUpdater.php b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/FirewallUpdater.php
index 26d6f94..fb124da 100644
--- a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/FirewallUpdater.php
+++ b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/FirewallUpdater.php
@@ -355,21 +355,27 @@ private function writeDbExclusions()
      */
     private function createTempTables()
     {
+        //drop current temp table to prevent any keys mismatches with the main table
+        $this->db->execute('DROP TABLE IF EXISTS `' . $this->db->prefix . APBCT_TBL_FIREWALL_DATA . '_temp`');
+
+        //check if main table exists
         $sql = 'SHOW TABLES LIKE "%scleantalk_sfw";';
         $sql = sprintf( $sql, $this->db->prefix ); // Adding current blog prefix
         $result = $this->db->fetch( $sql );
+        // create the main table if not
         if( ! $result ){
             $sql = sprintf( Schema::getSchema('sfw'), $this->db->prefix );
             $this->db->execute( $sql );
         }
-        $is_source_column_exist = $this->db->fetch( 'SHOW COLUMNS FROM `' . APBCT_TBL_FIREWALL_DATA . '` LIKE "source";' );
+        //hardcode for new "source" column
+        $is_source_column_exist = $this->db->fetch( 'SHOW COLUMNS FROM `' . $this->db->prefix . APBCT_TBL_FIREWALL_DATA . '` LIKE "source";' );
         if( ! $is_source_column_exist ) {
-            $sql = 'ALTER TABLE `' . APBCT_TBL_FIREWALL_DATA . '` ADD `source` TINYINT NULL DEFAULT NULL AFTER `status`;';
+            $sql = 'ALTER TABLE `' . $this->db->prefix . APBCT_TBL_FIREWALL_DATA . '` ADD `source` TINYINT NULL DEFAULT NULL AFTER `status`;';
             $this->db->execute( $sql );
         }
 
-        $this->db->execute( 'CREATE TABLE IF NOT EXISTS `' . APBCT_TBL_FIREWALL_DATA . '_temp` LIKE `' . APBCT_TBL_FIREWALL_DATA . '`;' );
-        $this->db->execute( 'TRUNCATE TABLE `' . APBCT_TBL_FIREWALL_DATA . '_temp`;' );
+        $this->db->execute( 'CREATE TABLE IF NOT EXISTS `' . $this->db->prefix . APBCT_TBL_FIREWALL_DATA . '_temp` LIKE `' . $this->db->prefix . APBCT_TBL_FIREWALL_DATA . '`;' );
+        $this->db->execute( 'TRUNCATE TABLE `' . $this->db->prefix . APBCT_TBL_FIREWALL_DATA . '_temp`;' );
     }
 
     /**
@@ -392,4 +398,4 @@ private function renameDataTables()
         $this->db->execute( 'ALTER TABLE `'. APBCT_TBL_FIREWALL_DATA .'_temp` RENAME `'. APBCT_TBL_FIREWALL_DATA .'`;' );
     }
 
-}
\ No newline at end of file
+}

From f459232f9d4c734c759efccc63b5c50ae6341280 Mon Sep 17 00:00:00 2001
From: svfcode <svfcode@mail.ru>
Date: Fri, 17 Nov 2023 14:39:12 +0300
Subject: [PATCH 03/16] Fix. SFW. Reduction to a number.

---
 .../lib/Cleantalk/Common/Firewall/FirewallUpdater.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/FirewallUpdater.php b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/FirewallUpdater.php
index fb124da..4050d94 100644
--- a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/FirewallUpdater.php
+++ b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/FirewallUpdater.php
@@ -97,7 +97,7 @@ public function update()
         if(
             Get::get('spbc_remote_call_action') == 'sfw_update__write_base' &&
             Get::get('firewall_updating_id') &&
-            Get::get('firewall_updating_id') !== $fw_stats['firewall_updating_id'] &&
+            (int)Get::get('firewall_updating_id') !== (int)$fw_stats['firewall_updating_id'] &&
             time() - $fw_stats['firewall_updating_last_start'] < 8600
         ) {
             return array( 'error' => 'FIREWALL_IS_UPDATING' );

From d81b5bb640db09ec484959fe2490e94a90bc016b Mon Sep 17 00:00:00 2001
From: Glomberg <bazz@bk.ru>
Date: Tue, 5 Dec 2023 13:36:00 +0300
Subject: [PATCH 04/16] Fix. Settings. Getting Access Key message fixed.

---
 cleantalk.antispam/lang/en/options.php |  5 +++++
 cleantalk.antispam/lang/ru/options.php |  5 +++++
 cleantalk.antispam/options.php         | 10 ++++++++++
 3 files changed, 20 insertions(+)

diff --git a/cleantalk.antispam/lang/en/options.php b/cleantalk.antispam/lang/en/options.php
index b5591f1..b972664 100644
--- a/cleantalk.antispam/lang/en/options.php
+++ b/cleantalk.antispam/lang/en/options.php
@@ -24,6 +24,11 @@
 $MESS['CLEANTALK_KEY_VALID']        = 'Key is valid';
 $MESS['CLEANTALK_KEY_NOT_VALID']    = 'Key is not valid';
 $MESS['CLEANTALK_EMAIL_REGISTRATION_WARNING']	= "Administrator's e-mail will be used for registration";
+$MESS['CLEANTALK_API_KEY_GETTING_WARNING']	= sprintf(
+    'Please, get the Access Key from %s CleanTalk Control Panel %s and insert it in the Access Key field',
+    '<a href="https://cleantalk.org/my/?cp_mode=antispam" target="_blank">',
+    '</a>'
+);
 $MESS['CLEANTALK_LICENSE_AGREEMENT'] = 'License agreement';
 $MESS['CLEANTALK_KEY']                           = 'Access key';
 $MESS['CLEANTALK_EXCLUSIONS']                    = 'Exclusions';
diff --git a/cleantalk.antispam/lang/ru/options.php b/cleantalk.antispam/lang/ru/options.php
index a6252dd..5d25351 100644
--- a/cleantalk.antispam/lang/ru/options.php
+++ b/cleantalk.antispam/lang/ru/options.php
@@ -24,6 +24,11 @@
 $MESS['CLEANTALK_KEY_VALID']        = 'Ключ активен';
 $MESS['CLEANTALK_KEY_NOT_VALID']    = 'Ключ не активен';
 $MESS['CLEANTALK_EMAIL_REGISTRATION_WARNING']	= 'Для регистрации будет использована почта администратора';
+$MESS['CLEANTALK_API_KEY_GETTING_WARNING']	= sprintf(
+    'Пожалуйста, используйте ключ доступа из вашей %s панели управления CleanTalk %s',
+    '<a href="https://cleantalk.org/my/?cp_mode=antispam" target="_blank">',
+    '</a>'
+);
 $MESS['CLEANTALK_LICENSE_AGREEMENT'] = 'Лицензионное соглашение';
 $MESS['CLEANTALK_KEY']                           = 'Ключ доступа';
 $MESS['CLEANTALK_EXCLUSIONS']                    = 'Исключения';
diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
index f301dc4..dae384a 100644
--- a/cleantalk.antispam/options.php
+++ b/cleantalk.antispam/options.php
@@ -19,6 +19,7 @@
 
 $cleantalk_is_wrong_regexp = false;
 $cleantalk_is_wrong_url_regexp = false;
+$is_account_exists = false;
 
 if ( ! empty($REQUEST_METHOD) && $REQUEST_METHOD == 'POST' && $_POST['Update'] == 'Y' ) {
     //try to get default options
@@ -44,6 +45,10 @@
 
             $result = CleantalkAPI::method__get_api_key('antispam', COption::GetOptionString("main", "email_from"), $_SERVER["HTTP_HOST"], 'bitrix');
 
+            if ( isset($result['account_exists']) && $result['account_exists'] == 1 ) {
+                $is_account_exists = true;
+            }
+
             if (empty($result['error'])){
 
                 if(isset($result['user_token'])){
@@ -354,6 +359,11 @@ function ctDdisableInputLine(ct_input_line){
                         value="<?php echo GetMessage( 'CLEANTALK_GET_AUTO_KEY' ) ?>" />
             </td>
         </tr>
+        <?php if ( $is_account_exists )  { ?>
+        <tr>
+            <td colspan='2' style='text-align: center; color: red;'><?php echo GetMessage( 'CLEANTALK_API_KEY_GETTING_WARNING' );?><br></td>
+        </tr>
+        <?php } ?>
         <tr>
             <td colspan='2' style='text-align: center;'><?php echo GetMessage( 'CLEANTALK_EMAIL_REGISTRATION_WARNING' )."(". Option::get("main", "email_from"); ?>).<br> <a target="_blank" href="https://cleantalk.org/publicoffer"><?php echo GetMessage( 'CLEANTALK_LICENSE_AGREEMENT' ); ?></a></td>
         </tr>

From 9a4dd811f36548c22daec266826218ec1a74e412 Mon Sep 17 00:00:00 2001
From: SVFCode <svfcode@mail.ru>
Date: Sun, 26 May 2024 09:21:49 +0000
Subject: [PATCH 05/16] New. Settings. Added option for sfw pass get param.

---
 cleantalk.antispam/default_option.php         |   1 +
 cleantalk.antispam/include.php                |   2 +-
 cleantalk.antispam/lang/en/options.php        |   2 +
 cleantalk.antispam/lang/ru/options.php        |   2 +
 .../lib/Cleantalk/ApbctBitrix/SFW.php         | 100 +++++++++++
 .../Cleantalk/ApbctBitrix/die_page_sfw.html   | 167 ++++++++++++++++++
 cleantalk.antispam/options.php                |  46 ++++-
 7 files changed, 318 insertions(+), 2 deletions(-)
 create mode 100644 cleantalk.antispam/lib/Cleantalk/ApbctBitrix/SFW.php
 create mode 100644 cleantalk.antispam/lib/Cleantalk/ApbctBitrix/die_page_sfw.html

diff --git a/cleantalk.antispam/default_option.php b/cleantalk.antispam/default_option.php
index efaa679..6cc1b73 100644
--- a/cleantalk.antispam/default_option.php
+++ b/cleantalk.antispam/default_option.php
@@ -12,6 +12,7 @@
     'form_global_check' => 0,
     'form_global_check_without_email' => 0,
     'form_sfw' => 1,
+    'form_sfw_uniq_get_option' => 1,
     'site_exclusions' => '',
     'form_exclusions_url' => '',
     'form_exclusions_url__regexp' => 0,
diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
index 56c21c8..07ccb0b 100644
--- a/cleantalk.antispam/include.php
+++ b/cleantalk.antispam/include.php
@@ -19,7 +19,7 @@
 use Cleantalk\ApbctBitrix\Cron;
 use Cleantalk\ApbctBitrix\DB;
 use Cleantalk\Common\Variables\Server;
-use Cleantalk\Common\Firewall\Modules\SFW;
+use Cleantalk\ApbctBitrix\SFW;
 
 if ( ! defined( 'CLEANTALK_USER_AGENT' ) )
     define( 'CLEANTALK_USER_AGENT', 'bitrix-3.12.0' );
diff --git a/cleantalk.antispam/lang/en/options.php b/cleantalk.antispam/lang/en/options.php
index b972664..7b3e391 100644
--- a/cleantalk.antispam/lang/en/options.php
+++ b/cleantalk.antispam/lang/en/options.php
@@ -19,6 +19,8 @@
 $MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = 'Check all POST data';
 $MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- Warning, conflict possibility!';
 $MESS['CLEANTALK_LABEL_SFW']        = 'Spam FireWall';
+$MESS['CLEANTALK_LABEL_UNIQ_GET_OPTION']        = 'Uniq GET option';
+$MESS['CLEANTALK_LABEL_UNIQ_GET_OPTION_DESC']        = 'If a visitor gets the SpamFireWall page, the plugin will put a unique GET variable in the URL to avoid issues with caching plugins.';
 $MESS['CLEANTALK_LABEL_NOTIFY']        = "Like Anti-spam by CleanTalk? Help others learn about CleanTalk! <a  target='_blank' href='http://marketplace.1c-bitrix.ru/solutions/cleantalk.antispam/#rating'>Leave a review at the Bitrix.Marketplace</a>";
 $MESS['CLEANTALK_ENTER_KEY']        = 'Enter the access key';
 $MESS['CLEANTALK_KEY_VALID']        = 'Key is valid';
diff --git a/cleantalk.antispam/lang/ru/options.php b/cleantalk.antispam/lang/ru/options.php
index 5d25351..3820a0f 100644
--- a/cleantalk.antispam/lang/ru/options.php
+++ b/cleantalk.antispam/lang/ru/options.php
@@ -19,6 +19,8 @@
 $MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = 'Проверять все POST данные';
 $MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- Внимание, возможны конфликты!';
 $MESS['CLEANTALK_LABEL_SFW']        = 'Spam FireWall';
+$MESS['CLEANTALK_LABEL_UNIQ_GET_OPTION']        = 'Добавление уникального гет параметра';
+$MESS['CLEANTALK_LABEL_UNIQ_GET_OPTION_DESC']        = 'Если посетитель попадает на страницу файервола, плагин помещает уникальный GET параметр в URL-адрес, чтобы избежать проблем с кэшированием.';
 $MESS['CLEANTALK_LABEL_NOTIFY']        = "Нравится антиспам от CleanTalk? Помогите другим узнать о нас! <a target='_blank' href='http://marketplace.1c-bitrix.ru/solutions/cleantalk.antispam/#rating'>Оставьте отзыв на Битрикс.Маркетплейс</a>";
 $MESS['CLEANTALK_ENTER_KEY']        = 'Введите ключ';
 $MESS['CLEANTALK_KEY_VALID']        = 'Ключ активен';
diff --git a/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/SFW.php b/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/SFW.php
new file mode 100644
index 0000000..39aad46
--- /dev/null
+++ b/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/SFW.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Cleantalk\ApbctBitrix;
+
+use Cleantalk\Common\Variables\Server;
+
+class SFW extends \Cleantalk\Common\Firewall\Modules\SFW
+{
+	public function __construct($data_table, $params = array())
+    {
+		parent::__construct($data_table, $params);
+	}
+
+    /**
+     * @inheritdoc
+     */
+	public function _die( $result )
+    {
+		// Statistics
+		if( ! empty( $this->blocked_ips ) ){
+			reset($this->blocked_ips);
+		}
+		
+		// File exists?
+		if( file_exists( __DIR__ . "/die_page_sfw.html" ) ){
+			
+			$sfw_die_page = file_get_contents( __DIR__ . "/die_page_sfw.html" );
+
+            $net_count = $this->db->fetch( 'SELECT COUNT(*) as net_count FROM ' . $this->db_data_table_name );
+
+            $status = $result['status'] === 'PASS_SFW__BY_WHITELIST' ? '1' : '0';
+            $cookie_val = md5( $result['ip'] . $this->api_key ) . $status;
+
+			// Translation
+			$replaces = array(
+				'{SFW_DIE_NOTICE_IP}'              => $this->__('SpamFireWall is activated for your IP ', 'cleantalk-spam-protect'),
+				'{SFW_DIE_MAKE_SURE_JS_ENABLED}'   => $this->__( 'To continue working with the web site, please make sure that you have enabled JavaScript.', 'cleantalk-spam-protect' ),
+				'{SFW_DIE_CLICK_TO_PASS}'          => $this->__('Please click the link below to pass the protection,', 'cleantalk-spam-protect'),
+				'{SFW_DIE_YOU_WILL_BE_REDIRECTED}' => sprintf( $this->__('Or you will be automatically redirected to the requested page after %d seconds.', 'cleantalk-spam-protect'), 3),
+				'{CLEANTALK_TITLE}'                => ($this->test ? $this->__('This is the testing page for SpamFireWall', 'cleantalk-spam-protect') : ''),
+				'{REMOTE_ADDRESS}'                 => $result['ip'],
+				'{SERVICE_ID}'                     => $net_count['net_count'],
+				'{HOST}'                           => '',
+				'{GENERATED}'                      => '<p>The page was generated at&nbsp;' . date( 'D, d M Y H:i:s' ) . "</p>",
+				'{REQUEST_URI}'                    => Server::get( 'REQUEST_URI' ),
+				
+				// Cookie
+				'{COOKIE_PREFIX}'      => '',
+				'{COOKIE_DOMAIN}'      => $this->cookie_domain,
+				'{COOKIE_SFW}'         => $this->test ? $this->test_ip : $cookie_val,
+				
+				// Test
+				'{TEST_TITLE}'      => '',
+				'{REAL_IP__HEADER}' => '',
+				'{TEST_IP__HEADER}' => '',
+				'{TEST_IP}'         => '',
+				'{REAL_IP}'         => '',
+			);
+			
+			// Test
+			if($this->test){
+				$replaces['{TEST_TITLE}']      = $this->__( 'This is the testing page for SpamFireWall', 'cleantalk-spam-protect' );
+				$replaces['{REAL_IP__HEADER}'] = 'Real IP:';
+				$replaces['{TEST_IP__HEADER}'] = 'Test IP:';
+				$replaces['{TEST_IP}']         = $this->test_ip;
+				$replaces['{REAL_IP}']         = $this->real_ip;
+			}
+
+			$form_sfw_uniq_get_option = \COption::GetOptionInt('cleantalk.antispam', 'form_sfw_uniq_get_option', 1);
+			$sfwgetoption = "<script>var form_sfw_uniq_get_option_js = $form_sfw_uniq_get_option</script>";
+			$replaces['{SFWGETOPTION}'] = $sfwgetoption;
+			
+			// Debug
+			if($this->debug){
+				$debug = '<h1>Headers</h1>'
+				         . var_export( apache_request_headers(), true )
+				         . '<h1>REMOTE_ADDR</h1>'
+				         . Server::get( 'REMOTE_ADDR' )
+				         . '<h1>SERVER_ADDR</h1>'
+				         . Server::get( 'REMOTE_ADDR' )
+				         . '<h1>IP_ARRAY</h1>'
+				         . var_export( $this->ip_array, true )
+				         . '<h1>ADDITIONAL</h1>'
+				         . var_export( $this->debug_data, true );
+			}
+			$replaces['{DEBUG}'] = isset( $debug ) ? $debug : '';
+			
+			foreach( $replaces as $place_holder => $replace ){
+				$sfw_die_page = str_replace( $place_holder, $replace, $sfw_die_page );
+			}
+			
+			die( $sfw_die_page );
+			
+		}
+
+        die( "IP BLACKLISTED. Blocked by SFW " . $result['ip'] );
+
+    }
+
+}
diff --git a/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/die_page_sfw.html b/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/die_page_sfw.html
new file mode 100644
index 0000000..236f83a
--- /dev/null
+++ b/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/die_page_sfw.html
@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<html lang='en'>
+	<head>
+		<meta charset='utf-8' />
+		<meta name='viewport' content='width=device-width, initial-scale=1' />
+		<meta http-equiv="cache-control" content="no-cache">
+		<meta http-equiv="cache-control" content="private">
+		<meta http-equiv="cache-control" content="max-age=0, must-revalidate">
+		<meta http-equiv="cache-control" content="max-age=0, proxy-revalidate">
+		<meta http-equiv="expires" content="0" />
+		<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
+		<meta http-equiv="pragma" content="no-cache" />
+
+	  <!--[if lt IE 9]>
+	  <script src='http://html5shiv.googlecode.com/svn/trunk/html5.js'></script>
+	  <![endif]-->
+	<style>
+		html{font-size: 14pt;}
+		h1{text-align:center}
+		h1.main{margin-top: 1em;margin-bottom: 3em;}
+		div.container {text-align:center;}
+		div.container p.js_notice{width: 60%; display: inline-block;}
+		div.footer {color: #666; text-align: center;}
+		div.footer a {color: #666; vertical-align:bottom; text-align: center;}
+
+		@media (max-width: 600px) {
+		}
+
+		.spinner, #timer {
+			margin-left: auto;
+			margin-right: auto;
+			width: 70px;
+			text-align: center;
+			font-size: 40px;
+			font-weight: bold;
+		}
+
+		.spinner > div {
+			width: 14px;
+			height: 14px;
+			background-color: #333;
+
+			border-radius: 100%;
+			display: inline-block;
+			-webkit-animation: sk-bouncedelay 1.4s infinite ease-in-out both;
+			animation: sk-bouncedelay 1.4s infinite ease-in-out both;
+		}
+
+		.spinner .bounce1 {
+			-webkit-animation-delay: -0.32s;
+			animation-delay: -0.32s;
+		}
+
+		.spinner .bounce2 {
+			-webkit-animation-delay: -0.16s;
+			animation-delay: -0.16s;
+		}
+
+		@-webkit-keyframes sk-bouncedelay {
+			0%, 80%, 100% { -webkit-transform: scale(0) }
+			40% { -webkit-transform: scale(1.0) }
+		}
+
+		@keyframes sk-bouncedelay {
+			0%, 80%, 100% {
+				-webkit-transform: scale(0);
+				transform: scale(0);
+			} 40% {
+				  -webkit-transform: scale(1.0);
+				  transform: scale(1.0);
+			  }
+		}
+	</style>
+	<script>
+		var ct_date = new Date;
+
+		function set_spamFireWallCookie(cookie_name, cookie_value) {
+			var date = new Date;
+			date.setDate(date.getDate() + 30);
+			document.cookie = cookie_name + '=' + escape(cookie_value) + '; path=/; expires=' + date.toUTCString() + '; samesite=lax';
+			return null;
+		}
+
+		function get_current_url() {
+			document.write(window.location.href);
+			return null;
+		}
+	</script>
+</head>
+
+<body>
+    <div class='container'>
+        <h1 class='main'>{SFW_DIE_NOTICE_IP}<a href='https://cleantalk.org/blacklists/{REMOTE_ADDRESS}' target='_blank'>{REMOTE_ADDRESS}</a></h1>
+
+		<h3>{REAL_IP__HEADER} {REAL_IP}</h3>
+		<h3>{TEST_IP__HEADER} {TEST_IP}</h3>
+
+		<h2>{TEST_TITLE}</h2>
+		
+        <div id='js_info'><br />{SFW_DIE_MAKE_SURE_JS_ENABLED}</div>
+
+        <div id='js_passed'>
+			<h3>{SFW_DIE_CLICK_TO_PASS}</h3>
+			<a href='{REQUEST_URI}'><script>get_current_url();</script></a>
+			<br />
+			<p class='js_notice'>{SFW_DIE_YOU_WILL_BE_REDIRECTED}</p>
+			<br />
+			<div class="spinner">
+				<div class="bounce1"></div>
+				<div class="bounce2"></div>
+				<div class="bounce3"></div>
+			</div>
+			<div id="timer"></div>
+			{GENERATED}
+			<p>Browser time <span id='curr_date'></span></p>
+        </div>
+
+    </div>
+	<div style='position: relative; line-height: 8px; text-align: center;'>
+		<p style="margin: 0; display: inline-block; font-size: 10px; color: gray;">{SERVICE_ID}, </p>
+		<p style="margin: 0; display: inline-block; font-size: 10px; color: gray;">{HOST}</p>
+	</div>
+    <div class='footer'>
+		<a href='https://cleantalk.org' target='_blank'>{CLEANTALK_TITLE}</a>
+    </div>
+    {SFWGETOPTION}
+    <script type='text/javascript'>
+		var reload_timeout = 3000;
+		document.getElementById('js_info').style.display = 'none';
+		document.getElementById('js_passed').style.display = 'block';
+		document.getElementById('curr_date').innerHTML = ct_date.toGMTString();
+		set_spamFireWallCookie('{COOKIE_PREFIX}ct_sfw_pass_key','{COOKIE_SFW}');
+		set_spamFireWallCookie('{COOKIE_PREFIX}apbct_antibot','{COOKIE_ANTICRAWLER}');
+		set_spamFireWallCookie('{COOKIE_PREFIX}ct_sfw_passed','1');
+
+		if(location.search.search('debug=1') === -1) {
+			var apbctSfwRandomGet = '';
+			if( +form_sfw_uniq_get_option_js ) {
+				apbctSfwRandomGet = '?sfw=pass' + Math.round(ct_date.getTime()/1000);
+			}
+			setTimeout(function(){
+				window.location.href = window.location.origin + window.location.pathname + apbctSfwRandomGet;
+			}, reload_timeout);
+		}
+
+		// Countdown function
+		var timer_block = document.getElementById('timer');
+		timer_block.innerText = reload_timeout/1000;
+		var time;
+		function countdown() {
+			time = parseInt( timer_block.innerText );
+			var current = parseInt( timer_block.innerText );
+			var cdw = setInterval( function(){
+				current = parseInt( current ) - 1;
+				timer_block.innerText = current;
+				if ( 0 === parseInt( current ) ) {
+					clearInterval( cdw );
+				}
+			}, 1000 );
+		}
+
+		// Run countdown
+		countdown();
+    </script>
+	{DEBUG}
+</body>
+</html>
diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
index dae384a..cdfc6ef 100644
--- a/cleantalk.antispam/options.php
+++ b/cleantalk.antispam/options.php
@@ -122,6 +122,7 @@
         Option::set( $sModuleId, 'form_global_check',               $_POST['form_global_check'] == '1'               ? 1 : 0 );
         Option::set( $sModuleId, 'form_global_check_without_email', $_POST['form_global_check_without_email'] == '1' ? 1 : 0 );
         Option::set( $sModuleId, 'form_sfw',                        $_POST['form_sfw'] == '1'                        ? 1 : 0 );
+        Option::set( $sModuleId, 'form_sfw_uniq_get_option',        $_POST['form_sfw_uniq_get_option'] == '1'        ? 1 : 0 );
         Option::set( $sModuleId, 'complete_deactivation',           $_POST['complete_deactivation'] == '1'           ? 1 : 0 );
 
         if (isset($_POST['form_exclusions_sites']) && is_array($_POST['form_exclusions_sites'])) {
@@ -496,7 +497,7 @@ function ctDdisableInputLine(ct_input_line){
     </tr>
     <tr>
         <td width="50%" valign="top">
-            <label for="form_global_check"><?php echo GetMessage( 'CLEANTALK_LABEL_SFW' );?>:</td>
+            <label for="form_sfw"><?php echo GetMessage( 'CLEANTALK_LABEL_SFW' );?>:</td>
         <td valign="top">
             <input
                     type="checkbox"
@@ -505,6 +506,33 @@ function ctDdisableInputLine(ct_input_line){
                 <?php if ( $current_options['form_sfw'] === '1' ):?> checked="checked"<?php endif; ?>value="1" />
         </td>
     </tr>
+    <tr>
+        <td width="50%" valign="top">
+            <label
+                    id="form_sfw_uniq_get_option_label"
+                    for="form_sfw_uniq_get_option"
+                <?php
+                if ($current_options['form_sfw'] === '0') {
+                    echo ("style='color: gray;'");
+                }
+                ?>
+            >
+                <?php echo GetMessage( 'CLEANTALK_LABEL_UNIQ_GET_OPTION' );?>:
+        </td>
+        <td  valign="top">
+            <input
+                    type="checkbox"
+                    name="form_sfw_uniq_get_option"
+                    id="form_sfw_uniq_get_option"
+                    <?php
+                    if ( $current_options['form_sfw'] === '0' ){
+                        echo "disabled";
+                    }
+                    ?>
+                <?php if ( $current_options['form_sfw_uniq_get_option'] === '1' ):?> checked="checked"<?php endif; ?>value="1" />
+                <?php echo GetMessage( 'CLEANTALK_LABEL_UNIQ_GET_OPTION_DESC' ); ?>
+        </td>
+    </tr>
     <tr class="heading">
         <td colspan="2">
             <?=GetMessage( 'CLEANTALK_EXCLUSIONS' )?>
@@ -612,4 +640,20 @@ function ctDdisableInputLine(ct_input_line){
     <input type="submit" name="reset" value="<?php echo GetMessage( 'CLEANTALK_BUTTON_RESET' ) ?>" />
     <input type="hidden" name="Update" value="Y" />
     <?php $oTabControl->End();?>
+    <script>
+        let form_sfw_checkbox = document.getElementById('form_sfw');
+        let form_sfw_uniq_get_option_checkbox = document.getElementById('form_sfw_uniq_get_option');
+        let form_sfw_uniq_get_option_checkbox_label = document.getElementById('form_sfw_uniq_get_option_label');
+        form_sfw_checkbox.addEventListener('change', (event) => {
+            if (event.currentTarget.checked) {
+                form_sfw_uniq_get_option_checkbox.disabled = false;
+                form_sfw_uniq_get_option_checkbox.checked = true;
+                form_sfw_uniq_get_option_checkbox_label.style.removeProperty('color');
+            } else {
+                form_sfw_uniq_get_option_checkbox.checked = false;
+                form_sfw_uniq_get_option_checkbox.disabled = true;
+                form_sfw_uniq_get_option_checkbox_label.style.color = 'gray';
+            }
+        });
+    </script>
 </form>

From b582bc8d6c5f82eb345494d87b413c5d2f9ff1d4 Mon Sep 17 00:00:00 2001
From: unknown <antonV1211@yandex.ru>
Date: Thu, 27 Jun 2024 16:23:02 +0700
Subject: [PATCH 06/16] Fix. USER variable is null

---
 cleantalk.antispam/include.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
index 07ccb0b..8fd3c53 100644
--- a/cleantalk.antispam/include.php
+++ b/cleantalk.antispam/include.php
@@ -1032,6 +1032,8 @@ static function OnEventLogGetAuditTypesHandler(){
     public static function OnEndBufferContentHandler( &$content ) {
         global $USER, $APPLICATION;
 
+        if (!is_object($USER)) $USER = new CUser;
+
         if(
             ! $USER->IsAdmin() &&
             ! defined( "ADMIN_SECTION" ) &&

From 32f4dab506d73c653e1961c11198f19797abeb06 Mon Sep 17 00:00:00 2001
From: Glomberg <bazz@bk.ru>
Date: Wed, 10 Jul 2024 13:40:26 +0300
Subject: [PATCH 07/16] Fix. SFW. Writing logs fixed.

---
 .../Cleantalk/Common/Firewall/Modules/SFW.php | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php
index 2deb37b..741ee41 100644
--- a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php
+++ b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php
@@ -136,11 +136,10 @@ public function check()
 	 */
 	public function update_log( $ip, $status, $is_personal )
     {
+        $id   = md5( $ip . $this->module_name );
+        $time = time();
 
-		$id   = md5( $ip . $this->module_name );
-		$time = time();
-
-		$query = "INSERT INTO " . $this->db_log_table_name . "
+        $query = "INSERT INTO " . $this->db_log_table_name . "
 		SET
 			id = '$id',
 			ip = '$ip',
@@ -148,24 +147,17 @@ public function update_log( $ip, $status, $is_personal )
 			all_entries = 1,
 			blocked_entries = " . ( strpos( $status, 'DENY' ) !== false ? 1 : 0 ) . ",
 			entries_timestamp = '" . $time . "',
-			ua_name = '" . addslashes(Server::get('HTTP_USER_AGENT')) . "'%s
+			ua_name = '" . addslashes(Server::get('HTTP_USER_AGENT')) . "'
 		ON DUPLICATE KEY
 		UPDATE
 			status = '$status',
 			all_entries = all_entries + 1,
 			blocked_entries = blocked_entries" . ( strpos( $status, 'DENY' ) !== false ? ' + 1' : '' ) . ",
 			entries_timestamp = '" . intval( $time ) . "',
-			ua_name = '" . addslashes(Server::get('HTTP_USER_AGENT')) . "'%s";
-
-		if ( $is_personal ) {
-			$is_personal_sql = ", source = '" . (int)$is_personal . "'";
-			$query = sprintf( $query, $is_personal_sql, $is_personal_sql);
-		} else {
-			$query = sprintf( $query, '', '');
-		}
+			ua_name = '" . addslashes(Server::get('HTTP_USER_AGENT')) . "'";
 
-		$this->db->execute( $query );
-	}
+        $this->db->execute( $query );
+    }
 
     /**
      * @inheritdoc

From 91eab9102d095e6e9fd26ce260df7e4d5e3a4dbc Mon Sep 17 00:00:00 2001
From: Glomberg <bazz@bk.ru>
Date: Wed, 10 Jul 2024 16:07:23 +0300
Subject: [PATCH 08/16] Fix. Frontend data. Mouse moving collecting removed.

---
 cleantalk.antispam/include.php                | 50 +------------------
 .../lib/Cleantalk/Antispam/Cleantalk.php      |  3 +-
 2 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
index 8fd3c53..f1ebfe7 100644
--- a/cleantalk.antispam/include.php
+++ b/cleantalk.antispam/include.php
@@ -1063,11 +1063,7 @@ static function FormAddon() {
             $ct_check_values = self::SetCheckJSValues();
 
             $js_template = "<script data-skip-moving = 'true'>
-                    var ct_checkjs_val = '".$ct_check_values[0]."', ct_date = new Date(), 
-                    ctTimeMs = new Date().getTime(),
-                    ctMouseEventTimerFlag = true, //Reading interval flag
-                    ctMouseData = [],
-                    ctMouseDataCounter = 0;
+                    var ct_checkjs_val = '".$ct_check_values[0]."', ct_date = new Date();
 
                     function ctSetCookie(c_name, value) {
                         document.cookie = c_name + '=' + encodeURIComponent(value) + '; path=/';
@@ -1075,7 +1071,6 @@ function ctSetCookie(c_name, value) {
 
                     ctSetCookie('ct_ps_timestamp', Math.floor(new Date().getTime()/1000));
                     ctSetCookie('ct_fkp_timestamp', '0');
-                    ctSetCookie('ct_pointer_data', '0');
                     ctSetCookie('ct_timezone', '0');
 
                     ct_attach_event_handler(window, 'DOMContentLoaded', ct_ready);
@@ -1092,45 +1087,6 @@ function ctSetCookie(c_name, value) {
                         ctKeyStopStopListening();
                     }
 
-                    /* Reading interval */
-                    var ctMouseReadInterval = setInterval(function(){
-                        ctMouseEventTimerFlag = true;
-                    }, 150);
-                        
-                    /* Writting interval */
-                    var ctMouseWriteDataInterval = setInterval(function(){
-                        ctSetCookie('ct_pointer_data', JSON.stringify(ctMouseData));
-                    }, 1200);
-
-                    /* Logging mouse position each 150 ms */
-                    var ctFunctionMouseMove = function output(event){
-                        if(ctMouseEventTimerFlag == true){
-                            
-                            ctMouseData.push([
-                                Math.round(event.pageY),
-                                Math.round(event.pageX),
-                                Math.round(new Date().getTime() - ctTimeMs)
-                            ]);
-                            
-                            ctMouseDataCounter++;
-                            ctMouseEventTimerFlag = false;
-                            if(ctMouseDataCounter >= 100){
-                                ctMouseStopData();
-                            }
-                        }
-                    }
-
-                    /* Stop mouse observing function */
-                    function ctMouseStopData(){
-                        if(typeof window.addEventListener == 'function'){
-                            window.removeEventListener('mousemove', ctFunctionMouseMove);
-                        }else{
-                            window.detachEvent('onmousemove', ctFunctionMouseMove);
-                        }
-                        clearInterval(ctMouseReadInterval);
-                        clearInterval(ctMouseWriteDataInterval);                
-                    }
-
                     /* Stop key listening function */
                     function ctKeyStopStopListening(){
                         if(typeof window.addEventListener == 'function'){
@@ -1143,11 +1099,9 @@ function ctKeyStopStopListening(){
                     }
 
                     if(typeof window.addEventListener == 'function'){
-                        window.addEventListener('mousemove', ctFunctionMouseMove);
                         window.addEventListener('mousedown', ctFunctionFirstKey);
                         window.addEventListener('keydown', ctFunctionFirstKey);
                     }else{
-                        window.attachEvent('onmousemove', ctFunctionMouseMove);
                         window.attachEvent('mousedown', ctFunctionFirstKey);
                         window.attachEvent('keydown', ctFunctionFirstKey);
                     }
@@ -1330,7 +1284,6 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = n
             else
                 $checkjs = 0;
 
-            $pointer_data        = (isset($_COOKIE['ct_pointer_data'])  ? json_decode($_COOKIE['ct_pointer_data']) : '');
             $js_timezone         = (isset($_COOKIE['ct_timezone'])      ? $_COOKIE['ct_timezone']                  : 'none');
             $first_key_timestamp = (isset($_COOKIE['ct_fkp_timestamp']) ? $_COOKIE['ct_fkp_timestamp']             : 0);
             $page_set_timestamp  = (isset($_COOKIE['ct_ps_timestamp'])  ? $_COOKIE['ct_ps_timestamp']              : 0);
@@ -1366,7 +1319,6 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = n
                 'post_url' => $refferrer,
                 'USER_AGENT' => $user_agent,
                 'js_timezone' => $js_timezone,
-                'mouse_cursor_positions' => $pointer_data,
                 'key_press_timestamp' => $first_key_timestamp,
                 'page_set_timestamp' => $page_set_timestamp,
                 'REFFERRER_PREVIOUS' => isset($_COOKIE['ct_prev_referer']) ? $_COOKIE['ct_prev_referer'] : null,
diff --git a/cleantalk.antispam/lib/Cleantalk/Antispam/Cleantalk.php b/cleantalk.antispam/lib/Cleantalk/Antispam/Cleantalk.php
index b16a5b8..399e34f 100644
--- a/cleantalk.antispam/lib/Cleantalk/Antispam/Cleantalk.php
+++ b/cleantalk.antispam/lib/Cleantalk/Antispam/Cleantalk.php
@@ -399,8 +399,7 @@ private function httpRequest($msg) {
       if(isset($tmp[$cookie_name]))
         $ct_tmp[$cookie_name] = preg_replace(array(
           '/\s{0,1}ct_checkjs=[a-z0-9]*[;|$]{0,1}/',
-          '/\s{0,1}ct_timezone=.{0,1}\d{1,2}[;|$]/', 
-          '/\s{0,1}ct_pointer_data=.*5D[;|$]{0,1}/', 
+          '/\s{0,1}ct_timezone=.{0,1}\d{1,2}[;|$]/',
           '/;{0,1}\s{0,3}$/'
         ), '', $ct_tmp[$cookie_name]);
         

From e15ee7b279e288fe2ae3eda1b265b9628d44c5fa Mon Sep 17 00:00:00 2001
From: M_A_X_NSK <hardstyle@myttk.ru>
Date: Tue, 13 Aug 2024 19:54:39 +0200
Subject: [PATCH 09/16] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/Cleantalk/Common/Firewall/Modules/SFW.php               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php
index 741ee41..9914887 100644
--- a/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php
+++ b/cleantalk.antispam/lib/Cleantalk/Common/Firewall/Modules/SFW.php
@@ -16,7 +16,7 @@ class SFW extends FirewallModule {
 	// Additional params
 	private $sfw_counter = false;
 	private $set_cookies = false;
-	private $cookie_domain = false;
+	protected $cookie_domain = false;
 
     /**
      * FireWall_module constructor.

From af6666f4632eea9b82c1dae5f76c55f368ba4de2 Mon Sep 17 00:00:00 2001
From: Viktor <Bazz@bk.ru>
Date: Mon, 2 Sep 2024 14:30:07 +0300
Subject: [PATCH 10/16] New. Anti-spam. Bot detector support added. (#28)

* New. Bot detector. Option added.

* New. Bot detector. Event token support added.

* New. Bot detector. JS library included.
---
 cleantalk.antispam/default_option.php         |  1 +
 cleantalk.antispam/include.php                |  7 +++++++
 cleantalk.antispam/lang/en/options.php        |  2 ++
 cleantalk.antispam/lang/ru/options.php        |  2 ++
 .../Cleantalk/Antispam/CleantalkRequest.php   |  7 ++++++-
 cleantalk.antispam/options.php                | 21 +++++++++++++++++++
 6 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/cleantalk.antispam/default_option.php b/cleantalk.antispam/default_option.php
index 6cc1b73..c296e6c 100644
--- a/cleantalk.antispam/default_option.php
+++ b/cleantalk.antispam/default_option.php
@@ -11,6 +11,7 @@
     'web_form' => 1,
     'form_global_check' => 0,
     'form_global_check_without_email' => 0,
+    'bot_detector' => 1,
     'form_sfw' => 1,
     'form_sfw_uniq_get_option' => 1,
     'site_exclusions' => '',
diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
index f1ebfe7..f08cb49 100644
--- a/cleantalk.antispam/include.php
+++ b/cleantalk.antispam/include.php
@@ -7,6 +7,7 @@
 require_once(dirname(__FILE__) . '/lib/autoload.php');
 
 //Antispam classes
+use Bitrix\Main\Page\Asset;
 use Cleantalk\Antispam\Cleantalk;
 use Cleantalk\Antispam\CleantalkRequest;
 use Cleantalk\Antispam\CleantalkResponse;
@@ -162,6 +163,7 @@ public static function OnPageStartHandler()
         $ct_key                  = COption::GetOptionString( 'cleantalk.antispam', 'key', '' );
         $last_checked            = COption::GetOptionInt( 'cleantalk.antispam', 'last_checked', 0 );
         $show_review             = COption::GetOptionInt( 'cleantalk.antispam', 'show_review', 0 );
+        $bot_detector            = COption::GetOptionInt( 'cleantalk.antispam', 'bot_detector', 0 );
         $is_sfw                  = COption::GetOptionInt( 'cleantalk.antispam', 'form_sfw', 0 );
         $sfw_last_update         = COption::GetOptionInt( 'cleantalk.antispam',  'sfw_last_update', 0);
         $sfw_last_send_log       = COption::GetOptionInt( 'cleantalk.antispam',  'sfw_last_send_log', 0);
@@ -179,6 +181,10 @@ public static function OnPageStartHandler()
 
         if( ! $USER->IsAdmin() ){
 
+            if ( $bot_detector ) {
+                Asset::getInstance()->addJs('https://moderate.cleantalk.org/ct-bot-detector-wrapper.js');
+            }
+
             // Set cookies
             if( ! headers_sent() )
                 self::ct_cookie();
@@ -1361,6 +1367,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = n
                 'js_on' => $checkjs,
                 'sender_info' => $sender_info,
                 'submit_time' => self::ct_cookies_test() == 1 ? time() - (int)$_COOKIE['ct_timestamp'] : null,
+                'event_token' => isset($_POST['ct_bot_detector_event_token']) ? $_POST['ct_bot_detector_event_token'] : null,
             );
 
             switch ($type) {
diff --git a/cleantalk.antispam/lang/en/options.php b/cleantalk.antispam/lang/en/options.php
index 7b3e391..cdf9c1b 100644
--- a/cleantalk.antispam/lang/en/options.php
+++ b/cleantalk.antispam/lang/en/options.php
@@ -18,6 +18,8 @@
 $MESS['CLEANTALK_LABEL_GLOBAL_CHECK']        = 'Any forms protection';
 $MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = 'Check all POST data';
 $MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- Warning, conflict possibility!';
+$MESS['CLEANTALK_LABEL_BOT_DETECTOR'] = 'Use Anti-Spam by CleanTalk JavaScript library';
+$MESS['CLEANTALK_DESCRIPTION_BOT_DETECTOR'] = 'This option includes external Anti-Spam by CleanTalk JavaScript library to getting visitors info data';
 $MESS['CLEANTALK_LABEL_SFW']        = 'Spam FireWall';
 $MESS['CLEANTALK_LABEL_UNIQ_GET_OPTION']        = 'Uniq GET option';
 $MESS['CLEANTALK_LABEL_UNIQ_GET_OPTION_DESC']        = 'If a visitor gets the SpamFireWall page, the plugin will put a unique GET variable in the URL to avoid issues with caching plugins.';
diff --git a/cleantalk.antispam/lang/ru/options.php b/cleantalk.antispam/lang/ru/options.php
index 3820a0f..0e92d22 100644
--- a/cleantalk.antispam/lang/ru/options.php
+++ b/cleantalk.antispam/lang/ru/options.php
@@ -18,6 +18,8 @@
 $MESS['CLEANTALK_LABEL_GLOBAL_CHECK']        = 'Защита любых форм';
 $MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = 'Проверять все POST данные';
 $MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- Внимание, возможны конфликты!';
+$MESS['CLEANTALK_LABEL_BOT_DETECTOR'] = 'Использовать Anti-Spam by CleanTalk JavaScript библиотеку';
+$MESS['CLEANTALK_DESCRIPTION_BOT_DETECTOR'] = 'Эта опция включает внешнюю Anti-Spam by CleanTalk JavaScript библиотеку для получения данных о посетителях';
 $MESS['CLEANTALK_LABEL_SFW']        = 'Spam FireWall';
 $MESS['CLEANTALK_LABEL_UNIQ_GET_OPTION']        = 'Добавление уникального гет параметра';
 $MESS['CLEANTALK_LABEL_UNIQ_GET_OPTION_DESC']        = 'Если посетитель попадает на страницу файервола, плагин помещает уникальный GET параметр в URL-адрес, чтобы избежать проблем с кэшированием.';
diff --git a/cleantalk.antispam/lib/Cleantalk/Antispam/CleantalkRequest.php b/cleantalk.antispam/lib/Cleantalk/Antispam/CleantalkRequest.php
index b480dfc..11d8cb6 100644
--- a/cleantalk.antispam/lib/Cleantalk/Antispam/CleantalkRequest.php
+++ b/cleantalk.antispam/lib/Cleantalk/Antispam/CleantalkRequest.php
@@ -155,7 +155,12 @@ class CleantalkRequest {
     * Method name
     * @var string
     */
-    public $method_name = 'check_message'; 
+    public $method_name = 'check_message';
+
+    /**
+     * @var string|null
+     */
+    public $event_token = null;
 
     /**
      * Fill params with constructor
diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
index cdfc6ef..9b88456 100644
--- a/cleantalk.antispam/options.php
+++ b/cleantalk.antispam/options.php
@@ -122,6 +122,7 @@
         Option::set( $sModuleId, 'form_global_check',               $_POST['form_global_check'] == '1'               ? 1 : 0 );
         Option::set( $sModuleId, 'form_global_check_without_email', $_POST['form_global_check_without_email'] == '1' ? 1 : 0 );
         Option::set( $sModuleId, 'form_sfw',                        $_POST['form_sfw'] == '1'                        ? 1 : 0 );
+        Option::set( $sModuleId, 'bot_detector',                    $_POST['bot_detector'] == '1'                        ? 1 : 0 );
         Option::set( $sModuleId, 'form_sfw_uniq_get_option',        $_POST['form_sfw_uniq_get_option'] == '1'        ? 1 : 0 );
         Option::set( $sModuleId, 'complete_deactivation',           $_POST['complete_deactivation'] == '1'           ? 1 : 0 );
 
@@ -495,6 +496,26 @@ function ctDdisableInputLine(ct_input_line){
                     value="1" /> <?php echo GetMessage( 'CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL' ); ?>
         </td>
     </tr>
+    <tr>
+        <td width="50%" valign="top">
+            <label for="bot_detector"
+                <?php
+                if ( $current_options['bot_detector'] === '0' ){
+                    echo ("style='color: gray;'");
+                }
+                ?>
+            >
+                <?php echo GetMessage( 'CLEANTALK_LABEL_BOT_DETECTOR' );?>:
+        </td>
+        <td  valign="top">
+            <input
+                    type="checkbox"
+                    name="bot_detector"
+                    id="bot_detector"
+                <?php if ( $current_options['bot_detector'] === '1' ):?> checked="checked"<?php endif; ?>value="1" />
+            <?php echo GetMessage( 'CLEANTALK_DESCRIPTION_BOT_DETECTOR' ); ?>
+        </td>
+    </tr>
     <tr>
         <td width="50%" valign="top">
             <label for="form_sfw"><?php echo GetMessage( 'CLEANTALK_LABEL_SFW' );?>:</td>

From 8bed240a7aee2c358e81e9dfee7fd60769581493 Mon Sep 17 00:00:00 2001
From: Glomberg <bazz@bk.ru>
Date: Tue, 10 Sep 2024 21:19:19 +0300
Subject: [PATCH 11/16] Fix. Options. JS code fixed.

---
 cleantalk.antispam/options.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
index 9b88456..7220291 100644
--- a/cleantalk.antispam/options.php
+++ b/cleantalk.antispam/options.php
@@ -296,10 +296,10 @@ function ct_get_options($sModuleId){
     <?=bitrix_sessid_post()?>
     <?php $oTabControl->BeginNextTab();?>
     <script>
-        function ctDdisableInputLine(ct_input_line){
+        function ctDisableInputLine(ct_input_line){
 
-            ct_label = document.getElementById(ct_input_line+'_label');
-            ct_input = document.getElementById(ct_input_line);
+            let ct_label = document.getElementById(ct_input_line+'_label');
+            let ct_input = document.getElementById(ct_input_line);
 
             if(ct_input.hasAttribute('disabled')){
                 ct_input.removeAttribute('disabled');
@@ -463,7 +463,7 @@ function ctDdisableInputLine(ct_input_line){
         <td width="50%" valign="top">
             <label for="form_global_check"><?php echo GetMessage( 'CLEANTALK_LABEL_GLOBAL_CHECK' );?>:</td>
         <td  valign="top">
-            <input type="checkbox" name="form_global_check" id="form_global_check" onclick="ctDdisableInputLine('form_global_check_without_email');" <?php if ( $current_options['form_global_check'] === '1' ):?> checked="checked"<?php endif; ?>value="1" />
+            <input type="checkbox" name="form_global_check" id="form_global_check" onclick="ctDisableInputLine('form_global_check_without_email');" <?php if ( $current_options['form_global_check'] === '1' ):?> checked="checked"<?php endif; ?>value="1" />
         </td>
     </tr>
     <tr>

From fa82c8cea9289c0a2c35c20ac88deed7007e76b1 Mon Sep 17 00:00:00 2001
From: Viktor <Bazz@bk.ru>
Date: Mon, 23 Sep 2024 12:43:23 +0300
Subject: [PATCH 12/16] New. Options. Support different api key for multisite
 mode. (#29)

* Fix. Options. Hidden service fields moved to the bottom of the settings form.

* New. Options. Support different api key for multisite mode.

* Fix. Common. Using different api keys from multisite mode logic fixed.

* Fix. Settings. Not show multisite option for single site mode.
---
 cleantalk.antispam/include.php         | 10 +++--
 cleantalk.antispam/lang/en/options.php |  3 +-
 cleantalk.antispam/lang/ru/options.php |  3 +-
 cleantalk.antispam/options.php         | 56 ++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
index f08cb49..57e5894 100644
--- a/cleantalk.antispam/include.php
+++ b/cleantalk.antispam/include.php
@@ -1235,7 +1235,7 @@ function ct_remove_event_handler(elem, event, callback){
      * @return array|null Checking result or NULL when bad params
      */
     static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = null) {
-        global $DB, $USER;
+        global $DB, $USER, $site;
 
         static $executed_check = true;
 
@@ -1280,7 +1280,8 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = n
                 return;
             }
 
-            $ct_key = COption::GetOptionString('cleantalk.antispam', 'key', '');
+            $ct_key_site = COption::GetOptionString('cleantalk.antispam', '_key', '', $site["LID"]);
+            $ct_key = empty($ct_key_site) ? COption::GetOptionString('cleantalk.antispam', 'key', '') : $ct_key_site;
             $ct_ws = self::GetWorkServer();
 
             if (!isset($_COOKIE['ct_checkjs']))
@@ -1649,7 +1650,7 @@ private static function ct_visibile_fields__process($visible_fields) {
      * @param string Feedback type - 'Y' or 'N' only
      */
     static function SendFeedback($module, $id, $feedback) {
-        global $DB;
+        global $DB, $site;
         if(empty($module))
             return;
         if(empty($id) || intval($id) < 0)
@@ -1661,7 +1662,8 @@ static function SendFeedback($module, $id, $feedback) {
         if($request_id !== FALSE){
             $DB->Query('DELETE FROM cleantalk_cids WHERE module=\''. $module .'\' AND cid=' . $id);
 
-            $ct_key = COption::GetOptionString('cleantalk.antispam', 'key', '');
+            $ct_key_site = COption::GetOptionString('cleantalk.antispam', '_key', '', $site["LID"]);
+            $ct_key = empty($ct_key_site) ? COption::GetOptionString('cleantalk.antispam', 'key', '') : $ct_key_site;
             $ct_ws = self::GetWorkServer();
 
             $ct = new Cleantalk();
diff --git a/cleantalk.antispam/lang/en/options.php b/cleantalk.antispam/lang/en/options.php
index cdf9c1b..41da049 100644
--- a/cleantalk.antispam/lang/en/options.php
+++ b/cleantalk.antispam/lang/en/options.php
@@ -53,4 +53,5 @@
 $MESS['CLEANTALK_WRONG_REGEXP_NOTIFY'] = 'Field Exclusions is not a valid regular expression.';
 $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.';
\ No newline at end of file
+$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.';
\ No newline at end of file
diff --git a/cleantalk.antispam/lang/ru/options.php b/cleantalk.antispam/lang/ru/options.php
index 0e92d22..30761d1 100644
--- a/cleantalk.antispam/lang/ru/options.php
+++ b/cleantalk.antispam/lang/ru/options.php
@@ -53,4 +53,5 @@
 $MESS['CLEANTALK_WRONG_REGEXP_NOTIFY'] = 'Исключение полей форм является не корректным регулярным выражением.';
 $MESS['CLEANTALK_WRONG_DEFAULT_SETTINGS'] = 'Невоможно загрузить опции по умолчанию. Ошибка в имени модуля.';
 $MESS['CLEANTALK_WRONG_CURRENT_SETTINGS'] = 'Невоможно загрузить текущие опции.';
-$MESS['CLEANTALK_RESET_OPTIONS_FAILED'] = 'Невоможно сбросить опции.';
\ No newline at end of file
+$MESS['CLEANTALK_RESET_OPTIONS_FAILED'] = 'Невоможно сбросить опции.';
+$MESS['CLEANTALK_MULTISITE_LABEL_KEY'] = 'Если вы хотите использовать отдельный ключ доступа для этого сайта, вставьте его здесь. В противном случае оставьте поле пустым.';
\ No newline at end of file
diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
index 7220291..19d0063 100644
--- a/cleantalk.antispam/options.php
+++ b/cleantalk.antispam/options.php
@@ -21,6 +21,20 @@
 $cleantalk_is_wrong_url_regexp = false;
 $is_account_exists = false;
 
+$sites_from_bd = CSite::GetList("", "", Array("ACTIVE" => "Y"));
+$sites = array();
+$sub_tabs = array();
+while( $site = $sites_from_bd->Fetch() ) {
+    $site["ID"] = htmlspecialcharsbx($site["ID"]);
+    $site["NAME"] = htmlspecialcharsbx($site["NAME"]);
+    $sites[] = $site;
+    $sub_tabs[] = array("DIV" => "opt_site_".$site["ID"], "TAB" => "(".$site["ID"].") ".$site["NAME"], 'TITLE' => '');
+}
+
+$subTabControl = new CAdminViewTabControl("subTabControl", $sub_tabs);
+
+$current_options = ct_get_options($sModuleId);
+
 if ( ! empty($REQUEST_METHOD) && $REQUEST_METHOD == 'POST' && $_POST['Update'] == 'Y' ) {
     //try to get default options
     $default_options = ct_get_default_options($sModuleId);
@@ -183,6 +197,18 @@
             CAgent::RemoveModuleAgents("cleantalk.antispam");
         }
     }
+
+    foreach( $sites as $site ) {
+        $key = "key_" . $site["LID"];
+        if ( isset($_POST[$key]) ) {
+            if ( empty($_POST[$key]) ) {
+                COption::RemoveOption($sModuleId, "_key", $site["LID"]);
+            } else {
+                // @ToDo add key_is_ok checking here and output error message
+                COption::SetOptionString($sModuleId, "_key", $_POST[$key], false, $site["LID"]);
+            }
+        }
+    }
 }
 
 function ct_is_valid_regexp($exclusion_string)
@@ -379,6 +405,31 @@ function ctDisableInputLine(ct_input_line){
             </td>
         </tr>
     <?php } ?>
+
+
+    <?php if ( count($sites) > 1 ) { ?>
+    <!-- Multisite options -->
+    <tr>
+        <th colspan='2'><?php echo GetMessage('CLEANTALK_MULTISITE_TITLE') ?></th>
+    </tr>
+    <tr>
+        <td colspan='2'>
+            <?php
+                $subTabControl->Begin();
+                foreach ( $sites as $site )
+                {
+                    $subTabControl->BeginNextTab();
+                    $api_key_subsite = Option::get($sModuleId, '_key', '', $site["LID"]);
+                    ?>
+                    <?= GetMessage( 'CLEANTALK_MULTISITE_LABEL_KEY' ) ?>
+                    <input type="text" name="key_<?= $site["LID"] ?>" id="key_<?= $site["LID"] ?>" value="<?= $api_key_subsite ?>" />
+            <?php }
+                $subTabControl->End();
+            ?>
+        </td>
+    </tr>
+    <?php } ?>
+
     <tr class="heading">
         <td colspan="2">
             <?=GetMessage( 'CLEANTALK_TITLE' )?>
@@ -656,6 +707,11 @@ function ctDisableInputLine(ct_input_line){
                     value="1" />
         </td>
     </tr>
+    <!--HIDDEN FIELDSET-->
+    <input type="hidden" name="is_paid" value="<?php echo $current_options['is_paid'] ?>" />
+    <input type="hidden" name="last_checked" value="0" />
+    <input type="hidden" name="moderate_ip" value="<?php echo $current_options['moderate_ip'] ?>" />
+    <input type="hidden" name="ip_license" value="<?php echo $current_options['ip_license'] ?>" />
     <?php $oTabControl->Buttons(); ?>
     <input type="submit" name="Update" value="<?php echo GetMessage( 'CLEANTALK_BUTTON_SAVE' ) ?>" />
     <input type="submit" name="reset" value="<?php echo GetMessage( 'CLEANTALK_BUTTON_RESET' ) ?>" />

From 682c1fb0da7990ea210f0b19d5285841350dea07 Mon Sep 17 00:00:00 2001
From: Glomberg <bazz@bk.ru>
Date: Tue, 8 Oct 2024 17:05:14 +0300
Subject: [PATCH 13/16] Fix. SFW. Testing block page fixed.

---
 cleantalk.antispam/lib/Cleantalk/ApbctBitrix/SFW.php      | 8 +++++++-
 .../lib/Cleantalk/ApbctBitrix/die_page_sfw.html           | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/SFW.php b/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/SFW.php
index 39aad46..135267e 100644
--- a/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/SFW.php
+++ b/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/SFW.php
@@ -31,6 +31,12 @@ public function _die( $result )
             $status = $result['status'] === 'PASS_SFW__BY_WHITELIST' ? '1' : '0';
             $cookie_val = md5( $result['ip'] . $this->api_key ) . $status;
 
+            $request_uri = Server::get('REQUEST_URI');
+            if ( $this->test ) {
+                // Remove "sfw_test_ip" get parameter from the uri
+                $request_uri = preg_replace('%sfw_test_ip=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}&?%', '', $request_uri);
+            }
+
 			// Translation
 			$replaces = array(
 				'{SFW_DIE_NOTICE_IP}'              => $this->__('SpamFireWall is activated for your IP ', 'cleantalk-spam-protect'),
@@ -42,7 +48,7 @@ public function _die( $result )
 				'{SERVICE_ID}'                     => $net_count['net_count'],
 				'{HOST}'                           => '',
 				'{GENERATED}'                      => '<p>The page was generated at&nbsp;' . date( 'D, d M Y H:i:s' ) . "</p>",
-				'{REQUEST_URI}'                    => Server::get( 'REQUEST_URI' ),
+				'{REQUEST_URI}'                    => $request_uri,
 				
 				// Cookie
 				'{COOKIE_PREFIX}'      => '',
diff --git a/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/die_page_sfw.html b/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/die_page_sfw.html
index 236f83a..0d700c1 100644
--- a/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/die_page_sfw.html
+++ b/cleantalk.antispam/lib/Cleantalk/ApbctBitrix/die_page_sfw.html
@@ -71,6 +71,7 @@
 			  }
 		}
 	</style>
+		{SFWGETOPTION}
 	<script>
 		var ct_date = new Date;
 
@@ -82,7 +83,7 @@
 		}
 
 		function get_current_url() {
-			document.write(window.location.href);
+			document.write(window.location.origin + window.location.pathname);
 			return null;
 		}
 	</script>
@@ -123,7 +124,6 @@ <h3>{SFW_DIE_CLICK_TO_PASS}</h3>
     <div class='footer'>
 		<a href='https://cleantalk.org' target='_blank'>{CLEANTALK_TITLE}</a>
     </div>
-    {SFWGETOPTION}
     <script type='text/javascript'>
 		var reload_timeout = 3000;
 		document.getElementById('js_info').style.display = 'none';

From bdc02f2603924d33238ea578bae7a3ed38e711ef Mon Sep 17 00:00:00 2001
From: Glomberg <bazz@bk.ru>
Date: Fri, 11 Oct 2024 13:34:36 +0300
Subject: [PATCH 14/16] Fix. Settings. Multisite option getting fixed.

---
 cleantalk.antispam/include.php |  4 ++--
 cleantalk.antispam/options.php | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
index 57e5894..707dbdb 100644
--- a/cleantalk.antispam/include.php
+++ b/cleantalk.antispam/include.php
@@ -1235,7 +1235,7 @@ function ct_remove_event_handler(elem, event, callback){
      * @return array|null Checking result or NULL when bad params
      */
     static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = null) {
-        global $DB, $USER, $site;
+        global $DB, $USER;
 
         static $executed_check = true;
 
@@ -1280,7 +1280,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE, $form_errors = n
                 return;
             }
 
-            $ct_key_site = COption::GetOptionString('cleantalk.antispam', '_key', '', $site["LID"]);
+            $ct_key_site = COption::GetOptionString('cleantalk.antispam', '_key', '', SITE_ID);
             $ct_key = empty($ct_key_site) ? COption::GetOptionString('cleantalk.antispam', 'key', '') : $ct_key_site;
             $ct_ws = self::GetWorkServer();
 
diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
index 19d0063..0a35ca9 100644
--- a/cleantalk.antispam/options.php
+++ b/cleantalk.antispam/options.php
@@ -199,13 +199,13 @@
     }
 
     foreach( $sites as $site ) {
-        $key = "key_" . $site["LID"];
+        $key = "key_" . $site["SITE_ID"];
         if ( isset($_POST[$key]) ) {
             if ( empty($_POST[$key]) ) {
-                COption::RemoveOption($sModuleId, "_key", $site["LID"]);
+                COption::RemoveOption($sModuleId, "_key", $site["SITE_ID"]);
             } else {
                 // @ToDo add key_is_ok checking here and output error message
-                COption::SetOptionString($sModuleId, "_key", $_POST[$key], false, $site["LID"]);
+                COption::SetOptionString($sModuleId, "_key", $_POST[$key], false, $site["SITE_ID"]);
             }
         }
     }
@@ -419,10 +419,10 @@ function ctDisableInputLine(ct_input_line){
                 foreach ( $sites as $site )
                 {
                     $subTabControl->BeginNextTab();
-                    $api_key_subsite = Option::get($sModuleId, '_key', '', $site["LID"]);
+                    $api_key_subsite = Option::get($sModuleId, '_key', '', $site["SITE_ID"]);
                     ?>
                     <?= GetMessage( 'CLEANTALK_MULTISITE_LABEL_KEY' ) ?>
-                    <input type="text" name="key_<?= $site["LID"] ?>" id="key_<?= $site["LID"] ?>" value="<?= $api_key_subsite ?>" />
+                    <input type="text" name="key_<?= $site["SITE_ID"] ?>" id="key_<?= $site["SITE_ID"] ?>" value="<?= $api_key_subsite ?>" />
             <?php }
                 $subTabControl->End();
             ?>

From e22bd3d0ab5408f04e186337d64eb531da5cf7ff Mon Sep 17 00:00:00 2001
From: Glomberg <bazz@bk.ru>
Date: Mon, 14 Oct 2024 18:53:49 +0300
Subject: [PATCH 15/16] Version 3.13.0 and changelog updated.

---
 README.md                              |  2 +-
 cleantalk.antispam/description.en      | 34 ++++++++++----------------
 cleantalk.antispam/description.ru      | 34 ++++++++++----------------
 cleantalk.antispam/install/version.php |  4 +--
 4 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index 3597144..64db824 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 bitrix-antispam
 ===============
 
-1C Bitrix anti-spam mod. 3.12.0
+1C Bitrix anti-spam mod.
 
 Information page,
 http://cleantalk.org/bitrix-antispam-module-bez-captcha
diff --git a/cleantalk.antispam/description.en b/cleantalk.antispam/description.en
index 25b4005..10afc20 100644
--- a/cleantalk.antispam/description.en
+++ b/cleantalk.antispam/description.en
@@ -1,23 +1,15 @@
 <ul>
-    <li>* Fix: all functions in the class CleantalkAntispam are now static for compatibility with php 8</li>
-    <li>* New. Options. Use bitrix API.</li>
-    <li>* New. default_option.php. Default settings file.</li>
-    <li>* Imp. options.php. Handle fail messages.</li>
-    <li>* Imp. options.php. Old COption legacy removed.</li>
-    <li>* Fix. Uninstall. Complete deactivation now works correct.</li>
-    <li>* New. Install. Use default options if no options set (new install or if complete deactivation performed)</li>
-    <li>* Fix. After tests. Exclusion for SFW module settings that placed after uninstallation process.</li>
-    <li>* Fix. After review. Old PHP version compatibility in access keys comparison.</li>
-    <li>* Fix. SFW test. Now displays test page correct and always runs in the session.</li>
-    <li>* Fix. Settings page. Remove spaces in URL exclusions.</li>
-    <li>* Fix. Exclusions. Page with URL exclusions now do not load JS.</li>
-    <li>* Fix. Description wrapped by list.</li>
-    <li>* Fix. Getting fields any fixed.</li>
-    <li>* fix: fixed warning in preg_match</li>
-    <li>* Fix: fixed preg_match in OnBeforeResultAddHandler()</li>
-    <li>* fixed static functions</li>
-    <li>* Fix. Skip service request - iblock.vode component ajax loading.</li>
-    <li>* Fix. SFW. Updating process fixed.</li>
-    <li>* Mod: SFW send logs is fixed</li>
-    <li>* Upd. SFW. Implemented personal list.</li>
+    <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>
 </ul>
diff --git a/cleantalk.antispam/description.ru b/cleantalk.antispam/description.ru
index 25b4005..10afc20 100644
--- a/cleantalk.antispam/description.ru
+++ b/cleantalk.antispam/description.ru
@@ -1,23 +1,15 @@
 <ul>
-    <li>* Fix: all functions in the class CleantalkAntispam are now static for compatibility with php 8</li>
-    <li>* New. Options. Use bitrix API.</li>
-    <li>* New. default_option.php. Default settings file.</li>
-    <li>* Imp. options.php. Handle fail messages.</li>
-    <li>* Imp. options.php. Old COption legacy removed.</li>
-    <li>* Fix. Uninstall. Complete deactivation now works correct.</li>
-    <li>* New. Install. Use default options if no options set (new install or if complete deactivation performed)</li>
-    <li>* Fix. After tests. Exclusion for SFW module settings that placed after uninstallation process.</li>
-    <li>* Fix. After review. Old PHP version compatibility in access keys comparison.</li>
-    <li>* Fix. SFW test. Now displays test page correct and always runs in the session.</li>
-    <li>* Fix. Settings page. Remove spaces in URL exclusions.</li>
-    <li>* Fix. Exclusions. Page with URL exclusions now do not load JS.</li>
-    <li>* Fix. Description wrapped by list.</li>
-    <li>* Fix. Getting fields any fixed.</li>
-    <li>* fix: fixed warning in preg_match</li>
-    <li>* Fix: fixed preg_match in OnBeforeResultAddHandler()</li>
-    <li>* fixed static functions</li>
-    <li>* Fix. Skip service request - iblock.vode component ajax loading.</li>
-    <li>* Fix. SFW. Updating process fixed.</li>
-    <li>* Mod: SFW send logs is fixed</li>
-    <li>* Upd. SFW. Implemented personal list.</li>
+    <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>
 </ul>
diff --git a/cleantalk.antispam/install/version.php b/cleantalk.antispam/install/version.php
index d6402de..b14aac0 100644
--- a/cleantalk.antispam/install/version.php
+++ b/cleantalk.antispam/install/version.php
@@ -1,5 +1,5 @@
 <?php
 $arModuleVersion = array(
-	"VERSION" => "3.12.0",
-	"VERSION_DATE" => "2023-19-10 10:00:00"
+	"VERSION" => "3.13.0",
+	"VERSION_DATE" => "2024-10-14 10:00:00",
 );

From 472f7af49b298edf147c7c177a253500c12be848 Mon Sep 17 00:00:00 2001
From: Glomberg <bazz@bk.ru>
Date: Mon, 14 Oct 2024 18:56:48 +0300
Subject: [PATCH 16/16] Upd. Code. Github actions added.

---
 .github/workflows/releaseNotice.yml | 23 +++++++++++++++++++++++
 .github/workflows/reviewNotice.yml  | 27 +++++++++++++++++++++++++++
 .gitignore                          |  4 +++-
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/releaseNotice.yml
 create mode 100644 .github/workflows/reviewNotice.yml

diff --git a/.github/workflows/releaseNotice.yml b/.github/workflows/releaseNotice.yml
new file mode 100644
index 0000000..46abd80
--- /dev/null
+++ b/.github/workflows/releaseNotice.yml
@@ -0,0 +1,23 @@
+name: Notice about releases via Telegram
+
+on:
+  release:
+    types: [published]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: send telegram message on release
+        uses: appleboy/telegram-action@master
+        with:
+          to: ${{ secrets.TELEGRAM_TO }}
+          token: ${{ secrets.TELEGRAM_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
\ No newline at end of file
diff --git a/.github/workflows/reviewNotice.yml b/.github/workflows/reviewNotice.yml
new file mode 100644
index 0000000..d29c9ad
--- /dev/null
+++ b/.github/workflows/reviewNotice.yml
@@ -0,0 +1,27 @@
+name: Notice about review approved via Telegram
+
+on:
+  pull_request_review:
+    types: [ submitted ]
+
+jobs:
+
+  build:
+    if: github.event.review.state == 'approved' && toJSON(github.event.pull_request.requested_reviewers) == '[]'
+    runs-on: ubuntu-latest
+    steps:
+      - 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
+        with:
+          to: ${{ secrets.TELEGRAM_PLUGINS_TO }}
+          token: ${{ secrets.TELEGRAM_REVIEWER_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
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f131eca..7681e02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /*
 !/cleantalk.antispam
-!/cleantalk.antispam/*
\ No newline at end of file
+!/cleantalk.antispam/*
+!/.github
+!/.github/*
\ No newline at end of file