diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index 125a0973a..66e6b3276 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -79,8 +79,6 @@ if (Tools::isSubmit('getAvailableFields') AND Tools::isSubmit('entity')) $jsonArray = array(); $import = new AdminImportController(); - $languages = Language::getLanguages(false); - $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); $fields = $import->getAvailableFields(true); foreach ($fields AS $field) $jsonArray[] = '{"field":"'.addslashes($field).'"}'; diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl index 8962eeefa..b5827cb45 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl @@ -54,6 +54,6 @@ name: '{$language.name|escape:'quotes'}' }; {/foreach} - displayFlags(languages, {$defaultLanguage}); + displayFlags(languages, {$id_lang_default}); \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl index 7c93fd4a6..7b71c6788 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl @@ -5,7 +5,7 @@
{foreach from=$languages item=language} -
+
*
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl index 74742ddc1..f779309f0 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl @@ -83,7 +83,7 @@ - '; + '; else { $content .= ' @@ -119,7 +119,7 @@ class Blockcustomerprivacy extends Module convert_urls : false, language : "'.(file_exists(_PS_ROOT_DIR_.'/js/tinymce/jscripts/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en').'" }); - id_language = Number('.$defaultLanguage.'); + id_language = Number('.$id_lang_default.'); '; } @@ -132,10 +132,10 @@ class Blockcustomerprivacy extends Module
'; foreach ($languages as $language) $content .= ' -
+
'; - $content .= $this->displayFlags($languages, $defaultLanguage, 'ccont', 'ccont', true).' + $content .= $this->displayFlags($languages, $id_lang_default, 'ccont', 'ccont', true).'

diff --git a/modules/blocklink/blocklink.php b/modules/blocklink/blocklink.php index ada9d4e2e..0bc6b8f31 100644 --- a/modules/blocklink/blocklink.php +++ b/modules/blocklink/blocklink.php @@ -149,7 +149,7 @@ class BlockLink extends Module { if (!($languages = Language::getLanguages())) return false; - $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); + $id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT'); if ($id_link = Tools::getValue('id_link')) { @@ -165,7 +165,7 @@ class BlockLink extends Module return false; } else - if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)$id_link.', '.$language['id_lang'].', \''.pSQL($_POST['text_'.$defaultLanguage]).'\')')) + if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)$id_link.', '.$language['id_lang'].', \''.pSQL($_POST['text_'.$id_lang_default]).'\')')) return false; } else @@ -183,7 +183,7 @@ class BlockLink extends Module return false; } else - if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)$id_link.', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$defaultLanguage]).'\')')) + if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)$id_link.', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$id_lang_default]).'\')')) return false; } @@ -289,7 +289,7 @@ class BlockLink extends Module private function _displayForm() { /* Language */ - $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); + $id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT'); $languages = Language::getLanguages(false); $divLangName = 'text¤title'; /* Title */ @@ -314,7 +314,7 @@ class BlockLink extends Module } $this->_html .= '

'.$this->l('Add a new link').' @@ -324,10 +324,10 @@ class BlockLink extends Module
'; foreach ($languages as $language) $this->_html .= ' -
+
*
'; - $this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'text', true); + $this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'text', true); $this->_html .= '
@@ -358,10 +358,10 @@ class BlockLink extends Module
'; foreach ($languages as $language) $this->_html .= ' -
+
*
'; - $this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'title', true); + $this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'title', true); $this->_html .= '
diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php index 69d1d7ea4..c0a3c7e38 100644 --- a/modules/homeslider/homeslider.php +++ b/modules/homeslider/homeslider.php @@ -309,10 +309,10 @@ class HomeSlider extends Module $this->adminDisplayWarning(sprintf($this->l('modules %s must be writable (CHMOD 755 / 777)'), $this->name)); /* Gets languages and sets which div requires translations */ - $defaultLanguage = (int)Configuration::get('PS_LANG_DEFAULT'); + $id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT'); $languages = Language::getLanguages(false); $divLangName = 'image¤title¤url¤legend¤description'; - $this->_html .= ''; + $this->_html .= ''; /* Form */ $this->_html .= '
'; @@ -326,7 +326,7 @@ class HomeSlider extends Module $this->_html .= '
'; foreach ($languages as $language) { - $this->_html .= '
'; + $this->_html .= '
'; $this->_html .= ''; /* Sets image as hidden in case it does not change */ if ($slide && $slide->image[$language['id_lang']]) @@ -336,7 +336,7 @@ class HomeSlider extends Module $this->_html .= ''; $this->_html .= '
'; } - $this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'image', true); + $this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'image', true); /* End Fieldset Upload */ $this->_html .= '


