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

// Fixed issue with refresh of default_country_modules_list.xml

Browse Source
This commit is contained in:
dMetzger
2012-10-03 16:22:09 +00:00
parent b89c8f0966
commit e19831ba78
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+2 -3
View File
@@ -2723,13 +2723,13 @@ class AdminControllerCore extends Controller
{ {
// Define protocol accepted and post data values for this request // Define protocol accepted and post data values for this request
$protocolsList = array('https://' => 443, 'http://' => 80); $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') if ($request == 'must-have')
{ {
// Define protocol accepted and post data values for this request // Define protocol accepted and post data values for this request
$protocolsList = array('https://' => 443, 'http://' => 80); $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') if ($request == 'customer')
{ {
@@ -2758,7 +2758,6 @@ class AdminControllerCore extends Controller
} }
} }
// Make the request // Make the request
$opts = array( $opts = array(
'http'=>array( 'http'=>array(
controllers/admin/AdminAccessController.php
+4 -1
View File
@@ -132,6 +132,8 @@ class AdminAccessControllerCore extends AdminController
public function ajaxProcessUpdateAccess() public function ajaxProcessUpdateAccess()
{ {
if (_PS_MODE_DEMO_)
throw new PrestaShopException(Tools::displayError('This functionality has been disabled.'));
if ($this->tabAccess['edit'] != '1') if ($this->tabAccess['edit'] != '1')
throw new PrestaShopException(Tools::displayError('You do not have permission to edit here.')); throw new PrestaShopException(Tools::displayError('You do not have permission to edit here.'));
@@ -190,9 +192,10 @@ class AdminAccessControllerCore extends AdminController
public function ajaxProcessUpdateModuleAccess() public function ajaxProcessUpdateModuleAccess()
{ {
if (_PS_MODE_DEMO_)
throw new PrestaShopException(Tools::displayError('This functionality has been disabled.'));
if ($this->tabAccess['edit'] != '1') if ($this->tabAccess['edit'] != '1')
throw new PrestaShopException(Tools::displayError('You do not have permission to edit here.')); throw new PrestaShopException(Tools::displayError('You do not have permission to edit here.'));
/* Update Access Modules */
if (Tools::isSubmit('changeModuleAccess')) if (Tools::isSubmit('changeModuleAccess'))
{ {
controllers/admin/AdminAttachmentsController.php
+1 -2
View File
@@ -126,13 +126,12 @@ class AdminAttachmentsControllerCore extends AdminController
public function postProcess() public function postProcess()
{ {
/* PrestaShop demo mode */
if (_PS_MODE_DEMO_) if (_PS_MODE_DEMO_)
{ {
$this->errors[] = Tools::displayError('This functionality has been disabled.'); $this->errors[] = Tools::displayError('This functionality has been disabled.');
return; return;
} }
/* PrestaShop demo mode*/
if (Tools::isSubmit('submitAdd'.$this->table)) if (Tools::isSubmit('submitAdd'.$this->table))
{ {
$id = (int)Tools::getValue('id_attachment'); $id = (int)Tools::getValue('id_attachment');
controllers/admin/AdminLocalizationController.php
+4
View File
@@ -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(); parent::postProcess();
} }
controllers/admin/AdminLoginController.php
+3 -4
View File
@@ -185,8 +185,9 @@ class AdminLoginControllerCore extends AdminController
public function processForgot() public function processForgot()
{ {
$email = trim(Tools::getValue('email_forgot')); if (_PS_MODE_DEMO_)
if (empty($email)) $this->errors[] = Tools::displayError('This functionality has been disabled.');
elseif (!($email = trim(Tools::getValue('email_forgot'))))
$this->errors[] = Tools::displayError('E-mail is empty'); $this->errors[] = Tools::displayError('E-mail is empty');
elseif (!Validate::isEmail($email)) elseif (!Validate::isEmail($email))
$this->errors[] = Tools::displayError('Invalid e-mail address'); $this->errors[] = Tools::displayError('Invalid e-mail address');
@@ -201,8 +202,6 @@ class AdminLoginControllerCore extends AdminController
Configuration::get('PS_PASSWD_TIME_BACK') Configuration::get('PS_PASSWD_TIME_BACK')
); );
} }
if (_PS_MODE_DEMO_)
$this->errors[] = Tools::displayError('This functionality has been disabled.');
if (!count($this->errors)) if (!count($this->errors))
{ {