From 9e96ec9da4ea1837e2487817660e6c0f34d28001 Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Mon, 18 Apr 2011 15:28:48 -0400
Subject: [PATCH] reloading config after ini values are changed

---
 airtime_mvc/application/configs/conf.php      | 26 +++++++++++++++++++
 install/airtime-install.php                   |  2 +-
 install/include/AirtimeIni.php                |  3 +--
 .../upgrades/airtime-1.8/airtime-upgrade.php  |  3 +++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index 8dba78a5d..429edb3cf 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -86,4 +86,30 @@ set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath']
 function load_airtime_config(){
 	$ini_array = parse_ini_file('/etc/airtime/airtime.conf', true);
     return $ini_array;
+} 
+
+class Config {
+    public static function reload_config() {
+        global $CC_CONFIG;
+        $values = parse_ini_file('/etc/airtime/airtime.conf', true);
+
+        // Name of the web server user
+        $CC_CONFIG['webServerUser'] = $values['general']['web_server_user'];
+        $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
+
+        $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
+        // main directory for storing binary media files
+        $CC_CONFIG['storageDir'] =  $values['general']['base_files_dir']."/stor";
+
+	    // Database config
+        $CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];
+        $CC_CONFIG['dsn']['password'] = $values['database']['dbpass'];
+        $CC_CONFIG['dsn']['hostspec'] = $values['database']['host'];
+        $CC_CONFIG['dsn']['database'] = $values['database']['dbname'];
+
+        $CC_CONFIG['apiKey'] = array($values['general']['api_key']);
+
+        $CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries'];
+        $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries'];
+    }
 }
diff --git a/install/airtime-install.php b/install/airtime-install.php
index 787ff629c..9ac7e6b78 100644
--- a/install/airtime-install.php
+++ b/install/airtime-install.php
@@ -84,7 +84,7 @@ AirtimeInstall::InstallStorageDirectory();
 
 AirtimeInstall::ChangeDirOwnerToWebserver($CC_CONFIG["storageDir"]);
 
-AirtimeInstall::CreateSymlinksToUtils($CC_CONFIG["storageDir"]);
+AirtimeInstall::CreateSymlinksToUtils();
 
 echo PHP_EOL."*** Pypo Installation ***".PHP_EOL;
 system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php
index 27384fead..930b6260d 100644
--- a/install/include/AirtimeIni.php
+++ b/install/include/AirtimeIni.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * @package Newscoop
- * @subpackage Subscriptions
+ * @package Airtime
  * @copyright 2011 Sourcefabric o.p.s.
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  */
diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8/airtime-upgrade.php
index d9e75f457..bcc1a2a75 100644
--- a/install/upgrades/airtime-1.8/airtime-upgrade.php
+++ b/install/upgrades/airtime-1.8/airtime-upgrade.php
@@ -61,6 +61,9 @@ AirtimeInstall::InstallBinaries();
 
 echo "* Initializing INI files".PHP_EOL;
 AirtimeIni::UpdateIniFiles();
+Config::reload_config();
 
 echo "* Creating default storage directory".PHP_EOL;
 AirtimeInstall::InstallStorageDirectory();
+AirtimeInstall::ChangeDirOwnerToWebserver($CC_CONFIG["storageDir"]);
+AirtimeInstall::CreateSymlinksToUtils();