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

[*] Project: MySQL::trytoconnect() and MySQL::tryUTF8() methods replaced with Db::checkConnection() and Db::checkEncoding()

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8380 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-07 08:16:43 +00:00
parent 0c7d567451
commit 174947be5b
5 changed files with 151 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminDb.php
+15 -4
View File
@@ -1,4 +1,4 @@
<?php
*<?php
/*
* 2007-2011 PrestaShop
*
@@ -70,8 +70,20 @@ class AdminDb extends AdminPreferences
foreach ($this->optionsList['database']['fields'] as $k => $data)
if ($value = Tools::getValue($k))
$settings['_'.Tools::strtoupper($k).'_'] = $value;
rewriteSettingsFile(NULL, NULL, $settings);
Tools::redirectAdmin(self::$currentIndex.'&conf=6'.'&token='.$this->token);
if (Db::checkConnection(
isset($settings['_DB_SERVER_']) ? $settings['_DB_SERVER_'] : _DB_SERVER_,
isset($settings['_DB_USER_']) ? $settings['_DB_USER_'] : _DB_USER_,
isset($settings['_DB_PASSWD_']) ? $settings['_DB_PASSWD_'] : _DB_PASSWD_,
isset($settings['_DB_NAME_']) ? $settings['_DB_NAME_'] : _DB_NAME_,
true
) == 0)
{
rewriteSettingsFile(NULL, NULL, $settings);
Tools::redirectAdmin(self::$currentIndex.'&conf=6'.'&token='.$this->token);
}
else
$this->_errors[] = Tools::displayError('Unable to connect to a database with these identifiers.');
}
}
else
@@ -94,7 +106,6 @@ class AdminDb extends AdminPreferences
$engineType = pSQL(Tools::getValue('engineType'));
/* Datas are not saved in database but in config/settings.inc.php */
// @todo add a Db::trytoconnect()
$settings = array('_MYSQL_ENGINE_' => $engineType);
rewriteSettingsFile(NULL, NULL, $settings);