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

Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

This commit is contained in:
drigato 2014-04-28 16:20:44 -04:00
parent 9a0abb29b3 f428a2d960
commit 48742abd6b
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
airtime_mvc/application/modules/rest/controllers/MediaController.php
View File

@ -144,11 +144,24 @@ class Rest_MediaController extends Zend_Rest_Controller
if (isset($whiteList["full_path"])) { if (isset($whiteList["full_path"])) {
$fullPath = $whiteList["full_path"]; $fullPath = $whiteList["full_path"];
$basePath = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."/srv/airtime/stor/organize/" : "/srv/airtime/stor/organize/"; $basePath = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."/srv/airtime/stor/organize/" : "/srv/airtime/stor/organize/";
//$relativePath is the folder name(if one) + track name, that was uploaded via ftp
$relativePath = substr($fullPath, strlen($basePath)-1); $relativePath = substr($fullPath, strlen($basePath)-1);
//after the file is moved from organize store it's parent folder so we can delete it after
if (dirname($relativePath) != '/') {
$pathToDelete = Application_Common_OsPath::join(
$basePath,
dirname($relativePath)
);
} else {
//if the uploaded file was not in a folder, DO NOT delete
$pathToDelete = False;
}
} else { } else {
$relativePath = $_FILES["file"]["name"]; $relativePath = $_FILES["file"]["name"];
$pathToDelete = False;
} }
$file->fromArray($whiteList); $file->fromArray($whiteList);
$file->setDbOwnerId($this->getOwnerId()); $file->setDbOwnerId($this->getOwnerId());
@ -161,6 +174,11 @@ class Rest_MediaController extends Zend_Rest_Controller
$callbackUrl = $this->getRequest()->getScheme() . '://' . $this->getRequest()->getHttpHost() . $this->getRequest()->getRequestUri() . "/" . $file->getPrimaryKey(); $callbackUrl = $this->getRequest()->getScheme() . '://' . $this->getRequest()->getHttpHost() . $this->getRequest()->getRequestUri() . "/" . $file->getPrimaryKey();
$this->processUploadedFile($callbackUrl, $relativePath, $this->getOwnerId()); $this->processUploadedFile($callbackUrl, $relativePath, $this->getOwnerId());
if (!$pathToDelete) {
//delete the empty folder that was uploaded via ftp (if one)
rmdir($pathToDelete);
}
$this->getResponse() $this->getResponse()
->setHttpResponseCode(201) ->setHttpResponseCode(201)