Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2013-01-15 16:29:14 -05:00
parent 7442f91a5d 84373391de
commit 6de4c4b63d
8 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/Bootstrap.php
View File

@ -1,6 +1,5 @@
<?php <?php
require_once __DIR__."/configs/conf.php"; require_once __DIR__."/configs/conf.php";
Config::loadConfig();
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
require_once __DIR__."/configs/ACL.php"; require_once __DIR__."/configs/ACL.php";

5
airtime_mvc/application/configs/conf.php
View File

@ -7,7 +7,7 @@
*/ */
class Config { class Config {
private static $CC_CONFIG; private static $CC_CONFIG = null;
public static function loadConfig() { public static function loadConfig() {
$CC_CONFIG = array( $CC_CONFIG = array(
/* ================================================ storage configuration */ /* ================================================ storage configuration */
@ -64,6 +64,9 @@ class Config {
} }
public static function getConfig() { public static function getConfig() {
if (is_null(self::$CC_CONFIG)) {
self::loadConfig();
}
return self::$CC_CONFIG; return self::$CC_CONFIG;
} }
} }

1
install_minimal/airtime-install
View File

@ -180,7 +180,6 @@ if [ "$python_service" -eq "0" ]; then
python $AIRTIMEROOT/python_apps/create-pypo-user.py python $AIRTIMEROOT/python_apps/create-pypo-user.py
fi fi
if [ "$DO_UPGRADE" -eq "1" ]; then if [ "$DO_UPGRADE" -eq "1" ]; then
#do upgrade #do upgrade
php --php-ini ${SCRIPTPATH}/airtime-php.ini ${SCRIPTPATH}/include/airtime-upgrade.php $@ php --php-ini ${SCRIPTPATH}/airtime-php.ini ${SCRIPTPATH}/include/airtime-upgrade.php $@

1
install_minimal/include/airtime-db-install.php
View File

@ -10,7 +10,6 @@ require_once(__DIR__.'/AirtimeInstall.php');
require_once(__DIR__.'/airtime-constants.php'); require_once(__DIR__.'/airtime-constants.php');
require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
Config::loadConfig();
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
require_once 'propel/runtime/lib/Propel.php'; require_once 'propel/runtime/lib/Propel.php';
Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");

2
install_minimal/include/airtime-install.php
View File

@ -16,7 +16,6 @@ $iniExists = file_exists("/etc/airtime/airtime.conf");
if ($iniExists){ if ($iniExists){
//reinstall, Will ask if we should rewrite config files. //reinstall, Will ask if we should rewrite config files.
require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
Config::loadConfig();
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
require_once 'propel/runtime/lib/Propel.php'; require_once 'propel/runtime/lib/Propel.php';
Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
@ -53,7 +52,6 @@ if ($overwrite) {
} }
if (!$iniExists){ if (!$iniExists){
require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
Config::loadConfig();
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
require_once 'propel/runtime/lib/Propel.php'; require_once 'propel/runtime/lib/Propel.php';
Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");

1
install_minimal/include/airtime-installed-check.php
View File

@ -21,7 +21,6 @@ if (!file_exists('/etc/airtime/airtime.conf')) {
} }
require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/db-conf.php"); require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/db-conf.php");
Config::loadConfig();
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
require_once('propel/runtime/lib/Propel.php'); require_once('propel/runtime/lib/Propel.php');
Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");

1
install_minimal/include/airtime-uninstall.php
View File

@ -17,7 +17,6 @@ if (!file_exists(AirtimeIni::CONF_FILE_AIRTIME)) {
} }
require_once(__DIR__.'/airtime-constants.php'); require_once(__DIR__.'/airtime-constants.php');
require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
Config::loadConfig();
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();

1
utils/phone_home_stat.php
View File

@ -7,7 +7,6 @@ date_default_timezone_set("UTC");
$values = parse_ini_file('/etc/airtime/airtime.conf', true); $values = parse_ini_file('/etc/airtime/airtime.conf', true);
$CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
require_once($CC_CONFIG['phpDir'].'/application/configs/conf.php'); require_once($CC_CONFIG['phpDir'].'/application/configs/conf.php');
Config::loadConfig();
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
/* /*