Merge pull request #6148 from owncloud/fix_trash_restore

Fix restore anbd delete operations in trash bin

apps/files_trashbin/ajax/delete.php

@@ -4,14 +4,24 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
 // "empty trash" command
-$deleteAll = false;
 if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true'){
-	$user = \OCP\User::getUser();
-	$list = OCA\Files_Trashbin\Helper::getTrashFiles('/');
 	$deleteAll = true;
-	$dirlisting = '0';
+	$folder = isset($_POST['dir']) ? $_POST['dir'] : '/';
+	if ($folder === '/' || $folder === '') {
+		OCA\Files_Trashbin\Trashbin::deleteAll();
+		$list = array();
+	} else {
+		$dirname = dirname($folder);
+		if ( $dirname !== '/' && $dirname !== '.' ) {
+			$dirlisting = '1';
+		} else {
+			$dirlisting = '0';
+		}
+		$list[] = $folder;
+	}
 }
 else {
+	$deleteAll = false;
 	$files = $_POST['files'];
 	$dirlisting = $_POST['dirlisting'];
 	$list = json_decode($files);
@@ -19,19 +29,13 @@ else {
 $error = array();
 $success = array();
 
-
 $i = 0;
 foreach ($list as $file) {
 	if ( $dirlisting === '0') {
-		if ($deleteAll) {
-			$filename = $file['name'];
-			$timestamp = $file['timestamp'];
-		}
-		else {
-			$delimiter = strrpos($file, '.d');
-			$filename = substr($file, 0, $delimiter);
-			$timestamp =  substr($file, $delimiter+2);
-		}
+		$file = ltrim($file, '/');
+		$delimiter = strrpos($file, '.d');
+		$filename = substr($file, 0, $delimiter);
+		$timestamp =  substr($file, $delimiter+2);
 	} else {
 		$filename = $file;
 		$timestamp = null;

apps/files_trashbin/ajax/undelete.php

@@ -13,6 +13,7 @@ $success = array();
 $i = 0;
 foreach ($list as $file) {
 	if ( $dirlisting === '0') {
+		$file = ltrim($file, '/');
 		$delimiter = strrpos($file, '.d');
 		$filename = substr($file, 0, $delimiter);
 		$timestamp =  substr($file, $delimiter+2);

apps/files_trashbin/js/trash.js

@@ -8,7 +8,7 @@ $(document).ready(function() {
 			deleteAction.removeClass('delete-icon').addClass('progress-icon');
 			disableActions();
 			$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'),
-					{files: JSON.stringify([filename]), dirlisting: tr.attr('data-dirlisting')},
+					{files: JSON.stringify([$('#dir').val() + '/' + filename]), dirlisting: tr.attr('data-dirlisting')},
 					function(result) {
 						for (var i = 0; i < result.data.success.length; i++) {
 							var row = document.getElementById(result.data.success[i].filename);
@@ -35,7 +35,7 @@ $(document).ready(function() {
 		deleteAction.removeClass('delete-icon').addClass('progress-icon');
 		disableActions();
 		$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'),
-				{files: JSON.stringify([filename]), dirlisting: tr.attr('data-dirlisting')},
+				{files: JSON.stringify([$('#dir').val() + '/' +filename]), dirlisting: tr.attr('data-dirlisting')},
 				function(result) {
 					for (var i = 0; i < result.data.success.length; i++) {
 						var row = document.getElementById(result.data.success[i].filename);
@@ -136,7 +136,8 @@ $(document).ready(function() {
 		var params = {};
 		if (allFiles) {
 			params = {
-			   allfiles: true
+			   allfiles: true,
+			   dir: $('#dir').val()
 			};
 		}
 		else {
@@ -229,7 +230,7 @@ function getSelectedFiles(property){
 	elements.each(function(i,element){
 		var file={
 			name:$(element).attr('data-filename'),
-			file:$(element).attr('data-file'),
+			file:$('#dir').val() + "/" + $(element).attr('data-file'),
 			timestamp:$(element).attr('data-timestamp'),
 			type:$(element).attr('data-type'),
 			dirlisting:$(element).attr('data-dirlisting')

apps/files_trashbin/lib/trashbin.php

@@ -564,6 +564,21 @@ class Trashbin {
 		return $size;
 	}
 
+	/**
+	 * @brief delete all files from the trash
+	 */
+	public static function deleteAll() {
+		$user = \OCP\User::getUser();
+		$view = new \OC\Files\View('/' . $user);
+		$view->deleteAll('files_trashbin');
+		self::setTrashbinSize($user, 0);
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
+		$query->execute(array($user));
+
+		return true;
+	}
+
+
 	/**
 	 * @brief delete file from trash bin permanently
 	 *