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

// Remove _DB_TYPE_ constant from everywhere in the code

Browse Source
This commit is contained in:
rMalie committed 2012-01-05 13:12:45 +00:00
1 parent f5716531fe
commit 136d1657d0
4 files changed
+35 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/functions.php
-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_'))
classes/Backup.php
-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
install-dev/xml/createDB.php
+35 -42
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,35 +102,31 @@ require_once(SETTINGS_FILE);
//----------- //-----------
//import SQL data //import SQL data
//----------- //-----------
switch (_DB_TYPE_) $filePrefix = 'PREFIX_';
$engineType = 'ENGINE_TYPE';
//send the SQL structure file requests
$structureFile = dirname(__FILE__).'/../sql/db.sql';
if(!file_exists($structureFile))
{ {
case 'MySQL':
$filePrefix = 'PREFIX_';
$engineType = 'ENGINE_TYPE';
//send the SQL structure file requests
$structureFile = dirname(__FILE__).'/../sql/db.sql';
if(!file_exists($structureFile))
{
$logger->logError('Impossible to access to a MySQL content file. ('.$structureFile.')'); $logger->logError('Impossible to access to a MySQL content file. ('.$structureFile.')');
die('<action result="fail" error="10" />'."\n"); die('<action result="fail" error="10" />'."\n");
} }
$db_structure_settings = ''; $db_structure_settings = '';
if ( !$db_structure_settings .= file_get_contents($structureFile) ) if ( !$db_structure_settings .= file_get_contents($structureFile) )
{ {
$logger->logError('Impossible to read the content of a MySQL content file. ('.$structureFile.')'); $logger->logError('Impossible to read the content of a MySQL content file. ('.$structureFile.')');
die('<action result="fail" error="9" />'."\n"); die('<action result="fail" error="9" />'."\n");
} }
$db_structure_settings = str_replace(array($filePrefix, $engineType), array($_GET['tablePrefix'], $_GET['engine']), $db_structure_settings); $db_structure_settings = str_replace(array($filePrefix, $engineType), array($_GET['tablePrefix'], $_GET['engine']), $db_structure_settings);
$db_structure_settings = preg_split("/;\s*[\r\n]+/",$db_structure_settings); $db_structure_settings = preg_split("/;\s*[\r\n]+/",$db_structure_settings);
if (isset($_GET['dropAndCreate']) && $_GET['dropAndCreate'] == 'true') if (isset($_GET['dropAndCreate']) && $_GET['dropAndCreate'] == 'true')
{ {
array_unshift($db_structure_settings, 'USE `'.trim($_GET['name']).'`;'); array_unshift($db_structure_settings, 'USE `'.trim($_GET['name']).'`;');
array_unshift($db_structure_settings, 'CREATE DATABASE `'.trim($_GET['name']).'`;'); array_unshift($db_structure_settings, 'CREATE DATABASE `'.trim($_GET['name']).'`;');
array_unshift($db_structure_settings, 'DROP DATABASE `'.trim($_GET['name']).'`;'); array_unshift($db_structure_settings, 'DROP DATABASE `'.trim($_GET['name']).'`;');
} }
foreach ($db_structure_settings as $query) foreach ($db_structure_settings as $query)
{ {
$query = trim($query); $query = trim($query);
if (!empty($query)) if (!empty($query))
{ {
@@ -158,19 +153,19 @@ switch (_DB_TYPE_)
} }
} }
} }
} }
//send the SQL data file requests //send the SQL data file requests
$db_data_settings = ''; $db_data_settings = '';
$liteFile = dirname(__FILE__).'/../sql/db_settings_lite.sql'; $liteFile = dirname(__FILE__).'/../sql/db_settings_lite.sql';
if(!file_exists($liteFile)) if(!file_exists($liteFile))
die('<action result="fail" error="10" />'."\n"); die('<action result="fail" error="10" />'."\n");
if ( !$db_data_settings .= file_get_contents( $liteFile ) ) if ( !$db_data_settings .= file_get_contents( $liteFile ) )
die('<action result="fail" error="9" />'."\n"); die('<action result="fail" error="9" />'."\n");
if ($_GET['mode'] == 'full') if ($_GET['mode'] == 'full')
{ {
$fullFile = dirname(__FILE__).'/../sql/db_settings_extends.sql'; $fullFile = dirname(__FILE__).'/../sql/db_settings_extends.sql';
if(!file_exists($fullFile)) if(!file_exists($fullFile))
{ {
@@ -182,16 +177,16 @@ switch (_DB_TYPE_)
$logger->logError('Impossible to read the content of a MySQL content file. ('.$fullFile.')'); $logger->logError('Impossible to read the content of a MySQL content file. ('.$fullFile.')');
die('<action result="fail" error="9" />'."\n"); die('<action result="fail" error="9" />'."\n");
} }
} }
$db_data_settings .= "\n".'INSERT INTO `PREFIX_shop_url` (`id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES(1, \''.pSQL(Tools::getHttpHost()).'\', \''.pSQL(Tools::getHttpHost()).'\', \''.pSQL($_PS_DIRECTORY_).'\', \'\', 1, 1);'; $db_data_settings .= "\n".'INSERT INTO `PREFIX_shop_url` (`id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES(1, \''.pSQL(Tools::getHttpHost()).'\', \''.pSQL(Tools::getHttpHost()).'\', \''.pSQL($_PS_DIRECTORY_).'\', \'\', 1, 1);';
$db_data_settings .= "\n".'UPDATE `PREFIX_customer` SET `passwd` = \''.md5(_COOKIE_KEY_.'123456789').'\' WHERE `id_customer` =1;'; $db_data_settings .= "\n".'UPDATE `PREFIX_customer` SET `passwd` = \''.md5(_COOKIE_KEY_.'123456789').'\' WHERE `id_customer` =1;';
$db_data_settings .= "\n".'INSERT INTO `PREFIX_configuration` (name, value, date_add, date_upd) VALUES (\'PS_VERSION_DB\', \'' . INSTALL_VERSION . '\', NOW(), NOW());'; $db_data_settings .= "\n".'INSERT INTO `PREFIX_configuration` (name, value, date_add, date_upd) VALUES (\'PS_VERSION_DB\', \'' . INSTALL_VERSION . '\', NOW(), NOW());';
$db_data_settings = str_replace(array($filePrefix, $engineType), array($_GET['tablePrefix'], $_GET['engine']), $db_data_settings); $db_data_settings = str_replace(array($filePrefix, $engineType), array($_GET['tablePrefix'], $_GET['engine']), $db_data_settings);
$db_data_settings = preg_split("/;\s*[\r\n]+/",$db_data_settings); $db_data_settings = preg_split("/;\s*[\r\n]+/",$db_data_settings);
/* UTF-8 support */ /* UTF-8 support */
array_unshift($db_data_settings, 'SET NAMES \'utf8\';'); array_unshift($db_data_settings, 'SET NAMES \'utf8\';');
foreach ($db_data_settings as $query) foreach ($db_data_settings as $query)
{ {
$query = trim($query); $query = trim($query);
if (!empty($query)) if (!empty($query))
{ {
@@ -215,8 +210,6 @@ switch (_DB_TYPE_)
} }
} }
} }
}
break;
} }
$xml = '<result><action result="ok" error="" />'."\n"; $xml = '<result><action result="ok" error="" />'."\n";
install-dev/xml/doUpgrade.php
-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_),