remove old trashbin api
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman
parent
a623e09868
commit
dea1e55b62
|
|
@ -1,93 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
||||||
*
|
|
||||||
* @author Bart Visscher <bartv@thisnet.nl>
|
|
||||||
* @author Björn Schießle <bjoern@schiessle.org>
|
|
||||||
* @author Lukas Reschke <lukas@statuscode.ch>
|
|
||||||
* @author Robin Appelman <robin@icewind.nl>
|
|
||||||
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
|
||||||
* @author Vincent Petry <pvince81@owncloud.com>
|
|
||||||
*
|
|
||||||
* @license AGPL-3.0
|
|
||||||
*
|
|
||||||
* This code is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License, version 3,
|
|
||||||
* as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
use OCP\ILogger;
|
|
||||||
|
|
||||||
\OC_JSON::checkLoggedIn();
|
|
||||||
\OC_JSON::callCheck();
|
|
||||||
\OC::$server->getSession()->close();
|
|
||||||
|
|
||||||
$folder = isset($_POST['dir']) ? $_POST['dir'] : '/';
|
|
||||||
|
|
||||||
// "empty trash" command
|
|
||||||
if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
|
|
||||||
$deleteAll = true;
|
|
||||||
if ($folder === '/' || $folder === '') {
|
|
||||||
OCA\Files_Trashbin\Trashbin::deleteAll();
|
|
||||||
$list = array();
|
|
||||||
} else {
|
|
||||||
$list[] = $folder;
|
|
||||||
$folder = dirname($folder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$deleteAll = false;
|
|
||||||
$files = (string)$_POST['files'];
|
|
||||||
$list = json_decode($files);
|
|
||||||
}
|
|
||||||
|
|
||||||
$folder = rtrim($folder, '/') . '/';
|
|
||||||
$error = array();
|
|
||||||
$success = array();
|
|
||||||
|
|
||||||
$i = 0;
|
|
||||||
foreach ($list as $file) {
|
|
||||||
if ($folder === '/') {
|
|
||||||
$file = ltrim($file, '/');
|
|
||||||
$delimiter = strrpos($file, '.d');
|
|
||||||
$filename = substr($file, 0, $delimiter);
|
|
||||||
$timestamp = substr($file, $delimiter+2);
|
|
||||||
} else {
|
|
||||||
$filename = $folder . '/' . $file;
|
|
||||||
$timestamp = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
|
|
||||||
if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
|
|
||||||
$error[] = $filename;
|
|
||||||
\OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', ILogger::ERROR);
|
|
||||||
}
|
|
||||||
// only list deleted files if not deleting everything
|
|
||||||
else if (!$deleteAll) {
|
|
||||||
$success[$i]['filename'] = $file;
|
|
||||||
$success[$i]['timestamp'] = $timestamp;
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $error ) {
|
|
||||||
$filelist = '';
|
|
||||||
foreach ( $error as $e ) {
|
|
||||||
$filelist .= $e.', ';
|
|
||||||
}
|
|
||||||
$l = \OC::$server->getL10N('files_trashbin');
|
|
||||||
$message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
|
|
||||||
\OC_JSON::error(array("data" => array("message" => $message,
|
|
||||||
"success" => $success, "error" => $error)));
|
|
||||||
} else {
|
|
||||||
\OC_JSON::success(array("data" => array("success" => $success)));
|
|
||||||
}
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
||||||
*
|
|
||||||
* @author Björn Schießle <bjoern@schiessle.org>
|
|
||||||
* @author Lukas Reschke <lukas@statuscode.ch>
|
|
||||||
* @author Morris Jobke <hey@morrisjobke.de>
|
|
||||||
*
|
|
||||||
* @license AGPL-3.0
|
|
||||||
*
|
|
||||||
* This code is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License, version 3,
|
|
||||||
* as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
\OC_JSON::checkLoggedIn();
|
|
||||||
\OC_JSON::callCheck();
|
|
||||||
\OC::$server->getSession()->close();
|
|
||||||
|
|
||||||
$trashStatus = OCA\Files_Trashbin\Trashbin::isEmpty(OCP\User::getUser());
|
|
||||||
|
|
||||||
\OC_JSON::success(array("data" => array("isEmpty" => $trashStatus)));
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,98 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
||||||
*
|
|
||||||
* @author Bart Visscher <bartv@thisnet.nl>
|
|
||||||
* @author Björn Schießle <bjoern@schiessle.org>
|
|
||||||
* @author Lukas Reschke <lukas@statuscode.ch>
|
|
||||||
* @author Morris Jobke <hey@morrisjobke.de>
|
|
||||||
* @author Robin Appelman <robin@icewind.nl>
|
|
||||||
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
|
||||||
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
|
||||||
* @author Vincent Petry <pvince81@owncloud.com>
|
|
||||||
*
|
|
||||||
* @license AGPL-3.0
|
|
||||||
*
|
|
||||||
* This code is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License, version 3,
|
|
||||||
* as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
use OCP\ILogger;
|
|
||||||
|
|
||||||
\OC_JSON::checkLoggedIn();
|
|
||||||
\OC_JSON::callCheck();
|
|
||||||
\OC::$server->getSession()->close();
|
|
||||||
|
|
||||||
$dir = '/';
|
|
||||||
if (isset($_POST['dir'])) {
|
|
||||||
$dir = rtrim((string)$_POST['dir'], '/'). '/';
|
|
||||||
}
|
|
||||||
$allFiles = false;
|
|
||||||
if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') {
|
|
||||||
$allFiles = true;
|
|
||||||
$list = array();
|
|
||||||
$dirListing = true;
|
|
||||||
if ($dir === '' || $dir === '/') {
|
|
||||||
$dirListing = false;
|
|
||||||
}
|
|
||||||
foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
|
|
||||||
$fileName = $file['name'];
|
|
||||||
if (!$dirListing) {
|
|
||||||
$fileName .= '.d' . $file['mtime'];
|
|
||||||
}
|
|
||||||
$list[] = $fileName;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$list = json_decode($_POST['files']);
|
|
||||||
}
|
|
||||||
|
|
||||||
$error = array();
|
|
||||||
$success = array();
|
|
||||||
|
|
||||||
$i = 0;
|
|
||||||
foreach ($list as $file) {
|
|
||||||
$path = $dir . '/' . $file;
|
|
||||||
if ($dir === '/') {
|
|
||||||
$file = ltrim($file, '/');
|
|
||||||
$delimiter = strrpos($file, '.d');
|
|
||||||
$filename = substr($file, 0, $delimiter);
|
|
||||||
$timestamp = substr($file, $delimiter+2);
|
|
||||||
} else {
|
|
||||||
$path_parts = pathinfo($file);
|
|
||||||
$filename = $path_parts['basename'];
|
|
||||||
$timestamp = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
|
|
||||||
$error[] = $filename;
|
|
||||||
\OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, ILogger::ERROR);
|
|
||||||
} else {
|
|
||||||
$success[$i]['filename'] = $file;
|
|
||||||
$success[$i]['timestamp'] = $timestamp;
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $error ) {
|
|
||||||
$filelist = '';
|
|
||||||
foreach ( $error as $e ) {
|
|
||||||
$filelist .= $e.', ';
|
|
||||||
}
|
|
||||||
$l = OC::$server->getL10N('files_trashbin');
|
|
||||||
$message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
|
|
||||||
\OC_JSON::error(array("data" => array("message" => $message,
|
|
||||||
"success" => $success, "error" => $error)));
|
|
||||||
} else {
|
|
||||||
\OC_JSON::success(array("data" => array("success" => $success)));
|
|
||||||
}
|
|
||||||
|
|
@ -34,11 +34,3 @@ $application->registerRoutes($this, [
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->create('files_trashbin_ajax_delete', 'ajax/delete.php')
|
|
||||||
->actionInclude('files_trashbin/ajax/delete.php');
|
|
||||||
$this->create('files_trashbin_ajax_isEmpty', 'ajax/isEmpty.php')
|
|
||||||
->actionInclude('files_trashbin/ajax/isEmpty.php');
|
|
||||||
$this->create('files_trashbin_ajax_undelete', 'ajax/undelete.php')
|
|
||||||
->actionInclude('files_trashbin/ajax/undelete.php');
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue