From c66be911e66e9328d031585ea4b4ba23261de1ec Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 27 Jan 2007 17:11:02 +0000 Subject: [PATCH] Final fix for #2074 - make it easier to change the version number. You can now set the version number for PHP code in src/modules/storageServer/var/campcaster_version.php - all components look at this file to get the version number. --- campcaster/src/modules/archiveServer/var/conf.php | 2 +- campcaster/src/modules/archiveServer/var/conf.php.template | 2 +- campcaster/src/modules/htmlUI/var/ui_conf.php | 2 +- campcaster/src/modules/htmlUI/var/ui_conf.php.template | 3 ++- .../src/modules/storageServer/var/campcaster_version.php | 3 +++ campcaster/src/modules/storageServer/var/conf.php | 2 +- campcaster/src/modules/storageServer/var/conf.php.template | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 campcaster/src/modules/storageServer/var/campcaster_version.php diff --git a/campcaster/src/modules/archiveServer/var/conf.php b/campcaster/src/modules/archiveServer/var/conf.php index e57c99577..0d3870249 100644 --- a/campcaster/src/modules/archiveServer/var/conf.php +++ b/campcaster/src/modules/archiveServer/var/conf.php @@ -3,7 +3,7 @@ * ArchiveServer configuration file */ -define('CAMPCASTER_VERSION', '1.1.1'); +include(dirname(__FILE__)."/../../storageServer/var/campcaster_version.php"); /** * configuration structure: diff --git a/campcaster/src/modules/archiveServer/var/conf.php.template b/campcaster/src/modules/archiveServer/var/conf.php.template index 003f5cc2d..ca051ab8a 100644 --- a/campcaster/src/modules/archiveServer/var/conf.php.template +++ b/campcaster/src/modules/archiveServer/var/conf.php.template @@ -3,7 +3,7 @@ * ArchiveServer configuration file */ -define('CAMPCASTER_VERSION', '1.1.1'); +include(dirname(__FILE__)."/../../storageServer/var/campcaster_version.php"); /** * configuration structure: diff --git a/campcaster/src/modules/htmlUI/var/ui_conf.php b/campcaster/src/modules/htmlUI/var/ui_conf.php index 4576619cf..64bcf2183 100644 --- a/campcaster/src/modules/htmlUI/var/ui_conf.php +++ b/campcaster/src/modules/htmlUI/var/ui_conf.php @@ -11,7 +11,6 @@ if (UI_DEBUG) { error_reporting(E_ALL); } -define('UI_VERSION', 'Campcaster 1.1.1'); define('UI_VERSION_FULLNAME', 'Campcaster 1.1.1'); define('UI_TESTSTREAM_MU3_TMP', 'img/listen.m3u'); @@ -118,6 +117,7 @@ define('UI_RESTORETOKEN_KEY', 'restoreToken'); //require_once('PEAR.php'); require_once('../../../storageServer/var/conf.php'); +define('UI_VERSION', CAMPCASTER_VERSION); // extent config $CC_CONFIG = array_merge($CC_CONFIG, diff --git a/campcaster/src/modules/htmlUI/var/ui_conf.php.template b/campcaster/src/modules/htmlUI/var/ui_conf.php.template index 6807619bc..82edd91e5 100644 --- a/campcaster/src/modules/htmlUI/var/ui_conf.php.template +++ b/campcaster/src/modules/htmlUI/var/ui_conf.php.template @@ -11,7 +11,6 @@ if (UI_DEBUG) { error_reporting(E_ALL); } -define('UI_VERSION', 'Campcaster 1.1.1'); define('UI_VERSION_FULLNAME', 'Campcaster 1.1.1'); define('UI_TESTSTREAM_MU3_TMP', 'img/listen.m3u'); @@ -121,6 +120,8 @@ define('UI_BACKUPTOKEN_KEY', 'backupToken'); define('UI_RESTORETOKEN_KEY', 'restoreToken'); require_once('storage_server/var/conf.php'); +define('UI_VERSION', CAMPCASTER_VERSION); + // extent config $CC_CONFIG = array_merge($CC_CONFIG, array( diff --git a/campcaster/src/modules/storageServer/var/campcaster_version.php b/campcaster/src/modules/storageServer/var/campcaster_version.php new file mode 100644 index 000000000..ae14ad95b --- /dev/null +++ b/campcaster/src/modules/storageServer/var/campcaster_version.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/campcaster/src/modules/storageServer/var/conf.php b/campcaster/src/modules/storageServer/var/conf.php index 881abb10a..4b2873604 100644 --- a/campcaster/src/modules/storageServer/var/conf.php +++ b/campcaster/src/modules/storageServer/var/conf.php @@ -31,7 +31,7 @@ * */ -define('CAMPCASTER_VERSION', '1.1.1'); +include("campcaster_version.php"); // these are the default values for the config global $CC_CONFIG; diff --git a/campcaster/src/modules/storageServer/var/conf.php.template b/campcaster/src/modules/storageServer/var/conf.php.template index 88cb02665..2c11bd83f 100644 --- a/campcaster/src/modules/storageServer/var/conf.php.template +++ b/campcaster/src/modules/storageServer/var/conf.php.template @@ -32,7 +32,7 @@ * */ -define('CAMPCASTER_VERSION', '1.1.1'); +include("campcaster_version.php"); // these are the default values for the config