From 06d73554be4aedf7ee832f2c4db1379ec2a471e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 4 Nov 2013 11:39:48 +0100 Subject: [PATCH 1/2] // preg instead strpos --- classes/controller/FrontController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 1884cccf0..cbe40be65 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -919,7 +919,7 @@ class FrontControllerCore extends Controller $ips = array_map('trim', $ips); if (is_array($ips) && count($ips)) foreach ($ips as $ip) - if (!empty($ip) && strpos($user_ip, $ip) === 0) + if (!empty($ip) && preg_match('/^'.$ip.'.*/', $user_ip)) $allowed = true; return $allowed; } From b3c54a59dd1d70c1038246ac4f82d13548f54d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 4 Nov 2013 11:48:30 +0100 Subject: [PATCH 2/2] // typo --- classes/controller/FrontController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index cbe40be65..14c85c0ec 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -850,7 +850,7 @@ class FrontControllerCore extends Controller if (!is_numeric(Tools::getValue('p', 1)) || Tools::getValue('p', 1) < 0) Tools::redirect(self::$link->getPaginationLink(false, false, $this->n, false, 1, false)); - $current_url = tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']); + $current_url = Tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']); //delete parameter page $current_url = preg_replace('/(\?)?(&)?p=\d+/', '$1', $current_url);