From 7607bce6c83308716ffe663ff55fe4d1f84aed42 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 24 Jun 2011 16:04:57 -0400 Subject: [PATCH] CC-2403: Downloading a file via the web UI returns an absolute path, not relative -fixed to take into account the base URL. --- airtime_mvc/application/controllers/LibraryController.php | 4 +++- airtime_mvc/application/models/StoredFile.php | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index c474f6639..7de2dc274 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -55,6 +55,8 @@ class LibraryController extends Zend_Controller_Action $id = $this->_getParam('id'); $type = $this->_getParam('type'); + $request = $this->getRequest(); + $baseUrl = $request->getBaseUrl(); $params = '/format/json/id/#id#/type/#type#'; @@ -79,7 +81,7 @@ class LibraryController extends Zend_Controller_Action $file_id = $this->_getParam('id', null); $file = StoredFile::Recall($file_id); - $url = $file->getRelativeFileUrl().'/api_key/'.$CC_CONFIG["apiKey"][0].'/download/true'; + $url = $file->getRelativeFileUrl($baseUrl).'/api_key/'.$CC_CONFIG["apiKey"][0].'/download/true'; $menu[] = array('action' => array('type' => 'gourl', 'url' => $url), 'title' => 'Download'); diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 951591d47..a6f79b1c8 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -449,10 +449,9 @@ class StoredFile { * Sometimes we want a relative URL and not a full URL. See bug * http://dev.sourcefabric.org/browse/CC-2403 */ - public function getRelativeFileUrl() + public function getRelativeFileUrl($baseUrl) { - global $CC_CONFIG; - return "api/get-media/file/".$this->getGunId().".".$this->getFileExtension(); + return $baseUrl."/api/get-media/file/".$this->getGunId().".".$this->getFileExtension(); } public static function Insert($md=null)