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

Revert GetDataPath() usage

Browse Source
This commit is contained in:
Eric Espie
2024-12-17 15:53:57 +01:00
parent eeabad895d
commit b20b4b7e82
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
setup/runtimeenv.class.inc.php
View File

@@ -382,7 +382,7 @@ class RunTimeEnvironment
{ {
$aDirsToCompile[] = APPROOT.'extensions'; $aDirsToCompile[] = APPROOT.'extensions';
} }
$sExtraDir = APPROOT.'data/'.$this->sTargetEnv.'-modules/'; $sExtraDir = utils::GetDataPath().$this->sTargetEnv.'-modules/';
if (is_dir($sExtraDir)) if (is_dir($sExtraDir))
{ {
$aDirsToCompile[] = $sExtraDir; $aDirsToCompile[] = $sExtraDir;
@@ -477,7 +477,7 @@ class RunTimeEnvironment
} }
while($bModuleAdded); while($bModuleAdded);
$sDeltaFile = APPROOT.'data/'.$this->sTargetEnv.'.delta.xml'; $sDeltaFile = utils::GetDataPath().$this->sTargetEnv.'.delta.xml';
if (file_exists($sDeltaFile)) if (file_exists($sDeltaFile))
{ {
$oDelta = new MFDeltaModule($sDeltaFile); $oDelta = new MFDeltaModule($sDeltaFile);
@@ -514,7 +514,7 @@ class RunTimeEnvironment
{ {
// Just before loading the delta, let's save an image of the datamodel // Just before loading the delta, let's save an image of the datamodel
// in case there is no delta the operation will be done after the end of the loop // in case there is no delta the operation will be done after the end of the loop
$oFactory->SaveToFile(APPROOT.'data/datamodel-'.$this->sTargetEnv.'.xml'); $oFactory->SaveToFile(utils::GetDataPath().'datamodel-'.$this->sTargetEnv.'.xml');
} }
$oFactory->LoadModule($oModule); $oFactory->LoadModule($oModule);
} }
@@ -522,10 +522,10 @@ class RunTimeEnvironment
if ($oModule instanceof MFDeltaModule) { if ($oModule instanceof MFDeltaModule) {
// A delta was loaded, let's save a second copy of the datamodel // A delta was loaded, let's save a second copy of the datamodel
$oFactory->SaveToFile(APPROOT.'data/datamodel-'.$this->sTargetEnv.'-with-delta.xml'); $oFactory->SaveToFile(utils::GetDataPath().'datamodel-'.$this->sTargetEnv.'-with-delta.xml');
} else { } else {
// No delta was loaded, let's save the datamodel now // No delta was loaded, let's save the datamodel now
$oFactory->SaveToFile(APPROOT.'data/datamodel-'.$this->sTargetEnv.'.xml'); $oFactory->SaveToFile(utils::GetDataPath().'datamodel-'.$this->sTargetEnv.'.xml');
} }
$sTargetDir = APPROOT.'env-'.$this->sTargetEnv; $sTargetDir = APPROOT.'env-'.$this->sTargetEnv;
@@ -940,38 +940,38 @@ class RunTimeEnvironment
{ {
if ($this->sFinalEnv != $this->sTargetEnv) if ($this->sFinalEnv != $this->sTargetEnv)
{ {
if (file_exists(APPROOT.'data/'.$this->sTargetEnv.'.delta.xml')) if (file_exists(utils::GetDataPath().$this->sTargetEnv.'.delta.xml'))
{ {
if (file_exists(APPROOT.'data/'.$this->sFinalEnv.'.delta.xml')) if (file_exists(utils::GetDataPath().$this->sFinalEnv.'.delta.xml'))
{ {
// Make a "previous" file // Make a "previous" file
copy( copy(
APPROOT.'data/'.$this->sFinalEnv.'.delta.xml', utils::GetDataPath().$this->sFinalEnv.'.delta.xml',
APPROOT.'data/'.$this->sFinalEnv.'.delta.prev.xml' utils::GetDataPath().$this->sFinalEnv.'.delta.prev.xml'
); );
} }
$this->CommitFile( $this->CommitFile(
APPROOT.'data/'.$this->sTargetEnv.'.delta.xml', utils::GetDataPath().$this->sTargetEnv.'.delta.xml',
APPROOT.'data/'.$this->sFinalEnv.'.delta.xml' utils::GetDataPath().$this->sFinalEnv.'.delta.xml'
); );
} }
$this->CommitFile( $this->CommitFile(
APPROOT.'data/datamodel-'.$this->sTargetEnv.'.xml', utils::GetDataPath().'datamodel-'.$this->sTargetEnv.'.xml',
APPROOT.'data/datamodel-'.$this->sFinalEnv.'.xml' utils::GetDataPath().'datamodel-'.$this->sFinalEnv.'.xml'
); );
$this->CommitFile( $this->CommitFile(
APPROOT.'data/datamodel-'.$this->sTargetEnv.'-with-delta.xml', utils::GetDataPath().'datamodel-'.$this->sTargetEnv.'-with-delta.xml',
APPROOT.'data/datamodel-'.$this->sFinalEnv.'-with-delta.xml', utils::GetDataPath().'datamodel-'.$this->sFinalEnv.'-with-delta.xml',
false false
); );
$this->CommitDir( $this->CommitDir(
APPROOT.'data/'.$this->sTargetEnv.'-modules/', utils::GetDataPath().$this->sTargetEnv.'-modules/',
APPROOT.'data/'.$this->sFinalEnv.'-modules/', utils::GetDataPath().$this->sFinalEnv.'-modules/',
false false
); );
$this->CommitDir( $this->CommitDir(
APPROOT.'data/cache-'.$this->sTargetEnv, utils::GetDataPath().'cache-'.$this->sTargetEnv,
APPROOT.'data/cache-'.$this->sFinalEnv, utils::GetDataPath().'cache-'.$this->sFinalEnv,
false false
); );
$this->CommitDir( $this->CommitDir(