diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-09-08 15:09:02 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-09-08 15:09:02 +0200 |
| commit | bd63f475bc4d9c4c17caf5ad75f37dc342013dd3 (patch) | |
| tree | b7626c143bf4cd8737294da05979ec99659d0467 /apps/files | |
| parent | 637cff68ac2944d6029eb015640bbbd0e686641b (diff) | |
| parent | e43c9b84c42a8b3f4fb25a950123fbcc060d1a5a (diff) | |
| download | nextcloud-server-bd63f475bc4d9c4c17caf5ad75f37dc342013dd3.tar.gz nextcloud-server-bd63f475bc4d9c4c17caf5ad75f37dc342013dd3.zip | |
Merge pull request #10891 from owncloud/files-moveoperationcatchexception
Catch exceptions when moving files
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/ajax/move.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index 3a07554ad00..12760d4415f 100644 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -19,10 +19,16 @@ if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) { if ($target != '' || strtolower($file) != 'shared') { $targetFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file); $sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file); - if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) { - OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file ))); - } else { - OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) ))); + try { + if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) { + OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file ))); + } else { + 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{ OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) ))); |