'; @@ -358,11 +358,11 @@ class HomeSlider extends Module foreach ($languages as $language) { $this->_html .= ' -
+
'; } - $this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'title', true); + $this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'title', true); $this->_html .= '


'; /* URL */ @@ -370,11 +370,11 @@ class HomeSlider extends Module foreach ($languages as $language) { $this->_html .= ' -
+
'; } - $this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'url', true); + $this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'url', true); $this->_html .= '


'; /* Legend */ @@ -382,11 +382,11 @@ class HomeSlider extends Module foreach ($languages as $language) { $this->_html .= ' -
+
'; } - $this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'legend', true); + $this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'legend', true); $this->_html .= '


'; /* Description */ @@ -395,11 +395,11 @@ class HomeSlider extends Module
'; foreach ($languages as $language) { - $this->_html .= '
+ $this->_html .= '
'; } - $this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'description', true); + $this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'description', true); $this->_html .= '

'; /* Active */ @@ -481,16 +481,16 @@ class HomeSlider extends Module } /* Checks title/url/legend/description for default lang */ - $defaultLanguage = (int)Configuration::get('PS_LANG_DEFAULT'); - if (strlen(Tools::getValue('title_'.$defaultLanguage)) == 0) + $id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT'); + if (strlen(Tools::getValue('title_'.$id_lang_default)) == 0) $errors[] = $this->l('Title is not set'); - if (strlen(Tools::getValue('legend_'.$defaultLanguage)) == 0) + if (strlen(Tools::getValue('legend_'.$id_lang_default)) == 0) $errors[] = $this->l('Legend is not set'); - if (strlen(Tools::getValue('url_'.$defaultLanguage)) == 0) + if (strlen(Tools::getValue('url_'.$id_lang_default)) == 0) $errors[] = $this->l('URL is not set'); - if (!isset($_FILES['image_'.$defaultLanguage]) || empty($_FILES['image_'.$defaultLanguage]['tmp_name'])) + if (!isset($_FILES['image_'.$id_lang_default]) || empty($_FILES['image_'.$id_lang_default]['tmp_name'])) $errors[] = $this->l('Image is not set'); - if (Tools::getValue('image_old_'.$defaultLanguage) && !Validate::isFileName(Tools::getValue('image_old_'.$defaultLanguage))) + if (Tools::getValue('image_old_'.$id_lang_default) && !Validate::isFileName(Tools::getValue('image_old_'.$id_lang_default))) $errors[] = $this->l('Image is not set'); } /* Validation for deletion */ elseif (Tools::isSubmit('delete_id_slide') && (!Validate::isInt(Tools::getValue('delete_id_slide')) || !$this->slideExists((int)Tools::getValue('delete_id_slide')))) diff --git a/modules/loyalty/loyalty.php b/modules/loyalty/loyalty.php index 07147551d..137d79d5f 100644 --- a/modules/loyalty/loyalty.php +++ b/modules/loyalty/loyalty.php @@ -169,7 +169,7 @@ class Loyalty extends Module { if (Tools::isSubmit('submitLoyalty')) { - $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); + $id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT'); $languages = Language::getLanguages(); $this->_errors = array(); @@ -196,28 +196,28 @@ class Loyalty extends Module $this->loyaltyStateConvert->name[(int)($language['id_lang'])] = Tools::getValue('convert_loyalty_state_'.(int)($language['id_lang'])); $this->loyaltyStateNoneAward->name[(int)($language['id_lang'])] = Tools::getValue('none_award_loyalty_state_'.(int)($language['id_lang'])); } - if (empty($arrayVoucherDetails[$defaultLanguage])) - $arrayVoucherDetails[$defaultLanguage] = ' '; + if (empty($arrayVoucherDetails[$id_lang_default])) + $arrayVoucherDetails[$id_lang_default] = ' '; Configuration::updateValue('PS_LOYALTY_VOUCHER_DETAILS', $arrayVoucherDetails); - if (empty($this->loyaltyStateDefault->name[$defaultLanguage])) - $this->loyaltyStateDefault->name[$defaultLanguage] = ' '; + if (empty($this->loyaltyStateDefault->name[$id_lang_default])) + $this->loyaltyStateDefault->name[$id_lang_default] = ' '; $this->loyaltyStateDefault->save(); - if (empty($this->loyaltyStateValidation->name[$defaultLanguage])) - $this->loyaltyStateValidation->name[$defaultLanguage] = ' '; + if (empty($this->loyaltyStateValidation->name[$id_lang_default])) + $this->loyaltyStateValidation->name[$id_lang_default] = ' '; $this->loyaltyStateValidation->save(); - if (empty($this->loyaltyStateCancel->name[$defaultLanguage])) - $this->loyaltyStateCancel->name[$defaultLanguage] = ' '; + if (empty($this->loyaltyStateCancel->name[$id_lang_default])) + $this->loyaltyStateCancel->name[$id_lang_default] = ' '; $this->loyaltyStateCancel->save(); - if (empty($this->loyaltyStateConvert->name[$defaultLanguage])) - $this->loyaltyStateConvert->name[$defaultLanguage] = ' '; + if (empty($this->loyaltyStateConvert->name[$id_lang_default])) + $this->loyaltyStateConvert->name[$id_lang_default] = ' '; $this->loyaltyStateConvert->save(); - if (empty($this->loyaltyStateNoneAward->name[$defaultLanguage])) - $this->loyaltyStateNoneAward->name[$defaultLanguage] = ' '; + if (empty($this->loyaltyStateNoneAward->name[$id_lang_default])) + $this->loyaltyStateNoneAward->name[$id_lang_default] = ' '; $this->loyaltyStateNoneAward->save(); echo $this->displayConfirmation($this->l('Settings updated.')); @@ -249,13 +249,13 @@ class Loyalty extends Module $order_states = OrderState::getOrderStates($this->context->language->id); $currency = new Currency((int)(Configuration::get('PS_CURRENCY_DEFAULT'))); - $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); + $id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT'); $languages = Language::getLanguages(false); $languageIds = 'voucher_details¤default_loyalty_state¤none_award_loyalty_state¤convert_loyalty_state¤validation_loyalty_state¤cancel_loyalty_state'; $html = '

