composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Preparing for the integration of the version 2.0 of the setup.

Browse Source 
Some changes to the application layout: logs now go to the ./log folder ./data should be used to store application's data.

SVN:trunk[2189]
This commit is contained in:
Denis Flaven
2012-09-18 19:55:56 +00:00
parent 93791255e6
commit e463bd8b48
15 changed files with 2680 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
setup/parameters.class.inc.php
View File

@@ -6,17 +6,12 @@ class InvalidParameterException extends Exception
abstract class Parameters
{
protected $aData = null;
protected $sParametersFile = null;
public function __construct($sParametersFile)
public function __construct()
{
$this->aData = null;
$this->sParametersFile = $sParametersFile;
$this->Load($sParametersFile);
}
abstract public function Load($sParametersFile);
public function Get($sCode, $default = '')
{
if (array_key_exists($sCode, $this->aData))
@@ -29,7 +24,12 @@ abstract class Parameters
class PHPParameters extends Parameters
{
public function Load($sParametersFile)
public function LoadFromHash($aData)
{
$this->aData = $aData;
}
public function LoadFromFile($sParametersFile)
{
if ($this->aData == null)
{
@@ -41,14 +41,21 @@ class PHPParameters extends Parameters
class XMLParameters extends Parameters
{
protected $aData = null;
public function Load($sParametersFile)
protected $sParametersFile;
public function __construct($sParametersFile)
{
parent::__construct();
$this->LoadFromFile($sParametersFile);
}
public function LoadFromFile($sParametersFile)
{
$this->sParametersFile = $sParametersFile;
if ($this->aData == null)
{
libxml_use_internal_errors(true);
$oXML = @simplexml_load_file($sParametersFile);
$oXML = @simplexml_load_file($this->sParametersFile);
if (!$oXML)
{
$aMessage = array();
@@ -134,5 +141,3 @@ class XMLParameters extends Parameters
return $sRet;
}
}