mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10891 from owncloud/files-moveoperationcatchexception 

Catch exceptions when moving files
This commit is contained in:
Vincent Petry 2014-09-08 15:09:02 +02:00
parent 637cff68ac e43c9b84c4
commit bd63f475bc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/ajax/move.php
View File

@ -19,11 +19,17 @@ if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) {
if ($target != '' || strtolower($file) != 'shared') { if ($target != '' || strtolower($file) != 'shared') {
$targetFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file); $targetFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file);
$sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file); $sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
try {
if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) { if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file ))); OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
} else { } else {
OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) ))); OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) )));
} }
} catch (\OCP\Files\NotPermittedException $e) {
OCP\JSON::error(array("data" => array( "message" => $l->t("Permission denied") )));
} catch (\Exception $e) {
OCP\JSON::error(array("data" => array( "message" => $e->getMessage())));
}
}else{ }else{
OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) ))); OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) )));
} }