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 15:52:49 -04:00
parent 0c0c65f69b c586e3e2b8
commit 9a0abb29b3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,8 @@ 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 = substr($fullPath, strlen($basePath)); $relativePath = substr($fullPath, strlen($basePath)-1);
} else { } else {
$relativePath = $_FILES["file"]["name"]; $relativePath = $_FILES["file"]["name"];
} }