From c7198819aae995ac94e5693b8f7609e2a27f7910 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 6 Jun 2011 10:53:08 +0200
Subject: [PATCH] CC-1799 Put Airtime Storage into a Human Readable File Naming
 Convention

enabling media monitor changes.
---
 install/include/AirtimeIni.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php
index 7f2ff24e8..a5adf6faf 100644
--- a/install/include/AirtimeIni.php
+++ b/install/include/AirtimeIni.php
@@ -33,7 +33,8 @@ class AirtimeIni
         $configFiles = array(AirtimeIni::CONF_FILE_AIRTIME,
                              AirtimeIni::CONF_FILE_PYPO,
                              AirtimeIni::CONF_FILE_RECORDER,
-                             AirtimeIni::CONF_FILE_LIQUIDSOAP);
+                             AirtimeIni::CONF_FILE_LIQUIDSOAP,
+                             AirtimeIni::CONF_FILE_MEDIAMONITOR);
         $exist = false;
         foreach ($configFiles as $conf) {
             if (file_exists($conf)) {
@@ -102,9 +103,9 @@ class AirtimeIni
         }
 
         //wait until Airtime 1.9.0
-        //if (file_exists(AirtimeIni::CONF_FILE_MEDIAMONITOR)){
-        //    unlink(AirtimeIni::CONF_FILE_MEDIAMONITOR);
-        //}
+        if (file_exists(AirtimeIni::CONF_FILE_MEDIAMONITOR)){
+            unlink(AirtimeIni::CONF_FILE_MEDIAMONITOR);
+        }
 
         if (file_exists("etc/airtime")){
             rmdir("/etc/airtime/");
@@ -157,8 +158,8 @@ class AirtimeIni
         foreach ($lines as &$line) {
             if ($line[0] != "#"){
                 $key_value = split("=", $line);
-                $key = trim($key_value[0]);         
-                
+                $key = trim($key_value[0]);
+
                 if ($key == $p_property){
                     $line = "$p_property = $p_value".PHP_EOL;
                 }
@@ -185,7 +186,7 @@ class AirtimeIni
         AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_AIRTIME, 'airtime_dir', AirtimeInstall::CONF_DIR_WWW);
         AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_PYPO, 'api_key', "'$api_key'");
         AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_RECORDER, 'api_key', "'$api_key'");
-        //AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_MEDIAMONITOR, 'api_key', "'$api_key'");
+        AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_MEDIAMONITOR, 'api_key', "'$api_key'");
         AirtimeIni::UpdateIniValue(AirtimeInstall::CONF_DIR_WWW.'/build/build.properties', 'project.home', AirtimeInstall::CONF_DIR_WWW);
     }