From cfb4c201ff65835cb2b54addd6e4930b11323427 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Thu, 10 May 2012 16:45:22 -0400
Subject: [PATCH] CC-3805: After upgrade, incorrect values in airtime.conf

-fixed
---
 install_minimal/include/AirtimeInstall.php            |  2 +-
 .../upgrades/airtime-2.1.0/MiscUpgrade.php            |  2 +-
 .../upgrades/airtime-2.1.0/common/UpgradeCommon.php   | 11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 2e18e3316..304cd6b35 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -4,7 +4,7 @@ set_include_path(__DIR__.'/../../airtime_mvc/library' . PATH_SEPARATOR . get_inc
 if (file_exists('/usr/share/php/libzend-framework-php')){
     set_include_path('/usr/share/php/libzend-framework-php' . PATH_SEPARATOR . get_include_path());
 }
-require_once('Zend/Loader/Autoloader.php');
+#require_once('Zend/Loader/Autoloader.php');
 
 class AirtimeInstall
 {
diff --git a/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php b/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php
index 5b863629a..16fb9bb16 100644
--- a/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.1.0/MiscUpgrade.php
@@ -10,7 +10,7 @@ class AirtimeMiscUpgrade{
     public static function adjustAirtimeStorPermissions($p_ini){
         /* Make the read permission of Monit cfg files more strict */
         $webUser = $p_ini["general"]["web_server_user"];
-        exec("chown -R root:$webUser");
+        exec("chown -R root:$webUser /srv/airtime");
         exec("chmod -R 2775 /srv/airtime");
     }
 }
diff --git a/install_minimal/upgrades/airtime-2.1.0/common/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.1.0/common/UpgradeCommon.php
index 52c74481d..45125e301 100644
--- a/install_minimal/upgrades/airtime-2.1.0/common/UpgradeCommon.php
+++ b/install_minimal/upgrades/airtime-2.1.0/common/UpgradeCommon.php
@@ -162,15 +162,12 @@ class UpgradeCommon{
                         if(is_array($oldSettings[$section])) {
                             $sectionKeys = array_keys($newSettings[$section]);
                             foreach($sectionKeys as $sectionKey) {
-                                // skip airtim_dir as we want to use new value
-                                if($sectionKey != "airtime_dir"){
-                                    if(isset($oldSettings[$section][$sectionKey])) {
-                                        self::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
-                                    }
+
+                                if(isset($oldSettings[$section][$sectionKey])) {
+                                    self::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
                                 }
                             }
-                        }
-                        else {
+                        } else {
                             self::UpdateIniValue($conf, $section, $oldSettings[$section]);
                         }
                     }