Skip to content

Commit 22c79e1

Browse files
author
davydovct
committed
fix cleantalk
1 parent 17404ff commit 22c79e1

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

lib/Cleantalk.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,6 @@ private function createMsg($method, CleantalkRequest $request) {
219219
$request->$param = CleantalkHelper::removeNonUTF8FromString($value);
220220
}
221221

222-
$request->message = unserialize($request->message);
223-
$request->message = is_array($request->message) ? json_encode($request->message) : $request->message;
224-
225222
return $request;
226223
}
227224

@@ -358,24 +355,27 @@ private function httpRequest($msg) {
358355
$cookie_name = 'cookie';
359356
else
360357
$cookie_name = 'COOKIE';
361-
362-
$ct_tmp[$cookie_name] = preg_replace(array(
363-
'/\s?ct_checkjs=[a-z0-9]*[^;]*;?/',
364-
'/\s?ct_timezone=.{0,1}\d{1,2}[^;]*;?/',
365-
'/\s?ct_pointer_data=.*5D[^;]*;?/',
366-
'/\s?apbct_timestamp=\d*[^;]*;?/',
367-
'/\s?apbct_site_landing_ts=\d*[^;]*;?/',
368-
'/\s?apbct_cookies_test=%7B.*%7D[^;]*;?/',
369-
'/\s?apbct_prev_referer=http.*?[^;]*;?/',
370-
'/\s?ct_cookies_test=.*?[^;]*;?/',
371-
'/\s?ct_ps_timestamp=.*?[^;]*;?/',
372-
'/\s?ct_fkp_timestamp=\d*?[^;]*;?/',
373-
'/\s?ct_sfw_pass_key=\d*?[^;]*;?/',
374-
'/\s?apbct_page_hits=\d*?[^;]*;?/',
375-
'/\s?apbct_visible_fields_count=\d*?[^;]*;?/',
376-
'/\s?apbct_visible_fields=%7B.*%7D[^;]*;?/',
377-
), '', $ct_tmp[$cookie_name]);
378-
$msg->all_headers = $ct_tmp;
358+
359+
if (isset($ct_tmp[$cookie_name]))
360+
{
361+
$ct_tmp[$cookie_name] = preg_replace(array(
362+
'/\s?ct_checkjs=[a-z0-9]*[^;]*;?/',
363+
'/\s?ct_timezone=.{0,1}\d{1,2}[^;]*;?/',
364+
'/\s?ct_pointer_data=.*5D[^;]*;?/',
365+
'/\s?apbct_timestamp=\d*[^;]*;?/',
366+
'/\s?apbct_site_landing_ts=\d*[^;]*;?/',
367+
'/\s?apbct_cookies_test=%7B.*%7D[^;]*;?/',
368+
'/\s?apbct_prev_referer=http.*?[^;]*;?/',
369+
'/\s?ct_cookies_test=.*?[^;]*;?/',
370+
'/\s?ct_ps_timestamp=.*?[^;]*;?/',
371+
'/\s?ct_fkp_timestamp=\d*?[^;]*;?/',
372+
'/\s?ct_sfw_pass_key=\d*?[^;]*;?/',
373+
'/\s?apbct_page_hits=\d*?[^;]*;?/',
374+
'/\s?apbct_visible_fields_count=\d*?[^;]*;?/',
375+
'/\s?apbct_visible_fields=%7B.*%7D[^;]*;?/',
376+
), '', $ct_tmp[$cookie_name]);
377+
$msg->all_headers = $ct_tmp;
378+
}
379379
}
380380

381381
$msg->all_headers = json_encode($msg->all_headers);

0 commit comments

Comments
 (0)