Skip to content

Commit f02e928

Browse files
author
davydovct
committed
Update version
Fix SSL
1 parent ba70ad0 commit f02e928

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bitrix-antispam
22
===============
33

4-
1C Bitrix anti-spam mod. 3.10.4
4+
1C Bitrix anti-spam mod. 3.10.5
55

66
Information page,
77
http://cleantalk.org/bitrix-antispam-module-bez-captcha

cleantalk.antispam/classes/Cleantalk.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,13 @@ private function sendRequest($data = null, $url, $server_timeout = 3) {
308308

309309
// Disabling CA cert verivication
310310
// Disabling common name verification
311-
if ($this->ssl_on && $this->ssl_path=='') {
311+
if ($this->ssl_on && $this->ssl_path != '') {
312312
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
313313
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
314-
}
315-
else if ($this->ssl_on && $this->ssl_path!='') {
316-
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
317-
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
318314
curl_setopt($ch, CURLOPT_CAINFO, $this->ssl_path);
315+
}else{ // Disabling CA cert verivication and common name verification
316+
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
317+
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
319318
}
320319

321320
$result = curl_exec($ch);

cleantalk.antispam/include.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
11581158
$ct_request->sender_email = isset($arEntity['sender_email']) ? $arEntity['sender_email'] : '';
11591159
$ct_request->sender_nickname = isset($arEntity['sender_nickname']) ? $arEntity['sender_nickname'] : '';
11601160
$ct_request->sender_ip = $ct->ct_session_ip($_SERVER['REMOTE_ADDR']);
1161-
$ct_request->agent = 'bitrix-3104';
1161+
$ct_request->agent = 'bitrix-3105';
11621162
$ct_request->response_lang = 'ru';
11631163
$ct_request->js_on = $checkjs;
11641164
$ct_request->sender_info = $sender_info;
@@ -1440,7 +1440,7 @@ static function SendFeedback($module, $id, $feedback) {
14401440

14411441
$ct_request = new CleantalkRequest();
14421442
$ct_request->auth_key = $ct_key;
1443-
$ct_request->agent = 'bitrix-3104';
1443+
$ct_request->agent = 'bitrix-3105';
14441444
$ct_request->sender_ip = $ct->ct_session_ip($_SERVER['REMOTE_ADDR']);
14451445
$ct_request->feedback = $request_id . ':' . ($feedback == 'Y' ? '1' : '0');
14461446

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
$arModuleVersion = array(
3-
"VERSION" => "3.10.4",
3+
"VERSION" => "3.10.5",
44
"VERSION_DATE" => "2018-02-14 24:00:00"
55
);

cleantalk.antispam/options.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
}
4141

4242
// Send empty feedback for version comparison in Dashboard
43-
$result = CleantalkHelper::sendEmptyFeedback($new_key, 'bitrix-3104');
43+
$result = CleantalkHelper::sendEmptyFeedback($new_key, 'bitrix-3105');
4444

4545
/**
4646
* Set settings when submit

0 commit comments

Comments
 (0)