0be9de5df5
Files app: - removed file list template, now rendering list from JSON response - FileList.addFile/addDir is now FileList.add() and takes a JS map with all required arguments instead of having a long number of function arguments - added unit tests for many FileList operations - fixed newfile.php, newfolder.php and rename.php to return the file's full JSON on success - removed obsolete/unused undo code - removed download_url / loading options, now using Files.getDownloadUrl() for that - server side now uses Helper::getFileInfo() to prepare file JSON response - previews are now client-side only Breadcrumbs are now JS only: - Added BreadCrumb class to handle breadcrumb rendering and events - Added unit test for BreadCrumb class - Moved all relevant JS functions to the BreadCrumb class Public page now uses ajax to load the file list: - Added Helper class in sharing app to make it easier to authenticate and retrieve the file's real path - Added ajax/list.php to retrieve the file list - Fixed FileActions and FileList to work with the ajax list Core: - Fixed file picker dialog to use the same list format as files app
69 lines
1.6 KiB
PHP
69 lines
1.6 KiB
PHP
<?php
|
|
|
|
OCP\JSON::checkLoggedIn();
|
|
OCP\JSON::callCheck();
|
|
|
|
$files = $_POST['files'];
|
|
$dir = '/';
|
|
if (isset($_POST['dir'])) {
|
|
$dir = rtrim($_POST['dir'], '/'). '/';
|
|
}
|
|
$allFiles = false;
|
|
if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true') {
|
|
$allFiles = true;
|
|
$list = array();
|
|
$dirListing = true;
|
|
if ($dir === '' || $dir === '/') {
|
|
$dirListing = false;
|
|
}
|
|
foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir) as $file) {
|
|
$fileName = $file['name'];
|
|
if (!$dirListing) {
|
|
$fileName .= '.d' . $file['mtime'];
|
|
}
|
|
$list[] = $fileName;
|
|
}
|
|
} else {
|
|
$list = json_decode($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;
|
|
OC_Log::write('trashbin', 'can\'t restore ' . $filename, OC_Log::ERROR);
|
|
} else {
|
|
$success[$i]['filename'] = $file;
|
|
$success[$i]['timestamp'] = $timestamp;
|
|
$i++;
|
|
}
|
|
|
|
}
|
|
|
|
if ( $error ) {
|
|
$filelist = '';
|
|
foreach ( $error as $e ) {
|
|
$filelist .= $e.', ';
|
|
}
|
|
$l = OC_L10N::get('files_trashbin');
|
|
$message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
|
|
OCP\JSON::error(array("data" => array("message" => $message,
|
|
"success" => $success, "error" => $error)));
|
|
} else {
|
|
OCP\JSON::success(array("data" => array("success" => $success)));
|
|
}
|