Merge pull request #16718 from owncloud/files-catchajaxexceptions
Catch exceptions in files ajax calls
This commit is contained in:
commit
ccbb1cce3c
|
@ -54,6 +54,7 @@ $success = true;
|
|||
|
||||
//Now delete
|
||||
foreach ($files as $file) {
|
||||
try {
|
||||
if (\OC\Files\Filesystem::file_exists($dir . '/' . $file) &&
|
||||
!(\OC\Files\Filesystem::isDeletable($dir . '/' . $file) &&
|
||||
\OC\Files\Filesystem::unlink($dir . '/' . $file))
|
||||
|
@ -61,6 +62,10 @@ foreach ($files as $file) {
|
|||
$filesWithError .= $file . "\n";
|
||||
$success = false;
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$filesWithError .= $file . "\n";
|
||||
$success = false;
|
||||
}
|
||||
}
|
||||
|
||||
// get array with updated storage stats (e.g. max file size) after upload
|
||||
|
|
|
@ -78,11 +78,22 @@ $templateManager = OC_Helper::getFileTemplateManager();
|
|||
$mimeType = OC_Helper::getMimetypeDetector()->detectPath($target);
|
||||
$content = $templateManager->getTemplate($mimeType);
|
||||
|
||||
try {
|
||||
if($content) {
|
||||
$success = \OC\Files\Filesystem::file_put_contents($target, $content);
|
||||
} else {
|
||||
$success = \OC\Files\Filesystem::touch($target);
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$result = [
|
||||
'success' => false,
|
||||
'data' => [
|
||||
'message' => $e->getMessage()
|
||||
]
|
||||
];
|
||||
OCP\JSON::error($result);
|
||||
exit();
|
||||
}
|
||||
|
||||
if($success) {
|
||||
$meta = \OC\Files\Filesystem::getFileInfo($target);
|
||||
|
|
|
@ -74,6 +74,7 @@ if (\OC\Files\Filesystem::file_exists($target)) {
|
|||
exit();
|
||||
}
|
||||
|
||||
try {
|
||||
if(\OC\Files\Filesystem::mkdir($target)) {
|
||||
if ( $dir !== '/') {
|
||||
$path = $dir.'/'.$folderName;
|
||||
|
@ -85,5 +86,15 @@ if(\OC\Files\Filesystem::mkdir($target)) {
|
|||
OCP\JSON::success(array('data' => \OCA\Files\Helper::formatFileInfo($meta)));
|
||||
exit();
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$result = [
|
||||
'success' => false,
|
||||
'data' => [
|
||||
'message' => $e->getMessage()
|
||||
]
|
||||
];
|
||||
OCP\JSON::error($result);
|
||||
exit();
|
||||
}
|
||||
|
||||
OCP\JSON::error(array('data' => array( 'message' => $l10n->t('Error when creating the folder') )));
|
||||
|
|
|
@ -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')
|
||||
);
|
||||
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']]);
|
||||
|
|
Loading…
Reference in New Issue