wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More error catching in list.php

Browse source
This commit is contained in:
Robin Appelman 2014-07-01 14:58:17 +02:00
parent 8061a4ccc0
commit 8339618ead
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/files/ajax/list.php
View file

@ -1,12 +1,14 @@
<?php <?php
try { OCP\JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn(); \OC::$session->close();
\OC::$session->close(); $l = OC_L10N::get('files');
// Load the files // Load the files
$dir = isset($_GET['dir']) ? $_GET['dir'] : ''; $dir = isset($_GET['dir']) ? $_GET['dir'] : '';
$dir = \OC\Files\Filesystem::normalizePath($dir); $dir = \OC\Files\Filesystem::normalizePath($dir);
try {
$dirInfo = \OC\Files\Filesystem::getFileInfo($dir); $dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
if (!$dirInfo || !$dirInfo->getType() === 'dir') { if (!$dirInfo || !$dirInfo->getType() === 'dir') {
header("HTTP/1.0 404 Not Found"); header("HTTP/1.0 404 Not Found");
@ -30,11 +32,24 @@ try {
OCP\JSON::success(array('data' => $data)); OCP\JSON::success(array('data' => $data));
} catch (\OCP\Files\StorageNotAvailableException $e) { } catch (\OCP\Files\StorageNotAvailableException $e) {
$l = OC_L10N::get('files');
OCP\JSON::error(array( OCP\JSON::error(array(
'data' => array( 'data' => array(
'exception' => '\OCP\Files\StorageNotAvailableException', 'exception' => '\OCP\Files\StorageNotAvailableException',
'message' => $l->t('Storage not available') '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')
)
));
} }