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
192 lines
6.5 KiB
PHP
192 lines
6.5 KiB
PHP
<?php
|
|
|
|
// Firefox and Konqueror tries to download application/json for me. --Arthur
|
|
OCP\JSON::setContentTypeHeader('text/plain');
|
|
|
|
// If a directory token is sent along check if public upload is permitted.
|
|
// If not, check the login.
|
|
// If no token is sent along, rely on login only
|
|
|
|
$allowedPermissions = OCP\PERMISSION_ALL;
|
|
$errorCode = null;
|
|
|
|
$l = OC_L10N::get('files');
|
|
if (empty($_POST['dirToken'])) {
|
|
// The standard case, files are uploaded through logged in users :)
|
|
OCP\JSON::checkLoggedIn();
|
|
$dir = isset($_POST['dir']) ? $_POST['dir'] : "";
|
|
if (!$dir || empty($dir) || $dir === false) {
|
|
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
|
|
die();
|
|
}
|
|
} else {
|
|
// TODO: ideally this code should be in files_sharing/ajax/upload.php
|
|
// and the upload/file transfer code needs to be refactored into a utility method
|
|
// that could be used there
|
|
|
|
// return only read permissions for public upload
|
|
$allowedPermissions = OCP\PERMISSION_READ;
|
|
$public_directory = !empty($_POST['subdir']) ? $_POST['subdir'] : '/';
|
|
|
|
$linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
|
|
if ($linkItem === false) {
|
|
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
|
|
die();
|
|
}
|
|
|
|
if (!($linkItem['permissions'] & OCP\PERMISSION_CREATE)) {
|
|
OCP\JSON::checkLoggedIn();
|
|
} else {
|
|
// resolve reshares
|
|
$rootLinkItem = OCP\Share::resolveReShare($linkItem);
|
|
|
|
OCP\JSON::checkUserExists($rootLinkItem['uid_owner']);
|
|
// Setup FS with owner
|
|
OC_Util::tearDownFS();
|
|
OC_Util::setupFS($rootLinkItem['uid_owner']);
|
|
|
|
// The token defines the target directory (security reasons)
|
|
$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
|
|
$dir = sprintf(
|
|
"/%s/%s",
|
|
$path,
|
|
$public_directory
|
|
);
|
|
|
|
if (!$dir || empty($dir) || $dir === false) {
|
|
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
|
|
die();
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
OCP\JSON::callCheck();
|
|
if (!\OCP\App::isEnabled('files_encryption')) {
|
|
// encryption app need to create keys later, so can't close too early
|
|
\OC::$session->close();
|
|
}
|
|
|
|
|
|
// get array with current storage stats (e.g. max file size)
|
|
$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
|
|
|
|
if (!isset($_FILES['files'])) {
|
|
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('No file was uploaded. Unknown error')), $storageStats)));
|
|
exit();
|
|
}
|
|
|
|
foreach ($_FILES['files']['error'] as $error) {
|
|
if ($error != 0) {
|
|
$errors = array(
|
|
UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'),
|
|
UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ')
|
|
. ini_get('upload_max_filesize'),
|
|
UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
|
|
UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'),
|
|
UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'),
|
|
UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'),
|
|
UPLOAD_ERR_CANT_WRITE => $l->t('Failed to write to disk'),
|
|
);
|
|
OCP\JSON::error(array('data' => array_merge(array('message' => $errors[$error]), $storageStats)));
|
|
exit();
|
|
}
|
|
}
|
|
$files = $_FILES['files'];
|
|
|
|
$error = false;
|
|
|
|
$maxUploadFileSize = $storageStats['uploadMaxFilesize'];
|
|
$maxHumanFileSize = OCP\Util::humanFileSize($maxUploadFileSize);
|
|
|
|
$totalSize = 0;
|
|
foreach ($files['size'] as $size) {
|
|
$totalSize += $size;
|
|
}
|
|
if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) {
|
|
OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'),
|
|
'uploadMaxFilesize' => $maxUploadFileSize,
|
|
'maxHumanFilesize' => $maxHumanFileSize)));
|
|
exit();
|
|
}
|
|
|
|
$result = array();
|
|
if (strpos($dir, '..') === false) {
|
|
$fileCount = count($files['name']);
|
|
for ($i = 0; $i < $fileCount; $i++) {
|
|
// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
|
|
if (isset($_POST['resolution']) && $_POST['resolution']==='autorename') {
|
|
// append a number in brackets like 'filename (2).ext'
|
|
$target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
|
|
} else {
|
|
$target = \OC\Files\Filesystem::normalizePath(stripslashes($dir).'/'.$files['name'][$i]);
|
|
}
|
|
|
|
$directory = \OC\Files\Filesystem::normalizePath(stripslashes($dir));
|
|
if (isset($public_directory)) {
|
|
// If we are uploading from the public app,
|
|
// we want to send the relative path in the ajax request.
|
|
$directory = $public_directory;
|
|
}
|
|
|
|
if ( ! \OC\Files\Filesystem::file_exists($target)
|
|
|| (isset($_POST['resolution']) && $_POST['resolution']==='replace')
|
|
) {
|
|
// upload and overwrite file
|
|
try
|
|
{
|
|
if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
|
|
|
|
// updated max file size after upload
|
|
$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
|
|
|
|
$meta = \OC\Files\Filesystem::getFileInfo($target);
|
|
if ($meta === false) {
|
|
$error = $l->t('The target folder has been moved or deleted.');
|
|
$errorCode = 'targetnotfound';
|
|
} else {
|
|
$data = \OCA\Files\Helper::formatFileInfo($meta);
|
|
$data['status'] = 'success';
|
|
$data['originalname'] = $files['tmp_name'][$i];
|
|
$data['uploadMaxFilesize'] = $maxUploadFileSize;
|
|
$data['maxHumanFilesize'] = $maxHumanFileSize;
|
|
$data['permissions'] = $meta['permissions'] & $allowedPermissions;
|
|
$data['directory'] = $directory;
|
|
$result[] = $data;
|
|
}
|
|
|
|
} else {
|
|
$error = $l->t('Upload failed. Could not find uploaded file');
|
|
}
|
|
} catch(Exception $ex) {
|
|
$error = $ex->getMessage();
|
|
}
|
|
|
|
} else {
|
|
// file already exists
|
|
$meta = \OC\Files\Filesystem::getFileInfo($target);
|
|
if ($meta === false) {
|
|
$error = $l->t('Upload failed. Could not get file info.');
|
|
} else {
|
|
$data = \OCA\Files\Helper::formatFileInfo($meta);
|
|
$data['permissions'] = $data['permissions'] & $allowedPermissions;
|
|
$data['status'] = 'existserror';
|
|
$data['originalname'] = $files['tmp_name'][$i];
|
|
$data['uploadMaxFilesize'] = $maxUploadFileSize;
|
|
$data['maxHumanFilesize'] = $maxHumanFileSize;
|
|
$data['permissions'] = $meta['permissions'] & $allowedPermissions;
|
|
$data['directory'] = $directory;
|
|
$result[] = $data;
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
$error = $l->t('Invalid directory.');
|
|
}
|
|
|
|
if ($error === false) {
|
|
OCP\JSON::encodedPrint($result);
|
|
exit();
|
|
} else {
|
|
OCP\JSON::error(array(array('data' => array_merge(array('message' => $error, 'code' => $errorCode), $storageStats))));
|
|
}
|