58c7042e70
Whent trying to upload/rename/create files in a folder that was removed or rename, the correct error message is now shown. In the case of upload of multiple files, the upload is cancelled. This situation can happen if the target folder was renamed or removed from another browser window or client.
65 lines
1.7 KiB
PHP
65 lines
1.7 KiB
PHP
<?php
|
|
|
|
// Init owncloud
|
|
|
|
|
|
OCP\JSON::checkLoggedIn();
|
|
OCP\JSON::callCheck();
|
|
|
|
// Get the params
|
|
$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
|
|
$foldername = isset( $_POST['foldername'] ) ? stripslashes($_POST['foldername']) : '';
|
|
|
|
$l10n = \OC_L10n::get('files');
|
|
|
|
$result = array(
|
|
'success' => false,
|
|
'data' => NULL
|
|
);
|
|
|
|
if(trim($foldername) === '') {
|
|
$result['data'] = array('message' => $l10n->t('Folder name cannot be empty.'));
|
|
OCP\JSON::error($result);
|
|
exit();
|
|
}
|
|
|
|
if(strpos($foldername, '/') !== false) {
|
|
$result['data'] = array('message' => $l10n->t('Folder name must not contain "/". Please choose a different name.'));
|
|
OCP\JSON::error($result);
|
|
exit();
|
|
}
|
|
|
|
if (!\OC\Files\Filesystem::file_exists($dir . '/')) {
|
|
$result['data'] = array('message' => (string)$l10n->t(
|
|
'The target folder has been moved or deleted.'),
|
|
'code' => 'targetnotfound'
|
|
);
|
|
OCP\JSON::error($result);
|
|
exit();
|
|
}
|
|
|
|
//TODO why is stripslashes used on foldername here but not in newfile.php?
|
|
$target = $dir . '/' . stripslashes($foldername);
|
|
|
|
if (\OC\Files\Filesystem::file_exists($target)) {
|
|
$result['data'] = array('message' => $l10n->t(
|
|
'The name %s is already used in the folder %s. Please choose a different name.',
|
|
array($foldername, $dir))
|
|
);
|
|
OCP\JSON::error($result);
|
|
exit();
|
|
}
|
|
|
|
if(\OC\Files\Filesystem::mkdir($target)) {
|
|
if ( $dir !== '/') {
|
|
$path = $dir.'/'.$foldername;
|
|
} else {
|
|
$path = '/'.$foldername;
|
|
}
|
|
$meta = \OC\Files\Filesystem::getFileInfo($path);
|
|
$id = $meta['fileid'];
|
|
OCP\JSON::success(array('data' => array('id' => $id)));
|
|
exit();
|
|
}
|
|
|
|
OCP\JSON::error(array('data' => array( 'message' => $l10n->t('Error when creating the folder') )));
|