From ffb55de566ce19bbbbdf9df17139e391bb9de834 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 15 Jul 2015 13:12:56 -0400 Subject: [PATCH] SAAS-922 take 2 --- airtime_mvc/application/models/airtime/CcFiles.php | 14 +++++--------- airtime_mvc/application/services/MediaService.php | 1 + 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/airtime_mvc/application/models/airtime/CcFiles.php b/airtime_mvc/application/models/airtime/CcFiles.php index c574c9d7c..498276f2b 100644 --- a/airtime_mvc/application/models/airtime/CcFiles.php +++ b/airtime_mvc/application/models/airtime/CcFiles.php @@ -363,14 +363,6 @@ class CcFiles extends BaseCcFiles { unset($response[$key]); } - $mime = $file->getDbMime(); - if (!empty($mime)) { - // Get an extension based on the file's mime type and change the path to use this extension - $path = pathinfo($file->getDbFilepath()); - $ext = FileDataHelper::getFileExtensionFromMime($mime); - $response["filepath"] = ($path["dirname"] . '/' . $path["filename"] . $ext); - } - return $response; } @@ -385,8 +377,12 @@ class CcFiles extends BaseCcFiles { public function getFilename() { $info = pathinfo($this->getAbsoluteFilePath()); + //filename doesn't contain the extension because PHP is awful - return $info['filename'].".".$info['extension']; + $mime = $this->getDbMime(); + $extension = FileDataHelper::getFileExtensionFromMime($mime); + + return $info['filename'].".".$extension; } /** diff --git a/airtime_mvc/application/services/MediaService.php b/airtime_mvc/application/services/MediaService.php index 55eaeff37..807d6de17 100644 --- a/airtime_mvc/application/services/MediaService.php +++ b/airtime_mvc/application/services/MediaService.php @@ -62,6 +62,7 @@ class Application_Service_MediaService if ($media->getPropelOrm()->isValidPhysicalFile()) { $filename = $media->getPropelOrm()->getFilename(); + //Download user left clicks a track and selects Download. if (!$inline) { //We are using Content-Disposition to specify