diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-07-01 14:58:17 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-07-01 14:58:17 +0200 |
| commit | 8339618ead32bf21e76d65d0e0015cf0cd8adc1f (patch) | |
| tree | 1e6fe112c647784df515836c8c65c0331d140cac /apps/files/ajax | |
| parent | 8061a4ccc09bbd6ba675521d1f9e2ced396c862f (diff) | |
| download | nextcloud-server-8339618ead32bf21e76d65d0e0015cf0cd8adc1f.tar.gz nextcloud-server-8339618ead32bf21e76d65d0e0015cf0cd8adc1f.zip | |
More error catching in list.php
Diffstat (limited to 'apps/files/ajax')
| -rw-r--r-- | apps/files/ajax/list.php | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index b94d00ed8f9..b4641343ed4 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -1,12 +1,14 @@ <?php -try { - OCP\JSON::checkLoggedIn(); - \OC::$session->close(); +OCP\JSON::checkLoggedIn(); +\OC::$session->close(); +$l = OC_L10N::get('files'); + +// Load the files +$dir = isset($_GET['dir']) ? $_GET['dir'] : ''; +$dir = \OC\Files\Filesystem::normalizePath($dir); - // Load the files - $dir = isset($_GET['dir']) ? $_GET['dir'] : ''; - $dir = \OC\Files\Filesystem::normalizePath($dir); +try { $dirInfo = \OC\Files\Filesystem::getFileInfo($dir); if (!$dirInfo || !$dirInfo->getType() === 'dir') { header("HTTP/1.0 404 Not Found"); @@ -30,11 +32,24 @@ try { OCP\JSON::success(array('data' => $data)); } catch (\OCP\Files\StorageNotAvailableException $e) { - $l = OC_L10N::get('files'); OCP\JSON::error(array( 'data' => array( 'exception' => '\OCP\Files\StorageNotAvailableException', 'message' => $l->t('Storage not available') ) )); +} catch (\OCP\Files\StorageInvalidException $e) { + OCP\JSON::error(array( + 'data' => array( + 'exception' => '\OCP\Files\StorageInvalidException', + 'message' => $l->t('Storage invalid') + ) + )); +} catch (\Exception $e) { + OCP\JSON::error(array( + 'data' => array( + 'exception' => '\Exception', + 'message' => $l->t('Unknown error') + ) + )); } |