{l s='PHP Version'}: {$version.php}
-- {l s='MySQL Version'}: {$version.mysql} -
{if $apache_instaweb}{l s='PageSpeed module for Apache installed (mod_instaweb)'}
{/if} + ++ {l s='MySQL Version'}: {$database.version} +
++ {l s='MySQL Engine'}: {$database.engine} +
++ {l s='Tables prefix'}: {$database.prefix} +
php_value upload_max_filesize 20M '.
Tools::displayError('(clic to open Generator tab)').'';
break;
case UPLOAD_ERR_FORM_SIZE:
$this->errors[] = Tools::displayError('The uploaded file exceeds the post_max_size directive in php.ini.
If your server configuration allows it, you may add a directive in your .htaccess, for example:')
- .'php_value post_max_size 20M '.
Tools::displayError('(clic to open Generator tab)').'';
break;
diff --git a/controllers/admin/AdminInformationController.php b/controllers/admin/AdminInformationController.php
index 4288ffd73..5d4985f6a 100644
--- a/controllers/admin/AdminInformationController.php
+++ b/controllers/admin/AdminInformationController.php
@@ -37,11 +37,15 @@ class AdminInformationControllerCore extends AdminController
{
$this->tpl_view_vars = array(
'version' => array(
- 'mysql' => Db::getInstance()->getVersion(),
'php' => phpversion(),
'ps' => _PS_VERSION_,
'server' => $_SERVER['SERVER_SOFTWARE'],
),
+ 'database' => array(
+ 'version' => Db::getInstance()->getVersion(),
+ 'prefix' => _DB_PREFIX_,
+ 'engine' => _MYSQL_ENGINE_,
+ ),
'uname' => function_exists('php_uname') ? php_uname('s').' '.php_uname('v').' '.php_uname('m') : '',
'apache_instaweb' => Tools::apacheModExists('mod_instaweb'),
'shop' => array(
diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php
index d37ee8082..a540da2a3 100644
--- a/controllers/admin/AdminLanguagesController.php
+++ b/controllers/admin/AdminLanguagesController.php
@@ -94,22 +94,6 @@ class AdminLanguagesControllerCore extends AdminController
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->specificConfirmDelete = $this->l('When you delete a language, ALL RELATED TRANSLATIONS IN THE DATABASE WILL BE DELETED, are you sure you want to delete this language?');
- $this->options = array(
- 'general' => array(
- 'title' => $this->l('Languages options'),
- 'fields' => array(
- 'PS_LANG_DEFAULT' => array(
- 'title' => $this->l('Default language:'),
- 'desc' => $this->l('The default language used in shop'),
- 'cast' => 'intval',
- 'type' => 'select',
- 'identifier' => 'id_lang',
- 'list' => Language::getlanguages(false)
- )
- ),
- 'submit' => array()
- )
- );
parent::__construct();
}
@@ -478,13 +462,6 @@ class AdminLanguagesControllerCore extends AdminController
parent::copyFromPost($object, $table);
}
- public function beforeUpdateOptions()
- {
- $lang = new Language((int)Tools::getValue('PS_LANG_DEFAULT'));
- if (!$lang->active)
- $this->errors[] = Tools::displayError('You cannot set this language as default language because it\'s disabled');
- }
-
public function ajaxProcessCheckLangPack()
{
$this->json = true;
diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php
index 55e99127f..12f433dbe 100644
--- a/controllers/admin/AdminLocalizationController.php
+++ b/controllers/admin/AdminLocalizationController.php
@@ -32,7 +32,43 @@ class AdminLocalizationControllerCore extends AdminController
$this->className = 'Configuration';
$this->table = 'configuration';
+ parent::__construct();
+
$this->options = array(
+ 'general' => array(
+ 'title' => $this->l('Configuration'),
+ 'fields' => array(
+ 'PS_LANG_DEFAULT' => array(
+ 'title' => $this->l('Default language:'),
+ 'desc' => $this->l('The default language used in shop'),
+ 'cast' => 'intval',
+ 'type' => 'select',
+ 'identifier' => 'id_lang',
+ 'list' => Language::getlanguages(false)
+ ),
+ 'PS_COUNTRY_DEFAULT' => array(
+ 'title' => $this->l('Default country:'),
+ 'desc' => $this->l('The default country used in shop'),
+ 'cast' => 'intval',
+ 'type' => 'select',
+ 'identifier' => 'id_country',
+ 'list' => Country::getCountries($this->context->language->id)
+ ),
+ 'PS_CURRENCY_DEFAULT' => array(
+ 'title' => $this->l('Default currency:'),
+ 'desc' =>
+ $this->l('The default currency used in shop')
+ .'