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

Insert leading slash into basedir for station URL

This commit is contained in:
Albert Santoni 2015-02-25 16:09:08 -05:00
parent 1ad024ca8d
commit 5acad059de
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/common/HTTPHelper.php
View File

@ -31,6 +31,9 @@ class Application_Common_HTTPHelper
if (empty($baseDir)) { if (empty($baseDir)) {
$baseDir = "/"; $baseDir = "/";
} }
if ($baseDir[0] != "") {
$baseDir = "/" . $baseDir;
}
$stationUrl = "$scheme://${baseUrl}:${basePort}${baseDir}"; $stationUrl = "$scheme://${baseUrl}:${basePort}${baseDir}";
return $stationUrl; return $stationUrl;

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

@ -160,7 +160,7 @@ class CcFiles extends BaseCcFiles {
throw new Exception("Bad file extension."); throw new Exception("Bad file extension.");
} }
$callbackUrl = Application_Common_HTTPHelper::getStationUrl() . "rest/media/" . $file->getPrimaryKey(); $callbackUrl = Application_Common_HTTPHelper::getStationUrl() . "/rest/media/" . $file->getPrimaryKey();
Application_Service_MediaService::importFileToLibrary($callbackUrl, $filePath, Application_Service_MediaService::importFileToLibrary($callbackUrl, $filePath,
$originalFilename, self::getOwnerId(), $copyFile); $originalFilename, self::getOwnerId(), $copyFile);