From 1bafffec6a32006f04d12d52f2fdfda4367bf295 Mon Sep 17 00:00:00 2001
From: Roman Safronov <r.safronik@gmail.com>
Date: Tue, 10 Oct 2017 14:31:51 +0500
Subject: [PATCH 1/5] Added web-forms protection Version: 3.10.2

---
 cleantalk.antispam/description.en      |  4 +-
 cleantalk.antispam/description.ru      |  4 +-
 cleantalk.antispam/include.php         | 94 +++++++++++++++++++++++++-
 cleantalk.antispam/install/index.php   |  7 ++
 cleantalk.antispam/install/version.php |  2 +-
 cleantalk.antispam/lang/en/options.php |  1 +
 cleantalk.antispam/lang/ru/options.php |  1 +
 cleantalk.antispam/options.php         |  9 ++-
 cleantalk.antispam/updater.php         |  8 ++-
 9 files changed, 118 insertions(+), 12 deletions(-)

diff --git a/cleantalk.antispam/description.en b/cleantalk.antispam/description.en
index 149a1d6..c91a722 100644
--- a/cleantalk.antispam/description.en
+++ b/cleantalk.antispam/description.en
@@ -1,3 +1 @@
-- Improved spam protection
-- Errors fixes
-- Improved JS code
\ No newline at end of file
+- Added protection for Web-form component
\ No newline at end of file
diff --git a/cleantalk.antispam/description.ru b/cleantalk.antispam/description.ru
index 6dedbf2..6275f32 100644
--- a/cleantalk.antispam/description.ru
+++ b/cleantalk.antispam/description.ru
@@ -1,3 +1 @@
-- �������� ������ �� �����
-- ����������� ������
-- ������� JS ���
\ No newline at end of file
+- ��������� ������ ��� ���������� ���-�����
\ No newline at end of file
diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
index fe0b562..c37e687 100644
--- a/cleantalk.antispam/include.php
+++ b/cleantalk.antispam/include.php
@@ -361,6 +361,79 @@ function OnBeforeOrderAddHandler(&$arFields)
 		}
 	}
    
+    /**
+     * *** Web forms section ***
+     */
+   
+   /**
+     * Checking web forms
+     * @param $WEB_FORM_ID, &$arFields, &$arrVALUES Comment fields to check
+     * @return null|boolean NULL when success or FALSE when spam detected
+     */
+    
+    function OnBeforeResultAddHandler($WEB_FORM_ID, &$arFields, &$arrVALUES)
+    {
+    	global $APPLICATION;
+		
+		$ct_status = COption::GetOptionString('cleantalk.antispam', 'status', '0');
+        $ct_webform= COption::GetOptionString('cleantalk.antispam', 'web_form', '0');
+		
+        if ($ct_status == 1 && $ct_webform == 1){
+			
+			$sender_email = null;
+	    	$message = '';
+			
+			$skip_keys = array(
+				'WEB_FORM_ID',
+				'RESULT_ID',
+				'formresult',
+				'sessid',
+				'captcha_',
+				'web_form_submit'
+			);
+			
+	    	foreach ($arrVALUES as $key => $value){
+				
+				// Skipping keys
+				foreach($skip_keys as $skip){
+					if(strpos($key, $skip) !== false)
+						continue 2;
+				}
+				
+				if ($sender_email === null && preg_match("/^\S+@\S+\.\S+$/", $value))
+					$sender_email = $value;
+				else
+					$message.="$value\n";
+		    }
+			
+		    $arUser = array();
+			$arUser["type"] = "webform";
+			$arUser["sender_email"] = $sender_email;
+			$arUser["sender_nickname"] = '';
+			$arUser["sender_ip"] = $_SERVER['REMOTE_ADDR'];
+			$arUser["message_title"] = "";
+			$arUser["message_body"] = $message;
+			$arUser["example_title"] = "";
+			$arUser["example_body"] = "";
+			$arUser["example_comments"] = "";
+			
+			$aResult =  CleantalkAntispam::CheckAllBefore($arUser,FALSE);
+
+			if(isset($aResult) && is_array($aResult)){
+				
+				if($aResult['errno'] == 0){
+					
+					if($aResult['allow'] == 1){
+						return; //Not spammer - just return;
+					}else{
+						$APPLICATION->ThrowException($aResult['ct_result_comment']);
+						return false;
+					}
+				}
+			}
+		}
+	}
+   
     /**
      * *** TreeLike comments section ***
      */
@@ -959,7 +1032,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
 		}
 
         $type = $arEntity['type'];
