mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wrong root dir name

This commit is contained in:
Morris Jobke 2013-04-09 13:44:54 +02:00
parent a878bd9923
commit b393c91a96
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/ajax/rename.php
View File

@ -13,7 +13,7 @@ $newname = stripslashes($_GET["newname"]);
$l = OC_L10N::get('files');
if ( $newname !== '.' and ($dir != '' || $file != 'Shared') and $newname !== 'Shared' ) {
if ( $newname !== '.' and ($dir != '/' || $file != 'Shared') and ($dir !== '/' || $newname !== 'Shared') ) {
$targetFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $newname);
$sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
@ -21,7 +21,7 @@ if ( $newname !== '.' and ($dir != '' || $file != 'Shared') and $newname !== 'Sh
} else {
OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));
}
} elseif( $newname === 'Shared' ) {
} elseif( $dir === '/' and $newname === 'Shared' ) {
OCP\JSON::error(array("data" => array( "message" => $l->t("Invalid folder name. Usage of 'Shared' is reserved by Owncloud") )));
} else {
OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));