// Remove _DB_TYPE_ constant from everywhere in the code

This commit is contained in:
rMalie committed 2012-01-05 13:12:45 +00:00
1 parent f5716531fe
commit 136d1657d0
4 files changed
-15

No files matched your search

-1
View File
@@ -93,7 +93,6 @@ function rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL)
$defines['_DB_USER_'] = (($arrayDB AND isset($arrayDB['_DB_USER_'])) ? $arrayDB['_DB_USER_'] : _DB_USER_); $defines['_DB_USER_'] = (($arrayDB AND isset($arrayDB['_DB_USER_'])) ? $arrayDB['_DB_USER_'] : _DB_USER_);
$defines['_DB_PREFIX_'] = (($arrayDB AND isset($arrayDB['_DB_PREFIX_'])) ? $arrayDB['_DB_PREFIX_'] : _DB_PREFIX_); $defines['_DB_PREFIX_'] = (($arrayDB AND isset($arrayDB['_DB_PREFIX_'])) ? $arrayDB['_DB_PREFIX_'] : _DB_PREFIX_);
$defines['_DB_PASSWD_'] = (($arrayDB AND isset($arrayDB['_DB_PASSWD_'])) ? $arrayDB['_DB_PASSWD_'] : _DB_PASSWD_); $defines['_DB_PASSWD_'] = (($arrayDB AND isset($arrayDB['_DB_PASSWD_'])) ? $arrayDB['_DB_PASSWD_'] : _DB_PASSWD_);
$defines['_DB_TYPE_'] = (($arrayDB AND isset($arrayDB['_DB_TYPE_'])) ? $arrayDB['_DB_TYPE_'] : _DB_TYPE_);
$defines['_COOKIE_KEY_'] = addslashes(_COOKIE_KEY_); $defines['_COOKIE_KEY_'] = addslashes(_COOKIE_KEY_);
$defines['_COOKIE_IV_'] = addslashes(_COOKIE_IV_); $defines['_COOKIE_IV_'] = addslashes(_COOKIE_IV_);
if (defined('_RIJNDAEL_KEY_')) if (defined('_RIJNDAEL_KEY_'))
-6
View File
@@ -171,12 +171,6 @@ class BackupCore
*/ */
public function add() public function add()
{ {
if ( _DB_TYPE_ !== 'MySQL' )
{
$this->error = Tools::displayError('Sorry, backup currently only supports MySQL database types. You are using') . ' "' . _DB_TYPE_ . '"';
return false;
}
if (!$this->psBackupAll) if (!$this->psBackupAll)
$ignore_insert_table = array(_DB_PREFIX_.'connections', _DB_PREFIX_.'connections_page', _DB_PREFIX_.'connections_source', _DB_PREFIX_.'guest', _DB_PREFIX_.'statssearch'); $ignore_insert_table = array(_DB_PREFIX_.'connections', _DB_PREFIX_.'connections_page', _DB_PREFIX_.'connections_source', _DB_PREFIX_.'guest', _DB_PREFIX_.'statssearch');
else else
-7
View File
@@ -61,7 +61,6 @@ $_PS_DIRECTORY_ = trim(str_replace(' ', '%20', INSTALLER__PS_BASE_URI), '/');
$_PS_DIRECTORY_ = ($_PS_DIRECTORY_) ? '/'.$_PS_DIRECTORY_.'/' : '/'; $_PS_DIRECTORY_ = ($_PS_DIRECTORY_) ? '/'.$_PS_DIRECTORY_.'/' : '/';
$datas = array( $datas = array(
array('_DB_SERVER_', trim($_GET['server'])), array('_DB_SERVER_', trim($_GET['server'])),
array('_DB_TYPE_', 'MySQL'),
array('_DB_NAME_', trim($_GET['name'])), array('_DB_NAME_', trim($_GET['name'])),
array('_DB_USER_', trim($_GET['login'])), array('_DB_USER_', trim($_GET['login'])),
array('_DB_PASSWD_', trim($_GET['password'])), array('_DB_PASSWD_', trim($_GET['password'])),
@@ -103,10 +102,6 @@ require_once(SETTINGS_FILE);
//----------- //-----------
//import SQL data //import SQL data
//----------- //-----------
switch (_DB_TYPE_)
{
case 'MySQL':
$filePrefix = 'PREFIX_'; $filePrefix = 'PREFIX_';
$engineType = 'ENGINE_TYPE'; $engineType = 'ENGINE_TYPE';
//send the SQL structure file requests //send the SQL structure file requests
@@ -216,8 +211,6 @@ switch (_DB_TYPE_)
} }
} }
} }
break;
}
$xml = '<result><action result="ok" error="" />'."\n"; $xml = '<result><action result="ok" error="" />'."\n";
-1
View File
@@ -152,7 +152,6 @@ $oldLevel = error_reporting(E_ALL);
$mysqlEngine = (defined('_MYSQL_ENGINE_') ? _MYSQL_ENGINE_ : 'MyISAM'); $mysqlEngine = (defined('_MYSQL_ENGINE_') ? _MYSQL_ENGINE_ : 'MyISAM');
$datas = array( $datas = array(
array('_DB_SERVER_', _DB_SERVER_), array('_DB_SERVER_', _DB_SERVER_),
array('_DB_TYPE_', _DB_TYPE_),
array('_DB_NAME_', _DB_NAME_), array('_DB_NAME_', _DB_NAME_),
array('_DB_USER_', _DB_USER_), array('_DB_USER_', _DB_USER_),
array('_DB_PASSWD_', _DB_PASSWD_), array('_DB_PASSWD_', _DB_PASSWD_),