From a2ec9b4d1083468fd64045446ae321b81caa7abb Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Thu, 19 May 2011 14:27:30 -0400
Subject: [PATCH] CC-2281 Install script should check for pre-installed
 versions and prompt user to upgrade/full installation

moving constants in conf.php to constants.php
---
 airtime_mvc/application/configs/conf.php      | 4 ----
 airtime_mvc/application/configs/constants.php | 4 ++++
 install/airtime-db-install.php                | 3 ++-
 install/airtime-install.php                   | 8 ++++----
 install/airtime-uninstall.php                 | 1 +
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index c8952ae5b..23e28ee32 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -6,10 +6,6 @@
  * /etc/airtime/recorder.cfg
  */
 
-define('AIRTIME_VERSION', '1.8.2');
-define('AIRTIME_COPYRIGHT_DATE', '2010-2011');
-define('AIRTIME_REST_VERSION', '1.1');
-
 global $CC_CONFIG;
 
 $CC_CONFIG = array(
diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php
index 7dfa420aa..c27ed510a 100644
--- a/airtime_mvc/application/configs/constants.php
+++ b/airtime_mvc/application/configs/constants.php
@@ -1,5 +1,9 @@
 <?php
 
+define('AIRTIME_VERSION', '1.8.2');
+define('AIRTIME_COPYRIGHT_DATE', '2010-2011');
+define('AIRTIME_REST_VERSION', '1.1');
+
 // Metadata Keys
 define('UI_MDATA_KEY_TITLE', 'dc:title');
 define('UI_MDATA_KEY_CREATOR', 'dc:creator');
diff --git a/install/airtime-db-install.php b/install/airtime-db-install.php
index 66174e61a..16bc73e6d 100644
--- a/install/airtime-db-install.php
+++ b/install/airtime-db-install.php
@@ -5,6 +5,7 @@ set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_includ
 require_once(dirname(__FILE__).'/include/AirtimeIni.php');
 require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
 
+require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/constants.php');
 require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
 
 echo PHP_EOL."*** Database Installation ***".PHP_EOL;
@@ -21,7 +22,7 @@ if ($databaseExisted){
     //Database already exists. Ask the user how they want to
     //proceed. Warn them that creating the database tables again
     //will cause them to lose their old ones.
-    
+
     $userAnswer = "x";
     while (!in_array($userAnswer, array("y", "Y", "n", "N", ""))) {
         echo PHP_EOL."Database already exists. Do you want to delete all tables and recreate? (y/N)";
diff --git a/install/airtime-install.php b/install/airtime-install.php
index 8f4f0f568..fe9bbd6c4 100644
--- a/install/airtime-install.php
+++ b/install/airtime-install.php
@@ -11,12 +11,15 @@ echo "******************************** Install Begin ***************************
 
 require_once(dirname(__FILE__).'/include/AirtimeIni.php');
 require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
-require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
+require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/constants.php');
 
 AirtimeInstall::ExitIfNotRoot();
 
 $version = AirtimeInstall::CheckForVersionBeforeInstall();
 
+require_once('Zend/Loader/Autoloader.php');
+$autoloader = Zend_Loader_Autoloader::getInstance();
+
 //a previous version exists.
 if(isset($version) && $version != false && $version < AIRTIME_VERSION) {
 
@@ -47,9 +50,6 @@ if(isset($version) && $version != false && $version < AIRTIME_VERSION) {
     }
 }
 
-require_once('Zend/Loader/Autoloader.php');
-$autoloader = Zend_Loader_Autoloader::getInstance();
-
 try {
     $opts = new Zend_Console_Getopt(
         array(
diff --git a/install/airtime-uninstall.php b/install/airtime-uninstall.php
index 29a3978cc..851ca8ce3 100644
--- a/install/airtime-uninstall.php
+++ b/install/airtime-uninstall.php
@@ -15,6 +15,7 @@ if (!file_exists(AirtimeIni::CONF_FILE_AIRTIME)) {
     echo "Most likely this means that Airtime is not installed, so there is nothing to do.".PHP_EOL.PHP_EOL;
     exit();
 }
+require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/constants.php');
 require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
 
 echo PHP_EOL;