Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SAAS-922 take 2

This commit is contained in:
Albert Santoni 2015-07-15 13:12:56 -04:00
parent 934b3fb764
commit ffb55de566
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/application/models/airtime/CcFiles.php
View File

@ -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;
}
/**

1
airtime_mvc/application/services/MediaService.php
View File

@ -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