From 96551e0d916e1a001cd35f707c4913a11d01ad4d Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Wed, 20 Apr 2011 16:22:06 -0400
Subject: [PATCH] CC-2186: Integration of a logger tool -added upgrade support

---
 install/airtime-upgrade.php                   | 20 ++++++++++++-------
 .../upgrades/airtime-1.9/airtime-upgrade.php  | 14 +++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 install/upgrades/airtime-1.9/airtime-upgrade.php

diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php
index c1c6436fa..4b5a4600b 100644
--- a/install/airtime-upgrade.php
+++ b/install/airtime-upgrade.php
@@ -14,13 +14,16 @@ require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
 AirtimeInstall::ExitIfNotRoot();
 AirtimeInstall::DbConnect(true);
 
-if(AirtimeInstall::DbTableExists('cc_show_rebroadcast') === true) {
-    $version = "1.7.0";
-    echo "Airtime Version: ".$version." ".PHP_EOL;
-}
-else {
-    $version = "1.6";
-    echo "Airtime Version: ".$version." ".PHP_EOL;
+$version = AirtimeInstall::GetAirtimeVersion();
+if (!$version){
+    if(AirtimeInstall::DbTableExists('cc_show_rebroadcast') === true) {
+        $version = "1.7.0";
+        echo "Airtime Version: ".$version." ".PHP_EOL;
+    }
+    else {
+        $version = "1.6";
+        echo "Airtime Version: ".$version." ".PHP_EOL;
+    }
 }
 
 echo "******************************** Update Begin *********************************".PHP_EOL;
@@ -31,6 +34,9 @@ if(strcmp($version, "1.7.0") < 0) {
 if(strcmp($version, "1.8.0") < 0) {
     system("php ".__DIR__."/upgrades/airtime-1.8/airtime-upgrade.php");
 }
+if (strcmp($version, "1.9.0") < 0){
+    system("php ".__DIR__."/upgrades/airtime-1.9/airtime-upgrade.php");
+}
 
 AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
 
diff --git a/install/upgrades/airtime-1.9/airtime-upgrade.php b/install/upgrades/airtime-1.9/airtime-upgrade.php
new file mode 100644
index 000000000..99ff40ee5
--- /dev/null
+++ b/install/upgrades/airtime-1.9/airtime-upgrade.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package Airtime
+ * @subpackage StorageServer
+ * @copyright 2010 Sourcefabric O.P.S.
+ * @license http://www.gnu.org/licenses/gpl.txt
+ */
+
+set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
+require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
+require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
+require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
+
+AirtimeInstall::CreateZendPhpLogFile();