From e56f50e8b2d4603abcaeccf2c9350f290f7b45cf Mon Sep 17 00:00:00 2001 From: Naomi Date: Tue, 12 Apr 2011 12:43:25 -0400 Subject: [PATCH 1/6] CC-2172 : Create Upgrade structure so that a user can upgrade from any version of Airtime properly --- VERSION | 1 + install/airtime-upgrade.php | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..27f9cd322 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.8.0 diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index 799cb4b76..23250b033 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -10,10 +10,27 @@ require_once(dirname(__FILE__).'/include/AirtimeIni.php'); AirtimeIni::ExitIfNotRoot(); +if(file_exists(dirname(__FILE__).'/../VERSION')) { + $version = file_get_contents(dirname(__FILE__).'/../VERSION'); + echo "Airtime Version: ".$version." ".PHP_EOL; +} +else 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; -//system("php ".__DIR__."/upgrades/airtime-1.7/airtime-upgrade.php"); -system("php ".__DIR__."/upgrades/airtime-1.8/airtime-upgrade.php"); +if(strcmp($version, "1.7.0") < 0) { + system("php ".__DIR__."/upgrades/airtime-1.7/airtime-upgrade.php"); +} +if(strcmp($version, "1.8.0") < 0) { + system("php ".__DIR__."/upgrades/airtime-1.8/airtime-upgrade.php"); +} echo "******************************* Update Complete *******************************".PHP_EOL; From c4e264b9369b99512ac83e400acd65cac5693dcf Mon Sep 17 00:00:00 2001 From: Naomi Date: Tue, 12 Apr 2011 13:42:28 -0400 Subject: [PATCH 2/6] CC-2172 : Create Upgrade structure so that a user can upgrade from any version of Airtime properly --- install/airtime-upgrade.php | 13 ++++++++----- install/include/AirtimeInstall.php | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index 23250b033..37590b0c0 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -7,14 +7,15 @@ */ require_once(dirname(__FILE__).'/include/AirtimeIni.php'); +require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); AirtimeIni::ExitIfNotRoot(); -if(file_exists(dirname(__FILE__).'/../VERSION')) { - $version = file_get_contents(dirname(__FILE__).'/../VERSION'); - echo "Airtime Version: ".$version." ".PHP_EOL; -} -else if(AirtimeInstall::DbTableExists('cc_show_rebroadcast') === true) { +//if(file_exists(dirname(__FILE__).'/../VERSION')) { +// $version = file_get_contents(dirname(__FILE__).'/../VERSION'); +// echo "Airtime Version: ".$version." ".PHP_EOL; +//} +if(AirtimeInstall::DbTableExists('cc_show_rebroadcast') === true) { $version = "1.7.0"; echo "Airtime Version: ".$version." ".PHP_EOL; } @@ -32,6 +33,8 @@ if(strcmp($version, "1.8.0") < 0) { system("php ".__DIR__."/upgrades/airtime-1.8/airtime-upgrade.php"); } +AirtimeInstall::SetAirtimeVersion("1.8.0"); + echo "******************************* Update Complete *******************************".PHP_EOL; diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index ddac4bd06..8bacffe85 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -165,6 +165,32 @@ class AirtimeInstall { system($command); } + public static function SetAirtimeVersion($p_version) + { + global $CC_DBC; + $sql = "DELETE FROM cc_pref WHERE keystr = 'system_version'"; + $CC_DBC->query($sql); + + $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', $p_version)"; + $result = $CC_DBC->query($sql); + if (PEAR::isError($result)) { + return false; + } + return true; + } + + public static function GetAirtimeVersion() + { + global $CC_DBC; + $sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version'"; + $version = $CC_DBC->GetOne($sql); + + if (PEAR::isError($version)) { + return false; + } + return $version; + } + public static function DeleteFilesRecursive($p_path) { $command = "rm -rf $p_path"; From 5cfeadcbfea9621620c2bda79aa8049a8bfc0434 Mon Sep 17 00:00:00 2001 From: Naomi Date: Tue, 12 Apr 2011 14:15:20 -0400 Subject: [PATCH 3/6] CC-2172 : Create Upgrade structure so that a user can upgrade from any version of Airtime properly --- install/airtime-upgrade.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index 37590b0c0..a7fe6ff0a 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -10,11 +10,8 @@ require_once(dirname(__FILE__).'/include/AirtimeIni.php'); require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); AirtimeIni::ExitIfNotRoot(); +AirtimeInstall::DbConnect(true); -//if(file_exists(dirname(__FILE__).'/../VERSION')) { -// $version = file_get_contents(dirname(__FILE__).'/../VERSION'); -// echo "Airtime Version: ".$version." ".PHP_EOL; -//} if(AirtimeInstall::DbTableExists('cc_show_rebroadcast') === true) { $version = "1.7.0"; echo "Airtime Version: ".$version." ".PHP_EOL; From 00e80911c3b278647eb5ff306dedaab1d0b91e87 Mon Sep 17 00:00:00 2001 From: Naomi Date: Tue, 12 Apr 2011 14:39:09 -0400 Subject: [PATCH 4/6] CC-2172 : Create Upgrade structure so that a user can upgrade from any version of Airtime properly --- install/airtime-upgrade.php | 2 ++ install/include/AirtimeInstall.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index a7fe6ff0a..705e94ddf 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -7,6 +7,8 @@ */ require_once(dirname(__FILE__).'/include/AirtimeIni.php'); +set_include_path(__DIR__.'/../library' . PATH_SEPARATOR . get_include_path()); +require_once __DIR__.'/../application/configs/conf.php'; require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); AirtimeIni::ExitIfNotRoot(); diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index 8bacffe85..cf8c22738 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -171,7 +171,7 @@ class AirtimeInstall { $sql = "DELETE FROM cc_pref WHERE keystr = 'system_version'"; $CC_DBC->query($sql); - $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', $p_version)"; + $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '$p_version')"; $result = $CC_DBC->query($sql); if (PEAR::isError($result)) { return false; From 833e3b20feb174378d48dc39a63a011c253b5f2b Mon Sep 17 00:00:00 2001 From: Naomi Date: Tue, 12 Apr 2011 14:41:33 -0400 Subject: [PATCH 5/6] CC-2172 : Create Upgrade structure so that a user can upgrade from any version of Airtime properly --- install/airtime-upgrade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index 705e94ddf..b1dda7246 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -32,7 +32,7 @@ if(strcmp($version, "1.8.0") < 0) { system("php ".__DIR__."/upgrades/airtime-1.8/airtime-upgrade.php"); } -AirtimeInstall::SetAirtimeVersion("1.8.0"); +AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION); echo "******************************* Update Complete *******************************".PHP_EOL; From dd4270d3675a52cce857ecb37dbe5631b26cdf08 Mon Sep 17 00:00:00 2001 From: Naomi Date: Tue, 12 Apr 2011 14:51:29 -0400 Subject: [PATCH 6/6] CC-2172 : Create Upgrade structure so that a user can upgrade from any version of Airtime properly --- install/airtime-install.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install/airtime-install.php b/install/airtime-install.php index 8b203f6df..2ba44be24 100644 --- a/install/airtime-install.php +++ b/install/airtime-install.php @@ -52,6 +52,7 @@ system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); echo PHP_EOL."*** Recorder Installation ***".PHP_EOL; system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py"); +AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION); echo "******************************* Install Complete *******************************".PHP_EOL;