From 973a415164971ae10db435c1860ee2666f6b53eb Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 15 Jan 2013 15:37:26 -0500
Subject: [PATCH] -fix installation error

---
 airtime_mvc/application/Bootstrap.php               | 1 -
 airtime_mvc/application/configs/conf.php            | 5 ++++-
 install_minimal/airtime-install                     | 1 -
 install_minimal/include/airtime-db-install.php      | 1 -
 install_minimal/include/airtime-install.php         | 2 --
 install_minimal/include/airtime-installed-check.php | 1 -
 install_minimal/include/airtime-uninstall.php       | 1 -
 utils/phone_home_stat.php                           | 1 -
 8 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index dab304fd1..38d4d9c7a 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -1,6 +1,5 @@
 <?php
 require_once __DIR__."/configs/conf.php";
-Config::loadConfig();
 $CC_CONFIG = Config::getConfig();
 
 require_once __DIR__."/configs/ACL.php";
diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index 76b94f429..937b91c75 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -7,7 +7,7 @@
  */
 
 class Config {
-    private static $CC_CONFIG;
+    private static $CC_CONFIG = null;
     public static function loadConfig() {
         $CC_CONFIG = array(
                 /* ================================================ storage configuration */
@@ -64,6 +64,9 @@ class Config {
     }
     
     public static function getConfig() {
+        if (is_null(self::$CC_CONFIG)) {
+            self::loadConfig();
+        }
         return self::$CC_CONFIG;
     }
 }
diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index 02e54620b..279fdce64 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -180,7 +180,6 @@ if [ "$python_service" -eq "0" ]; then
     python $AIRTIMEROOT/python_apps/create-pypo-user.py
 fi
 
-
 if [ "$DO_UPGRADE" -eq "1" ]; then
     #do upgrade
     php --php-ini ${SCRIPTPATH}/airtime-php.ini ${SCRIPTPATH}/include/airtime-upgrade.php $@
diff --git a/install_minimal/include/airtime-db-install.php b/install_minimal/include/airtime-db-install.php
index f99bb1cb3..d2aca76a4 100644
--- a/install_minimal/include/airtime-db-install.php
+++ b/install_minimal/include/airtime-db-install.php
@@ -10,7 +10,6 @@ require_once(__DIR__.'/AirtimeInstall.php');
 require_once(__DIR__.'/airtime-constants.php');
 
 require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
-Config::loadConfig();
 $CC_CONFIG = Config::getConfig();
 require_once 'propel/runtime/lib/Propel.php';
 Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php
index e67c3f6f2..bbd0c157a 100644
--- a/install_minimal/include/airtime-install.php
+++ b/install_minimal/include/airtime-install.php
@@ -16,7 +16,6 @@ $iniExists = file_exists("/etc/airtime/airtime.conf");
 if ($iniExists){
     //reinstall, Will ask if we should rewrite config files.
     require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
-    Config::loadConfig();
     $CC_CONFIG = Config::getConfig();
     require_once 'propel/runtime/lib/Propel.php';
     Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
@@ -53,7 +52,6 @@ if ($overwrite) {
 }
 if (!$iniExists){
     require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
-    Config::loadConfig();
     $CC_CONFIG = Config::getConfig();
     require_once 'propel/runtime/lib/Propel.php';
     Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
diff --git a/install_minimal/include/airtime-installed-check.php b/install_minimal/include/airtime-installed-check.php
index 4c37edf90..76020853b 100644
--- a/install_minimal/include/airtime-installed-check.php
+++ b/install_minimal/include/airtime-installed-check.php
@@ -21,7 +21,6 @@ if (!file_exists('/etc/airtime/airtime.conf')) {
 }
 
 require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/db-conf.php");
-Config::loadConfig();
 $CC_CONFIG = Config::getConfig();
 require_once('propel/runtime/lib/Propel.php');
 Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
diff --git a/install_minimal/include/airtime-uninstall.php b/install_minimal/include/airtime-uninstall.php
index f6a2f959f..118ccc01b 100644
--- a/install_minimal/include/airtime-uninstall.php
+++ b/install_minimal/include/airtime-uninstall.php
@@ -17,7 +17,6 @@ if (!file_exists(AirtimeIni::CONF_FILE_AIRTIME)) {
 }
 require_once(__DIR__.'/airtime-constants.php');
 require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
-Config::loadConfig();
 $CC_CONFIG = Config::getConfig();
 
 
diff --git a/utils/phone_home_stat.php b/utils/phone_home_stat.php
index 2f9ae6c42..3de05a8da 100644
--- a/utils/phone_home_stat.php
+++ b/utils/phone_home_stat.php
@@ -7,7 +7,6 @@ date_default_timezone_set("UTC");
 $values = parse_ini_file('/etc/airtime/airtime.conf', true);
 $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
 require_once($CC_CONFIG['phpDir'].'/application/configs/conf.php');
-Config::loadConfig();
 $CC_CONFIG = Config::getConfig();
 
 /*