diff options
| author | icewind1991 <icewind1991@gmail.com> | 2013-01-30 13:22:33 -0800 |
|---|---|---|
| committer | icewind1991 <icewind1991@gmail.com> | 2013-01-30 13:22:33 -0800 |
| commit | 0cde86ac5561f468c7218e74192cb23fb4ace0c3 (patch) | |
| tree | bcc43051351cb1f455f0482ee5a0a112e9052ac7 /apps/files/ajax/rename.php | |
| parent | 2fbf3d40900d29c04b69f0c18e4d833a312fb21c (diff) | |
| parent | 6043789394252a8f9042acfe0e62c1a5fb4e73d1 (diff) | |
| download | nextcloud-server-0cde86ac5561f468c7218e74192cb23fb4ace0c3.tar.gz nextcloud-server-0cde86ac5561f468c7218e74192cb23fb4ace0c3.zip | |
Merge pull request #673 from owncloud/filesystem
Filecache rewrite
Diffstat (limited to 'apps/files/ajax/rename.php')
| -rw-r--r-- | apps/files/ajax/rename.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php index 89b4d4bba73..970aaa638da 100644 --- a/apps/files/ajax/rename.php +++ b/apps/files/ajax/rename.php @@ -11,10 +11,14 @@ $dir = stripslashes($_GET["dir"]); $file = stripslashes($_GET["file"]); $newname = stripslashes($_GET["newname"]); -// Delete -if( $newname !== '.' and OC_Files::move( $dir, $file, $dir, $newname )) { - OCP\JSON::success(array("data" => array( "dir" => $dir, "file" => $file, "newname" => $newname ))); -} else { - $l=OC_L10N::get('files'); - OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") ))); +if ( $newname !== '.' and ($dir != '' || $file != 'Shared') and $newname !== '.') { + $targetFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $newname); + $sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file); + if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) { + OCP\JSON::success(array("data" => array( "dir" => $dir, "file" => $file, "newname" => $newname ))); + } else { + OCP\JSON::error(array("data" => array( "message" => "Unable to rename file" ))); + } +}else{ + OCP\JSON::error(array("data" => array( "message" => "Unable to rename file" ))); } |