dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix #PSCFV-4090

Browse Source
This commit is contained in:
rGaillard
2012-09-17 08:41:26 +00:00
parent 79b7ea4cb8
commit f4060aadcf
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+8 -3
View File
@@ -708,9 +708,9 @@ class FrontControllerCore extends Controller
$this->context->cookie->id_currency = (int)(Currency::getCurrencyInstance($default_country->id_currency ? (int)$default_country->id_currency : Configuration::get('PS_CURRENCY_DEFAULT'))->id); $this->context->cookie->id_currency = (int)(Currency::getCurrencyInstance($default_country->id_currency ? (int)$default_country->id_currency : Configuration::get('PS_CURRENCY_DEFAULT'))->id);
return $default_country; return $default_country;
} }
elseif (Configuration::get('PS_GEOLOCATION_NA_BEHAVIOR') == _PS_GEOLOCATION_NO_CATALOG_) elseif (Configuration::get('PS_GEOLOCATION_NA_BEHAVIOR') == _PS_GEOLOCATION_NO_CATALOG_ && !FrontController::isInWhitelistForGeolocation())
$this->restrictedCountry = true; $this->restrictedCountry = true;
elseif (Configuration::get('PS_GEOLOCATION_NA_BEHAVIOR') == _PS_GEOLOCATION_NO_ORDER_) elseif (Configuration::get('PS_GEOLOCATION_NA_BEHAVIOR') == _PS_GEOLOCATION_NO_ORDER_ && !FrontController::isInWhitelistForGeolocation())
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'restricted_country_mode' => true, 'restricted_country_mode' => true,
'geolocation_country' => 'Undefined' 'geolocation_country' => 'Undefined'
@@ -930,7 +930,12 @@ class FrontControllerCore extends Controller
{ {
$allowed = false; $allowed = false;
$userIp = Tools::getRemoteAddr(); $userIp = Tools::getRemoteAddr();
$ips = explode(';', Configuration::get('PS_GEOLOCATION_WHITELIST')); $ips = array();
// retrocompatibility
$ips_old = explode(';', Configuration::get('PS_GEOLOCATION_WHITELIST'));
if (is_array($ips_old) && count($ips_old))
foreach ($ips_old as $ip)
$ips = array_merge($ips, explode("\n", $ip));
if (is_array($ips) && count($ips)) if (is_array($ips) && count($ips))
foreach ($ips as $ip) foreach ($ips as $ip)
if (!empty($ip) && strpos($userIp, $ip) === 0) if (!empty($ip) && strpos($userIp, $ip) === 0)