Skip to content
Snippets Groups Projects
Commit 46f06115 authored by Davide's avatar Davide
Browse files

fixed cookie numeration

parent b4805be8
No related branches found
No related tags found
5 merge requests!1730Development,!1724Development,!1723Development,!1712Development,!1701Resolve "settings for blacklisting pages"
......@@ -290,7 +290,7 @@ class SettingsController extends Controller
$blacklist = substr($blacklist, 0, stripos($blacklist, '/'));
}
$regexUrl = '#^(\*\.)?[a-z0-9]+(\.[a-z0-9]{2,})+$#';
$regexUrl = '#^(\*\.)?[a-z0-9]+(\.[a-z0-9]+)?(\.[a-z0-9]{2,})$#';
if(preg_match($regexUrl, $blacklist) === 1){
$path = \Request::path();
......@@ -299,19 +299,23 @@ class SettingsController extends Controller
$cookieCounter = 0;
$noduplicate = true;
ksort($cookies);
if(!empty($cookies)){
foreach ($cookies as $key => $value) {
if(stripos($key, $fokus.'_blpage') === 0 && $value == $blacklist){
$noduplicate = false;
break;
}
if(stripos($key, $fokus.'_blpage') === 0) {
$cookieCounter++;
if(stripos($key, $fokus . '_blpage') === 0){
if($value === $blacklist){
$noduplicate = false;
break;
}
if((int)(substr($key,strlen($fokus . '_blpage'))) === $cookieCounter){
$cookieCounter++;
}
}
}
}
if($noduplicate && !empty($cookie) && strlen($cookie) <= 255){
$cookieName= $fokus . '_blpage' . $cookieCounter;
if($noduplicate && !empty($blacklist) > 0 && strlen($blacklist) <= 255){
$cookieName= $fokus.'_blpage'.$cookieCounter;
Cookie::queue($cookieName, $blacklist, 0, $cookiePath, null, false, false);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment