Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-2621 : Support upgrades from 1.7.0

This commit is contained in:
Naomi Aro 2011-08-02 12:56:39 +02:00 committed by James
parent 3add6b4b63
commit 4047fcd59e
6 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install_minimal/include/AirtimeInstall.php
View File

@ -68,6 +68,14 @@ class AirtimeInstall
if (PEAR::isError($version)) {
return null;
}
$sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
$result = $CC_DBC->GetOne($sql);
if (!PEAR::isError($result)) {
$version = "1.7.0";
//echo "Airtime Version: ".$version." ".PHP_EOL;
}
// no version string detected
if($version == ''){
$version = false;

2
install_minimal/include/airtime-install.php
View File

@ -72,7 +72,7 @@ if (isset($version) && ($version != false) && ($version < AIRTIME_VERSION) && !i
}
if($version === false){
echo "A version of Airtime older than 1.8.0 detected, please upgrade to 1.8.0 first.\n";
echo "A version of Airtime older than 1.7.0 detected, please upgrade to 1.7.0 first.\n";
echo "You will then be able to upgrade to 1.9.0 using this installer.\n";
exit(3);
}

7
install_minimal/include/airtime-upgrade.php
View File

@ -12,6 +12,7 @@ set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . ge
require_once('DB.php');
require_once(__DIR__.'/../../airtime_mvc/application/configs/constants.php');
require_once(dirname(__FILE__).'/AirtimeIni.php');
require_once(dirname(__FILE__).'/AirtimeInstall.php');
if(exec("whoami") != "root"){
echo "Must be root user.\n";
@ -43,6 +44,7 @@ if (PEAR::isError($CC_DBC)) {
$CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
}
/*
$sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version'";
$version = $CC_DBC->GetOne($sql);
@ -52,7 +54,7 @@ if (PEAR::isError($version)) {
if (!$version){
$sql = "SELECT * FROM ".$p_name;
$sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
$result = $CC_DBC->GetOne($sql);
if (!PEAR::isError($result)) {
$version = "1.7.0";
@ -63,6 +65,9 @@ if (!$version){
echo "Airtime Version: ".$version." ".PHP_EOL;
}
}
*/
$version = AirtimeInstall::GetVersionInstalled();
echo "******************************** Update Begin *********************************".PHP_EOL;

4
install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
View File

@ -162,9 +162,9 @@ function LoadConfig($CC_CONFIG) {
$CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
$CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
$CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'],
$CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
// main directory for storing binary media files
$CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor",
$CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
// Database config
$CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];

4
install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
View File

@ -88,9 +88,9 @@ function LoadConfig($CC_CONFIG) {
$CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
$CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
$CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'],
$CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
// main directory for storing binary media files
$CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor",
$CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
//$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
//$CC_CONFIG['basePort'] = $values['general']['base_port'];

4
install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
View File

@ -88,9 +88,9 @@ function LoadConfig($CC_CONFIG) {
$CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
$CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
$CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'],
$CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
// main directory for storing binary media files
$CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor",
$CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
$CC_CONFIG['basePort'] = $values['general']['base_port'];