Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SAAS-922 - additional mime-type coverage

This commit is contained in:
Duncan Sommerville 2015-07-07 15:09:06 -04:00
parent 92c9fd30b5
commit e246771af0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/common/FileDataHelper.php
View File

@ -40,6 +40,10 @@ class FileDataHelper {
return ".ogg"; return ".ogg";
} elseif ($mime == "audio/mp3" || $mime == "audio/mpeg" || $mime == "audio/mpeg3") { } elseif ($mime == "audio/mp3" || $mime == "audio/mpeg" || $mime == "audio/mpeg3") {
return ".mp3"; return ".mp3";
} elseif ($mime == "audio/mp2") {
return ".mp2";
} elseif ($mime == "audio/mp1") {
return ".mp1";
} elseif ($mime == "audio/x-flac") { } elseif ($mime == "audio/x-flac") {
return ".flac"; return ".flac";
} elseif ($mime == "audio/mp4") { } elseif ($mime == "audio/mp4") {

2
airtime_mvc/application/models/StoredFile.php
View File

@ -527,7 +527,7 @@ SQL;
*/ */
public function getRelativeFileUrl($baseUrl) public function getRelativeFileUrl($baseUrl)
{ {
return $baseUrl."api/get-media/file/".$this->getId().FileDataHelper::getFileExtensionFromMime($this->_file->getDbMime()); return $baseUrl."api/get-media/file/".$this->getId();
} }
public function getResourceId() public function getResourceId()