forks/baikal
1
0
Fork 0
Code Releases Activity

Improved the config model

Browse source 
Former-commit-id: 6500d04d1a
This commit is contained in:
Jérôme Schneider 2012-08-07 14:02:54 +02:00
parent 17a74c10bf
commit e9e4e798f9
4 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CoreVersions/0.2.1/Frameworks/Baikal/Model/Config.php
View file

@ -99,10 +99,14 @@ abstract class Config extends \Flake\Core\Model\NoDb {
}
}
$aRes[$sConstant] = $sValue;
} elseif($iNbRes === 0) {
throw new \Exception("Baikal\Model\Config->parseConfig(): Unable to find constant '" . $sConstant . "' in config file");
} elseif($iNbRes > 1) {
throw new \Exception("Baikal\Model\Config->parseConfig(): constant '" . $sConstant . "' has been found multiple times in the config file; stopping execution");
} else {
# $iNbRes === 0
# We do nothing, to keep the default value (the one already set in $aData)
}
$aRes[$sConstant] = $sValue;
}
reset($aRes);

3
CoreVersions/0.2.1/Frameworks/Baikal/Model/Config/Distrib.php
View file

@ -39,7 +39,8 @@ class Distrib extends \Baikal\Model\Config {
"type" => "string",
),
);
# Default values
protected $aData = array(
"BAIKAL_VERSION" => "",
"BAIKAL_HOMEPAGE" => "",

15
CoreVersions/0.2.1/Frameworks/Baikal/Model/Config/Standard.php
View file

@ -48,15 +48,14 @@ class Standard extends \Baikal\Model\Config {
"type" => "string",
)
);
# Default values
protected $aData = array(
"PROJECT_TIMEZONE" => "",
"BAIKAL_CARD_ENABLED" => "",
"BAIKAL_CAL_ENABLED" => "",
"BAIKAL_CARD_ENABLED" => "",
"BAIKAL_CAL_ENABLED" => "",
"BAIKAL_ADMIN_ENABLED" => "",
"BAIKAL_ADMIN_AUTOLOCKENABLED" => "",
"PROJECT_TIMEZONE" => "Europe/Paris",
"BAIKAL_CARD_ENABLED" => TRUE,
"BAIKAL_CAL_ENABLED" => TRUE,
"BAIKAL_ADMIN_ENABLED" => TRUE,
"BAIKAL_ADMIN_AUTOLOCKENABLED" => FALSE,
"BAIKAL_ADMIN_PASSWORDHASH" => ""
);

19
CoreVersions/0.2.1/Frameworks/Baikal/Model/Config/System.php
View file

@ -69,16 +69,17 @@ class System extends \Baikal\Model\Config {
"type" => "string",
),
);
# Default values
protected $aData = array(
"BAIKAL_PATH_SABREDAV" => "",
"BAIKAL_AUTH_REALM" => "",
"BAIKAL_CARD_BASEURI" => "",
"BAIKAL_CAL_BASEURI" => "",
"BAIKAL_STANDALONE_ALLOWED" => "",
"BAIKAL_STANDALONE_PORT" => "",
"PROJECT_SQLITE_FILE" => "",
"PROJECT_DB_MYSQL" => "",
"BAIKAL_PATH_SABREDAV" => 'PROJECT_PATH_FRAMEWORKS . "SabreDAV/lib/Sabre/"',
"BAIKAL_AUTH_REALM" => "BaikalDAV",
"BAIKAL_CARD_BASEURI" => 'PROJECT_BASEURI . "card.php/"',
"BAIKAL_CAL_BASEURI" => 'PROJECT_BASEURI . "cal.php/"',
"BAIKAL_STANDALONE_ALLOWED" => FALSE,
"BAIKAL_STANDALONE_PORT" => 8888,
"PROJECT_SQLITE_FILE" => 'PROJECT_PATH_SPECIFIC . "db/db.sqlite"',
"PROJECT_DB_MYSQL" => FALSE,
"PROJECT_DB_MYSQL_HOST" => "",
"PROJECT_DB_MYSQL_DBNAME" => "",
"PROJECT_DB_MYSQL_USERNAME" => "",