From e7dfc08128a7f53cda1ee3e172702366c8c19735 Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 10 Jul 2014 17:59:27 -0400 Subject: [PATCH] CC-5892: Handle when a file is downloaded from the Airtime library --- .../application/controllers/ApiController.php | 12 ++++++++++++ .../controllers/AudiopreviewController.php | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 98ca2ce60..47573065d 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -81,6 +81,18 @@ class ApiController extends Zend_Controller_Action $media = Application_Model_StoredFile::RecallById($fileId); if ($media != null) { + + if ($media->isInCloud()) { + if ("true" == $this->_getParam('download')) { + header('Content-type:'.$media->getPropelOrm()->getDbMime()); + header('Content-Disposition: attachment; filename="'.$media->getResourceId().'"'); + header('Content-length:'.$media->getFileSize()); + echo $media->getCloudUrl(); + exit; + } else { + $this->_redirect($media->getCloudUrl()); + } + } $filepath = $media->getFilePath(); // Make sure we don't have some wrong result beecause of caching diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php index af5e7fa0d..e90c34a39 100644 --- a/airtime_mvc/application/controllers/AudiopreviewController.php +++ b/airtime_mvc/application/controllers/AudiopreviewController.php @@ -46,8 +46,8 @@ class AudiopreviewController extends Zend_Controller_Action } if ($type == "audioclip") { - $uri = $baseUrl."api/get-media/file/".$audioFileID; $media = Application_Model_StoredFile::RecallById($audioFileID); + $uri = $baseUrl."api/get-media/file/".$audioFileID; $mime = $media->getPropelOrm()->getDbMime(); } elseif ($type == "stream") { $webstream = CcWebstreamQuery::create()->findPk($audioFileID);