diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-10-22 23:13:18 +0300 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-10-24 22:45:00 +0300 |
commit | 7a6dbeb3986b76740a4b19ea3553118d226f51c7 (patch) | |
tree | 4cb6cb43fe53187631671f325ced010964dadefd /apps | |
parent | e73a11d1060320917343679b15c126f0076ac46b (diff) |
Make files_drop work
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/dav/appinfo/v1/publicwebdav.php | 12 | ||||
-rw-r--r-- | apps/dav/lib/Files/Sharing/FilesDropPlugin.php | 82 | ||||
-rw-r--r-- | apps/files_sharing/js/files_drop.js | 40 |
3 files changed, 124 insertions, 10 deletions
diff --git a/apps/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php index b88c5847ab5..2177a4b3ed0 100644 --- a/apps/dav/appinfo/v1/publicwebdav.php +++ b/apps/dav/appinfo/v1/publicwebdav.php @@ -57,8 +57,9 @@ $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory( $requestUri = \OC::$server->getRequest()->getRequestUri(); $linkCheckPlugin = new \OCA\DAV\Files\Sharing\PublicLinkCheckPlugin(); +$filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin(); -$server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin) { +$server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) { $isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest'); $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application(); $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider(); @@ -72,9 +73,10 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, func $isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ; $fileId = $share->getNodeId(); + /* if (!$isReadable) { return false; - } + }*/ \OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) { return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE)); @@ -86,10 +88,14 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, func $fileInfo = $ownerView->getFileInfo($path); $linkCheckPlugin->setFileInfo($fileInfo); - return new \OC\Files\View($ownerView->getAbsolutePath($path)); + $view = new \OC\Files\View($ownerView->getAbsolutePath($path)); + $filesDropPlugin->setView($view); + + return $view; }); $server->addPlugin($linkCheckPlugin); +$server->addPlugin($filesDropPlugin); // And off we go! $server->exec(); diff --git a/apps/dav/lib/Files/Sharing/FilesDropPlugin.php b/apps/dav/lib/Files/Sharing/FilesDropPlugin.php index e69de29bb2d..bc00ea0771b 100644 --- a/apps/dav/lib/Files/Sharing/FilesDropPlugin.php +++ b/apps/dav/lib/Files/Sharing/FilesDropPlugin.php @@ -0,0 +1,82 @@ +<?php +/** + * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\DAV\Files\Sharing; + +use OC\Files\View; +use Sabre\DAV\ServerPlugin; +use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; + +/** + * Make sure that the destination is writable + */ +class FilesDropPlugin extends ServerPlugin { + + /** + * @var View + */ + private $view; + + /** + * @param View $view + */ + public function setView($view) { + $this->view = $view; + } + + /** + * This initializes the plugin. + * + * @param \Sabre\DAV\Server $server Sabre server + * + * @return void + */ + public function initialize(\Sabre\DAV\Server $server) { + $server->on('beforeMethod', [$this, 'beforeMethod']); + } + + public function beforeMethod(RequestInterface $request, ResponseInterface $response){ + $path = $request->getPath(); + + if ($this->view->file_exists($path)) { + $newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view); + + $url = $request->getBaseUrl() . $newName . '?'; + $parms = $request->getQueryParameters(); + $first = true; + foreach ($parms as $k => $v) { + if ($first) { + $url .= '?'; + $first = false; + } else { + $url .= '&'; + } + $url .= $k . '=' . $v; + } + + $request->setUrl($url); + } + + + } +} diff --git a/apps/files_sharing/js/files_drop.js b/apps/files_sharing/js/files_drop.js index 984eb06b9e3..aa993635b58 100644 --- a/apps/files_sharing/js/files_drop.js +++ b/apps/files_sharing/js/files_drop.js @@ -22,22 +22,46 @@ _template: undefined, initialize: function () { + + var filesClient = new OC.Files.Client({ + host: OC.getHost(), + port: OC.getPort(), + userName: $('#sharingToken').val(), + // note: password not be required, the endpoint + // will recognize previous validation from the session + root: OC.getRootPath() + '/public.php/webdav', + useHTTPS: OC.getProtocol() === 'https' + }); + $(document).bind('drop dragover', function (e) { // Prevent the default browser drop action: e.preventDefault(); }); var output = this.template(); $('#public-upload').fileupload({ - url: OC.linkTo('files', 'ajax/upload.php'), - dataType: 'json', + type: 'PUT', dropZone: $('#public-upload'), - formData: { - dirToken: $('#sharingToken').val() - }, + sequentialUploads: true, add: function(e, data) { var errors = []; - if(data.files[0]['size'] && data.files[0]['size'] > $('#maxFilesizeUpload').val()) { - errors.push('File is too big'); + + var name = data.files[0].name; + + var base = OC.getProtocol() + '://' + OC.getHost(); + data.url = base + OC.getRootPath() + '/public.php/webdav/' + encodeURI(name); + + data.multipart = false; + + if (!data.headers) { + data.headers = {}; + } + + var userName = filesClient.getUserName(); + var password = filesClient.getPassword(); + if (userName) { + // copy username/password from DAV client + data.headers['Authorization'] = + 'Basic ' + btoa(userName + ':' + (password || '')); } $('#drop-upload-done-indicator').addClass('hidden'); @@ -53,6 +77,8 @@ $('[data-toggle="tooltip"]').tooltip(); } }); + + return true; }, success: function (response) { if(response.status !== 'error') { |