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

[-] MO : #PSCFV-2357 - Fix bug with error displaying

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15367 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-05-18 09:37:39 +00:00
parent 7670c2d207
commit 5eb050b89c
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/themeinstallator/themeinstallator.php
+15 -15
View File
@@ -202,7 +202,7 @@ class ThemeInstallator extends Module
$this->to_enable = false; $this->to_enable = false;
$this->to_disable = false; $this->to_disable = false;
$this->to_install = false; $this->to_install = false;
$this->errors = false; $this->errors = array();
if ($this->page == 'exportPage' && Tools::isSubmit('exportTheme') && ($id_theme = Tools::getValue('mainTheme'))) if ($this->page == 'exportPage' && Tools::isSubmit('exportTheme') && ($id_theme = Tools::getValue('mainTheme')))
{ {
$theme = new Theme($id_theme); $theme = new Theme($id_theme);
@@ -219,24 +219,24 @@ class ThemeInstallator extends Module
if (Tools::isSubmit('submitImport1')) if (Tools::isSubmit('submitImport1'))
{ {
if ($_FILES['themearchive']['error'] || !file_exists($_FILES['themearchive']['tmp_name'])) if ($_FILES['themearchive']['error'] || !file_exists($_FILES['themearchive']['tmp_name']))
$this->errors .= parent::displayError($this->l('An error has occurred during the file upload.')); $this->errors[] = parent::displayError($this->l('An error has occurred during the file upload.'));
else if (substr($_FILES['themearchive']['name'], -4) != '.zip') else if (substr($_FILES['themearchive']['name'], -4) != '.zip')
$this->errors .= parent::displayError($this->l('Only zip files are allowed')); $this->errors[] = parent::displayError($this->l('Only zip files are allowed'));
else if (!rename($_FILES['themearchive']['tmp_name'], ARCHIVE_NAME)) else if (!rename($_FILES['themearchive']['tmp_name'], ARCHIVE_NAME))
$this->errors .= parent::displayError($this->l('An error has occurred during the file copy.')); $this->errors[] = parent::displayError($this->l('An error has occurred during the file copy.'));
else if (Tools::ZipTest(ARCHIVE_NAME)) else if (Tools::ZipTest(ARCHIVE_NAME))
$this->page = 2; $this->page = 2;
else else
$this->errors .= parent::displayError($this->l('Zip file seems to be broken')); $this->errors[] = parent::displayError($this->l('Zip file seems to be broken'));
} }
else if (Tools::isSubmit('submitImport2')) else if (Tools::isSubmit('submitImport2'))
{ {
if (!Validate::isModuleUrl($url = Tools::getValue('linkurl'), $this->errors)) if (!Validate::isModuleUrl($url = Tools::getValue('linkurl'), $tmp)) // $tmp is not used, because we don't care about the error output of isModuleUrl
$this->errors .= parent::displayError($this->l('Only zip files are allowed')); $this->errors[] = parent::displayError($this->l('Only zip files are allowed'));
else if (!copy($url, ARCHIVE_NAME)) else if (!copy($url, ARCHIVE_NAME))
$this->errors .= parent::displayError($this->l('Error during the file download')); $this->errors[] = parent::displayError($this->l('Error during the file download'));
else if (Tools::ZipTest(ARCHIVE_NAME)) else if (Tools::ZipTest(ARCHIVE_NAME))
$this->errors .= parent::displayError($this->l('Zip file seems to be broken')); $this->errors[] = parent::displayError($this->l('Zip file seems to be broken'));
else else
$this->page = 2; $this->page = 2;
} }
@@ -244,13 +244,13 @@ class ThemeInstallator extends Module
{ {
$filename = _IMPORT_FOLDER_.Tools::getValue('ArchiveName'); $filename = _IMPORT_FOLDER_.Tools::getValue('ArchiveName');
if (substr($filename, -4) != '.zip') if (substr($filename, -4) != '.zip')
$this->errors .= parent::displayError($this->l('Only zip files are allowed')); $this->errors[] = parent::displayError($this->l('Only zip files are allowed'));
else if (!copy($filename, ARCHIVE_NAME)) else if (!copy($filename, ARCHIVE_NAME))
$this->errors .= parent::displayError($this->l('An error has occurred during the file copy.')); $this->errors[] = parent::displayError($this->l('An error has occurred during the file copy.'));
else if (Tools::ZipTest(ARCHIVE_NAME)) else if (Tools::ZipTest(ARCHIVE_NAME))
$this->page = 2; $this->page = 2;
else else
$this->errors .= parent::displayError($this->l('Zip file seems to be broken')); $this->errors[] = parent::displayError($this->l('Zip file seems to be broken'));
} }
else if (Tools::isSubmit('prevThemes')) else if (Tools::isSubmit('prevThemes'))
$this->page = 2; $this->page = 2;
@@ -262,7 +262,7 @@ class ThemeInstallator extends Module
{ {
if (!Tools::ZipExtract(ARCHIVE_NAME, _IMPORT_FOLDER_)) if (!Tools::ZipExtract(ARCHIVE_NAME, _IMPORT_FOLDER_))
{ {
$this->errors .= parent::displayError($this->l('Error during zip extraction')); $this->errors[] = parent::displayError($this->l('Error during zip extraction'));
$this->page = 1; $this->page = 1;
} }
} }
@@ -272,7 +272,7 @@ class ThemeInstallator extends Module
{ {
if (!self::checkXmlFields()) if (!self::checkXmlFields())
{ {
$this->errors .= parent::displayError($this->l('Bad configuration file')); $this->errors[] = parent::displayError($this->l('Bad configuration file'));
$this->page = 1; $this->page = 1;
} }
else else
@@ -353,7 +353,7 @@ class ThemeInstallator extends Module
self::_displayForm4(); self::_displayForm4();
break; break;
} }
return $this->errors.$this->_msg.$this->_html; return join($this->errors, '').$this->_msg.$this->_html;
} }
/* /*