From b73e58551ff763a0e36e97972e14888cc57a4121 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 29 Mar 2011 14:44:51 -0400 Subject: [PATCH] CC-2128: storageUrlPort in application/configs/conf.php not being used -fixed --- application/configs/conf.php | 37 ------------------------------- application/models/StoredFile.php | 3 ++- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/application/configs/conf.php b/application/configs/conf.php index 74c3b10ac..b96db1f1d 100644 --- a/application/configs/conf.php +++ b/application/configs/conf.php @@ -61,38 +61,6 @@ $CC_CONFIG = array( 'zendPath' => dirname(__FILE__).'/../../library/Zend', 'phingPath' => dirname(__FILE__).'/../../library/phing', - // name of admin group - //'AdminsGr' => 'Admins', - - // name of station preferences group -// 'StationPrefsGr'=> 'StationPrefs', - - // name of 'all users' group - //'AllGr' => 'All', - - /* ==================================== application-specific configuration */ -// 'objtypes' => array( -// 'Storage' => array(/*'Folder',*/ 'File' /*, 'Replica'*/), -// 'File' => array(), -// 'audioclip' => array(), -// 'playlist' => array(), -// ), -// 'allowedActions'=> array( -// 'File' => array('editPrivs', 'write', 'read'), -// 'audioclip' => array('editPrivs', 'write', 'read'), -// 'playlist' => array('editPrivs', 'write', 'read'), -// ), -// 'allActions' => array( -// 'editPrivs', 'write', 'read', 'subjects' -// ), - - /* =================================================== cron configuration */ - 'cronUserName' => 'www-data', -# 'lockfile' => dirname(__FILE__).'/cron/cron.lock', - 'lockfile' => dirname(__FILE__).'/stor/buffer/cron.lock', - 'cronfile' => dirname(__FILE__).'/cron/croncall.php', - 'paramdir' => dirname(__FILE__).'/cron/params', -// 'systemPrefId' => "0", // ID for system prefs in prefs table ); // Add database table names @@ -119,11 +87,6 @@ $CC_CONFIG['permSequence'] = $CC_CONFIG['permTable'].'_id'; $CC_CONFIG['subjSequence'] = $CC_CONFIG['subjTable'].'_id'; $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id'; -// System users/groups - they cannot be deleted -//$CC_CONFIG['sysSubjs'] = array( -// 'root', /*$CC_CONFIG['AdminsGr'],*/ /*$CC_CONFIG['AllGr'],*/ $CC_CONFIG['StationPrefsGr'] -//); - // Add libs to the PHP path $old_include_path = get_include_path(); set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'] diff --git a/application/models/StoredFile.php b/application/models/StoredFile.php index ecff91caa..cd98aff60 100644 --- a/application/models/StoredFile.php +++ b/application/models/StoredFile.php @@ -1481,7 +1481,8 @@ class StoredFile { public function getFileUrl() { global $CC_CONFIG; - return "http://".$CC_CONFIG["storageUrlHost"] + return "http://$CC_CONFIG[storageUrlHost]" + .":$CC_CONFIG[storageUrlPort]" .$CC_CONFIG["apiPath"]."get-media/file/" .$this->gunid.".".$this->getFileExtension(); }