Update version

Fix SSL
CleanTalk · Mar 16, 2018 · f02e928 · f02e928
1 parent ba70ad0
commit f02e928
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 bitrix-antispam
 ===============
 
-1C Bitrix anti-spam mod. 3.10.4
+1C Bitrix anti-spam mod. 3.10.5
 
 Information page,
 http://cleantalk.org/bitrix-antispam-module-bez-captcha

diff --git a/cleantalk.antispam/classes/Cleantalk.php b/cleantalk.antispam/classes/Cleantalk.php
@@ -308,14 +308,13 @@ private function sendRequest($data = null, $url, $server_timeout = 3) {
 
             // Disabling CA cert verivication
             // Disabling common name verification
-            if ($this->ssl_on && $this->ssl_path=='') {
+            if ($this->ssl_on && $this->ssl_path != '') {
                 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
                 curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-            }
-            else if ($this->ssl_on && $this->ssl_path!='') {
-            	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
-                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
                 curl_setopt($ch, CURLOPT_CAINFO, $this->ssl_path);
+            }else{ // Disabling CA cert verivication and common name verification
+                curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
             }
 
             $result = curl_exec($ch);

diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
@@ -1158,7 +1158,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-3104';
+        $ct_request->agent = 'bitrix-3105';
         $ct_request->response_lang = 'ru';
         $ct_request->js_on = $checkjs;
         $ct_request->sender_info = $sender_info;
@@ -1440,7 +1440,7 @@ static function SendFeedback($module, $id, $feedback) {
 
             $ct_request = new CleantalkRequest();
             $ct_request->auth_key = $ct_key;
-            $ct_request->agent = 'bitrix-3104';
+            $ct_request->agent = 'bitrix-3105';
 	    $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/version.php b/cleantalk.antispam/install/version.php
@@ -1,5 +1,5 @@
 <?php
 $arModuleVersion = array(
-	"VERSION" => "3.10.4",
+	"VERSION" => "3.10.5",
 	"VERSION_DATE" => "2018-02-14 24:00:00"
 );
diff --git 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-3104');
+    $result = CleantalkHelper::sendEmptyFeedback($new_key, 'bitrix-3105');
 
     /**
      * Set settings when submit