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

Merge branch 'saas' into saas-embed-player

Browse source
This commit is contained in:
drigato 2015-04-09 15:09:03 -04:00
commit fbcd5bc5bd
16 changed files with 141 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/ApiController.php
View file

@ -1074,7 +1074,9 @@ class ApiController extends Zend_Controller_Action
$dir->getId(),$all=false);
foreach ($files as $f) {
// if the file is from this mount
if (substr($f->getFilePath(), 0, strlen($rd)) === $rd) {
$filePaths = $f->getFilePaths();
$filePath = $filePaths[0];
if (substr($filePath, 0, strlen($rd)) === $rd) {
$f->delete();
}
}

2
airtime_mvc/application/controllers/LibraryController.php
View file

@ -356,6 +356,8 @@ class LibraryController extends Zend_Controller_Action
$res = $file->delete();
} catch (FileNoPermissionException $e) {
$message = $noPermissionMsg;
} catch (DeleteScheduledFileException $e) {
$message = _("Could not delete file because it is scheduled in the future.");
} catch (Exception $e) {
//could throw a scheduled in future exception.
$message = _("Could not delete file(s).");