From e19831ba78427a609ca1e8c3e0a4e91c6efde8ca Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Wed, 3 Oct 2012 16:22:09 +0000
Subject: [PATCH] // Fixed issue with refresh of
 default_country_modules_list.xml

---
 classes/controller/AdminController.php            | 5 ++---
 controllers/admin/AdminAccessController.php       | 5 ++++-
 controllers/admin/AdminAttachmentsController.php  | 3 +--
 controllers/admin/AdminLocalizationController.php | 4 ++++
 controllers/admin/AdminLoginController.php        | 7 +++----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 50bb6d82c..426f87266 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -2723,13 +2723,13 @@ class AdminControllerCore extends Controller
 		{
 			// Define protocol accepted and post data values for this request
 			$protocolsList = array('https://' => 443, 'http://' => 80);
-			$postData = 'version='._PS_VERSION_.'&method=listing&action=native&iso_code='.strtolower(Configuration::get('PS_LOCALE_COUNTRY')).'&iso_lang='.strtolower(Context::getContext()->language->iso_code);
+			$postData = 'version='._PS_VERSION_.'&method=listing&action=native&iso_code='.strtolower(Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT'))).'&iso_lang='.strtolower(Context::getContext()->language->iso_code);
 		}
 		if ($request == 'must-have')
 		{
 			// Define protocol accepted and post data values for this request
 			$protocolsList = array('https://' => 443, 'http://' => 80);
-			$postData = 'version='._PS_VERSION_.'&method=listing&action=must-have&iso_code='.strtolower(Configuration::get('PS_LOCALE_COUNTRY')).'&iso_lang='.strtolower(Context::getContext()->language->iso_code);
+			$postData = 'version='._PS_VERSION_.'&method=listing&action=must-have&iso_code='.strtolower(Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT'))).'&iso_lang='.strtolower(Context::getContext()->language->iso_code);
 		}
 		if ($request == 'customer')
 		{
@@ -2758,7 +2758,6 @@ class AdminControllerCore extends Controller
 			}
 		}
 
-
 		// Make the request
 		$opts = array(
 			'http'=>array(
diff --git a/controllers/admin/AdminAccessController.php b/controllers/admin/AdminAccessController.php
index 1d35b9905..ca3ab9ccb 100644
--- a/controllers/admin/AdminAccessController.php
+++ b/controllers/admin/AdminAccessController.php
@@ -132,6 +132,8 @@ class AdminAccessControllerCore extends AdminController
 
 	public function ajaxProcessUpdateAccess()
 	{
+		if (_PS_MODE_DEMO_)
+			throw new PrestaShopException(Tools::displayError('This functionality has been disabled.'));
 		if ($this->tabAccess['edit'] != '1')
 			throw new PrestaShopException(Tools::displayError('You do not have permission to edit here.'));
 
@@ -190,9 +192,10 @@ class AdminAccessControllerCore extends AdminController
 
 	public function ajaxProcessUpdateModuleAccess()
 	{
+		if (_PS_MODE_DEMO_)
+			throw new PrestaShopException(Tools::displayError('This functionality has been disabled.'));
 		if ($this->tabAccess['edit'] != '1')
 			throw new PrestaShopException(Tools::displayError('You do not have permission to edit here.'));
-			/* Update Access Modules */
 
 		if (Tools::isSubmit('changeModuleAccess'))
 		{
diff --git a/controllers/admin/AdminAttachmentsController.php b/controllers/admin/AdminAttachmentsController.php
index 328d2bf4a..a3fb55996 100644
--- a/controllers/admin/AdminAttachmentsController.php
+++ b/controllers/admin/AdminAttachmentsController.php
@@ -126,13 +126,12 @@ class AdminAttachmentsControllerCore extends AdminController
 
 	public function postProcess()
 	{
-		/* PrestaShop demo mode */
 		if (_PS_MODE_DEMO_)
 		{
 			$this->errors[] = Tools::displayError('This functionality has been disabled.');
 			return;
 		}
-		/* PrestaShop demo mode*/
+
 		if (Tools::isSubmit('submitAdd'.$this->table))
 		{
 			$id = (int)Tools::getValue('id_attachment');
diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php
index a798d0fbd..47c639be1 100644
--- a/controllers/admin/AdminLocalizationController.php
+++ b/controllers/admin/AdminLocalizationController.php
@@ -174,6 +174,10 @@ class AdminLocalizationControllerCore extends AdminController
 			}
 		}
 
+		// Remove the module list cache if the default country changed
+		if (Tools::isSubmit('submitOptionsconfiguration') && file_exists(Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST))
+			@unlink(Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST);			
+		
 		parent::postProcess();
 	}
 
diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php
index b2cb3a153..844af77a6 100755
--- a/controllers/admin/AdminLoginController.php
+++ b/controllers/admin/AdminLoginController.php
@@ -185,8 +185,9 @@ class AdminLoginControllerCore extends AdminController
 	
 	public function processForgot()
 	{
-		$email = trim(Tools::getValue('email_forgot'));
-		if (empty($email))
+		if (_PS_MODE_DEMO_)
+			$this->errors[] = Tools::displayError('This functionality has been disabled.');
+		elseif (!($email = trim(Tools::getValue('email_forgot'))))
 			$this->errors[] = Tools::displayError('E-mail is empty');
 		elseif (!Validate::isEmail($email))
 			$this->errors[] = Tools::displayError('Invalid e-mail address');
@@ -201,8 +202,6 @@ class AdminLoginControllerCore extends AdminController
 					Configuration::get('PS_PASSWD_TIME_BACK')
 				);
 		}
-		if (_PS_MODE_DEMO_)
-			$this->errors[] = Tools::displayError('This functionality has been disabled.');
 
 		if (!count($this->errors))
 		{