-        if($type != 'comment' && $type != 'register' && $type != 'order' && $type != 'feedback_general_contact_form' && $type != 'private_message'){
+        if($type != 'comment' && $type != 'webform' &&$type != 'register' && $type != 'order' && $type != 'feedback_general_contact_form' && $type != 'private_message'){
             CEventLog::Add(array(
                 'SEVERITY' => 'SECURITY',
                 'AUDIT_TYPE_ID' => 'CLEANTALK_E_INTERNAL',
@@ -982,6 +1055,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
 			$checkjs = 1;
 		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);
@@ -1034,7 +1108,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
         $ct_request->sender_email = isset($arEntity['sender_email']) ? $arEntity['sender_email'] : '';
         $ct_request->sender_nickname = isset($arEntity['sender_nickname']) ? $arEntity['sender_nickname'] : '';
 		$ct_request->sender_ip = $ct->ct_session_ip($_SERVER['REMOTE_ADDR']);
-        $ct_request->agent = 'bitrix-3101';
+        $ct_request->agent = 'bitrix-3102';
         $ct_request->response_lang = 'ru';
         $ct_request->js_on = $checkjs;
         $ct_request->sender_info = $sender_info;
@@ -1091,6 +1165,20 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
 				$timelabels_key = 'mail_error_comment';
                 $ct_request->submit_time = $ct_submit_time;
 
+                $ct_request->message .= isset($arEntity['message_body']) ? $arEntity['message_body'] : '';
+				
+				$ct_result = $ct->isAllowMessage($ct_request);
+				break;
+				
+			case 'webform':
+				
+				$a_post_info['comment_type'] = 'webform';
+                $post_info = json_encode($a_post_info);
+				$ct_request->post_info = $post_info;
+				
+				$timelabels_key = 'mail_error_comment';
+                $ct_request->submit_time = $ct_submit_time;
+
                 $ct_request->message .= isset($arEntity['message_body']) ? $arEntity['message_body'] : '';
 				
 				$ct_result = $ct->isAllowMessage($ct_request);
@@ -1302,7 +1390,7 @@ static function SendFeedback($module, $id, $feedback) {
 
             $ct_request = new CleantalkRequest();
             $ct_request->auth_key = $ct_key;
-            $ct_request->agent = 'bitrix-3101';
+            $ct_request->agent = 'bitrix-3102';
 	    $ct_request->sender_ip = $ct->ct_session_ip($_SERVER['REMOTE_ADDR']);
             $ct_request->feedback = $request_id . ':' . ($feedback == 'Y' ? '1' : '0');
 
diff --git a/cleantalk.antispam/install/index.php b/cleantalk.antispam/install/index.php
index b24596c..c1b5fa6 100644
--- a/cleantalk.antispam/install/index.php
+++ b/cleantalk.antispam/install/index.php
@@ -134,6 +134,10 @@ function DoInstall() {
 			{
 				RegisterModuleDependences('sale', 'OnBeforeOrderAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeOrderAddHandler');
 			} 
+			if (IsModuleInstalled('form'))
+			{
+				RegisterModuleDependences('form', 'OnBeforeResultAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeResultAddHandler');
+			} 
 		}
 		
 		//Adding agents
@@ -186,6 +190,9 @@ function DoUninstall() {
         UnRegisterModuleDependences('main', 'OnBeforeUserRegister', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeUserRegisterHandler');
 		UnRegisterModuleDependences('main', 'OnEndBufferContent', 'cleantalk.antispam', 'CleantalkAntispam', 'OnEndBufferContentHandler');
         UnRegisterModuleDependences('main', 'OnEventLogGetAuditTypes', 'cleantalk.antispam', 'CleantalkAntispam', 'OnEventLogGetAuditTypesHandler');
+		if (IsModuleInstalled('form')){
+			UnRegisterModuleDependences('form', 'OnBeforeResultAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeResultAddHandler');
+		} 
         UnRegisterModule('cleantalk.antispam');
         $this->UnInstallDB();
         $this->UnInstallFiles();
diff --git a/cleantalk.antispam/install/version.php b/cleantalk.antispam/install/version.php
index 7477687..98c2044 100644
--- a/cleantalk.antispam/install/version.php
+++ b/cleantalk.antispam/install/version.php
@@ -1,5 +1,5 @@
 <?php
 $arModuleVersion = array(
-	"VERSION" => "3.10.1",
+	"VERSION" => "3.10.2",
 	"VERSION_DATE" => "2017-09-12 24:00:00"
 );
diff --git a/cleantalk.antispam/lang/en/options.php b/cleantalk.antispam/lang/en/options.php
index c083987..e980209 100644
--- a/cleantalk.antispam/lang/en/options.php
+++ b/cleantalk.antispam/lang/en/options.php
@@ -8,6 +8,7 @@
 $MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = 'Treelike comments forms protection';
 $MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = 'Send texts for off-top analysis';
 $MESS['CLEANTALK_LABEL_ORDER'] = 'Order form protection';
+$MESS['CLEANTALK_LABEL_WEB_FORMS'] = 'Web forms protection';
 $MESS['CLEANTALK_BUTTON_SAVE']  = 'Save';
 $MESS['CLEANTALK_GET_AUTO_KEY']  = 'Get access key automatically';
 $MESS['CLEANTALK_GET_MANUAL_KEY']  = 'Get access key manually';
diff --git a/cleantalk.antispam/lang/ru/options.php b/cleantalk.antispam/lang/ru/options.php
index a28cc6c..e2b1d5e 100644
--- a/cleantalk.antispam/lang/ru/options.php
+++ b/cleantalk.antispam/lang/ru/options.php
@@ -8,6 +8,7 @@
 $MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = '������ ���� ����������� ������������';
 $MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = '�������� ������ ��� ���-��� �������';
 $MESS['CLEANTALK_LABEL_ORDER']  = '��������� ����� �������';
+$MESS['CLEANTALK_LABEL_WEB_FORMS'] = '������ ���-����';
 $MESS['CLEANTALK_BUTTON_SAVE']  = '���������';
 $MESS['CLEANTALK_GET_AUTO_KEY']  = '�������� ���� �������������';
 $MESS['CLEANTALK_GET_MANUAL_KEY']  = '�������� ���� �������';
diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
index cb0704c..b5c6b8e 100644
--- a/cleantalk.antispam/options.php
+++ b/cleantalk.antispam/options.php
@@ -40,7 +40,7 @@
 	}
 	
 	// Send empty feedback for version comparison in Dashboard
-	$result = CleantalkHelper::sendEmptyFeedback($new_key, 'bitrix-3101');
+	$result = CleantalkHelper::sendEmptyFeedback($new_key, 'bitrix-3102');
 	
     /**
      * Set settings when submit
@@ -59,6 +59,7 @@
     COption::SetOptionString( $sModuleId, 'form_comment_treelike',           $_POST['form_comment_treelike'] == '1'           ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'form_send_example',               $_POST['form_send_example'] == '1'               ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'form_order',                      $_POST['form_order'] == '1'                      ? '1' : '0' );
+	COption::SetOptionString( $sModuleId, 'web_form',                        $_POST['web_form'] == '1'                        ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'is_paid',                         $_POST['is_paid'] == '1'                         ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'last_checked',                    $_POST['last_checked'] == '1'                    ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'form_global_check',               $_POST['form_global_check'] == '1'               ? '1' : '0' );
@@ -173,6 +174,12 @@ function ctDdisableInputLine(ct_input_line){
         <td  valign="top">
             <input type="checkbox" name="form_order" id="form_order" <? if ( COption::GetOptionString( $sModuleId, 'form_order', '0' ) == '1'):?> checked="checked"<? endif; ?> value="1" />
         </td>
+    </tr>
+	 <tr>
+        <td width="50%" valign="top"><label for="web_form"><?echo GetMessage( 'CLEANTALK_LABEL_WEB_FORMS' );?>:</td>
+        <td  valign="top">
+            <input type="checkbox" name="web_form" id="web_form" <? if ( COption::GetOptionString( $sModuleId, 'web_form', '0' ) == '1'):?> checked="checked"<? endif; ?> value="1" />
+        </td>
     </tr>
     <tr>
         <td width="50%" valign="top"><label for="form_global_check"><?echo GetMessage( 'CLEANTALK_LABEL_GLOBAL_CHECK' );?>:</td>
diff --git a/cleantalk.antispam/updater.php b/cleantalk.antispam/updater.php
index dd02c73..770b55f 100644
--- a/cleantalk.antispam/updater.php
+++ b/cleantalk.antispam/updater.php
@@ -35,7 +35,8 @@
 			$arModuleVersion['VERSION'] == '3.9.1' ||
 			$arModuleVersion['VERSION'] == '3.9.2' ||
 			$arModuleVersion['VERSION'] == '3.10.0'||
-			$arModuleVersion['VERSION'] == '3.10.1'
+			$arModuleVersion['VERSION'] == '3.10.1'||
+			$arModuleVersion['VERSION'] == '3.10.2'
 		)
     ){
 		// Here is checking version of existing (old) code.
@@ -168,6 +169,11 @@
 						CAgent::AddAgent("CleantalkAntispam::sfw_send_logs();", "cleantalk.antispam", "N", 3600);
 						CAgent::AddAgent("CleantalkAntispam::sfw_update();",    "cleantalk.antispam", "N", 86400);
 					}
+				case '3.10.2' :
+					if (IsModuleInstalled('cleantalk.antispam') && IsModuleInstalled('form')){
+							RegisterModuleDependences('form', 'OnBeforeResultAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeResultAddHandler');
+					}
+					
 			}
 			unset($obModule);
 		}

From 520c6628d1f74bcd1f396f0c52840f59c1aeaf8d Mon Sep 17 00:00:00 2001
From: davydovct <davydov@cleantalk.org>
Date: Thu, 7 Dec 2017 06:21:59 +0500
Subject: [PATCH 2/5] Update version Display error message on BuyOneClick forms
 Check forms with get method

---
 README.md                                    |   2 +-
 cleantalk.antispam/description.en            |   3 +-
 cleantalk.antispam/description.ru            |   3 +-
 cleantalk.antispam/include.php               | 105 +++----------------
 cleantalk.antispam/install/index.php         |   7 --
 cleantalk.antispam/install/version.php       |   2 +-
 cleantalk.antispam/lang/en/options.php       |   1 -
 cleantalk.antispam/lang/ru/include.php       |  14 +--
 cleantalk.antispam/lang/ru/install/index.php |  42 ++++----
 cleantalk.antispam/lang/ru/options.php       |  49 +++++----
 cleantalk.antispam/options.php               |   7 --
 cleantalk.antispam/updater.php               |   5 -
 12 files changed, 71 insertions(+), 169 deletions(-)

diff --git a/README.md b/README.md
index 7e37e8b..a003c86 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 bitrix-antispam
 ===============
 
-1C Bitrix anti-spam mod. 3.10.0
+1C Bitrix anti-spam mod. 3.10.2
 
 Information page,
 http://cleantalk.org/bitrix-antispam-module-bez-captcha
diff --git a/cleantalk.antispam/description.en b/cleantalk.antispam/description.en
index c91a722..4a21d11 100644
--- a/cleantalk.antispam/description.en
+++ b/cleantalk.antispam/description.en
@@ -1 +1,2 @@
-- Added protection for Web-form component
\ No newline at end of file
+- "Display error on BuyOneClick forms"
+- "Protect forms with GET method"
\ No newline at end of file
diff --git a/cleantalk.antispam/description.ru b/cleantalk.antispam/description.ru
index 6275f32..4d79e9d 100644
--- a/cleantalk.antispam/description.ru
+++ b/cleantalk.antispam/description.ru
@@ -1 +1,2 @@
-- ��������� ������ ��� ���������� ���-�����
\ No newline at end of file
+- "Вывод ошибки на формах Купить в один клик"
+- "Защита любых форм с GET параметрами"
\ No newline at end of file
diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
index c37e687..a328c73 100644
--- a/cleantalk.antispam/include.php
+++ b/cleantalk.antispam/include.php
@@ -83,8 +83,16 @@ static public function sfw_send_logs()
     
     static function CleantalkDie($message)
     {
-    	$error_tpl=file_get_contents(dirname(__FILE__)."/error.html");
-		print str_replace('%ERROR_TEXT%',$message,$error_tpl);
+		if (isset($_POST['feedback_type']) && $_POST['feedback_type'] == 'buyoneclick')
+		{
+			$result=Array('error'=>true,'msg'=>'js_kr_error_send');
+			print json_encode($result);
+		}
+		else
+		{
+	    	$error_tpl=file_get_contents(dirname(__FILE__)."/error.html");
+			print str_replace('%ERROR_TEXT%',$message,$error_tpl);			
+		}    	
 		die();
     }
 	
@@ -259,7 +267,8 @@ public function OnPageStartHandler()
 	    	$sender_email = null;
 		    $message = '';
 			CleantalkAntispam::CleantalkGetFields($sender_email,$message,$_POST); //Works via links need to be fixed
-			
+			if ($sender_email === null)
+				CleantalkAntispam::CleantalkGetFields($sender_email,$message,$_GET);
 		    if($sender_email!==null || $ct_global_without_email == 1)
 		    {
 		    	$arUser = array();
@@ -361,79 +370,6 @@ function OnBeforeOrderAddHandler(&$arFields)
 		}
 	}
    
-    /**
-     * *** Web forms section ***
-     */
-   
-   /**
-     * Checking web forms
-     * @param $WEB_FORM_ID, &$arFields, &$arrVALUES Comment fields to check
-     * @return null|boolean NULL when success or FALSE when spam detected
-     */
-    
-    function OnBeforeResultAddHandler($WEB_FORM_ID, &$arFields, &$arrVALUES)
-    {
-    	global $APPLICATION;
-		
-		$ct_status = COption::GetOptionString('cleantalk.antispam', 'status', '0');
-        $ct_webform= COption::GetOptionString('cleantalk.antispam', 'web_form', '0');
-		
-        if ($ct_status == 1 && $ct_webform == 1){
-			
-			$sender_email = null;
-	    	$message = '';
-			
-			$skip_keys = array(
-				'WEB_FORM_ID',
-				'RESULT_ID',
-				'formresult',
-				'sessid',
-				'captcha_',
-				'web_form_submit'
-			);
-			
-	    	foreach ($arrVALUES as $key => $value){
-				
-				// Skipping keys
-				foreach($skip_keys as $skip){
-					if(strpos($key, $skip) !== false)
-						continue 2;
-				}
-				
-				if ($sender_email === null && preg_match("/^\S+@\S+\.\S+$/", $value))
-					$sender_email = $value;
-				else
-					$message.="$value\n";
-		    }
-			
-		    $arUser = array();
-			$arUser["type"] = "webform";
-			$arUser["sender_email"] = $sender_email;
-			$arUser["sender_nickname"] = '';
-			$arUser["sender_ip"] = $_SERVER['REMOTE_ADDR'];
-			$arUser["message_title"] = "";
-			$arUser["message_body"] = $message;
-			$arUser["example_title"] = "";
-			$arUser["example_body"] = "";
-			$arUser["example_comments"] = "";
-			
-			$aResult =  CleantalkAntispam::CheckAllBefore($arUser,FALSE);
-
-			if(isset($aResult) && is_array($aResult)){
-				
-				if($aResult['errno'] == 0){
-					
-					if($aResult['allow'] == 1){
-						return; //Not spammer - just return;
-					}else{
-						$APPLICATION->ThrowException($aResult['ct_result_comment']);
-						return false;
-					}
-				}
-			}
-		}
-	}
-   
     /**
      * *** TreeLike comments section ***
      */
@@ -1032,7 +968,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
 		}
 
         $type = $arEntity['type'];
-        if($type != 'comment' && $type != 'webform' &&$type != 'register' && $type != 'order' && $type != 'feedback_general_contact_form' && $type != 'private_message'){
+        if($type != 'comment' && $type != 'register' && $type != 'order' && $type != 'feedback_general_contact_form' && $type != 'private_message'){
             CEventLog::Add(array(
                 'SEVERITY' => 'SECURITY',
                 'AUDIT_TYPE_ID' => 'CLEANTALK_E_INTERNAL',
@@ -1055,7 +991,6 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
 			$checkjs = 1;
 		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);
@@ -1165,20 +1100,6 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
 				$timelabels_key = 'mail_error_comment';
                 $ct_request->submit_time = $ct_submit_time;
 
-                $ct_request->message .= isset($arEntity['message_body']) ? $arEntity['message_body'] : '';
-				
-				$ct_result = $ct->isAllowMessage($ct_request);
-				break;
-				
-			case 'webform':
-				
-				$a_post_info['comment_type'] = 'webform';
-                $post_info = json_encode($a_post_info);
-				$ct_request->post_info = $post_info;
-				
-				$timelabels_key = 'mail_error_comment';
-                $ct_request->submit_time = $ct_submit_time;
-
                 $ct_request->message .= isset($arEntity['message_body']) ? $arEntity['message_body'] : '';
 				
 				$ct_result = $ct->isAllowMessage($ct_request);
diff --git a/cleantalk.antispam/install/index.php b/cleantalk.antispam/install/index.php
index c1b5fa6..b24596c 100644
--- a/cleantalk.antispam/install/index.php
+++ b/cleantalk.antispam/install/index.php
@@ -134,10 +134,6 @@ function DoInstall() {
 			{
 				RegisterModuleDependences('sale', 'OnBeforeOrderAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeOrderAddHandler');
 			} 
-			if (IsModuleInstalled('form'))
-			{
-				RegisterModuleDependences('form', 'OnBeforeResultAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeResultAddHandler');
-			} 
 		}
 		
 		//Adding agents
@@ -190,9 +186,6 @@ function DoUninstall() {
         UnRegisterModuleDependences('main', 'OnBeforeUserRegister', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeUserRegisterHandler');
 		UnRegisterModuleDependences('main', 'OnEndBufferContent', 'cleantalk.antispam', 'CleantalkAntispam', 'OnEndBufferContentHandler');
         UnRegisterModuleDependences('main', 'OnEventLogGetAuditTypes', 'cleantalk.antispam', 'CleantalkAntispam', 'OnEventLogGetAuditTypesHandler');
-		if (IsModuleInstalled('form')){
-			UnRegisterModuleDependences('form', 'OnBeforeResultAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeResultAddHandler');
-		} 
         UnRegisterModule('cleantalk.antispam');
         $this->UnInstallDB();
         $this->UnInstallFiles();
diff --git a/cleantalk.antispam/install/version.php b/cleantalk.antispam/install/version.php
index 98c2044..f65080b 100644
--- a/cleantalk.antispam/install/version.php
+++ b/cleantalk.antispam/install/version.php
@@ -1,5 +1,5 @@
 <?php
 $arModuleVersion = array(
 	"VERSION" => "3.10.2",
-	"VERSION_DATE" => "2017-09-12 24:00:00"
+	"VERSION_DATE" => "2017-12-07 24:00:00"
 );
diff --git a/cleantalk.antispam/lang/en/options.php b/cleantalk.antispam/lang/en/options.php
index e980209..c083987 100644
--- a/cleantalk.antispam/lang/en/options.php
+++ b/cleantalk.antispam/lang/en/options.php
@@ -8,7 +8,6 @@
 $MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = 'Treelike comments forms protection';
 $MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = 'Send texts for off-top analysis';
 $MESS['CLEANTALK_LABEL_ORDER'] = 'Order form protection';
-$MESS['CLEANTALK_LABEL_WEB_FORMS'] = 'Web forms protection';
 $MESS['CLEANTALK_BUTTON_SAVE']  = 'Save';
 $MESS['CLEANTALK_GET_AUTO_KEY']  = 'Get access key automatically';
 $MESS['CLEANTALK_GET_MANUAL_KEY']  = 'Get access key manually';
diff --git a/cleantalk.antispam/lang/ru/include.php b/cleantalk.antispam/lang/ru/include.php
index 69fc3fd..9ee8cde 100644
--- a/cleantalk.antispam/lang/ru/include.php
+++ b/cleantalk.antispam/lang/ru/include.php
@@ -1,8 +1,8 @@
 <?php
-$MESS['CLEANTALK_BACK_LINK'] = '��������� �����';
-$MESS['CLEANTALK_EVENT']     = '������������� CleanTalk';
-$MESS['CLEANTALK_MESSAGE']   = '���������';
-$MESS['CLEANTALK_E_SERVER'] = '������ ������ ������� CleanTalk';
-$MESS['CLEANTALK_E_INTERNAL'] = '������ ������ ������� CleanTalk';
-$MESS['CLEANTALK_E_PARAM']  = '������ ��������� ������ CheckAllBefore';
-$MESS['CLEANTALK_E_TYPE']   = '������ �������� type ������ CheckAllBefore';
\ No newline at end of file
+$MESS['CLEANTALK_BACK_LINK'] = 'Вернуться назад';
+$MESS['CLEANTALK_EVENT']     = 'Автомодератор CleanTalk';
+$MESS['CLEANTALK_MESSAGE']   = 'Сообщение';
+$MESS['CLEANTALK_E_SERVER'] = 'Ошибка работы сервера CleanTalk';
+$MESS['CLEANTALK_E_INTERNAL'] = 'Ошибка вызова методов CleanTalk';
+$MESS['CLEANTALK_E_PARAM']  = 'Плохие параметры метода CheckAllBefore';
+$MESS['CLEANTALK_E_TYPE']   = 'Плохой параметр type метода CheckAllBefore';
diff --git a/cleantalk.antispam/lang/ru/install/index.php b/cleantalk.antispam/lang/ru/install/index.php
index d0d1ec2..c44472e 100644
--- a/cleantalk.antispam/lang/ru/install/index.php
+++ b/cleantalk.antispam/lang/ru/install/index.php
@@ -1,22 +1,22 @@
 <?php
-$MESS["CLEANTALK_MODULE_NAME"] = "�������� ��� CAPTCHA �� CleanTalk";
-$MESS["CLEANTALK_MODULE_DESCRIPTION"] = "������ �� ����� ��� �����, ��������-�������, �������� ��������, ������ � �������������� �����.";
-$MESS["CLEANTALK_INSTALL_TITLE"] = "��������� ������ \"�������� ��� CAPTCHA �� CleanTalk\"";
-$MESS["CLEANTALK_UNINSTALL_TITLE"] = "�������� ������ \"�������� ��� CAPTCHA �� CleanTalk\"";
-$MESS["CLEANTALK_ERROR_CREATE_TIMELABELS"] = "�� ���� ������� ������� TIMELABELS";
-$MESS["CLEANTALK_ERROR_CREATE_CIDS"] = "�� ���� ������� ������� CIDS";
-$MESS["CLEANTALK_ERROR_CREATE_SERVER"] = "�� ���� ������� ������� SERVER";
-$MESS["CLEANTALK_ERROR_FILES_01"] = "��� ������ ��������� �����";
-$MESS["CLEANTALK_ERROR_FILES_02"] = "�� ���� ������� ����� ������� ����������";
-$MESS["CLEANTALK_ERROR_FILES_03"] = "�� ���� ����������� ������ ���������� �� ��������� ����� � ���������";
-$MESS["CLEANTALK_ERROR_FILES_04"] = "��� PHP-����� �������";
-$MESS["CLEANTALK_ERROR_FILES_05"] = "�� ���� ��������� �� PHP-����� �������";
-$MESS["CLEANTALK_ERROR_FILES_06"] = "�� ���� ����� ������� ��� ������� ���������� � PHP-���� �������";
-$MESS["CLEANTALK_ERROR_FILES_07"] = "�� ���� ��������� PHP-���� ������� - ������ ������ ������ ����������� ��� CLEANTALK";
-$MESS["CLEANTALK_ERROR_FILES_08"] = "�� ���� ��������� PHP-���� ������� - ������ ������ ������ ����������� ��� CLEANTALK";
-$MESS["CLEANTALK_ERROR_FILES_09"] = "�� ���� ��������� PHP-���� ������� - ������ ����������� ��� CLEANTALK ������ ����� �����������";
-$MESS["CLEANTALK_ERROR_FILES_10"] = "�� ���� �������� ����� PHP-���� �������";
-$MESS["CLEANTALK_TEMPLATES_HEADER"] = "�������� ��������� ������� ��-���������:";
-$MESS["CLEANTALK_TEMPLATES_FOOTER"] = "���� �� ����������� ������ �������, �� ������ ������ � ��� ��������� ����";
-$MESS["MOD_INST_OK"] = "��������� ������ ������� ���������";
-$MESS["MOD_UNINST_OK"] = "�������� ������ ������� ���������";
\ No newline at end of file
+$MESS["CLEANTALK_MODULE_NAME"] = "Антиспам без CAPTCHA от CleanTalk";
+$MESS["CLEANTALK_MODULE_DESCRIPTION"] = "Защита от спама без капчи, вопросов-ответов, подсчета животных, пазлов и арифметических задач.";
+$MESS["CLEANTALK_INSTALL_TITLE"] = "Установка модуля \"Антиспам без CAPTCHA от CleanTalk\"";
+$MESS["CLEANTALK_UNINSTALL_TITLE"] = "Удаление модуля \"Антиспам без CAPTCHA от CleanTalk\"";
+$MESS["CLEANTALK_ERROR_CREATE_TIMELABELS"] = "Не могу создать таблицу TIMELABELS";
+$MESS["CLEANTALK_ERROR_CREATE_CIDS"] = "Не могу создать таблицу CIDS";
+$MESS["CLEANTALK_ERROR_CREATE_SERVER"] = "Не могу создать таблицу SERVER";
+$MESS["CLEANTALK_ERROR_FILES_01"] = "Нет нужных системных папок";
+$MESS["CLEANTALK_ERROR_FILES_02"] = "Не могу создать папку шаблона компонента";
+$MESS["CLEANTALK_ERROR_FILES_03"] = "Не могу скопировать шаблон компонента из системной папки в локальную";
+$MESS["CLEANTALK_ERROR_FILES_04"] = "Нет PHP-файла шаблона";
+$MESS["CLEANTALK_ERROR_FILES_05"] = "Не могу прочитать из PHP-файла шаблона";
+$MESS["CLEANTALK_ERROR_FILES_06"] = "Не могу найти паттерн для вставки дополнения в PHP-файл шаблона";
+$MESS["CLEANTALK_ERROR_FILES_07"] = "Не могу разобрать PHP-файл шаблона - найден только старый открывающий тэг CLEANTALK";
+$MESS["CLEANTALK_ERROR_FILES_08"] = "Не могу разобрать PHP-файл шаблона - найден только старый закрывающий тэг CLEANTALK";
+$MESS["CLEANTALK_ERROR_FILES_09"] = "Не могу разобрать PHP-файл шаблона - старый закрывающий тэг CLEANTALK найден перед открывающим";
+$MESS["CLEANTALK_ERROR_FILES_10"] = "Не могу записать новый PHP-файл шаблона";
+$MESS["CLEANTALK_TEMPLATES_HEADER"] = "Измемены следующие шаблоны ПО-УМОЛЧАНИЮ:";
+$MESS["CLEANTALK_TEMPLATES_FOOTER"] = "Если вы используете ДРУГИЕ шаблоны, вы ДОЛЖНЫ внести в них изменения САМИ";
+$MESS["MOD_INST_OK"] = "Установка модуля успешно завершена";
+$MESS["MOD_UNINST_OK"] = "Удаление модуля успешно завершено";
diff --git a/cleantalk.antispam/lang/ru/options.php b/cleantalk.antispam/lang/ru/options.php
index e2b1d5e..413fa3b 100644
--- a/cleantalk.antispam/lang/ru/options.php
+++ b/cleantalk.antispam/lang/ru/options.php
@@ -1,27 +1,26 @@
 <?php
-$MESS['CLEANTALK_LABEL_STATUS'] = '������ �������';
-$MESS['CLEANTALK_LABEL_KEY']    = '���� �������';
-$MESS['CLEANTALK_LABEL_NEW_USER']       = '������ ����� �����������';
-$MESS['CLEANTALK_LABEL_COMMENT_BLOG']   = '������ ����� ������������ �����';
-$MESS['CLEANTALK_LABEL_COMMENT_FORUM']  = '������ ����� ������������ ������';
-$MESS['CLEANTALK_LABEL_FORUM_PRIVATE_MESSAGES']  = '������ ������ ��������� ������';
-$MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = '������ ���� ����������� ������������';
-$MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = '�������� ������ ��� ���-��� �������';
-$MESS['CLEANTALK_LABEL_ORDER']  = '��������� ����� �������';
-$MESS['CLEANTALK_LABEL_WEB_FORMS'] = '������ ���-����';
-$MESS['CLEANTALK_BUTTON_SAVE']  = '���������';
-$MESS['CLEANTALK_GET_AUTO_KEY']  = '�������� ���� �������������';
-$MESS['CLEANTALK_GET_MANUAL_KEY']  = '�������� ���� �������';
-$MESS['CLEANTALK_GET_TO_CP']  = '������� � ������ ���������� CleanTalk';
-$MESS['CLEANTALK_BUTTON_RESET'] = '��������';
-$MESS['CLEANTALK_TITLE']        = '��������� ������';
-$MESS['CLEANTALK_LABEL_GLOBAL_CHECK']        = '������ ����� ����';
-$MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = '��������� ��� POST ������';
-$MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- ��������, �������� ���������!';
+$MESS['CLEANTALK_LABEL_STATUS'] = 'Модуль включен';
+$MESS['CLEANTALK_LABEL_KEY']    = 'Ключ доступа';
+$MESS['CLEANTALK_LABEL_NEW_USER']       = 'Защита формы регистрации';
+$MESS['CLEANTALK_LABEL_COMMENT_BLOG']   = 'Защита формы комментариев блога';
+$MESS['CLEANTALK_LABEL_COMMENT_FORUM']  = 'Защита формы комментариев форума';
+$MESS['CLEANTALK_LABEL_FORUM_PRIVATE_MESSAGES']  = 'Защита личных сообщений форума';
+$MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = 'Защита форм Древовидных комментариев';
+$MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = 'Отсылать тексты для офф-топ анализа';
+$MESS['CLEANTALK_LABEL_ORDER']  = 'Проверять формы заказов';
+$MESS['CLEANTALK_BUTTON_SAVE']  = 'Сохранить';
+$MESS['CLEANTALK_GET_AUTO_KEY']  = 'Получить ключ автоматически';
+$MESS['CLEANTALK_GET_MANUAL_KEY']  = 'Получить ключ вручную';
+$MESS['CLEANTALK_GET_TO_CP']  = 'Перейти в панель управления CleanTalk';
+$MESS['CLEANTALK_BUTTON_RESET'] = 'Сбросить';
+$MESS['CLEANTALK_TITLE']        = 'Настройки модуля';
+$MESS['CLEANTALK_LABEL_GLOBAL_CHECK']        = 'Защита любых форм';
+$MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = 'Проверять все POST данные';
+$MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- Внимание, возможны конфликты!';
 $MESS['CLEANTALK_LABEL_SFW']        = 'Spam FireWall';
-$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']        = '���� �������';
-$MESS['CLEANTALK_KEY_NOT_VALID']    = '���� �� �������';
-$MESS['CLEANTALK_EMAIL_REGISTRATION_WARNING']	= '��� ����������� ����� ������������ ����� ��������������';
-$MESS['CLEANTALK_LICENSE_AGREEMENT'] = '������������ ����������';
+$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']        = 'Ключ активен';
+$MESS['CLEANTALK_KEY_NOT_VALID']    = 'Ключ не активен';
+$MESS['CLEANTALK_EMAIL_REGISTRATION_WARNING']	= 'Для регистрации будет использована почта администратора';
+$MESS['CLEANTALK_LICENSE_AGREEMENT'] = 'Лицензионное соглашение';
diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
index b5c6b8e..ceff4ca 100644
--- a/cleantalk.antispam/options.php
+++ b/cleantalk.antispam/options.php
@@ -59,7 +59,6 @@
     COption::SetOptionString( $sModuleId, 'form_comment_treelike',           $_POST['form_comment_treelike'] == '1'           ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'form_send_example',               $_POST['form_send_example'] == '1'               ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'form_order',                      $_POST['form_order'] == '1'                      ? '1' : '0' );
-	COption::SetOptionString( $sModuleId, 'web_form',                        $_POST['web_form'] == '1'                        ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'is_paid',                         $_POST['is_paid'] == '1'                         ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'last_checked',                    $_POST['last_checked'] == '1'                    ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'form_global_check',               $_POST['form_global_check'] == '1'               ? '1' : '0' );
@@ -174,12 +173,6 @@ function ctDdisableInputLine(ct_input_line){
         <td  valign="top">
             <input type="checkbox" name="form_order" id="form_order" <? if ( COption::GetOptionString( $sModuleId, 'form_order', '0' ) == '1'):?> checked="checked"<? endif; ?> value="1" />
         </td>
-    </tr>
-	 <tr>
-        <td width="50%" valign="top"><label for="web_form"><?echo GetMessage( 'CLEANTALK_LABEL_WEB_FORMS' );?>:</td>
-        <td  valign="top">
-            <input type="checkbox" name="web_form" id="web_form" <? if ( COption::GetOptionString( $sModuleId, 'web_form', '0' ) == '1'):?> checked="checked"<? endif; ?> value="1" />
-        </td>
     </tr>
     <tr>
         <td width="50%" valign="top"><label for="form_global_check"><?echo GetMessage( 'CLEANTALK_LABEL_GLOBAL_CHECK' );?>:</td>
diff --git a/cleantalk.antispam/updater.php b/cleantalk.antispam/updater.php
index 770b55f..95f9741 100644
--- a/cleantalk.antispam/updater.php
+++ b/cleantalk.antispam/updater.php
@@ -169,11 +169,6 @@
 						CAgent::AddAgent("CleantalkAntispam::sfw_send_logs();", "cleantalk.antispam", "N", 3600);
 						CAgent::AddAgent("CleantalkAntispam::sfw_update();",    "cleantalk.antispam", "N", 86400);
 					}
-				case '3.10.2' :
-					if (IsModuleInstalled('cleantalk.antispam') && IsModuleInstalled('form')){
-							RegisterModuleDependences('form', 'OnBeforeResultAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeResultAddHandler');
-					}
-					
 			}
 			unset($obModule);
 		}

From 69163c2452b67a99a548eeaee745ae569cd15e10 Mon Sep 17 00:00:00 2001
From: davydovct <davydov@cleantalk.org>
Date: Wed, 13 Dec 2017 10:44:06 +0500
Subject: [PATCH 3/5] Update version Web form protection

---
 cleantalk.antispam/classes/general/JSON.php   |  806 +++++++++++
 .../classes/general/cleantalk.class.php       | 1255 +++++++++++++++++
 cleantalk.antispam/cleantalk-sfw.class.php    |  164 +++
 cleantalk.antispam/description.en             |    3 +-
 cleantalk.antispam/description.ru             |    3 +-
 cleantalk.antispam/include.php                |   92 +-
 cleantalk.antispam/install/index.php          |    7 +
 cleantalk.antispam/install/version.php        |    2 +-
 cleantalk.antispam/options.php                |    7 +
 cleantalk.antispam/sfw_die_page.html          |   65 +
 cleantalk.antispam/updater.php                |  179 ---
 11 files changed, 2399 insertions(+), 184 deletions(-)
 create mode 100644 cleantalk.antispam/classes/general/JSON.php
 create mode 100644 cleantalk.antispam/classes/general/cleantalk.class.php
 create mode 100644 cleantalk.antispam/cleantalk-sfw.class.php
 create mode 100644 cleantalk.antispam/sfw_die_page.html
 delete mode 100644 cleantalk.antispam/updater.php

diff --git a/cleantalk.antispam/classes/general/JSON.php b/cleantalk.antispam/classes/general/JSON.php
new file mode 100644
index 0000000..0cddbdd
--- /dev/null
+++ b/cleantalk.antispam/classes/general/JSON.php
@@ -0,0 +1,806 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Converts to and from JSON format.
+ *
+ * JSON (JavaScript Object Notation) is a lightweight data-interchange
+ * format. It is easy for humans to read and write. It is easy for machines
+ * to parse and generate. It is based on a subset of the JavaScript
+ * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
+ * This feature can also be found in  Python. JSON is a text format that is
+ * completely language independent but uses conventions that are familiar
+ * to programmers of the C-family of languages, including C, C++, C#, Java,
+ * JavaScript, Perl, TCL, and many others. These properties make JSON an
+ * ideal data-interchange language.
+ *
+ * This package provides a simple encoder and decoder for JSON notation. It
+ * is intended for use with client-side Javascript applications that make
+ * use of HTTPRequest to perform server communication functions - data can
+ * be encoded into JSON notation for use in a client-side javascript, or
+ * decoded from incoming Javascript requests. JSON format is native to
+ * Javascript, and can be directly eval()'ed with no further parsing
+ * overhead
+ *
+ * All strings should be in ASCII or UTF-8 format!
+ *
+ * LICENSE: Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met: Redistributions of source code must retain the
+ * above copyright notice, this list of conditions and the following
+ * disclaimer. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * @category
+ * @package     Services_JSON
+ * @author      Michal Migurski <mike-json@teczno.com>
+ * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
+ * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
+ * @copyright   2005 Michal Migurski
+ * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
+ * @license     http://www.opensource.org/licenses/bsd-license.php
+ * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
+ */
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_SLICE',   1);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_STR',  2);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_ARR',  3);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_OBJ',  4);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_CMT', 5);
+
+/**
+ * Behavior switch for Services_JSON::decode()
+ */
+define('SERVICES_JSON_LOOSE_TYPE', 16);
+
+/**
+ * Behavior switch for Services_JSON::decode()
+ */
+define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
+
+/**
+ * Converts to and from JSON format.
+ *
+ * Brief example of use:
+ *
+ * <code>
+ * // create a new instance of Services_JSON
+ * $json = new Services_JSON();
+ *
+ * // convert a complexe value to JSON notation, and send it to the browser
+ * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
+ * $output = $json->encode($value);
+ *
+ * print($output);
+ * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
+ *
+ * // accept incoming POST data, assumed to be in JSON notation
+ * $input = file_get_contents('php://input', 1000000);
+ * $value = $json->decode($input);
+ * </code>
+ */
+class Services_JSON
+{
+   /**
+    * constructs a new JSON instance
+    *
+    * @param    int     $use    object behavior flags; combine with boolean-OR
+    *
+    *                           possible values:
+    *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
+    *                                   "{...}" syntax creates associative arrays
+    *                                   instead of objects in decode().
+    *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
+    *                                   Values which can't be encoded (e.g. resources)
+    *                                   appear as NULL instead of throwing errors.
+    *                                   By default, a deeply-nested resource will
+    *                                   bubble up with an error, so all return values
+    *                                   from encode() should be checked with isError()
+    */
+    function Services_JSON($use = 0)
+    {
+        $this->use = $use;
+    }
+
+   /**
+    * convert a string from one UTF-16 char to one UTF-8 char
+    *
+    * Normally should be handled by mb_convert_encoding, but
+    * provides a slower PHP-only method for installations
+    * that lack the multibye string extension.
+    *
+    * @param    string  $utf16  UTF-16 character
+    * @return   string  UTF-8 character
+    * @access   private
+    */
+    function utf162utf8($utf16)
+    {
+        // oh please oh please oh please oh please oh please
+        if(function_exists('mb_convert_encoding')) {
+            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+        }
+
+        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+
+        switch(true) {
+            case ((0x7F & $bytes) == $bytes):
+                // this case should never be reached, because we are in ASCII range
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0x7F & $bytes);
+
+            case (0x07FF & $bytes) == $bytes:
+                // return a 2-byte UTF-8 character
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0xC0 | (($bytes >> 6) & 0x1F))
+                     . chr(0x80 | ($bytes & 0x3F));
+
+            case (0xFFFF & $bytes) == $bytes:
+                // return a 3-byte UTF-8 character
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0xE0 | (($bytes >> 12) & 0x0F))
+                     . chr(0x80 | (($bytes >> 6) & 0x3F))
+                     . chr(0x80 | ($bytes & 0x3F));
+        }
+
+        // ignoring UTF-32 for now, sorry
+        return '';
+    }
+
+   /**
+    * convert a string from one UTF-8 char to one UTF-16 char
+    *
+    * Normally should be handled by mb_convert_encoding, but
+    * provides a slower PHP-only method for installations
+    * that lack the multibye string extension.
+    *
+    * @param    string  $utf8   UTF-8 character
+    * @return   string  UTF-16 character
+    * @access   private
+    */
+    function utf82utf16($utf8)
+    {
+        // oh please oh please oh please oh please oh please
+        if(function_exists('mb_convert_encoding')) {
+            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+        }
+
+        switch(strlen($utf8)) {
+            case 1:
+                // this case should never be reached, because we are in ASCII range
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return $utf8;
+
+            case 2:
+                // return a UTF-16 character from a 2-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0x07 & (ord($utf8{0}) >> 2))
+                     . chr((0xC0 & (ord($utf8{0}) << 6))
+                         | (0x3F & ord($utf8{1})));
+
+            case 3:
+                // return a UTF-16 character from a 3-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr((0xF0 & (ord($utf8{0}) << 4))
+                         | (0x0F & (ord($utf8{1}) >> 2)))
+                     . chr((0xC0 & (ord($utf8{1}) << 6))
+                         | (0x7F & ord($utf8{2})));
+        }
+
+        // ignoring UTF-32 for now, sorry
+        return '';
+    }
+
+   /**
+    * encodes an arbitrary variable into JSON format
+    *
+    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+    *                           if var is a strng, note that encode() always expects it
+    *                           to be in ASCII or UTF-8 format!
+    *
+    * @return   mixed   JSON string representation of input var or an error if a problem occurs
+    * @access   public
+    */
+    function encode($var)
+    {
+        switch (gettype($var)) {
+            case 'boolean':
+                return $var ? 'true' : 'false';
+
+            case 'NULL':
+                return 'null';
+
+            case 'integer':
+                return (int) $var;
+
+            case 'double':
+            case 'float':
+                return (float) $var;
+
+            case 'string':
+                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+                $ascii = '';
+                $strlen_var = strlen($var);
+
+               /*
+                * Iterate over every character in the string,
+                * escaping with a slash or encoding to UTF-8 where necessary
+                */
+                for ($c = 0; $c < $strlen_var; ++$c) {
+
+                    $ord_var_c = ord($var{$c});
+
+                    switch (true) {
+                        case $ord_var_c == 0x08:
+                            $ascii .= '\b';
+                            break;
+                        case $ord_var_c == 0x09:
+                            $ascii .= '\t';
+                            break;
+                        case $ord_var_c == 0x0A:
+                            $ascii .= '\n';
+                            break;
+                        case $ord_var_c == 0x0C:
+                            $ascii .= '\f';
+                            break;
+                        case $ord_var_c == 0x0D:
+                            $ascii .= '\r';
+                            break;
+
+                        case $ord_var_c == 0x22:
+                        case $ord_var_c == 0x2F:
+                        case $ord_var_c == 0x5C:
+                            // double quote, slash, slosh
+                            $ascii .= '\\'.$var{$c};
+                            break;
+
+                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                            // characters U-00000000 - U-0000007F (same as ASCII)
+                            $ascii .= $var{$c};
+                            break;
+
+                        case (($ord_var_c & 0xE0) == 0xC0):
+                            // characters U-00000080 - U-000007FF, mask 110XXXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+                            $c += 1;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF0) == 0xE0):
+                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}));
+                            $c += 2;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF8) == 0xF0):
+                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}));
+                            $c += 3;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFC) == 0xF8):
+                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}),
+                                         ord($var{$c + 4}));
+                            $c += 4;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFE) == 0xFC):
+                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}),
+                                         ord($var{$c + 4}),
+                                         ord($var{$c + 5}));
+                            $c += 5;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+                    }
+                }
+
+                return '"'.$ascii.'"';
+
+            case 'array':
+               /*
+                * As per JSON spec if any array key is not an integer
+                * we must treat the the whole array as an object. We
+                * also try to catch a sparsely populated associative
+                * array with numeric keys here because some JS engines
+                * will create an array with empty indexes up to
+                * max_index which can cause memory issues and because
+                * the keys, which may be relevant, will be remapped
+                * otherwise.
+                *
+                * As per the ECMA and JSON specification an object may
+                * have any string as a property. Unfortunately due to
+                * a hole in the ECMA specification if the key is a
+                * ECMA reserved word or starts with a digit the
+                * parameter is only accessible using ECMAScript's
+                * bracket notation.
+                */
+
+                // treat as a JSON object
+                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+                    $properties = array_map(array($this, 'name_value'),
+                                            array_keys($var),
+                                            array_values($var));
+
+                    foreach($properties as $property) {
+                        if(Services_JSON::isError($property)) {
+                            return $property;
+                        }
+                    }
+
+                    return '{' . join(',', $properties) . '}';
+                }
+
+                // treat it like a regular array
+                $elements = array_map(array($this, 'encode'), $var);
+
+                foreach($elements as $element) {
+                    if(Services_JSON::isError($element)) {
+                        return $element;
+                    }
+                }
+
+                return '[' . join(',', $elements) . ']';
+
+            case 'object':
+                $vars = get_object_vars($var);
+
+                $properties = array_map(array($this, 'name_value'),
+                                        array_keys($vars),
+                                        array_values($vars));
+
+                foreach($properties as $property) {
+                    if(Services_JSON::isError($property)) {
+                        return $property;
+                    }
+                }
+
+                return '{' . join(',', $properties) . '}';
+
+            default:
+                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+                    ? 'null'
+                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
+        }
+    }
+
+   /**
+    * array-walking function for use in generating JSON-formatted name-value pairs
+    *
+    * @param    string  $name   name of key to use
+    * @param    mixed   $value  reference to an array element to be encoded
+    *
+    * @return   string  JSON-formatted name-value pair, like '"name":value'
+    * @access   private
+    */
+    function name_value($name, $value)
+    {
+        $encoded_value = $this->encode($value);
+
+        if(Services_JSON::isError($encoded_value)) {
+            return $encoded_value;
+        }
+
+        return $this->encode(strval($name)) . ':' . $encoded_value;
+    }
+
+   /**
+    * reduce a string by removing leading and trailing comments and whitespace
+    *
+    * @param    $str    string      string value to strip of comments and whitespace
+    *
+    * @return   string  string value stripped of comments and whitespace
+    * @access   private
+    */
+    function reduce_string($str)
+    {
+        $str = preg_replace(array(
+
+                // eliminate single line comments in '// ...' form
+                '#^\s*//(.+)$#m',
+
+                // eliminate multi-line comments in '/* ... */' form, at start of string
+                '#^\s*/\*(.+)\*/#Us',
+
+                // eliminate multi-line comments in '/* ... */' form, at end of string
+                '#/\*(.+)\*/\s*$#Us'
+
+            ), '', $str);
+
+        // eliminate extraneous space
+        return trim($str);
+    }
+
+   /**
+    * decodes a JSON string into appropriate variable
+    *
+    * @param    string  $str    JSON-formatted string
+    *
+    * @return   mixed   number, boolean, string, array, or object
+    *                   corresponding to given JSON input string.
+    *                   See argument 1 to Services_JSON() above for object-output behavior.
+    *                   Note that decode() always returns strings
+    *                   in ASCII or UTF-8 format!
+    * @access   public
+    */
+    function decode($str)
+    {
+        $str = $this->reduce_string($str);
+
+        switch (strtolower($str)) {
+            case 'true':
+                return true;
+
+            case 'false':
+                return false;
+
+            case 'null':
+                return null;
+
+            default:
+                $m = array();
+
+                if (is_numeric($str)) {
+                    // Lookie-loo, it's a number
+
+                    // This would work on its own, but I'm trying to be
+                    // good about returning integers where appropriate:
+                    // return (float)$str;
+
+                    // Return float or int, as appropriate
+                    return ((float)$str == (integer)$str)
+                        ? (integer)$str
+                        : (float)$str;
+
+                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+                    // STRINGS RETURNED IN UTF-8 FORMAT
+                    $delim = substr($str, 0, 1);
+                    $chrs = substr($str, 1, -1);
+                    $utf8 = '';
+                    $strlen_chrs = strlen($chrs);
+
+                    for ($c = 0; $c < $strlen_chrs; ++$c) {
+
+                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+                        $ord_chrs_c = ord($chrs{$c});
+
+                        switch (true) {
+                            case $substr_chrs_c_2 == '\b':
+                                $utf8 .= chr(0x08);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\t':
+                                $utf8 .= chr(0x09);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\n':
+                                $utf8 .= chr(0x0A);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\f':
+                                $utf8 .= chr(0x0C);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\r':
+                                $utf8 .= chr(0x0D);
+                                ++$c;
+                                break;
+
+                            case $substr_chrs_c_2 == '\\"':
+                            case $substr_chrs_c_2 == '\\\'':
+                            case $substr_chrs_c_2 == '\\\\':
+                            case $substr_chrs_c_2 == '\\/':
+                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
+                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
+                                    $utf8 .= $chrs{++$c};
+                                }
+                                break;
+
+                            case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
+                                // single, escaped unicode character
+                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
+                                       . chr(hexdec(substr($chrs, ($c + 4), 2)));
+                                $utf8 .= $this->utf162utf8($utf16);
+                                $c += 5;
+                                break;
+
+                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+                                $utf8 .= $chrs{$c};
+                                break;
+
+                            case ($ord_chrs_c & 0xE0) == 0xC0:
+                                // characters U-00000080 - U-000007FF, mask 110XXXXX
+                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 2);
+                                ++$c;
+                                break;
+
+                            case ($ord_chrs_c & 0xF0) == 0xE0:
+                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 3);
+                                $c += 2;
+                                break;
+
+                            case ($ord_chrs_c & 0xF8) == 0xF0:
+                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 4);
+                                $c += 3;
+                                break;
+
+                            case ($ord_chrs_c & 0xFC) == 0xF8:
+                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 5);
+                                $c += 4;
+                                break;
+
+                            case ($ord_chrs_c & 0xFE) == 0xFC:
+                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 6);
+                                $c += 5;
+                                break;
+
+                        }
+
+                    }
+
+                    return $utf8;
+
+                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+                    // array, or object notation
+
+                    if ($str{0} == '[') {
+                        $stk = array(SERVICES_JSON_IN_ARR);
+                        $arr = array();
+                    } else {
+                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+                            $stk = array(SERVICES_JSON_IN_OBJ);
+                            $obj = array();
+                        } else {
+                            $stk = array(SERVICES_JSON_IN_OBJ);
+                            $obj = new stdClass();
+                        }
+                    }
+
+                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
+                                           'where' => 0,
+                                           'delim' => false));
+
+                    $chrs = substr($str, 1, -1);
+                    $chrs = $this->reduce_string($chrs);
+
+                    if ($chrs == '') {
+                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
+                            return $arr;
+
+                        } else {
+                            return $obj;
+
+                        }
+                    }
+
+                    //print("\nparsing {$chrs}\n");
+
+                    $strlen_chrs = strlen($chrs);
+
+                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
+
+                        $top = end($stk);
+                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+
+                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+                            // found a comma that is not inside a string, array, etc.,
+                            // OR we've reached the end of the character list
+                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
+                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
+                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
+                                // we are in an array, so just push an element onto the stack
+                                array_push($arr, $this->decode($slice));
+
+                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+                                // we are in an object, so figure
+                                // out the property name and set an
+                                // element in an associative array,
+                                // for now
+                                $parts = array();
+                                
+                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+                                    // "name":value pair
+                                    $key = $this->decode($parts[1]);
+                                    $val = $this->decode($parts[2]);
+
+                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+                                        $obj[$key] = $val;
+                                    } else {
+                                        $obj->$key = $val;
+                                    }
+                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+                                    // name:value pair, where name is unquoted
+                                    $key = $parts[1];
+                                    $val = $this->decode($parts[2]);
+
+                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+                                        $obj[$key] = $val;
+                                    } else {
+                                        $obj->$key = $val;
+                                    }
+                                }
+
+                            }
+
+                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+                            // found a quote, and we are not inside a string
+                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+                            //print("Found start of string at {$c}\n");
+
+                        } elseif (($chrs{$c} == $top['delim']) &&
+                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
+                                 ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
+                            // found a quote, we're in a string, and it's not escaped
+                            // we know that it's not escaped becase there is _not_ an
+                            // odd number of backslashes at the end of the string so far
+                            array_pop($stk);
+                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+
+                        } elseif (($chrs{$c} == '[') &&
+                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+                            // found a left-bracket, and we are in an array, object, or slice
+                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
+                            //print("Found start of array at {$c}\n");
+
+                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+                            // found a right-bracket, and we're in an array
+                            array_pop($stk);
+                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        } elseif (($chrs{$c} == '{') &&
+                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+                            // found a left-brace, and we are in an array, object, or slice
+                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
+                            //print("Found start of object at {$c}\n");
+
+                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+                            // found a right-brace, and we're in an object
+                            array_pop($stk);
+                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        } elseif (($substr_chrs_c_2 == '/*') &&
+                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+                            // found a comment start, and we are in an array, object, or slice
+                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
+                            $c++;
+                            //print("Found start of comment at {$c}\n");
+
+                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
+                            // found a comment end, and we're in one now
+                            array_pop($stk);
+                            $c++;
+
+                            for ($i = $top['where']; $i <= $c; ++$i)
+                                $chrs = substr_replace($chrs, ' ', $i, 1);
+
+                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        }
+
+                    }
+
+                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
+                        return $arr;
+
+                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+                        return $obj;
+
+                    }
+
+                }
+        }
+    }
+
+    /**
+     * @todo Ultimately, this should just call PEAR::isError()
+     */
+    function isError($data, $code = null)
+    {
+        if (class_exists('pear')) {
+            return PEAR::isError($data, $code);
+        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
+                                 is_subclass_of($data, 'services_json_error'))) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+if (class_exists('PEAR_Error')) {
+
+    class Services_JSON_Error extends PEAR_Error
+    {
+        function Services_JSON_Error($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null)
+        {
+            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+        }
+    }
+
+} else {
+
+    /**
+     * @todo Ultimately, this class shall be descended from PEAR_Error
+     */
+    class Services_JSON_Error
+    {
+        function Services_JSON_Error($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null)
+        {
+
+        }
+    }
+
+}
+    
+?>
diff --git a/cleantalk.antispam/classes/general/cleantalk.class.php b/cleantalk.antispam/classes/general/cleantalk.class.php
new file mode 100644
index 0000000..b6094fa
--- /dev/null
+++ b/cleantalk.antispam/classes/general/cleantalk.class.php
@@ -0,0 +1,1255 @@
+<?php
+/**
+ * Cleantalk base class
+ *
+ * @version 2.1.3
+ * @package Cleantalk
+ * @subpackage Base
+ * @author Cleantalk team (welcome@cleantalk.org)
+ * @copyright (C) 2014 CleanTalk team (http://cleantalk.org)
+ * @license GNU/GPL: http://www.gnu.org/copyleft/gpl.html
+ * @see https://github.com/CleanTalk/php-antispam 
+ *
+ */
+ 
+ /**
+* Creating apache_request_headers() if not exists
+*/
+if( !function_exists('apache_request_headers') ) {
+	function apache_request_headers() {
+	  $arh = array();
+	  $rx_http = '/\AHTTP_/';
+	  foreach($_SERVER as $key => $val) {
+		if( preg_match($rx_http, $key) ) {
+		  $arh_key = preg_replace($rx_http, '', $key);
+		  $rx_matches = array();
+		  // do some nasty string manipulations to restore the original letter case
+		  // this should work in most cases
+		  $rx_matches = explode('_', $arh_key);
+		  if( count($rx_matches) > 0 and strlen($arh_key) > 2 ) {
+			foreach($rx_matches as $ak_key => $ak_val) $rx_matches[$ak_key] = ucfirst($ak_val);
+			$arh_key = implode('-', $rx_matches);
+		  }
+		  $arh[$arh_key] = $val;
+		}
+	  }
+	  return( $arh );
+	}
+}
+
+/**
+ * Response class
+ */
+class CleantalkResponse {
+
+    /**
+     * Received feedback nubmer
+     * @var int
+     */
+    public $received = null;
+	
+    /**
+     *  Is stop words
+     * @var int
+     */
+    public $stop_words = null;
+    
+    /**
+     * Cleantalk comment
+     * @var string
+     */
+    public $comment = null;
+
+    /**
+     * Is blacklisted
+     * @var int
+     */
+    public $blacklisted = null;
+
+    /**
+     * Is allow, 1|0
+     * @var int
+     */
+    public $allow = null;
+
+    /**
+     * Request ID
+     * @var int
+     */
+    public $id = null;
+
+    /**
+     * Request errno
+     * @var int
+     */
+    public $errno = null;
+
+    /**
+     * Error string
+     * @var string
+     */
+    public $errstr = null;
+
+    /**
+     * Is fast submit, 1|0
+     * @var string
+     */
+    public $fast_submit = null;
+
+    /**
+     * Is spam comment
+     * @var string
+     */
+    public $spam = null;
+
+    /**
+     * Is JS
+     * @var type 
+     */
+    public $js_disabled = null;
+
+    /**
+     * Sms check
+     * @var type 
+     */
+    public $sms_allow = null;
+
+    /**
+     * Sms code result
+     * @var type 
+     */
+    public $sms = null;
+	
+    /**
+     * Sms error code
+     * @var type 
+     */
+    public $sms_error_code = null;
+	
+    /**
+     * Sms error code
+     * @var type 
+     */
+    public $sms_error_text = null;
+    
+	/**
+     * Stop queue message, 1|0
+     * @var int  
+     */
+    public $stop_queue = null;
+	
+    /**
+     * Account shuld by deactivated after registration, 1|0
+     * @var int  
+     */
+    public $inactive = null;
+
+    /**
+     * Account status 
+     * @var int  
+     */
+    public $account_status = -1;
+
+    /**
+     * Create server response
+     *
+     * @param type $response
+     * @param type $obj
+     */
+    function __construct($response = null, $obj = null) {
+        if ($response && is_array($response) && count($response) > 0) {
+            foreach ($response as $param => $value) {
+                $this->{$param} = $value;
+            }
+        } else {
+            $this->errno = $obj->errno;
+            $this->errstr = $obj->errstr;
+
+			$this->errstr = preg_replace("/.+(\*\*\*.+\*\*\*).+/", "$1", $this->errstr);
+
+            $this->stop_words = isset($obj->stop_words) ? utf8_decode($obj->stop_words) : null;
+            $this->comment = isset($obj->comment) ? utf8_decode($obj->comment) : null;
+            $this->blacklisted = (isset($obj->blacklisted)) ? $obj->blacklisted : null;
+            $this->allow = (isset($obj->allow)) ? $obj->allow : 0;
+            $this->id = (isset($obj->id)) ? $obj->id : null;
+            $this->fast_submit = (isset($obj->fast_submit)) ? $obj->fast_submit : 0;
+            $this->spam = (isset($obj->spam)) ? $obj->spam : 0;
+            $this->js_disabled = (isset($obj->js_disabled)) ? $obj->js_disabled : 0;
+            $this->sms_allow = (isset($obj->sms_allow)) ? $obj->sms_allow : null;
+            $this->sms = (isset($obj->sms)) ? $obj->sms : null;
+            $this->sms_error_code = (isset($obj->sms_error_code)) ? $obj->sms_error_code : null;
+            $this->sms_error_text = (isset($obj->sms_error_text)) ? $obj->sms_error_text : null;
+            $this->stop_queue = (isset($obj->stop_queue)) ? $obj->stop_queue : 0;
+            $this->inactive = (isset($obj->inactive)) ? $obj->inactive : 0;
+            $this->account_status = (isset($obj->account_status)) ? $obj->account_status : -1;
+	    	$this->received = (isset($obj->received)) ? $obj->received : -1;
+
+            if ($this->errno !== 0 && $this->errstr !== null && $this->comment === null)
+                $this->comment = '*** ' . $this->errstr . ' Antispam service cleantalk.org ***'; 
+        }
+    }
+
+}
+
+/**
+ * Request class
+ */
+class CleantalkRequest {
+
+     /**
+     *  All http request headers
+     * @var string
+     */
+     public $all_headers = null;
+     
+     /**
+     *  IP address of connection
+     * @var string
+     */
+     //public $remote_addr = null;
+     
+     /**
+     *  Last error number
+     * @var integer
+     */
+     public $last_error_no = null;
+     
+     /**
+     *  Last error time
+     * @var integer
+     */
+     public $last_error_time = null;
+     
+     /**
+     *  Last error text
+     * @var string
+     */
+     public $last_error_text = null;
+
+    /**
+     * User message
+     * @var string
+     */
+    public $message = null;
+
+    /**
+     * Post example with last comments
+     * @var string
+     */
+    public $example = null;
+
+    /**
+     * Auth key
+     * @var string
+     */
+    public $auth_key = null;
+
+    /**
+     * Engine
+     * @var string
+     */
+    public $agent = null;
+
+    /**
+     * Is check for stoplist,
+     * valid are 0|1
+     * @var int
+     */
+    public $stoplist_check = null;
+
+    /**
+     * Language server response,
+     * valid are 'en' or 'ru'
+     * @var string
+     */
+    public $response_lang = null;
+
+    /**
+     * User IP
+     * @var strings
+     */
+    public $sender_ip = null;
+
+    /**
+     * User email
+     * @var strings
+     */
+    public $sender_email = null;
+
+    /**
+     * User nickname
+     * @var string
+     */
+    public $sender_nickname = null;
+
+    /**
+     * Sender info JSON string
+     * @var string
+     */
+    public $sender_info = null;
+
+    /**
+     * Post info JSON string
+     * @var string
+     */
+    public $post_info = null;
+
+    /**
+     * Is allow links, email and icq,
+     * valid are 1|0
+     * @var int
+     */
+    public $allow_links = null;
+
+    /**
+     * Time form filling
+     * @var int
+     */
+    public $submit_time = null;
+    
+    public $x_forwarded_for = '';
+    public $x_real_ip = '';
+
+    /**
+     * Is enable Java Script,
+     * valid are 0|1|2
+	 * Status:
+	 *  null - JS html code not inserted into phpBB templates
+	 *  0 - JS disabled at the client browser
+	 *  1 - JS enabled at the client broswer
+     * @var int
+     */
+    public $js_on = null;
+
+    /**
+     * user time zone
+     * @var string
+     */
+    public $tz = null;
+
+    /**
+     * Feedback string,
+     * valid are 'requset_id:(1|0)'
+     * @var string
+     */
+    public $feedback = null;
+
+    /**
+     * Phone number
+     * @var type 
+     */
+    public $phone = null;
+    
+    /**
+    * Method name
+    * @var string
+    */
+    public $method_name = 'check_message'; 
+
+    /**
+     * Fill params with constructor
+     * @param type $params
+     */
+    public function __construct($params = null) {
+        if (is_array($params) && count($params) > 0) {
+            foreach ($params as $param => $value) {
+                $this->{$param} = $value;
+            }
+        }
+    }
+
+}
+
+/**
+ * Cleantalk class create request
+ */
+class Cleantalk {
+
+    /**
+     * Debug level
+     * @var int
+     */
+    public $debug = 0;
+	
+    /**
+	* Maximum data size in bytes
+	* @var int
+	*/
+	private $dataMaxSise = 32768;
+	
+	/**
+	* Data compression rate 
+	* @var int
+	*/
+	private $compressRate = 6;
+	
+    /**
+	* Server connection timeout in seconds 
+	* @var int
+	*/
+	private $server_timeout = 15;
+
+    /**
+     * Cleantalk server url
+     * @var string
+     */
+    public $server_url = null;
+
+    /**
+     * Last work url
+     * @var string
+     */
+    public $work_url = null;
+
+    /**
+     * WOrk url ttl
+     * @var int
+     */
+    public $server_ttl = null;
+
+    /**
+     * Time wotk_url changer
+     * @var int
+     */
+    public $server_changed = null;
+
+    /**
+     * Flag is change server url
+     * @var bool
+     */
+    public $server_change = false;
+
+    /**
+     * Use TRUE when need stay on server. Example: send feedback
+     * @var bool
+     */
+    public $stay_on_server = false;
+    
+    /**
+     * Codepage of the data 
+     * @var bool
+     */
+    public $data_codepage = null;
+    
+    /**
+     * API version to use 
+     * @var string
+     */
+    public $api_version = '/api2.0';
+    
+    /**
+     * Use https connection to servers 
+     * @var bool 
+     */
+    public $ssl_on = false;
+    
+    /**
+     * Path to SSL certificate 
+     * @var string
+     */
+    public $ssl_path = '';
+
+    /**
+     * Minimal server response in miliseconds to catch the server
+     *
+     */
+    public $min_server_timeout = 50;
+
+    /**
+     * Function checks whether it is possible to publish the message
+     * @param CleantalkRequest $request
+     * @return type
+     */
+    public function isAllowMessage(CleantalkRequest $request) {
+        $request = $this->filterRequest($request);
+        $msg = $this->createMsg('check_message', $request);
+        return $this->httpRequest($msg);
+    }
+
+    /**
+     * Function checks whether it is possible to publish the message
+     * @param CleantalkRequest $request
+     * @return type
+     */
+    public function isAllowUser(CleantalkRequest $request) {
+        $request = $this->filterRequest($request);
+        $msg = $this->createMsg('check_newuser', $request);
+        return $this->httpRequest($msg);
+    }
+
+    /**
+     * Function sends the results of manual moderation
+     *
+     * @param CleantalkRequest $request
+     * @return type
+     */
+    public function sendFeedback(CleantalkRequest $request) {
+        $request = $this->filterRequest($request);
+        $msg = $this->createMsg('send_feedback', $request);
+        return $this->httpRequest($msg);
+    }
+
+    /**
+     *  Filter request params
+     * @param CleantalkRequest $request
+     * @return type
+     */
+    private function filterRequest(CleantalkRequest $request) {
+        // general and optional
+        foreach ($request as $param => $value) {
+            if (in_array($param, array('message', 'example', 'agent',
+                        'sender_info', 'sender_nickname', 'post_info', 'phone')) && !empty($value)) {
+                if (!is_string($value) && !is_integer($value)) {
+                    $request->$param = NULL;
+                }
+            }
+
+            if (in_array($param, array('stoplist_check', 'allow_links')) && !empty($value)) {
+                if (!in_array($value, array(1, 2))) {
+                    $request->$param = NULL;
+                }
+            }
+            
+            if (in_array($param, array('js_on')) && !empty($value)) {
+                if (!is_integer($value)) {
+                    $request->$param = NULL;
+                }
+            }
+
+            if ($param == 'sender_ip' && !empty($value)) {
+                if (!is_string($value)) {
+                    $request->$param = NULL;
+                }
+            }
+
+            if ($param == 'sender_email' && !empty($value)) {
+                if (!is_string($value)) {
+                    $request->$param = NULL;
+                }
+            }
+
+            if ($param == 'submit_time' && !empty($value)) {
+                if (!is_int($value)) {
+                    $request->$param = NULL;
+                }
+            }
+        }
+		return $request;
+    }
+    
+	/**
+     * Compress data and encode to base64 
+     * @param type string
+     * @return string 
+     */
+	private function compressData($data = null){
+		
+		if (strlen($data) > $this->dataMaxSise && function_exists('gzencode') && function_exists('base64_encode')){
+
+			$localData = gzencode($data, $this->compressRate, FORCE_GZIP);
+
+			if ($localData === false)
+				return $data;
+			
+			$localData = base64_encode($localData);
+			
+			if ($localData === false)
+				return $data;
+			
+			return $localData;
+		}
+
+		return $data;
+	} 
+
+    /**
+     * Create msg for cleantalk server
+     * @param type $method
+     * @param CleantalkRequest $request
+     * @return \xmlrpcmsg
+     */
+    private function createMsg($method, CleantalkRequest $request) {
+        switch ($method) {
+            case 'check_message':
+                // Convert strings to UTF8
+                $request->message = $this->stringToUTF8($request->message, $this->data_codepage);
+                $request->example = $this->stringToUTF8($request->example, $this->data_codepage);
+                $request->sender_email = $this->stringToUTF8($request->sender_email, $this->data_codepage);
+                $request->sender_nickname = $this->stringToUTF8($request->sender_nickname, $this->data_codepage);
+
+                $request->message = $this->compressData($request->message);
+				$request->example = $this->compressData($request->example);
+                break;
+
+            case 'check_newuser':
+                // Convert strings to UTF8
+                $request->sender_email = $this->stringToUTF8($request->sender_email, $this->data_codepage);
+                $request->sender_nickname = $this->stringToUTF8($request->sender_nickname, $this->data_codepage);
+                break;
+
+            case 'send_feedback':
+                if (is_array($request->feedback)) {
+                    $request->feedback = implode(';', $request->feedback);
+                }
+                break;
+        }
+        
+        $request->method_name = $method;
+        
+        //
+        // Removing non UTF8 characters from request, because non UTF8 or malformed characters break json_encode().
+        //
+        foreach ($request as $param => $value) {
+            if (!preg_match('//u', $value)) {
+                $request->{$param} = 'Nulled. Not UTF8 encoded or malformed.'; 
+            }
+        }
+        
+        return $request;
+    }
+    
+    /**
+     * Send JSON request to servers 
+     * @param $msg
+     * @return boolean|\CleantalkResponse
+     */
+    private function sendRequest($data = null, $url, $server_timeout = 3) {
+        // Convert to array
+        $data = (array)json_decode(json_encode($data), true);
+		
+		//Cleaning from 'null' values
+		$tmp_data = array();
+		foreach($data as $key => $value){
+			if($value !== null)
+				$tmp_data[$key] = $value;
+		}
+		$data = $tmp_data;
+		unset($key, $value, $tmp_data);
+	
+        // Convert to JSON
+        $data = json_encode($data);
+        
+        if (isset($this->api_version)) {
+            $url = $url . $this->api_version;
+        }
+        
+        // Switching to secure connection
+        if ($this->ssl_on && !preg_match("/^https:/", $url)) {
+            $url = preg_replace("/^(http)/i", "$1s", $url);
+        }
+
+        $result = false;
+        $curl_error = null;
+		if(function_exists('curl_init')) {
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_TIMEOUT, $server_timeout);
+            curl_setopt($ch, CURLOPT_POST, 1);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+            // receive server response ...
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            // resolve 'Expect: 100-continue' issue
+            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
+            // see http://stackoverflow.com/a/23322368
+            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+            
+            // Disabling CA cert verivication
+            // Disabling common name verification
+            if ($this->ssl_on && $this->ssl_path=='') {
+                curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+            }
+            else if ($this->ssl_on && $this->ssl_path!='') {
+            	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true);
+                curl_setopt($ch, CURLOPT_CAINFO, $this->ssl_path);
+            }
+
+            $result = curl_exec($ch);
+            if (!$result) {
+                $curl_error = curl_error($ch);
+            }
+            
+            curl_close($ch); 
+        }
+
+        if (!$result) {
+            $allow_url_fopen = ini_get('allow_url_fopen');
+            if (function_exists('file_get_contents') && isset($allow_url_fopen) && $allow_url_fopen == '1') {
+                $opts = array('http' =>
+                  array(
+                    'method'  => 'POST',
+                    'header'  => "Content-Type: text/html\r\n",
+                    'content' => $data,
+                    'timeout' => $server_timeout
+                  )
+                );
+
+                $context  = stream_context_create($opts);
+                $result = @file_get_contents($url, false, $context);
+            }
+        }
+        
+        if (!$result || !cleantalk_is_JSON($result)) {
+            $response = null;
+            $response['errno'] = 1;
+            if ($curl_error) {
+                $response['errstr'] = sprintf("CURL error: '%s'", $curl_error); 
+            } else {
+                $response['errstr'] = 'No CURL support compiled in'; 
+            }
+            $response['errstr'] .= ' or disabled allow_url_fopen in php.ini.'; 
+            $response = json_decode(json_encode($response));
+            
+            return $response;
+        }
+        
+        $errstr = null;
+        $response = json_decode($result);
+        if ($result !== false && is_object($response)) {
+            $response->errno = 0;
+            $response->errstr = $errstr;
+        } else {
+            $errstr = 'Unknown response from ' . $url . '.' . ' ' . $result;
+            
+            $response = null;
+            $response['errno'] = 1;
+            $response['errstr'] = $errstr;
+            $response = json_decode(json_encode($response));
+        } 
+        
+        
+        return $response;
+    }
+
+    /**
+     * httpRequest 
+     * @param $msg
+     * @return boolean|\CleantalkResponse
+     */
+    private function httpRequest($msg) {
+        $result = false;
+	    
+		if($msg->method_name != 'send_feedback'){
+			$ct_tmp = apache_request_headers();
+			$ct_tmp['Cookie'] = 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}/', 
+				'/;{0,1}\s{0,3}$/'
+			), '', $ct_tmp['Cookie']);
+			$msg->all_headers=json_encode($ct_tmp);
+		}
+	    
+        //$msg->remote_addr=$_SERVER['REMOTE_ADDR'];
+        //$msg->sender_info['remote_addr']=$_SERVER['REMOTE_ADDR'];
+        $si=(array)json_decode($msg->sender_info,true);
+        if(defined('IN_PHPBB'))
+        {
+        	global $request;
+        	if(method_exists($request,'server'))
+        	{
+        		$si['remote_addr']=$request->server('REMOTE_ADDR');
+        		$msg->x_forwarded_for=$request->server('X_FORWARDED_FOR');
+        		$msg->x_real_ip=$request->server('X_REAL_IP');
+        	}
+        }
+        else
+        {
+        	$si['remote_addr']=$_SERVER['REMOTE_ADDR'];
+        	$msg->x_forwarded_for=@$_SERVER['X_FORWARDED_FOR'];
+        	$msg->x_real_ip=@$_SERVER['X_REAL_IP'];
+        }
+        $msg->sender_info=json_encode($si);
+        if (((isset($this->work_url) && $this->work_url !== '') && ($this->server_changed + $this->server_ttl > time()))
+				|| $this->stay_on_server == true) {
+	        
+            $url = (!empty($this->work_url)) ? $this->work_url : $this->server_url;
+					
+            $result = $this->sendRequest($msg, $url, $this->server_timeout);
+        }
+
+        if (($result === false || $result->errno != 0) && $this->stay_on_server == false) {
+            // Split server url to parts
+            preg_match("@^(https?://)([^/:]+)(.*)@i", $this->server_url, $matches);
+            $url_prefix = '';
+            if (isset($matches[1]))
+                $url_prefix = $matches[1];
+
+            $pool = null;
+            if (isset($matches[2]))
+                $pool = $matches[2];
+            
+            $url_suffix = '';
+            if (isset($matches[3]))
+                $url_suffix = $matches[3];
+            
+            if ($url_prefix === '')
+                $url_prefix = 'http://';
+
+            if (empty($pool)) {
+                return false;
+            } else {
+                // Loop until find work server
+                foreach ($this->get_servers_ip($pool) as $server) {
+                    if ($server['host'] === 'localhost' || $server['ip'] === null) {
+                        $work_url = $server['host'];
+                    } else {
+                        $server_host = $server['ip'];
+                        $work_url = $server_host;
+                    }
+                    $work_url = $url_prefix . $work_url; 
+                    if (isset($url_suffix)) 
+                        $work_url = $work_url . $url_suffix;
+                    
+                    $this->work_url = $work_url;
+                    $this->server_ttl = $server['ttl'];
+                    
+                    $result = $this->sendRequest($msg, $this->work_url, $this->server_timeout);
+
+                    if ($result !== false && $result->errno === 0) {
+                        $this->server_change = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        $response = new CleantalkResponse(null, $result);
+
+        if (!empty($this->data_codepage) && $this->data_codepage !== 'UTF-8') {
+            if (!empty($response->comment))
+            $response->comment = $this->stringFromUTF8($response->comment, $this->data_codepage);
+            if (!empty($response->errstr))
+            $response->errstr = $this->stringFromUTF8($response->errstr, $this->data_codepage);
+            if (!empty($response->sms_error_text))
+            $response->sms_error_text = $this->stringFromUTF8($response->sms_error_text, $this->data_codepage);
+        }
+
+        return $response;
+    }
+    
+    /**
+     * Function DNS request
+     * @param $host
+     * @return array
+     */
+    public function get_servers_ip($host) {
+        $response = null;
+        if (!isset($host))
+            return $response;
+
+        if (function_exists('dns_get_record')) {
+            $records = dns_get_record($host, DNS_A);
+
+            if ($records !== FALSE) {
+                foreach ($records as $server) {
+                    $response[] = $server;
+                }
+            }
+        }
+
+        if (count($response) == 0 && function_exists('gethostbynamel')) {
+            $records = gethostbynamel($host);
+
+            if ($records !== FALSE) {
+                foreach ($records as $server) {
+                    $response[] = array("ip" => $server,
+                        "host" => $host,
+                        "ttl" => $this->server_ttl
+                    );
+                }
+            }
+        }
+
+        if (count($response) == 0) {
+            $response[] = array("ip" => null,
+                "host" => $host,
+                "ttl" => $this->server_ttl
+            );
+        } else {
+            // $i - to resolve collisions with localhost
+            $i = 0;
+            $r_temp = null;
+            $fast_server_found = false;
+            foreach ($response as $server) {
+                
+                // Do not test servers because fast work server found
+                if ($fast_server_found) {
+                    $ping = $this->min_server_timeout; 
+                } else {
+                    $ping = $this->httpPing($server['ip']);
+                    $ping = $ping * 1000;
+                }
+                
+                // -1 server is down, skips not reachable server
+                if ($ping != -1) {
+                    $r_temp[$ping + $i] = $server;
+                }
+                $i++;
+                
+                if ($ping < $this->min_server_timeout) {
+                    $fast_server_found = true;
+                }
+            }
+            if (count($r_temp)){
+                ksort($r_temp);
+                $response = $r_temp;
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * Function to get the message hash from Cleantalk.ru comment
+     * @param $message
+     * @return null
+     */
+    public function getCleantalkCommentHash($message) {
+        $matches = array();
+        if (preg_match('/\n\n\*\*\*.+([a-z0-9]{32}).+\*\*\*$/', $message, $matches))
+            return $matches[1];
+        else if (preg_match('/\<br.*\>[\n]{0,1}\<br.*\>[\n]{0,1}\*\*\*.+([a-z0-9]{32}).+\*\*\*$/', $message, $matches))
+            return $matches[1];
+
+        return NULL;
+    }
+
+    /**
+     * Function adds to the post comment Cleantalk.ru
+     * @param $message
+     * @param $comment
+     * @return string
+     */
+    public function addCleantalkComment($message, $comment) {
+        $comment = preg_match('/\*\*\*(.+)\*\*\*/', $comment, $matches) ? $comment : '*** ' . $comment . ' ***';
+        return $message . "\n\n" . $comment;
+    }
+
+    /**
+     * Function deletes the comment Cleantalk.ru
+     * @param $message
+     * @return mixed
+     */
+    public function delCleantalkComment($message) {
+        $message = preg_replace('/\n\n\*\*\*.+\*\*\*$/', '', $message);
+
+        // DLE sign cut
+        $message = preg_replace('/<br\s?\/><br\s?\/>\*\*\*.+\*\*\*$/', '', $message);
+
+        $message = preg_replace('/\<br.*\>[\n]{0,1}\<br.*\>[\n]{0,1}\*\*\*.+\*\*\*$/', '', $message);
+        
+        return $message;
+    }
+
+    /**
+    *   Get user IP behind proxy server
+    */
+    public function ct_session_ip( $data_ip ) {
+        if (!$data_ip || !preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/", $data_ip)) {
+            return $data_ip;
+        }
+        /*if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            
+            $forwarded_ip = explode(",", $_SERVER['HTTP_X_FORWARDED_FOR']);
+
+            // Looking for first value in the list, it should be sender real IP address
+            if (!preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/", $forwarded_ip[0])) {
+                return $data_ip;
+            }
+
+            $private_src_ip = false;
+            $private_nets = array(
+                '10.0.0.0/8',
+                '127.0.0.0/8',
+                '176.16.0.0/12',
+                '192.168.0.0/16',
+            );
+
+            foreach ($private_nets as $v) {
+
+                // Private IP found
+                if ($private_src_ip) {
+                    continue;
+                }
+                
+                if ($this->net_match($v, $data_ip)) {
+                    $private_src_ip = true;
+                }
+            }
+            if ($private_src_ip) {
+                // Taking first IP from the list HTTP_X_FORWARDED_FOR 
+                $data_ip = $forwarded_ip[0]; 
+            }
+        }
+
+        return $data_ip;*/
+        return cleantalk_get_real_ip();
+    }
+
+    /**
+    * From http://php.net/manual/en/function.ip2long.php#82397
+    */
+    public function net_match($CIDR,$IP) { 
+        list ($net, $mask) = explode ('/', $CIDR); 
+        return ( ip2long ($IP) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($net); 
+    } 
+    
+    /**
+    * Function to check response time
+    * param string
+    * @return int
+    */
+    function httpPing($host){
+
+        // Skip localhost ping cause it raise error at fsockopen.
+        // And return minimun value 
+        if ($host == 'localhost')
+            return 0.001;
+
+        $starttime = microtime(true);
+        $file      = @fsockopen ($host, 80, $errno, $errstr, $this->server_timeout);
+        $stoptime  = microtime(true);
+        $status    = 0;
+        if (!$file) {
+            $status = -1;  // Site is down
+        } else {
+            fclose($file);
+            $status = ($stoptime - $starttime);
+            $status = round($status, 4);
+        }
+        
+        return $status;
+    }
+    
+    /**
+    * Function convert string to UTF8 and removes non UTF8 characters 
+    * param string
+    * param string
+    * @return string
+    */
+    function stringToUTF8($str, $data_codepage = null){
+        if (!preg_match('//u', $str) && function_exists('mb_detect_encoding') && function_exists('mb_convert_encoding')) {
+            
+            if ($data_codepage !== null)
+                return mb_convert_encoding($str, 'UTF-8', $data_codepage);
+
+            $encoding = mb_detect_encoding($str);
+            if ($encoding)
+                return mb_convert_encoding($str, 'UTF-8', $encoding);
+        }
+        
+        return $str;
+    }
+    
+    /**
+    * Function convert string from UTF8 
+    * param string
+    * param string
+    * @return string
+    */
+    function stringFromUTF8($str, $data_codepage = null){
+        if (preg_match('//u', $str) && function_exists('mb_convert_encoding') && $data_codepage !== null) {
+            return mb_convert_encoding($str, $data_codepage, 'UTF-8');
+        }
+        
+        return $str;
+    }
+    
+    /**
+     * Function gets information about spam active networks 
+     *
+     * @param string api_key
+     * @return JSON/array 
+     */
+    public function get_2s_blacklists_db ($api_key) {
+        $request=Array();
+        $request['method_name'] = '2s_blacklists_db'; 
+        $request['auth_key'] = $api_key;
+        $url='https://api.cleantalk.org';
+        $result=sendRawRequest($url,$request);
+        return $result;
+    }
+}
+
+/**
+ * Function gets access key automatically
+ *
+ * @param string website admin email
+ * @param string website host
+ * @param string website platform
+ * @return type
+ */
+
+if(!function_exists('getAutoKey'))
+{
+	function getAutoKey($email, $host, $platform)
+	{
+		$request=Array();
+		$request['method_name'] = 'get_api_key'; 
+		$request['email'] = $email;
+		$request['website'] = $host;
+		$request['platform'] = $platform;
+		$url='https://api.cleantalk.org';
+		$result=sendRawRequest($url,$request);
+		return $result;
+	}
+}
+
+/**
+ * Function gets information about renew notice
+ *
+ * @param string api_key
+ * @return type
+ */
+
+function noticePaidTill($api_key)
+{
+	$request=Array();
+	$request['method_name'] = 'notice_paid_till'; 
+	$request['auth_key'] = $api_key;
+	$url='https://api.cleantalk.org';
+	$result=sendRawRequest($url,$request);
+	return $result;
+}
+
+/**
+ * Function sends raw request to API server
+ *
+ * @param string url of API server
+ * @param array data to send
+ * @param boolean is data have to be JSON encoded or not
+ * @param integer connect timeout
+ * @return type
+ */
+
+function sendRawRequest($url,$data,$isJSON=false,$timeout=3)
+{
+	$result=null;
+	if(!$isJSON)
+	{
+		$data=http_build_query($data);
+		$data=str_replace("&amp;", "&", $data);
+	}
+	else
+	{
+		$data= json_encode($data);
+	}
+	$curl_exec=false;
+	if (function_exists('curl_init') && function_exists('json_decode'))
+	{
+	
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		curl_setopt($ch, CURLOPT_POST, true);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+		
+		// receive server response ...
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		// resolve 'Expect: 100-continue' issue
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
+		
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+		
+		$result = @curl_exec($ch);
+		if($result!==false)
+		{
+			$curl_exec=true;
+		}
+		@curl_close($ch);
+	}
+	if(!$curl_exec)
+	{
+		$opts = array(
+		    'http'=>array(
+		        'method' => "POST",
+		        'timeout'=> $timeout,
+		        'content' => $data
+            )
+		);
+		$context = stream_context_create($opts);
+		$result = @file_get_contents($url, 0, $context);
+	}
+	return $result;
+}
+
+if( !function_exists('apache_request_headers') )
+{
+	function apache_request_headers()
+	{
+		$arh = array();
+		$rx_http = '/\AHTTP_/';
+		if(defined('IN_PHPBB'))
+		{
+			global $request;
+			$request->enable_super_globals();
+		}
+		foreach($_SERVER as $key => $val)
+		{
+			if( preg_match($rx_http, $key) )
+			{
+				$arh_key = preg_replace($rx_http, '', $key);
+				$rx_matches = array();
+				$rx_matches = explode('_', $arh_key);
+				if( count($rx_matches) > 0 and strlen($arh_key) > 2 )
+				{
+					foreach($rx_matches as $ak_key => $ak_val) $rx_matches[$ak_key] = ucfirst($ak_val);
+					$arh_key = implode('-', $rx_matches);
+				}
+				$arh[$arh_key] = $val;
+			}
+		}
+		if(defined('IN_PHPBB'))
+		{
+			global $request;
+			$request->disable_super_globals();
+		}
+		return( $arh );
+	}
+}
+
+function cleantalk_get_real_ip()
+{
+	if(defined('IN_PHPBB'))
+	{
+		global $request;
+		$request->enable_super_globals();
+	}
+	if ( function_exists( 'apache_request_headers' ) )
+	{
+		$headers = apache_request_headers();
+	}
+	else
+	{
+		
+		$headers = $_SERVER;
+	}
+	if ( array_key_exists( 'X-Forwarded-For', $headers ) )
+	{
+		$the_ip=explode(",", trim($headers['X-Forwarded-For']));
+		$the_ip = trim($the_ip[0]);
+	}
+	elseif ( array_key_exists( 'HTTP_X_FORWARDED_FOR', $headers ))
+	{
+		$the_ip=explode(",", trim($headers['HTTP_X_FORWARDED_FOR']));
+		$the_ip = trim($the_ip[0]);
+	}
+	else
+	{
+		$the_ip = filter_var( $_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 );
+	}
+	if(defined('IN_PHPBB'))
+	{
+		global $request;
+		$request->disable_super_globals();
+	}
+	return $the_ip;
+}
+
+function cleantalk_is_JSON($string)
+{
+    return ((is_string($string) && (is_object(json_decode($string)) || is_array(json_decode($string))))) ? true : false;
+}
diff --git a/cleantalk.antispam/cleantalk-sfw.class.php b/cleantalk.antispam/cleantalk-sfw.class.php
new file mode 100644
index 0000000..36666f8
--- /dev/null
+++ b/cleantalk.antispam/cleantalk-sfw.class.php
@@ -0,0 +1,164 @@
+<?php
+class CleanTalkSFW
+{
+	public $ip = 0;
+	public $ip_str = '';
+	public $ip_array = Array();
+	public $ip_str_array = Array();
+	public $blocked_ip = '';
+	public $result = false;
+	
+	public function cleantalk_get_real_ip()
+	{
+		if ( function_exists( 'apache_request_headers' ) )
+		{
+			$headers = apache_request_headers();
+		}
+		else
+		{
+			$headers = $_SERVER;
+		}
+		if ( array_key_exists( 'X-Forwarded-For', $headers ) )
+		{
+			$the_ip=explode(",", trim($headers['X-Forwarded-For']));
+			$the_ip = trim($the_ip[0]);
+			$this->ip_str_array[]=$the_ip;
+			$this->ip_array[]=sprintf("%u", ip2long($the_ip));
+		}
+		if ( array_key_exists( 'HTTP_X_FORWARDED_FOR', $headers ))
+		{
+			$the_ip=explode(",", trim($headers['HTTP_X_FORWARDED_FOR']));
+			$the_ip = trim($the_ip[0]);
+			$this->ip_str_array[]=$the_ip;
+			$this->ip_array[]=sprintf("%u", ip2long($the_ip));
+		}
+		$the_ip = filter_var( $_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 );
+		$this->ip_str_array[]=$the_ip;
+		$this->ip_array[]=sprintf("%u", ip2long($the_ip));
+
+		if(isset($_GET['sfw_test_ip']))
+		{
+			$the_ip=$_GET['sfw_test_ip'];
+			$this->ip_str_array[]=$the_ip;
+			$this->ip_array[]=sprintf("%u", ip2long($the_ip));
+		}
+		//$this->ip_str=$the_ip;
+		//$this->ip=sprintf("%u", ip2long($the_ip));
+		//print sprintf("%u", ip2long($the_ip));
+	}
+	
+	public function check_ip()
+	{
+		global $DB;
+		$passed_ip='';
+		for($i=0;$i<sizeof($this->ip_array);$i++)
+		{
+			$r = $DB->Query("select count(network) as cnt from `cleantalk_sfw` where network = ".$this->ip_array[$i]." & mask;");
+			
+			$sfw_log=COption::GetOptionString( 'cleantalk.antispam', 'sfw_log', '' );
+			
+			if($sfw_log=='')
+			{
+				$sfw_log=Array();
+			}
+			else
+			{
+				$sfw_log=json_decode($sfw_log, true);
+			}
+			$cnt=$r->Fetch();
+			if($cnt['cnt']>0)
+			{
+				$this->result=true;
+				$this->blocked_ip=$this->ip_str_array[$i];
+				if(isset($sfw_log[$this->ip_str_array[$i]]))
+				{
+					$sfw_log[$this->ip_str_array[$i]]['all']++;
+				}
+				else
+				{
+					$sfw_log[$this->ip_str_array[$i]] = Array('datetime'=>time(), 'all' => 1, 'allow' => 0);
+				}
+			}
+			else
+			{
+				$passed_ip = $this->ip_str_array[$i];
+			}
+		}
+		if($passed_ip!='')
+		{
+			$key=COption::GetOptionString( 'cleantalk.antispam', 'key', '' );
+			@setcookie ('ct_sfw_pass_key', md5($passed_ip.$key), 0, "/");
+		}
+		COption::SetOptionString( 'cleantalk.antispam', 'sfw_log', json_encode($sfw_log));
+	}
+	
+	public function sfw_die()
+	{
+		$key=COption::GetOptionString( 'cleantalk.antispam', 'key', '' );
+		$sfw_die_page=file_get_contents(dirname(__FILE__)."/sfw_die_page.html");
+		$sfw_die_page=str_replace("{REMOTE_ADDRESS}",$this->blocked_ip,$sfw_die_page);
+		$sfw_die_page=str_replace("{REQUEST_URI}",$_SERVER['REQUEST_URI'],$sfw_die_page);
+		$sfw_die_page=str_replace("{SFW_COOKIE}",md5($this->blocked_ip.$key),$sfw_die_page);
+		@header('HTTP/1.0 403 Forbidden');
+		print $sfw_die_page;
+		die();
+	}
+	
+	function send_logs(){
+		
+		$is_sfw = COption::GetOptionString( 'cleantalk.antispam', 'form_sfw', 0 );
+		$sfw_log = COption::GetOptionString( 'cleantalk.antispam', 'sfw_log', '' );
+		$ct_key = COption::GetOptionString( 'cleantalk.antispam', 'key', '' );
+			
+	    if($is_sfw==1 && $sfw_log!=''){
+			
+	    	$sfw_log=json_decode($sfw_log, true);
+	    	$data=Array();
+	    	foreach($sfw_log as $key=>$value){
+	    		$data[]=Array($key, $value['all'], $value['allow'], $value['datetime']);
+			}
+			unset($key, $value);
+	    	$qdata = array (
+				'data' => json_encode($data),
+				'rows' => count($data),
+				'timestamp' => time()
+			);
+						
+			$result = CleantalkAntispam::CleantalkSendRequest('https://api.cleantalk.org/?method_name=sfw_logs&auth_key='.$ct_key, $qdata, false);
+						
+			$result = json_decode($result);
+			
+			if(isset($result->data) && isset($result->data->rows))
+				if($result->data->rows == count($data))
+					COption::SetOptionString( 'cleantalk.antispam', 'sfw_log', '');
+	    }
+		return "CleanTalkSFW::send_logs();";
+	}
+	
+	function update_local(){
+		global $DB;
+		
+		$key=COption::GetOptionString( 'cleantalk.antispam', 'key', '' );
+		
+		$data = Array(	'auth_key' => $key,
+			'method_name' => '2s_blacklists_db'
+		);
+	
+		$result = CleantalkAntispam::CleantalkSendRequest('https://api.cleantalk.org/2.1', $data, false);
+		$result = json_decode($result, true);
+
+		if(isset($result['data'])){
+			$result=$result['data'];
+			$query="INSERT INTO `cleantalk_sfw` VALUES ";
+			for($i=0;$i<sizeof($result);$i++){
+				if($i==sizeof($result)-1)
+					$query.="(".$result[$i][0].",".$result[$i][1].");";
+				else
+					$query.="(".$result[$i][0].",".$result[$i][1]."), ";
+			}
+			$DB->Query("TRUNCATE TABLE `cleantalk_sfw`;"); //Clean before write
+			$DB->Query($query);
+		}
+		return "CleanTalkSFW::update_local();";
+	}
+}
\ No newline at end of file
diff --git a/cleantalk.antispam/description.en b/cleantalk.antispam/description.en
index 4a21d11..3cc82a2 100644
--- a/cleantalk.antispam/description.en
+++ b/cleantalk.antispam/description.en
@@ -1,2 +1,3 @@
 - "Display error on BuyOneClick forms"
-- "Protect forms with GET method"
\ No newline at end of file
+- "Protect forms with GET method"
+- "Web forms protection"
\ No newline at end of file
diff --git a/cleantalk.antispam/description.ru b/cleantalk.antispam/description.ru
index 4d79e9d..4b201fc 100644
--- a/cleantalk.antispam/description.ru
+++ b/cleantalk.antispam/description.ru
@@ -1,2 +1,3 @@
 - "Вывод ошибки на формах Купить в один клик"
-- "Защита любых форм с GET параметрами"
\ No newline at end of file
+- "Защита любых форм с GET параметрами"
+- "Защита Веб форм""
\ No newline at end of file
diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
index a328c73..218db4c 100644
--- a/cleantalk.antispam/include.php
+++ b/cleantalk.antispam/include.php
@@ -212,7 +212,7 @@ public function OnPageStartHandler()
 	    					$show_notice=1;
 	    					if(LANGUAGE_ID=='ru')
 	    					{
-	    						$review_message = "???????? ???????? ?? CleanTalk? ?????????? ?????? ?? ????! <a target='_blank' href='http://marketplace.1c-bitrix.ru/solutions/cleantalk.antispam/#rating'>???????? ????? ? Bitrix.Marketplace</a>";
+	    						$review_message = "Нравится Анти-спам от CleanTalk? Помогите другим узнать о CleanTalk! <a target='_blank' href='http://marketplace.1c-bitrix.ru/solutions/cleantalk.antispam/#rating'>Оставить отзыв на Bitrix.Marketplace</a>";
 	    					}
 	    					else
 	    					{
@@ -370,6 +370,79 @@ function OnBeforeOrderAddHandler(&$arFields)
 		}
 	}
    
+    /**
+     * *** Web forms section ***
+     */
+   
+   /**
+     * Checking web forms
+     * @param $WEB_FORM_ID, &$arFields, &$arrVALUES Comment fields to check
+     * @return null|boolean NULL when success or FALSE when spam detected
+     */
+    
+    function OnBeforeResultAddHandler($WEB_FORM_ID, &$arFields, &$arrVALUES)
+    {
+    	global $APPLICATION;
+		
+		$ct_status = COption::GetOptionString('cleantalk.antispam', 'status', '0');
+        $ct_webform= COption::GetOptionString('cleantalk.antispam', 'web_form', '0');
+		
+        if ($ct_status == 1 && $ct_webform == 1){
+			
+			$sender_email = null;
+	    	$message = '';
+			
+			$skip_keys = array(
+				'WEB_FORM_ID',
+				'RESULT_ID',
+				'formresult',
+				'sessid',
+				'captcha_',
+				'web_form_submit'
+			);
+			
+	    	foreach ($arrVALUES as $key => $value){
+				
+				// Skipping keys
+				foreach($skip_keys as $skip){
+					if(strpos($key, $skip) !== false)
+						continue 2;
+				}
+				
+				if ($sender_email === null && preg_match("/^\S+@\S+\.\S+$/", $value))
+					$sender_email = $value;
+				else
+					$message.="$value\n";
+		    }
+			
+		    $arUser = array();
+			$arUser["type"] = "webform";
+			$arUser["sender_email"] = $sender_email;
+			$arUser["sender_nickname"] = '';
+			$arUser["sender_ip"] = $_SERVER['REMOTE_ADDR'];
+			$arUser["message_title"] = "";
+			$arUser["message_body"] = $message;
+			$arUser["example_title"] = "";
+			$arUser["example_body"] = "";
+			$arUser["example_comments"] = "";
+			
+			$aResult =  CleantalkAntispam::CheckAllBefore($arUser,FALSE);
+
+			if(isset($aResult) && is_array($aResult)){
+				
+				if($aResult['errno'] == 0){
+					
+					if($aResult['allow'] == 1){
+						return; //Not spammer - just return;
+					}else{
+						$APPLICATION->ThrowException($aResult['ct_result_comment']);
+						return false;
+					}
+				}
+			}
+		}
+	}
+   
     /**
      * *** TreeLike comments section ***
      */
@@ -968,7 +1041,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
 		}
 
         $type = $arEntity['type'];
-        if($type != 'comment' && $type != 'register' && $type != 'order' && $type != 'feedback_general_contact_form' && $type != 'private_message'){
+        if($type != 'comment' && $type != 'webform' &&$type != 'register' && $type != 'order' && $type != 'feedback_general_contact_form' && $type != 'private_message'){
             CEventLog::Add(array(
                 'SEVERITY' => 'SECURITY',
                 'AUDIT_TYPE_ID' => 'CLEANTALK_E_INTERNAL',
@@ -991,6 +1064,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
 			$checkjs = 1;
 		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);
@@ -1100,6 +1174,20 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
 				$timelabels_key = 'mail_error_comment';
                 $ct_request->submit_time = $ct_submit_time;
 
+                $ct_request->message .= isset($arEntity['message_body']) ? $arEntity['message_body'] : '';
+				
+				$ct_result = $ct->isAllowMessage($ct_request);
+				break;
+				
+			case 'webform':
+				
+				$a_post_info['comment_type'] = 'webform';
+                $post_info = json_encode($a_post_info);
+				$ct_request->post_info = $post_info;
+				
+				$timelabels_key = 'mail_error_comment';
+                $ct_request->submit_time = $ct_submit_time;
+
                 $ct_request->message .= isset($arEntity['message_body']) ? $arEntity['message_body'] : '';
 				
 				$ct_result = $ct->isAllowMessage($ct_request);
diff --git a/cleantalk.antispam/install/index.php b/cleantalk.antispam/install/index.php
index b24596c..c1b5fa6 100644
--- a/cleantalk.antispam/install/index.php
+++ b/cleantalk.antispam/install/index.php
@@ -134,6 +134,10 @@ function DoInstall() {
 			{
 				RegisterModuleDependences('sale', 'OnBeforeOrderAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeOrderAddHandler');
 			} 
+			if (IsModuleInstalled('form'))
+			{
+				RegisterModuleDependences('form', 'OnBeforeResultAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeResultAddHandler');
+			} 
 		}
 		
 		//Adding agents
@@ -186,6 +190,9 @@ function DoUninstall() {
         UnRegisterModuleDependences('main', 'OnBeforeUserRegister', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeUserRegisterHandler');
 		UnRegisterModuleDependences('main', 'OnEndBufferContent', 'cleantalk.antispam', 'CleantalkAntispam', 'OnEndBufferContentHandler');
         UnRegisterModuleDependences('main', 'OnEventLogGetAuditTypes', 'cleantalk.antispam', 'CleantalkAntispam', 'OnEventLogGetAuditTypesHandler');
+		if (IsModuleInstalled('form')){
+			UnRegisterModuleDependences('form', 'OnBeforeResultAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeResultAddHandler');
+		} 
         UnRegisterModule('cleantalk.antispam');
         $this->UnInstallDB();
         $this->UnInstallFiles();
diff --git a/cleantalk.antispam/install/version.php b/cleantalk.antispam/install/version.php
index f65080b..98c2044 100644
--- a/cleantalk.antispam/install/version.php
+++ b/cleantalk.antispam/install/version.php
@@ -1,5 +1,5 @@
 <?php
 $arModuleVersion = array(
 	"VERSION" => "3.10.2",
-	"VERSION_DATE" => "2017-12-07 24:00:00"
+	"VERSION_DATE" => "2017-09-12 24:00:00"
 );
diff --git a/cleantalk.antispam/options.php b/cleantalk.antispam/options.php
index ceff4ca..b5c6b8e 100644
--- a/cleantalk.antispam/options.php
+++ b/cleantalk.antispam/options.php
@@ -59,6 +59,7 @@
     COption::SetOptionString( $sModuleId, 'form_comment_treelike',           $_POST['form_comment_treelike'] == '1'           ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'form_send_example',               $_POST['form_send_example'] == '1'               ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'form_order',                      $_POST['form_order'] == '1'                      ? '1' : '0' );
+	COption::SetOptionString( $sModuleId, 'web_form',                        $_POST['web_form'] == '1'                        ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'is_paid',                         $_POST['is_paid'] == '1'                         ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'last_checked',                    $_POST['last_checked'] == '1'                    ? '1' : '0' );
     COption::SetOptionString( $sModuleId, 'form_global_check',               $_POST['form_global_check'] == '1'               ? '1' : '0' );
@@ -173,6 +174,12 @@ function ctDdisableInputLine(ct_input_line){
         <td  valign="top">
             <input type="checkbox" name="form_order" id="form_order" <? if ( COption::GetOptionString( $sModuleId, 'form_order', '0' ) == '1'):?> checked="checked"<? endif; ?> value="1" />
         </td>
+    </tr>
+	 <tr>
+        <td width="50%" valign="top"><label for="web_form"><?echo GetMessage( 'CLEANTALK_LABEL_WEB_FORMS' );?>:</td>
+        <td  valign="top">
+            <input type="checkbox" name="web_form" id="web_form" <? if ( COption::GetOptionString( $sModuleId, 'web_form', '0' ) == '1'):?> checked="checked"<? endif; ?> value="1" />
+        </td>
     </tr>
     <tr>
         <td width="50%" valign="top"><label for="form_global_check"><?echo GetMessage( 'CLEANTALK_LABEL_GLOBAL_CHECK' );?>:</td>
diff --git a/cleantalk.antispam/sfw_die_page.html b/cleantalk.antispam/sfw_die_page.html
new file mode 100644
index 0000000..5db425f
--- /dev/null
+++ b/cleantalk.antispam/sfw_die_page.html
@@ -0,0 +1,65 @@
+<!doctype html>
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+<!--  <title></title> -->
+
+  <!--[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; position: absolute; bottom: 1em; text-align: center; width: 100%;}
+    div.footer a {color: #666; vertical-align:bottom; text-align: center;}
+    div#js_passed {display:none;}
+
+    @media (max-width: 600px) {
+    }
+</style>
+<script>
+var reload_timeout = 3000;
+function set_spamFireWallCookie(cookie_name, cookie_value) {
+    document.cookie = cookie_name + "=" + escape(cookie_value) + "; path=/;";
+    return null;
+}
+function get_current_url() {
+    document.write(window.location.href);
+    return null;
+}
+</script>
+</head>
+
+<body>
+    <div class="container">
+        <h1 class="main">SpamFireWall is activated for your IP <a href="https://cleantalk.org/blacklists/{REMOTE_ADDRESS}" target="_blank">{REMOTE_ADDRESS}</a></h1>
+        
+        <div id="js_info"><br />To continue working with web site, please make sure that you have enabled JavaScript.</div>
+        
+        <div id="js_passed">
+        <h3>Please click bellow to pass protection,</h3>
+        <a href="{REQUEST_URI}"><script>get_current_url();</script></a>
+        <br /><br /><br />
+        <p class="js_notice">Or you will be automatically redirected to the requested page after 3 seconds.</p>
+        </div>
+    </div>
+    <div class="footer">
+    <a href="https://cleantalk.org" target="_blank">Anti-Spam by CleanTalk</a>
+    </div>
+    <script type="text/javascript">
+        document.getElementById('js_info').style.display = 'none';
+        document.getElementById('js_passed').style.display = 'block';
+        set_spamFireWallCookie('ct_sfw_pass_key','{SFW_COOKIE}');
+        set_spamFireWallCookie('ct_sfw_passed','1');
+        setTimeout(function(){
+            window.location.reload(1);
+        }, reload_timeout);
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/cleantalk.antispam/updater.php b/cleantalk.antispam/updater.php
deleted file mode 100644
index 95f9741..0000000
--- a/cleantalk.antispam/updater.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-$updater->CopyFiles('classes', 'modules/cleantalk.antispam/classes');
-$updater->CopyFiles('docs', 'modules/cleantalk.antispam/docs');
-
-//xdebug_break();
-
-if( @file_exists($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/cleantalk.antispam/install/version.php') ){
-    include($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/cleantalk.antispam/install/version.php');
-	
-    if (is_array($arModuleVersion) && array_key_exists('VERSION', $arModuleVersion) &&
-		(	$arModuleVersion['VERSION'] == '1.0.1' ||
-			$arModuleVersion['VERSION'] == '1.1.2' ||
-			$arModuleVersion['VERSION'] == '1.1.3' ||
-			$arModuleVersion['VERSION'] == '1.1.4' ||
-			$arModuleVersion['VERSION'] == '1.1.5' ||
-			$arModuleVersion['VERSION'] == '2.0.1' ||
-			$arModuleVersion['VERSION'] == '2.0.2' ||
-			$arModuleVersion['VERSION'] == '2.0.3' ||
-			$arModuleVersion['VERSION'] == '2.0.5' ||
-			$arModuleVersion['VERSION'] == '2.0.6' ||
-			$arModuleVersion['VERSION'] == '2.0.7' ||
-			$arModuleVersion['VERSION'] == '3.0.0' ||
-			$arModuleVersion['VERSION'] == '3.1.0' ||
-			$arModuleVersion['VERSION'] == '3.2.0' ||
-			$arModuleVersion['VERSION'] == '3.3.0' ||
-			$arModuleVersion['VERSION'] == '3.4.0' ||
-			$arModuleVersion['VERSION'] == '3.5.0' ||
-			$arModuleVersion['VERSION'] == '3.6.0' ||
-			$arModuleVersion['VERSION'] == '3.7.0' ||
-			$arModuleVersion['VERSION'] == '3.8.0' ||
-			$arModuleVersion['VERSION'] == '3.8.1' ||
-			$arModuleVersion['VERSION'] == '3.8.2' ||
-			$arModuleVersion['VERSION'] == '3.8.3' ||
-			$arModuleVersion['VERSION'] == '3.9.0' ||
-			$arModuleVersion['VERSION'] == '3.9.1' ||
-			$arModuleVersion['VERSION'] == '3.9.2' ||
-			$arModuleVersion['VERSION'] == '3.10.0'||
-			$arModuleVersion['VERSION'] == '3.10.1'||
-			$arModuleVersion['VERSION'] == '3.10.2'
-		)
-    ){
-		// Here is checking version of existing (old) code.
-		if( @file_exists($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/cleantalk.antispam/install/index.php') ){
-			include_once($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/cleantalk.antispam/install/index.php');
-			$obModule = new cleantalk_antispam();
-
-			// Main problem is to make needed changes (like in install script) when module is INSTALLED ALREADY
-			switch ($arModuleVersion['VERSION']) {
-				case '1.0.1' : 
-					// Version is too old, need to uninstall so user must run installation manually.
-					if (IsModuleInstalled('blog'))
-						UnRegisterModuleDependences('blog', 'OnBeforeCommentAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeCommentAddHandler');
-
-					if (IsModuleInstalled('forum')){
-						UnRegisterModuleDependences('forum', 'OnBeforeMessageAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeMessageAddHandler');
-						UnRegisterModuleDependences('forum', 'OnAfterMessageAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnAfterMessageAddHandler');
-						UnRegisterModuleDependences('forum', 'OnMessageModerate', 'cleantalk.antispam', 'CleantalkAntispam', 'OnMessageModerateHandler');
-						UnRegisterModuleDependences('forum', 'OnBeforeMessageDelete', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeMessageDeleteHandler');
-					}
-					
-					UnRegisterModuleDependences('main', 'OnBeforeUserRegister', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforeUserRegisterHandler');
-					UnRegisterModuleDependences('main', 'OnEventLogGetAuditTypes', 'cleantalk.antispam', 'CleantalkAntispam', 'OnEventLogGetAuditTypesHandler');
-					UnRegisterModule('cleantalk.antispam');
-					$obModule->UnInstallDB();
-					$obModule->UnInstallFiles();
-					$GLOBALS['errors'] = $obModule->errors;
-					break;
-				case '1.1.2' :
-				case '1.1.3' :
-				case '1.1.4' :
-				case '1.1.5' :
-					// We need to register just new dependencies and remove any template changes.
-					if (IsModuleInstalled('cleantalk.antispam')){
-						// New dependencies here are OnEndBufferContentHandler and treelikecomments
-							RegisterModuleDependences('main', 'OnEndBufferContent', 'cleantalk.antispam', 'CleantalkAntispam', 'OnEndBufferContentHandler');
-						if (IsModuleInstalled('prmedia.treelikecomments'))
-							RegisterModuleDependences('prmedia.treelikecomments', 'OnBeforePrmediaCommentAdd', 'cleantalk.antispam', 'CleantalkAntispam', 'OnBeforePrmediaCommentAddHandler');
-						// We don't need any template file changes, so just clear them all.
-						$obModule->UnInstallFiles();
-					}
-					// break; -- NO break THERE
-				case '2.0.1' :
-				case '2.0.2' :
-				case '2.0.3' :
-					// We need to create additional table.
-					// No need to run $obModule->InstallDB() because it drops existing module tables with useful data.
-					if (IsModuleInstalled('cleantalk.antispam')){
-						$DB->Query('DROP TABLE IF EXISTS cleantalk_checkjs');
-						
-						if(!$DB->Query('CREATE TABLE cleantalk_checkjs ( time_range varchar(10), js_values varchar(1024), PRIMARY KEY (time_range))'))
-							$GLOBALS['errors'][] = GetMessage('CLEANTALK_ERROR_CREATE_SERVER');
-
-					}
-				case '2.0.5' :
-				// No changes in tables and additional files since 2.0.5
-				case '2.0.6' :
-				// No changes in tables and additional files since 2.0.6
-				case '2.0.7' :
-				// No changes in tables and additional files since 2.0.7
-				case '3.0.0' :
-				// No changes in tables and additional files since 2.0.7
-				case '3.1.0' :
-				// No changes in tables and additional files since 3.0.0
-				case '3.2.0' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.3.0' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.4.0' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.5.0' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.6.0' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.7.0' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.8.0' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.8.1' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.8.2' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.8.3' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.9.0' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.9.1' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.9.2' :
-				// No changes in tables and additional files since 3.1.0
-				case '3.10.0' :
-					if (IsModuleInstalled('cleantalk.antispam')){
-						// Creating SFW DATA
-						$DB->Query('DROP TABLE IF EXISTS cleantalk_sfw');
-						$result = $DB->Query(
-							"CREATE 
-							TABLE IF NOT EXISTS `cleantalk_sfw` (
-								`network` int(11) unsigned NOT NULL,
-								`mask` int(11) unsigned NOT NULL,
-								INDEX (  `network` ,  `mask` )
-							)
-							ENGINE = MYISAM ;"
-						);
-						if(!$result){
-							$this->errors[] = GetMessage('CLEANTALK_ERROR_CREATE_SFW_DATA');
-							return FALSE;
-						}
-						
-						// Creating SFW LOGS
-						$DB->Query('DROP TABLE IF EXISTS cleantalk_sfw_logs');
-						$result = $DB->Query(
-							"CREATE 
-							TABLE IF NOT EXISTS `cleantalk_sfw_logs` (
-								`ip` VARCHAR(15) NOT NULL,
-								`all_entries` INT NOT NULL,
-								`blocked_entries` INT NOT NULL,
-								`entries_timestamp` INT NOT NULL,
-								PRIMARY KEY (`ip`)
-							)
-							ENGINE = MYISAM ;"
-						);
-						if(!$result){
-							$this->errors[] = GetMessage('CLEANTALK_ERROR_CREATE_SFW_LOGS');
-							return FALSE;
-						}
-					}
-				case '3.10.1' :
-					if (IsModuleInstalled('cleantalk.antispam')){
-						CAgent::RemoveModuleAgents("cleantalk.antispam");
-						CAgent::AddAgent("CleantalkAntispam::sfw_send_logs();", "cleantalk.antispam", "N", 3600);
-						CAgent::AddAgent("CleantalkAntispam::sfw_update();",    "cleantalk.antispam", "N", 86400);
-					}
-			}
-			unset($obModule);
-		}
-		if( @file_exists($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/cleantalk.antispam/Cleantalk.php') )
-			unlink($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/cleantalk.antispam/Cleantalk.php');
-	}
-    unset($arModuleVersion);
-}

From b47b770b1299513143799687d4e81def01fb4610 Mon Sep 17 00:00:00 2001
From: davydovct <davydov@cleantalk.org>
Date: Wed, 13 Dec 2017 10:54:34 +0500
Subject: [PATCH 4/5] Webform settings translation

---
 cleantalk.antispam/lang/en/options.php       |  1 +
 cleantalk.antispam/lang/ru/include.php       | 14 +++---
 cleantalk.antispam/lang/ru/install/index.php | 42 ++++++++---------
 cleantalk.antispam/lang/ru/options.php       | 49 ++++++++++----------
 4 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/cleantalk.antispam/lang/en/options.php b/cleantalk.antispam/lang/en/options.php
index c083987..e980209 100644
--- a/cleantalk.antispam/lang/en/options.php
+++ b/cleantalk.antispam/lang/en/options.php
@@ -8,6 +8,7 @@
 $MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = 'Treelike comments forms protection';
 $MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = 'Send texts for off-top analysis';
 $MESS['CLEANTALK_LABEL_ORDER'] = 'Order form protection';
+$MESS['CLEANTALK_LABEL_WEB_FORMS'] = 'Web forms protection';
 $MESS['CLEANTALK_BUTTON_SAVE']  = 'Save';
 $MESS['CLEANTALK_GET_AUTO_KEY']  = 'Get access key automatically';
 $MESS['CLEANTALK_GET_MANUAL_KEY']  = 'Get access key manually';
diff --git a/cleantalk.antispam/lang/ru/include.php b/cleantalk.antispam/lang/ru/include.php
index 9ee8cde..69fc3fd 100644
--- a/cleantalk.antispam/lang/ru/include.php
+++ b/cleantalk.antispam/lang/ru/include.php
@@ -1,8 +1,8 @@
 <?php
-$MESS['CLEANTALK_BACK_LINK'] = 'Вернуться назад';
-$MESS['CLEANTALK_EVENT']     = 'Автомодератор CleanTalk';
-$MESS['CLEANTALK_MESSAGE']   = 'Сообщение';
-$MESS['CLEANTALK_E_SERVER'] = 'Ошибка работы сервера CleanTalk';
-$MESS['CLEANTALK_E_INTERNAL'] = 'Ошибка вызова методов CleanTalk';
-$MESS['CLEANTALK_E_PARAM']  = 'Плохие параметры метода CheckAllBefore';
-$MESS['CLEANTALK_E_TYPE']   = 'Плохой параметр type метода CheckAllBefore';
+$MESS['CLEANTALK_BACK_LINK'] = '��������� �����';
+$MESS['CLEANTALK_EVENT']     = '������������� CleanTalk';
+$MESS['CLEANTALK_MESSAGE']   = '���������';
+$MESS['CLEANTALK_E_SERVER'] = '������ ������ ������� CleanTalk';
+$MESS['CLEANTALK_E_INTERNAL'] = '������ ������ ������� CleanTalk';
+$MESS['CLEANTALK_E_PARAM']  = '������ ��������� ������ CheckAllBefore';
+$MESS['CLEANTALK_E_TYPE']   = '������ �������� type ������ CheckAllBefore';
\ No newline at end of file
diff --git a/cleantalk.antispam/lang/ru/install/index.php b/cleantalk.antispam/lang/ru/install/index.php
index c44472e..d0d1ec2 100644
--- a/cleantalk.antispam/lang/ru/install/index.php
+++ b/cleantalk.antispam/lang/ru/install/index.php
@@ -1,22 +1,22 @@
 <?php
-$MESS["CLEANTALK_MODULE_NAME"] = "Антиспам без CAPTCHA от CleanTalk";
-$MESS["CLEANTALK_MODULE_DESCRIPTION"] = "Защита от спама без капчи, вопросов-ответов, подсчета животных, пазлов и арифметических задач.";
-$MESS["CLEANTALK_INSTALL_TITLE"] = "Установка модуля \"Антиспам без CAPTCHA от CleanTalk\"";
-$MESS["CLEANTALK_UNINSTALL_TITLE"] = "Удаление модуля \"Антиспам без CAPTCHA от CleanTalk\"";
-$MESS["CLEANTALK_ERROR_CREATE_TIMELABELS"] = "Не могу создать таблицу TIMELABELS";
-$MESS["CLEANTALK_ERROR_CREATE_CIDS"] = "Не могу создать таблицу CIDS";
-$MESS["CLEANTALK_ERROR_CREATE_SERVER"] = "Не могу создать таблицу SERVER";
-$MESS["CLEANTALK_ERROR_FILES_01"] = "Нет нужных системных папок";
-$MESS["CLEANTALK_ERROR_FILES_02"] = "Не могу создать папку шаблона компонента";
-$MESS["CLEANTALK_ERROR_FILES_03"] = "Не могу скопировать шаблон компонента из системной папки в локальную";
-$MESS["CLEANTALK_ERROR_FILES_04"] = "Нет PHP-файла шаблона";
-$MESS["CLEANTALK_ERROR_FILES_05"] = "Не могу прочитать из PHP-файла шаблона";
-$MESS["CLEANTALK_ERROR_FILES_06"] = "Не могу найти паттерн для вставки дополнения в PHP-файл шаблона";
-$MESS["CLEANTALK_ERROR_FILES_07"] = "Не могу разобрать PHP-файл шаблона - найден только старый открывающий тэг CLEANTALK";
-$MESS["CLEANTALK_ERROR_FILES_08"] = "Не могу разобрать PHP-файл шаблона - найден только старый закрывающий тэг CLEANTALK";
-$MESS["CLEANTALK_ERROR_FILES_09"] = "Не могу разобрать PHP-файл шаблона - старый закрывающий тэг CLEANTALK найден перед открывающим";
-$MESS["CLEANTALK_ERROR_FILES_10"] = "Не могу записать новый PHP-файл шаблона";
-$MESS["CLEANTALK_TEMPLATES_HEADER"] = "Измемены следующие шаблоны ПО-УМОЛЧАНИЮ:";
-$MESS["CLEANTALK_TEMPLATES_FOOTER"] = "Если вы используете ДРУГИЕ шаблоны, вы ДОЛЖНЫ внести в них изменения САМИ";
-$MESS["MOD_INST_OK"] = "Установка модуля успешно завершена";
-$MESS["MOD_UNINST_OK"] = "Удаление модуля успешно завершено";
+$MESS["CLEANTALK_MODULE_NAME"] = "�������� ��� CAPTCHA �� CleanTalk";
+$MESS["CLEANTALK_MODULE_DESCRIPTION"] = "������ �� ����� ��� �����, ��������-�������, �������� ��������, ������ � �������������� �����.";
+$MESS["CLEANTALK_INSTALL_TITLE"] = "��������� ������ \"�������� ��� CAPTCHA �� CleanTalk\"";
+$MESS["CLEANTALK_UNINSTALL_TITLE"] = "�������� ������ \"�������� ��� CAPTCHA �� CleanTalk\"";
+$MESS["CLEANTALK_ERROR_CREATE_TIMELABELS"] = "�� ���� ������� ������� TIMELABELS";
+$MESS["CLEANTALK_ERROR_CREATE_CIDS"] = "�� ���� ������� ������� CIDS";
+$MESS["CLEANTALK_ERROR_CREATE_SERVER"] = "�� ���� ������� ������� SERVER";
+$MESS["CLEANTALK_ERROR_FILES_01"] = "��� ������ ��������� �����";
+$MESS["CLEANTALK_ERROR_FILES_02"] = "�� ���� ������� ����� ������� ����������";
+$MESS["CLEANTALK_ERROR_FILES_03"] = "�� ���� ����������� ������ ���������� �� ��������� ����� � ���������";
+$MESS["CLEANTALK_ERROR_FILES_04"] = "��� PHP-����� �������";
+$MESS["CLEANTALK_ERROR_FILES_05"] = "�� ���� ��������� �� PHP-����� �������";
+$MESS["CLEANTALK_ERROR_FILES_06"] = "�� ���� ����� ������� ��� ������� ���������� � PHP-���� �������";
+$MESS["CLEANTALK_ERROR_FILES_07"] = "�� ���� ��������� PHP-���� ������� - ������ ������ ������ ����������� ��� CLEANTALK";
+$MESS["CLEANTALK_ERROR_FILES_08"] = "�� ���� ��������� PHP-���� ������� - ������ ������ ������ ����������� ��� CLEANTALK";
+$MESS["CLEANTALK_ERROR_FILES_09"] = "�� ���� ��������� PHP-���� ������� - ������ ����������� ��� CLEANTALK ������ ����� �����������";
+$MESS["CLEANTALK_ERROR_FILES_10"] = "�� ���� �������� ����� PHP-���� �������";
+$MESS["CLEANTALK_TEMPLATES_HEADER"] = "�������� ��������� ������� ��-���������:";
+$MESS["CLEANTALK_TEMPLATES_FOOTER"] = "���� �� ����������� ������ �������, �� ������ ������ � ��� ��������� ����";
+$MESS["MOD_INST_OK"] = "��������� ������ ������� ���������";
+$MESS["MOD_UNINST_OK"] = "�������� ������ ������� ���������";
\ No newline at end of file
diff --git a/cleantalk.antispam/lang/ru/options.php b/cleantalk.antispam/lang/ru/options.php
index 413fa3b..e2b1d5e 100644
--- a/cleantalk.antispam/lang/ru/options.php
+++ b/cleantalk.antispam/lang/ru/options.php
@@ -1,26 +1,27 @@
 <?php
-$MESS['CLEANTALK_LABEL_STATUS'] = 'Модуль включен';
-$MESS['CLEANTALK_LABEL_KEY']    = 'Ключ доступа';
-$MESS['CLEANTALK_LABEL_NEW_USER']       = 'Защита формы регистрации';
-$MESS['CLEANTALK_LABEL_COMMENT_BLOG']   = 'Защита формы комментариев блога';
-$MESS['CLEANTALK_LABEL_COMMENT_FORUM']  = 'Защита формы комментариев форума';
-$MESS['CLEANTALK_LABEL_FORUM_PRIVATE_MESSAGES']  = 'Защита личных сообщений форума';
-$MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = 'Защита форм Древовидных комментариев';
-$MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = 'Отсылать тексты для офф-топ анализа';
-$MESS['CLEANTALK_LABEL_ORDER']  = 'Проверять формы заказов';
-$MESS['CLEANTALK_BUTTON_SAVE']  = 'Сохранить';
-$MESS['CLEANTALK_GET_AUTO_KEY']  = 'Получить ключ автоматически';
-$MESS['CLEANTALK_GET_MANUAL_KEY']  = 'Получить ключ вручную';
-$MESS['CLEANTALK_GET_TO_CP']  = 'Перейти в панель управления CleanTalk';
-$MESS['CLEANTALK_BUTTON_RESET'] = 'Сбросить';
-$MESS['CLEANTALK_TITLE']        = 'Настройки модуля';
-$MESS['CLEANTALK_LABEL_GLOBAL_CHECK']        = 'Защита любых форм';
-$MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = 'Проверять все POST данные';
-$MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- Внимание, возможны конфликты!';
+$MESS['CLEANTALK_LABEL_STATUS'] = '������ �������';
+$MESS['CLEANTALK_LABEL_KEY']    = '���� �������';
+$MESS['CLEANTALK_LABEL_NEW_USER']       = '������ ����� �����������';
+$MESS['CLEANTALK_LABEL_COMMENT_BLOG']   = '������ ����� ������������ �����';
+$MESS['CLEANTALK_LABEL_COMMENT_FORUM']  = '������ ����� ������������ ������';
+$MESS['CLEANTALK_LABEL_FORUM_PRIVATE_MESSAGES']  = '������ ������ ��������� ������';
+$MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = '������ ���� ����������� ������������';
+$MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = '�������� ������ ��� ���-��� �������';
+$MESS['CLEANTALK_LABEL_ORDER']  = '��������� ����� �������';
+$MESS['CLEANTALK_LABEL_WEB_FORMS'] = '������ ���-����';
+$MESS['CLEANTALK_BUTTON_SAVE']  = '���������';
+$MESS['CLEANTALK_GET_AUTO_KEY']  = '�������� ���� �������������';
+$MESS['CLEANTALK_GET_MANUAL_KEY']  = '�������� ���� �������';
+$MESS['CLEANTALK_GET_TO_CP']  = '������� � ������ ���������� CleanTalk';
+$MESS['CLEANTALK_BUTTON_RESET'] = '��������';
+$MESS['CLEANTALK_TITLE']        = '��������� ������';
+$MESS['CLEANTALK_LABEL_GLOBAL_CHECK']        = '������ ����� ����';
+$MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = '��������� ��� POST ������';
+$MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- ��������, �������� ���������!';
 $MESS['CLEANTALK_LABEL_SFW']        = 'Spam FireWall';
-$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']        = 'Ключ активен';
-$MESS['CLEANTALK_KEY_NOT_VALID']    = 'Ключ не активен';
-$MESS['CLEANTALK_EMAIL_REGISTRATION_WARNING']	= 'Для регистрации будет использована почта администратора';
-$MESS['CLEANTALK_LICENSE_AGREEMENT'] = 'Лицензионное соглашение';
+$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']        = '���� �������';
+$MESS['CLEANTALK_KEY_NOT_VALID']    = '���� �� �������';
+$MESS['CLEANTALK_EMAIL_REGISTRATION_WARNING']	= '��� ����������� ����� ������������ ����� ��������������';
+$MESS['CLEANTALK_LICENSE_AGREEMENT'] = '������������ ����������';

From 2d033d33fc5258376b44356244f74615cbf445c8 Mon Sep 17 00:00:00 2001
From: davydovct <davydov@cleantalk.org>
Date: Wed, 13 Dec 2017 11:30:52 +0500
Subject: [PATCH 5/5] set utf8 for lang files

---
 cleantalk.antispam/lang/ru/include.php       | 14 +++---
 cleantalk.antispam/lang/ru/install/index.php | 42 ++++++++--------
 cleantalk.antispam/lang/ru/options.php       | 50 ++++++++++----------
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/cleantalk.antispam/lang/ru/include.php b/cleantalk.antispam/lang/ru/include.php
index 69fc3fd..a161a94 100644
--- a/cleantalk.antispam/lang/ru/include.php
+++ b/cleantalk.antispam/lang/ru/include.php
@@ -1,8 +1,8 @@
 <?php
-$MESS['CLEANTALK_BACK_LINK'] = '��������� �����';
-$MESS['CLEANTALK_EVENT']     = '������������� CleanTalk';
-$MESS['CLEANTALK_MESSAGE']   = '���������';
-$MESS['CLEANTALK_E_SERVER'] = '������ ������ ������� CleanTalk';
-$MESS['CLEANTALK_E_INTERNAL'] = '������ ������ ������� CleanTalk';
-$MESS['CLEANTALK_E_PARAM']  = '������ ��������� ������ CheckAllBefore';
-$MESS['CLEANTALK_E_TYPE']   = '������ �������� type ������ CheckAllBefore';
\ No newline at end of file
+$MESS['CLEANTALK_BACK_LINK'] = 'Вернуться назад';
+$MESS['CLEANTALK_EVENT']     = 'Автомодератор CleanTalk';
+$MESS['CLEANTALK_MESSAGE']   = 'Сообщение';
+$MESS['CLEANTALK_E_SERVER'] = 'Ошибка работы сервера CleanTalk';
+$MESS['CLEANTALK_E_INTERNAL'] = 'Ошибка вызова методов CleanTalk';
+$MESS['CLEANTALK_E_PARAM']  = 'Плохие параметры метода CheckAllBefore';
+$MESS['CLEANTALK_E_TYPE']   = 'Плохой параметр type метода CheckAllBefore';
\ No newline at end of file
diff --git a/cleantalk.antispam/lang/ru/install/index.php b/cleantalk.antispam/lang/ru/install/index.php
index d0d1ec2..89968d0 100644
--- a/cleantalk.antispam/lang/ru/install/index.php
+++ b/cleantalk.antispam/lang/ru/install/index.php
@@ -1,22 +1,22 @@
 <?php
-$MESS["CLEANTALK_MODULE_NAME"] = "�������� ��� CAPTCHA �� CleanTalk";
-$MESS["CLEANTALK_MODULE_DESCRIPTION"] = "������ �� ����� ��� �����, ��������-�������, �������� ��������, ������ � �������������� �����.";
-$MESS["CLEANTALK_INSTALL_TITLE"] = "��������� ������ \"�������� ��� CAPTCHA �� CleanTalk\"";
-$MESS["CLEANTALK_UNINSTALL_TITLE"] = "�������� ������ \"�������� ��� CAPTCHA �� CleanTalk\"";
-$MESS["CLEANTALK_ERROR_CREATE_TIMELABELS"] = "�� ���� ������� ������� TIMELABELS";
-$MESS["CLEANTALK_ERROR_CREATE_CIDS"] = "�� ���� ������� ������� CIDS";
-$MESS["CLEANTALK_ERROR_CREATE_SERVER"] = "�� ���� ������� ������� SERVER";
-$MESS["CLEANTALK_ERROR_FILES_01"] = "��� ������ ��������� �����";
-$MESS["CLEANTALK_ERROR_FILES_02"] = "�� ���� ������� ����� ������� ����������";
-$MESS["CLEANTALK_ERROR_FILES_03"] = "�� ���� ����������� ������ ���������� �� ��������� ����� � ���������";
-$MESS["CLEANTALK_ERROR_FILES_04"] = "��� PHP-����� �������";
-$MESS["CLEANTALK_ERROR_FILES_05"] = "�� ���� ��������� �� PHP-����� �������";
-$MESS["CLEANTALK_ERROR_FILES_06"] = "�� ���� ����� ������� ��� ������� ���������� � PHP-���� �������";
-$MESS["CLEANTALK_ERROR_FILES_07"] = "�� ���� ��������� PHP-���� ������� - ������ ������ ������ ����������� ��� CLEANTALK";
-$MESS["CLEANTALK_ERROR_FILES_08"] = "�� ���� ��������� PHP-���� ������� - ������ ������ ������ ����������� ��� CLEANTALK";
-$MESS["CLEANTALK_ERROR_FILES_09"] = "�� ���� ��������� PHP-���� ������� - ������ ����������� ��� CLEANTALK ������ ����� �����������";
-$MESS["CLEANTALK_ERROR_FILES_10"] = "�� ���� �������� ����� PHP-���� �������";
-$MESS["CLEANTALK_TEMPLATES_HEADER"] = "�������� ��������� ������� ��-���������:";
-$MESS["CLEANTALK_TEMPLATES_FOOTER"] = "���� �� ����������� ������ �������, �� ������ ������ � ��� ��������� ����";
-$MESS["MOD_INST_OK"] = "��������� ������ ������� ���������";
-$MESS["MOD_UNINST_OK"] = "�������� ������ ������� ���������";
\ No newline at end of file
+$MESS["CLEANTALK_MODULE_NAME"] = "Антиспам без CAPTCHA от CleanTalk";
+$MESS["CLEANTALK_MODULE_DESCRIPTION"] = "Защита от спама без капчи, вопросов-ответов, подсчета животных, пазлов и арифметических задач.";
+$MESS["CLEANTALK_INSTALL_TITLE"] = "Установка модуля \"Антиспам без CAPTCHA от CleanTalk\"";
+$MESS["CLEANTALK_UNINSTALL_TITLE"] = "Удаление модуля \"Антиспам без CAPTCHA от CleanTalk\"";
+$MESS["CLEANTALK_ERROR_CREATE_TIMELABELS"] = "Не могу создать таблицу TIMELABELS";
+$MESS["CLEANTALK_ERROR_CREATE_CIDS"] = "Не могу создать таблицу CIDS";
+$MESS["CLEANTALK_ERROR_CREATE_SERVER"] = "Не могу создать таблицу SERVER";
+$MESS["CLEANTALK_ERROR_FILES_01"] = "Нет нужных системных папок";
+$MESS["CLEANTALK_ERROR_FILES_02"] = "Не могу создать папку шаблона компонента";
+$MESS["CLEANTALK_ERROR_FILES_03"] = "Не могу скопировать шаблон компонента из системной папки в локальную";
+$MESS["CLEANTALK_ERROR_FILES_04"] = "Нет PHP-файла шаблона";
+$MESS["CLEANTALK_ERROR_FILES_05"] = "Не могу прочитать из PHP-файла шаблона";
+$MESS["CLEANTALK_ERROR_FILES_06"] = "Не могу найти паттерн для вставки дополнения в PHP-файл шаблона";
+$MESS["CLEANTALK_ERROR_FILES_07"] = "Не могу разобрать PHP-файл шаблона - найден только старый открывающий тэг CLEANTALK";
+$MESS["CLEANTALK_ERROR_FILES_08"] = "Не могу разобрать PHP-файл шаблона - найден только старый закрывающий тэг CLEANTALK";
+$MESS["CLEANTALK_ERROR_FILES_09"] = "Не могу разобрать PHP-файл шаблона - старый закрывающий тэг CLEANTALK найден перед открывающим";
+$MESS["CLEANTALK_ERROR_FILES_10"] = "Не могу записать новый PHP-файл шаблона";
+$MESS["CLEANTALK_TEMPLATES_HEADER"] = "Измемены следующие шаблоны ПО-УМОЛЧАНИЮ:";
+$MESS["CLEANTALK_TEMPLATES_FOOTER"] = "Если вы используете ДРУГИЕ шаблоны, вы ДОЛЖНЫ внести в них изменения САМИ";
+$MESS["MOD_INST_OK"] = "Установка модуля успешно завершена";
+$MESS["MOD_UNINST_OK"] = "Удаление модуля успешно завершено";
\ No newline at end of file
diff --git a/cleantalk.antispam/lang/ru/options.php b/cleantalk.antispam/lang/ru/options.php
index e2b1d5e..8015c68 100644
--- a/cleantalk.antispam/lang/ru/options.php
+++ b/cleantalk.antispam/lang/ru/options.php
@@ -1,27 +1,27 @@
 <?php
-$MESS['CLEANTALK_LABEL_STATUS'] = '������ �������';
-$MESS['CLEANTALK_LABEL_KEY']    = '���� �������';
-$MESS['CLEANTALK_LABEL_NEW_USER']       = '������ ����� �����������';
-$MESS['CLEANTALK_LABEL_COMMENT_BLOG']   = '������ ����� ������������ �����';
-$MESS['CLEANTALK_LABEL_COMMENT_FORUM']  = '������ ����� ������������ ������';
-$MESS['CLEANTALK_LABEL_FORUM_PRIVATE_MESSAGES']  = '������ ������ ��������� ������';
-$MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = '������ ���� ����������� ������������';
-$MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = '�������� ������ ��� ���-��� �������';
-$MESS['CLEANTALK_LABEL_ORDER']  = '��������� ����� �������';
-$MESS['CLEANTALK_LABEL_WEB_FORMS'] = '������ ���-����';
-$MESS['CLEANTALK_BUTTON_SAVE']  = '���������';
-$MESS['CLEANTALK_GET_AUTO_KEY']  = '�������� ���� �������������';
-$MESS['CLEANTALK_GET_MANUAL_KEY']  = '�������� ���� �������';
-$MESS['CLEANTALK_GET_TO_CP']  = '������� � ������ ���������� CleanTalk';
-$MESS['CLEANTALK_BUTTON_RESET'] = '��������';
-$MESS['CLEANTALK_TITLE']        = '��������� ������';
-$MESS['CLEANTALK_LABEL_GLOBAL_CHECK']        = '������ ����� ����';
-$MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = '��������� ��� POST ������';
-$MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- ��������, �������� ���������!';
+$MESS['CLEANTALK_LABEL_STATUS'] = 'Модуль включен';
+$MESS['CLEANTALK_LABEL_KEY']    = 'Ключ доступа';
+$MESS['CLEANTALK_LABEL_NEW_USER']       = 'Защита формы регистрации';
+$MESS['CLEANTALK_LABEL_COMMENT_BLOG']   = 'Защита формы комментариев блога';
+$MESS['CLEANTALK_LABEL_COMMENT_FORUM']  = 'Защита формы комментариев форума';
+$MESS['CLEANTALK_LABEL_FORUM_PRIVATE_MESSAGES']  = 'Защита личных сообщений форума';
+$MESS['CLEANTALK_LABEL_COMMENT_TREELIKE']  = 'Защита форм Древовидных комментариев';
+$MESS['CLEANTALK_LABEL_SEND_EXAMPLE']  = 'Отсылать тексты для офф-топ анализа';
+$MESS['CLEANTALK_LABEL_ORDER']  = 'Проверять формы заказов';
+$MESS['CLEANTALK_LABEL_WEB_FORMS'] = 'Защита Веб-форм';
+$MESS['CLEANTALK_BUTTON_SAVE']  = 'Сохранить';
+$MESS['CLEANTALK_GET_AUTO_KEY']  = 'Получить ключ автоматически';
+$MESS['CLEANTALK_GET_MANUAL_KEY']  = 'Получить ключ вручную';
+$MESS['CLEANTALK_GET_TO_CP']  = 'Перейти в панель управления CleanTalk';
+$MESS['CLEANTALK_BUTTON_RESET'] = 'Сбросить';
+$MESS['CLEANTALK_TITLE']        = 'Настройки модуля';
+$MESS['CLEANTALK_LABEL_GLOBAL_CHECK']        = 'Защита любых форм';
+$MESS['CLEANTALK_LABEL_GLOBAL_CHECK_WITHOUT_EMAIL'] = 'Проверять все POST данные';
+$MESS['CLEANTALK_WARNING_GLOBAL_CHECK_WITHOUT_EMAIL'] = '- Внимание, возможны конфликты!';
 $MESS['CLEANTALK_LABEL_SFW']        = 'Spam FireWall';
-$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']        = '���� �������';
-$MESS['CLEANTALK_KEY_NOT_VALID']    = '���� �� �������';
-$MESS['CLEANTALK_EMAIL_REGISTRATION_WARNING']	= '��� ����������� ����� ������������ ����� ��������������';
-$MESS['CLEANTALK_LICENSE_AGREEMENT'] = '������������ ����������';
+$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']        = 'Ключ активен';
+$MESS['CLEANTALK_KEY_NOT_VALID']    = 'Ключ не активен';
+$MESS['CLEANTALK_EMAIL_REGISTRATION_WARNING']	= 'Для регистрации будет использована почта администратора';
+$MESS['CLEANTALK_LICENSE_AGREEMENT'] = 'Лицензионное соглашение';