'.$this->l('Loyalty Program').'

@@ -276,10 +276,10 @@ class Loyalty extends Module
'; foreach ($languages as $language) $html .= ' -
+
'; - $html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'voucher_details', true); + $html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'voucher_details', true); $html .= '
@@ -335,50 +335,50 @@ class Loyalty extends Module
'; foreach ($languages as $language) $html .= ' -
- +
+
'; - $html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'default_loyalty_state', true); + $html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'default_loyalty_state', true); $html .= '
'; foreach ($languages as $language) $html .= ' -
- +
+
'; - $html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'none_award_loyalty_state', true); + $html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'none_award_loyalty_state', true); $html .= '
'; foreach ($languages as $language) $html .= ' -
- +
+
'; - $html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'convert_loyalty_state', true); + $html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'convert_loyalty_state', true); $html .= '
'; foreach ($languages as $language) $html .= ' -
- +
+
'; - $html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'validation_loyalty_state', true); + $html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'validation_loyalty_state', true); $html .= '
'; foreach ($languages as $language) $html .= ' -
- +
+
'; - $html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'cancel_loyalty_state', true); + $html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'cancel_loyalty_state', true); $html .= '
diff --git a/modules/referralprogram/referralprogram.php b/modules/referralprogram/referralprogram.php index 5f7fb65e2..337fb4ced 100644 --- a/modules/referralprogram/referralprogram.php +++ b/modules/referralprogram/referralprogram.php @@ -290,15 +290,15 @@ class ReferralProgram extends Module

'; - $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); + $id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT'); $languages = Language::getLanguages(true); foreach ($languages AS $language) $this->_html .= ' -
+
'; - $this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'dd', true); + $this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'dd', true); $this->_html .= '

@@ -309,7 +309,6 @@ class ReferralProgram extends Module private function _displayFormRules() { // Languages preliminaries - $defaultLanguage = $this->context->language->id; $languages = Language::getLanguages(); $iso = $this->context->language->iso_code; $divLangName = 'cpara¤dd'; @@ -331,18 +330,18 @@ class ReferralProgram extends Module - +
'.$this->l('Conditions of the referral program').''; foreach ($languages AS $language) { $this->_html .= ' -
+
'; } - $this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'cpara', true); + $this->_html .= $this->displayFlags($languages, $this->context->language->id, $divLangName, 'cpara', true); $this->_html .= '