cleanup OC_Files a bit

5 files changed, 34 insertions, 20 deletions

diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 57c8c15c197..ae6158a05aa 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -12,17 +12,22 @@ $files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_P
 
 $files = explode(';', $files);
 $filesWithError = '';
-$success = true;
-//Now delete
-foreach($files as $file) {
-	if( !OC_Files::delete( $dir, $file )) {
-		$filesWithError .= $file . "\n";
-		$success = false;
+if (OC_User::isLoggedIn()) {
+	$success = true;
+
+	//Now delete
+	foreach ($files as $file) {
+		if ($dir != '' || $file != 'Shared' && !\OC\Files\Filesystem::unlink($dir . '/' . $file)) {
+			$filesWithError .= $file . "\n";
+			$success = false;
+		}
 	}
+} else {
+	$success = false;
 }
 
-if($success) {
-	OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $files )));
+if ($success) {
+	OCP\JSON::success(array("data" => array("dir" => $dir, "files" => $files)));
 } else {
-	OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError )));
+	OCP\JSON::error(array("data" => array("message" => "Could not delete:\n" . $filesWithError)));
 }
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index 8b3149ef14e..f8727831228 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -11,9 +11,14 @@ $dir = stripslashes($_GET["dir"]);
 $file = stripslashes($_GET["file"]);
 $target = stripslashes($_GET["target"]);
 
-
-if(OC_Files::move($dir, $file, $target, $file)) {
-	OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
-} else {
+if (OC_User::isLoggedIn() && ($dir != '' || $file != 'Shared')) {
+	$targetFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
+	$sourceFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file);
+	if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
+		OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
+	} else {
+		OCP\JSON::error(array("data" => array( "message" => "Could not move $file" )));
+	}
+}else{
 	OCP\JSON::error(array("data" => array( "message" => "Could not move $file" )));
 }
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 4d73970b68d..f94d984d5ba 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -82,7 +82,7 @@ if($source) {
 			OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id)));
 			exit();
 		}
-	}elseif(OC_Files::newFile($dir, $filename, 'file')) {
+	}elseif(\OC\Files\Filesystem::touch($dir . '/' . $filename)) {
 		$meta = OC_FileCache::get($dir.'/'.$filename);
 		$id = OC_FileCache::getId($dir.'/'.$filename);
 		OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id)));
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index 0f1f2f14eb0..c36c2084551 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -19,7 +19,7 @@ if(strpos($foldername, '/')!==false) {
 	exit();
 }
 
-if(OC_Files::newFile($dir, stripslashes($foldername), 'dir')) {
+if(\OC\Files\Filesystem::mkdir($dir . '/' . stripslashes($foldername))) {
 	if ( $dir != '/') {
 		$path = $dir.'/'.$foldername;
 	} else {
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index 45448279fa1..a2b9b8de257 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( OC_Files::move( $dir, $file, $dir, $newname )) {
-	OCP\JSON::success(array("data" => array( "dir" => $dir, "file" => $file, "newname" => $newname )));
-}
-else{
+if (OC_User::isLoggedIn() && ($dir != '' || $file != 'Shared')) {
+	$targetFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
+	$sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $newname);
+	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" )));
 }