Stable9.1 chunked web upload

apps/dav/lib/Connector/Sabre/FilesPlugin.php

@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <[email protected]>
+ * @author Joas Schilling <[email protected]>
  * @author Lukas Reschke <[email protected]>
  * @author Morris Jobke <[email protected]>
  * @author Robin Appelman <[email protected]>
@@ -9,7 +10,7 @@
  * @author Thomas Müller <[email protected]>
  * @author Vincent Petry <[email protected]>
  *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, ownCloud GmbH.
  * @license AGPL-3.0
  *
  * This code is free software: you can redistribute it and/or modify
@@ -29,7 +30,6 @@
 namespace OCA\DAV\Connector\Sabre;
 
 use OC\Files\View;
-use OCA\DAV\Upload\FutureFile;
 use OCP\Files\ForbiddenException;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
@@ -43,6 +43,8 @@
 use OCP\Files\StorageNotAvailableException;
 use OCP\IConfig;
 use OCP\IRequest;
+use Sabre\DAV\Exception\BadRequest;
+use OCA\DAV\Connector\Sabre\Directory;
 
 class FilesPlugin extends ServerPlugin {
 
@@ -413,5 +415,4 @@ public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
 			}
 		}
 	}
-
 }

apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php

@@ -108,7 +108,7 @@ public function setUp() {
 	 * @param string $class
 	 * @return \PHPUnit_Framework_MockObject_MockObject
 	 */
-	private function createTestNode($class) {
+	private function createTestNode($class, $path = '/dummypath') {
 		$node = $this->getMockBuilder($class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -119,7 +119,7 @@ private function createTestNode($class) {
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
-			->with('/dummypath')
+			->with($path)
 			->will($this->returnValue($node));
 
 		$node->expects($this->any())

apps/files/appinfo/routes.php

@@ -70,24 +70,12 @@
 
 /** @var $this \OC\Route\Router */
 
-$this->create('files_ajax_delete', 'ajax/delete.php')
-	->actionInclude('files/ajax/delete.php');
 $this->create('files_ajax_download', 'ajax/download.php')
 	->actionInclude('files/ajax/download.php');
 $this->create('files_ajax_getstoragestats', 'ajax/getstoragestats.php')
 	->actionInclude('files/ajax/getstoragestats.php');
 $this->create('files_ajax_list', 'ajax/list.php')
 	->actionInclude('files/ajax/list.php');
-$this->create('files_ajax_move', 'ajax/move.php')
-	->actionInclude('files/ajax/move.php');
-$this->create('files_ajax_newfile', 'ajax/newfile.php')
-	->actionInclude('files/ajax/newfile.php');
-$this->create('files_ajax_newfolder', 'ajax/newfolder.php')
-	->actionInclude('files/ajax/newfolder.php');
-$this->create('files_ajax_rename', 'ajax/rename.php')
-	->actionInclude('files/ajax/rename.php');
-$this->create('files_ajax_upload', 'ajax/upload.php')
-	->actionInclude('files/ajax/upload.php');
 
 $this->create('download', 'download{file}')
 	->requirements(array('file' => '.*'))

apps/files/js/app.js

@@ -93,6 +93,7 @@
 						direction: $('#defaultFileSortingDirection').val()
 					},
 					config: this._filesConfig,
+					enableUpload: true
 				}
 			);
 			this.files.initialize();