diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-05 12:01:01 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-05 12:01:01 +0200 |
| commit | ccbb1cce3ce966dd8efbc18c7c6181d671df4434 (patch) | |
| tree | cb40d2f8075decf9f99647f7274911f619eb157f /apps/files/ajax/rename.php | |
| parent | c747a58978ffd1985c547f94cedec29663d73496 (diff) | |
| parent | 263bb46ff892c0a7de7852ce0ab9b9c1d2381054 (diff) | |
| download | nextcloud-server-ccbb1cce3ce966dd8efbc18c7c6181d671df4434.tar.gz nextcloud-server-ccbb1cce3ce966dd8efbc18c7c6181d671df4434.zip | |
Merge pull request #16718 from owncloud/files-catchajaxexceptions
Catch exceptions in files ajax calls
Diffstat (limited to 'apps/files/ajax/rename.php')
| -rw-r--r-- | apps/files/ajax/rename.php | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php index 576902e29e5..edb6dd7862d 100644 --- a/apps/files/ajax/rename.php +++ b/apps/files/ajax/rename.php @@ -29,15 +29,26 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); \OC::$server->getSession()->close(); +$l10n = \OC::$server->getL10N('files'); + $files = new \OCA\Files\App( \OC\Files\Filesystem::getView(), \OC::$server->getL10N('files') ); -$result = $files->rename( - isset($_GET['dir']) ? (string)$_GET['dir'] : '', - isset($_GET['file']) ? (string)$_GET['file'] : '', - isset($_GET['newname']) ? (string)$_GET['newname'] : '' -); +try { + $result = $files->rename( + isset($_GET['dir']) ? (string)$_GET['dir'] : '', + isset($_GET['file']) ? (string)$_GET['file'] : '', + isset($_GET['newname']) ? (string)$_GET['newname'] : '' + ); +} catch (\Exception $e) { + $result = [ + 'success' => false, + 'data' => [ + 'message' => $e->getMessage() + ] + ]; +} if($result['success'] === true){ OCP\JSON::success(['data' => $result['data']]); |