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

// Context part 29

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7935 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-08-08 13:17:12 +00:00
parent 89cc9649cf
commit 653ef8d115
40 changed files with 195 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/themeinstallator/themeinstallator.php
+5 -13
View File
@@ -162,8 +162,6 @@ class ThemeInstallator extends Module
private function init_defines()
{
global $cookie;
define('_EXPORT_FOLDER_', dirname(__FILE__).'/export/');
define('_IMPORT_FOLDER_', dirname(__FILE__).'/import/');
$this->page = 1;
@@ -623,9 +621,7 @@ class ThemeInstallator extends Module
private function _displayForm2()
{
global $cookie;
$iso = Language::getIsoById((int)($cookie->id_lang));
$iso = $this->context->language->iso_code;
$xml = simplexml_load_file(_IMPORT_FOLDER_.XMLFILENAME);
$this->xml = $xml;
$res = $xml->xpath('/theme/descriptions/description[@iso="'.$iso.'"]');
@@ -1145,10 +1141,8 @@ class ThemeInstallator extends Module
private function AuthorInformationForm()
{
global $cookie;
$employee = new Employee((int)$cookie->id_employee);
$mail = Tools::getValue('email') ? Tools::htmlentitiesUTF8(Tools::getValue('email')) : Tools::htmlentitiesUTF8($cookie->email);
$employee = $this->context->employee;
$mail = Tools::getValue('email') ? Tools::htmlentitiesUTF8(Tools::getValue('email')) : Tools::htmlentitiesUTF8($employee->email);
$author = Tools::getValue('author_name') ? Tools::htmlentitiesUTF8(Tools::getValue('author_name')) : Tools::htmlentitiesUTF8(($employee->firstname).' '.$employee->lastname);
$website = Tools::getValue('website') ? Tools::htmlentitiesUTF8(Tools::getValue('website')) : Tools::getHttpHost(true);
@@ -1173,11 +1167,9 @@ class ThemeInstallator extends Module
private function ThemeInformationForm()
{
global $cookie;
$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
$defaultLanguage = (int)$this->context->language->id;
$languages = Language::getLanguages();
$iso = Language::getIsoById((int)($cookie->id_lang));
$iso = $this->context->language->iso_code;
$divLangName = 'title';
$val = Tools::getValue('theme_name') ? Tools::getValue('theme_name') : Tools::getValue('mainTheme');