composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°1260 Config : migrate DB* variables to the Get() model, create CMDBSource::InitFromConfig

Browse Source 
SVN:trunk[5308]
This commit is contained in:
Pierre Goiffon
2018-02-08 14:21:25 +00:00
parent 5a25e44177
commit d2f0deec9c
13 changed files with 426 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/metamodel.class.php
View File

@@ -182,7 +182,7 @@ abstract class MetaModel
var_dump(get_class_vars(__CLASS__));
}
/** @var Config */
/** @var Config m_oConfig */
private static $m_oConfig = null;
/** @var array */
protected static $m_aModulesParameters = array();
@@ -5801,17 +5801,8 @@ abstract class MetaModel
self::IncludeModule($sToInclude, 'addons');
}
$sServer = self::$m_oConfig->GetDBHost();
$sUser = self::$m_oConfig->GetDBUser();
$sPwd = self::$m_oConfig->GetDBPwd();
$sSource = self::$m_oConfig->GetDBName();
$sSSLKey = self::$m_oConfig->GetDBSSLKey();
$sSSLCert = self::$m_oConfig->GetDBSSLCert();
$sSSLCA = self::$m_oConfig->GetDBSSLCA();
$sSSLCipher = self::$m_oConfig->GetDBSSLCipher();
$sTablePrefix = self::$m_oConfig->GetDBSubname();
$sCharacterSet = self::$m_oConfig->GetDBCharacterSet();
$sCollation = self::$m_oConfig->GetDBCollation();
$sSource = self::$m_oConfig->Get('db_name');
$sTablePrefix = self::$m_oConfig->Get('db_subname');
if (self::$m_bUseAPCCache)
{
@@ -5888,8 +5879,7 @@ abstract class MetaModel
self::$m_sDBName = $sSource;
self::$m_sTablePrefix = $sTablePrefix;
CMDBSource::Init($sServer, $sUser, $sPwd, '', $sSSLKey, $sSSLCert, $sSSLCA, $sSSLCipher); // do not select the DB (could not exist)
CMDBSource::SetCharacterSet($sCharacterSet, $sCollation);
CMDBSource::InitFromConfig(self::$m_oConfig);
// Later when timezone implementation is correctly done: CMDBSource::SetTimezone($sDBTimezone);
}