From 779ee95834a2f4ace43f96da2d225957aef5f7d5 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 30 Jun 2016 11:10:48 +0200
Subject: [PATCH 001/219] Prevent infinite loop in search auto-nextpage

When loading the next page of search results, make sure that the loop
can end if there are no more elements in case the total doesn't match.

Also added a check to avoid recomputing the search results whenever the
setFilter() is called with the same value. This happens when navigating
away to another folder, the search field gets cleared automatically and
it calls FileList.setFilter('').
---
 apps/files/js/filelist.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 18f17a7207c2..690e5e70fdb7 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2352,13 +2352,16 @@
 		 */
 		setFilter:function(filter) {
 			var total = 0;
+			if (this._filter === filter) {
+				return;
+			}
 			this._filter = filter;
 			this.fileSummary.setFilter(filter, this.files);
 			total = this.fileSummary.getTotal();
 			if (!this.$el.find('.mask').exists()) {
 				this.hideIrrelevantUIWhenNoFilesMatch();
 			}
-			var that = this;
+
 			var visibleCount = 0;
 			filter = filter.toLowerCase();
 
@@ -2378,7 +2381,7 @@
 				if (visibleCount < total) {
 					$trs = this._nextPage(false);
 				}
-			} while (visibleCount < total);
+			} while (visibleCount < total && $trs.length > 0);
 
 			this.$container.trigger('scroll');
 		},

From 325776eaf2a744cbc1569450781d202451d3feec Mon Sep 17 00:00:00 2001
From: felixboehm <felix@webhippie.de>
Date: Mon, 4 Jul 2016 14:16:13 +0200
Subject: [PATCH 002/219] check if renamed user is still valid by reapplying
 the ldap filter (#25338)

---
 apps/user_ldap/lib/User_LDAP.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index 230c82a30455..7929394893b2 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -228,6 +228,10 @@ public function userExistsOnLDAP($user) {
 					return false;
 				}
 				$newDn = $this->access->getUserDnByUuid($uuid);
+				//check if renamed user is still valid by reapplying the ldap filter
+				if(!is_array($this->access->readAttribute($newDn, '', $this->access->connection->ldapUserFilter))) {
+					return false;
+				}
 				$this->access->getUserMapper()->setDNbyUUID($newDn, $uuid);
 				return true;
 			} catch (\Exception $e) {

From 19cf727a0f055246c83317ff745b2a64a414b063 Mon Sep 17 00:00:00 2001
From: Carlos Damken <carlos@damken.com>
Date: Tue, 5 Jul 2016 19:53:06 +0200
Subject: [PATCH 003/219] Files_Versions don't show when the files are erased

---
 apps/files_versions/lib/Storage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index 6345d4c303bc..5857b0646995 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -641,7 +641,7 @@ protected static function getAutoExpireList($time, $versions) {
 						//distance between two version too small, mark to delete
 						$toDelete[$key] = $version['path'] . '.v' . $version['version'];
 						$size += $version['size'];
-						\OCP\Util::writeLog('files_versions', 'Mark to expire '. $version['path'] .' next version should be ' . $nextVersion . " or smaller. (prevTimestamp: " . $prevTimestamp . "; step: " . $step, \OCP\Util::DEBUG);
+						\OCP\Util::writeLog('files_versions', 'Mark to expire '. $version['path'] .' next version should be ' . $nextVersion . " or smaller. (prevTimestamp: " . $prevTimestamp . "; step: " . $step, \OCP\Util::INFO);
 					} else {
 						$nextVersion = $version['version'] - $step;
 						$prevTimestamp = $version['version'];
@@ -762,7 +762,7 @@ public static function expire($filename) {
 				self::deleteVersion($versionsFileview, $path);
 				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
 				unset($allVersions[$key]); // update array with the versions we keep
-				\OCP\Util::writeLog('files_versions', "Expire: " . $path, \OCP\Util::DEBUG);
+				\OCP\Util::writeLog('files_versions', "Expire: " . $path, \OCP\Util::INFO);
 			}
 
 			// Check if enough space is available after versions are rearranged.
@@ -778,7 +778,7 @@ public static function expire($filename) {
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
 				self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
 				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED));
-				\OCP\Util::writeLog('files_versions', 'running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'] , \OCP\Util::DEBUG);
+				\OCP\Util::writeLog('files_versions', 'running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'] , \OCP\Util::INFO);
 				$versionsSize -= $version['size'];
 				$availableSpace += $version['size'];
 				next($allVersions);

From e2dbc0d0e6b8c5f26609e79614dfeb338f05b03b Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 6 Jul 2016 11:55:02 +0200
Subject: [PATCH 004/219] Ignore invalid paths in the JS file list (#25368)

---
 apps/files/js/filelist.js           | 14 ++++++++++++++
 apps/files/tests/js/filelistSpec.js | 25 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 690e5e70fdb7..7a7d26eed7c1 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1397,6 +1397,16 @@
 			return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
 		},
 
+		_isValidPath: function(path) {
+			var sections = path.split('/');
+			for (var i = 0; i < sections.length; i++) {
+				if (sections[i] === '..') {
+					return false;
+				}
+			}
+			return true;
+		},
+
 		/**
 		 * Sets the current directory name and updates the breadcrumb.
 		 * @param targetDir directory to display
@@ -1405,6 +1415,10 @@
 		 */
 		_setCurrentDir: function(targetDir, changeUrl, fileId) {
 			targetDir = targetDir.replace(/\\/g, '/');
+			if (!this._isValidPath(targetDir)) {
+				targetDir = '/';
+				changeUrl = true;
+			}
 			var previousDir = this.getCurrentDirectory(),
 				baseDir = OC.basename(targetDir);
 
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index a74e1c7328c7..d8d3057ec3e2 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1334,6 +1334,31 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.changeDirectory('/another\\subdir');
 			expect(fileList.getCurrentDirectory()).toEqual('/another/subdir');
 		});
+		it('switches to root dir when current directory is invalid', function() {
+			_.each([
+				'..',
+				'/..',
+				'../',
+				'/../',
+				'/../abc',
+				'/abc/..',
+				'/abc/../',
+				'/../abc/'
+			], function(path) {
+				fileList.changeDirectory(path);
+				expect(fileList.getCurrentDirectory()).toEqual('/');
+			});
+		});
+		it('allows paths with dotdot at the beginning or end', function() {
+			_.each([
+				'..abc',
+				'def..',
+				'...'
+			], function(path) {
+				fileList.changeDirectory(path);
+				expect(fileList.getCurrentDirectory()).toEqual(path);
+			});
+		});
 		it('switches to root dir when current directory does not exist', function() {
 			fileList.changeDirectory('/unexist');
 			deferredList.reject(404);

From 513e4aac85133b722d970064c26f4ebc74bf75c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 6 Jul 2016 21:28:17 +0200
Subject: [PATCH 005/219] Cap LDAP user cache (#25326)


From 8b601c567d20efc7edacf12e5901e600234c76b2 Mon Sep 17 00:00:00 2001
From: VicDeo <dubiniuk@owncloud.com>
Date: Wed, 6 Jul 2016 23:08:34 +0300
Subject: [PATCH 006/219] Bypass upgrade page when occ controller is requested
 (#25366)


From 0ec43a4f0f0872bbfda9d61d69c887f8ea48927c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Thu, 7 Jul 2016 12:28:26 +0200
Subject: [PATCH 007/219] [stable9.1] Use named parameter instead of direct
 value for system tags search param (#25380) (#25395)

---
 lib/private/SystemTag/SystemTagManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/SystemTag/SystemTagManager.php b/lib/private/SystemTag/SystemTagManager.php
index 2b0ef03e471d..7055fafbf248 100644
--- a/lib/private/SystemTag/SystemTagManager.php
+++ b/lib/private/SystemTag/SystemTagManager.php
@@ -142,7 +142,7 @@ public function getAllTags($visibilityFilter = null, $nameSearchPattern = null)
 			$query->andWhere(
 				$query->expr()->like(
 					'name',
-					$query->expr()->literal('%' . $this->connection->escapeLikeParameter($nameSearchPattern). '%')
+					$query->createNamedParameter('%' . $this->connection->escapeLikeParameter($nameSearchPattern). '%')
 				)
 			);
 		}

From 830c1f2fbfe560f42912315dc423b30578125905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Fri, 8 Jul 2016 09:15:38 +0200
Subject: [PATCH 008/219] [stable9.1] Set content type when downloading log
 file to force download in some browsers (#25382) (#25397)

---
 settings/Controller/LogSettingsController.php           | 1 +
 tests/Settings/Controller/LogSettingsControllerTest.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php
index 4863c2369be2..f9a69fa38c8b 100644
--- a/settings/Controller/LogSettingsController.php
+++ b/settings/Controller/LogSettingsController.php
@@ -105,6 +105,7 @@ public function getEntries($count=50, $offset=0) {
 	 */
 	public function download() {
 		$resp = new StreamResponse(\OC\Log\Owncloud::getLogFilePath());
+		$resp->addHeader('Content-Type', 'application/octet-stream');
 		$resp->addHeader('Content-Disposition', 'attachment; filename="owncloud.log"');
 		return $resp;
 	}
diff --git a/tests/Settings/Controller/LogSettingsControllerTest.php b/tests/Settings/Controller/LogSettingsControllerTest.php
index 092c04aecc7a..1660369fafe9 100644
--- a/tests/Settings/Controller/LogSettingsControllerTest.php
+++ b/tests/Settings/Controller/LogSettingsControllerTest.php
@@ -71,5 +71,8 @@ public function testDownload() {
 		$response = $this->logSettingsController->download();
 
 		$this->assertInstanceOf('\OCP\AppFramework\Http\StreamResponse', $response);
+		$headers = $response->getHeaders();
+		$this->assertEquals('application/octet-stream', $headers['Content-Type']);
+		$this->assertEquals('attachment; filename="owncloud.log"', $headers['Content-Disposition']);
 	}
 }

From 0ddbf5c9812d869db7df4473637927edaa0da9b1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 8 Jul 2016 16:56:13 +0200
Subject: [PATCH 009/219] [stable9.1] Revert invalid commits from
 master->stable9.1 merge (#25420)

* Revert "Merge pull request #25240 from owncloud/remove-svg"

This reverts commit 8b8d2b679a12f703141de9da71340f1f02151f3d, reversing
changes made to a35747b6fa8f7704bf7333f16a2b867b76acb187.

* Revert "Merge pull request #25253 from owncloud/users-fixotherquotadropdown"

This reverts commit a35747b6fa8f7704bf7333f16a2b867b76acb187, reversing
changes made to a573b6863cbb4eb21feb7fe5a17a9b8fc60cf059.

* Revert "Merge pull request #25314 from owncloud/files_external-backends-config"

This reverts commit a573b6863cbb4eb21feb7fe5a17a9b8fc60cf059, reversing
changes made to 8147eefaeba3822c9331283e973006ad3aeac1f5.

* Revert "Add all properties while creating a subscription (#25318)"

This reverts commit aaf4c3073af2511ab895e982cadae8dc6a143e55.

* Revert "Merge pull request #25276 from owncloud/delete-own-session-token"

This reverts commit e42ce62ce2855c95861eeae669508e5c20f99be4, reversing
changes made to aaf4c3073af2511ab895e982cadae8dc6a143e55.

* Revert "Merge pull request #25262 from owncloud/fed-sharing-error"

This reverts commit 027715f9acba4dc314a7e4c63ac41a58d4e33f22, reversing
changes made to e42ce62ce2855c95861eeae669508e5c20f99be4.
---
 apps/dav/lib/CalDAV/CalDavBackend.php         |  25 ++---
 .../tests/unit/CalDAV/CalDavBackendTest.php   |   8 +-
 .../lib/FederatedShareProvider.php            |  59 ++++------
 .../tests/FederatedShareProviderTest.php      |  60 +---------
 apps/files_external/lib/Command/Backends.php  |  21 +---
 core/img/actions/add.png                      | Bin 0 -> 132 bytes
 core/img/actions/caret-dark.png               | Bin 0 -> 128 bytes
 core/img/actions/caret.png                    | Bin 0 -> 127 bytes
 .../img/actions/checkbox-checked-disabled.png | Bin 0 -> 233 bytes
 core/img/actions/checkbox-checked-white.png   | Bin 0 -> 267 bytes
 core/img/actions/checkbox-checked.png         | Bin 0 -> 254 bytes
 core/img/actions/checkbox-disabled-white.png  | Bin 0 -> 134 bytes
 core/img/actions/checkbox-disabled.png        | Bin 0 -> 134 bytes
 core/img/actions/checkbox-mixed-white.png     | Bin 0 -> 135 bytes
 core/img/actions/checkbox-mixed.png           | Bin 0 -> 138 bytes
 core/img/actions/checkbox-white.png           | Bin 0 -> 130 bytes
 core/img/actions/checkbox.png                 | Bin 0 -> 134 bytes
 core/img/actions/checkmark-color.png          | Bin 0 -> 279 bytes
 core/img/actions/checkmark-white.png          | Bin 0 -> 212 bytes
 core/img/actions/checkmark.png                | Bin 0 -> 266 bytes
 core/img/actions/close.png                    | Bin 0 -> 493 bytes
 core/img/actions/comment.png                  | Bin 0 -> 323 bytes
 core/img/actions/confirm.png                  | Bin 0 -> 132 bytes
 core/img/actions/delete-hover.png             | Bin 0 -> 208 bytes
 core/img/actions/delete-white.png             | Bin 0 -> 236 bytes
 core/img/actions/delete.png                   | Bin 0 -> 208 bytes
 core/img/actions/details.png                  | Bin 0 -> 295 bytes
 core/img/actions/download-white.png           | Bin 0 -> 192 bytes
 core/img/actions/download.png                 | Bin 0 -> 134 bytes
 core/img/actions/edit.png                     | Bin 0 -> 169 bytes
 core/img/actions/error-color.png              | Bin 0 -> 228 bytes
 core/img/actions/error-white.png              | Bin 0 -> 228 bytes
 core/img/actions/error.png                    | Bin 0 -> 160 bytes
 core/img/actions/external.png                 | Bin 0 -> 392 bytes
 core/img/actions/history.png                  | Bin 0 -> 249 bytes
 core/img/actions/info-white.png               | Bin 0 -> 324 bytes
 core/img/actions/info.png                     | Bin 0 -> 315 bytes
 core/img/actions/logout.png                   | Bin 0 -> 2993 bytes
 core/img/actions/mail.png                     | Bin 0 -> 229 bytes
 core/img/actions/menu.png                     | Bin 0 -> 106 bytes
 core/img/actions/more.png                     | Bin 0 -> 122 bytes
 core/img/actions/password.png                 | Bin 0 -> 159 bytes
 core/img/actions/pause-big.png                | Bin 0 -> 92 bytes
 core/img/actions/pause.png                    | Bin 0 -> 96 bytes
 core/img/actions/play-add.png                 | Bin 0 -> 163 bytes
 core/img/actions/play-big.png                 | Bin 0 -> 136 bytes
 core/img/actions/play-next.png                | Bin 0 -> 150 bytes
 core/img/actions/play-previous.png            | Bin 0 -> 163 bytes
 core/img/actions/play.png                     | Bin 0 -> 127 bytes
 core/img/actions/public.png                   | Bin 0 -> 307 bytes
 core/img/actions/radio-checked-disabled.png   | Bin 0 -> 378 bytes
 core/img/actions/radio-checked.png            | Bin 0 -> 425 bytes
 core/img/actions/radio-disabled.png           | Bin 0 -> 317 bytes
 core/img/actions/radio-white.png              | Bin 0 -> 336 bytes
 core/img/actions/radio.png                    | Bin 0 -> 321 bytes
 core/img/actions/rename.png                   | Bin 0 -> 193 bytes
 core/img/actions/search-white.png             | Bin 0 -> 309 bytes
 core/img/actions/search.png                   | Bin 0 -> 293 bytes
 core/img/actions/settings.png                 | Bin 0 -> 256 bytes
 core/img/actions/share.png                    | Bin 0 -> 264 bytes
 core/img/actions/shared.png                   | Bin 0 -> 264 bytes
 core/img/actions/sound-off.png                | Bin 0 -> 118 bytes
 core/img/actions/sound.png                    | Bin 0 -> 180 bytes
 core/img/actions/star.png                     | Bin 0 -> 496 bytes
 core/img/actions/starred.png                  | Bin 0 -> 492 bytes
 core/img/actions/toggle-filelist.png          | Bin 0 -> 122 bytes
 core/img/actions/toggle-pictures.png          | Bin 0 -> 120 bytes
 core/img/actions/toggle.png                   | Bin 0 -> 238 bytes
 core/img/actions/triangle-e.png               | Bin 0 -> 149 bytes
 core/img/actions/triangle-n.png               | Bin 0 -> 128 bytes
 core/img/actions/triangle-s.png               | Bin 0 -> 128 bytes
 core/img/actions/upload-white.png             | Bin 0 -> 142 bytes
 core/img/actions/upload.png                   | Bin 0 -> 142 bytes
 core/img/actions/user.png                     | Bin 0 -> 300 bytes
 core/img/actions/view-close.png               | Bin 0 -> 1126 bytes
 core/img/actions/view-download.png            | Bin 0 -> 1103 bytes
 core/img/actions/view-next.png                | Bin 0 -> 959 bytes
 core/img/actions/view-pause.png               | Bin 0 -> 648 bytes
 core/img/actions/view-play.png                | Bin 0 -> 804 bytes
 core/img/actions/view-previous.png            | Bin 0 -> 984 bytes
 core/img/breadcrumb.png                       | Bin 0 -> 376 bytes
 core/img/desktopapp.png                       | Bin 0 -> 2364 bytes
 core/img/filetypes/application-pdf.png        | Bin 0 -> 892 bytes
 core/img/filetypes/application.png            | Bin 0 -> 805 bytes
 core/img/filetypes/audio.png                  | Bin 0 -> 640 bytes
 core/img/filetypes/file.png                   | Bin 0 -> 306 bytes
 core/img/filetypes/folder-drag-accept.png     | Bin 0 -> 283 bytes
 core/img/filetypes/folder-external.png        | Bin 0 -> 595 bytes
 core/img/filetypes/folder-public.png          | Bin 0 -> 693 bytes
 core/img/filetypes/folder-shared.png          | Bin 0 -> 655 bytes
 core/img/filetypes/folder-starred.png         | Bin 0 -> 655 bytes
 core/img/filetypes/folder.png                 | Bin 0 -> 276 bytes
 core/img/filetypes/image.png                  | Bin 0 -> 486 bytes
 core/img/filetypes/package-x-generic.png      | Bin 0 -> 302 bytes
 core/img/filetypes/text-calendar.png          | Bin 0 -> 570 bytes
 core/img/filetypes/text-code.png              | Bin 0 -> 591 bytes
 core/img/filetypes/text-vcard.png             | Bin 0 -> 889 bytes
 core/img/filetypes/text.png                   | Bin 0 -> 382 bytes
 core/img/filetypes/video.png                  | Bin 0 -> 318 bytes
 core/img/filetypes/x-office-document.png      | Bin 0 -> 380 bytes
 core/img/filetypes/x-office-presentation.png  | Bin 0 -> 259 bytes
 core/img/filetypes/x-office-spreadsheet.png   | Bin 0 -> 362 bytes
 core/img/logo-icon.png                        | Bin 0 -> 1197 bytes
 core/img/places/calendar-dark.png             | Bin 0 -> 280 bytes
 core/img/places/contacts-dark.png             | Bin 0 -> 640 bytes
 core/img/places/files.png                     | Bin 0 -> 155 bytes
 core/img/places/home.png                      | Bin 0 -> 191 bytes
 core/img/places/link.png                      | Bin 0 -> 845 bytes
 core/img/places/music.png                     | Bin 0 -> 527 bytes
 core/img/places/picture.png                   | Bin 0 -> 295 bytes
 core/js/jquery.ocdialog.js                    |   2 +-
 core/js/js.js                                 | 105 ++++++++++++++++--
 core/js/mimetype.js                           |  15 ++-
 core/js/sharedialogshareelistview.js          |   2 +-
 core/js/sharedialogview.js                    |   2 +-
 core/js/shareitemmodel.js                     |   2 +-
 core/js/tests/specs/coreSpec.js               |  39 ++++++-
 core/templates/installation.php               |   6 +-
 core/templates/layout.guest.php               |   2 +-
 core/templates/layout.user.php                |  20 ++--
 core/templates/login.php                      |   2 +-
 core/templates/update.admin.php               |   2 +-
 lib/private/Files/Type/Detection.php          |  12 +-
 lib/private/Preview/MP3.php                   |   2 +-
 .../Controller/AuthSettingsController.php     |  37 ++----
 settings/js/authtoken_view.js                 |   4 -
 settings/js/users/users.js                    |  20 +---
 settings/templates/admin.php                  |   8 +-
 settings/templates/certificates.php           |   2 +-
 settings/templates/personal.php               |   8 +-
 settings/templates/users/part.grouplist.php   |   4 +-
 settings/templates/users/part.userlist.php    |   6 +-
 .../Controller/AuthSettingsControllerTest.php |  41 +------
 133 files changed, 242 insertions(+), 274 deletions(-)
 create mode 100644 core/img/actions/add.png
 create mode 100644 core/img/actions/caret-dark.png
 create mode 100644 core/img/actions/caret.png
 create mode 100644 core/img/actions/checkbox-checked-disabled.png
 create mode 100644 core/img/actions/checkbox-checked-white.png
 create mode 100644 core/img/actions/checkbox-checked.png
 create mode 100644 core/img/actions/checkbox-disabled-white.png
 create mode 100644 core/img/actions/checkbox-disabled.png
 create mode 100644 core/img/actions/checkbox-mixed-white.png
 create mode 100644 core/img/actions/checkbox-mixed.png
 create mode 100644 core/img/actions/checkbox-white.png
 create mode 100644 core/img/actions/checkbox.png
 create mode 100644 core/img/actions/checkmark-color.png
 create mode 100644 core/img/actions/checkmark-white.png
 create mode 100644 core/img/actions/checkmark.png
 create mode 100644 core/img/actions/close.png
 create mode 100644 core/img/actions/comment.png
 create mode 100644 core/img/actions/confirm.png
 create mode 100644 core/img/actions/delete-hover.png
 create mode 100644 core/img/actions/delete-white.png
 create mode 100644 core/img/actions/delete.png
 create mode 100644 core/img/actions/details.png
 create mode 100644 core/img/actions/download-white.png
 create mode 100644 core/img/actions/download.png
 create mode 100644 core/img/actions/edit.png
 create mode 100644 core/img/actions/error-color.png
 create mode 100644 core/img/actions/error-white.png
 create mode 100644 core/img/actions/error.png
 create mode 100644 core/img/actions/external.png
 create mode 100644 core/img/actions/history.png
 create mode 100644 core/img/actions/info-white.png
 create mode 100644 core/img/actions/info.png
 create mode 100644 core/img/actions/logout.png
 create mode 100644 core/img/actions/mail.png
 create mode 100644 core/img/actions/menu.png
 create mode 100644 core/img/actions/more.png
 create mode 100644 core/img/actions/password.png
 create mode 100644 core/img/actions/pause-big.png
 create mode 100644 core/img/actions/pause.png
 create mode 100644 core/img/actions/play-add.png
 create mode 100644 core/img/actions/play-big.png
 create mode 100644 core/img/actions/play-next.png
 create mode 100644 core/img/actions/play-previous.png
 create mode 100644 core/img/actions/play.png
 create mode 100644 core/img/actions/public.png
 create mode 100644 core/img/actions/radio-checked-disabled.png
 create mode 100644 core/img/actions/radio-checked.png
 create mode 100644 core/img/actions/radio-disabled.png
 create mode 100644 core/img/actions/radio-white.png
 create mode 100644 core/img/actions/radio.png
 create mode 100644 core/img/actions/rename.png
 create mode 100644 core/img/actions/search-white.png
 create mode 100644 core/img/actions/search.png
 create mode 100644 core/img/actions/settings.png
 create mode 100644 core/img/actions/share.png
 create mode 100644 core/img/actions/shared.png
 create mode 100644 core/img/actions/sound-off.png
 create mode 100644 core/img/actions/sound.png
 create mode 100644 core/img/actions/star.png
 create mode 100644 core/img/actions/starred.png
 create mode 100644 core/img/actions/toggle-filelist.png
 create mode 100644 core/img/actions/toggle-pictures.png
 create mode 100644 core/img/actions/toggle.png
 create mode 100644 core/img/actions/triangle-e.png
 create mode 100644 core/img/actions/triangle-n.png
 create mode 100644 core/img/actions/triangle-s.png
 create mode 100644 core/img/actions/upload-white.png
 create mode 100644 core/img/actions/upload.png
 create mode 100644 core/img/actions/user.png
 create mode 100644 core/img/actions/view-close.png
 create mode 100644 core/img/actions/view-download.png
 create mode 100644 core/img/actions/view-next.png
 create mode 100644 core/img/actions/view-pause.png
 create mode 100644 core/img/actions/view-play.png
 create mode 100644 core/img/actions/view-previous.png
 create mode 100644 core/img/breadcrumb.png
 create mode 100644 core/img/desktopapp.png
 create mode 100644 core/img/filetypes/application-pdf.png
 create mode 100644 core/img/filetypes/application.png
 create mode 100644 core/img/filetypes/audio.png
 create mode 100644 core/img/filetypes/file.png
 create mode 100644 core/img/filetypes/folder-drag-accept.png
 create mode 100644 core/img/filetypes/folder-external.png
 create mode 100644 core/img/filetypes/folder-public.png
 create mode 100644 core/img/filetypes/folder-shared.png
 create mode 100644 core/img/filetypes/folder-starred.png
 create mode 100644 core/img/filetypes/folder.png
 create mode 100644 core/img/filetypes/image.png
 create mode 100644 core/img/filetypes/package-x-generic.png
 create mode 100644 core/img/filetypes/text-calendar.png
 create mode 100644 core/img/filetypes/text-code.png
 create mode 100644 core/img/filetypes/text-vcard.png
 create mode 100644 core/img/filetypes/text.png
 create mode 100644 core/img/filetypes/video.png
 create mode 100644 core/img/filetypes/x-office-document.png
 create mode 100644 core/img/filetypes/x-office-presentation.png
 create mode 100644 core/img/filetypes/x-office-spreadsheet.png
 create mode 100644 core/img/logo-icon.png
 create mode 100644 core/img/places/calendar-dark.png
 create mode 100644 core/img/places/contacts-dark.png
 create mode 100644 core/img/places/files.png
 create mode 100644 core/img/places/home.png
 create mode 100644 core/img/places/link.png
 create mode 100644 core/img/places/music.png
 create mode 100644 core/img/places/picture.png

diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 565ad0ec663a..ce4940829761 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -1079,27 +1079,22 @@ function createSubscription($principalUri, $uri, array $properties) {
 			'lastmodified' => time(),
 		];
 
-		$propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
-
 		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
-			if (array_key_exists($xmlName, $properties)) {
-					$values[$dbName] = $properties[$xmlName];
-					if (in_array($dbName, $propertiesBoolean)) {
-						$values[$dbName] = true;
-				}
+			if (isset($properties[$xmlName])) {
+
+				$values[$dbName] = $properties[$xmlName];
+				$fieldNames[] = $dbName;
 			}
 		}
 
-		$valuesToInsert = array();
-
 		$query = $this->db->getQueryBuilder();
-
-		foreach (array_keys($values) as $name) {
-			$valuesToInsert[$name] = $query->createNamedParameter($values[$name]);
-		}
-
 		$query->insert('calendarsubscriptions')
-			->values($valuesToInsert)
+			->values([
+				'principaluri' => $query->createNamedParameter($values['principaluri']),
+				'uri'          => $query->createNamedParameter($values['uri']),
+				'source'       => $query->createNamedParameter($values['source']),
+				'lastmodified' => $query->createNamedParameter($values['lastmodified']),
+			])
 			->execute();
 
 		return $this->db->lastInsertId('*PREFIX*calendarsubscriptions');
diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
index baa8540c43cf..977bdf15c8e3 100644
--- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
@@ -333,20 +333,15 @@ public function testSyncSupport() {
 
 	public function testSubscriptions() {
 		$id = $this->backend->createSubscription(self::UNIT_TEST_USER, 'Subscription', [
-			'{http://calendarserver.org/ns/}source' => new Href('test-source'),
-			'{http://apple.com/ns/ical/}calendar-color' => '#1C4587',
-			'{http://calendarserver.org/ns/}subscribed-strip-todos' => ''
+			'{http://calendarserver.org/ns/}source' => new Href('test-source')
 		]);
 
 		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
 		$this->assertEquals(1, count($subscriptions));
-		$this->assertEquals('#1C4587', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
-		$this->assertEquals(true, $subscriptions[0]['{http://calendarserver.org/ns/}subscribed-strip-todos']);
 		$this->assertEquals($id, $subscriptions[0]['id']);
 
 		$patch = new PropPatch([
 				'{DAV:}displayname' => 'Unit test',
-				'{http://apple.com/ns/ical/}calendar-color' => '#ac0606',
 		]);
 		$this->backend->updateSubscription($id, $patch);
 		$patch->commit();
@@ -355,7 +350,6 @@ public function testSubscriptions() {
 		$this->assertEquals(1, count($subscriptions));
 		$this->assertEquals($id, $subscriptions[0]['id']);
 		$this->assertEquals('Unit test', $subscriptions[0]['{DAV:}displayname']);
-		$this->assertEquals('#ac0606', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
 
 		$this->backend->deleteSubscription($id);
 		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
index 181351816b11..01737256769b 100644
--- a/apps/federatedfilesharing/lib/FederatedShareProvider.php
+++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -217,32 +217,28 @@ protected function createFederatedShare(IShare $share) {
 			$share->getPermissions(),
 			$token
 		);
+		$sharedByFederatedId = $share->getSharedBy();
+		if ($this->userManager->userExists($sharedByFederatedId)) {
+			$sharedByFederatedId = $sharedByFederatedId . '@' . $this->addressHandler->generateRemoteURL();
+		}
+		$send = $this->notifications->sendRemoteShare(
+			$token,
+			$share->getSharedWith(),
+			$share->getNode()->getName(),
+			$shareId,
+			$share->getShareOwner(),
+			$share->getShareOwner() . '@' . $this->addressHandler->generateRemoteURL(),
+			$share->getSharedBy(),
+			$sharedByFederatedId
+		);
 
-		try {
-			$sharedByFederatedId = $share->getSharedBy();
-			if ($this->userManager->userExists($sharedByFederatedId)) {
-				$sharedByFederatedId = $sharedByFederatedId . '@' . $this->addressHandler->generateRemoteURL();
-			}
-			$send = $this->notifications->sendRemoteShare(
-				$token,
-				$share->getSharedWith(),
-				$share->getNode()->getName(),
-				$shareId,
-				$share->getShareOwner(),
-				$share->getShareOwner() . '@' . $this->addressHandler->generateRemoteURL(),
-				$share->getSharedBy(),
-				$sharedByFederatedId
-			);
-
-			if ($send === false) {
-				$message_t = $this->l->t('Sharing %s failed, could not find %s, maybe the server is currently unreachable.',
-					[$share->getNode()->getName(), $share->getSharedWith()]);
-				throw new \Exception($message_t);
-			}
-		} catch (\Exception $e) {
-			$this->logger->error('Failed to notify remote server of federated share, removing share (' . $e->getMessage() . ')');
-			$this->removeShareFromTableById($shareId);
-			throw $e;
+		if ($send === false) {
+			$data = $this->getRawShare($shareId);
+			$share = $this->createShareObject($data);
+			$this->removeShareFromTable($share);
+			$message_t = $this->l->t('Sharing %s failed, could not find %s, maybe the server is currently unreachable.',
+				[$share->getNode()->getName(), $share->getSharedWith()]);
+			throw new \Exception($message_t);
 		}
 
 		return $shareId;
@@ -530,22 +526,13 @@ protected function revokeShare($share, $isOwner) {
 	 * @param IShare $share
 	 */
 	public function removeShareFromTable(IShare $share) {
-		$this->removeShareFromTableById($share->getId());
-	}
-
-	/**
-	 * remove share from table
-	 *
-	 * @param string $shareId
-	 */
-	private function removeShareFromTableById($shareId) {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
+			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())));
 		$qb->execute();
 
 		$qb->delete('federated_reshares')
-			->where($qb->expr()->eq('share_id', $qb->createNamedParameter($shareId)));
+			->where($qb->expr()->eq('share_id', $qb->createNamedParameter($share->getId())));
 		$qb->execute();
 	}
 
diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
index 8c5efdab7b00..6792e534cc6e 100644
--- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
+++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
@@ -217,6 +217,10 @@ public function testCreateCouldNotFindServer() {
 				'sharedBy@http://localhost/'
 			)->willReturn(false);
 
+		$this->rootFolder->expects($this->once())
+			->method('getUserFolder')
+			->with('shareOwner')
+			->will($this->returnSelf());
 		$this->rootFolder->method('getById')
 			->with('42')
 			->willReturn([$node]);
@@ -240,62 +244,6 @@ public function testCreateCouldNotFindServer() {
 		$this->assertFalse($data);
 	}
 
-	public function testCreateException() {
-		$share = $this->shareManager->newShare();
-
-		$node = $this->getMock('\OCP\Files\File');
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$share->setSharedWith('user@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setNode($node);
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-
-		$this->addressHandler->expects($this->any())->method('generateRemoteURL')
-			->willReturn('http://localhost/');
-		$this->addressHandler->expects($this->any())->method('splitUserRemote')
-			->willReturn(['user', 'server.com']);
-
-		$this->notifications->expects($this->once())
-			->method('sendRemoteShare')
-			->with(
-				$this->equalTo('token'),
-				$this->equalTo('user@server.com'),
-				$this->equalTo('myFile'),
-				$this->anything(),
-				'shareOwner',
-				'shareOwner@http://localhost/',
-				'sharedBy',
-				'sharedBy@http://localhost/'
-			)->willThrowException(new \Exception('dummy'));
-
-		$this->rootFolder->method('getById')
-			->with('42')
-			->willReturn([$node]);
-
-		try {
-			$share = $this->provider->create($share);
-			$this->fail();
-		} catch (\Exception $e) {
-			$this->assertEquals('dummy', $e->getMessage());
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$stmt = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->execute();
-
-		$data = $stmt->fetch();
-		$stmt->closeCursor();
-
-		$this->assertFalse($data);
-	}
-
 	public function testCreateShareWithSelf() {
 		$share = $this->shareManager->newShare();
 
diff --git a/apps/files_external/lib/Command/Backends.php b/apps/files_external/lib/Command/Backends.php
index d1da6db3f6a6..260ea210397e 100644
--- a/apps/files_external/lib/Command/Backends.php
+++ b/apps/files_external/lib/Command/Backends.php
@@ -98,30 +98,15 @@ private function serializeAuthBackend(\JsonSerializable $backend) {
 		$result = [
 			'name' => $data['name'],
 			'identifier' => $data['identifier'],
-			'configuration' => $this->formatConfiguration($data['configuration'])
+			'configuration' => array_map(function (DefinitionParameter $parameter) {
+				return $parameter->getTypeName();
+			}, $data['configuration'])
 		];
 		if ($backend instanceof Backend) {
 			$result['storage_class'] = $backend->getStorageClass();
 			$authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes()));
 			$result['supported_authentication_backends'] = array_keys($authBackends);
-			$authConfig = array_map(function (AuthMechanism $auth) {
-				return $this->serializeAuthBackend($auth)['configuration'];
-			}, $authBackends);
-			$result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
 		}
 		return $result;
 	}
-
-	/**
-	 * @param DefinitionParameter[] $parameters
-	 * @return string[]
-	 */
-	private function formatConfiguration(array $parameters) {
-		$configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
-			return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
-		});
-		return array_map(function (DefinitionParameter $parameter) {
-			return $parameter->getTypeName();
-		}, $configuration);
-	}
 }
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ae17cfe11b4365254e1acbc1c0ade0793f25bef
GIT binary patch
literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW{r~?zkckXZ<{X#><g=Cp
z`2{mDF|)FFnhUl91!O#3978y+Cnp?Wi(u|Z<e15@GQhwgO<=X`>az^Wui2;m<FY9M
O8RY5e=d#Wzp$PyCzaMe{

literal 0
HcmV?d00001

diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..97c64c6a7203c89f8a0074a13bb53bb5a1d319ce
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE09J8{(R4Sfqa&dAirRS
z@`etpv)y7qzKo}fV@L&K@&fsU6h`JW6TvhS(=#h}&6pwaf|EgYC4=M7mb_CSb39%B
KT-G@yGywoK&l{fr

literal 0
HcmV?d00001

diff --git a/core/img/actions/caret.png b/core/img/actions/caret.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a8dd99176d6956dae065e0e274cb146382236d4
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2VGmzZ%#=aj&@dx;XxB}__NTA>8UItKzr6kBN
zn4!F(!|H6e7?3aR>Eakt!I-STBN2I^LGoN$TetDyD+Y#!0?Z8j*BKncs}_N@F?hQA
KxvX<aXaWFY87K(=

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-checked-disabled.png b/core/img/actions/checkbox-checked-disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..55980ba730d193e82e2b0f2cedd4efd49cf6a150
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eSlAhE0CTyZ{FOwbAcof%$hZ8
z+O%n_SFhf+YuBDVd-m?#yKmpV!-o$aJ9g~Ei4!MJo;-Ex)c5b-|Ni~^@87@w|Nq+w
zIy(c6U@Hmo3ud@<`O5q6H_vLU2Z{uHx;TbZ-0JP~6lzf5VG$Hn?N~7L|Ng680WPPw
zYiFO!a+?u*c;BJg7p}|VQto&Q-d411tbG}we`MC{6Xz_HXOv_nc<kjg^!a=9!T<Ud
e8)m5+A7HNPXIc4ciYN!rcm_{bKbLh*2~7ahfNBH)

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-checked-white.png b/core/img/actions/checkbox-checked-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed8e3d3d5579d4ab5bf504002ba674e34d9b1f4a
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbE0F$ACD1&Rn;mGJL`jfe
zFar}at8hb8OKVs6#Ch`<E?T_&@R6fu?!A9}KQ05PCfw7-F{I*FZ{JP61_KV3@GbX(
zw#xnaKV9llL{81iJ#QVv0uCv5GPv43IaH`8^Gds`_|l!GYdZ?fC0wi~)LWZ5**D$r
sn$BhA@5EbJSN83{y${Q2Ypx20lX_hDm$ft40<B>1boFyt=akR{0FAnfU;qFB

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-checked.png b/core/img/actions/checkbox-checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8a07193ab700714b87d1459717462b77da4f164
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Uw}`DE09jCU6fd}FtHYdqATWx
z7SAg0UpHa#-bu^$O<uNt%JThFR~(qO;=sK1#};iqv3T=|W!p|I-+p?<jx(!vp853k
z`=395|Ni|41poj4zjB!Q8_-0yk|4iehD(>Py#Idltj2nvNTjEWV@SoV-ac=>1_d4$
z!L3>=emK6q^MBDYA;(8;+h<=-iwbq}75vNbYXWzE@xwwh$CAxYWNlh{za4Pe(s=gv
zMdL8`Z7WOmD16p9vf=D`zi0p5g{+=>i54*Lc)=>i<`<I#w1mOa)z4*}Q$iB}cLa6p

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-disabled-white.png b/core/img/actions/checkbox-disabled-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1f48439d270fb9ecb882ae8e5ccb94e02dd7e0c
GIT binary patch
literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!P=HT}E0F#R19$G+`Tzg_%WG{3
zKv9;GAirRSOP8;RnX+F6^5s2U978G?lNHzuHXmXXj%b+5$``@Dok94}%bp_@q6{ui
WnG&P2rkn>VW$<+Mb6Mw<&;$UPlPmuK

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-disabled.png b/core/img/actions/checkbox-disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2ead20996562993ec08eaa551ff4a1cb68afd94
GIT binary patch
literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!P=HT}E0CTI1JkBWyL0D`|7-(M
zpeRd8kY6yvrOQ{uOxdpj`SPAFjv*C{$qH-+n-4GwM>MpG@<p(1XAnO0vgb&JC_~Co
Wrn%bon=b>EGI+ZBxvX<aXaWGFI3?Zy

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-mixed-white.png b/core/img/actions/checkbox-mixed-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b81f998fc599b02e08aad5adbd533e047b286ea
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE0F$=1p1xsWdMa(N`m}?
z84e#gn(`>?8<4N;>Eakt!I-STX0Z7Hqi{q6E9V4#24lJH3{STiDE{a<QX$H~yOi-K
T>mU6cK;;acu6{1-oD!M<X;CX)

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-mixed.png b/core/img/actions/checkbox-mixed.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc27ec651eaf25f0d186772adcd63e8ce3b1c399
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!P=HT}E0CTyZ{FOwbAjZvY197y
z|39<mni5cyr6kBNnBmgpD`KYXSAl$GPZ!6K3dUpwHiOLv7=<GmSUD%?AK+r$!K$&n
fmGfY_%CXf97OG61>_I7&K;;acu6{1-oD!M<h+-z9

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-white.png b/core/img/actions/checkbox-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f903c77c6fac730541d2c2dd392e79e44e93cd
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE0F$=1p1xsWdMa(N`m}?
z84e#gn(`>?8;~#O>Eakt!I-STX0Z7Hqi{q6tKxB^9jr41{L)p9t!9W8V_3-;u{Z~)
OlEKr}&t;ucLK6Ul$tZsS

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox.png b/core/img/actions/checkbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..770b7ef82037fcc3b3ab6a628fbdb0762846013f
GIT binary patch
literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!P=HT}E0CTyZ{FOwbAjZvY197y
z|39<mni5cyr6kBNnBmgpD`KYXSAl$aPZ!6K3dUpwHiOLv7=<GmT1ELH*tRnWA9~qy
cq(YP-<tWo!ZTroafl3)XUHx3vIVCg!01!eaO#lD@

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkmark-color.png b/core/img/actions/checkmark-color.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8ab849cad7267e74034306dcbdb5023a801cb50
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}RDe&2E0AVb#lWzif#E6x!+i#Z
zV+;%z!R&Kj#x({8Ai54FFM-9cFfc$6Q2k{bY_NhB#`}MPhRc=&`2{mDv#@b+a`T9a
zNy;ne=&snbdHb&2d-q?ueC7J9AM5;<JOL{7_jGX#k(j!)Yr9~BfxrQmx*|Wb{r_i)
z%ut@Pz)$_4z0&)q&Ts8wa~UU`c)0hLkitA4HkP%wxELZ!d^xSJGtRvF<m}D6n`7_V
fZs$`-K3QJI-_ByR`^x9tARl_V`njxgN@xNAO0HUS

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkmark-white.png b/core/img/actions/checkmark-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..27f17204b1da7c06dfad3325937cc4ac7f2cc01c
GIT binary patch
literal 212
zcmV;_04x8AP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0001+Nkl<ZIE~fQ
zI}Sln6ouh)iAF`IP<V`hgw8y5#$XO8M5Uzh=uP2Mh~zjq7s)NeN>;c3KiNCk1wxh7
zD$&0XG(rfI7Y^UHi-SitsN-uv7e}v|rGgF?n4|pxzM`25meIfttvB%S$;E<IGPupa
z7YyR{V!;SE<vFKtDhL>tNKWXda88huoY2d`WrBby_E?J!mTTefpXm-Ni0B0*BjvRK
O0000<MNUMnLSTZEE>}JP

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkmark.png b/core/img/actions/checkmark.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1a8be786cd59c2e5e28de1ec448bb566491b872
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}V1Q4E>;M1%flMj_osMM%K;xuJ
zg8YIRm^nCkM8(7<6m*yD*tu)>p1u1HU%7hi`m3L-N`w9YRrz_kIEGX(CNB^$FkbYL
zb*E(D52hfYISOpt)-C7tRS&X0<L)kI&{VV2nBN%d!=-WP2=_B*7nh|+EGrMxv~;L+
l^fTlr3D_}h;3^D!AkVOO8FRl&Hg5>XJD#q7F6*2UngGI1JUajY

literal 0
HcmV?d00001

diff --git a/core/img/actions/close.png b/core/img/actions/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..66e3c26cc65a1b9e48fbcce71fcdea12e5df7093
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002b3#c}2nbc|
zMg#x=010qNS#tmY4c7nw4c7reD4Tcy000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*
zE^l&Yo9;Xs0004ONkl<ZC{sm|KW>|F97n&=Z!l7Xu!N_;(AIyjvlN?=3=KX-xPWnP
zQ1D4gu3+i|gvCpa5E{j@E!A6?gOJe6fTN5b=?x#fCtRS=FfcLbpw6pD7Y)UQpt!_l
ziqB83(9yAQxnYLQB}&k+`9;KU76dqq35ZCz=N21H=rUvZwD#U!G7|0xS?w~f+-_Jh
zqbv0ANv5SRd_O+&hjgF+s06Ph=7yeN;1cb!VI>Ue<MZj+sfBOVzrRGd7=nhyoYgKL
z)WW2hG{T_X<*b-vp$Q6|F(K*yV$ul0usIZ@gpAQqE#MH6o{H-;a4bl<!)bvI76Hj2
zAJxLB88yPFKI9|>SajNxi~V}|F7)d|aVnfz_+GtaEZUPMKCxE{{c4|+^03eQmEgS*
z<71vhZ8y{MHDg6cNb<U#mfH>YttbtfTb9H`%yDoCSP*}yZez{xak0?Rxx&T&iq+=s
jVq&17P;@XbKXZQolrA@&4nfe?00000NkvXXu0mjf{H@!R

literal 0
HcmV?d00001

diff --git a/core/img/actions/comment.png b/core/img/actions/comment.png
new file mode 100644
index 0000000000000000000000000000000000000000..08867cf6361ef6e19bb5bed0159ba2e672dcb2c9
GIT binary patch
literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQk-yx;Tbd
z^e(+@-Noc6()#ec`+~sJ4eK0u=N@!Pi+tyJM0AH_Y|D%p(iTm9{dW?1ZZ(DNlFsFy
z^W;!{Ug+KEJu8E})^_QCxv=MISwvE!cUT0oaL&j14|R`q$UV&e^Q58wUV^{_y>t2p
z4!UpAp0Q|t>3W%~7n<%f-EIE<lxgndU)ssv+z!ZCS)|Gso@d|Ue96IPR{F!OM<kk+
zdgk$Dv1sH@)&8+(XQx%$yY2eDr$gCSAK~PB>HOzaD|1KvE0f3_Obu&N795n?WeoHS
NgQu&X%Q~loCIHw&f3*Mr

literal 0
HcmV?d00001

diff --git a/core/img/actions/confirm.png b/core/img/actions/confirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..3021d4c27d6db047a0355b801a376d8f06b3e734
GIT binary patch
literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`-kvUwAr_~T6BaOQ99KW-)57R3
z0R)l~5_}V0H~kN|<FJykg7>FCliu<x3~Tg$`ma;;5pmH!-cY%)aZ<(`i484R96Zyq
d7G#F8GR$c3b#4&Pa|0U7;OXk;vd$@?2>>&>DB1u3

literal 0
HcmV?d00001

diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed12640df7133147f781bf2b0df11c6c78d71b0e
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF4e$wZ{r~^}Dh7sY3=EeU7_NZP
zRR#ti0<wW5To5Al?q~FRphmuuAirP+W*yhK@(C+;95{IR*5?~qZa083E}kxqAso@Y
zCl~TI7>GC=%(iXwoH0dk#!6)dt~37P8V_c9`R#pTcq4Cvn@h|jhT{JxOCH2*5?}SE
kG4|R5iEHaMwygTiaAUH}>5lAveV};^p00i_>zopr0RGxZv;Y7A

literal 0
HcmV?d00001

diff --git a/core/img/actions/delete-white.png b/core/img/actions/delete-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..07a5de342526821d9e00b7f82f4e07add4056861
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQm9bT^vI!
zdhbp)<ZDn6V9D2A(ewX5Z*SQzzPFVJA_NaQ^&L85akurZrG`N@w?dJiZ7ZvN@w=4*
z7mA%dvzFT|Dq@&4v$xl8lF8G=9kTEGmWDoSZ#t~F!svdr)Aj{S90$IAU=LHUnD)bx
ZQG>7g;%iZ>6F^HDJYD@<);T3K0RTiXP(uI!

literal 0
HcmV?d00001

diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..20e894c7f740da793d98590fa12e998749ae2ad3
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF4e$wZ{r~?zkVzysV6}MxP$^$Y
zkY6wZvyN+A`Ggfa4jepu>+=mQw;Mni7f%<*5RT~HlM8tp3`86bX4|%T&X^)NW2G_!
z*BO6tjR&*5{PsREypgxT%_U|ML-GHUB@bdYiLZLo7<+Aj#I^MrTUPyMxG`DgbVqi-
PKFCp?u6{1-oD!M<K4Lwe

literal 0
HcmV?d00001

diff --git a/core/img/actions/details.png b/core/img/actions/details.png
new file mode 100644
index 0000000000000000000000000000000000000000..9145025be26c0e86e294ce98e1f883199c4d6366
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQpuQx;Tbd
z^e(+%$j9g?(e_Y%iq#^4@PLj>yeeMl0hX;!YcH>w+Zd+mxHix$#H?ge=$jYUj9%yd
z^L+OE-WmIv^d@UJ`;_9F%13S9Z~E2zpp$)>$Ekgf^j~F6)eK9KpOGLPotL0{+n)Ei
zhS-Y)VV2Di2WNW=@SL7<d*Pf#KQ%)%1-=}zdHkzCA$)?SNXcQF1^tB+HToy#{Fk1#
j;wV>`MUp^t&m-196XYg8U)UW5bT5OatDnm{r-UW|QXFm+

literal 0
HcmV?d00001

diff --git a/core/img/actions/download-white.png b/core/img/actions/download-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..815b551354f4249157b4575c17f9991a836b1c8e
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|t_%$6|G~gE^EwAmkg+7l
zFPOpM*^M+1C&}C0g`tC0)&r!xz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0SlD;o{`868~&r
z3KTN%ba4#fxSpKAz`TyNg=1yt>S+cW)<&5&HWpshVrOexGu44}rK&?yF4KgBk_HJD
ZhBuRV9!ytD6#?pH@O1TaS?83{1OR3<GXekr

literal 0
HcmV?d00001

diff --git a/core/img/actions/download.png b/core/img/actions/download.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f8e1a4f7e167efc019708a635eb763445dc255b
GIT binary patch
literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJXMj(L>;M1%flMH%3tSlsq?k&A
z{DK)8W^4ON0C`%TE{-7;jL8QWXEZeIW9sqoXb|*m5%lF%juD^3FW&f3P|3i~iRILB
Z7KVUchS`s_Z4ZIW@^tlcS?83{1OQBSAkP2*

literal 0
HcmV?d00001

diff --git a/core/img/actions/edit.png b/core/img/actions/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca20eba363b77d280b976c690ce778e9c4d2fbe
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=6^{l)y&{Ksk<*AirP+
zBTJ_@A3lFkE!?yhC}!&E;uyjaot)6n+|$>`=PtnPQNBg1K|&#hNAzVzyP=grkc<FZ
n42vh%D$&^@vpiUC7_}%f{Nqts_A$bDJIF#$S3j3^P6<r_-)Sf^

literal 0
HcmV?d00001

diff --git a/core/img/actions/error-color.png b/core/img/actions/error-color.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d00282312ab9d50f4634201e03f97a51a59af41
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`E0A8rz;K3v;VKfk#=rnX
zS6~Pz1!P|aD*!SeTp**#etkAjzi>&AUoZnRD;tlNwvk2q(&Z~QUVifO)q8i|b*VsU
z7f%<*kP60R1wMn1T+EFE);;G>=<={N<pkJ?PdI$=fVz&(0WPrzB5j-;pN*SYDg>Ag
r=^WuwVBl_B_~KfU70>0DEsPA(5$s2dI(r*|<}rA>`njxgN@xNAd<{SW

literal 0
HcmV?d00001

diff --git a/core/img/actions/error-white.png b/core/img/actions/error-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e15865401d6bee0f86181429c67f7ffb566187f
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`E0F$AF1X>DAq><nToU9L
z%)rdb#-pWeWYNBK`HGE~pS*na-ko<{Dp1<R)5S5Qf-zZv&)_2$bEAND&-oL&JZw!l
z0e0dO4j(+AuA_5+OYDJ28z;wS<7So$0j5JbN4OLixZ4)KxRzwabNOWpBZG7V`w^qg
R-bSE#44$rjF6*2UngDP+X!QU9

literal 0
HcmV?d00001

diff --git a/core/img/actions/error.png b/core/img/actions/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..61df76b53ea5ef14cd1acffc997fc6d090a451c4
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=5&6h>>9lP?W7C$S;^d
zR`Jf=2miu3+kqk`o-U3d9MQ=M2bfweUutqNSsWP^wTdZ1p^;bT30u+<2FXkXHz__g
k4h8MD>~?96?M$)^3}^I3wik5mUk$Ry)78&qol`;+0GXsD{r~^~

literal 0
HcmV?d00001

diff --git a/core/img/actions/external.png b/core/img/actions/external.png
new file mode 100644
index 0000000000000000000000000000000000000000..af03dbf3e05397a5aa029b699297933729f55d56
GIT binary patch
literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$m7#J8?JzX3_
zEP9t--mB-5D8Tk0{f4XhM2^-jri+0SFI-%AjCTj4-a*|LJGeXDI@)r+iM@E?vha4>
zk&JUU=d8KAdG;HX$@-ta*BR%hDH;1J_3lb=S@S5t<A<rSb+6YawP{+M`W46R{MZ>{
z7B7}~$P&9J^vg~Lo*1RyU$l&?m2(~{8uzpJ81}zSOzwM>AXr|?5Nvu>yW*90-eZ~l
zk4r8baywe*qHVle@MEW~hUcCGzG<tp&UM|-GYtPx)>W=({F<@rhTtsG-Mxn|$(?f4
zoLM=4roHHOlWShdDhD()J$=r&9r+|-dRA%wb)`3tPXEu9ULqf%Z`tulN;!$kIJxA*
i+?jiAJ3P<-<o`BvLTuc-i%)=|#^CAd=d#Wzp$P!gcARJc

literal 0
HcmV?d00001

diff --git a/core/img/actions/history.png b/core/img/actions/history.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec2bbd0587fc5a4eba586e0fa47c468712b86a38
GIT binary patch
literal 249
zcmV<V00#ewP)<h;3K|Lk000e1NJLTq000jF000dL1ONa4+!y@H0002MNkl<Z7#Rh@
zF)Jnj0D$2~Qn%e=xyj;6og$0TW;A|fK=&hLV^@;#SPbGv7^O&k1LYq`y3K&Tk6zCs
zNn+lCYp;e*EG3a7w!BG_jP03>B>qa0B*|_hetMB4556QBS&-O~<kDiyIG5y~#F^yX
zbP~UeC3pO>=w9+<&TJA_l2-;kCCSJjG38luE7pBVKCC5vIF{r{V#Aj=t8wVYe@Vuc
zC9!EGaVkl&9Z8bJsU#x@CL&3a*!O7Y!tW&CQ+=VE890#@00000NkvXXu0mjfDY|DB

literal 0
HcmV?d00001

diff --git a/core/img/actions/info-white.png b/core/img/actions/info-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..670d7309c4eec4e6c8e462309db6511d66d4c8af
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}MSxF;>;C})sYXI4fNoGP3GxeO
zVB;1Pm6Vp%w(<2335$$N&8w?#>FDa4IA`6)O}h`AyKwROi}#=YGAwG-0BQ;Gba4!+
zxK(??Rj9#%hxOtEo_Fh-|NOo`K{WIv)4g@G<7V=CMoc_CF~sceW|^BGEkBt2mNu4O
zyMKY=LkE>xtTu*B8A4t?MLrrKr;hinHv93y%vD~_eJRWI0KJFoK=T<qUHx3vIVCg!
E0BvT$1poj5

literal 0
HcmV?d00001

diff --git a/core/img/actions/info.png b/core/img/actions/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..b280a019ab4beb72c254931fe604c9c1effa1085
GIT binary patch
literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}QGic~>;M1%flPXWLtRmKfcB}C
z1o;IsFtc%T^YZbF$*F5-Y3u46o7+1$xwyJ}`h`cvC8TF$mQ+;MH#l%8mH>4GdAc};
zNJ!QmbQNlG5MViQD7UbjZN>lkLVuSMc?IGALn;Ag(*iafJ8FKsdD1*#mg+q_9bO!s
zDl2kWUS&Ry!cmietaAZrVS#)PA6$(RXtO=kZEse>Qha&Zgfk%jd%F6$taD0e0s!*4
BKd}G+

literal 0
HcmV?d00001

diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad230de98f40244b1b8da5d714ca287a60530cc4
GIT binary patch
literal 2993
zcmV;i3r_TjP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00009a7bBm000}F
z000}F0asx{rT_p6PiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z0002oNkl<ZD3NW^zb*uE6vgqoiA`oI35kM2r=-xRsPu${XuN=zP;9r2g6O<~3dt5~
z8jXf{g)JohEM|A}QT*(hVRE{AzRA7!oDdaV>QpCHI|q3^a9~YSU!iH;eig`^<3f1%
zD%|0;3|!&ff`&pNEbHQI1Z?2Zgpe5;%7j^6tR~<ZD?h6s6T)U%8bZ&<_|(q$&4z*J
z1kn4FM$#t<c)<KWdk#+tX#GA_(h=GTm;^f&dmBuRa@YdL7G-ivPQY$C>OF5@U<h84
nUG8E=%dNgIHx5nLw^^fa*2PK-YU(!i00000NkvXXu0mjfdH<5@

literal 0
HcmV?d00001

diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d06259cd0882ec5c7cb72eb76245e2f936ffbfa
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ydl>XLo9l)UOvy|=qPgh<N2>#
zr@C5Q<~e;*+4O}Y%<E%@$j{>WtxJ!k<;70dj*$*te$Mjq?^=K3vnq-#p<!z${T64q
zp->|!Z78Yy_rMG{{}T-AU+%Zexp3H!pX0{y-tY;^RyUqjl{e|`Qk}qjD?<Di{~=8&
z))S1SKJ#9@?-Fe*^eR)odGVS=Vjx>YVncCW7Wdg1>@i9ykt{KWr)S0=W&QkuGo;4j
d<p26*(qH>}tNYU84+GuJ;OXk;vd$@?2>@~=Tkik>

literal 0
HcmV?d00001

diff --git a/core/img/actions/menu.png b/core/img/actions/menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..583ce319175c4f7d05a224798d393d82fe4b9a38
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9>;M1%fy~fDm+OEOV@Z%-
zFoVOh8)-m}kf)1d2*>s01P12c_6jWQJ9aXx*JMwA;v%F9lx6UA^>bP0l+XkKok|&@

literal 0
HcmV?d00001

diff --git a/core/img/actions/more.png b/core/img/actions/more.png
new file mode 100644
index 0000000000000000000000000000000000000000..880d5dccce38619118357b1288cf07003f870f72
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u4m4i0Wu+AW%;N1Ko)aJ
zkY6x^&B<)r<EB8al&6bh2uE~s!U66jchvL}FTAh&!tB(rvx1SqV+u#Gx!~3BAnl&6
KelF{r5}E*S?I1e<

literal 0
HcmV?d00001

diff --git a/core/img/actions/password.png b/core/img/actions/password.png
new file mode 100644
index 0000000000000000000000000000000000000000..3619fabab9a05d84462949f49f1ed40d05dfe84f
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU{r~?zkckOmk{tH}McGS&
z{DK+e&6Xd2_MzT$$77(7zNd?02uE~sf&+uw<pf3p=QVq51kV_h2Whey9}=D6b+D(%
kz$t0NbY@4!n>-~93{!f=<g8@28-nccboFyt=akR{01yc%r2qf`

literal 0
HcmV?d00001

diff --git a/core/img/actions/pause-big.png b/core/img/actions/pause-big.png
new file mode 100644
index 0000000000000000000000000000000000000000..054281c63143b8779d43cc1bb6b6beaf90c312d0
GIT binary patch
literal 92
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`%APKcAr_~TfBgS%&#Wrp#GqNy
pvrwRYRv@z*uY_sCEVh6q#;TLgG;V7DI|x+H;OXk;vd$@?2>{`e8OQ(t

literal 0
HcmV?d00001

diff --git a/core/img/actions/pause.png b/core/img/actions/pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4b865e3401856e4c763b2425906eb40e4ec591e
GIT binary patch
literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar_~T|NQ@N&#c-|SRi@e
u#EFh1senGg`9D@LE@r!MtYP8InG7pE>mS-2ds+k3!r<xZ=d#Wzp$P!%fFHyF

literal 0
HcmV?d00001

diff --git a/core/img/actions/play-add.png b/core/img/actions/play-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccf77d2a062e93c9854006485437b6f6f9b8ace6
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`S)MMAAr_~TfBgS%&#WqOFd^Xv
z>k+mo5)4ZJ7(Xg0OjEzkAn}j!$Xy2=k9CX&fA~7Q8)nRnVNUqLC~%y~P<bcYfe)1m
zWwHXyC%!RxDI7X-vd=Av=fJE91(m%omiSCzbWx42iCfUkc*B6f<bdLDj&D+eKwB9+
MUHx3vIVCg!01|vRmH+?%

literal 0
HcmV?d00001

diff --git a/core/img/actions/play-big.png b/core/img/actions/play-big.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d4916cb204c7d7322beb8a0a0c7852942e8195f
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`{+=$5Ar`0iUOvsqpuod&@!%<)
zyXPJqZEou5OG;SJ|A|?{p^w9dVUeq&?Sci81uSbDbTil^oYW797#(0xmAkTC?2Eux
ksjrGJgRh-0`Fc*&RAYa_gHwhjK%*HvUHx3vIVCg!0MoE8vj6}9

literal 0
HcmV?d00001

diff --git a/core/img/actions/play-next.png b/core/img/actions/play-next.png
new file mode 100644
index 0000000000000000000000000000000000000000..50cd91d240ec5c09e0e589b75da72499dcfcd4b7
GIT binary patch
literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`v7RoDAr_~TfBgS%&#XG5F^i4i
zpo&78+r%SEZRZ&THcEC>e&`f5VrV(fywOC@Fo}oZp}Ip(gKtj+v%?Q#K12B=-UF@w
x84C4cc@~`D7GYI#z336>v`9yjKO&EXAu?TN@><`gx<HE<JYD@<);T3K0RUZ;EiC{5

literal 0
HcmV?d00001

diff --git a/core/img/actions/play-previous.png b/core/img/actions/play-previous.png
new file mode 100644
index 0000000000000000000000000000000000000000..c380e96bb58dfa550ace9ef570153b4e8335017b
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`S)MMAAr_~TfBgS%&#XG5aTyx}
zqp^VhA@w$YV}61BGzRU1%5Bb@O$6q%Yqn?}Q)|1*pkTo8NZp_{phpqJ`M~(-e8#N*
z$-;*X7&wX=fAEW)jWGPmyWj?Q2&c;`7v)ePq0mW2cZ-x6775BsUiz)_3(!^uPgg&e
IbxsLQ0N2<wGXMYp

literal 0
HcmV?d00001

diff --git a/core/img/actions/play.png b/core/img/actions/play.png
new file mode 100644
index 0000000000000000000000000000000000000000..7994424c65cb1acf6a6fee475f476dda1428c909
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Zk{fVAr_~TfBgS%&#XG5F^i4i
zAfrOrf+G$81AHbq-r!L<sZhfvkSbuv_Q145gn5IMOE~k1Z%j8EJ<3cb&7Gj(eTsRS
YG-Irr=lx3l2#{3_p00i_>zopr0JDiEhX4Qo

literal 0
HcmV?d00001

diff --git a/core/img/actions/public.png b/core/img/actions/public.png
new file mode 100644
index 0000000000000000000000000000000000000000..772838ad2058e5e6e16c9fcb13e1bb6708155238
GIT binary patch
literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}NPtg>>;M1%flTUx4SfrRfhJ0q
z1o;IsaB_=FX`0(O2Ly#DHnewa-?8)Jwbvg$e*X4r`odeeKxM_AE{-7;w@Obt^0g=k
zxLkB{6%lj|Jh1D(?eUaZExlW-=l=UKk56;gF}2MT)@==+w(%p^ib+}js~Bv`EoJT;
ztDZUY>;L`x=bigBXVb(wtIXZcU-`a${#4Ff?h<=dLPR$Il0^;I**1Bsu1U7o)bUz%
c*@BNd<*z5QTV<JfcYyru>FVdQ&MBb@0Qi4hvH$=8

literal 0
HcmV?d00001

diff --git a/core/img/actions/radio-checked-disabled.png b/core/img/actions/radio-checked-disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..09abc410f618214c27f1c46afff9d424bc14297a
GIT binary patch
literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}U4T!BE0CT!bLON;lcs~gv}x0T
zG*D#5j2W}QV9uO5^XAQ)J9jRS0VE-UKoKASDm!rC08k~6Jb3URkPFm4d-iOIN}z)6
z+qdu7v18}XoiARzc=__>>({T}ym|Bf{rk_KKmYpm>;M1%AEy3w2f9G2B*-tAK}1w6
zI5e!at)uhKoxAt$eg5+0>-X<Je*E}pH(j0ysA{68i(^Q|t=x0h#hMHRTmxAqDsc#M
zF7)J9`ToEDLg5AW({-~qs~!D$x_k33Kjrtf^IK-EojdhIeDTJnmrdR3VKX-7w(~~q
z5J_UaY`(;Ng%j6w*5t!#XVSSYExPN>uD$<ouhXuC9~MHIIW;fuF5vkQ$!lDCH)X-+
zX6HXn%`abHOx(9(Uc7$stn$1W9y3|?{C~{YaYgV}(q`4kK*uq7y85}Sb4q9e0L~Y_
AG5`Po

literal 0
HcmV?d00001

diff --git a/core/img/actions/radio-checked.png b/core/img/actions/radio-checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..94933b7b69c84c8fa356f947a281b489e95b9543
GIT binary patch
literal 425
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf`~aU2S0Ei(JTo+RUSP@eu+q8V
zrE|hcW<{0HjjWg#Q!y{Pa$Z8sf`pod3DpY{YZt@=88r)|E9XX6%uB3Ym;^+13nR<t
z&RTsqqHIoN*_>Hx4$oc-L`Q(!(BfHfRrBMj7sOYCOaQB2)HQ!s&%)h(i}u`n@Z#2k
zm$x3iy#4Ui{ikmpJbm-@)rU9lzr6YI<=c;6-+%o2@$>ip|Nq78{uKh9C|45X7tA0c
zDi$0X*4oz5dFRgEyZ7#W{_^GP*YDqdfWXg??~-ajm9srv978H@<@R|BH97Dw2)c*`
zrnuY`4|GUKi1_q>yCj=Ufb0ET+ACddxL(Q+EV;U5|9p=K|6o~x%F^Aee6=5xCW=K&
zRH<a2(joCh;D)uE5!=45gE<R2ELB6&dG2wX6bh2q<6Cj?!;ykah5KtV7)x%xnJ*{P
zI)CYbQzp9A3$8gjq|9E|f46@{v0|NRU;J^Wc!AKvrM#@q%YQJ&dW$+n-u?Fo=u8Gr
LS3j3^P6<r_&Y{WK

literal 0
HcmV?d00001

diff --git a/core/img/actions/radio-disabled.png b/core/img/actions/radio-disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac7f49ed53310e48d982e01d8a95db0691054229
GIT binary patch
literal 317
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}LV!<*E0CT!bLON;lcs~gv}x0T
zG*Dy)7yucwX3d%n1`q~N1PJELnFAC9D%rGY6Hq;bv3c`mAmi-Wv**vBzj5Qn&6_vx
z+_`fwe_|)l4(XC0zhDLtQL*6Au-3MY&O3MR-n;kt%a^a;zyAP&pAS8f+=0ppJzX3_
zDsJVT^W<w#5O4_;dA@V5K;WMLy1Ie~CH}9AbISN8t$(X@ZSlW1ElVy%d3L>(+je*h
zubV|;^g@Av6Nk5^G`Lj;s5)fuSFxSZzv1riw|0^@fAFuL+qfmV?k3hA5onqA`pe40
j`?xoIb!hS4h*v+qPoVnQsgLV{mNR&|`njxgN@xNAMzEHi

literal 0
HcmV?d00001

diff --git a/core/img/actions/radio-white.png b/core/img/actions/radio-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..04beefdff014133e9d282f587ff57755feb12248
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}W`IwKE0F$A7w|`VZ5hxq<&q%3
zU<Pg;J`qtdeFHOd3(KI8(8i|bmWh)lpFMZ}!lTEpUVr@b`AhJxXMI5B#hxyXArg|T
z2RWIX92gi5Y_v2}3hBGj_TPS!Bm={Onl;aN_NX4PwSBF#I({YdyZKxl(d?<K7?QL;
zR4^IvR>U)Ah{-TEY)Iy3h^dQM&tSrROq?OO-^jJ$$JvFyT@><kFDzZj`OvI3x*=&s
gfAYIx28Ivpf1FvTUea{n2U^eI>FVdQ&MBb@0A&8O^Z)<=

literal 0
HcmV?d00001

diff --git a/core/img/actions/radio.png b/core/img/actions/radio.png
new file mode 100644
index 0000000000000000000000000000000000000000..70ac4741b978b0071c4d672e0e7aa28c0f5709dc
GIT binary patch
literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}a)3{WE0CT!bLON;lcs~gv}x0T
zG*D#5j2W}QV9uO5^XAQ)J9jRS0VE-UKoKASDm!rC08k~6Jb3URko)4ri<d87zJC4s
z&6_trfByXS>(~GP|JU5hxec^NswBuSm_bBTEI2f*wXLJ`&YipW?tT99<?HwFKYsl9
zX*XS-38<>r)5S5Q;#O|oO(6#b5eH@OvT&8oU;o#acuzAtciYmqTyg(}P0`bqEtsCJ
zFxAk@Nor31wZ%L2MJ_luN;qr2J$uGr%WL6~R>v9Y5+6B#cP#wbC$fHN@VoP`e&@&w
xsywy&F=4?jrp?v0uP*v0g>eTy7yS8{;nyL7Gn*?aSb^3vc)I$ztaD0e0stHBoa6ui

literal 0
HcmV?d00001

diff --git a/core/img/actions/rename.png b/core/img/actions/rename.png
new file mode 100644
index 0000000000000000000000000000000000000000..975bd2d7031d55e599dd8b8e788799afac376356
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`9iA?ZAr_~TfBgS%&#XGb<R}l1
zn!_FLBlDg}U0^t(aLiueo7ydg701|2oYe$V878&;&uFs{Hev8J?ownq%+Q|ph({sJ
zIE>ljVoxH&%2|Ot3{1%icFtXCCCsN9XD~-^5j0`osA#ysc<Ncht|g5x_Aszy2F#XS
qpl7J2Y0P-gXN97T$=Ti;1`OS8o*bs@IwXN^V(@hJb6Mw<&;$TwX+Jsu

literal 0
HcmV?d00001

diff --git a/core/img/actions/search-white.png b/core/img/actions/search-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..9812c44a3d6bc3073bb2e32c4b1ff0d086f71e4b
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}LV!<*>wg*pwxo%lfp*E41o;Is
z=o*_?SX$XTcm#weR`gGrxBkMd+Yg_<eEZ?^x1YcM9%1M)04h!Oba4!+xRvXFU8q5U
zC%EwZBZtBX|NnbGJr`=CzjK-P$A1FeOH=+_nR<{h_-^gyi2_?@X1g`%2tLu&;P7TT
zC0bR!w6Jf{lYB<my*;I+hDm-i<LeJiGE}_~QM}B>IBK4e<e~g8vRcaQ4&qnz1ArDX
Nc)I$ztaD0e0syVPuZ{o!

literal 0
HcmV?d00001

diff --git a/core/img/actions/search.png b/core/img/actions/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f4767a6f461956689bc15b231cafe91e5690481
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}NPtg>>;M1%flTUx4SfrRfhNk7
z1o;Ish)c=HDyV4a7}|Jv`bT8s<`ou~mRD3&*VZ>wM9eS(s!Q>7aSW-rmFs_9s6m0}
zG8dnSj0VTg|NleY$GCo;l)Y=x8~#HP*++s`cgP0b{VQQIk?-Ry!wc-0GlDlPXyz~z
zJyx>RyKm9Md`9)SV{O~!JyiWXTR*~k*#zem6>9zSmQM-(*t?IhO`lEmw`2NGkWW2b
L{an^LB{Ts5S9eS3

literal 0
HcmV?d00001

diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ab939ca37a4fb3a96846aed3102acef0efd7416
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`>;M1%flTs%#&v-(piYsJ
zAirP+MivPLO#@?V2X`M||ES#j^1Avr+SPSH`FKwk$B+uf)P7ICBMuzQir!Y$PS^kc
zw{prTDvT8nGukG~JL~Vq(l5e(^5NT`D8)6H?<kUQ>X!(bx$ynvE#)(GEfY@eJP`QL
w=IK9%vt|$U9<rJ36yX1<WT~>UWa73%{JU#75+xUNya##0)78&qol`;+0FiS-rT_o{

literal 0
HcmV?d00001

diff --git a/core/img/actions/share.png b/core/img/actions/share.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdacbbabebcf013a5a80907b3e62cb2e3c0ee26d
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`=RI8<Lo7}w|M>sko>_H9MJo@_
zGKW2q9q*Y6RRxSEW*u-<_}AaEx5JEqBj$oh^M{ZoHikwuf%OcJ>LYjxTnrgFQW`CI
zJDxU1h<1oGe~e%8=(s}+-;vXeKQsi?7qKV_9AWq<zv5B7$D4GAIowCyR3tNUoLgx5
zUR^+((NI0`A_vRyi#$KLjwCvq@mRxH=kP~z)ldCNj?)`0B<4GwXgtAwgwa8V>&P~T
zJ^UvZa68Q5I?}y?O=(_63B#l2h(!X%Qk)VZZedP~qJoxrr5$Qzd?m&k+oST~GSF)b
Mp00i_>zopr0Q>V`U;qFB

literal 0
HcmV?d00001

diff --git a/core/img/actions/shared.png b/core/img/actions/shared.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdacbbabebcf013a5a80907b3e62cb2e3c0ee26d
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`=RI8<Lo7}w|M>sko>_H9MJo@_
zGKW2q9q*Y6RRxSEW*u-<_}AaEx5JEqBj$oh^M{ZoHikwuf%OcJ>LYjxTnrgFQW`CI
zJDxU1h<1oGe~e%8=(s}+-;vXeKQsi?7qKV_9AWq<zv5B7$D4GAIowCyR3tNUoLgx5
zUR^+((NI0`A_vRyi#$KLjwCvq@mRxH=kP~z)ldCNj?)`0B<4GwXgtAwgwa8V>&P~T
zJ^UvZa68Q5I?}y?O=(_63B#l2h(!X%Qk)VZZedP~qJoxrr5$Qzd?m&k+oST~GSF)b
Mp00i_>zopr0Q>V`U;qFB

literal 0
HcmV?d00001

diff --git a/core/img/actions/sound-off.png b/core/img/actions/sound-off.png
new file mode 100644
index 0000000000000000000000000000000000000000..0457de8e4d1cbff1c62ca9234a1589467c8ac8e1
GIT binary patch
literal 118
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ww^AIAr_~T|NQ@N&#c-|_(AHx
zi4!*%mb_~G)T1KJaG57*at_0$v_-rOS%)MAl#eoWF;84|(PL_h$rdAFhWQ)9AEt%x
Q2bss<>FVdQ&MBb@00wO)`2YX_

literal 0
HcmV?d00001

diff --git a/core/img/actions/sound.png b/core/img/actions/sound.png
new file mode 100644
index 0000000000000000000000000000000000000000..e849b4d248b3590426420336af60951413a89c2f
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`)t)YnAr_~TfBgS%&#XEl@q-it
z3olPXCQo7b1erMIgjo}L8JN-()-fb$D%5cv*%ZO+aE-^9fkS1Xls`iumw-7_q4^z#
z6y6sSTK9R5Om%p}e&l!K4Z)7@lad<v1mf9}I2Gzxk1SHizi^e|Puv0vft6CdA)X%2
c+Qy6wYP;li_MVlf06K%g)78&qol`;+0H<X)TL1t6

literal 0
HcmV?d00001

diff --git a/core/img/actions/star.png b/core/img/actions/star.png
new file mode 100644
index 0000000000000000000000000000000000000000..88e4ad54584fa3cae3d390938aaee9afb0b547fc
GIT binary patch
literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10c}Y{K~y-6t<*bfRACUt@!unxY=T7!FL4ny*m;Qvl0wo8VrL<U
zpDSNMEkwjZ1V4bb+9;$I!E_3Wm({V@T{+o3!Lw!`7|zSgoIi8s%)F^8U6kY)`c?Iz
zOMb5tb)+pUp%eH>m!u?1xQfe3mKO%b74)%;%|(K@8s}>Z0Vg?w^@eMZWN>J({nbwN
z&#HS#V${D?tc;({^Tn3;Hj{ist5wyH;5u$}sC*v1NL5L40k_RJ*KPWV$5r(%lg&$V
z8h3H@KcS!SpsGGXnk$`T4fk+jPUw3)tg0`6S<`n#l0NR>d`IXTJgur<P3O$GRn>Rg
z$FKu*h$qv~R`6KIb^DP$oN5ak1m5TXo#@<Q!9#rOTExufjyG{Sc^A)&=JX~mHDYHw
zfsHPlmGSvAo>$e|M*LBd*SLi>tR^{GReMcHTPrs38!xdl1qD^Liygc|Y3p-U?K5m+
mecFGJVSw#v|IC6cN`C;KX`P3~niH`A0000<MNUMnLSTX@3)XA^

literal 0
HcmV?d00001

diff --git a/core/img/actions/starred.png b/core/img/actions/starred.png
new file mode 100644
index 0000000000000000000000000000000000000000..22e68c757e79535d4378a7e7539b5f6e99dfb401
GIT binary patch
literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX0005ANkl<ZIE}5<
zze|--9LMq3_tAt)iRluwG&E#LrB~76MkO>gv{XYyYlBNr&_5B;);}N(EeQ=S{Q*He
z71@t5C~61{1Q89do(3(iK9}w>`@rEm=lkRRd^zWPIFVA4r817`(rYA@IpN)TRD>z(
zYRCddR>gC%->Pruvf{8tTI`fk<osRJb@btYnyWb}dEjKK<@@IU0hiIhsTRwqS5e<P
zI9jURvURMwn<%`~=cj&!e(MG{=YC-Tmn&JxHD&z3{GX9F$Etaav>2&$2lo&itIt!y
z-HmoD<B~9q+8&`x!VUE_v(?9Cj0;b3=pUh96fPP`Z)rWevGhV=0v~pbOrC2R{|(&^
zhLQ9c4Lr++hG_>)nn>TbncH6JkI`e<g3f!s?2}$s(%Mc(`#xSVm;r^FqlVi#+JlqH
z4Csc|oyiAtu8nOO3l(cPn+cABO7N^TLz)I9k9YV^6P3$VJ-nAOtng-Y^;Ni~o}O%r
zDdU3h5Jy0A!dQC$_lm<Lnz*m#cm)b$Y1TeN!UL>{>ONPWrqCmds;9Y%uT>}05^j4P
ik0j?SnC!=Nm-+?#L4wF;-O0HC0000<MNUMnLSTZjo#>zd

literal 0
HcmV?d00001

diff --git a/core/img/actions/toggle-filelist.png b/core/img/actions/toggle-filelist.png
new file mode 100644
index 0000000000000000000000000000000000000000..0926a726d53e1cbf6ad2646f5a84a9ff1ef33201
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uK)l42QnexM-P)Pki}dQ
z<QL3v;K9VUk1v2+DNh&25RT~N1O~>xYzm3>fBuWJ{bn}Ms}y3GSSY}(pSRQ!q}|ii
K&t;ucLK6Ugq8|MK

literal 0
HcmV?d00001

diff --git a/core/img/actions/toggle-pictures.png b/core/img/actions/toggle-pictures.png
new file mode 100644
index 0000000000000000000000000000000000000000..7499d5b7809884da195be32975d5e71c26ae0e0b
GIT binary patch
literal 120
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uK)l42Qq=6E^uWmkYXwc
z@(X5oaBZf(1CS@<>Eal|5uKdCz_?O1$XjAdSjJih^#ej24iT~pU#<xYYBZPp1gc~3
MboFyt=akR{04VkzHvj+t

literal 0
HcmV?d00001

diff --git a/core/img/actions/toggle.png b/core/img/actions/toggle.png
new file mode 100644
index 0000000000000000000000000000000000000000..24a6a4d47de12117417066ca90138a7464017439
GIT binary patch
literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`>;M1%Wn^UJ<>h5%Wfc?@
zfD9EC6(B=VQBesAK)A}v%1B~LefmBiLxoF%{DK*TB&8HIwarsAr>x#`?DVxK@BZ#~
z_;?p6?dR#@7*cU-X`eaY0Rw@<=XBpaJ@fy+DaVAf(T92)6g=&OP6f!S?#a@6bImN|
zb4857-j4Yj7M)n?ur2up&kI%A1F9Z;3*<W&KaR1i|MQ&9^$_dnh}w>aK$96fUHx3v
IIVCg!0RM?f-v9sr

literal 0
HcmV?d00001

diff --git a/core/img/actions/triangle-e.png b/core/img/actions/triangle-e.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ce1086f61d4f9ea9333f695407831e2b800819f
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=3hSn7ND=P=dWA$S;_o
zzM;LN^Pi#A-CCfKs;7%%2uE~sf&!n!0g06cZo8O!0+~{$h#!(*3SjeTaAZ8Dz`~&A
V%OdgnTflCR;hwI3F6*2UngEeTAIty%

literal 0
HcmV?d00001

diff --git a/core/img/actions/triangle-n.png b/core/img/actions/triangle-n.png
new file mode 100644
index 0000000000000000000000000000000000000000..2042d66532c01d7266d157a7c665bd7301321405
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE09J8{(R4Sfqa&dAirRS
zhQ^M`vG<vPd>Ky{$B+uf<OSLZDQ=H9Z!lQ=G0<g3L(B$_y9^8prx=`UZ(Z00GRM=^
K&t;ucLK6Uu=N<3>

literal 0
HcmV?d00001

diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
new file mode 100644
index 0000000000000000000000000000000000000000..97c64c6a7203c89f8a0074a13bb53bb5a1d319ce
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE09J8{(R4Sfqa&dAirRS
z@`etpv)y7qzKo}fV@L&K@&fsU6h`JW6TvhS(=#h}&6pwaf|EgYC4=M7mb_CSb39%B
KT-G@yGywoK&l{fr

literal 0
HcmV?d00001

diff --git a/core/img/actions/upload-white.png b/core/img/actions/upload-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..28693f855d3e8243fe54d533451921ce585d3770
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJPk>K|E0F#V0~QCYR{;6UB|(0{
z3=JJh)56<<Ts==0$B+uf<O8e{GcWu&bH*p5rh}u2U(oS`pc04ODm?*ym&w`=5(dhQ
dK8!vL4EbLfo@({}KMB;y;OXk;vd$@?2>_65Dd7MB

literal 0
HcmV?d00001

diff --git a/core/img/actions/upload.png b/core/img/actions/upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..8955ed9641202f08a70536bf9708e67eb7d328f2
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJPk>K|E0Bf*)0gJcfE?zMAirRS
zh7P4^;q5@Ko~MgrNCji^0al5b7k->M<C9U-!O_Go==ecUiNkJ{o&dkgWNilt17$`Z
bMjr--{I3j8wR-=b1exmT>gTe~DWM4fOEDn&

literal 0
HcmV?d00001

diff --git a/core/img/actions/user.png b/core/img/actions/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f2fddc0ea3fbd3a1c45eea0f477a62c4a85f95d
GIT binary patch
literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002<Nkl<ZIE|&#
zp-MzS6vpx2t|E)r*6a%yJyvbT1r>}2eTj_=zJ!=fV%S$O89ZRoW-)3|41z(_;0pI%
z=E@Zh3=IGI=9_b7=JYbte`3CEAtJVLhz(3}l9|^{U9XfuMC{_cf!`3Bd0U13mIU?-
zY=FHcY%^%%b6tgZU3r_qWr2O*s*^!xp5e5CkD3?wTLv(x%%3xJQW6ynB4Qak6*P#5
zgNRscYHR->BGxd*2nz-87aaR8=M`k8naK$6`0Oz5v7VW=62=Pe+!8CZ18WAuj+=j?
yPraE|v59TO%y5V$JmC=!xWF_sZ)j<zzr+`$qf9XcN$NoW0000<MNUMnLSTY6Wqzdq

literal 0
HcmV?d00001

diff --git a/core/img/actions/view-close.png b/core/img/actions/view-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..eae9acc7a4301f25f0bdf3cda51708e51fb7d057
GIT binary patch
literal 1126
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V4M-)6XFWw4kzH?;Naxs<l^E2
z@szf<wyv(OzP`S(u`y7@$jAupS#@=F4Gj$~EiIq|RaI3rH8r4O6%`dA8z`uxqy%IG
z6#xN5i#!-8C@28MrKP166&0_6!S(CcZ{EE56bzm{d-nM8V<7qB#fwLe9zA*T<l)1I
zKn6q*sO0|r`wt#G0Ez=e?%cU^_wL<$_wE7J08O}c>(=etw;_W6|Nr+~<9i)waeGOS
zUoZnB6Eh1d8#@Ol7dH<tAHRU0kg$lTn7D+bl(ejzf})C=x`w8XuAY&pnYo3PwT-R4
zgS&@!U{G*KSa@_yYFc_;eo=98Nl8UzO-*fGeSJfFM^{fz@5D({rcRqackaCT3m2_f
zyKepABbTpSx&G?)>o;%SynXu)2;P7A@Zr<v&tJZL2ZA5c2VS%Rlg&3z7sn6_|K8x&
zdAAHCdS%tO70xN#zolfB$=Cn){wscC*v)CR%2CkAqD-j$$UJ5d#);Rgg68O3{nC3r
zhrc3Url3Yv@AW*lh<YYqlDsCBovY09mH&mZ{H;}MR!K3u7PzrVOLmDLdxF3uhFeDZ
z-}o5+FeI~_x!20~kip<UPs_fQC9}k*K5w6r#B$on`>nu%<~j*Ow+Wh`O}xGNw`O!J
z1!S#E36x}aQ0c4qT{!PWOzN$}Qv@&7{rF}+(KGB?L&Gtff1e6}?$I=Q%Fy%ZU&)3a
zvp6Qc<(JHmIlA|J`R<=q=VLjYeqFxz>v@*?QN!kbWx34<4}1K%m$J_D*4%C7`=_n+
z5Q_cI@JdQ2>2PMeZp+66lXo3Ay*y_wY1d@<a5zlF*lO4NWvefJZl5?y*I09k)~Z?T
z(+?f**{RaZ9`|Qs@+7;xDk~?P65Zggt8i$}#}&8dPCBLZch5~P^TlN$`@2}3PuU-t
z8&@G;@onXeyd!?gS~tFDi<x4uEb`H^lY)CQKb84dJh`5HPasu5y8LL)%z2$zL3d|<
zk-e&A8Ca`(?VhvWnUfiRYiq?`t9(D5w3xqWyT-e_zU!Vm6MS!T?&wW}86W)Zx1}F8
z(RE+>Ic1&SwCq{awm7k@Rto>6@_qH&t#&u<jvQ=#t1o_h#^*;fthRiMUH$#rr+?r7
YFmssBHJEU{3tV7$y85}Sb4q9e0IG+pfB*mh

literal 0
HcmV?d00001

diff --git a/core/img/actions/view-download.png b/core/img/actions/view-download.png
new file mode 100644
index 0000000000000000000000000000000000000000..29e1b6fec70bd0c0bf9717f3cf00011a9afe6ae4
GIT binary patch
literal 1103
zcmV-V1hD&wP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11I$T8K~z|Ut(V<S8&?p=f41=lvE6`8R2y2+auf9mA$-}q0#YS%
z2NLiAeV0A~MpS}=s(`Uoafj62R8{&E{fL{GG-(OO;N4#A3_CuoH%r@*M!PyY=luU?
z&di+I6v-qtMy>c`G*%|=0iG7kn0F=N1D@#6yz94rO~8Urh~|K-yr;#^18#t8U?A@|
zNl3&IaKUpx0hkocoB21u6>urqH{-D+k{p2&C;(;P1K=T06jBiE`T}?Zyp=JJ(W8iz
zaRgH4nI>>~LBJmYGeTlg>@Edd30;fc$Qr(RCL&;os0StqJW%cRdS6v4l^JVzet!O{
zTCILb;Qn_)$_8qrq+`ChF_0&4`_yna%(%ufHYGM1A8DdfHW2|Op#-u7UMP8<cW0iA
zmBhwoNvsFlBT!?VsCl1}MRP#j_x(GI%2=K-O?95u46PMlVnGSmptD6sb3bb|7egTD
z*y{X9aKNA7Zp3GdYVND%6L=u+%<*LHp;1qWq^t)NREv&+7YWj@jGS={fl09`6J&xX
zYxW6h#lRtR>j8DS=DSwAqAWHIROMNYA)vMw0<PKfjxaU*gcp_PdLT!b?^^MuWYI^W
z(=k~vEg(Z@GjC*l7`?Di4=4ef@4D+MLFJnf0+kp76<Itjo5>52v;YnW?u-m!l_VpE
zWuOjx20S@EJ^kAMpXBW9>>J>TtX&tZyn01lUjjY^9s{2PPY(_bTK^UN`1trc;HeOJ
zEEpxh%w!nNeR~Xr!^6Yw!otFX#l^)>U6&`3{r&y#S65fR1zrPx0)G?4$h91mXKQ*?
z5y~DN9le~Jn=39aFMoU=@ZH_rAJ^8_j)6abo*~dT1bp>Cl-!azIXUUp>-A!z(fB9{
zc(d7jzOk{<0)7_)uL$~t3&M`chcGo<ahu9iyWQ^AYPDjc(U^+^-`?K-d24Iy1o#bj
z0lXyK{T0FPwG#SK1l+Dxjp=kc-CC{oU>u2Nv-w=We>J;*&8X`=vo>xF=#DM;h;}-i
z7qhdo1ve&kc6NT++}vy#@NNY7Z2?koJrGAiClA~0_Am4E^SPy^rB49%_V#{QUtd2W
zaJ$|4Uj$J<aKLYG#HawYJ%POuO9a)ig7k!~R_hCZm6ere1m(8JXvD{Yk0TI8LhHKT
zbPwe{FLqY~_?9r*^#&XZ4&$3r?PA@Q+9yb%z5r!q{F?Be;F2)fW5MlC$BFfX{XwxE
z4+1n`^v@{K@7enZSevMh$^M!}bv&`)NeQ?ll!$G&-I|dI{5}Mth}fqK_+DU@e*kMN
V{dzAhU$OuI002ovPDHLkV1nsU_(cE!

literal 0
HcmV?d00001

diff --git a/core/img/actions/view-next.png b/core/img/actions/view-next.png
new file mode 100644
index 0000000000000000000000000000000000000000..be8cc15cecdf1790a32004c1fa4111fb559e0cef
GIT binary patch
literal 959
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V5|-B32_B-M;g%3(9qV_4h#$g
zdR$FS4ahJyHU_dGq@tptva+&@iV9FfS63Iv1_Fqnf`WpQk`hoaoS~(q1vCw)QdLzI
zD0Sn;jhi=bK6vop(W6I?A3p|?4<9}Ra)IE*ix<zHJ$w4}>60f<Amac3|9_`EeKAmT
zT}hB%FaskKGYcylI|nBhH!mN*fS{0wsF;MLl(dYjoV=ovvWl9zhL*ODuAaV;iK&^n
zg{6(Hy@R8ZtDC!rpMOA5XjpheWK>*yLQ-aSPHtX)L19r*QE_oeMP+4UQ)^p$duMk~
zPhVeOfB%HZvt}>beDUJVr%zwJeD(VE+js9jetPwH88A2)i#=T&Ln>~yUj7-*7%0MC
zu=#|+Nrlr9w>mmBoMv3mYW-Gw-RXDRif8%xCUZZZtNc8t(!Ty&?fZM*_i{Z<aN$2Y
z<BebY(F@)aEtWO#`>m3^_LQG(PxCT6Qzrr2sLk4Qe3lCf>vi)fa&#5`m>hlH`t+SC
zx3#!9Ua&je(f(hyWm0F)rbP`}7R`6=smI&LpI*eW@Y1GzGyg<(ua6hm9Junp)GdV?
zHoL1XKa!rB<fmn@u;r%g$*EbfENzpg^nLX?Kh^rtCgn970#-@RHaFAnx-@^mgrvRK
zo=Jy4jX9EgZB+*!gVW&~$C9{jm*?)Qj6UVV_x-Y$j8N5X{e4^N|EqR5W!+i0_=u3h
z1-5jBP>b3>&t@O*z9_i3?GO8c$Zqv{_B9p19@?7;$xSYBFW<n)@Tp6<fc4YF&<`Fd
zvqLYa6$M;R2sjZKeqhDK`Js&SRsY}p)YzzeeS#Zb%QprtU8QgD1Kun=db74soITD~
kZ!U*tn15Ym>h=HPvnomi91Ygb111CpPgg&ebxsLQ06Rf19RL6T

literal 0
HcmV?d00001

diff --git a/core/img/actions/view-pause.png b/core/img/actions/view-pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..94cd1a5dc6c938962bf4d856fe056f4405bd248e
GIT binary patch
literal 648
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy&jWlyT!HlP0KUGy$R2TZb#-)f
zw70jnv$OmE|9{d%SplH5Pf3tpFaskKGYcyl2PZc#AHRUGh=in+jI5lzf})zXzJZaM
zxrLRDt)0DtkAGl9WORH|a!P7?MrK|?X?;^?cW?iM$y28-TDgAP&Ru&?p1XL{*3ycB
zfsw`2#WBRf|LNq{S;rK3+7`dejNi(`w)_8UX&$$&_p1!b^0)rp9dm%m>C>+a1GP30
z<5bBA&hybt?7N*@jzwg12TtkM|81FWa6R+1Z}Ls4rb#E8mK%Hfc{(s8yt_4TCZh+V
zL_<f;aXqF3X1Vq@>#Y3_u5GEwS@-#TsdbRqkzDh>xyjoYvbfA5Ro<Q6B%ib*v;Cs)
z`>%obwR!cg{+;o7lN_hR_kwf#LrvdaF}?bi$Iz~v;lzVI^=ntjTq!Eu@6>UEae=)0
z``S=rhUmKjhxX*K7BIww`ZH{uB*J(kKH<}2UX`r81kTU<nWs2qF1=>w{WouG;+1K^
mv%_+$OAD@Cyxjgh|2LzFkePwnv^~<GXz+CPb6Mw<&;$Tx8>q+t

literal 0
HcmV?d00001

diff --git a/core/img/actions/view-play.png b/core/img/actions/view-play.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8398d5758f44f1616e3682098d90d20ec0bf6a7
GIT binary patch
literal 804
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U~~!a32_B-M*%Pds;a7x!y!FA
zJvTQuEiElEF)=<qJ`N1--@pIh!GpVZ?_LLkD_5>uzI^%r|NkZ~b{#;?*(E`K!3>N{
z%q*;I>>Qk2+&sK|`~reP!Xlz#;u4ZlGO}{=ib~2VYU&!A+B&+1Mkb~fmR2^l_D;^O
zZtfnQ-hm-u;SrHhF|qN9scGq%S=mL!Rn;|(?OolyeSH%qO`bAm{;EyecI>=!|Iv$=
zZ{GfS#vuocMioyN#}EtuxtITDH5&*pe3&DDIV^hdn&!V7-~OGS&2JEvJZX20ZkD8T
zG}B}br@EMPr)3Qqb|`ERcyzkV|4y^cc?FjDe{Gp0pQHw+oQY0P->f>}d1|Qr(+9nZ
z$#?r40<Rrkrj@>c^E=C_RhhT9>DUM^Iwsq=%5HAu@5aT-u9L1zbEviW+_&Gb`;bH@
zmpRKT<@fEEv;Tb2=qO|1bGPGpK3z5Dz{Lqyv<=Ul-`ebaxczzFj-?{cG%gFdPM+(@
zQd|G>mvqG91y??5v_84R)aHG>{-D!@mY^WdO?9k$elsWS`sGz5bXn!(UDh7Uud3@V
zYiy}ykTAY}{(Ydw=lBU0N%K=4nFqIeO|>eGJo(zs?98pA_Zo6rV>V?@&Ydqa=gAAz
cc5~Bz_Nu4W_!!8_vw-5*)78&qol`;+0IMP2asU7T

literal 0
HcmV?d00001

diff --git a/core/img/actions/view-previous.png b/core/img/actions/view-previous.png
new file mode 100644
index 0000000000000000000000000000000000000000..86e2a809626cb0683078e5582d1f37719c07f7de
GIT binary patch
literal 984
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U~CKU32_B-M;h?;^(E5Fix)3m
zx^yW}ac^&LYiny$Q&VGO<CZO3wr<@DWH*4pk|j%OYHDh0YuBz_yK2>{)vH&}nKP%n
zyc|eYR8-8KJ$w1`<+EnZTDEK%&?ul{pqYynEh;W9E-5Mb3kLuH|Mzz_mj_zYSQ6wH
z%)rRR%)-jX&dJTg%O@ZxBrGB-CN3c<B`qhfps1v*qN=8$sim!>XJ}+>Vrph?Wn*XW
z;OOMy;pye=<Ll=i5Ev8@6&;h1n3SB7nwFlClUGn!Qd(Y7SzS|G*VH{>;lf2r*KY!O
zV%zqeyZ7wfxBt-L!$*!BIePTi@e?Oco&NLhQ_zPez~s^3>EaktajSK5c=#a)fmTnB
zMis3~AyFX$q5>f~97<YU8WDkv)$jL~m;c|%&Hr)DVauD>-_M&n)4JI7N^*p*{*{|=
z^wKALUMl8U%ow9TOD3*f<HkFaZky8%dXXvh^)`~-B{yF4$T08RYAG^zj`cmyvhA~2
z`&##?%A9|a|KWVl{Oek;ZfMn{Z2Qo2u}<sJMh+K-%56WoE*?A-aU)m7mSNrrvHJ#A
zXZ(48NM%>(2G5mWyR6+xHiaYAr)}YnTO}qBj3)B^v%BzVQR|18m+Q_LA9maxxq#~h
z%Vrs`C)eZ+taL+mc<fM0ux!34*^z2K&%jFm+>u==UBZm|ra#y&FBR`uXZBn;@upL8
zZ&>_mj$ZxAzxr=$3-6Viy=3{0HsdR&ZC7&l?EAh=%)Qw!In_a7$FUdPLJdMknyOc^
zWPB1{?7hm<;2FDHdV<f<6$XZ{=1O=<vaVUT#wk!>$u^y@rK{z8ew}n=wTP<tw*CJ(
tIkx91)4BS*z9dxKKJ~Cv^I>S`fBiVE;$v^CW)*=FtEa1<%Q~loCIH(~H@N@+

literal 0
HcmV?d00001

diff --git a/core/img/breadcrumb.png b/core/img/breadcrumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..5556920aa73b4b7778c6e89e5c6caa5d3abde86d
GIT binary patch
literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^d_b(j!3-pmK2_cWQq=)IA+G=b|Gz#!z~lYpV4yQJ
zOM?7@8JJnQc?6`S74-BC&D=e`15?xU8k@W3&R@QL=k7g+FJHa&{KcEkU%q~`I?Q+k
zsHxf0#W6%9IChe|P_uym%R#eaPv-Ed9sVExVs%x?YptnQb{mJqM?C8+W4F2D@cviB
zY`!0MP6d{X^Rv0mO>6J`)~~m5N6pJe_e(NgKAKmu^2MiHFD7-L_L=Sy<F<>XMDR(f
zovM7Gvx;RC&xwzzmNBy8+S%zELXyl=cSN$S<my&2P3HW+aTzCn_tg*GK<6-cy85}S
Ib4q9e09={O9{>OV

literal 0
HcmV?d00001

diff --git a/core/img/desktopapp.png b/core/img/desktopapp.png
new file mode 100644
index 0000000000000000000000000000000000000000..272397c949e6846c73280de2a29a42e678e63a09
GIT binary patch
literal 2364
zcmV-C3B&e@P)<h;3K|Lk000e1NJLTq00620002A)0{{R3!I#nQ0008$P)t-s|Ns90
z00000000000000000000000000RaI50s;dA0|W#F1qB5L1_lQQ2M7oV2?+@b3JMDg
z3k(bl4Gj$r4h|0w4-gO#5fKp*5)u;=6BHB_6%`d078Vy57Z?~A85tQG8X6lL8yp-Q
z9UUDW9v&YbA0QwgAt50mA|fLrBP1jwB_$;$CMG8*CnzW=DJdx`Dk>{0D=aK5EiElB
zE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG`
zKR`f0K|w)6LPA7DL`6kKMn*<QM@L9VNJ&XaN=iygOG`{lOifKqPEJlwPft)#P*G7)
zQc_Y=Q&Ut_R8>_~R#sM5S65hASXo(FT3T9LTU%UQTwPsVUS3{bUteHgU}0flVq#)r
zV`F4wWMyS#W@ct*XJ=?=XlZF_YHDh0Yin$5Y;A3AZf<UHaBy*PadL8Ub8~ZabaZuf
zb#``kcXxMqczAhvd3t(!dwY9)e0+U<eSUs^e}8{~fPjI4fr5g9gM)*FgoK5Kg@%TP
zhlhuVh=_@aiHeGfi;IhljEs$qjgF3vkB^U#kdTp)k&=><l$4Z}m6ev3mYA5BnVFfI
znwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|s;aB2
ztE{Z7t*x!EudlGMu(7eRva+(Yw6wLgwYIjlxVX5vxw*Q!y1To(yu7@=zP`V|zreu2
z!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4{l%+Aiv&(F`$(9qJ-($mw^)YR0~
z)z#M4*4Nk9*x1<F+1c9K+T7gS-QC^Z-rnEe-{9cj;o;%p;^O1u<K*Pz=H}+-=jZ6?
z=;`U{>gww2>+9_7?CtIC?(XjI@9*&N@bU5S^78WY^Yixh_V@Sq`1ttw`T6?#`uqF)
z{QUg={r&#_{{R2~AfpJV00007bW%=J018ByqSgJx$H)l)00sO>L_t(&-tF3dRMqtz
z$MKuLp4V}q5Cj)UQzx3G2pWh(lTvT$#8eO`mDm>H55AK9m_IU2#g=(v)O0iFLNB1T
z$VuC{M0$x)2*#3mO_PlxTT|8w)7{s<`{P39IV9@wp13>r{l`6@^SPhT=RWTDeD3G{
zJ>UB_nM|f0y?Xbd8%Lksy?U5TCX?xgp7=oYyuoBL`GgdDnoK?Lk?3LS<tx-)rry3n
z?QQDgE7U$Fd?x%<Kh;n5Q~gvgQ_bl$x@^>>o4W}$U0p_cH=)*aO|5DFQifsVq{eoB
zjqf*Ny-t;M`59jisP(|#8r<0^mkdwiVOvUfpdR1(+lmVv7x`PL4%xZ`)efXeX~5J~
zYvKXIAKvt6d<XTutmLupsyGfp($_5=3yja2HZc2%_^*G%Ggoi;X$XwUO6|XBbuus`
zE8(`sa-zLLrCz(SyedigF#e1r6?mu{_4mOIl4?mhCCU9F*!1oR>B17v3V~IUbb2U;
zKB$$n865iKzok~ISE##G!wQ{z;EDfe9tTyPvR)d8OU6R|Yc$FAdhJfjaWy|)>el_(
zq>rC&RND^$Sgh9EpZ!CdF{HDb-;pNZkluf~MNJlOP`BzsTzUjvRs~JkpJ-lW+>T2{
zZEcg<_v&nEB)p<(Y|>CHt=a&<^tEXOzok7G(qw2<Ar5`|Jw{4%y+Pfrg8}E&<Z^wY
zQ*4*ivL_Z?lH3#9sVns%@Q_Yp)8BwH?e#1%Y+J*Zk{v^z2f#M{1&3Y%nzYIbRPzVg
z8SGY>-EOz<#5}L$taR>fTsl{$I<tqmM#q7LYQ?4_z&`yR0PBVGWh+W$$IxeeVT)>U
zXgAQPwO*h;B~7APDG-q`D#SXquO;P#3UF!ttzRkIL!BoLhkZJXP3{QHpXylv_UJ`8
zEIWoY9_qChhniuCwBR~ZKXF!lER{mO-ie=bO!;B|)h{Q`Y1WgtWbkX94x>zO+#KAj
zW0}ACN=vax4U4OEek1@zs-L;l?V+AD4oK5*NEJ(tsimJ6vQ=At5QNuBQe`lClBD-S
zaLFL@bNz~Jsg~*glq9<un~t<ddeXDP6t~oRP)!y?r;bT_2^>1uCViQDeGjWdtJOMn
zL|*^`GGBOpwi$?Dx8u1*7MNfi1Y@js5jcN)HbmxZ-(Ur7DjTuRc2CDzw{BWHY@pS8
zqoIadR=$u1IFy(4+{UrjIR#ux*i_b8x1k0)@^GFP66^mtb(!<o&bm{bFSobyomt(4
z`W@X_`51NdFqms*@Eu8k9bFe&m&S;Nvw|UD@{B-$djnv~0MCR_;O=Xqb{Q8(XKrJZ
zJCRMfxuG3huSazHK}(LWE`EP7)sN@a^#eAp=gvc(gKmEuu-5C;AJns=WE~YTX~DC{
zZ<)bOxhbzlSTdJ~j*Dkm#EpxhR{lH^fT)iwu(aro1288E2&hi18_q>)Ci9cGOe7OB
z!!o#i%Jrx6*O0PdZ}xRj8d<b+^x@DyKk(qWh+R2pm5DEfoPBUwLE)?oYXF#C3`Cp=
zJXF5y764+-<nRrulgce|M{t6Z!b#;(T~n>jE1^0s-lXqHsiJ)HK1w5t5-1vT2<iq_
z!GS2}k8Op&n6~N<nVzjXw-5+B39(O|nF%nbaoeR-=K!1@YWT^FE;qoHK`+7nr1E)I
zy}6ju$fBVX-S##dji`n<!V8PzD$6a=LmvB+XQzA=01v&IaUW!q0Fg(+EAF|J>UrsZ
zm~k})T~Mza`VH*O?&*xx@OJ9Zl4qXzEFwRDWeM|J%)fh$qUG7e>;-t_=%c$Dqldh=
zIHMvRIFLs4(f-Tt0`~97%S&pfR;L!c9aK5Mo_u+#t};Bck^^Bf#9Cs4hzTNP)<_Ez
zQq0^mjv>*6EST31PlAfeSr7_QOP9w0L6d;ksN{QrIIGn<D1ih>V9=7$W4=Fvu$aqJ
z+pbR9cExA6^;_ThQNL?T0b9Sg8tE5X{SPhuR6o^E^;0{e`p}>3K2*BkLj@r|RA%Et
i#Y?_a66Q07cK-t#X|XPa)f*cC0000<MNUMnLSTYxHi3))

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
new file mode 100644
index 0000000000000000000000000000000000000000..c215094eaa777c8d06bd2197399065e7f4b812fe
GIT binary patch
literal 892
zcmV-?1B3jDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10{KZqK~z|U<&{rp9CZ}OKkqj?JDW|LNUJ@_rVutsRYDO>)f$Qc
zHElpbA}nI?AbP3AQ#}~;BI3oHAcBfQZc^%>q|w$aR!WJ7QWQ0$X>Do`78DOQq$bT~
zXXfi6HAtG>O*U&3{ldWTc<=i@^WOaU!T(*hGBDk@|7+l$4Z0rl8VgS}51m@5l<HQA
zZLB$f=#6HA6O*~FE!6<jN?k!QIDWCGr{SLh0N7`NPX3hJzpd5)=b|WiTNL^k&_wxE
zbrg!^r}`h>UONEe4QFAK=Y{u4?(H>H-0PG0a=O2JM{NM4Z}8%spsf)9y0#j2BRg3W
z0MBF2q$@GH;2dRtvK4CAilbi@Kpa{o9R*W$$;R)6WvlVn5P*!mw~vm_Hyu5CU1HCs
z10Wv!^VMMI<^wp5FSAJRYy==tO_4$y{;s>bKArN~=C4QZ)~9(1xV0Lubx*+HOzY^_
zWIFBo&GhE(e12ZibAUDlAcnU9OdQ12d8x1a`PPyAhoFOqinrfNt#%!k`;sf(ErnKH
z4fe#w>18Hqpk*X~<cI!8?(|}>SEj1~GPlK~`++_n36LEgbM}{Mt!o0pUTGdWwGf*I
zZ-jmZj$rJV%;l18pL{Wu9T|H)3X`A7ybB2zAJ6&?1J3kVDbMu)Ottu1hb}(elQHZ(
zQfKz=y_uHbv4OyEd@r>)x9i8=1G@m)>gs-RQX-1ov(t;$UNbG8EoHja6`b%q9d7<8
zfBy2*U8!&;^?)OOD8@Ps?f^13yabE`pMoYlkIONN;>ZmeJOekcpwcnCChSlYCr7fw
z$9|v8<&x3N>{&zY!fvKtg4nn87*VtoS|x8;C0AfDhjhS2;pv21c+x;YarQ-^y#n;Q
zRB{4>!BD9Q-z&Ud@Ee}G)ca_M;N@C2FAGq#@B<$@B)w1{&2A5!`xppn4N!6gz7mK0
zDDkaucZD%$fTmhEFAD&?TJ*!;%=G!+)w~kGrs!V@FuqExHj;g1Ro<HaUHt)JS`<lO
STtf>00000<MNUMnLSTZE=bK~z

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9db3b9114ccad32c2f06b064e21976cd9a2b021
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10-{MoK~z|U?N+gF6G0Gt!(I4-Yaqe?gG6-cV~GMx>Cn+(?OI7e
zDw2XkBBa7aq}z=tso+WykU#<2l##z6ijy=rKY;Hv6j?|1d3SSX(UB*)@XqYKce}GQ
z1Ki?&2Tij{YyF6s_W{h9r2!Gug%ID$#=0|&0A{X^kORPsSu2h3CI_X|D*&}12$q}8
zW<N=i;PUda!pviSL{v$VBxp1mS*O#9vMl=q;804r<BRXTf;f&hiRiWY+a;n8%)AER
zo@2`efOi0%1DFQ@X5MPGTAQT>m@j|p6IcT4u9NWPK<yuqdt*5Tq-pvLK-Uwr2jIZ`
zdLF-S5CqFEqc;bXQZI3Jr+H!_g!oEC3;@hbdwYA20cd8P%lWTKDchw5BuNtV`~6b@
z_eaUIEL&VzS-G(7(OS;}ILe7QkD{pBXf(1y0!)#q5>bVjH*)4DQpztb(Et#~ah-@h
zkC6~<GxI4kpR`)7?_L2)sXrJmGDGx)5Y^$ayTHt(weA6!wU`G|%DbZrwj{KX1Hkc3
z<N#oNjveNS*kwv_;l9Dlg?()T1`gkaB7vEih-krKo`^ls3y7%hNWur^sU7$PXszqW
z-T!D3PVl(`*`6U0odH-BLY&+7?C$Q)g<*J<6X1P@&Kxis#)^=6-$!vA*GI2|nMo=2
z)ItsbZ5KJ<IRVpBf53FLiH$^O%skBYhZf=?x@nr$R##Vl+l<b6!1Qw~IdFX%`Lb)n
zd>Dow0W8^!zGrw?Ab3$YV>ty#DR-E8Yh<YlU=3G8hYRP%=emnB^OkQa@)ja9$!q}l
zm8NM;O4*L0s6s^B7WX$%6jh~^?H~x20Q>~7?wf{yDW_tk)C&Ne+;US&`MzwdX{X{7
jj90aRt;pQs7DezEoqHeO!r>G=00000NkvXXu0mjftBq$(

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d52756341acdc897f1abf5ba55306153cb905da
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10sTotK~z|U?Uu1?6JZ#}pZEJtQ)~t`bP)#^uZu--&`C!rO4pmL
zi^xGPQ-+R$L#J#<P7+1Zt&qt<@E_==2-Paif~bLr3VKH%-{VjNCB5{%yQW>t12^2q
z`##T)m-mhj_}?YdGz-IUL2JFJlyXVB04@Sp1aN`mS`Y+}$9tT-A&o|3zFaQ5#u!&b
zMgi`>=QIG2Ol!Rhpg2GjMGurx4@sUU36Xrm6A_(uZVezJ>m(O)rCLbksI5#p+!~<W
zZlAENJraNd`UPMMz~DFlz5sYZ@(}>f7;~xD>z%1qt2Y4r&T7v683KTayfen!cO2)v
z@B4p>cpM6V<hLLQUL7WQq@&t_8Ndu+24Jm1|AB)PMbQ-iw*Z_1Fn4SKola*ij^j3f
zdwKc}1ZXy!*R|Fw!{P93mQj)Li2z|3mK?`<3Sf1@^=cgSszrFJQR)&pj`IY-YG(4t
zM5$$qvYr({tJS)U{G*)DDiD#ERshDB+gWBLzmJ)3XSBSH<9NdgfaJL>01?^R`(CM3
zo|F7Ip?pVcy;85&V=Dlq)Q61x&!tjnWAB0Ic>|KmBC-kK2X+^38^BtUB-ec3|1`;L
z-{rpB?VjxS`>#nZrPO~l#@wmZYHu<it+j6gp63mcB)JLT8GxVIz1QuC$hy{gX`10P
a0l;6@exwSa7DXHY0000<MNUMnLSTZ)GZzv7

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..74add13f2760e194a8145532201f6bdc478ea9ed
GIT binary patch
literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xPJzX3_
zB3j>GGUQ@%<YB$wvh0dm&Yq?O<!w#o8@`AY&rakxBXh`2#BsxgbHCTL%-mS8I@K{H
zwrNIu+lS9x41cOOSbn&7-&?cWZ)t~h+P$c3`S)e)XC1FUE<JusqPXB3uRU9hVYbVi
z;}Y&bpEQJqhCUZK6v4&Nu_NV~u%NFC&;|RwG-Eq5w3t>HpSF}&Weo6|+0Aro5d*7+
t10z>J1Cz*t2D1Zek5^xp+g)$se{H5I`;W?nuYpcy@O1TaS?83{1OOSjY?A;0

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..1124a02982f6673167ecaaea22c89cedf0788205
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0vBJY5_^
zB3hFZBv_SY4Gu{xJi7Utv4Mewz?B0(_7{fwS21suInZ)MEyI$TnfdVl|2<z7T{l~0
zJY-nJsI2U4xmCt-8uN;m98XL>%nv&3!N4B&eVL_^L4W|02ot+RGiz*GX}*;5E(ue{
zDi8h;jvlLoD~yZzBuWpgV0M!=c*S6GAcOzH&eRqerk?f}Y1+z%9e3R{<zlmCU`SM!
WIXL&*<4B+z89ZJ6T-G@yGywp7QCVgH

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd8343d245aeafc38967572f5ea6654ecc5e2973
GIT binary patch
literal 595
zcmV-Z0<8UsP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10nkZAK~z|U?Ug-C98na8pL0juAbuc10{H_%z}8Acn@AvP;|2mD
z#6Z>}NWf798^=mP*CLI&+ojU1MMwf^LUhyGCN>fh5I>q&xb5s5i`|vQs59=2U&I$K
z+{4`a-she<a|Ukpze`G!xSd)BI(;{YPQITVbfN+<Wpm%d0aRt8e>gRL5deWD!dO%g
z6#+yEQC<TY*6bWw%On$B5F!I1)mfTc6~K|IBJfxN-9Pb($}@!8hyY{{^ha4-1KI(!
zVBCk9nb&*Acf{><FX)*7fnR~8RvTXah38cb7KSw-ND^qptIj@slfD=HG8F(U&Ar^h
zm`}#Ize+<<8$e)vw`u$Dg#w%=g@p(8JI~h~$E{?4s3H_)Dl?ZDUn$0qhTg{NYhv?)
z%r7Ss>p?uiWZ)n#`mPl8IE%G))ptHBGT_12C-y=|5R)(&XfQ}NKAP&r=x=iJ8KE86
z1e#UN7ep;Tldv^#7mshak_FlU5H=C-aq;_)`58pfh?<JyNO@QOSiW~J=%%$|*#>Pq
zYlW)((-9*9=pRY<WoBRX_^ops$86;8CxZUl0|SWahq#^cUH3B=)Ulu|uYv0XAm1<T
hR3Uq5XWi=B>k!a+gHoPn<|zOG002ovPDHLkV1ng%`Ii6y

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png
new file mode 100644
index 0000000000000000000000000000000000000000..3da67f85f79d13ac9674a3e364bc140adeaf6447
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10y0TNK~z|U?UqeQ6mb~FfA7qGOp8k&hal<P2YU|*Duw9a*}W76
zVXm+ugbH?YXFVD2dJ#8J(t~tyJbUS2wsffb645d8;2{t-cV}_l4mz??;H<lALO!RL
z8RmU{Jn#P<{&1%MUE&wX;n`K7^T-cGvrD;tyIBB6O?{*}fU0DAhGr*P0T5Usj5Z76
zSOCq0s67MPXtO%>&dH~`pn(J$RHtA3D}X~a3!nt@AmWzKW12TmUIT$f+BkqxWVhPk
z<on+4m~kT!`}WnDN<BlFZ#{rgq+IQG3Ip58;n}gUS^ZJkYG1Q$+weqltp%tt?-`jJ
z2eRyM)$P*mmAK_r)>{W4e6BSY)u%OYv(C%@&59N62+}HaEPy?4$d4W6e#9*&-0-<q
z7<$3UrN)!#nKnF`3eu{+1e7AM1))#L^h_I&0e-%j9^AszNtEl!^h_I8cm+r_7vNy#
zz=mh)Ri}{N0a*p@dOWfiqa6AUT*eBoAlwPsHYh;JpE<%8!(;T(;B*{_0oldelO3Yf
zTR^-Xa|n0_M0mbb7})L^n#-WtjVNx!x~sy%vOjZVvL0h!ff6Vi=EsLG3KvB*<3Cf8
zh2>n|*x}5Tn=J!~Li;sqV-xrQctGYi^EzX%8$kBF5!<%CM11`oA-&|}4`Of79D?5m
z6lLBM%~@_`y<$Z>WPi^Ct=iw@<WmB{e?)@NYaqRD#6rB|+Wx82bRUrSC*~@wotW2|
bPQ88s^MTex41ua600000NkvXXu0mjfV1zgF

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png
new file mode 100644
index 0000000000000000000000000000000000000000..d24e1d7af4edddfe4a9edc3b4d091b8af510243c
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10t`t+K~z|U?UuW16j2n$zwgdI8iPa|3&B1rHiBTa`42>AHbezc
zaW{%s>|hkcc(n?+D<Or%*%Wrl&I*E!jqDox*r=6td^Hw9)Y+M1p{tuH?##|j44AJv
zXD;WQ-+i4sz^49pv1>T4*8))J8$h|<sFt-U0M%pnEe-%8yk=Lt>9qieEfSYZK@0?7
z5~BAENZMox)b?woQ6R+%q*S46{40Q;G6=vYD&$D+>*uW^G65in6O}PkeK`m-_QRQz
zAAk6F>`Hxvlnea=4XuE*dWwHf%xE!AWLkh%B*u0Ry*cz75?F|nAjuZA1$a*2Ab?>3
zZtNLax~H{{4!iTaimrDKB9BAidu4GPA}5Ri2vKcTOBcJI<M^uS7sF_>zSDNSD@1fk
zfE>t4MF0}NrNr8TY{2R-kFvbuZKmjYvsNgt2}}UU#jZFAz?VF-y?$nU-U6@<SowX;
z0IZH^t+fIGt+jfj%byyx(s3Z#OVS50a2rqX7RU>diz0FW;0KCKHExw#05DdW+ZQRT
zObPFcm3_ykGcLlbf199RD={I!AJrDcspicy&sGmO6>lEI>3#rd`#^z_EZA=S?&<*n
z7vdx^(g_JUa`f`;;T4G~`{Tr#dJDD$LFR$u&Ycg!{8CPJjtS)KdIA8zD4<?utsv2r
p*hv2a@eYj<5l`2x)}}VRz5&leuh0hkz&ro|002ovPDHLkV1h0I76t$S

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/folder-starred.png b/core/img/filetypes/folder-starred.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b847bf69ea9912e7e1753fcca3124a23d8860c3
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10t`t+K~z|U?Uuc3Q&AYkfA48kN<<Kf*hL4yLBz>Fpt_4-lAC|P
zMqPy71|m2lZdGjKWc8*{7Y7?+Hx-x04|M4u6u-I!bjf1C#gE?eI@FX1wz=otSOxn`
z@8LY}^E{mMp38-8{O^!Xk(~$@fzh4~qF3gxpDXt(fa$7xngggxDdPu|e<DC+h*0cT
zh*$yo8KQdzG^v;a8nvnX2}p1PKVg9|M&D?sNE+ZF=z}BzgNf`#X9P8>a_VmcXwuyK
zNC6JCo4~<1B1vAsOs(dHwVD@-=$*JaaRYq)PB_<DtQs>*ykYEp1p;>wmaWycG4jcZ
zwsloLE>teGI-L90#y;fy;E0OdZy6Xi=spX>f*u9QB?_Q$(uVd%y>fnOGv2-F{0gwr
zS*HutW1^hxr61)AMvO6yOrd%@0v7<!57I{U1rY`_>I|erb-^p#E^kg#@d`mvg?S(q
zMc8EsMO8|kAEY-TWc(nb%A|{~^D79IcN^`gu<WYm8lY9LjJ@f$ESJmc8uh9Cd!Y53
zzWxMIXn-g{&JPY}C#sKMe;!#%kKa1J#t;R4?xN}RDK@Z}9iJYOfmG2dmw;U$7$Yw;
ze)Xn&`F2^wJQLM34w}(n(LI>mZ&jtVX1<O=5xvOJj#sGN>7wa$0)kxaK{*tG^9z#x
p4<trc0C~D)uELWo^V-Hgj~|eFr=pDHpT+<H002ovPDHLkV1g2H9tQvb

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..e811e9cdfdcb70ba397a52797ce8aff7616af1bb
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0u$JzX3_
zB3hFZBv_SY4Gu{xbluEnXkc_h=+cM(_Q{85?YrWZW!cc#*x0ym;ljpFiPMr2Kp^?w
zyhY^fy5*~wJy@@lutf4LSf(r?DWMQp@OAT*crRXMMwy7av!9(f;NZv+!0{%br?H4Z
zrpGGb3gcoviP8frnB8OzUNr==ABZ~oA7~u^#f$ftOSWW-@DwpHm>rM{lzbH^1ausO
Mr>mdKI;Vst0Mcn$6#xJL

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ff5e6c119fda8354bd7ab90ea3ed8345d20e00a
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10b@x-K~z|U?Uubx!!Q&^KU;_;8J(FG!NQ9mwrqvWegN93RIngr
z&Gid(%g8gp%!@dCg@i5x35xRPq(r6?J(G29`8)D;tN=&;JE9sGW8MK=dCGm!THgSG
ztQCEQ1Hg4PIBCvktwpmoC&m~??d0XaS}(Ltpd!!n)1oMzn0Wz!0c@30>o|@-ya-rp
z9|7FgN=s`k0IcQ|7;3?7N9}ITaF+mg)INO*Y?}pUZq<HE?;TJ|t;?P-DxoNf9=r*Z
zw|#{fE*%jiLWpy%b!)F)fw{=C>{1Ak0SJg_*PP$$AtIuUG3ME|E=|)wN|^%)06+-Q
zYT;x7BHEN2EnN~}7-j%2hSp3HsD)SbN)S=P%!zBy(E=Uey%M#)I~gS~5Z;n#_T7c^
zD;N>}BSAzvDdib65B7buz=UuB-?yB(>jm$pw*^zf_oa0L<sXYT{``;VpakAL=DvE&
cI&$EA0a%}P))ildR{#J207*qoM6N<$f;+^+s{jB1

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png
new file mode 100644
index 0000000000000000000000000000000000000000..68117e0d0701d9917a8af13f98f1aa3a9d1c31a9
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0wkJzX3_
zB3hFZBv=<GEMa!5nY8feW+_PtiB}q%9{m5mE423I*&R=2W@cI*VeRR&nr8QZo!tE*
zj@2d;r(IwF&No}>=)DP(Zu<88|9}0E?jb=T2}K9q(?IPK>tt{5i9da-f9Ax-gL03U
z-Y7N-G4b*8>MWYSv~F^iB<F+kukM+Ir7)^VMY)Mclpa{Y>?UjQsv(fQ$10(~@_~c%
rVR<&TV~<U?@Mo{i5b0@}$jiXH#^m-PrS0c{&Svm*^>bP0l+XkKOdo98

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..f21c3a9951d2e7188a5c2980fa63463f268b5afe
GIT binary patch
literal 570
zcmV-A0>%A_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10k=s+K~z|U?Uyl6!ax{?-|w#a2RunsHjM)gy6LE+vk7rfHv=I|
zZf;G`_y?d3u5Ls}2M0&~0)uW!3?UGMx)^$VE|wH&Nvo(a_MN_7`+o0p*K3*s{<|pX
zhGkisM0Co`1R#^k<u0Q%4(k^qdf3dI1TY8SG)j0B|0sZ@r=G1;Dl#HKDE}ycAJM=b
zD3wYJL{v~p?X+60R{(u#rIhh;EJ%LODy58eyM3m$HuL%XjXU07fpWP#PefG!+h3bg
zu$Vb5gs2va#l;~2t@ROr1OPM|jTr!SkN2U|=_rJleF(pjQXUTh09bbm!!UN4ISb&P
zi0VR!{cg9r7bZN6pP4uO0H!^)DTG+jTCX{dv)b$RmH-sO0)+5SxnG45&|s38Po$J5
z5kf!Z|Mkx>2Jqbj&1Q4LG)-rmLCj3HZ9DidY2Ot{rBXc3Z~!18-=4qz3Sxj5AO?s5
zya3N`QLEJg&kLW``}x4tOFEs_z~H~&8o(9+Boc|PWm#hdux;CWdF2-U6%axk0(cy2
zs=pqklm|lq*=+V!2(b#_0>INZ1V0hcIWsS3GMT$?=>JFc2AJlu%{fz>SO5S307*qo
IM6N<$f;U9yc>n+a

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png
new file mode 100644
index 0000000000000000000000000000000000000000..69744e499e6edae39545353f6ebfebb0bb3fdfcd
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10nAB6K~z|U?Up}J+dvq`pZDTGvqwU(u_RKyL=mdQgo-NVX0kwJ
zqRbsLb`I9X11QXngs3`ILbQB|NMT@u2rGLavHW%@262t!KM7O)jPE_Z=l9;(=L0fj
z`rk!yOiHOT5q+Ibr}bvD`83blZnszS`Mk}{-%QgSM9nRt43=e;09-NizF`>OyWQ@G
zFt6h{D~4h8n0cR>uWj3|ECisGDhnZg1K4;j?Tp9cbH{O3W`&PNqYD7L06;`*zVBZu
zrOK%Qg3bY~YeRSae&5sm)oOJL;8rWIN3F!ncfhi&k`Uq-UONwT;=1l(tJU&nJ;%({
z>2!_(9BK83TrRg=uh;vL0BOV1Lc9T3G&~K&3&66%lS0sYgeQTZ_X>{-G4C9RbxOt&
z5rxhbwFRfH>mDq!1-5Nl%xr4)*DVN&%Z7*(4#fWq6G6lc{|8_h5J|#k0xSZNG&~d_
z4Mdu7V9wvL(P-QN*ak4vhBhjdilO^^y<VP~H?{JRh(3me&jkPg(=-RZ?{5LPe=hwj
z6bfIYloQ=6rJNLt#XSH&fWMs!AwEUjiXv}B!AcO(ndf<*Yqi>Am{&?U@jS0eL}yW*
dXUdc*&>#NogdH4}#;yPW002ovPDHLkV1j4t|84*P

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png
new file mode 100644
index 0000000000000000000000000000000000000000..087eadaabd123e5e7ecd60b6c0351be96313060b
GIT binary patch
literal 889
zcmV-<1BU#GP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10`^HnK~z|U?Uzr897Pnyf3IsM0nsR!6^XidP>%*g1QSqCUObqi
zQS>6x+cS&E9&!p{hzF5HlB_#5J=YKvCxRyxkDB1Y1T~P=gZLkew3Aga>Mm>d=VfMT
zlAfL(c2*DiPSy3*``)jryQ{0=|M-`~reV_UcI%Svm$XMxvbMH%eqmwZ&us^gWN{of
zB^?1~a?)?Wu_Q@eY_(c{m3ahP0f^)H6-lpNRUF_3;K<C(OixnjBum9!ueW1$b@kpf
zO?TI7wF_YwUK(occ6*<hogL=^Jk@A4UK=HjT!Buf^FY7fU&*rUoSD6wrs;Q`PUq#}
zjLhtb3dI2qmWhP`OG`_;B)tXPmFuoaI^?~N2G_S$C=PJP!~nHgZ9lN5NHeo%2F+h9
z0$iCGK+>*J31(IwG{33{@a4n+W#*E;9)NsW5#W=F0oK>oF9Pc$ay|ygvg|xi`i=vb
z*@qJY40f@j1=6J~%enx~X7fj2aZLTwQ51bNF#tdmMK4KuC)XuOkI&D~UmkWONpjfC
zULRqx;+%VK4B%)0GgA-*XL4OXG@H$H`7y0lE34P*^FVfWewwBS!!R8CrW9@@?RNWC
zGkX%41MVJr0;hpEilPt9OvCZs`)`5SoW({IMLY9jDgnfCyjRj;Ne6&hN#5tcqI2$)
zq(`zWI|ba5(*->1oO>e-!#^qkc<&DYZvt){buO*|*O%zONIL19>(0&1eO5Fe{|r1f
zVR6P32e`@1p3kyu#e4tW^78USWdNmn_7vjLAPC;~-k<FCdOL~$W($(GBcAT}`-h4E
zwtEHgvH6wF11ti`KLl{|H2{r9<EV4)cHlutFPPa0Nj>0g;HPO;m$V5`=}_vuKMU-i
zBEuJrM&ll+ekh&x1G;<Is0y&9({n*=e#R>qJLeuYvtz)|TP(Z^91ntE^L9@3W76$*
z>l+&z_YDm8n%SL_W`P@loxpX#@4y;x+04F|^bK$kIFlsFg>gSB|GoGdVS^MiG*5vO
P00000NkvXXu0mjf=ai3E

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6bec70cf43e2deacb8b42f2f9201693a7329922
GIT binary patch
literal 382
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0w&JzX3_
zB3j=D8}c<d2;A8lkd^#g+-J)M^NpLgeBo3P`NPJ+X>;gUMskwlO8t+F5=_|()hZg6
z%M`5eDX*^HUR-R<@SpDqci&@~&J3+m%|}*Ui>7AI5)agW%)ROG`*Iyq-`i2suKu3k
z&^kl;(XsD;_h~UPFl;v9`9AMCZ<myj+=krQm$DBV7}>5rFrS^l;fQc@&cfHfX5L>N
z&B(Chr&izN=GVKN>->df&s7I{_DoW_$#_5|Hpiury(7cN#XtU*Mx%{}y26(OyEQdl
zPyMDHkjPcEFs8B3AyreO>4fv!@CDun&kIlRYh2@gYrVsCCQ+6qspqU65wEA$$*+rP
W3u#_8y<Zm?3=E#GelF{r5}E*>^^pny

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cc1ecdc46a0e9cb0b0d1653b6a75450e79a101c
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0w!JzX3_
zB3j>0Gvs126mY$-CwJoBu|r{dj_+@om&BK}`s|^oYL(m=j@=5gc!Uq`(Nbyr?~&%T
z;N$y}%LmT9J7A^pUFRjk1@*~+4;g-EZkV;+<JGg`c{6S{KY8-oyxKW~NuGPg&5X3&
zSxg7mc2smfiD_Kz;mNzBqe3KcVn@1oN@qy^;iJJZ2Y4+!ce!z=uvT-3uukXL!SbAg
z=Rn}42ZDdLHY{12{=wy|Sq@XTRK?$$hdlffc+T{m$@*jAZ+Xi8+Lu{w$v|%~c)I$z
JtaD0e0ss(idSL(n

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bc2f08d1f9d7c848152864c94407d9232f3b877
GIT binary patch
literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0vNJzX3_
zB3hFZBwjWM#vUlXx_UED50BdviC^;@3ze0>w|{sWx5}P#W$K|vDqTA55+Co+f2jSR
zuRU~qg-1EV*9K;B<-=zCd)HU8pJL?sFDa2z|Nqzi^R-vq6=SjtE+2Rm{(s`n+s;P~
zt~_9V@oS-;<?&C?`+q;vSZV$u$b^^CA|b`#*Wpt&7i!;TdzNU5IaO`^)nOB!Vfgp=
z{>hDvj{K2R>=YXqcJciGzt}}{uWSP&+Z{%h%M2TLHr&}_^uxKKYA1uW#0LS1QiiKV
zjCu|lyuAMeB+jxPzQ-u?oXP9*i3j|R7h@di+5e<lcp2aRXDpMNkg_Cm3ZE?lL;7aV
V^yBG0k-$J;@O1TaS?83{1OU}ml@9;_

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png
new file mode 100644
index 0000000000000000000000000000000000000000..644fb852009e9a6d057d23cd0ab14fc8d02e6c04
GIT binary patch
literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0uwo-U3d
z5v|Dy60FLy28Sf%mmQs-o{(U$VDi%0KQ@c~GByAL#m>t|i`dxM+WzzK>@zSEwre$E
z`7l9VgZ;q470eMASXnlS86^dK=zd6y`ct3suc7_G3T8K1gI5iK>^)Wti}f7zS7-9F
u*{}e`Dr63vI8e|MH|^5pb%6#y7#U`~=9jPJ$$JcR3xlVtpUXO@geCw>5>i?K

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f79c32fe01e201d5c5e458327628b0c31d4712d
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0w|JzX3_
zB3hFZBwjWM#wJ{g+rOEIhsRB1*6z-!FM}%<J#Lh55iv>>TzsX74G8w%|6jS?|E~Ng
z=RW2Y%>Rt7HvId&Gxw62|GvgT29_H|n>N0iyIDCTV}Z<p5A!D;e4_vQysh!~-(5T%
z%n~3VDZwN8-%w^&rG|%4Y+vhyXC}{mH7rws*8ab7q>yn&6&stIZ`=L)azg`y7fPou
ztFk0COnkWi-2eY8BImE;JHW<vhmqwngA!k-u(~MEKY;~tdI$K}Y*^f64Q6q>6(3x|
t3?|r?GWT7&uy1is4^N2ap2O@63>Er*tv0Ubn}J?t@O1TaS?83{1OPesgeU+2

literal 0
HcmV?d00001

diff --git a/core/img/logo-icon.png b/core/img/logo-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6874c83673fdf0810515fce0c1bd0fd69bc81209
GIT binary patch
literal 1197
zcmV;e1XBBnP)<h;3K|Lk000e1NJLTq002G!001Hg1^@s62i0n%00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11S&~HK~!jg?U`$cRaF$ne`8}NDW*kImOap*H1RP`qXvm-MUfgM
z7L`a3njTOPRwM}ZK_amF6p_)B`VhuICDfM^#Ad*8W_+Y+VV2WFDwCY4nbQ7!So=C>
z?(B2-K6j4y3eyiZ_ujMDUVE*x*IxT^Ya}rg8CGorsztRNuc=bMC#a<3Q-N22ZNOi^
zKHxpzmI~U?hoqBTPLuSsq+X@-zNB+1V9SY8Q-S3646r6bt{J!*`1j<RW8~@hSYR!1
z4e%ZC7VtID0@Oz8coKL%FM~>vm*XR`xqEry*=xX=z#SR%90tzL!=Mm(CAWL%?=-+x
zpf01Haloa(W5CV81%o%uPhO5s^E}%NOe#aybl?f#L*O8=0XVOG)BMEFy%6m{572~#
z{C@Y@4U8(1J>=we0-eBU;3`+91HD+jC~zyV5SR~i<YaGdbNnn|GH@eM56l8y1eO8~
zPUa8bLEu-+$vXO`LMt{kTCrr<0bEqn$6lwmI}d~NSQBd`JtC>QXl?#U(!=iic1iOk
zZ7i{t7if}ng`|%>b!$$gb^KM}{*<~0ump7gScgSM42OY6;5y*G#Pe2Qc3D;yGsri0
zQ(*Mol~gC`pNNqzrdLwEELsZelr*B+BR&kvy6308Q(ztz5mU?TqYYSr?dV#7iNIXo
zM=W`E0DqRFIBQm)iG|w5z&oTn4e$YQ1LZqi=x;H$zQ4@C<@a~sQD;jwB12<>`X{EX
zlI{+K>LN*dG6(oT+9j<D$TUf+RfbTH*}z;0?826+0$sp_K)X)hvdkkfkSV~9fXq^0
zbrz)|$7_K%8JLahu=$rp7cf3Te+<KcV}ws_tFaAG6d}VJv3XX^DBy2rkdK4do;xqb
z13w33hLhny6mon)iMm<97SHn@Y|FYk)`$pxAa1|z8ze6w$4i~A9s*VYzqsE!faTap
z?NjV(DJ>$h&;y)K+&$eiU=FYyTShNTl?-IRLxF7CENP*nU6K|{>P*z#<udYMX_oYO
zq->j{#>DR<k|wE)tlk=^Z@{*tbFo87GSjaF)(6_hu%7-aN-5gtAMRs-7kq*t$G?c^
z?0VN(aWY%r4Ea1lM;f1CJHS%8Cdnr3<d<ZgSJD>-i85N!fk1fuCh7K+y8V)7NIDuB
zs!5JWYH*)1Y?5@R=lQoPBh-%q_X5XD$c)2A#V2zKunaq8?F;mkWH+z~xD5-}5M97i
zz)POG4c->Mx8W)ElD<rN)5j&Pko2sl?t4k+Ivpb=t#k5e9Fz2%`c7cAlGX;=Y?dXk
zDXzaHA4@vJ=Tnx`*$C_!Xf`kdyHVK#ya9aWWLCN|7T5^94t!IjXCmo0FfG_tx0pG=
z64!2~li3D*2E0w*u5Ju)Ep~g;j?H;5mH0#9l;r<^ONSam*75%U3JZ?RPB`E{00000
LNkvXXu0mjfnkgvY

literal 0
HcmV?d00001

diff --git a/core/img/places/calendar-dark.png b/core/img/places/calendar-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dc21d8a7b8e92695e62da15b4f5d551a42b0681
GIT binary patch
literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyW&u7SuK)l42Qo<o?)r<@0rd!$
z1o;IsFmlSto7mL!%v*l)%I#+#e$CEU#tW2e@N{tuskrrYf+t^tf&j}z*Ve!-|Nlo$
z<rGpD=BqN;n3o#fvEbe!^;fLv90~^|-*nvL`*K3Q;E-L`y|X=44L6r0Fvu`I`4m&*
zaggQ5<0!lHN0<L`UR{1}{Rxrh4v(@Om*<sCcL@Cvd7*9v$HW;;3==0X?RH4m*wrnt
e`Z@c(`I{KCSmc_y@3e-1Jm=}^=d#Wzp$Py#hgy07

literal 0
HcmV?d00001

diff --git a/core/img/places/contacts-dark.png b/core/img/places/contacts-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe03bbfe1a4f0cbeb04ff4bde9bb354cb4a86761
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10sTotK~z|U&DXzcR6!8H@y{9s8-oz93c*IxSwuyGsECD@Vv|3>
z&PE$WkrY;zf~A#$3KljN>R+H@Ar^sCF`!6DBr0knC`s1h-i77ey&so5FAfa5Ftan?
zw>$geg&3pFlr5W@{eJ-1I*1@4gn&Jm#7De~F|O1a9AoTDF@sNtiGIg<j8u;AGx^nA
z;=JDJ3jiaS!YMRzw*6SC0EjrfApjgeGYRwu*Ax3}jpPxxdj`M`EEEJhm-*bQ3Gk{6
zplBN&#(05kCTkZ8?0H!%GZq1qZO?64J6{vv{YC)F2F=&-=^Nk!eizu@W^J>?CzaQw
z){<RtMQ1@RVXVR@)rb9_1CNtnYdDm%2iz@4{suey1-P69{88XDiq$RvQ?*Xhf}jmt
z$iAW-a25A)tc(9r7l7?O17IH>Xq|dxYdeP%*%BPb*DgM1>p-N*r}3*Iab6cI?B8$$
zlXU=Y^_aX@eS)K908jrhKwEE0-U%r{b4UOYv)wME3B!}gb|(e6rnT*cA!F@M$fkc?
zLI`_tQtLWyWO^hWGyr)SW1L3$Nto2fGlQ*x`Kkv=UItwsyV{+)06zx|@MXPMa|tGJ
z5ihiE#f?n+8lK}4cDG}96k(Nw5XNx^2ek?_)lse4TF$<5Iny~jiZOofh}SE?pk>p4
aPX7Wc-@h|B0laJg0000<MNUMnLSTYV0thGo

literal 0
HcmV?d00001

diff --git a/core/img/places/files.png b/core/img/places/files.png
new file mode 100644
index 0000000000000000000000000000000000000000..e317fc3c722b9d2ff4d51286a5f8716c6a0dc99a
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0Mc#19+UzWdTaCl?3?(
zGc<JUKX6daZ0jVTh`y(bV~9p@a>4@60&iv}MioW@dtJ_01z*Nk1<qIou1ObJFS)UD
haJMLa4wg8<z~FVOQY8QNI!>Tg22WQ%mvv4FO#n@+GO7Ro

literal 0
HcmV?d00001

diff --git a/core/img/places/home.png b/core/img/places/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e0313d59a7a5c8502f81dc8806c2429e744b1cc
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!dVo)e>;M1%flPuxX{z5mpd#Lq
zAirP+b1NHLJ9`I5C+GSGk1x^oKnW{P7srr_TU*aqaxp0IuwLAeU;O`bm%=QOY5Vf*
z6h8^=dCS3f;cS3&l67wTnTzG|zDp9Wls5nSn7u*m%~>`j7Z1@EkQ+Q*{an^LB{Ts5
Dw39L?

literal 0
HcmV?d00001

diff --git a/core/img/places/link.png b/core/img/places/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ba9f6530fb65e1b245ccc0ed661d8431381b7fc
GIT binary patch
literal 845
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V6+SH332`Z|36S9G&I!M*jQUz
zTSZ01($Z2_R~N|D)6+9GH8nIe1d>25kYQ$K24ol+837q4CMFOzL;-|^2tvexx`14u
zI8Z%A9Igdf8ALIVL}S3!z;!{?KuDmO5Mv>-a5X>%P#mHLnT>2XvN;s8^(N-=0fR5I
zB*-tAfr*)wjh$0aL`*_TR!&|~Sw&4<LsLsz-@wqw+``_$*~8P@FCZ)_BP%<vps2XC
zrnbJJv8lDEZ{nn>(`U?Gykhm*bsINr+p%-cfg{IHoH}#%{Dq5GZ`{27;L+nJ&tAQK
z_u=!mA3uNn`TMU=%y1Jh`a(Tj978H@ot<<&?2v;%n|YH)*-^3GZY>?98xxKT?bcuv
zG2!A`{pbCEraUvlmIIdeKHWX@W{PoY`xXhu)~vRLfvPvIyzMrA!Wfgjs^^!~-%W8{
zm#rD%XYZXjN3Z&?R<l=C*U!ba4$7A<&3<(<-NUox%W*bOA<n!R>ra$^y{ys3@sfMK
zjyLzt?}2$<FW%WbT5+bJ(CX8tIZV!dum72po;|)H*Q>K7@so?i;itE@aBWbUvXg(t
zoY}t^MARE@F>cJ~ko)_`@NeYmg^a6XC%--ZLs?1c@*D={i1^j}4kh}qNW5#fy)xEf
zN=xbKg6RitvdWw~v}^IsSzj)AGTnVLZ`biBG9@mXH=MXLMK68f4)LR$AHS;BB~0F%
z<oJCRqjutp8IA$0YyaygWWJQ%aG`eIdp0rOwQm`j)XZggxNOun<o~{UY%(*S`XW}2
nOOMa?Uu%<pTc3VE>JQW1XO*IAm!-A>W0k?v)z4*}Q$iB}skAc>

literal 0
HcmV?d00001

diff --git a/core/img/places/music.png b/core/img/places/music.png
new file mode 100644
index 0000000000000000000000000000000000000000..0670544fedc635215d1313921ac8c2cbd879c8d0
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10gOpRK~z|U?Uy@C13?spzm4Lf^-(GTCBa5Z8!c_p+t^qN`XBTU
zNI*LgD}RHHprECV_^4uGBO(YQs3-w*EM}2)o!QK;yQay3fnoNZd(OPrJAouRiQWQo
z4gr<0RU`c}um!9~gM*AKFbGUKgoYD%O`t!kfjM9!6d418RF)%}Sq<D^X8l)WHt-3Q
z@;2a`urDX^U+_&@h&beb4PSw4;0m}5+euLd8lgZ`>=sCMuYC{U0Pr5?dTPW4G9ALg
z&^6FC&^6F;14UFsV18cHK<mE^lrSaN8ZhERXlEb*MoBKSqT>6&l8^8=B)M8m(z)D-
z$1f(tI(aVf)wGEuoq2HX<2>6fm<P5~Eu+D>N6c}2z-C|>=xLLvX&HO)FmUK&V8J8N
zg=MVKhO>t`q(5QV%SVsBtXp_flAbNGElInQN*0c_B02zS2{X9^W`HNlw=%E-OoaVY
zU<dQ2u*2f2D(S^B^IJ)?wwYvYu9~m{Y+{~cZ<zf(0_wm=!s?_(*2igX_yVpX{i51g
Rac%$r002ovPDHLkV1nwq+Ux)T

literal 0
HcmV?d00001

diff --git a/core/img/places/picture.png b/core/img/places/picture.png
new file mode 100644
index 0000000000000000000000000000000000000000..171af526e9d5125b00d46a1e353b60118f33834c
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyP60k4u0Z-fWq>38QX9||(UKs)
zU<NjB?SzK*j?VcT4<9*y^~uv`&%gXrX$;i?Dya8#aSW+oJbTWY?~s82OCb9to`=kQ
z0pIs)ZF-Vo{Oy2RP}bii@3!>6E7`q7=&zmV62A}j66cDyDKfAnFwS6%V?4odK3;hF
zizQD#q^!P}R8XVLpR%&7f`N}i%<v*ZlWUJj!-B4&1I&S&fyBmTocu1EMLPr-ZZ}Ea
eU6(0d%b2l8Zl}BJ+&@64FnGH9xvX<aXaWG+k(1^C

literal 0
HcmV?d00001

diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index 15b58f9e0864..ea034f0aff70 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -145,7 +145,7 @@
 					break;
 				case 'closeButton':
 					if(value) {
-						var $closeButton = $('<a class="oc-dialog-close"></a>');
+						var $closeButton = $('<a class="oc-dialog-close svg"></a>');
 						this.$dialog.prepend($closeButton);
 						$closeButton.on('click', function() {
 							self.close();
diff --git a/core/js/js.js b/core/js/js.js
index 07ed396bec9b..7f98668dcb27 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -327,8 +327,8 @@ var OC={
 	 * @return {string}
 	 */
 	imagePath:function(app,file){
-		if(file.indexOf('.')==-1){//if no extension is given, use svg
-			file+='.svg';
+		if(file.indexOf('.')==-1){//if no extension is given, use png or svg depending on browser support
+			file+=(OC.Util.hasSVGSupport())?'.svg':'.png';
 		}
 		return OC.filePath(app,'img',file);
 	},
@@ -592,7 +592,7 @@ var OC={
 			var arrowclass = settings.hasClass('topright') ? 'up' : 'left';
 			var jqxhr = $.get(OC.filePath(props.appid, '', props.scriptName), function(data) {
 				popup.html(data).ready(function() {
-					popup.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close"></a>').show();
+					popup.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close svg"></a>').show();
 					popup.find('.close').bind('click', function() {
 						popup.remove();
 					});
@@ -613,6 +613,9 @@ var OC={
 							throw e;
 						});
 					}
+					if(!OC.Util.hasSVGSupport()) {
+						OC.Util.replaceSVG();
+					}
 				}).show();
 			}, 'html');
 		}
@@ -1354,6 +1357,49 @@ if(typeof localStorage !=='undefined' && localStorage !== null){
 	};
 }
 
+/**
+ * check if the browser support svg images
+ * @return {boolean}
+ */
+function SVGSupport() {
+	return SVGSupport.checkMimeType.correct && !!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', "svg").createSVGRect;
+}
+SVGSupport.checkMimeType=function(){
+	$.ajax({
+		url: OC.imagePath('core','breadcrumb.svg'),
+		success:function(data,text,xhr){
+			var headerParts=xhr.getAllResponseHeaders().split("\n");
+			var headers={};
+			$.each(headerParts,function(i,text){
+				if(text){
+					var parts=text.split(':',2);
+					if(parts.length===2){
+						var value=parts[1].trim();
+						if(value[0]==='"'){
+							value=value.substr(1,value.length-2);
+						}
+						headers[parts[0].toLowerCase()]=value;
+					}
+				}
+			});
+			if(headers["content-type"]!=='image/svg+xml'){
+				OC.Util.replaceSVG();
+				SVGSupport.checkMimeType.correct=false;
+			}
+		}
+	});
+};
+SVGSupport.checkMimeType.correct=true;
+
+/**
+ * Replace all svg images with png for browser compatibility
+ * @param $el
+ * @deprecated use OC.Util.replaceSVG instead
+ */
+function replaceSVG($el){
+	return OC.Util.replaceSVG($el);
+}
+
 /**
  * prototypical inheritance functions
  * @todo Write documentation
@@ -1471,6 +1517,12 @@ function initCore() {
 		initSessionHeartBeat();
 	}
 
+	if(!OC.Util.hasSVGSupport()){ //replace all svg images with png images for browser that don't support svg
+		OC.Util.replaceSVG();
+	}else{
+		SVGSupport.checkMimeType();
+	}
+
 	OC.registerMenu($('#expand'), $('#expanddiv'));
 
 	// toggle for menus
@@ -1739,21 +1791,24 @@ OC.Util = {
 	},
 	/**
 	 * Returns whether the browser supports SVG
-	 * @deprecated SVG is always supported (since 9.0)
 	 * @return {boolean} true if the browser supports SVG, false otherwise
 	 */
-	hasSVGSupport: function(){
-		return true
-	},
+	// TODO: replace with original function
+	hasSVGSupport: SVGSupport,
 	/**
 	 * If SVG is not supported, replaces the given icon's extension
 	 * from ".svg" to ".png".
 	 * If SVG is supported, return the image path as is.
 	 * @param {string} file image path with svg extension
-	 * @deprecated SVG is always supported (since 9.0)
 	 * @return {string} fixed image path with png extension if SVG is not supported
 	 */
 	replaceSVGIcon: function(file) {
+		if (file && !OC.Util.hasSVGSupport()) {
+			var i = file.lastIndexOf('.svg');
+			if (i >= 0) {
+				file = file.substr(0, i) + '.png' + file.substr(i+4);
+			}
+		}
 		return file;
 	},
 	/**
@@ -1761,9 +1816,39 @@ OC.Util = {
 	 * with PNG images.
 	 *
 	 * @param $el root element from which to search, defaults to $('body')
-	 * @deprecated SVG is always supported (since 9.0)
 	 */
-	replaceSVG: function($el) {},
+	replaceSVG: function($el) {
+		if (!$el) {
+			$el = $('body');
+		}
+		$el.find('img.svg').each(function(index,element){
+			element=$(element);
+			var src=element.attr('src');
+			element.attr('src',src.substr(0, src.length-3) + 'png');
+		});
+		$el.find('.svg').each(function(index,element){
+			element = $(element);
+			var background = element.css('background-image');
+			if (background){
+				var i = background.lastIndexOf('.svg');
+				if (i >= 0){
+					background = background.substr(0,i) + '.png' + background.substr(i + 4);
+					element.css('background-image', background);
+				}
+			}
+			element.find('*').each(function(index, element) {
+				element = $(element);
+				var background = element.css('background-image');
+				if (background) {
+					var i = background.lastIndexOf('.svg');
+					if(i >= 0){
+						background = background.substr(0,i) + '.png' + background.substr(i + 4);
+						element.css('background-image', background);
+					}
+				}
+			});
+		});
+	},
 
 	/**
 	 * Fix image scaling for IE8, since background-size is not supported.
diff --git a/core/js/mimetype.js b/core/js/mimetype.js
index 0d30da26c265..3cc33ce28305 100644
--- a/core/js/mimetype.js
+++ b/core/js/mimetype.js
@@ -29,7 +29,7 @@ OC.MimeType = {
 	 * Cache that maps mimeTypes to icon urls
 	 */
 	_mimeTypeIcons: {},
-
+	
 	/**
 	 * Return the file icon we want to use for the given mimeType.
 	 * The file needs to be present in the supplied file list
@@ -60,7 +60,7 @@ OC.MimeType = {
 
 		return null;
 	},
-
+	
 	/**
 	 * Return the url to icon of the given mimeType
 	 *
@@ -91,14 +91,19 @@ OC.MimeType = {
 				path += icon;
 			}
 		}
-
+		
 		// If we do not yet have an icon fall back to the default
 		if (gotIcon === null) {
 			path = OC.webroot + '/core/img/filetypes/';
 			path += OC.MimeType._getFile(mimeType, OC.MimeTypeList.files);
 		}
 
-		path += '.svg';
+		// Use svg if we can
+		if(OC.Util.hasSVGSupport()){
+			path += '.svg';
+		} else {
+			path += '.png';
+		}
 
 		// Cache the result
 		OC.MimeType._mimeTypeIcons[mimeType] = path;
@@ -106,3 +111,5 @@ OC.MimeType = {
 	}
 
 };
+
+
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 85dee9789876..83fde1546150 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -38,7 +38,7 @@
 					'<span class="shareOption">' +
 						'<input id="canEdit-{{cid}}-{{shareWith}}" type="checkbox" name="edit" class="permissions checkbox" {{#if hasEditPermission}}checked="checked"{{/if}} />' +
 						'<label for="canEdit-{{cid}}-{{shareWith}}">{{canEditLabel}}</label>' +
-						'<a href="#" class="showCruds"><img alt="{{crudsLabel}}" src="{{triangleSImage}}"/></a>' +
+						'<a href="#" class="showCruds"><img class="svg" alt="{{crudsLabel}}" src="{{triangleSImage}}"/></a>' +
 					'</span>' +
 					'{{/if}}' +
 					'<div class="cruds hidden">' +
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index c17da94bab3d..a4bfde1777be 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -30,7 +30,7 @@
 		'<div class="loading hidden" style="height: 50px"></div>';
 
 	var TEMPLATE_REMOTE_SHARE_INFO =
-		'<a target="_blank" class="icon-info shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
+		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
 		'title="{{tooltip}}"></a>';
 
 	/**
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 9f75ac42f217..3ced66a1a785 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -187,7 +187,7 @@
 			}).fail(function(xhr) {
 				var msg = t('core', 'Error');
 				var result = xhr.responseJSON;
-				if (result && result.ocs && result.ocs.meta) {
+				if (result.ocs && result.ocs.meta) {
 					msg = result.ocs.meta.message;
 				}
 
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 1ffe7b38a40b..3d19a38c4168 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -231,12 +231,22 @@ describe('Core base tests', function() {
 		});
 		describe('Images', function() {
 			it('Generates image path with given extension', function() {
+				var svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport', function() { return true; });
 				expect(OC.imagePath('core', 'somefile.jpg')).toEqual(OC.webroot + '/core/img/somefile.jpg');
 				expect(OC.imagePath(TESTAPP, 'somefile.jpg')).toEqual(TESTAPP_ROOT + '/img/somefile.jpg');
+				svgSupportStub.restore();
 			});
-			it('Generates image path with svg extension', function() {
+			it('Generates image path with svg extension when svg support exists', function() {
+				var svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport', function() { return true; });
 				expect(OC.imagePath('core', 'somefile')).toEqual(OC.webroot + '/core/img/somefile.svg');
 				expect(OC.imagePath(TESTAPP, 'somefile')).toEqual(TESTAPP_ROOT + '/img/somefile.svg');
+				svgSupportStub.restore();
+			});
+			it('Generates image path with png ext when svg support is not available', function() {
+				var svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport', function() { return false; });
+				expect(OC.imagePath('core', 'somefile')).toEqual(OC.webroot + '/core/img/somefile.png');
+				expect(OC.imagePath(TESTAPP, 'somefile')).toEqual(TESTAPP_ROOT + '/img/somefile.png');
+				svgSupportStub.restore();
 			});
 		});
 	});
@@ -494,6 +504,32 @@ describe('Core base tests', function() {
 			expect($navigation.is(':visible')).toEqual(false);
 		});
 	});
+	describe('SVG extension replacement', function() {
+		var svgSupportStub;
+
+		beforeEach(function() {
+			svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport');
+		});
+		afterEach(function() {
+			svgSupportStub.restore();
+		});
+		it('does not replace svg extension with png when SVG is supported', function() {
+			svgSupportStub.returns(true);
+			expect(
+				OC.Util.replaceSVGIcon('/path/to/myicon.svg?someargs=1')
+			).toEqual(
+				'/path/to/myicon.svg?someargs=1'
+			);
+		});
+		it('replaces svg extension with png when SVG not supported', function() {
+			svgSupportStub.returns(false);
+			expect(
+				OC.Util.replaceSVGIcon('/path/to/myicon.svg?someargs=1')
+			).toEqual(
+				'/path/to/myicon.png?someargs=1'
+			);
+		});
+	});
 	describe('Util', function() {
 		describe('humanFileSize', function() {
 			it('renders file sizes with the correct unit', function() {
@@ -981,3 +1017,4 @@ describe('Core base tests', function() {
 		});
 	});
 });
+
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 98d955418277..7f179bfa5d69 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -51,14 +51,14 @@
 				autocomplete="off" autocapitalize="off" autocorrect="off" required>
 			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
 			<input type="checkbox" id="show" name="show">
-			<label for="show"></label>
+			<label for="show" class="svg"></label>
 			<div class="strengthify-wrapper"></div>
 		</p>
 	</fieldset>
 
 	<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id="advancedHeader">
-		<legend><a id="showAdvanced"><?php p($l->t( 'Storage & database' )); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
+		<legend><a id="showAdvanced"><?php p($l->t( 'Storage & database' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
 	</fieldset>
 	<?php endif; ?>
 
@@ -162,7 +162,7 @@
 	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div>
 
 	<p class="info">
-		<span class="icon-info-white"></span>
+		<span class="icon-info-white svg"></span>
 		<?php p($l->t('Need help?'));?>
 		<a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation'));?> ↗</a>
 	</p>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 585063531586..985e95294adc 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -31,7 +31,7 @@
 				<?php if ($_['bodyid'] === 'body-login' ): ?>
 					<header role="banner">
 						<div id="header">
-							<div class="logo">
+							<div class="logo svg">
 								<h1 class="hidden-visually">
 									<?php p($theme->getName()); ?>
 								</h1>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 370a6e2bd606..b19095dee8ea 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -39,7 +39,7 @@
 	<header role="banner"><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
 				id="owncloud" tabindex="1">
-				<div class="logo-icon">
+				<div class="logo-icon svg">
 					<h1 class="hidden-visually">
 						<?php p($theme->getName()); ?>
 					</h1>
@@ -56,11 +56,11 @@
 						}
 					?>
 				</h1>
-				<div class="icon-caret"></div>
+				<div class="icon-caret svg"></div>
 			</a>
 
 			<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
-			<div id="settings">
+			<div id="settings" class="svg">
 				<div id="expand" tabindex="6" role="link" class="menutoggle">
 					<?php if ($_['enableAvatars']): ?>
 					<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
@@ -73,7 +73,7 @@
 					</div>
 					<?php endif; ?>
 					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
-					<img alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>">
+					<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>">
 				</div>
 				<div id="expanddiv">
 				<ul>
@@ -81,14 +81,14 @@
 					<li>
 						<a href="<?php print_unescaped($entry['href']); ?>"
 							<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
-							<img alt="" src="<?php print_unescaped($entry['icon']); ?>">
+							<img class="svg" alt="" src="<?php print_unescaped($entry['icon']); ?>">
 							<?php p($entry['name']) ?>
 						</a>
 					</li>
 				<?php endforeach; ?>
 					<li>
 						<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
-							<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg')); ?>">
+							<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg')); ?>">
 							<?php p($l->t('Log out'));?>
 						</a>
 					</li>
@@ -100,20 +100,20 @@
 				<label for="searchbox" class="hidden-visually">
 					<?php p($l->t('Search'));?>
 				</label>
-				<input id="searchbox" type="search" name="query"
+				<input id="searchbox" class="svg" type="search" name="query"
 					value="" required
 					autocomplete="off" tabindex="5">
 			</form>
 		</div></header>
 
 		<nav role="navigation"><div id="navigation">
-			<div id="apps">
+			<div id="apps" class="svg">
 				<ul>
 				<?php foreach($_['navigation'] as $entry): ?>
 					<li data-id="<?php p($entry['id']); ?>">
 						<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
 							<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
-							<img class="app-icon" alt="" src="<?php print_unescaped($entry['icon']); ?>">
+							<img class="app-icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>">
 							<div class="icon-loading-dark" style="display:none;"></div>
 							<span>
 								<?php p($entry['name']); ?>
@@ -128,7 +128,7 @@
 					<li id="apps-management">
 						<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4"
 							<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
-							<img class="app-icon" alt="" src="<?php print_unescaped(image_path('settings', 'apps.svg')); ?>">
+							<img class="app-icon svg" alt="" src="<?php print_unescaped(image_path('settings', 'apps.svg')); ?>">
 							<div class="icon-loading-dark" style="display:none;"></div>
 							<span>
 								<?php p($l->t('Apps')); ?>
diff --git a/core/templates/login.php b/core/templates/login.php
index 95c5a423c3de..5b0fd97cfd86 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -53,7 +53,7 @@
 				<?php p($_['user_autofocus'] ? '' : 'autofocus'); ?>
 				autocomplete="on" autocapitalize="off" autocorrect="off" required>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
-			<input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
+			<input type="submit" id="submit" class="login primary icon-confirm svg" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
 		</p>
 
 		<?php if (!empty($_['invalidpassword']) && !empty($_['canResetPassword'])) { ?>
diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
index 87f93967d910..24b2beec6dac 100644
--- a/core/templates/update.admin.php
+++ b/core/templates/update.admin.php
@@ -47,7 +47,7 @@
 		<p id="update-progress-message-error" class="warning hidden"></p>
 		<ul id="update-progress-message-warnings" class="warning hidden"></ul>
 		<p id="update-progress-message"></p>
-		<a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a>
+		<a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a>
 		<div id="update-progress-detailed" class="hidden warning"></div>
 	</div>
 </div>
diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
index 2d68c92b14ef..6191eae2754f 100644
--- a/lib/private/Files/Type/Detection.php
+++ b/lib/private/Files/Type/Detection.php
@@ -283,21 +283,21 @@ public function mimeTypeIcon($mimetype) {
 
 		// Is it a dir?
 		if ($mimetype === 'dir') {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder.png');
 			return $this->mimetypeIcons[$mimetype];
 		}
 		if ($mimetype === 'dir-shared') {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-shared.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-shared.png');
 			return $this->mimetypeIcons[$mimetype];
 		}
 		if ($mimetype === 'dir-external') {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-external.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-external.png');
 			return $this->mimetypeIcons[$mimetype];
 		}
 
 		// Icon exists?
 		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.png');
 			return $this->mimetypeIcons[$mimetype];
 		} catch (\RuntimeException $e) {
 			// Specified image not found
@@ -306,13 +306,13 @@ public function mimeTypeIcon($mimetype) {
 		// Try only the first part of the filetype
 		$mimePart = substr($icon, 0, strpos($icon, '-'));
 		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.png');
 			return $this->mimetypeIcons[$mimetype];
 		} catch (\RuntimeException $e) {
 			// Image for the first part of the mimetype not found
 		}
 
-		$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/file.svg');
+		$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/file.png');
 		return $this->mimetypeIcons[$mimetype];
 	}
 }
diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php
index f96b422f57ad..8b1a0500538f 100644
--- a/lib/private/Preview/MP3.php
+++ b/lib/private/Preview/MP3.php
@@ -68,7 +68,7 @@ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
 	 * @return bool|\OCP\IImage false if the default image is missing or invalid
 	 */
 	private function getNoCoverThumbnail() {
-		$icon = \OC::$SERVERROOT . '/core/img/filetypes/audio.svg';
+		$icon = \OC::$SERVERROOT . '/core/img/filetypes/audio.png';
 
 		if(!file_exists($icon)) {
 			return false;
diff --git a/settings/Controller/AuthSettingsController.php b/settings/Controller/AuthSettingsController.php
index e7fc2d916bca..db2db6e5bfc7 100644
--- a/settings/Controller/AuthSettingsController.php
+++ b/settings/Controller/AuthSettingsController.php
@@ -81,28 +81,7 @@ public function index() {
 		if (is_null($user)) {
 			return [];
 		}
-		$tokens = $this->tokenProvider->getTokenByUser($user);
-		
-		try {
-			$sessionId = $this->session->getId();
-		} catch (SessionNotAvailableException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
-		try {
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
-		} catch (InvalidTokenException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
-
-		return array_map(function(IToken $token) use ($sessionToken) {
-			$data = $token->jsonSerialize();
-			if ($sessionToken->getId() === $token->getId()) {
-				$data['canDelete'] = false;
-			} else {
-				$data['canDelete'] = true;
-			}
-			return $data;
-		}, $tokens);
+		return $this->tokenProvider->getTokenByUser($user);
 	}
 
 	/**
@@ -115,7 +94,9 @@ public function create($name) {
 		try {
 			$sessionId = $this->session->getId();
 		} catch (SessionNotAvailableException $ex) {
-			return $this->getServiceNotAvailableResponse();
+			$resp = new JSONResponse();
+			$resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
+			return $resp;
 		}
 
 		try {
@@ -127,7 +108,9 @@ public function create($name) {
 				$password = null;
 			}
 		} catch (InvalidTokenException $ex) {
-			return $this->getServiceNotAvailableResponse();
+			$resp = new JSONResponse();
+			$resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
+			return $resp;
 		}
 
 		$token = $this->generateRandomDeviceToken();
@@ -140,12 +123,6 @@ public function create($name) {
 		];
 	}
 
-	private function getServiceNotAvailableResponse() {
-		$resp = new JSONResponse();
-		$resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
-		return $resp;
-	}
-
 	/**
 	 * Return a 20 digit device password
 	 *
diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js
index 472b841c2302..01fc1b2ea343 100644
--- a/settings/js/authtoken_view.js
+++ b/settings/js/authtoken_view.js
@@ -29,11 +29,7 @@
 		'<tr data-id="{{id}}">'
 		+ '<td class="has-tooltip" title="{{name}}"><span class="token-name">{{name}}</span></td>'
 		+ '<td><span class="last-activity has-tooltip" title="{{lastActivityTime}}">{{lastActivity}}</span></td>'
-		+ '{{#if canDelete}}'
 		+ '<td><a class="icon-delete has-tooltip" title="' + t('core', 'Disconnect') + '"></a></td>'
-		+ '{{else}}'
-		+ '<td></td>'
-		+ '{{/if}}'
 		+ '<tr>';
 
 	var SubView = OC.Backbone.View.extend({
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e0fdea64773d..e0fccbd95399 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -117,7 +117,7 @@ var UserList = {
 		 * remove action
 		 */
 		if ($tr.find('td.remove img').length === 0 && OC.currentUser !== user.name) {
-			var deleteImage = $('<img class="action">').attr({
+			var deleteImage = $('<img class="svg action">').attr({
 				src: OC.imagePath('core', 'actions/delete')
 			});
 			var deleteLink = $('<a class="action delete">')
@@ -138,13 +138,10 @@ var UserList = {
 				.find('option').attr('selected', null)
 				.first().attr('selected', 'selected');
 		} else {
-			var $options = $quotaSelect.find('option');
-			var $foundOption = $options.filterAttr('value', user.quota);
-			if ($foundOption.length > 0) {
-				$foundOption.attr('selected', 'selected');
+			if ($quotaSelect.find('option').filterAttr('value', user.quota).length > 0) {
+				$quotaSelect.find('option').filterAttr('value', user.quota).attr('selected', 'selected');
 			} else {
-				// append before "Other" entry
-				$options.last().before('<option value="' + escapeHTML(user.quota) + '" selected="selected">' + escapeHTML(user.quota) + '</option>');
+				$quotaSelect.append('<option value="' + escapeHTML(user.quota) + '" selected="selected">' + escapeHTML(user.quota) + '</option>');
 			}
 		}
 
@@ -579,15 +576,6 @@ var UserList = {
 		var $select = $(ev.target);
 		var uid = UserList.getUID($select);
 		var quota = $select.val();
-		if (quota === 'other') {
-			return;
-		}
-		if (isNaN(parseInt(quota, 10)) || parseInt(quota, 10) < 0) {
-			// the select component has added the bogus value, delete it again
-			$select.find('option[selected]').remove();
-			OC.Notification.showTemporary(t('core', 'Invalid quota value "{val}"', {val: quota}));
-			return;
-		}
 		UserList._updateQuota(uid, quota, function(returnedQuota){
 			if (quota !== returnedQuota) {
 				$select.find(':selected').text(returnedQuota);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9195e03ff482..0cdefe100833 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -202,7 +202,7 @@
 
 	<div class="section" id="shareAPI">
 		<h2><?php p($l->t('Sharing'));?></h2>
-		<a target="_blank"  el="noreferrer" class="icon-info"
+		<a target="_blank"  el="noreferrer" class="icon-info svg"
 			title="<?php p($l->t('Open documentation'));?>"
 			href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
 		<p id="enable">
@@ -314,7 +314,7 @@
 		endif; ?>
 	</p>
 	<?php endif; ?>
-	<a target="_blank" rel="noreferrer" class="icon-info"
+	<a target="_blank" rel="noreferrer" class="icon-info svg"
 		title="<?php p($l->t('Open documentation'));?>"
 		href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
 
@@ -346,7 +346,7 @@
 
 <div class="section" id='encryptionAPI'>
 	<h2><?php p($l->t('Server-side encryption')); ?></h2>
-	<a target="_blank" rel="noreferrer" class="icon-info"
+	<a target="_blank" rel="noreferrer" class="icon-info svg"
 		title="<?php p($l->t('Open documentation'));?>"
 		href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
 
@@ -412,7 +412,7 @@
 <div class="section" id="mail_general_settings">
 	<form id="mail_general_settings_form" class="mail_settings">
 		<h2><?php p($l->t('Email server'));?></h2>
-		<a target="_blank" rel="noreferrer" class="icon-info"
+		<a target="_blank" rel="noreferrer" class="icon-info svg"
 			title="<?php p($l->t('Open documentation'));?>"
 			href="<?php p(link_to_docs('admin-email')); ?>"></a>
 
diff --git a/settings/templates/certificates.php b/settings/templates/certificates.php
index 16f8dda31ad6..c1ccdcaef952 100644
--- a/settings/templates/certificates.php
+++ b/settings/templates/certificates.php
@@ -26,7 +26,7 @@
 					<?php else: ?>style="visibility:hidden;"
 					<?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
 										 title="<?php p($l->t('Delete')); ?>"
-										 class="action"
+										 class="svg action"
 										 src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/>
 				</td>
 			</tr>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index a31cf1ed7b29..5056aad4c10d 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -39,9 +39,9 @@
 		<div class="avatardiv"></div>
 		<div class="warning hidden"></div>
 		<?php if ($_['avatarChangeSupported']): ?>
-		<label for="uploadavatar" class="inlineblock button icon-upload" id="uploadavatarbutton" title="<?php p($l->t('Upload new')); ?>"></label>
-		<div class="inlineblock button icon-folder" id="selectavatar" title="<?php p($l->t('Select from Files')); ?>"></div>
-		<div class="hidden button icon-delete" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
+		<label for="uploadavatar" class="inlineblock button icon-upload svg" id="uploadavatarbutton" title="<?php p($l->t('Upload new')); ?>"></label>
+		<div class="inlineblock button icon-folder svg" id="selectavatar" title="<?php p($l->t('Select from Files')); ?>"></div>
+		<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
 		<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
 		<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
 		<?php else: ?>
@@ -130,7 +130,7 @@
 		placeholder="<?php echo $l->t('New password');?>"
 		data-typetoggle="#personal-show"
 		autocomplete="off" autocapitalize="off" autocorrect="off" />
-	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
+	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="svg"></label>
 	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	<br/>
 	<div class="strengthify-wrapper"></div>
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 64c602c364c8..cd6ac4a1e899 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -8,7 +8,7 @@
 	<li id="newgroup-form" style="display: none">
 		<form>
 			<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
-			<input type="submit" class="button icon-add" value="" />
+			<input type="submit" class="button icon-add svg" value="" />
 		</form>
 	</li>
 	<!-- Everyone -->
@@ -45,7 +45,7 @@
 				<span class="usercount"><?php if($group['usercount'] > 0) { p($group['usercount']); } ?></span>
 				<?php if($_['isAdmin']): ?>
 				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
-					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" />
+					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
 				</a>
 				<?php endif; ?>
 			</span>
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index c7b2ad58c153..697d0f3f1428 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -26,15 +26,15 @@
 			<td class="avatar"><div class="avatardiv"></div></td>
 		<?php endif; ?>
 			<th class="name" scope="row"></th>
-			<td class="displayName"><span></span> <img class="action"
+			<td class="displayName"><span></span> <img class="svg action"
 				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
 				alt="<?php p($l->t("change full name"))?>" title="<?php p($l->t("change full name"))?>"/>
 			</td>
-			<td class="password"><span>●●●●●●●</span> <img class="action"
+			<td class="password"><span>●●●●●●●</span> <img class="svg action"
 				src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>"
 				alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/>
 			</td>
-			<td class="mailAddress"><span></span><div class="loading-small hidden"></div> <img class="action"
+			<td class="mailAddress"><span></span><div class="loading-small hidden"></div> <img class="svg action"
 				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
 				alt="<?php p($l->t('change email address'))?>" title="<?php p($l->t('change email address'))?>"/>
 			</td>
diff --git a/tests/Settings/Controller/AuthSettingsControllerTest.php b/tests/Settings/Controller/AuthSettingsControllerTest.php
index 1705cb5ddf19..ee67b221022b 100644
--- a/tests/Settings/Controller/AuthSettingsControllerTest.php
+++ b/tests/Settings/Controller/AuthSettingsControllerTest.php
@@ -24,7 +24,6 @@
 
 use OC\AppFramework\Http;
 use OC\Authentication\Exceptions\InvalidTokenException;
-use OC\Authentication\Token\DefaultToken;
 use OC\Authentication\Token\IToken;
 use OC\Settings\Controller\AuthSettingsController;
 use OCP\AppFramework\Http\JSONResponse;
@@ -57,17 +56,10 @@ protected function setUp() {
 	}
 
 	public function testIndex() {
-		$token1 = new DefaultToken();
-		$token1->setId(100);
-		$token2 = new DefaultToken();
-		$token2->setId(200);
-		$tokens = [
-			$token1,
-			$token2,
+		$result = [
+			'token1',
+			'token2',
 		];
-		$sessionToken = new DefaultToken();
-		$sessionToken->setId(100);
-
 		$this->userManager->expects($this->once())
 			->method('get')
 			->with($this->uid)
@@ -75,31 +67,9 @@ public function testIndex() {
 		$this->tokenProvider->expects($this->once())
 			->method('getTokenByUser')
 			->with($this->user)
-			->will($this->returnValue($tokens));
-		$this->session->expects($this->once())
-			->method('getId')
-			->will($this->returnValue('session123'));
-		$this->tokenProvider->expects($this->once())
-			->method('getToken')
-			->with('session123')
-			->will($this->returnValue($sessionToken));
+			->will($this->returnValue($result));
 
-		$this->assertEquals([
-			[
-				'id' => 100,
-				'name' => null,
-				'lastActivity' => null,
-				'type' => null,
-				'canDelete' => false,
-			],
-			[
-				'id' => 200,
-				'name' => null,
-				'lastActivity' => null,
-				'type' => null,
-				'canDelete' => true,
-			]
-		], $this->controller->index());
+		$this->assertEquals($result, $this->controller->index());
 	}
 
 	public function testCreate() {
@@ -137,7 +107,6 @@ public function testCreate() {
 		$expected = [
 			'token' => $newToken,
 			'deviceToken' => $deviceToken,
-			'loginName' => 'User13',
 		];
 		$this->assertEquals($expected, $this->controller->create($name));
 	}

From 9712c9db0f0b68d5aa0ac906a8403a17bdc84138 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 6 Jul 2016 17:54:18 +0200
Subject: [PATCH 010/219] Additional perm check in Webdav

---
 apps/dav/lib/Connector/Sabre/ObjectTree.php   |   5 +
 .../unit/Connector/Sabre/ObjectTreeTest.php   |  82 +++++++++++++
 .../integration/features/bootstrap/WebDav.php |  28 ++++-
 .../features/webdav-related.feature           | 111 +++++++++++++++++-
 4 files changed, 222 insertions(+), 4 deletions(-)

diff --git a/apps/dav/lib/Connector/Sabre/ObjectTree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php
index 9e7d876187da..051272e862f5 100644
--- a/apps/dav/lib/Connector/Sabre/ObjectTree.php
+++ b/apps/dav/lib/Connector/Sabre/ObjectTree.php
@@ -283,6 +283,11 @@ public function copy($source, $destination) {
 			throw new InvalidPath($ex->getMessage());
 		}
 
+		// Webdav's copy will implicitly do a delete+create, so only create+delete permissions are required
+		if (!$this->fileView->isCreatable($destinationDir)) {
+			throw new \Sabre\DAV\Exception\Forbidden();
+		}
+
 		try {
 			$this->fileView->copy($source, $destination);
 		} catch (StorageNotAvailableException $e) {
diff --git a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
index 4a5e43376c0f..b4f0b22dd70f 100644
--- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
@@ -142,6 +142,88 @@ private function moveTest($source, $destination, $updatables, $deletables) {
 		$objectTree->move($source, $destination);
 	}
 
+	public function copyDataProvider() {
+		return [
+			// copy into same dir
+			['a', 'b', ''],
+			// copy into same dir
+			['a/a', 'a/b', 'a'],
+			// copy into another dir
+			['a', 'sub/a', 'sub'],
+		];
+	}
+
+	/**
+	 * @dataProvider copyDataProvider
+	 */
+	public function testCopy($sourcePath, $targetPath, $targetParent) {
+		$view = $this->getMock('\OC\Files\View');
+		$view->expects($this->once())
+			->method('verifyPath')
+			->with($targetParent)
+			->will($this->returnValue(true));
+		$view->expects($this->once())
+			->method('isCreatable')
+			->with($targetParent)
+			->will($this->returnValue(true));
+		$view->expects($this->once())
+			->method('copy')
+			->with($sourcePath, $targetPath)
+			->will($this->returnValue(true));
+
+		$info = new FileInfo('', null, null, array(), null);
+
+		$rootDir = new \OCA\DAV\Connector\Sabre\Directory($view, $info);
+		$objectTree = $this->getMock('\OCA\DAV\Connector\Sabre\ObjectTree',
+			array('nodeExists', 'getNodeForPath'),
+			array($rootDir, $view));
+
+		$objectTree->expects($this->once())
+			->method('getNodeForPath')
+			->with($this->identicalTo($sourcePath))
+			->will($this->returnValue(false));
+
+		/** @var $objectTree \OCA\DAV\Connector\Sabre\ObjectTree */
+		$mountManager = \OC\Files\Filesystem::getMountManager();
+		$objectTree->init($rootDir, $view, $mountManager);
+		$objectTree->copy($sourcePath, $targetPath);
+	}
+
+	/**
+	 * @dataProvider copyDataProvider
+	 * @expectedException \Sabre\DAV\Exception\Forbidden
+	 */
+	public function testCopyFailNotCreatable($sourcePath, $targetPath, $targetParent) {
+		$view = $this->getMock('\OC\Files\View');
+		$view->expects($this->once())
+			->method('verifyPath')
+			->with($targetParent)
+			->will($this->returnValue(true));
+		$view->expects($this->once())
+			->method('isCreatable')
+			->with($targetParent)
+			->will($this->returnValue(false));
+		$view->expects($this->never())
+			->method('copy');
+
+		$info = new FileInfo('', null, null, array(), null);
+
+		$rootDir = new \OCA\DAV\Connector\Sabre\Directory($view, $info);
+		$objectTree = $this->getMock('\OCA\DAV\Connector\Sabre\ObjectTree',
+			array('nodeExists', 'getNodeForPath'),
+			array($rootDir, $view));
+
+		$objectTree->expects($this->once())
+			->method('getNodeForPath')
+			->with($this->identicalTo($sourcePath))
+			->will($this->returnValue(false));
+
+		/** @var $objectTree \OCA\DAV\Connector\Sabre\ObjectTree */
+		$mountManager = \OC\Files\Filesystem::getMountManager();
+		$objectTree->init($rootDir, $view, $mountManager);
+		$objectTree->copy($sourcePath, $targetPath);
+	}
+
 	/**
 	 * @dataProvider nodeForPathProvider
 	 */
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 0abb8667739b..3df37db72bb0 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -67,7 +67,27 @@ public function userMovedFile($user, $fileSource, $fileDestination){
 	public function userMovesFile($user, $fileSource, $fileDestination){
 		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
 		$headers['Destination'] = $fullUrl . $fileDestination;
-		$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
+		try {
+			$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
+		} catch (\GuzzleHttp\Exception\ClientException $e) {
+			$this->response = $e->getResponse();
+		}
+	}
+
+	/**
+	 * @When /^User "([^"]*)" copies file "([^"]*)" to "([^"]*)"$/
+	 * @param string $user
+	 * @param string $fileSource
+	 * @param string $fileDestination
+	 */
+	public function userCopiesFile($user, $fileSource, $fileDestination){
+		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
+		$headers['Destination'] = $fullUrl . $fileDestination;
+		try {
+			$this->response = $this->makeDavRequest($user, "COPY", $fileSource, $headers);
+		} catch (\GuzzleHttp\Exception\ClientException $e) {
+			$this->response = $e->getResponse();
+		}
 	}
 
 	/**
@@ -142,7 +162,11 @@ public function downloadedContentWhenDownloadindShouldBe($fileSource, $range, $c
 	 * @param string $fileName
 	 */
 	public function downloadingFile($fileName) {
-		$this->response = $this->makeDavRequest($this->currentUser, 'GET', $fileName, []);
+		try {
+			$this->response = $this->makeDavRequest($this->currentUser, 'GET', $fileName, []);
+		} catch (\GuzzleHttp\Exception\ClientException $e) {
+			$this->response = $e->getResponse();
+		}
 	}
 
 	/**
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index 06df280ea646..1f87ef4990ac 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -2,12 +2,119 @@ Feature: webdav-related
 	Background:
 		Given using api version "1"
 
-	Scenario: moving a file old way
+	Scenario: Moving a file
 		Given using dav path "remote.php/webdav"
 		And As an "admin"
 		And user "user0" exists
-		When User "user0" moves file "/textfile0.txt" to "/FOLDER/textfile0.txt"
+		And As an "user0"
+		When User "user0" moves file "/welcome.txt" to "/FOLDER/welcome.txt"
 		Then the HTTP status code should be "201"
+		And Downloading file "/FOLDER/welcome.txt"
+		And Downloaded content should start with "Welcome to your ownCloud account!"
+
+	Scenario: Moving and overwriting a file old way
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And As an "user0"
+		When User "user0" moves file "/welcome.txt" to "/textfile0.txt"
+		Then the HTTP status code should be "204"
+		And Downloading file "/textfile0.txt"
+		And Downloaded content should start with "Welcome to your ownCloud account!"
+
+	Scenario: Moving a file to a folder with no permissions
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user1" exists
+		And As an "user1"
+		And user "user1" created a folder "/testshare"
+		And as "user1" creating a share with
+		  | path | testshare |
+		  | shareType | 0 |
+		  | permissions | 1 |
+		  | shareWith | user0 |
+		And As an "user0"
+		When User "user0" moves file "/textfile0.txt" to "/testshare/textfile0.txt"
+		Then the HTTP status code should be "403"
+		And Downloading file "/testshare/textfile0.txt"
+		And the HTTP status code should be "404"
+
+	Scenario: Moving a file to overwrite a file in a folder with no permissions
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user1" exists
+		And As an "user1"
+		And user "user1" created a folder "/testshare"
+		And as "user1" creating a share with
+		  | path | testshare |
+		  | shareType | 0 |
+		  | permissions | 1 |
+		  | shareWith | user0 |
+		And User "user1" copies file "/welcome.txt" to "/testshare/overwritethis.txt"
+		And As an "user0"
+		When User "user0" moves file "/textfile0.txt" to "/testshare/overwritethis.txt"
+		Then the HTTP status code should be "403"
+		And Downloading file "/testshare/overwritethis.txt"
+		And Downloaded content should start with "Welcome to your ownCloud account!"
+
+	Scenario: Copying a file
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And As an "user0"
+		When User "user0" copies file "/welcome.txt" to "/FOLDER/welcome.txt"
+		Then the HTTP status code should be "201"
+		And Downloading file "/FOLDER/welcome.txt"
+		And Downloaded content should start with "Welcome to your ownCloud account!"
+
+	Scenario: Copying and overwriting a file
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And As an "user0"
+		When User "user0" copies file "/welcome.txt" to "/textfile1.txt"
+		Then the HTTP status code should be "204"
+		And Downloading file "/textfile1.txt"
+		And Downloaded content should start with "Welcome to your ownCloud account!"
+
+	Scenario: Copying a file to a folder with no permissions
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user1" exists
+		And As an "user1"
+		And user "user1" created a folder "/testshare"
+		And as "user1" creating a share with
+		  | path | testshare |
+		  | shareType | 0 |
+		  | permissions | 1 |
+		  | shareWith | user0 |
+		And As an "user0"
+		When User "user0" copies file "/textfile0.txt" to "/testshare/textfile0.txt"
+		Then the HTTP status code should be "403"
+		And Downloading file "/testshare/textfile0.txt"
+		And the HTTP status code should be "404"
+
+	Scenario: Copying a file to overwrite a file into a folder with no permissions
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user1" exists
+		And As an "user1"
+		And user "user1" created a folder "/testshare"
+		And as "user1" creating a share with
+		  | path | testshare |
+		  | shareType | 0 |
+		  | permissions | 1 |
+		  | shareWith | user0 |
+		And User "user1" copies file "/welcome.txt" to "/testshare/overwritethis.txt"
+		And As an "user0"
+		When User "user0" copies file "/textfile0.txt" to "/testshare/overwritethis.txt"
+		Then the HTTP status code should be "403"
+		And Downloading file "/testshare/overwritethis.txt"
+		And Downloaded content should start with "Welcome to your ownCloud account!"
 
 	Scenario: download a file with range
 		Given using dav path "remote.php/webdav"

From c301b8d71e1cd09446772cef92ca43c0a5218086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Mon, 11 Jul 2016 13:13:08 +0000
Subject: [PATCH 011/219] Modified integration tests

---
 .../features/webdav-related.feature           | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index 1f87ef4990ac..19913416afee 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -9,8 +9,7 @@ Feature: webdav-related
 		And As an "user0"
 		When User "user0" moves file "/welcome.txt" to "/FOLDER/welcome.txt"
 		Then the HTTP status code should be "201"
-		And Downloading file "/FOLDER/welcome.txt"
-		And Downloaded content should start with "Welcome to your ownCloud account!"
+		And Downloaded content when downloading file "/FOLDER/welcome.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Moving and overwriting a file old way
 		Given using dav path "remote.php/webdav"
@@ -19,8 +18,7 @@ Feature: webdav-related
 		And As an "user0"
 		When User "user0" moves file "/welcome.txt" to "/textfile0.txt"
 		Then the HTTP status code should be "204"
-		And Downloading file "/textfile0.txt"
-		And Downloaded content should start with "Welcome to your ownCloud account!"
+		And Downloaded content when downloading file "/textfile0.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Moving a file to a folder with no permissions
 		Given using dav path "remote.php/webdav"
@@ -35,10 +33,10 @@ Feature: webdav-related
 		  | permissions | 1 |
 		  | shareWith | user0 |
 		And As an "user0"
-		When User "user0" moves file "/textfile0.txt" to "/testshare/textfile0.txt"
-		Then the HTTP status code should be "403"
-		And Downloading file "/testshare/textfile0.txt"
-		And the HTTP status code should be "404"
+		And User "user0" moves file "/textfile0.txt" to "/testshare/textfile0.txt"
+		And the HTTP status code should be "403"
+		When Downloading file "/testshare/textfile0.txt"
+ 		Then the HTTP status code should be "404"
 
 	Scenario: Moving a file to overwrite a file in a folder with no permissions
 		Given using dav path "remote.php/webdav"
@@ -56,8 +54,7 @@ Feature: webdav-related
 		And As an "user0"
 		When User "user0" moves file "/textfile0.txt" to "/testshare/overwritethis.txt"
 		Then the HTTP status code should be "403"
-		And Downloading file "/testshare/overwritethis.txt"
-		And Downloaded content should start with "Welcome to your ownCloud account!"
+		And Downloaded content when downloading file "/testshare/overwritethis.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Copying a file
 		Given using dav path "remote.php/webdav"
@@ -66,8 +63,7 @@ Feature: webdav-related
 		And As an "user0"
 		When User "user0" copies file "/welcome.txt" to "/FOLDER/welcome.txt"
 		Then the HTTP status code should be "201"
-		And Downloading file "/FOLDER/welcome.txt"
-		And Downloaded content should start with "Welcome to your ownCloud account!"
+		And Downloaded content when downloading file "/FOLDER/welcome.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Copying and overwriting a file
 		Given using dav path "remote.php/webdav"
@@ -76,8 +72,7 @@ Feature: webdav-related
 		And As an "user0"
 		When User "user0" copies file "/welcome.txt" to "/textfile1.txt"
 		Then the HTTP status code should be "204"
-		And Downloading file "/textfile1.txt"
-		And Downloaded content should start with "Welcome to your ownCloud account!"
+		And Downloaded content when downloading file "/textfile1.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Copying a file to a folder with no permissions
 		Given using dav path "remote.php/webdav"
@@ -113,8 +108,7 @@ Feature: webdav-related
 		And As an "user0"
 		When User "user0" copies file "/textfile0.txt" to "/testshare/overwritethis.txt"
 		Then the HTTP status code should be "403"
-		And Downloading file "/testshare/overwritethis.txt"
-		And Downloaded content should start with "Welcome to your ownCloud account!"
+		And Downloaded content when downloading file "/testshare/overwritethis.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: download a file with range
 		Given using dav path "remote.php/webdav"
@@ -203,13 +197,13 @@ Feature: webdav-related
 		Given Logging in using web as "admin"
 		When Sending a "GET" to "/remote.php/webdav/welcome.txt" without requesttoken
 		Then Downloaded content should start with "Welcome to your ownCloud account!"
-		Then the HTTP status code should be "200"
+		And the HTTP status code should be "200"
 
 	Scenario: Doing a GET with a web login should work with CSRF token on the old backend
 		Given Logging in using web as "admin"
 		When Sending a "GET" to "/remote.php/webdav/welcome.txt" with requesttoken
 		Then Downloaded content should start with "Welcome to your ownCloud account!"
-		Then the HTTP status code should be "200"
+		And the HTTP status code should be "200"
 
 	Scenario: Doing a PROPFIND with a web login should not work without CSRF token on the old backend
 		Given Logging in using web as "admin"

From 92f49fbb395f494a639d481461fa6739600193c2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 13 Jul 2016 10:40:33 +0200
Subject: [PATCH 012/219] [stable9.1] Workaround to check htaccess in case of
 redirects (#25434)

* Workaround to check htaccess in case of redirects

In some setups, the web server will redirect any call to "data/" to the
main page. This causes the XHR to return the 200 HTTP status code and
the body contains the HTML page of the main page / files app.

This fix improves the htaccess failure detection by adding a known
string inside the test file "htaccesstest.txt". If we are able to find
this string, it means that the web server didn't block access to that
file.

* Fix setup check unit test (#25439)
---
 core/js/setupchecks.js                 |  2 +-
 core/js/tests/specs/setupchecksSpec.js | 14 +++++++++++++-
 lib/private/legacy/util.php            |  3 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 280c8d08c995..954eeab6d0ca 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -198,7 +198,7 @@
 			}
 			var afterCall = function(xhr) {
 				var messages = [];
-				if (xhr.status !== 403 && xhr.status !== 307 && xhr.status !== 301 && xhr.responseText !== '') {
+				if (xhr.status !== 403 && xhr.status !== 307 && xhr.status !== 301 && xhr.responseText.indexOf('HTACCESSFAIL') >= 0) {
 					messages.push({
 						msg: t('core', 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.'),
 						type: OC.SetupChecks.MESSAGE_TYPE_ERROR
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 172e6e271350..5d34e4d50c99 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -103,7 +103,7 @@ describe('OC.SetupChecks tests', function() {
 		it('should return an error if data directory is not protected', function(done) {
 			var async = OC.SetupChecks.checkDataProtected();
 
-			suite.server.requests[0].respond(200, {'Content-Type': 'text/plain'}, 'file contents');
+			suite.server.requests[0].respond(200, {'Content-Type': 'text/plain'}, '*cough*HTACCESSFAIL*cough*');
 
 			async.done(function( data, s, x ){
 				expect(data).toEqual([
@@ -126,6 +126,18 @@ describe('OC.SetupChecks tests', function() {
 			});
 		});
 
+		it('should not return an error if data directory is protected and redirects to main page', function(done) {
+			var async = OC.SetupChecks.checkDataProtected();
+
+			suite.server.requests[0].respond(200, {'Content-Type': 'text/plain'}, '<html><body>blah</body></html>');
+
+			async.done(function( data, s, x ){
+				expect(data).toEqual([]);
+				done();
+			});
+		});
+
+
 		it('should return an error if data directory is a boolean', function(done) {
 
 			oc_dataURL = false;
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index 78445dab0203..f34fef7d06dc 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -1143,7 +1143,8 @@ public function createHtaccessTestFile(\OCP\IConfig $config) {
 
 		// testdata
 		$fileName = '/htaccesstest.txt';
-		$testContent = 'This is used for testing whether htaccess is properly enabled to disallow access from the outside. This file can be safely removed.';
+		// test content containing the string "HTACCESSFAIL"
+		$testContent = 'HTACCESSFAIL: This is used for testing whether htaccess is properly enabled to disallow access from the outside. This file can be safely removed.';
 
 		// creating a test file
 		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;

From 0daddd5866e51d58d0467da9b492a8456c794859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Wed, 13 Jul 2016 14:34:52 +0200
Subject: [PATCH 013/219] [stable9.1] Cast share id to string (#25402) (#25432)

---
 apps/dav/lib/Connector/PublicAuth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php
index 4e63ca1d29ed..201e5b22ee57 100644
--- a/apps/dav/lib/Connector/PublicAuth.php
+++ b/apps/dav/lib/Connector/PublicAuth.php
@@ -98,7 +98,7 @@ protected function validateUserPass($username, $password) {
 				if ($this->shareManager->checkPassword($share, $password)) {
 					return true;
 				} else if ($this->session->exists('public_link_authenticated')
-					&& $this->session->get('public_link_authenticated') === $share->getId()) {
+					&& $this->session->get('public_link_authenticated') === (string)$share->getId()) {
 					return true;
 				} else {
 					if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) {

From 084f46917a53e6997317283ac0d445a02740c974 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 13 Jul 2016 16:12:25 +0200
Subject: [PATCH 014/219] [stable9.1] Adding certificate revocation list and
 validate if the app certificate is revoked (#25468)

* Adding certificate revocation list and validate if the app certificate is revoked

* Check integrity of a signed app in any case on installation
---
 lib/private/Installer.php                  |  2 +-
 lib/private/IntegrityCheck/Checker.php     | 24 +++++++-
 resources/codesigning/intermediate.crl.pem | 21 +++++++
 tests/lib/IntegrityCheck/CheckerTest.php   | 72 +++++++++++++++++++---
 4 files changed, 108 insertions(+), 11 deletions(-)
 create mode 100644 resources/codesigning/intermediate.crl.pem

diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index e8872c6662fe..6e54d9e102a4 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -367,7 +367,7 @@ public static function checkAppsIntegrity($data, $extractDir, $path, $isShipped
 			$appBelongingToId = $info['id'];
 			$previouslySigned = 'false';
 		}
-		if($data['appdata']['level'] === OC_App::officialApp || $previouslySigned === 'true') {
+		if (file_exists($extractDir . '/appinfo/signature.json') || $previouslySigned === 'true') {
 			\OC::$server->getConfig()->setAppValue($appBelongingToId, 'signed', 'true');
 			$integrityResult = \OC::$server->getIntegrityCodeChecker()->verifyAppSignature(
 					$appBelongingToId,
diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
index 57127f280c4f..d4038f85302f 100644
--- a/lib/private/IntegrityCheck/Checker.php
+++ b/lib/private/IntegrityCheck/Checker.php
@@ -327,10 +327,30 @@ private function verify($signaturePath, $basePath, $certificateCN) {
 		$x509 = new \phpseclib\File\X509();
 		$rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/root.crt');
 		$x509->loadCA($rootCertificatePublicKey);
-		$x509->loadX509($certificate);
+		$loadedCertificate = $x509->loadX509($certificate);
 		if(!$x509->validateSignature()) {
-			throw new InvalidSignatureException('Certificate is not valid.');
+			throw new InvalidSignatureException('App Certificate is not valid.');
 		}
+
+		// Check if the certificate has been revoked
+		$crlFileContent = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/intermediate.crl.pem');
+		if ($crlFileContent && strlen($crlFileContent) > 0) {
+			$crl = new \phpseclib\File\X509();
+			$crl->loadCA($rootCertificatePublicKey);
+			$crl->loadCRL($crlFileContent);
+			if(!$crl->validateSignature()) {
+				throw new InvalidSignatureException('Certificate Revocation List is not valid.');
+			}
+			// Get the certificate's serial number.
+			$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
+
+			// Check certificate revocation status.
+			$revoked = $crl->getRevoked($csn);
+			if ($revoked) {
+				throw new InvalidSignatureException('Certificate has been revoked.');
+			}
+		}
+
 		// Verify if certificate has proper CN. "core" CN is always trusted.
 		if($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') {
 			throw new InvalidSignatureException(
diff --git a/resources/codesigning/intermediate.crl.pem b/resources/codesigning/intermediate.crl.pem
new file mode 100644
index 000000000000..f6e54cf0dbc7
--- /dev/null
+++ b/resources/codesigning/intermediate.crl.pem
@@ -0,0 +1,21 @@
+-----BEGIN X509 CRL-----
+MIIDdDCCAVwCAQEwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCVVMxDzANBgNV
+BAgMBkJvc3RvbjEWMBQGA1UECgwNb3duQ2xvdWQgSW5jLjE1MDMGA1UEAwwsb3du
+Q2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBBdXRob3JpdHkXDTE2MDcx
+MjEzMjYyMFoXDTI2MDcxMDEzMjYyMFowFTATAgIQCBcNMTYwNzEyMTMyNDE2WqCB
+ozCBoDCBkAYDVR0jBIGIMIGFgBR9mg09Gd5DWmT1JlP0DaWkbgfDs6FppGcwZTEL
+MAkGA1UEBhMCVVMxDzANBgNVBAgMBkJvc3RvbjEWMBQGA1UECgwNb3duQ2xvdWQg
+SW5jLjEtMCsGA1UEAwwkb3duQ2xvdWQgQ29kZSBTaWduaW5nIFJvb3QgQXV0aG9y
+aXR5ggIQADALBgNVHRQEBAICEAIwDQYJKoZIhvcNAQELBQADggIBAJ+HZMvR1doo
+t/l7cjv4Nt6BOugrTv0WzLWz6hhPS305l5kwWyekLzl+4UJLfmX0uEGAMxi370GZ
+Ljwgeu/sIlP0ZEDr6+Py2ddSP9ZKvfymOx3Ihzr+7aa99HZvG2wx4N6yvy2dYBkD
+CiE7RRdmO43vZYFAAcRPOlJwaKepk0Zyg2Hr4WWNsqRPkDYkWk3Zf85rRhwwmO8a
+2UNAe4BiCRQeNBbOgoNkA7vETJKO7NyVshBrBkosFfXFe4S7SIOJLtgHKjk5Z7Hn
+X46eEsnndOLVZiBZ1p0I5tTY4iQbGNxy0ZHwCMDjLsPfD4CaosT/YX74anMmYVtX
+YU3k5sweg/bHBJx2oKeVk0L0n2HH2gfpwL1zuJjzwuN/AB/VbogRLEzT2MKJ8clU
+nYlNKao7FRyiS1L+1sBNYyBFyAhHfs4ddX5KzZIWD9A4nYW22Xw+1azaykCNdrrB
+4dCGdi3QbyTXodx/J5r4iHmkF3JW7g0bNmw0GFHUwrbTWcfGsyjDfXKuae9sjMTV
+Ud62ee+7If+89UvKq6El+d1SEOCyy7vK+3cHPilbWRc/735qfBeD8JWir3V9BTcS
+lNE51CbvI5t90H+Nu1XRae9KSLMk/bpfF7NO/rXebB6GCvCmaSKDlkuhqqKBKa/q
+jJX4kqB0cB2GJT8CHq7sQEGjyjLrXWQ3
+-----END X509 CRL-----
diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php
index 6e6095668b06..75e923da7da0 100644
--- a/tests/lib/IntegrityCheck/CheckerTest.php
+++ b/tests/lib/IntegrityCheck/CheckerTest.php
@@ -34,19 +34,19 @@
 use OCP\App\IAppManager;
 
 class CheckerTest extends TestCase {
-	/** @var EnvironmentHelper */
+	/** @var EnvironmentHelper | \PHPUnit_Framework_MockObject_MockObject */
 	private $environmentHelper;
-	/** @var AppLocator */
+	/** @var AppLocator | \PHPUnit_Framework_MockObject_MockObject */
 	private $appLocator;
 	/** @var Checker */
 	private $checker;
-	/** @var FileAccessHelper */
+	/** @var FileAccessHelper | \PHPUnit_Framework_MockObject_MockObject */
 	private $fileAccessHelper;
-	/** @var IConfig */
+	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
 	private $config;
-	/** @var ICacheFactory */
+	/** @var ICacheFactory | \PHPUnit_Framework_MockObject_MockObject */
 	private $cacheFactory;
-	/** @var IAppManager */
+	/** @var IAppManager | \PHPUnit_Framework_MockObject_MockObject */
 	private $appManager;
 
 	public function setUp() {
@@ -848,7 +848,7 @@ public function testVerifyCoreWithInvalidCertificate() {
 		$expected = [
 				'EXCEPTION' => [
 						'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException',
-						'message' => 'Certificate is not valid.',
+						'message' => 'App Certificate is not valid.',
 				]
 		];
 		$this->assertSame($expected, $this->checker->verifyCoreSignature());
@@ -923,7 +923,7 @@ public function testRunInstanceVerification() {
 			->method('verifyCoreSignature');
 		$this->appLocator
 			->expects($this->at(0))
-			->Method('getAllApps')
+			->method('getAllApps')
 			->will($this->returnValue([
 				'files',
 				'calendar',
@@ -1052,4 +1052,60 @@ public function testIsCodeCheckEnforcedWithDisabledConfigSwitch($channel) {
 		$result = $this->invokePrivate($this->checker, 'isCodeCheckEnforced');
 		$this->assertSame(false, $result);
 	}
+
+	public function testCertRevocation() {
+		$this->environmentHelper
+			->expects($this->once())
+			->method('getChannel')
+			->will($this->returnValue('stable'));
+		$this->config
+			->expects($this->any())
+			->method('getSystemValue')
+			->with('integrity.check.disabled', false)
+			->will($this->returnValue(false));
+
+		$this->appLocator
+			->expects($this->once())
+			->method('getAppPath')
+			->with('SomeApp')
+			->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/app/'));
+		$signatureDataFile = '{
+    "hashes": {
+        "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
+        "subfolder\/file.txt": "410738545fb623c0a5c8a71f561e48ea69e3ada0981a455e920a5ae9bf17c6831ae654df324f9328ff8453de179276ae51931cca0fa71fe8ccde6c083ca0574b"
+    },
+    "signature": "dYoohBaWIFR\/To1FXEbMQB5apUhVYlEauBGSPo12nq84wxWkBx2EM3KDRgkB5Sub2tr0CgmAc2EVjPhKIEzAam26cyUb48bJziz1V6wvW7z4GZAfaJpzLkyHdSfV5117VSf5w1rDcAeZDXfGUaaNEJPWytaF4ZIxVge7f3NGshHy4odFVPADy\/u6c43BWvaOtJ4m3aJQbP6sxCO9dxwcm5yJJJR3n36jfh229sdWBxyl8BhwhH1e1DEv78\/aiL6ckKFPVNzx01R6yDFt3TgEMR97YZ\/R6lWiXG+dsJ305jNFlusLu518zBUvl7g5yjzGN778H29b2C8VLZKmi\/h1CH9jGdD72fCqCYdenD2uZKzb6dsUtXtvBmVcVT6BUGz41W1pkkEEB+YJpMrHILIxAiHRGv1+aZa9\/Oz8LWFd+BEUQjC2LJgojPnpzaG\/msw1nBkX16NNVDWWtJ25Bc\/r\/mG46rwjWB\/cmV6Lwt6KODiqlxgrC4lm9ALOCEWw+23OcYhLwNfQTYevXqHqsFfXOkhUnM8z5vDUb\/HBraB1DjFXN8iLK+1YewD4P495e+SRzrR79Oi3F8SEqRIzRLfN2rnW1BTms\/wYsz0p67cup1Slk1XlNmHwbWX25NVd2PPlLOvZRGoqcKFpIjC5few8THiZfyjiNFwt3RM0AFdZcXY=",
+    "certificate": "-----BEGIN CERTIFICATE-----\r\nMIIE8jCCAtoCAhAIMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNVBAYTAlVTMQ8wDQYD\r\nVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xNTAzBgNVBAMMLG93\r\nbkNsb3VkIENvZGUgU2lnbmluZyBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MB4XDTE2\r\nMDUxODA5MzIwMFoXDTI2MDUxNjA5MzIwMFowEDEOMAwGA1UEAwwFdGFza3MwggIi\r\nMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDwgaK\/DswWQalQs8RE9\/5dHk\/h\r\nRWS\/Jw0Wqh2ASaY+EDXw1Nt62GItiEjQ6R1CgrW4RHeL2g5yokbokYD9Wl3JeIbW\r\nv1FcfBuoEBriNQOUmTpFFH5qyR6tlBOzp3uecEF8KcmRsFF\/KlhQ+jNh2rj1q\/Tm\r\nMLvzJFnRhNbW7HNfl0TZjp0O5xtFdoOUimctIUyhUvunH2OY+ySZpdg\/Kqab\/uMQ\r\nLU2qBydj2nsV3HYwiKw2JvzEFxMQ4DGPbTbPVBT6RXEL\/yD8kWjDFzQLz+I0bkpV\r\nPoTy\/7LCX2xUlMTTCxRaIbvLpzKxlBkD9v66JhijF3zVVUhU8yslxCMKdNNvxMOH\r\n3IYnrND762pakq+UCv+nvdr39tGXUaEyqUVjWX7SoY56uIU\/wR3ny9NNuCacozGg\r\n81lPrVnBPv7NSD7eSkQvf5V2yp9BneZsvVkgiuWxB9PG2XmHMCbmG\/1I730pWEb+\r\nxm8q7MdXBf+2VWlP4aZiDDI3c\/tdO+kEiivPMpkf8aNNaFS\/QuC0jr7ZyMHhPxSK\r\nZ0lO00fca\/fyX0qv9T6EpHOoVrn2cN2z8Atot2iGk11N\/nzVv3gzMQQOCTSO+67i\r\nRN6BxqcmQIbsoLIa35nDkpzZH3ob8cCmrhAMLxVdS08o5fZ4uCzuBVp4ntjCLbrM\r\nVBfJrg82cOrkzLpzhQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQCqVh0ZzU3UZ3tg\r\nsc8jDI+MMrUU6A1gUv0zmT4yWYi2PZwWuhJ5V5z9GftZZNl8AmeyvaDRPdAFP0x4\r\nD6MIUthG9TIfu4b1bRbj1W29U+7xFF3A0B8zuLtRlokvjYjhY+PLx6NHh1L+pkKq\r\n8G87+PXz2N9eSuf\/6Mx7Xgg\/xScfpVDzLRmHgwSczXvyzMRT66HrNeZZBn6bNckC\r\nXhfurg1oZmYR2lkhZLPEB3p5ZtNWEYmsdyQz9N\/J0SrDwcSeUXI4M6X1mCf4D7rX\r\nHRTeV5lH3VEQ+FfSL1mqDyRHCU3TKPzVjKNFHrk8XsnwZlcryWkgRodwHhVKZAeU\r\no2JmrmDGUMvJ3ktngI2TNGq99eYe3+lM4axFxr8VryRGfFu+0cR0x4ECasaHdLTy\r\nttitTcZ3+FCGTYCkhfWc0K2GegZzJiuMZ\/Culm+tvwX4Z9fH1caWKDI55rk2SULD\r\nuCjh94RGxlRKmgljQPVN\/buFDNE+x+Is18APa\/5YExQqvfVsRsQ72wk+pzttFdAr\r\nDQclXYVjITPOgmX7l654rw7CGUi1lNFAWf+O7psnwEvF3ytPbaYlqWQJlnaYByN8\r\neE5bAMBkEoDV2eLmJN4F4R0KQThUDy6dvK2XlI0HUbDZgMZbWMz+D3Fv54ZTRMaW\r\nn3MEtya90V9SVUbYcwp7dhF\/FVM3ug==\r\n-----END CERTIFICATE-----"
+}';
+		$this->fileAccessHelper
+			->expects($this->at(0))
+			->method('file_get_contents')
+			->with(
+				\OC::$SERVERROOT . '/tests/data/integritycheck/app//appinfo/signature.json'
+			)
+			->will($this->returnValue($signatureDataFile));
+		$this->fileAccessHelper
+			->expects($this->at(1))
+			->method('file_get_contents')
+			->with(
+				'/resources/codesigning/root.crt'
+			)
+			->will($this->returnValue(file_get_contents(__DIR__ .'/../../../resources/codesigning/root.crt')));
+		$this->fileAccessHelper
+			->expects($this->at(2))
+			->method('file_get_contents')
+			->with(
+				'/resources/codesigning/intermediate.crl.pem'
+			)
+			->will($this->returnValue(file_get_contents(__DIR__ .'/../../../resources/codesigning/intermediate.crl.pem')));
+		$expected = [
+			'EXCEPTION' => [
+				'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException',
+				'message' => 'Certificate has been revoked.',
+			]
+		];
+
+		$this->assertSame($expected, $this->checker->verifyAppSignature('SomeApp'));
+	}
+
 }

From a9faa222411a340c3b2e75be1b8ed448d19e0d74 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Wed, 13 Jul 2016 18:09:14 +0200
Subject: [PATCH 015/219] ownCloud Server 9.1.0 RC2

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 86fb9bbf54cb..cc694cdbc320 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 0, 11);
+$OC_Version = array(9, 1, 0, 12);
 
 // The human readable string
-$OC_VersionString = '9.1.0 RC1';
+$OC_VersionString = '9.1.0 RC2';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From ef7d362810d14b62fdf4beec4988506407bd0575 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 14 Jul 2016 16:19:41 +0200
Subject: [PATCH 016/219] Change load order of auth backends so that we can
 throw an exception in OCA\DAV\Connector\Sabre\Auth - fixes #25362 (#25478)

---
 apps/dav/lib/Server.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index 7fa1b13783b2..a2493f4b5af6 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -66,13 +66,16 @@ public function __construct(IRequest $request, $baseUri) {
 		$this->server->setBaseUri($this->baseUri);
 
 		$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
-		$authPlugin = new Plugin($authBackend, 'ownCloud');
+		$authPlugin = new Plugin();
 		$this->server->addPlugin($authPlugin);
 
 		// allow setup of additional auth backends
 		$event = new SabrePluginEvent($this->server);
 		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
 
+		// because we are throwing exceptions this plugin has to be the last one
+		$authPlugin->addBackend($authBackend);
+
 		// debugging
 		if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
 			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());

From 0aef283dff1fc2f4e6b7d44484442f1fe1adfaef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Sat, 16 Jul 2016 01:19:14 +0200
Subject: [PATCH 017/219] [stable9.1] Added custom exception as non fatal
 (#25486) (#25489)

---
 apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
index 38bddef87694..20a68b977f4a 100644
--- a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
@@ -42,6 +42,8 @@ class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
 		// forbidden can be expected when trying to upload to
 		// read-only folders for example
 		'Sabre\DAV\Exception\Forbidden' => true,
+		// Custom exception similar to NotAuthenticated
+		'OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden' => true,
 	);
 
 	/** @var string */

From 425107ba2f6add0edaf5ce734bd8f399810165cc Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Mon, 18 Jul 2016 14:30:21 +0200
Subject: [PATCH 018/219] ownCloud Server 9.1.0 RC3

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index cc694cdbc320..d45d153f9187 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 0, 12);
+$OC_Version = array(9, 1, 0, 13);
 
 // The human readable string
-$OC_VersionString = '9.1.0 RC2';
+$OC_VersionString = '9.1.0 RC3';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From dd3e5e0e88ff8521fcf878f480cb5e6992a91e0b Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 18 Jul 2016 19:37:24 +0200
Subject: [PATCH 019/219] Backport guzzlehttp fix from 5.3.1

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 509385e67456..f65a242bbd11 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 509385e674563e48a977bf8285c826963835528e
+Subproject commit f65a242bbd116405b13997ca0e4b6a545e290c75

From 28a689c856e6d77d8504e45d1328d4e2825b8b49 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Mon, 18 Jul 2016 19:43:26 +0200
Subject: [PATCH 020/219] ownCloud Server 9.1.0 RC4

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index d45d153f9187..4fad31e3b12c 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 0, 13);
+$OC_Version = array(9, 1, 0, 14);
 
 // The human readable string
-$OC_VersionString = '9.1.0 RC3';
+$OC_VersionString = '9.1.0 RC4';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From b642b26f7229c99b33e49cde86b38fdc6e8e5f21 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Wed, 20 Jul 2016 11:05:19 +0200
Subject: [PATCH 021/219] ownCloud Server 9.1.0 final

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 4fad31e3b12c..07bb6282e946 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 0, 14);
+$OC_Version = array(9, 1, 0, 15);
 
 // The human readable string
-$OC_VersionString = '9.1.0 RC4';
+$OC_VersionString = '9.1.0';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From 57a045efcb6dff74937f187568d07a8f6933995f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 21 Jul 2016 10:52:34 +0200
Subject: [PATCH 022/219] [stable9.1] Filelist change dir auto-prepend slash
 (#25377)

* Filelist change dir auto-prepend slash

Prepend a slash to directories in case it was missing since many places
assume that it's there.

* Fix js unit test in filelist spec
---
 apps/files/js/filelist.js           |  5 ++++-
 apps/files/tests/js/filelistSpec.js | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 7a7d26eed7c1..4f4c833a5f3c 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -513,7 +513,7 @@
 		 * Event handler for when the URL changed
 		 */
 		_onUrlChanged: function(e) {
-			if (e && e.dir) {
+			if (e && _.isString(e.dir)) {
 				this.changeDirectory(e.dir, false, true);
 			}
 		},
@@ -1429,6 +1429,9 @@
 				this.setPageTitle();
 			}
 
+			if (targetDir.length > 0 && targetDir[0] !== '/') {
+				targetDir = '/' + targetDir;
+			}
 			this._currentDirectory = targetDir;
 
 			// legacy stuff
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index d8d3057ec3e2..9ce35fb16ffe 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1351,9 +1351,9 @@ describe('OCA.Files.FileList tests', function() {
 		});
 		it('allows paths with dotdot at the beginning or end', function() {
 			_.each([
-				'..abc',
-				'def..',
-				'...'
+				'/..abc',
+				'/def..',
+				'/...'
 			], function(path) {
 				fileList.changeDirectory(path);
 				expect(fileList.getCurrentDirectory()).toEqual(path);
@@ -1416,6 +1416,12 @@ describe('OCA.Files.FileList tests', function() {
 			setDirSpy.restore();
 			getFolderContentsStub.restore();
 		});
+		it('prepends a slash to directory if none was given', function() {
+			fileList.changeDirectory('');
+			expect(fileList.getCurrentDirectory()).toEqual('/');
+			fileList.changeDirectory('noslash');
+			expect(fileList.getCurrentDirectory()).toEqual('/noslash');
+		});
 	});
 	describe('breadcrumb events', function() {
 		var deferredList;

From 1550ae93ef3b63ef80247669cf2390fa76c917db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Thu, 21 Jul 2016 10:54:36 +0200
Subject: [PATCH 023/219] [stable9.1] Test jenkins pipeline (#25401) (#25501)

---
 Jenkinsfile           | 68 +++++++++++++++++++++++++++++++++++++++++++
 tests/karma.config.js |  4 ++-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000000000000..9e6ac097a828
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,68 @@
+#!groovy
+
+node('SLAVE') {
+    stage 'Checkout'
+        checkout scm
+        sh '''git submodule update --init'''
+
+    stage 'JavaScript Testing'
+        sh '''./autotest-js.sh'''
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-js.xml'])
+
+    stage 'PHPUnit'
+        sh '''
+        export NOCOVERAGE=1
+        unset USEDOCKER
+        phpenv local 7.0
+        ./autotest.sh sqlite
+        phpenv local 5.4
+        ./autotest.sh mysql
+        phpenv local 5.6
+        ./autotest.sh pgsql
+        phpenv local 5.5
+        ./autotest.sh oci
+        '''
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-sqlite.xml'])
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-mysql.xml'])
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-oci.xml'])
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-pgsql.xml'])
+
+    stage 'Files External Testing'
+        sh '''phpenv local 7.0
+        export NOCOVERAGE=1
+        unset USEDOCKER
+        ./autotest-external.sh sqlite webdav-ownCloud
+        ./autotest-external.sh sqlite smb-silvershell
+        ./autotest-external.sh sqlite swift-ceph
+        '''
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite.xml'])
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite-webdav-ownCloud.xml'])
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite-smb-silvershell.xml'])
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite-swift-ceph.xml'])
+
+    stage 'Primary Objectstore Test - Swift'
+        sh '''phpenv local 7.0
+
+        export NOCOVERAGE=1
+        export RUN_OBJECTSTORE_TESTS=1
+        export PRIMARY_STORAGE_CONFIG="swift"
+        unset USEDOCKER
+
+        rm tests/autotest-results-*.xml
+        ./autotest.sh mysql
+        '''
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-mysql.xml'])
+
+    stage 'Integration Testing'
+        sh '''phpenv local 7.0
+        rm -rf config/config.php
+        ./occ maintenance:install --admin-pass=admin
+        rm -rf build/integration/output
+        rm -rf build/integration/vendor
+        rm -rf build/integration/composer.lock
+        cd build/integration
+        ./run.sh
+       '''
+        step([$class: 'JUnitResultArchiver', testResults: 'build/integration/output/*.xml'])
+}
+
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 111af7a1559d..7374b722467c 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -252,7 +252,9 @@ module.exports = function(config) {
 		reporters: ['dots', 'junit', 'coverage'],
 
 		junitReporter: {
-			outputFile: 'tests/autotest-results-js.xml'
+			outputDir: 'tests',
+			outputFile: 'autotest-results-js.xml',
+			useBrowserName: false
 		},
 
 		// web server port

From 9f2117613d41a81e703eded9cbb5be260c5b4b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Thu, 21 Jul 2016 15:58:46 +0200
Subject: [PATCH 024/219] Add all properties while creating a subscription
 (#25318) (#25335)

Fixes #24469
---
 apps/dav/lib/CalDAV/CalDavBackend.php         | 23 +++++++++++--------
 .../tests/unit/CalDAV/CalDavBackendTest.php   |  8 ++++++-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index ce4940829761..7f051426c368 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -1079,22 +1079,27 @@ function createSubscription($principalUri, $uri, array $properties) {
 			'lastmodified' => time(),
 		];
 
-		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
-			if (isset($properties[$xmlName])) {
+		$propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
 
+		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+			if (array_key_exists($xmlName, $properties)) {
 				$values[$dbName] = $properties[$xmlName];
-				$fieldNames[] = $dbName;
+				if (in_array($dbName, $propertiesBoolean)) {
+					$values[$dbName] = true;
+				}
 			}
 		}
 
+		$valuesToInsert = array();
+
 		$query = $this->db->getQueryBuilder();
+
+		foreach (array_keys($values) as $name) {
+			$valuesToInsert[$name] = $query->createNamedParameter($values[$name]);
+		}
+
 		$query->insert('calendarsubscriptions')
-			->values([
-				'principaluri' => $query->createNamedParameter($values['principaluri']),
-				'uri'          => $query->createNamedParameter($values['uri']),
-				'source'       => $query->createNamedParameter($values['source']),
-				'lastmodified' => $query->createNamedParameter($values['lastmodified']),
-			])
+			->values($valuesToInsert)
 			->execute();
 
 		return $this->db->lastInsertId('*PREFIX*calendarsubscriptions');
diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
index 977bdf15c8e3..baa8540c43cf 100644
--- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
@@ -333,15 +333,20 @@ public function testSyncSupport() {
 
 	public function testSubscriptions() {
 		$id = $this->backend->createSubscription(self::UNIT_TEST_USER, 'Subscription', [
-			'{http://calendarserver.org/ns/}source' => new Href('test-source')
+			'{http://calendarserver.org/ns/}source' => new Href('test-source'),
+			'{http://apple.com/ns/ical/}calendar-color' => '#1C4587',
+			'{http://calendarserver.org/ns/}subscribed-strip-todos' => ''
 		]);
 
 		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);
 		$this->assertEquals(1, count($subscriptions));
+		$this->assertEquals('#1C4587', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
+		$this->assertEquals(true, $subscriptions[0]['{http://calendarserver.org/ns/}subscribed-strip-todos']);
 		$this->assertEquals($id, $subscriptions[0]['id']);
 
 		$patch = new PropPatch([
 				'{DAV:}displayname' => 'Unit test',
+				'{http://apple.com/ns/ical/}calendar-color' => '#ac0606',
 		]);
 		$this->backend->updateSubscription($id, $patch);
 		$patch->commit();
@@ -350,6 +355,7 @@ public function testSubscriptions() {
 		$this->assertEquals(1, count($subscriptions));
 		$this->assertEquals($id, $subscriptions[0]['id']);
 		$this->assertEquals('Unit test', $subscriptions[0]['{DAV:}displayname']);
+		$this->assertEquals('#ac0606', $subscriptions[0]['{http://apple.com/ns/ical/}calendar-color']);
 
 		$this->backend->deleteSubscription($id);
 		$subscriptions = $this->backend->getSubscriptionsForUser(self::UNIT_TEST_USER);

From 716273a91895520f1e8d26549a9bc00c6a63a92c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Sun, 24 Jul 2016 10:54:23 +0200
Subject: [PATCH 025/219] [stable9.1] Use explode() instead of split() - fixes
 #25483 (#25488) (#25499)

---
 lib/private/legacy/files.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/legacy/files.php b/lib/private/legacy/files.php
index 8cf983222233..cb8dc35aa5c1 100644
--- a/lib/private/legacy/files.php
+++ b/lib/private/legacy/files.php
@@ -192,7 +192,7 @@ public static function get($dir, $files, $params = null) {
 	 * @return array $rangeArray ('from'=>int,'to'=>int), ...
 	 */
 	private static function parseHttpRangeHeader($rangeHeaderPos, $fileSize) {
-		$rArray=split(',', $rangeHeaderPos);
+		$rArray=explode(',', $rangeHeaderPos);
 		$minOffset = 0;
 		$ind = 0;
 

From b247e4e5ff33c67785ca010e12ed372b5c0d7f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 25 Jul 2016 09:26:13 +0200
Subject: [PATCH 026/219] [stable9.1] Especially with coverage enabled
 execution times are pretty high (#25517) (#25595)

---
 tests/bootstrap.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index c58d9f585222..2746405a387e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,6 +8,9 @@
 
 require_once __DIR__ . '/../lib/base.php';
 
+// especially with code coverage it will require some more time
+set_time_limit(0);
+
 \OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib/', true);
 \OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/', true);
 

From f5c5bac0febf449406ff4ff8129f5cd4c5dd8e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 25 Jul 2016 22:29:14 +0200
Subject: [PATCH 027/219] [stable9.1] Fixes undefined two-factor-providers
 (#25605) (#25606)

---
 .../Authentication/TwoFactorAuth/Manager.php  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php
index 6ca4fd065a6a..81284054e56c 100644
--- a/lib/private/Authentication/TwoFactorAuth/Manager.php
+++ b/lib/private/Authentication/TwoFactorAuth/Manager.php
@@ -108,15 +108,17 @@ public function getProviders(IUser $user) {
 
 		foreach ($allApps as $appId) {
 			$info = $this->appManager->getAppInfo($appId);
-			$providerClasses = $info['two-factor-providers'];
-			foreach ($providerClasses as $class) {
-				try {
-					$this->loadTwoFactorApp($appId);
-					$provider = OC::$server->query($class);
-					$providers[$provider->getId()] = $provider;
-				} catch (QueryException $exc) {
-					// Provider class can not be resolved
-					throw new Exception("Could not load two-factor auth provider $class");
+			if (isset($info['two-factor-providers'])) {
+				$providerClasses = $info['two-factor-providers'];
+				foreach ($providerClasses as $class) {
+					try {
+						$this->loadTwoFactorApp($appId);
+						$provider = OC::$server->query($class);
+						$providers[$provider->getId()] = $provider;
+					} catch (QueryException $exc) {
+						// Provider class can not be resolved
+						throw new Exception("Could not load two-factor auth provider $class");
+					}
 				}
 			}
 		}

From ec02b8bf2524affbcd95ca9c336eb2cddeaeb9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 26 Jul 2016 11:07:17 +0200
Subject: [PATCH 028/219] [stable9.1] Redirect to default page after login -
 fixes #25562 (#25600) (#25609)

---
 core/Controller/LoginController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 7806e1de904d..b2545b73d787 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -214,7 +214,8 @@ public function tryLogin($user, $password, $redirect_url) {
 				return new RedirectResponse($location);
 			}
 		}
-		return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index'));
+
+		return new RedirectResponse(OC_Util::getDefaultPageUrl());
 	}
 
 }

From 2bf6f54366c4e2e0eb966881bea2075787a7a5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 26 Jul 2016 11:43:36 +0200
Subject: [PATCH 029/219] [stable9.1] Simplify testPermissionMovedGroupShare
 (#25573) (#25607)

Reduces significantly the testing time but still cover the permission
change
---
 apps/files_sharing/tests/SharedMountTest.php | 75 ++++++--------------
 1 file changed, 20 insertions(+), 55 deletions(-)

diff --git a/apps/files_sharing/tests/SharedMountTest.php b/apps/files_sharing/tests/SharedMountTest.php
index da751ad0c842..41f68c419108 100644
--- a/apps/files_sharing/tests/SharedMountTest.php
+++ b/apps/files_sharing/tests/SharedMountTest.php
@@ -242,62 +242,27 @@ public function dataProviderTestStripUserFilesPath() {
 	}
 
 	public function dataPermissionMovedGroupShare() {
-		$data = [];
-
-		$powerset = function($permissions) {
-			$results = [\OCP\Constants::PERMISSION_READ];
-
-			foreach ($permissions as $permission) {
-				foreach ($results as $combination) {
-					$results[] = $permission | $combination;
-				}
-			}
-			return $results;
-		};
-
-		//Generate file permissions
-		$permissions = [
-			\OCP\Constants::PERMISSION_UPDATE,
-			\OCP\Constants::PERMISSION_SHARE,
+		return [
+			[
+				'file',
+				\OCP\Constants::PERMISSION_READ
+				|| \OCP\Constants::PERMISSION_UPDATE
+				|| \OCP\Constants::PERMISSION_SHARE,
+				\OCP\Constants::PERMISSION_READ
+				|| \OCP\Constants::PERMISSION_SHARE,
+			],
+			[
+				'folder',
+				\OCP\Constants::PERMISSION_READ
+				|| \OCP\Constants::PERMISSION_CREATE
+				|| \OCP\Constants::PERMISSION_UPDATE
+				|| \OCP\Constants::PERMISSION_DELETE
+				|| \OCP\Constants::PERMISSION_SHARE,
+				\OCP\Constants::PERMISSION_READ
+				|| \OCP\Constants::PERMISSION_CREATE
+				|| \OCP\Constants::PERMISSION_UPDATE,
+			],
 		];
-
-		$allPermissions = $powerset($permissions);
-
-		foreach ($allPermissions as $before) {
-			foreach ($allPermissions as $after) {
-				if ($before === $after) { continue; }
-
-				$data[] = [
-					'file', 
-					$before,
-					$after,
-				];
-			}
-		}
-
-		//Generate folder permissions
-		$permissions = [
-			\OCP\Constants::PERMISSION_UPDATE,
-			\OCP\Constants::PERMISSION_CREATE,
-			\OCP\Constants::PERMISSION_SHARE,
-			\OCP\Constants::PERMISSION_DELETE,
-		];
-
-		$allPermissions = $powerset($permissions);
-
-		foreach ($allPermissions as $before) {
-			foreach ($allPermissions as $after) {
-				if ($before === $after) { continue; }
-
-				$data[] = [
-					'folder',
-					$before,
-					$after,
-				];
-			}
-		}
-
-		return $data;
 	}
 
 

From 56ee571dc31acf57db0bc5361bdc49ded5c41608 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 26 Jul 2016 11:57:05 +0200
Subject: [PATCH 030/219] [stable9.1]  Group shares with same source and target
 (#25534)

* Group shares with same source and target

Fixes #24575

Note that this is a very limited solution and eventually we want smarter
merging!

* Add integration tests for merging received shares

* Improved share grouping readability + fixed test

* Add repair step for unmerged shares (WIP)

* Added more tests for sharing's MountProvider

* Group incoming shares for resharing in JS

* Adjust repair version check for unmerged shares

* Fix RepairUnmergedShares to not skip valid repair cases

The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.

* Add integration tests for double shares with rename in between

* Make share target consistent when grouping group share with user share

In some situations, a group share is created before a user share, and
the recipient renamed the received share before the latter is created.
In this situation, the "file_target" was already modified and the second
created share must align to the already renamed share.

To achieve this, the MountProvider now groups only by "item_source"
value and sorts by share time. This makes it so that the least recent
share is selected as super-share and its "file_target" value is then
adjusted in all grouped shares.

This fixes the issue where this situation would have different
"file_target" values resulting in two shared folders appearing instead
of one.
---
 apps/files_sharing/lib/MountProvider.php      |  90 +++-
 apps/files_sharing/lib/SharedMount.php        |  24 +-
 apps/files_sharing/lib/sharedstorage.php      |  77 ++-
 .../files_sharing/tests/MountProviderTest.php | 282 +++++++++--
 .../features/bootstrap/Sharing.php            |  24 +-
 .../integration/features/bootstrap/WebDav.php |  77 ++-
 build/integration/features/sharing-v1.feature | 144 ++++++
 core/js/shareitemmodel.js                     |  29 +-
 core/js/tests/specs/shareitemmodelSpec.js     |  42 ++
 lib/private/Repair.php                        |   7 +
 lib/private/Repair/RepairUnmergedShares.php   | 328 +++++++++++++
 tests/lib/Repair/RepairUnmergedSharesTest.php | 449 ++++++++++++++++++
 version.php                                   |   2 +-
 13 files changed, 1447 insertions(+), 128 deletions(-)
 create mode 100644 lib/private/Repair/RepairUnmergedShares.php
 create mode 100644 tests/lib/Repair/RepairUnmergedSharesTest.php

diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php
index c71c0e8ddea6..54f9feabde65 100644
--- a/apps/files_sharing/lib/MountProvider.php
+++ b/apps/files_sharing/lib/MountProvider.php
@@ -73,16 +73,20 @@ public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
 			return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
 		});
 
-		$mounts = [];
-		foreach ($shares as $share) {
+		$superShares = $this->buildSuperShares($shares, $user);
 
+		$mounts = [];
+		foreach ($superShares as $share) {
 			try {
 				$mounts[] = new SharedMount(
 					'\OC\Files\Storage\Shared',
 					$mounts,
 					[
 						'user' => $user->getUID(),
-						'newShare' => $share,
+						// parent share
+						'superShare' => $share[0],
+						// children/component of the superShare
+						'groupedShares' => $share[1],
 					],
 					$storageFactory
 				);
@@ -95,4 +99,84 @@ public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
 		// array_filter removes the null values from the array
 		return array_filter($mounts);
 	}
+
+	/**
+	 * Groups shares by path (nodeId) and target path
+	 *
+	 * @param \OCP\Share\IShare[] $shares
+	 * @return \OCP\Share\IShare[][] array of grouped shares, each element in the
+	 * array is a group which itself is an array of shares
+	 */
+	private function groupShares(array $shares) {
+		$tmp = [];
+
+		foreach ($shares as $share) {
+			if (!isset($tmp[$share->getNodeId()])) {
+				$tmp[$share->getNodeId()] = [];
+			}
+			$tmp[$share->getNodeId()][] = $share;
+		}
+
+		$result = [];
+		// sort by stime, the super share will be based on the least recent share
+		foreach ($tmp as &$tmp2) {
+			@usort($tmp2, function($a, $b) {
+				if ($a->getShareTime() < $b->getShareTime()) {
+					return -1;
+				}
+				return 1;
+			});
+			$result[] = $tmp2;
+		}
+
+		return array_values($result);
+	}
+
+	/**
+	 * Build super shares (virtual share) by grouping them by node id and target,
+	 * then for each group compute the super share and return it along with the matching
+	 * grouped shares. The most permissive permissions are used based on the permissions
+	 * of all shares within the group.
+	 *
+	 * @param \OCP\Share\IShare[] $allShares
+	 * @param \OCP\IUser $user user
+	 * @return array Tuple of [superShare, groupedShares]
+	 */
+	private function buildSuperShares(array $allShares, \OCP\IUser $user) {
+		$result = [];
+
+		$groupedShares = $this->groupShares($allShares);
+
+		/** @var \OCP\Share\IShare[] $shares */
+		foreach ($groupedShares as $shares) {
+			if (count($shares) === 0) {
+				continue;
+			}
+
+			$superShare = $this->shareManager->newShare();
+
+			// compute super share based on first entry of the group
+			$superShare->setId($shares[0]->getId())
+				->setShareOwner($shares[0]->getShareOwner())
+				->setNodeId($shares[0]->getNodeId())
+				->setTarget($shares[0]->getTarget());
+
+			// use most permissive permissions
+			$permissions = 0;
+			foreach ($shares as $share) {
+				$permissions |= $share->getPermissions();
+				if ($share->getTarget() !== $superShare->getTarget()) {
+					// adjust target, for database consistency
+					$share->setTarget($superShare->getTarget());
+					$this->shareManager->moveShare($share, $user->getUID());
+				}
+			}
+
+			$superShare->setPermissions($permissions);
+
+			$result[] = [$superShare, $shares];
+		}
+
+		return $result;
+	}
 }
diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php
index 2b066bd2d944..3f5bf8ea7bff 100644
--- a/apps/files_sharing/lib/SharedMount.php
+++ b/apps/files_sharing/lib/SharedMount.php
@@ -50,7 +50,10 @@ class SharedMount extends MountPoint implements MoveableMount {
 	private $user;
 
 	/** @var \OCP\Share\IShare */
-	private $share;
+	private $superShare;
+
+	/** @var \OCP\Share\IShare[] */
+	private $groupedShares;
 
 	/**
 	 * @param string $storage
@@ -61,10 +64,13 @@ class SharedMount extends MountPoint implements MoveableMount {
 	public function __construct($storage, array $mountpoints, $arguments = null, $loader = null) {
 		$this->user = $arguments['user'];
 		$this->recipientView = new View('/' . $this->user . '/files');
-		$this->share = $arguments['newShare'];
-		$newMountPoint = $this->verifyMountPoint($this->share, $mountpoints);
+
+		$this->superShare = $arguments['superShare'];
+		$this->groupedShares = $arguments['groupedShares'];
+
+		$newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints);
 		$absMountPoint = '/' . $this->user . '/files' . $newMountPoint;
-		$arguments['ownerView'] = new View('/' . $this->share->getShareOwner() . '/files');
+		$arguments['ownerView'] = new View('/' . $this->superShare->getShareOwner() . '/files');
 		parent::__construct($storage, $absMountPoint, $arguments, $loader);
 	}
 
@@ -106,7 +112,11 @@ private function verifyMountPoint(\OCP\Share\IShare $share, array $mountpoints)
 	 */
 	private function updateFileTarget($newPath, &$share) {
 		$share->setTarget($newPath);
-		\OC::$server->getShareManager()->moveShare($share, $this->user);
+
+		foreach ($this->groupedShares as $share) {
+			$share->setTarget($newPath);
+			\OC::$server->getShareManager()->moveShare($share, $this->user);
+		}
 	}
 
 
@@ -212,7 +222,7 @@ public function removeMount() {
 	 * @return \OCP\Share\IShare
 	 */
 	public function getShare() {
-		return $this->share;
+		return $this->superShare;
 	}
 
 	/**
@@ -221,6 +231,6 @@ public function getShare() {
 	 * @return int
 	 */
 	public function getStorageRootId() {
-		return $this->share->getNodeId();
+		return $this->getShare()->getNodeId();
 	}
 }
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index b5b5e4168842..af47bf94a08c 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -42,11 +42,11 @@
  * Convert target path to source path and pass the function call to the correct storage provider
  */
 class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage {
-
-	private $share;   // the shared resource
-
 	/** @var \OCP\Share\IShare */
-	private $newShare;
+	private $superShare;
+
+	/** @var \OCP\Share\IShare[] */
+	private $groupedShares;
 
 	/**
 	 * @var \OC\Files\View
@@ -76,11 +76,14 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage {
 	public function __construct($arguments) {
 		$this->ownerView = $arguments['ownerView'];
 		$this->logger = \OC::$server->getLogger();
-		$this->newShare = $arguments['newShare'];
+
+		$this->superShare = $arguments['superShare'];
+		$this->groupedShares = $arguments['groupedShares'];
+
 		$this->user = $arguments['user'];
 
-		Filesystem::initMountPoints($this->newShare->getShareOwner());
-		$sourcePath = $this->ownerView->getPath($this->newShare->getNodeId());
+		Filesystem::initMountPoints($this->superShare->getShareOwner());
+		$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
 		list($storage, $internalPath) = $this->ownerView->resolvePath($sourcePath);
 
 		parent::__construct([
@@ -95,8 +98,8 @@ private function init() {
 		}
 		$this->initialized = true;
 		try {
-			Filesystem::initMountPoints($this->newShare->getShareOwner());
-			$sourcePath = $this->ownerView->getPath($this->newShare->getNodeId());
+			Filesystem::initMountPoints($this->superShare->getShareOwner());
+			$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
 			list($this->sourceStorage, $sourceInternalPath) = $this->ownerView->resolvePath($sourcePath);
 			$this->sourceRootInfo = $this->sourceStorage->getCache()->get($sourceInternalPath);
 		} catch (\Exception $e) {
@@ -104,6 +107,13 @@ private function init() {
 		}
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getShareId() {
+		return $this->superShare->getId();
+	}
+
 	private function isValid() {
 		$this->init();
 		return $this->sourceRootInfo && ($this->sourceRootInfo->getPermissions() & Constants::PERMISSION_SHARE) === Constants::PERMISSION_SHARE;
@@ -118,15 +128,6 @@ public function getId() {
 		return 'shared::' . $this->getMountPoint();
 	}
 
-	/**
-	 * get file cache of the shared item source
-	 *
-	 * @return int
-	 */
-	public function getSourceId() {
-		return $this->newShare->getNodeId();
-	}
-
 	/**
 	 * Get the permissions granted for a shared file
 	 *
@@ -137,7 +138,7 @@ public function getPermissions($target = '') {
 		if (!$this->isValid()) {
 			return 0;
 		}
-		$permissions = $this->newShare->getPermissions();
+		$permissions = $this->superShare->getPermissions();
 		// part files and the mount point always have delete permissions
 		if ($target === '' || pathinfo($target, PATHINFO_EXTENSION) === 'part') {
 			$permissions |= \OCP\Constants::PERMISSION_DELETE;
@@ -259,30 +260,18 @@ public function rename($path1, $path2) {
 	 * @return string
 	 */
 	public function getMountPoint() {
-		return $this->newShare->getTarget();
+		return $this->superShare->getTarget();
 	}
 
 	/**
 	 * @param string $path
 	 */
 	public function setMountPoint($path) {
-		$this->newShare->setTarget($path);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getShareType() {
-		return $this->newShare->getShareType();
-	}
+		$this->superShare->setTarget($path);
 
-	/**
-	 * get share ID
-	 *
-	 * @return integer unique share ID
-	 */
-	public function getShareId() {
-		return $this->newShare->getId();
+		foreach ($this->groupedShares as $share) {
+			$share->setTarget($path);
+		}
 	}
 
 	/**
@@ -291,14 +280,14 @@ public function getShareId() {
 	 * @return string
 	 */
 	public function getSharedFrom() {
-		return $this->newShare->getShareOwner();
+		return $this->superShare->getShareOwner();
 	}
 
 	/**
 	 * @return \OCP\Share\IShare
 	 */
 	public function getShare() {
-		return $this->newShare;
+		return $this->superShare;
 	}
 
 	/**
@@ -307,7 +296,7 @@ public function getShare() {
 	 * @return string
 	 */
 	public function getItemType() {
-		return $this->newShare->getNodeType();
+		return $this->superShare->getNodeType();
 	}
 
 	public function getCache($path = '', $storage = null) {
@@ -336,7 +325,7 @@ public function getPropagator($storage = null) {
 	}
 
 	public function getOwner($path) {
-		return $this->newShare->getShareOwner();
+		return $this->superShare->getShareOwner();
 	}
 
 	/**
@@ -345,7 +334,9 @@ public function getOwner($path) {
 	 * @return bool
 	 */
 	public function unshareStorage() {
-		\OC::$server->getShareManager()->deleteFromSelf($this->newShare, $this->user);
+		foreach ($this->groupedShares as $share) {
+			\OC::$server->getShareManager()->deleteFromSelf($share, $this->user);
+		}
 		return true;
 	}
 
@@ -361,7 +352,7 @@ public function acquireLock($path, $type, ILockingProvider $provider) {
 		$targetStorage->acquireLock($targetInternalPath, $type, $provider);
 		// lock the parent folders of the owner when locking the share as recipient
 		if ($path === '') {
-			$sourcePath = $this->ownerView->getPath($this->newShare->getNodeId());
+			$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
 			$this->ownerView->lockFile(dirname($sourcePath), ILockingProvider::LOCK_SHARED, true);
 		}
 	}
@@ -377,7 +368,7 @@ public function releaseLock($path, $type, ILockingProvider $provider) {
 		$targetStorage->releaseLock($targetInternalPath, $type, $provider);
 		// unlock the parent folders of the owner when unlocking the share as recipient
 		if ($path === '') {
-			$sourcePath = $this->ownerView->getPath($this->newShare->getNodeId());
+			$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
 			$this->ownerView->unlockFile(dirname($sourcePath), ILockingProvider::LOCK_SHARED, true);
 		}
 	}
diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php
index 90d9f0a8567e..dc9d81971bd8 100644
--- a/apps/files_sharing/tests/MountProviderTest.php
+++ b/apps/files_sharing/tests/MountProviderTest.php
@@ -65,51 +65,51 @@ public function setUp() {
 		$this->provider = new MountProvider($this->config, $this->shareManager, $this->logger);
 	}
 
-	public function testExcludeShares() {
-		/** @var IShare | \PHPUnit_Framework_MockObject_MockObject $share1 */
-		$share1 = $this->getMock('\OCP\Share\IShare');
-		$share1->expects($this->once())
-			->method('getPermissions')
-			->will($this->returnValue(0));
-
-		$share2 = $this->getMock('\OCP\Share\IShare');
-		$share2->expects($this->once())
+	private function makeMockShare($id, $nodeId, $owner = 'user2', $target = null, $permissions = 31) {
+		$share = $this->getMock('\OCP\Share\IShare');
+		$share->expects($this->any())
 			->method('getPermissions')
-			->will($this->returnValue(31));
-		$share2->expects($this->any())
+			->will($this->returnValue($permissions));
+		$share->expects($this->any())
 			->method('getShareOwner')
-			->will($this->returnValue('user2'));
-		$share2->expects($this->any())
+			->will($this->returnValue($owner));
+		$share->expects($this->any())
 			->method('getTarget')
-			->will($this->returnValue('/share2'));
+			->will($this->returnValue($target));
+		$share->expects($this->any())
+			->method('getId')
+			->will($this->returnValue($id));
+		$share->expects($this->any())
+			->method('getNodeId')
+			->will($this->returnValue($nodeId));
+		$share->expects($this->any())
+			->method('getShareTime')
+			->will($this->returnValue(
+				// compute share time based on id, simulating share order
+				new \DateTime('@' . (1469193980 + 1000 * $id))
+			));
+		return $share;
+	}
 
-		$share3 = $this->getMock('\OCP\Share\IShare');
-		$share3->expects($this->once())
-			->method('getPermissions')
-			->will($this->returnValue(0));
+	/**
+	 * Tests excluding shares from the current view. This includes:
+	 * - shares that were opted out of (permissions === 0)
+	 * - shares with a group in which the owner is already in
+	 */
+	public function testExcludeShares() {
+		$rootFolder = $this->getMock('\OCP\Files\IRootFolder');
+		$userManager = $this->getMock('\OCP\IUserManager');
 
-		/** @var IShare | \PHPUnit_Framework_MockObject_MockObject $share4 */
-		$share4 = $this->getMock('\OCP\Share\IShare');
-		$share4->expects($this->once())
-			->method('getPermissions')
-			->will($this->returnValue(31));
-		$share4->expects($this->any())
-			->method('getShareOwner')
-			->will($this->returnValue('user2'));
-		$share4->expects($this->any())
-			->method('getTarget')
-			->will($this->returnValue('/share4'));
+		$userShares = [
+			$this->makeMockShare(1, 100, 'user2', '/share2', 0), 
+			$this->makeMockShare(2, 100, 'user2', '/share2', 31),
+		];
 
-		$share5 = $this->getMock('\OCP\Share\IShare');
-		$share5->expects($this->once())
-			->method('getPermissions')
-			->will($this->returnValue(31));
-		$share5->expects($this->any())
-			->method('getShareOwner')
-			->will($this->returnValue('user1'));
-
-		$userShares = [$share1, $share2];
-		$groupShares = [$share3, $share4, $share5];
+		$groupShares = [
+			$this->makeMockShare(3, 100, 'user2', '/share2', 0), 
+			$this->makeMockShare(4, 101, 'user2', '/share4', 31), 
+			$this->makeMockShare(5, 100, 'user1', '/share4', 31), 
+		];
 
 		$this->user->expects($this->any())
 			->method('getUID')
@@ -123,17 +123,211 @@ public function testExcludeShares() {
 			->method('getSharedWith')
 			->with('user1', \OCP\Share::SHARE_TYPE_GROUP, null, -1)
 			->will($this->returnValue($groupShares));
+		$this->shareManager->expects($this->any())
+			->method('newShare')
+			->will($this->returnCallback(function() use ($rootFolder, $userManager) {
+				return new \OC\Share20\Share($rootFolder, $userManager);
+			}));
 
 		$mounts = $this->provider->getMountsForUser($this->user, $this->loader);
 
 		$this->assertCount(2, $mounts);
-		$this->assertSharedMount($share1, $mounts[0]);
-		$this->assertSharedMount($share4, $mounts[1]);
+		$this->assertInstanceOf('OCA\Files_Sharing\SharedMount', $mounts[0]);
+		$this->assertInstanceOf('OCA\Files_Sharing\SharedMount', $mounts[1]);
+
+		$mountedShare1 = $mounts[0]->getShare();
+
+		$this->assertEquals('2', $mountedShare1->getId());
+		$this->assertEquals('user2', $mountedShare1->getShareOwner());
+		$this->assertEquals(100, $mountedShare1->getNodeId());
+		$this->assertEquals('/share2', $mountedShare1->getTarget());
+		$this->assertEquals(31, $mountedShare1->getPermissions());
+
+		$mountedShare2 = $mounts[1]->getShare();
+		$this->assertEquals('4', $mountedShare2->getId());
+		$this->assertEquals('user2', $mountedShare2->getShareOwner());
+		$this->assertEquals(101, $mountedShare2->getNodeId());
+		$this->assertEquals('/share4', $mountedShare2->getTarget());
+		$this->assertEquals(31, $mountedShare2->getPermissions());
+	}
+
+	public function mergeSharesDataProvider() {
+		// note: the user in the specs here is the shareOwner not recipient
+		// the recipient is always "user1"
+		return [
+			// #0: share as outsider with "group1" and "user1" with same permissions
+			[
+				[
+					[1, 100, 'user2', '/share2', 31], 
+				],
+				[
+					[2, 100, 'user2', '/share2', 31], 
+				],
+				[
+					// combined, user share has higher priority
+					['1', 100, 'user2', '/share2', 31],
+				],
+			],
+			// #1: share as outsider with "group1" and "user1" with different permissions
+			[
+				[
+					[1, 100, 'user2', '/share', 31], 
+				],
+				[
+					[2, 100, 'user2', '/share', 15], 
+				],
+				[
+					// use highest permissions
+					['1', 100, 'user2', '/share', 31],
+				],
+			],
+			// #2: share as outsider with "group1" and "group2" with same permissions
+			[
+				[
+				],
+				[
+					[1, 100, 'user2', '/share', 31], 
+					[2, 100, 'user2', '/share', 31], 
+				],
+				[
+					// combined, first group share has higher priority
+					['1', 100, 'user2', '/share', 31],
+				],
+			],
+			// #3: share as outsider with "group1" and "group2" with different permissions
+			[
+				[
+				],
+				[
+					[1, 100, 'user2', '/share', 31], 
+					[2, 100, 'user2', '/share', 15], 
+				],
+				[
+					// use higher permissions
+					['1', 100, 'user2', '/share', 31],
+				],
+			],
+			// #4: share as insider with "group1"
+			[
+				[
+				],
+				[
+					[1, 100, 'user1', '/share', 31], 
+				],
+				[
+					// no received share since "user1" is the sharer/owner
+				],
+			],
+			// #5: share as insider with "group1" and "group2" with different permissions
+			[
+				[
+				],
+				[
+					[1, 100, 'user1', '/share', 31], 
+					[2, 100, 'user1', '/share', 15], 
+				],
+				[
+					// no received share since "user1" is the sharer/owner
+				],
+			],
+			// #6: share as outside with "group1", recipient opted out
+			[
+				[
+				],
+				[
+					[1, 100, 'user2', '/share', 0], 
+				],
+				[
+					// no received share since "user1" opted out
+				],
+			],
+			// #7: share as outsider with "group1" and "user1" where recipient renamed in between
+			[
+				[
+					[1, 100, 'user2', '/share2-renamed', 31], 
+				],
+				[
+					[2, 100, 'user2', '/share2', 31], 
+				],
+				[
+					// use target of least recent share
+					['1', 100, 'user2', '/share2-renamed', 31],
+				],
+			],
+			// #8: share as outsider with "group1" and "user1" where recipient renamed in between
+			[
+				[
+					[2, 100, 'user2', '/share2', 31], 
+				],
+				[
+					[1, 100, 'user2', '/share2-renamed', 31], 
+				],
+				[
+					// use target of least recent share
+					['1', 100, 'user2', '/share2-renamed', 31],
+				],
+			],
+		];
 	}
 
-	private function assertSharedMount(IShare $share, IMountPoint $mount) {
-		$this->assertInstanceOf('OCA\Files_Sharing\SharedMount', $mount);
-		$this->assertEquals($share, $mount->getShare());
+	/**
+	 * Tests merging shares.
+	 *
+	 * Happens when sharing the same entry to a user through multiple ways,
+	 * like several groups and also direct shares at the same time.
+	 *
+	 * @dataProvider mergeSharesDataProvider
+	 *
+	 * @param array $userShares array of user share specs
+	 * @param array $groupShares array of group share specs
+	 * @param array $expectedShares array of expected supershare specs
+	 */
+	public function testMergeShares($userShares, $groupShares, $expectedShares) {
+		$rootFolder = $this->getMock('\OCP\Files\IRootFolder');
+		$userManager = $this->getMock('\OCP\IUserManager');
+
+		$userShares = array_map(function($shareSpec) {
+			return $this->makeMockShare($shareSpec[0], $shareSpec[1], $shareSpec[2], $shareSpec[3], $shareSpec[4]);
+		}, $userShares);
+		$groupShares = array_map(function($shareSpec) {
+			return $this->makeMockShare($shareSpec[0], $shareSpec[1], $shareSpec[2], $shareSpec[3], $shareSpec[4]);
+		}, $groupShares);
+
+		$this->user->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('user1'));
+
+		$this->shareManager->expects($this->at(0))
+			->method('getSharedWith')
+			->with('user1', \OCP\Share::SHARE_TYPE_USER)
+			->will($this->returnValue($userShares));
+		$this->shareManager->expects($this->at(1))
+			->method('getSharedWith')
+			->with('user1', \OCP\Share::SHARE_TYPE_GROUP, null, -1)
+			->will($this->returnValue($groupShares));
+		$this->shareManager->expects($this->any())
+			->method('newShare')
+			->will($this->returnCallback(function() use ($rootFolder, $userManager) {
+				return new \OC\Share20\Share($rootFolder, $userManager);
+			}));
+
+		$mounts = $this->provider->getMountsForUser($this->user, $this->loader);
+
+		$this->assertCount(count($expectedShares), $mounts);
+
+		foreach ($mounts as $index => $mount) {
+			$expectedShare = $expectedShares[$index];
+			$this->assertInstanceOf('OCA\Files_Sharing\SharedMount', $mount);
+
+			// supershare
+			$share = $mount->getShare();
+
+			$this->assertEquals($expectedShare[0], $share->getId());
+			$this->assertEquals($expectedShare[1], $share->getNodeId());
+			$this->assertEquals($expectedShare[2], $share->getShareOwner());
+			$this->assertEquals($expectedShare[3], $share->getTarget());
+			$this->assertEquals($expectedShare[4], $share->getPermissions());
+		}
 	}
 }
 
diff --git a/build/integration/features/bootstrap/Sharing.php b/build/integration/features/bootstrap/Sharing.php
index d423a28f1964..2c8c17982505 100644
--- a/build/integration/features/bootstrap/Sharing.php
+++ b/build/integration/features/bootstrap/Sharing.php
@@ -284,10 +284,10 @@ public function checkSharedUserNotInResponse($user){
 		PHPUnit_Framework_Assert::assertEquals(False, $this->isFieldInResponse('share_with', "$user"));
 	}
 
-	public function isUserOrGroupInSharedData($userOrGroup){
+	public function isUserOrGroupInSharedData($userOrGroup, $permissions = null){
 		$data = $this->response->xml()->data[0];
 		foreach($data as $element) {
-			if ($element->share_with == $userOrGroup){
+			if ($element->share_with == $userOrGroup && ($permissions === null || $permissions == $element->permissions)){
 				return True;
 			}
 		}
@@ -295,13 +295,13 @@ public function isUserOrGroupInSharedData($userOrGroup){
 	}
 
 	/**
-	 * @Given /^file "([^"]*)" of user "([^"]*)" is shared with user "([^"]*)"$/
+	 * @Given /^(file|folder|entry) "([^"]*)" of user "([^"]*)" is shared with user "([^"]*)"( with permissions ([\d]*))?$/
 	 *
 	 * @param string $filepath
 	 * @param string $user1
 	 * @param string $user2
 	 */
-	public function assureFileIsShared($filepath, $user1, $user2){
+	public function assureFileIsShared($entry, $filepath, $user1, $user2, $withPerms = null, $permissions = null){
 		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares" . "?path=$filepath";
 		$client = new Client();
 		$options = [];
@@ -311,23 +311,23 @@ public function assureFileIsShared($filepath, $user1, $user2){
 			$options['auth'] = [$user1, $this->regularUser];
 		}
 		$this->response = $client->get($fullUrl, $options);
-		if ($this->isUserOrGroupInSharedData($user2)){
+		if ($this->isUserOrGroupInSharedData($user2, $permissions)){
 			return;
 		} else {
-			$this->createShare($user1, $filepath, 0, $user2, null, null, null);
+			$this->createShare($user1, $filepath, 0, $user2, null, null, $permissions);
 		}
 		$this->response = $client->get($fullUrl, $options);
-		PHPUnit_Framework_Assert::assertEquals(True, $this->isUserOrGroupInSharedData($user2));
+		PHPUnit_Framework_Assert::assertEquals(True, $this->isUserOrGroupInSharedData($user2, $permissions));
 	}
 
 	/**
-	 * @Given /^file "([^"]*)" of user "([^"]*)" is shared with group "([^"]*)"$/
+	 * @Given /^(file|folder|entry) "([^"]*)" of user "([^"]*)" is shared with group "([^"]*)"( with permissions ([\d]*))?$/
 	 *
 	 * @param string $filepath
 	 * @param string $user
 	 * @param string $group
 	 */
-	public function assureFileIsSharedWithGroup($filepath, $user, $group){
+	public function assureFileIsSharedWithGroup($entry, $filepath, $user, $group, $withPerms = null, $permissions = null){
 		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares" . "?path=$filepath";
 		$client = new Client();
 		$options = [];
@@ -337,13 +337,13 @@ public function assureFileIsSharedWithGroup($filepath, $user, $group){
 			$options['auth'] = [$user, $this->regularUser];
 		}
 		$this->response = $client->get($fullUrl, $options);
-		if ($this->isUserOrGroupInSharedData($group)){
+		if ($this->isUserOrGroupInSharedData($group, $permissions)){
 			return;
 		} else {
-			$this->createShare($user, $filepath, 1, $group, null, null, null);
+			$this->createShare($user, $filepath, 1, $group, null, null, $permissions);
 		}
 		$this->response = $client->get($fullUrl, $options);
-		PHPUnit_Framework_Assert::assertEquals(True, $this->isUserOrGroupInSharedData($group));
+		PHPUnit_Framework_Assert::assertEquals(True, $this->isUserOrGroupInSharedData($group, $permissions));
 	}
 
 	/**
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 3df37db72bb0..092c79fe0206 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -46,12 +46,12 @@ public function makeDavRequest($user, $method, $path, $headers, $body = null){
 	}
 
 	/**
-	 * @Given /^User "([^"]*)" moved file "([^"]*)" to "([^"]*)"$/
+	 * @Given /^User "([^"]*)" moved (file|folder|entry) "([^"]*)" to "([^"]*)"$/
 	 * @param string $user
 	 * @param string $fileSource
 	 * @param string $fileDestination
 	 */
-	public function userMovedFile($user, $fileSource, $fileDestination){
+	public function userMovedFile($user, $entry, $fileSource, $fileDestination){
 		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
 		$headers['Destination'] = $fullUrl . $fileDestination;
 		$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
@@ -59,12 +59,12 @@ public function userMovedFile($user, $fileSource, $fileDestination){
 	}
 
 	/**
-	 * @When /^User "([^"]*)" moves file "([^"]*)" to "([^"]*)"$/
+	 * @When /^User "([^"]*)" moves (file|folder|entry) "([^"]*)" to "([^"]*)"$/
 	 * @param string $user
 	 * @param string $fileSource
 	 * @param string $fileDestination
 	 */
-	public function userMovesFile($user, $fileSource, $fileDestination){
+	public function userMovesFile($user, $entry, $fileSource, $fileDestination){
 		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
 		$headers['Destination'] = $fullUrl . $fileDestination;
 		try {
@@ -225,6 +225,32 @@ public function asGetsPropertiesOfFolderWith($user, $path, $propertiesTable) {
 		$this->response = $this->listFolder($user, $path, 0, $properties);
 	}
 
+	/**
+	 * @Then /^as "([^"]*)" the (file|folder|entry) "([^"]*)" does not exist$/
+	 * @param string $user
+	 * @param string $path
+	 * @param \Behat\Gherkin\Node\TableNode|null $propertiesTable
+	 */
+	public function asTheFileOrFolderDoesNotExist($user, $entry, $path) {
+		$client = $this->getSabreClient($user);
+		$response = $client->request('HEAD', $this->makeSabrePath($path));
+		if ($response['statusCode'] !== 404) {
+			throw new \Exception($entry . ' "' . $path . '" expected to not exist (status code ' . $response['statusCode'] . ', expected 404)');
+		}
+
+		return $response;
+	}
+
+	/**
+	 * @Then /^as "([^"]*)" the (file|folder|entry) "([^"]*)" exists$/
+	 * @param string $user
+	 * @param string $path
+	 * @param \Behat\Gherkin\Node\TableNode|null $propertiesTable
+	 */
+	public function asTheFileOrFolderExists($user, $entry, $path) {
+		$this->response = $this->listFolder($user, $path, 0);
+	}
+
 	/**
 	 * @Then the single response should contain a property :key with value :value
 	 * @param string $key
@@ -293,9 +319,25 @@ public function theResponseShouldContainAnEmptyProperty($property) {
 		}
 	}
 
-
 	/*Returns the elements of a propfind, $folderDepth requires 1 to see elements without children*/
 	public function listFolder($user, $path, $folderDepth, $properties = null){
+		$client = $this->getSabreClient($user);
+		if (!$properties) {
+			$properties = [
+				'{DAV:}getetag'
+			];
+		}
+
+		$response = $client->propfind($this->makeSabrePath($path), $properties, $folderDepth);
+
+		return $response;
+	}
+
+	public function makeSabrePath($path) {
+		return $this->encodePath($this->davPath . '/' . ltrim($path, '/'));
+	}
+
+	public function getSabreClient($user) {
 		$fullUrl = substr($this->baseUrl, 0, -4);
 
 		$settings = array(
@@ -309,17 +351,7 @@ public function listFolder($user, $path, $folderDepth, $properties = null){
 			$settings['password'] = $this->regularUser;
 		}
 
-		$client = new SClient($settings);
-
-		if (!$properties) {
-			$properties = [
-				'{DAV:}getetag'
-			];
-		}
-
-		$response = $client->propfind($this->davPath . '/' . ltrim($path, '/'), $properties, $folderDepth);
-
-		return $response;
+		return new SClient($settings);
 	}
 
 	/**
@@ -393,7 +425,7 @@ public function userDeletesFile($user, $file)  {
 	 */
 	public function userCreatedAFolder($user, $destination){
 		try {
-			$this->response = $this->makeDavRequest($user, "MKCOL", $destination, []);
+			$this->response = $this->makeDavRequest($user, "MKCOL", '/' . ltrim($destination, '/'), []);
 		} catch (\GuzzleHttp\Exception\ServerException $e) {
 			// 4xx and 5xx responses cause an exception
 			$this->response = $e->getResponse();
@@ -459,6 +491,17 @@ public function downloadingFileAs($fileName, $user) {
 		}
 	}
 
+	/**
+	 * URL encodes the given path but keeps the slashes
+	 *
+	 * @param string $path to encode
+	 * @return string encoded path
+	 */
+	private function encodePath($path) {
+		// slashes need to stay
+		return str_replace('%2F', '/', rawurlencode($path));
+	}
+
 	/**
 	 * @When user :user favorites element :path
 	 */
diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index 3878e741f60e..b7d32051c697 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -709,3 +709,147 @@ Feature: sharing
       | shareType | 0 |
     Then the OCS status code should be "997"
     And the HTTP status code should be "401"
+
+  Scenario: Merging shares for recipient when shared from outside with group and member
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "group1" exists
+    And user "user1" belongs to group "group1"
+    And user "user0" created a folder "merge-test-outside"
+    When folder "merge-test-outside" of user "user0" is shared with group "group1"
+    And folder "merge-test-outside" of user "user0" is shared with user "user1"
+    Then as "user1" the folder "merge-test-outside" exists
+    And as "user1" the folder "merge-test-outside (2)" does not exist
+
+  Scenario: Merging shares for recipient when shared from outside with group and member with different permissions
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "group1" exists
+    And user "user1" belongs to group "group1"
+    And user "user0" created a folder "merge-test-outside-perms"
+    When folder "merge-test-outside-perms" of user "user0" is shared with group "group1" with permissions 1
+    And folder "merge-test-outside-perms" of user "user0" is shared with user "user1" with permissions 31
+    Then as "user1" gets properties of folder "merge-test-outside-perms" with
+        |{http://owncloud.org/ns}permissions|
+    And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
+    And as "user1" the folder "merge-test-outside-perms (2)" does not exist
+
+  Scenario: Merging shares for recipient when shared from outside with two groups
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "group1" exists
+    And group "group2" exists
+    And user "user1" belongs to group "group1"
+    And user "user1" belongs to group "group2"
+    And user "user0" created a folder "merge-test-outside-twogroups"
+    When folder "merge-test-outside-twogroups" of user "user0" is shared with group "group1"
+    And folder "merge-test-outside-twogroups" of user "user0" is shared with group "group2"
+    Then as "user1" the folder "merge-test-outside-twogroups" exists
+    And as "user1" the folder "merge-test-outside-twogroups (2)" does not exist
+
+  Scenario: Merging shares for recipient when shared from outside with two groups with different permissions
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "group1" exists
+    And group "group2" exists
+    And user "user1" belongs to group "group1"
+    And user "user1" belongs to group "group2"
+    And user "user0" created a folder "merge-test-outside-twogroups-perms"
+    When folder "merge-test-outside-twogroups-perms" of user "user0" is shared with group "group1" with permissions 1
+    And folder "merge-test-outside-twogroups-perms" of user "user0" is shared with group "group2" with permissions 31
+    Then as "user1" gets properties of folder "merge-test-outside-twogroups-perms" with
+        |{http://owncloud.org/ns}permissions|
+    And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
+    And as "user1" the folder "merge-test-outside-twogroups-perms (2)" does not exist
+
+  Scenario: Merging shares for recipient when shared from outside with two groups and member
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "group1" exists
+    And group "group2" exists
+    And user "user1" belongs to group "group1"
+    And user "user1" belongs to group "group2"
+    And user "user0" created a folder "merge-test-outside-twogroups-member-perms"
+    When folder "merge-test-outside-twogroups-member-perms" of user "user0" is shared with group "group1" with permissions 1
+    And folder "merge-test-outside-twogroups-member-perms" of user "user0" is shared with group "group2" with permissions 31
+    And folder "merge-test-outside-twogroups-member-perms" of user "user0" is shared with user "user1" with permissions 1
+    Then as "user1" gets properties of folder "merge-test-outside-twogroups-member-perms" with
+        |{http://owncloud.org/ns}permissions|
+    And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
+    And as "user1" the folder "merge-test-outside-twogroups-member-perms (2)" does not exist
+
+  Scenario: Merging shares for recipient when shared from inside with group
+    Given As an "admin"
+    And user "user0" exists
+    And group "group1" exists
+    And user "user0" belongs to group "group1"
+    And user "user0" created a folder "merge-test-inside-group"
+    When folder "/merge-test-inside-group" of user "user0" is shared with group "group1"
+    Then as "user0" the folder "merge-test-inside-group" exists
+    And as "user0" the folder "merge-test-inside-group (2)" does not exist
+
+  Scenario: Merging shares for recipient when shared from inside with two groups
+    Given As an "admin"
+    And user "user0" exists
+    And group "group1" exists
+    And group "group2" exists
+    And user "user0" belongs to group "group1"
+    And user "user0" belongs to group "group2"
+    And user "user0" created a folder "merge-test-inside-twogroups"
+    When folder "merge-test-inside-twogroups" of user "user0" is shared with group "group1"
+    And folder "merge-test-inside-twogroups" of user "user0" is shared with group "group2"
+    Then as "user0" the folder "merge-test-inside-twogroups" exists
+    And as "user0" the folder "merge-test-inside-twogroups (2)" does not exist
+    And as "user0" the folder "merge-test-inside-twogroups (3)" does not exist
+
+  Scenario: Merging shares for recipient when shared from inside with group with less permissions
+    Given As an "admin"
+    And user "user0" exists
+    And group "group1" exists
+    And group "group2" exists
+    And user "user0" belongs to group "group1"
+    And user "user0" belongs to group "group2"
+    And user "user0" created a folder "merge-test-inside-twogroups-perms"
+    When folder "merge-test-inside-twogroups-perms" of user "user0" is shared with group "group1"
+    And folder "merge-test-inside-twogroups-perms" of user "user0" is shared with group "group2"
+    Then as "user0" gets properties of folder "merge-test-inside-twogroups-perms" with
+        |{http://owncloud.org/ns}permissions|
+    And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "RDNVCK"
+    And as "user0" the folder "merge-test-inside-twogroups-perms (2)" does not exist
+    And as "user0" the folder "merge-test-inside-twogroups-perms (3)" does not exist
+
+  Scenario: Merging shares for recipient when shared from outside with group then user and recipient renames in between
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "group1" exists
+    And user "user1" belongs to group "group1"
+    And user "user0" created a folder "merge-test-outside-groups-renamebeforesecondshare"
+    When folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with group "group1"
+    And User "user1" moved folder "/merge-test-outside-groups-renamebeforesecondshare" to "/merge-test-outside-groups-renamebeforesecondshare-renamed"
+    And folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with user "user1"
+    Then as "user1" gets properties of folder "merge-test-outside-groups-renamebeforesecondshare-renamed" with
+        |{http://owncloud.org/ns}permissions|
+    And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
+    And as "user1" the folder "merge-test-outside-groups-renamebeforesecondshare" does not exist
+
+  Scenario: Merging shares for recipient when shared from outside with user then group and recipient renames in between
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "group1" exists
+    And user "user1" belongs to group "group1"
+    And user "user0" created a folder "merge-test-outside-groups-renamebeforesecondshare"
+    When folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with user "user1"
+    And User "user1" moved folder "/merge-test-outside-groups-renamebeforesecondshare" to "/merge-test-outside-groups-renamebeforesecondshare-renamed"
+    And folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with group "group1"
+    Then as "user1" gets properties of folder "merge-test-outside-groups-renamebeforesecondshare-renamed" with
+        |{http://owncloud.org/ns}permissions|
+    And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
+    And as "user1" the folder "merge-test-outside-groups-renamebeforesecondshare" does not exist
+
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 3ced66a1a785..78763ad033a6 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -591,6 +591,33 @@
 			}
 		},
 
+		/**
+		 * Group reshares into a single super share element.
+		 * Does this by finding the most precise share and
+		 * combines the permissions to be the most permissive.
+		 *
+		 * @param {Array} reshares
+		 * @return {Object} reshare
+		 */
+		_groupReshares: function(reshares) {
+			if (!reshares || !reshares.length) {
+				return false;
+			}
+
+			var superShare = reshares.shift();
+			var combinedPermissions = superShare.permissions;
+			_.each(reshares, function(reshare) {
+				// use share have higher priority than group share
+				if (reshare.share_type === OC.Share.SHARE_TYPE_USER && superShare.share_type === OC.Share.SHARE_TYPE_GROUP) {
+					superShare = reshare;
+				}
+				combinedPermissions |= reshare.permissions;
+			});
+
+			superShare.permissions = combinedPermissions;
+			return superShare;
+		},
+
 		fetch: function() {
 			var model = this;
 			this.trigger('request', this);
@@ -608,7 +635,7 @@
 
 				var reshare = false;
 				if (data2[0].ocs.data.length) {
-					reshare = data2[0].ocs.data[0];
+					reshare = model._groupReshares(data2[0].ocs.data);
 				}
 
 				model.set(model.parse({
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index 8c9560d2646d..9d9001dc9e8f 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -181,6 +181,48 @@ describe('OC.Share.ShareItemModel', function() {
 
 			// TODO: check more attributes
 		});
+		it('groups reshare info into a single item', function() {
+			/* jshint camelcase: false */
+			fetchReshareDeferred.resolve(makeOcsResponse([
+				{
+					id: '1',
+					share_type: OC.Share.SHARE_TYPE_USER,
+					uid_owner: 'owner',
+					displayname_owner: 'Owner',
+					share_with: 'root',
+					permissions: 1
+				},
+				{
+					id: '2',
+					share_type: OC.Share.SHARE_TYPE_GROUP,
+					uid_owner: 'owner',
+					displayname_owner: 'Owner',
+					share_with: 'group1',
+					permissions: 15
+				},
+				{
+					id: '3',
+					share_type: OC.Share.SHARE_TYPE_GROUP,
+					uid_owner: 'owner',
+					displayname_owner: 'Owner',
+					share_with: 'group1',
+					permissions: 17
+				}
+			]));
+			fetchSharesDeferred.resolve(makeOcsResponse([]));
+
+			OC.currentUser = 'root';
+
+			model.fetch();
+
+			var reshare = model.get('reshare');
+			// max permissions
+			expect(reshare.permissions).toEqual(31);
+			// user share has higher priority
+			expect(reshare.share_type).toEqual(OC.Share.SHARE_TYPE_USER);
+			expect(reshare.share_with).toEqual('root');
+			expect(reshare.id).toEqual('1');
+		});
 		it('does not parse link share when for a different file', function() {
 			/* jshint camelcase: false */
 			fetchReshareDeferred.resolve(makeOcsResponse([]));
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 2b33dc413b42..c49faeaca2dc 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -47,6 +47,7 @@
 use OC\Repair\SearchLuceneTables;
 use OC\Repair\UpdateOutdatedOcsIds;
 use OC\Repair\RepairInvalidShares;
+use OC\Repair\RepairUnmergedShares;
 use OCP\AppFramework\QueryException;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
@@ -138,6 +139,12 @@ public static function getRepairSteps() {
 			new RemoveOldShares(\OC::$server->getDatabaseConnection()),
 			new AvatarPermissions(\OC::$server->getDatabaseConnection()),
 			new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
+			new RepairUnmergedShares(
+				\OC::$server->getConfig(),
+				\OC::$server->getDatabaseConnection(),
+				\OC::$server->getUserManager(),
+				\OC::$server->getGroupManager()
+			),
 		];
 	}
 
diff --git a/lib/private/Repair/RepairUnmergedShares.php b/lib/private/Repair/RepairUnmergedShares.php
new file mode 100644
index 000000000000..353877bb8737
--- /dev/null
+++ b/lib/private/Repair/RepairUnmergedShares.php
@@ -0,0 +1,328 @@
+<?php
+/**
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @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/>
+ *
+ */
+
+namespace OC\Repair;
+
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+use OC\Share\Constants;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IUserManager;
+use OCP\IUser;
+use OCP\IGroupManager;
+use OC\Share20\DefaultShareProvider;
+
+/**
+ * Repairs shares for which the received folder was not properly deduplicated.
+ *
+ * An unmerged share can for example happen when sharing a folder with the same
+ * user through multiple ways, like several groups and also directly, additionally
+ * to group shares. Since 9.0.0 these would create duplicate entries "folder (2)",
+ * one for every share. This repair step rearranges them so they only appear as a single
+ * folder.
+ */
+class RepairUnmergedShares implements IRepairStep {
+
+	/** @var \OCP\IConfig */
+	protected $config;
+
+	/** @var \OCP\IDBConnection */
+	protected $connection;
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var IGroupManager */
+	protected $groupManager;
+
+	/** @var IQueryBuilder */
+	private $queryGetSharesWithUsers;
+
+	/** @var IQueryBuilder */
+	private $queryUpdateSharePermissionsAndTarget;
+
+	/** @var IQueryBuilder */
+	private $queryUpdateShareInBatch;
+
+	/**
+	 * @param \OCP\IConfig $config
+	 * @param \OCP\IDBConnection $connection
+	 */
+	public function __construct(
+		IConfig $config,
+		IDBConnection $connection,
+		IUserManager $userManager,
+		IGroupManager $groupManager
+	) {
+		$this->connection = $connection;
+		$this->config = $config;
+		$this->userManager = $userManager;
+		$this->groupManager = $groupManager;
+	}
+
+	public function getName() {
+		return 'Repair unmerged shares';
+	}
+
+	/**
+	 * Builds prepared queries for reuse
+	 */
+	private function buildPreparedQueries() {
+		/**
+		 * Retrieve shares for a given user/group and share type
+		 */
+		$query = $this->connection->getQueryBuilder();
+		$query
+			->select('item_source', 'id', 'file_target', 'permissions', 'parent', 'share_type')
+			->from('share')
+			->where($query->expr()->eq('share_type', $query->createParameter('shareType')))
+			->andWhere($query->expr()->in('share_with', $query->createParameter('shareWiths')))
+			->andWhere($query->expr()->in('item_type', $query->createParameter('itemTypes')))
+			->orderBy('item_source', 'ASC')
+			->addOrderBy('stime', 'ASC');
+
+		$this->queryGetSharesWithUsers = $query;
+
+		/**
+		 * Updates the file_target to the given value for all given share ids.
+		 *
+		 * This updates several shares in bulk which is faster than individually.
+		 */
+		$query = $this->connection->getQueryBuilder();
+		$query->update('share')
+			->set('file_target', $query->createParameter('file_target'))
+			->where($query->expr()->in('id', $query->createParameter('ids')));
+
+		$this->queryUpdateShareInBatch = $query;
+
+		/**
+		 * Updates the share permissions and target path of a single share.
+		 */
+		$query = $this->connection->getQueryBuilder();
+		$query->update('share')
+			->set('permissions', $query->createParameter('permissions'))
+			->set('file_target', $query->createParameter('file_target'))
+			->where($query->expr()->eq('id', $query->createParameter('shareid')));
+
+		$this->queryUpdateSharePermissionsAndTarget = $query;
+
+	}
+
+	private function getSharesWithUser($shareType, $shareWiths) {
+		$groupedShares = [];
+
+		$query = $this->queryGetSharesWithUsers;
+		$query->setParameter('shareWiths', $shareWiths, IQueryBuilder::PARAM_STR_ARRAY);
+		$query->setParameter('shareType', $shareType);
+		$query->setParameter('itemTypes', ['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY);
+
+		$shares = $query->execute()->fetchAll();
+
+		// group by item_source
+		foreach ($shares as $share) {
+			if (!isset($groupedShares[$share['item_source']])) {
+				$groupedShares[$share['item_source']] = [];
+			}
+			$groupedShares[$share['item_source']][] = $share;
+		}
+		return $groupedShares;
+	}
+
+	/**
+	 * Fix the given received share represented by the set of group shares
+	 * and matching sub shares
+	 *
+	 * @param array $groupShares group share entries
+	 * @param array $subShares sub share entries
+	 *
+	 * @return boolean false if the share was not repaired, true if it was
+	 */
+	private function fixThisShare($groupShares, $subShares) {
+		if (empty($subShares)) {
+			return false;
+		}
+
+		$groupSharesById = [];
+		foreach ($groupShares as $groupShare) {
+			$groupSharesById[$groupShare['id']] = $groupShare;
+		}
+
+		if ($this->isThisShareValid($groupSharesById, $subShares)) {
+			return false;
+		}
+
+		$targetPath = $groupShares[0]['file_target'];
+
+		// check whether the user opted out completely of all subshares
+		$optedOut = true;
+		foreach ($subShares as $subShare) {
+			if ((int)$subShare['permissions'] !== 0) {
+				$optedOut = false;
+				break;
+			}
+		}
+
+		$shareIds = [];
+		foreach ($subShares as $subShare) {
+			// only if the user deleted some subshares but not all, adjust the permissions of that subshare
+			if (!$optedOut && (int)$subShare['permissions'] === 0 && (int)$subShare['share_type'] === DefaultShareProvider::SHARE_TYPE_USERGROUP) {
+				// set permissions from parent group share
+				$permissions = $groupSharesById[$subShare['parent']]['permissions'];
+
+				// fix permissions and target directly
+				$query = $this->queryUpdateSharePermissionsAndTarget;
+				$query->setParameter('shareid', $subShare['id']);
+				$query->setParameter('file_target', $targetPath);
+				$query->setParameter('permissions', $permissions);
+				$query->execute();
+			} else {
+				// gather share ids for bulk target update
+				if ($subShare['file_target'] !== $targetPath) {
+					$shareIds[] = (int)$subShare['id'];
+				}
+			}
+		}
+
+		if (!empty($shareIds)) {
+			$query = $this->queryUpdateShareInBatch;
+			$query->setParameter('ids', $shareIds, IQueryBuilder::PARAM_INT_ARRAY);
+			$query->setParameter('file_target', $targetPath);
+			$query->execute();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Checks whether the number of group shares is balanced with the child subshares.
+	 * If all group shares have exactly one subshare, and the target of every subshare
+	 * is the same, then the share is valid.
+	 * If however there is a group share entry that has no matching subshare, it means
+	 * we're in the bogus situation and the whole share must be repaired
+	 *
+	 * @param array $groupSharesById
+	 * @param array $subShares
+	 *
+	 * @return true if the share is valid, false if it needs repair
+	 */
+	private function isThisShareValid($groupSharesById, $subShares) {
+		$foundTargets = [];
+
+		// every group share needs to have exactly one matching subshare
+		foreach ($subShares as $subShare) {
+			$foundTargets[$subShare['file_target']] = true;
+			if (count($foundTargets) > 1) {
+				// not all the same target path value => invalid
+				return false;
+			}
+			if (isset($groupSharesById[$subShare['parent']])) {
+				// remove it from the list as we found it
+				unset($groupSharesById[$subShare['parent']]);
+			}
+		}
+
+		// if we found one subshare per group entry, the set will be empty.
+		// If not empty, it means that one of the group shares did not have
+		// a matching subshare entry.
+		return empty($groupSharesById);
+	}
+
+	/**
+	 * Detect unmerged received shares and merge them properly
+	 */
+	private function fixUnmergedShares(IOutput $out, IUser $user) {
+		$groups = $this->groupManager->getUserGroupIds($user);
+		if (empty($groups)) {
+			// user is in no groups, so can't have received group shares
+			return;
+		}
+
+		// get all subshares grouped by item source
+		$subSharesByItemSource = $this->getSharesWithUser(DefaultShareProvider::SHARE_TYPE_USERGROUP, [$user->getUID()]);
+
+		// because sometimes one wants to give the user more permissions than the group share
+		$userSharesByItemSource = $this->getSharesWithUser(Constants::SHARE_TYPE_USER, [$user->getUID()]);
+
+		if (empty($subSharesByItemSource) && empty($userSharesByItemSource)) {
+			// nothing to repair for this user, no need to do extra queries
+			return;
+		}
+
+		$groupSharesByItemSource = $this->getSharesWithUser(Constants::SHARE_TYPE_GROUP, $groups);
+		if (empty($groupSharesByItemSource) && empty($userSharesByItemSource)) {
+			// nothing to repair for this user
+			return;
+		}
+
+		foreach ($groupSharesByItemSource as $itemSource => $groupShares) {
+			$subShares = [];
+			if (isset($subSharesByItemSource[$itemSource])) {
+				$subShares = $subSharesByItemSource[$itemSource];
+			}
+
+			if (isset($userSharesByItemSource[$itemSource])) {
+				// add it to the subshares to get a similar treatment
+				$subShares = array_merge($subShares, $userSharesByItemSource[$itemSource]);
+			}
+
+			$this->fixThisShare($groupShares, $subShares);
+		}
+	}
+
+	/**
+	 * Count all the users
+	 *
+	 * @return int
+	 */
+	private function countUsers() {
+		$allCount = $this->userManager->countUsers();
+
+		$totalCount = 0;
+		foreach ($allCount as $backend => $count) {
+			$totalCount += $count;
+		}
+
+		return $totalCount;
+	}
+
+	public function run(IOutput $output) {
+		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+		if (version_compare($ocVersionFromBeforeUpdate, '9.1.0.16', '<')) {
+			// this situation was only possible between 9.0.0 and 9.0.3 included
+
+			$function = function(IUser $user) use ($output) {
+				$this->fixUnmergedShares($output, $user);
+				$output->advance();
+			};
+
+			$this->buildPreparedQueries();
+
+			$userCount = $this->countUsers();
+			$output->startProgress($userCount);
+
+			$this->userManager->callForAllUsers($function);
+
+			$output->finishProgress();
+		}
+	}
+}
diff --git a/tests/lib/Repair/RepairUnmergedSharesTest.php b/tests/lib/Repair/RepairUnmergedSharesTest.php
new file mode 100644
index 000000000000..fe9b3e5b96f3
--- /dev/null
+++ b/tests/lib/Repair/RepairUnmergedSharesTest.php
@@ -0,0 +1,449 @@
+<?php
+/**
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @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/>
+ *
+ */
+
+namespace Test\Repair;
+
+
+use OC\Repair\RepairUnmergedShares;
+use OC\Share\Constants;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+use Test\TestCase;
+use OC\Share20\DefaultShareProvider;
+
+/**
+ * Tests for repairing invalid shares
+ *
+ * @group DB
+ *
+ * @see \OC\Repair\RepairUnmergedShares
+ */
+class RepairUnmergedSharesTest extends TestCase {
+
+	/** @var IRepairStep */
+	private $repair;
+
+	/** @var \OCP\IDBConnection */
+	private $connection;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$config->expects($this->any())
+			->method('getSystemValue')
+			->with('version')
+			->will($this->returnValue('9.0.3.0'));
+
+		$this->connection = \OC::$server->getDatabaseConnection();
+		$this->deleteAllShares();
+
+		$user1 = $this->getMock('\OCP\IUser');
+		$user1->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('user1'));
+
+		$user2 = $this->getMock('\OCP\IUser');
+		$user2->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('user2'));
+
+		$users = [$user1, $user2];
+
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$groupManager->expects($this->any())
+			->method('getUserGroupIds')
+			->will($this->returnValueMap([
+				// owner
+				[$user1, ['samegroup1', 'samegroup2']],
+				// recipient
+				[$user2, ['recipientgroup1', 'recipientgroup2']],
+			]));
+
+		$userManager = $this->getMock('\OCP\IUserManager');
+		$userManager->expects($this->once())
+			->method('countUsers')
+			->will($this->returnValue([2]));
+		$userManager->expects($this->once())
+			->method('callForAllUsers')
+			->will($this->returnCallback(function(\Closure $closure) use ($users) {
+				foreach ($users as $user) {
+					$closure($user);
+				}
+			}));
+
+		/** @var \OCP\IConfig $config */
+		$this->repair = new RepairUnmergedShares($config, $this->connection, $userManager, $groupManager);
+	}
+
+	protected function tearDown() {
+		$this->deleteAllShares();
+
+		parent::tearDown();
+	}
+
+	protected function deleteAllShares() {
+		$qb = $this->connection->getQueryBuilder();
+		$qb->delete('share')->execute();
+	}
+
+	private function createShare($type, $sourceId, $recipient, $targetName, $permissions, $parentId = null) {
+		$qb = $this->connection->getQueryBuilder();
+		$values = [
+			'share_type' => $qb->expr()->literal($type),
+			'share_with' => $qb->expr()->literal($recipient),
+			'uid_owner' => $qb->expr()->literal('user1'),
+			'item_type' => $qb->expr()->literal('folder'),
+			'item_source' => $qb->expr()->literal($sourceId),
+			'item_target' => $qb->expr()->literal('/' . $sourceId),
+			'file_source' => $qb->expr()->literal($sourceId),
+			'file_target' => $qb->expr()->literal($targetName),
+			'permissions' => $qb->expr()->literal($permissions),
+			'stime' => $qb->expr()->literal(time()),
+		];
+		if ($parentId !== null) {
+			$values['parent'] = $qb->expr()->literal($parentId);
+		}
+		$qb->insert('share')
+			->values($values)
+			->execute();
+
+		return $this->connection->lastInsertId('*PREFIX*share');
+	}
+
+	private function getShareById($id) {
+		$query = $this->connection->getQueryBuilder();
+		$results = $query
+			->select('*')
+			->from('share')
+			->where($query->expr()->eq('id', $query->expr()->literal($id)))
+			->execute()
+			->fetchAll();
+
+		if (!empty($results)) {
+			return $results[0];
+		}
+		return null;
+	}
+
+	public function sharesDataProvider() {
+		/**
+		 * For all these test cases we have the following situation:
+		 *
+		 * - "user1" is the share owner
+		 * - "user2" is the recipient, and member of "recipientgroup1" and "recipientgroup2"
+		 * - "user1" is member of "samegroup1", "samegroup2" for same group tests
+		 */
+		return [
+			[
+				// #0 legitimate share:
+				// - outsider shares with group1, group2
+				// - recipient renamed, resulting in subshares
+				// - one subshare for each group share
+				// - targets of subshare all match
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 31],
+					// child of the previous ones
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test renamed', 31, 0],
+					// child of the previous ones
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test renamed', 31, 1],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					['/test', 31],
+					['/test', 31],
+					// leave them alone
+					['/test renamed', 31],
+					['/test renamed', 31],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #1 broken share:
+				// - outsider shares with group1, group2
+				// - only one subshare for two group shares
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 31],
+					// child of the previous one
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (2)', 31, 1],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					['/test', 31],
+					['/test', 31],
+					['/test', 31],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #2 bogus share
+				// - outsider shares with group1, group2
+				// - one subshare for each group share
+				// - but the targets do not match when grouped
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 31],
+					// child of the previous ones
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (2)', 31, 0],
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (3)', 31, 1],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					['/test', 31],
+					['/test', 31],
+					// reset to original name
+					['/test', 31],
+					['/test', 31],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #3 bogus share
+				// - outsider shares with group1, group2
+				// - one subshare for each group share
+				// - first subshare not renamed (as in real world scenario)
+				// - but the targets do not match when grouped
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 31],
+					// child of the previous ones
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test', 31, 0],
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (2)', 31, 1],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					['/test', 31],
+					['/test', 31],
+					// reset to original name
+					['/test', 31],
+					['/test', 31],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #4 bogus share:
+				// - outsider shares with group1, group2
+				// - one subshare for each group share
+				// - non-matching targets
+				// - recipient deletes one duplicate (unshare from self, permissions 0)
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 15],
+					// child of the previous ones
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (2)', 0, 0],
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (3)', 15, 1],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					['/test', 31],
+					['/test', 15],
+					// subshares repaired and permissions restored to the max allowed
+					['/test', 31],
+					['/test', 15],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #5 bogus share:
+				// - outsider shares with group1, group2
+				// - one subshare for each group share
+				// - non-matching targets
+				// - recipient deletes ALL duplicates (unshare from self, permissions 0)
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 15],
+					// child of the previous ones
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (2)', 0, 0],
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (3)', 0, 1],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					['/test', 31],
+					['/test', 15],
+					// subshares target repaired but left "deleted" as it was the user's choice
+					['/test', 0],
+					['/test', 0],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #6 bogus share:
+				// - outsider shares with group1, group2 and also user2
+				// - one subshare for each group share
+				// - one extra share entry for direct share to user2
+				// - non-matching targets
+				// - user share has more permissions
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 1],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 15],
+					// child of the previous ones
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (2)', 1, 0],
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (3)', 15, 1],
+					[Constants::SHARE_TYPE_USER, 123, 'user2', '/test (4)', 31],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (5)', 31],
+				],
+				[
+					['/test', 1],
+					['/test', 15],
+					// subshares repaired
+					['/test', 1],
+					['/test', 15],
+					['/test', 31],
+					// leave unrelated alone
+					['/test (5)', 31],
+				]
+			],
+			[
+				// #7 bogus share:
+				// - outsider shares with group1 and also user2
+				// - no subshare at all
+				// - one extra share entry for direct share to user2
+				// - non-matching targets
+				// - user share has more permissions
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 1],
+					[Constants::SHARE_TYPE_USER, 123, 'user2', '/test (2)', 31],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (5)', 31],
+				],
+				[
+					['/test', 1],
+					// user share repaired
+					['/test', 31],
+					// leave unrelated alone
+					['/test (5)', 31],
+				]
+			],
+			[
+				// #8 legitimate share with own group:
+				// - insider shares with both groups the user is already in
+				// - no subshares in this case
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'samegroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'samegroup2', '/test', 31],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					// leave all alone
+					['/test', 31],
+					['/test', 31],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #9 legitimate shares:
+				// - group share with same group
+				// - group share with other group
+				// - user share where recipient renamed
+				// - user share where recipient did not rename
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'samegroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					[Constants::SHARE_TYPE_USER, 123, 'user3', '/test legit rename', 31],
+					[Constants::SHARE_TYPE_USER, 123, 'user4', '/test', 31],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					// leave all alone
+					['/test', 31],
+					['/test', 31],
+					['/test legit rename', 31],
+					['/test', 31],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #10 legitimate share:
+				// - outsider shares with group and user directly with different permissions
+				// - no subshares
+				// - same targets
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'samegroup1', '/test', 1],
+					[Constants::SHARE_TYPE_USER, 123, 'user3', '/test', 31],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					// leave all alone
+					['/test', 1],
+					['/test', 31],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+		];
+	}
+
+	/**
+	 * Test merge shares from group shares
+	 *
+	 * @dataProvider sharesDataProvider
+	 */
+	public function testMergeGroupShares($shares, $expectedShares) {
+		$shareIds = [];
+
+		foreach ($shares as $share) {
+			// if parent
+			if (isset($share[5])) {
+				// adjust to real id
+				$share[5] = $shareIds[$share[5]];
+			} else {
+				$share[5] = null;
+			}
+			$shareIds[] = $this->createShare($share[0], $share[1], $share[2], $share[3], $share[4], $share[5]);
+		}
+
+		/** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */
+		$outputMock = $this->getMockBuilder('\OCP\Migration\IOutput')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->repair->run($outputMock);
+
+		foreach ($expectedShares as $index => $expectedShare) {
+			$share = $this->getShareById($shareIds[$index]);
+			$this->assertEquals($expectedShare[0], $share['file_target']);
+			$this->assertEquals($expectedShare[1], $share['permissions']);
+		}
+	}
+}
+
diff --git a/version.php b/version.php
index 07bb6282e946..ea52cf12c1a7 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 0, 15);
+$OC_Version = array(9, 1, 0, 16);
 
 // The human readable string
 $OC_VersionString = '9.1.0';

From 97e24aed58f91077e9a26f88a87c9c225777a924 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 26 Jul 2016 21:09:25 +0200
Subject: [PATCH 031/219] Prevent setting email and triggering events at login
 time (#25554)

Whenever an LDAP user also has an email address defined in LDAP, the
LDAP code will try and update the email address of the locally known
user. This happens at login time or every time the user's LDAP
attributes are processed.

There is code listening to the email setting hook which updates the
system address book, which also will trigger FS setup due to avatars
and other things.

This fix only sets the email address when really necessary.
---
 apps/user_ldap/lib/User/User.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index c82bde0704c6..d45e19b39d61 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -434,7 +434,10 @@ public function updateEmail($valueFromLDAP = null) {
 		if(!is_null($email)) {
 			$user = $this->userManager->get($this->uid);
 			if (!is_null($user)) {
-				$user->setEMailAddress($email);
+				$currentEmail = $user->getEMailAddress();
+				if ($currentEmail !== $email) {
+					$user->setEMailAddress($email);
+				}
 			}
 		}
 	}

From 62235e511dc8afd1b397c6acb4f213de4f96f8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 1 Aug 2016 11:12:06 +0200
Subject: [PATCH 032/219] [stable9.1] Adding quota plugin to new dav endpoint
 (#25615) (#25648)

* Adding quota plugin to new dav endpoint

* Added integrated test failing in old endpoint

* Added 0B quota test
---
 apps/dav/lib/Server.php                       |  3 +++
 .../integration/features/bootstrap/WebDav.php | 12 ++++++++-
 build/integration/features/dav-v2.feature     | 27 +++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index a2493f4b5af6..e36d3e280cee 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -161,6 +161,9 @@ public function __construct(IRequest $request, $baseUri) {
 						)
 					)
 				);
+				$this->server->addPlugin(
+					new \OCA\DAV\Connector\Sabre\QuotaPlugin($view));
+
 			}
 		});
 	}
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 092c79fe0206..a63b752a0151 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -22,6 +22,16 @@ public function usingDavPath($davPath) {
 		$this->davPath = $davPath;
 	}
 
+	public function getFilesPath(){
+		$basePath = '';
+		if ($this->davPath === "remote.php/dav"){
+			$basePath = '/files/' . $this->currentUser . '/';
+		} else {
+			$basePath = '/';
+		}
+		return $basePath;
+	}
+
 	public function makeDavRequest($user, $method, $path, $headers, $body = null){
 		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath . "$path";
 		$client = new GClient();
@@ -425,7 +435,7 @@ public function userDeletesFile($user, $file)  {
 	 */
 	public function userCreatedAFolder($user, $destination){
 		try {
-			$this->response = $this->makeDavRequest($user, "MKCOL", '/' . ltrim($destination, '/'), []);
+			$this->response = $this->makeDavRequest($user, "MKCOL", $this->getFilesPath() . ltrim($destination, $this->getFilesPath()), []);
 		} catch (\GuzzleHttp\Exception\ServerException $e) {
 			// 4xx and 5xx responses cause an exception
 			$this->response = $e->getResponse();
diff --git a/build/integration/features/dav-v2.feature b/build/integration/features/dav-v2.feature
index 2b3aeff94542..a57b7f26c436 100644
--- a/build/integration/features/dav-v2.feature
+++ b/build/integration/features/dav-v2.feature
@@ -53,3 +53,30 @@ Feature: dav-v2
 		Given Logging in using web as "admin"
 		When Sending a "PROPFIND" to "/remote.php/dav/files/admin/welcome.txt" with requesttoken
 		Then the HTTP status code should be "207"
+
+	Scenario: Uploading a file having 0B as quota
+		Given using dav path "remote.php/dav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user0" has a quota of "0 B"
+		And As an "user0"
+		When User "user0" uploads file "data/textfile.txt" to "/files/user0/asdf.txt"
+		Then the HTTP status code should be "507"
+
+	Scenario: Uploading a file as recipient using webdav new endpoint having quota
+		Given using dav path "remote.php/dav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user1" exists
+		And user "user0" has a quota of "10 MB"
+		And user "user1" has a quota of "10 MB"
+		And As an "user1"
+		And user "user1" created a folder "/testquota"
+		And as "user1" creating a share with
+		  | path | testquota |
+		  | shareType | 0 |
+		  | permissions | 31 |
+		  | shareWith | user0 |
+		And As an "user0"
+		When User "user0" uploads file "data/textfile.txt" to "/files/user0/testquota/asdf.txt"
+		Then the HTTP status code should be "201"

From db8549969707a6337a94dd39f40dcbb679330feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Mon, 1 Aug 2016 17:49:30 +0200
Subject: [PATCH 033/219] Add integration test for sharing with group, then
 user in group (#25672)

Add integration test for the use case where a group share exists and
then the same owner creates a direct share to a user in that group.
---
 build/integration/features/sharing-v1.feature | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index b7d32051c697..0faf5f516d3e 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -26,6 +26,21 @@ Feature: sharing
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
 
+  Scenario: Creating a new share with user who already received a share through their group
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "sharing-group" exists
+    And user "user1" belongs to group "sharing-group"
+    And file "welcome.txt" of user "user0" is shared with group "sharing-group"
+    And As an "user0"
+    Then sending "POST" to "/apps/files_sharing/api/v1/shares" with
+      | path | welcome.txt |
+      | shareWith | user1 |
+      | shareType | 0 |
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+
   Scenario: Creating a new public share
     Given user "user0" exists
     And As an "user0"

From f37612216828b4c52ac3c050c9c51d73e8d714b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 2 Aug 2016 13:41:00 +0200
Subject: [PATCH 034/219] [stable9.1] Load the app before executing it's repair
 steps (#25650) (#25674)

---
 core/Command/Maintenance/Repair.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php
index df684b45a1c5..6f9a0a699a37 100644
--- a/core/Command/Maintenance/Repair.php
+++ b/core/Command/Maintenance/Repair.php
@@ -87,6 +87,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			if (!is_array($info)) {
 				continue;
 			}
+			\OC_App::loadApp($app);
 			$steps = $info['repair-steps']['post-migration'];
 			foreach ($steps as $step) {
 				try {

From 66f86bc6860f0b3caeacee1f2e7ec256fd129609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 2 Aug 2016 22:28:37 +0200
Subject: [PATCH 035/219] [stable9.1] Added integration test (#25675)

* [stable9.1] Added integration test

* A shared storage is never a home storage - fixes #25582
---
 apps/files_sharing/lib/sharedstorage.php       | 10 ++++++++++
 .../features/webdav-related.feature            | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index af47bf94a08c..4b3f4b0795dc 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -107,6 +107,16 @@ private function init() {
 		}
 	}
 
+	/**
+	 * @inheritdoc
+	 */
+	public function instanceOfStorage($class) {
+		if (in_array($class, ['\OC\Files\Storage\Home', '\OC\Files\ObjectStore\HomeObjectStoreStorage'])) {
+			return false;
+		}
+		return parent::instanceOfStorage($class);
+	}
+
 	/**
 	 * @return string
 	 */
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index 19913416afee..5ab4d0a08a48 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -160,6 +160,24 @@ Feature: webdav-related
 		  |{DAV:}quota-available-bytes|
 		And the single response should contain a property "{DAV:}quota-available-bytes" with value "10485429"
 
+	Scenario: Uploading a file as recipient using webdav having quota
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user1" exists
+		And user "user0" has a quota of "10 MB"
+		And user "user1" has a quota of "10 MB"
+		And As an "user1"
+		And user "user1" created a folder "/testquota"
+		And as "user1" creating a share with
+		  | path | testquota |
+		  | shareType | 0 |
+		  | permissions | 31 |
+		  | shareWith | user0 |
+		And As an "user0"
+		When User "user0" uploads file "data/textfile.txt" to "/testquota/asdf.txt"
+		Then the HTTP status code should be "201"
+
 	Scenario: download a public shared file with range
 		Given user "user0" exists
 		And As an "user0"

From 1a497b1027ebf9d249940f155ae2cb6bd793f899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Wed, 3 Aug 2016 08:29:37 +0200
Subject: [PATCH 036/219] [stable9.1] Fix undefined
 OfflineUser::composeAndStoreDisplayName() - fixes #23248 (#25601)

---
 apps/user_ldap/lib/User_LDAP.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index 7929394893b2..7d48bdd23ed4 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -382,8 +382,14 @@ public function getDisplayName($uid) {
 			}
 
 			$user = $this->access->userManager->get($uid);
-			$displayName = $user->composeAndStoreDisplayName($displayName, $displayName2);
-			$this->access->connection->writeToCache($cacheKey, $displayName);
+			if ($user instanceof User) {
+				$displayName = $user->composeAndStoreDisplayName($displayName, $displayName2);
+				$this->access->connection->writeToCache($cacheKey, $displayName);
+			}
+			if ($user instanceof OfflineUser) {
+				/** @var OfflineUser $user*/
+				$displayName = $user->getDisplayName();
+			}
 			return $displayName;
 		}
 

From ee72c9b1e88e317d749bcd7cccfe9b50ae9c03e0 Mon Sep 17 00:00:00 2001
From: VicDeo <dubiniuk@owncloud.com>
Date: Tue, 9 Aug 2016 10:54:19 +0300
Subject: [PATCH 037/219] Respect theme for external folder icon (#25487)
 (#25711)

See issue #25461.
When using a theme with alternative filetype icons `OCA.External.StatusManager.Utils.getIconRoute` should respect that, rather than hard coding the default icon.

Note this change does not affect windows_network_drive and sharepoint icons, which appear not to be easily themeable.
---
 apps/files_external/js/statusmanager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js
index 91974f2d04d6..bfb9a950c6b4 100644
--- a/apps/files_external/js/statusmanager.js
+++ b/apps/files_external/js/statusmanager.js
@@ -537,7 +537,7 @@ OCA.External.StatusManager.Utils = {
 	 * of the tr matching the folder name
 	 */
 	getIconRoute: function (tr) {
-		var icon = OC.imagePath('core', 'filetypes/folder-external');
+		var icon = OC.MimeType.getIconUrl('dir-external');
 		var backend = null;
 
 		if (tr instanceof $) {

From a32f50a5bfe83a3631c78d2803d38a46c548ec4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 9 Aug 2016 10:05:27 +0200
Subject: [PATCH 038/219] [stable9.1] getJailedPath expects $path to have a
 trailing /  (#25703)

* getJailedPath expects $path to have a trailing / - fixes #25464

* Adding test case for getPathById including a jailed cache where root is just empty
---
 lib/private/Files/Cache/Wrapper/CacheJail.php   |  3 +++
 tests/lib/Files/Cache/Wrapper/CacheJailTest.php | 13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
index 858132930f23..3443ad40d26d 100644
--- a/lib/private/Files/Cache/Wrapper/CacheJail.php
+++ b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -58,6 +58,9 @@ protected function getSourcePath($path) {
 	 * @return null|string the jailed path or null if the path is outside the jail
 	 */
 	protected function getJailedPath($path) {
+		if ($this->root === '') {
+			return $path;
+		}
 		$rootLength = strlen($this->root) + 1;
 		if ($path === $this->root) {
 			return '';
diff --git a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php
index 6ef6716f7213..e3043c50d576 100644
--- a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php
+++ b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php
@@ -63,8 +63,17 @@ function testClearKeepEntriesOutsideJail() {
 	}
 
 	function testGetById() {
-		//not supported
-		$this->assertTrue(true);
+		$data1 = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
+		$id = $this->sourceCache->put('foo/bar', $data1);
+
+		// path from jailed foo of foo/bar is bar
+		$path = $this->cache->getPathById($id);
+		$this->assertEquals('bar', $path);
+
+		// path from jailed '' of foo/bar is foo/bar
+		$this->cache = new \OC\Files\Cache\Wrapper\CacheJail($this->sourceCache, '');
+		$path = $this->cache->getPathById($id);
+		$this->assertEquals('foo/bar', $path);
 	}
 
 	function testGetIncomplete() {

From ee7106ca712ef929c8f3f6b575b601368fb853fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 10 Aug 2016 16:51:30 +0200
Subject: [PATCH 039/219] log class name, ID only is hard to debug (#25746)

---
 cron.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cron.php b/cron.php
index bf258932a013..c5ce895eb7e7 100644
--- a/cron.php
+++ b/cron.php
@@ -118,9 +118,9 @@
 				break;
 			}
 
-			$logger->debug('Run job with ID ' . $job->getId(), ['app' => 'cron']);
+			$logger->debug('Run ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
 			$job->execute($jobList, $logger);
-			$logger->debug('Finished job with ID ' . $job->getId(), ['app' => 'cron']);
+			$logger->debug('Finished ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
 
 			$jobList->setLastJob($job);
 			$executedJobs[$job->getId()] = true;

From 4d47963a6e9b6b2f7fa9df9fb1b357864ed05d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 10 Aug 2016 17:39:03 +0200
Subject: [PATCH 040/219] Skip version and trash expiry for users that never
 logged in (#25745)

---
 apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php    | 2 +-
 apps/files_versions/lib/BackgroundJob/ExpireVersions.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
index b682f4260887..69491fb69335 100644
--- a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
+++ b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
@@ -78,7 +78,7 @@ protected function run($argument) {
 
 		$this->userManager->callForAllUsers(function(IUser $user) {
 			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
+			if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) {
 				return;
 			}
 			$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
diff --git a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
index f357b73409ba..1faf5c9aa564 100644
--- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
+++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
@@ -68,7 +68,7 @@ protected function run($argument) {
 
 		$this->userManager->callForAllUsers(function(IUser $user) {
 			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
+			if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) {
 				return;
 			}
 			Storage::expireOlderThanMaxForUser($uid);

From ed59de57bb305e7c27d5f647b5f635e2ce48cf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Wed, 10 Aug 2016 22:48:45 +0200
Subject: [PATCH 041/219] [stable9.1] Add missing array element - fixes #25714
 (#25732)

---
 core/Controller/LoginController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index b2545b73d787..fa41af67b89c 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -185,7 +185,7 @@ public function tryLogin($user, $password, $redirect_url) {
 		}
 		if ($loginResult === false) {
 			$this->session->set('loginMessages', [
-				['invalidpassword']
+				['invalidpassword'], []
 			]);
 			// Read current user and append if possible - we need to return the unmodified user otherwise we will leak the login name
 			$args = !is_null($user) ? ['user' => $originalUser] : [];

From 4b1b5adb34e327009676755789029aaeb63906bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Wed, 10 Aug 2016 22:50:04 +0200
Subject: [PATCH 042/219] [stable9.1] Faster classification migration (#25638)

* [stable9.1] Faster classification migration

* Update PHPDoc
---
 apps/dav/appinfo/info.xml                     |  2 +-
 apps/dav/lib/AppInfo/Application.php          |  2 +-
 apps/dav/lib/Migration/Classification.php     | 64 +++++++++-------
 .../unit/Migration/ClassificationTest.php     | 75 -------------------
 4 files changed, 39 insertions(+), 104 deletions(-)
 delete mode 100644 apps/dav/tests/unit/Migration/ClassificationTest.php

diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index df147a032fe0..683382339407 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>ownCloud WebDAV endpoint</description>
 	<licence>AGPL</licence>
 	<author>owncloud.org</author>
-	<version>0.2.5</version>
+	<version>0.2.6</version>
 	<default_enable/>
 	<types>
 		<filesystem/>
diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php
index b7b24ba76320..401f66a62c64 100644
--- a/apps/dav/lib/AppInfo/Application.php
+++ b/apps/dav/lib/AppInfo/Application.php
@@ -114,7 +114,7 @@ public function __construct (array $urlParams=array()) {
 			/** @var IAppContainer $c */
 			return new Classification(
 				$c->query('CalDavBackend'),
-				$c->getServer()->getUserManager()
+				$c->getServer()->getDatabaseConnection()
 			);
 		});
 
diff --git a/apps/dav/lib/Migration/Classification.php b/apps/dav/lib/Migration/Classification.php
index b793f790af5e..6a7390c76355 100644
--- a/apps/dav/lib/Migration/Classification.php
+++ b/apps/dav/lib/Migration/Classification.php
@@ -23,8 +23,7 @@
 namespace OCA\DAV\Migration;
 
 use OCA\DAV\CalDAV\CalDavBackend;
-use OCP\IUser;
-use OCP\IUserManager;
+use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
@@ -33,33 +32,19 @@ class Classification implements IRepairStep {
 	/** @var CalDavBackend */
 	private $calDavBackend;
 
-	/** @var IUserManager */
-	private $userManager;
+	/** @var IDBConnection */
+	private $connection;
 
 	/**
 	 * Classification constructor.
 	 *
 	 * @param CalDavBackend $calDavBackend
+	 * @param IDBConnection $connection
 	 */
-	public function __construct(CalDavBackend $calDavBackend, IUserManager $userManager) {
+	public function __construct(CalDavBackend $calDavBackend, IDBConnection $connection) {
 		$this->calDavBackend = $calDavBackend;
-		$this->userManager = $userManager;
-	}
+		$this->connection = $connection;
 
-	/**
-	 * @param IUser $user
-	 */
-	public function runForUser($user) {
-		$principal = 'principals/users/' . $user->getUID();
-		$calendars = $this->calDavBackend->getCalendarsForUser($principal);
-		foreach ($calendars as $calendar) {
-			$objects = $this->calDavBackend->getCalendarObjects($calendar['id']);
-			foreach ($objects as $object) {
-				$calObject = $this->calDavBackend->getCalendarObject($calendar['id'], $object['uri']);
-				$classification = $this->extractClassification($calObject['calendardata']);
-				$this->calDavBackend->setClassification($object['id'], $classification);
-			}
-		}
 	}
 
 	/**
@@ -82,12 +67,37 @@ public function getName() {
 	 * @inheritdoc
 	 */
 	public function run(IOutput $output) {
-		$output->startProgress();
-		$this->userManager->callForAllUsers(function($user) use ($output) {
-			/** @var IUser $user */
-			$output->advance(1, $user->getDisplayName());
-			$this->runForUser($user);
-		});
+		$qb = $this->connection->getQueryBuilder();
+		$result = $qb->select($qb->createFunction('COUNT(*)'))
+			->from('calendarobjects')
+			->execute();
+
+		$max = $result->fetchColumn();
+		$output->startProgress($max);
+
+		$query = $this->connection->getQueryBuilder();
+		$query->select(['id', 'calendardata', 'classification'])
+			->from('calendarobjects');
+
+		$stmt = $query->execute();
+
+		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+			$output->advance(1);
+
+			$classification = $this->extractClassification($this->readBlob($row['calendardata']));
+			$this->calDavBackend->setClassification($row['id'], $classification);
+		}
+
 		$output->finishProgress();
 	}
+
+	private function readBlob($cardData) {
+		if (is_resource($cardData)) {
+			return stream_get_contents($cardData);
+		}
+
+		return $cardData;
+	}
+
 }
diff --git a/apps/dav/tests/unit/Migration/ClassificationTest.php b/apps/dav/tests/unit/Migration/ClassificationTest.php
deleted file mode 100644
index 5c7fa6272267..000000000000
--- a/apps/dav/tests/unit/Migration/ClassificationTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @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/>
- *
- */
-
-namespace OCA\DAV\Tests\unit\DAV\Migration;
-
-use OCA\DAV\CalDAV\CalDavBackend;
-use OCA\DAV\Migration\Classification;
-use OCA\DAV\Tests\unit\CalDAV\AbstractCalDavBackendTest;
-use OCP\IUser;
-
-/**
- * Class ClassificationTest
- *
- * @group DB
- *
- * @package OCA\DAV\Tests\unit\DAV
- */
-class ClassificationTest extends AbstractCalDavBackendTest {
-
-	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\IUserManager */
-	private $userManager;
-
-	public function setUp() {
-		parent::setUp();
-
-		$this->userManager = $this->getMockBuilder('OCP\IUserManager')
-			->disableOriginalConstructor()->getMock();
-	}
-
-	public function test() {
-		// setup data
-		$calendarId = $this->createTestCalendar();
-		$eventUri = $this->createEvent($calendarId, '20130912T130000Z', '20130912T140000Z');
-		$object = $this->backend->getCalendarObject($calendarId, $eventUri);
-
-		// assert proper classification
-		$this->assertEquals(CalDavBackend::CLASSIFICATION_PUBLIC, $object['classification']);
-		$this->backend->setClassification($object['id'], CalDavBackend::CLASSIFICATION_CONFIDENTIAL);
-		$object = $this->backend->getCalendarObject($calendarId, $eventUri);
-		$this->assertEquals(CalDavBackend::CLASSIFICATION_CONFIDENTIAL, $object['classification']);
-
-		// run migration
-		$c = new Classification($this->backend, $this->userManager);
-
-		/** @var IUser | \PHPUnit_Framework_MockObject_MockObject $user */
-		$user = $this->getMockBuilder('OCP\IUser')
-			->disableOriginalConstructor()
-			->getMock();
-		$user->expects($this->once())->method('getUID')->willReturn('caldav-unit-test');
-
-		$c->runForUser($user);
-
-		// assert classification after migration
-		$object = $this->backend->getCalendarObject($calendarId, $eventUri);
-		$this->assertEquals(CalDavBackend::CLASSIFICATION_PUBLIC, $object['classification']);
-	}
-}

From 912aa4f82b0da2a05168091e78225b03b800ed1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Thu, 11 Aug 2016 19:33:33 +0200
Subject: [PATCH 043/219] [Stable9.1] fix unit test on new jenkins setup and
 adjust Jenkinsfile (#25772)

* [stable9.1] Next step jenkinsfile (#25622)

* Adding timestamper and evaluation of test results even in case of failure

* Adding build timeout

* use fixed value 120 minutes as timeout for each test executing for now

* Terminate the build as soon as test execution fails

* Adjust external testing as well

* Finalize use of executeAndReport

* [stable9.1] Fix discoverymanager tests (#25769)

* Allow testing of the DiscoveryManager

* Array sort order is of no relevance
---
 Jenkinsfile                                   | 165 +++++++++++++-----
 .../lib/DiscoveryManager.php                  |   6 +
 .../tests/DiscoveryManagerTest.php            |   1 +
 .../SystemTag/SystemTagObjectMapperTest.php   |   2 +-
 4 files changed, 125 insertions(+), 49 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9e6ac097a828..8c15c67f25f7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,68 +1,137 @@
 #!groovy
+/*
+ * This Jenkinsfile is intended to run on https://ci.owncloud.org and may fail anywhere else.
+ * It makes assumptions about plugins being installed, labels mapping to nodes that can build what is needed, etc.
+ */
 
-node('SLAVE') {
+timestampedNode('SLAVE') {
     stage 'Checkout'
         checkout scm
         sh '''git submodule update --init'''
 
     stage 'JavaScript Testing'
-        sh '''./autotest-js.sh'''
-        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-js.xml'])
+        executeAndReport('tests/autotest-results-js.xml') {
+            sh '''./autotest-js.sh'''
+        }
 
     stage 'PHPUnit'
-        sh '''
-        export NOCOVERAGE=1
-        unset USEDOCKER
-        phpenv local 7.0
-        ./autotest.sh sqlite
-        phpenv local 5.4
-        ./autotest.sh mysql
-        phpenv local 5.6
-        ./autotest.sh pgsql
-        phpenv local 5.5
-        ./autotest.sh oci
-        '''
-        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-sqlite.xml'])
-        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-mysql.xml'])
-        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-oci.xml'])
-        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-pgsql.xml'])
+        executeAndReport('tests/autotest-results-sqlite.xml') {
+            sh '''
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            phpenv local 7.0
+            ./autotest.sh sqlite
+            '''
+        }
+        executeAndReport('tests/autotest-results-mysql.xml') {
+            sh '''
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            phpenv local 5.4
+            ./autotest.sh mysql
+            '''
+        }
+        executeAndReport('tests/autotest-results-pgsql.xml') {
+            sh '''
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            phpenv local 5.6
+            ./autotest.sh pgsql
+            '''
+        }
+        executeAndReport('tests/autotest-results-oci.xml') {
+            sh '''
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            phpenv local 5.5
+            ./autotest.sh oci
+            '''
+        }
 
     stage 'Files External Testing'
-        sh '''phpenv local 7.0
-        export NOCOVERAGE=1
-        unset USEDOCKER
-        ./autotest-external.sh sqlite webdav-ownCloud
-        ./autotest-external.sh sqlite smb-silvershell
-        ./autotest-external.sh sqlite swift-ceph
-        '''
+        executeAndReport('tests/autotest-external-results-sqlite-webdav-ownCloud.xml') {
+            sh '''phpenv local 7.0
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            ./autotest-external.sh sqlite webdav-ownCloud
+            '''
+        }
+        executeAndReport('tests/autotest-external-results-sqlite-smb-silvershell.xml') {
+            sh '''phpenv local 7.0
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            ./autotest-external.sh sqlite smb-silvershell
+            '''
+        }
+        executeAndReport('tests/autotest-external-results-sqlite-swift-ceph.xml') {
+            sh '''phpenv local 7.0
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            ./autotest-external.sh sqlite swift-ceph
+            '''
+        }
+        executeAndReport('tests/autotest-external-results-sqlite-smb-windows.xml') {
+            sh '''phpenv local 7.0
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            ./autotest-external.sh sqlite smb-windows
+            '''
+        }
+
         step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite.xml'])
-        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite-webdav-ownCloud.xml'])
-        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite-smb-silvershell.xml'])
-        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite-swift-ceph.xml'])
 
     stage 'Primary Objectstore Test - Swift'
-        sh '''phpenv local 7.0
+        executeAndReport('tests/autotest-results-mysql.xml') {
+            sh '''phpenv local 7.0
 
-        export NOCOVERAGE=1
-        export RUN_OBJECTSTORE_TESTS=1
-        export PRIMARY_STORAGE_CONFIG="swift"
-        unset USEDOCKER
+            export NOCOVERAGE=1
+            export RUN_OBJECTSTORE_TESTS=1
+            export PRIMARY_STORAGE_CONFIG="swift"
+            unset USEDOCKER
 
-        rm tests/autotest-results-*.xml
-        ./autotest.sh mysql
-        '''
-        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-mysql.xml'])
+            rm tests/autotest-results-*.xml
+            ./autotest.sh mysql
+            '''
+        }
 
     stage 'Integration Testing'
-        sh '''phpenv local 7.0
-        rm -rf config/config.php
-        ./occ maintenance:install --admin-pass=admin
-        rm -rf build/integration/output
-        rm -rf build/integration/vendor
-        rm -rf build/integration/composer.lock
-        cd build/integration
-        ./run.sh
-       '''
-        step([$class: 'JUnitResultArchiver', testResults: 'build/integration/output/*.xml'])
+        executeAndReport('build/integration/output/*.xml') {
+            sh '''phpenv local 7.0
+            rm -rf config/config.php
+            ./occ maintenance:install --admin-pass=admin
+            rm -rf build/integration/output
+            rm -rf build/integration/vendor
+            rm -rf build/integration/composer.lock
+            cd build/integration
+            ./run.sh
+           '''
+        }
 }
 
+void executeAndReport(String testResultLocation, def body) {
+    def failed = false
+    // We're wrapping this in a timeout - if it takes longer, kill it.
+    try {
+        timeout(time: 120, unit: 'MINUTES') {
+            body.call()
+        }
+    } catch (Exception e) {
+        failed = true
+        echo "Test execution failed: ${e}"
+    } finally {
+        step([$class: 'JUnitResultArchiver', testResults: testResultLocation])
+    }
+
+    if (failed) {
+        error "Test execution failed. Terminating the build"
+    }
+}
+
+// Runs the given body within a Timestamper wrapper on the given label.
+def timestampedNode(String label, Closure body) {
+    node(label) {
+        wrap([$class: 'TimestamperBuildWrapper']) {
+            body.call()
+        }
+    }
+}
diff --git a/apps/federatedfilesharing/lib/DiscoveryManager.php b/apps/federatedfilesharing/lib/DiscoveryManager.php
index 25af0a40fd54..13af9ba78aa9 100644
--- a/apps/federatedfilesharing/lib/DiscoveryManager.php
+++ b/apps/federatedfilesharing/lib/DiscoveryManager.php
@@ -39,6 +39,8 @@ class DiscoveryManager {
 	private $cache;
 	/** @var IClient */
 	private $client;
+	/** @var bool */
+	public $underTest = false;
 
 	/**
 	 * @param ICacheFactory $cacheFactory
@@ -82,6 +84,10 @@ private function discover($remote) {
 			'share' => '/ocs/v1.php/cloud/shares',
 		];
 
+		if (defined('PHPUNIT_RUN') && !$this->underTest) {
+			return $discoveredServices;
+		}
+
 		// Read the data from the response body
 		try {
 			$response = $this->client->get($remote . '/ocs-provider/', [
diff --git a/apps/federatedfilesharing/tests/DiscoveryManagerTest.php b/apps/federatedfilesharing/tests/DiscoveryManagerTest.php
index a9c324f02442..28c129bc9ae1 100644
--- a/apps/federatedfilesharing/tests/DiscoveryManagerTest.php
+++ b/apps/federatedfilesharing/tests/DiscoveryManagerTest.php
@@ -62,6 +62,7 @@ public function setUp() {
 			$cacheFactory,
 			$clientService
 		);
+		$this->discoveryManager->underTest = true;
 	}
 
 	public function testWithMalformedFormattedEndpointCached() {
diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php
index 69cf7e8f8168..56f8de32f7d1 100644
--- a/tests/lib/SystemTag/SystemTagObjectMapperTest.php
+++ b/tests/lib/SystemTag/SystemTagObjectMapperTest.php
@@ -151,7 +151,7 @@ public function testGetObjectsForTags() {
 		$this->assertEquals([
 			'1',
 			'2',
-		], $objectIds);
+		], $objectIds, '', 0.0, 10, true);
 	}
 
 	public function testGetObjectsForTagsLimit() {

From befed183e501ef0776cccd3f9ce907fc3dc15ee6 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 11 Aug 2016 19:45:19 +0200
Subject: [PATCH 044/219] [stable9.1] Merge pull request #25652 from
 owncloud/fix-getQuota-on-null

Ensure the user exists before calling a method on it
---
 lib/private/legacy/util.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index f34fef7d06dc..06cd1bee4cec 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -164,6 +164,7 @@ public static function setupFS($user = '') {
 
 		// install storage availability wrapper, before most other wrappers
 		\OC\Files\Filesystem::addStorageWrapper('oc_availability', function ($mountPoint, $storage) {
+			/** @var \OCP\Files\Storage $storage */
 			if (!$storage->instanceOfStorage('\OC\Files\Storage\Shared') && !$storage->isLocal()) {
 				return new \OC\Files\Storage\Wrapper\Availability(['storage' => $storage]);
 			}
@@ -289,16 +290,19 @@ public static function isDefaultExpireDateEnforced() {
 	/**
 	 * Get the quota of a user
 	 *
-	 * @param string $user
+	 * @param string $userId
 	 * @return int Quota bytes
 	 */
-	public static function getUserQuota($user) {
-		$userQuota = \OC::$server->getUserManager()->get($user)->getQuota();
+	public static function getUserQuota($userId) {
+		$user = \OC::$server->getUserManager()->get($userId);
+		if (is_null($user)) {
+			return \OCP\Files\FileInfo::SPACE_UNLIMITED;
+		}
+		$userQuota = $user->getQuota();
 		if($userQuota === 'none') {
 			return \OCP\Files\FileInfo::SPACE_UNLIMITED;
-		}else{
-			return OC_Helper::computerFileSize($userQuota);
 		}
+		return OC_Helper::computerFileSize($userQuota);
 	}
 
 	/**

From 6e44ef83ff22163815d77b149b4da5bc705463ad Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 12 Aug 2016 08:55:29 +0200
Subject: [PATCH 045/219] Fix OR operands in SharedMountTest (#25779)

---
 apps/files_sharing/tests/SharedMountTest.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/files_sharing/tests/SharedMountTest.php b/apps/files_sharing/tests/SharedMountTest.php
index 41f68c419108..eacd04f7bee3 100644
--- a/apps/files_sharing/tests/SharedMountTest.php
+++ b/apps/files_sharing/tests/SharedMountTest.php
@@ -246,21 +246,21 @@ public function dataPermissionMovedGroupShare() {
 			[
 				'file',
 				\OCP\Constants::PERMISSION_READ
-				|| \OCP\Constants::PERMISSION_UPDATE
-				|| \OCP\Constants::PERMISSION_SHARE,
+				| \OCP\Constants::PERMISSION_UPDATE
+				| \OCP\Constants::PERMISSION_SHARE,
 				\OCP\Constants::PERMISSION_READ
-				|| \OCP\Constants::PERMISSION_SHARE,
+				| \OCP\Constants::PERMISSION_SHARE,
 			],
 			[
 				'folder',
 				\OCP\Constants::PERMISSION_READ
-				|| \OCP\Constants::PERMISSION_CREATE
-				|| \OCP\Constants::PERMISSION_UPDATE
-				|| \OCP\Constants::PERMISSION_DELETE
-				|| \OCP\Constants::PERMISSION_SHARE,
+				| \OCP\Constants::PERMISSION_CREATE
+				| \OCP\Constants::PERMISSION_UPDATE
+				| \OCP\Constants::PERMISSION_DELETE
+				| \OCP\Constants::PERMISSION_SHARE,
 				\OCP\Constants::PERMISSION_READ
-				|| \OCP\Constants::PERMISSION_CREATE
-				|| \OCP\Constants::PERMISSION_UPDATE,
+				| \OCP\Constants::PERMISSION_CREATE
+				| \OCP\Constants::PERMISSION_UPDATE,
 			],
 		];
 	}

From a986fd4b79099ca821b7ac0bed291c036e0db782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Pablo=20Villafa=C3=B1ez?=
 <jvillafanez@solidgeargroup.com>
Date: Fri, 12 Aug 2016 12:06:30 +0200
Subject: [PATCH 046/219] [stable9.1] Fix smb attributes stable9 1 (#25733)

* Fix file permissions for SMB (read-only folders will be writeable)

* Read-only folders won't be deletable

* Added comment for the read-only behaviour for folders
---
 apps/files_external/lib/Lib/Storage/SMB.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
index 9f74aa881e0b..fce701821503 100644
--- a/apps/files_external/lib/Lib/Storage/SMB.php
+++ b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -381,6 +381,19 @@ public function isReadable($path) {
 	}
 
 	public function isUpdatable($path) {
+		try {
+			$info = $this->getFileInfo($path);
+			// following windows behaviour for read-only folders: they can be written into
+			// (https://support.microsoft.com/en-us/kb/326549 - "cause" section)
+			return !$info->isHidden() && (!$info->isReadOnly() || $this->is_dir($path));
+		} catch (NotFoundException $e) {
+			return false;
+		} catch (ForbiddenException $e) {
+			return false;
+		}
+	}
+
+	public function isDeletable($path) {
 		try {
 			$info = $this->getFileInfo($path);
 			return !$info->isHidden() && !$info->isReadOnly();

From 563df59f58206e7c8c0e294e7adab6765c038f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 12 Aug 2016 15:10:01 +0200
Subject: [PATCH 047/219] [stable9.1] lastInsertId requires the prefix (#25785)

backport of https://github.com/owncloud/core/pull/25764
---
 apps/files_external/lib/Service/DBConfigService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/lib/Service/DBConfigService.php b/apps/files_external/lib/Service/DBConfigService.php
index 3e38f4aed94d..ce975cb3fac0 100644
--- a/apps/files_external/lib/Service/DBConfigService.php
+++ b/apps/files_external/lib/Service/DBConfigService.php
@@ -207,7 +207,7 @@ public function addMount($mountPoint, $storageBackend, $authBackend, $priority,
 				'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)
 			]);
 		$query->execute();
-		return (int)$this->connection->lastInsertId('external_mounts');
+		return (int)$this->connection->lastInsertId('*PREFIX*external_mounts');
 	}
 
 	/**

From 4033a6b65adf4e68e1d22b730ed2353f457f9aa9 Mon Sep 17 00:00:00 2001
From: Markus Goetz <markus@woboq.com>
Date: Sat, 13 Aug 2016 17:03:54 +0200
Subject: [PATCH 048/219] DAV: Return data-fingerprint always when asked
 (#25482)

For owncloud/client#5056
Users can configure arbitrary subfolders for syncing, therefore we should
always return it when asked for.
The sync client makes sure to not always ask for it to save bandwidth.
---
 apps/dav/lib/Connector/Sabre/FilesPlugin.php            | 9 ++-------
 apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php | 6 ++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index 0a2e6713cb48..e924bffd5214 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -308,15 +308,10 @@ public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node)
 				$displayName = $owner->getDisplayName();
 				return $displayName;
 			});
-
-			$propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function() use ($node) {
-				if ($node->getPath() === '/') {
-					return $this->config->getSystemValue('data-fingerprint', '');
-				}
-			});
 		}
 
-		if ($node instanceof \OCA\DAV\Files\FilesHome) {
+		if ($node instanceof \OCA\DAV\Connector\Sabre\Node
+			|| $node instanceof \OCA\DAV\Files\FilesHome) {
 			$propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function() use ($node) {
 				return $this->config->getSystemValue('data-fingerprint', '');
 			});
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
index 2b3f3e15d1a7..f3775a12915c 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -191,7 +191,8 @@ public function testGetPropertiesForFile() {
 		$this->assertEquals('http://example.com/', $propFind->get(self::DOWNLOADURL_PROPERTYNAME));
 		$this->assertEquals('foo', $propFind->get(self::OWNER_ID_PROPERTYNAME));
 		$this->assertEquals('M. Foo', $propFind->get(self::OWNER_DISPLAY_NAME_PROPERTYNAME));
-		$this->assertEquals([self::SIZE_PROPERTYNAME, self::DATA_FINGERPRINT_PROPERTYNAME], $propFind->get404Properties());
+		$this->assertEquals('my_fingerprint', $propFind->get(self::DATA_FINGERPRINT_PROPERTYNAME));
+		$this->assertEquals([self::SIZE_PROPERTYNAME], $propFind->get404Properties());
 	}
 
 	public function testGetPropertiesForFileHome() {
@@ -332,7 +333,8 @@ public function testGetPropertiesForDirectory() {
 		$this->assertEquals(1025, $propFind->get(self::SIZE_PROPERTYNAME));
 		$this->assertEquals('DWCKMSR', $propFind->get(self::PERMISSIONS_PROPERTYNAME));
 		$this->assertEquals(null, $propFind->get(self::DOWNLOADURL_PROPERTYNAME));
-		$this->assertEquals([self::DOWNLOADURL_PROPERTYNAME, self::DATA_FINGERPRINT_PROPERTYNAME], $propFind->get404Properties());
+		$this->assertEquals('my_fingerprint', $propFind->get(self::DATA_FINGERPRINT_PROPERTYNAME));
+		$this->assertEquals([self::DOWNLOADURL_PROPERTYNAME], $propFind->get404Properties());
 	}
 
 	public function testGetPropertiesForRootDirectory() {

From df16a0c5e3f060d15b4ebc1df6264cc207aee043 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 18 Jul 2016 11:35:14 +0200
Subject: [PATCH 049/219] Store the shared propagator instance

This instead of recreating it for every call.
---
 apps/files_sharing/lib/sharedstorage.php |  7 ++++++-
 lib/private/Files/Utils/Scanner.php      | 10 ++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 4b3f4b0795dc..2c5d4bab7922 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -328,10 +328,15 @@ public function getScanner($path = '', $storage = null) {
 	}
 
 	public function getPropagator($storage = null) {
+		if (isset($this->propagator)) {
+			return $this->propagator;
+		}
+
 		if (!$storage) {
 			$storage = $this;
 		}
-		return new \OCA\Files_Sharing\SharedPropagator($storage, \OC::$server->getDatabaseConnection());
+		$this->propagator = new \OCA\Files_Sharing\SharedPropagator($storage, \OC::$server->getDatabaseConnection());
+		return $this->propagator;
 	}
 
 	public function getOwner($path) {
diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php
index e4e5e353f9f5..0fbe0967877c 100644
--- a/lib/private/Files/Utils/Scanner.php
+++ b/lib/private/Files/Utils/Scanner.php
@@ -138,9 +138,10 @@ public function backgroundScan($dir) {
 				$this->triggerPropagator($storage, $path);
 			});
 
-			$storage->getPropagator()->beginBatch();
+			$propagator = $storage->getPropagator();
+			$propagator->beginBatch();
 			$scanner->backgroundScan();
-			$storage->getPropagator()->commitBatch();
+			$propagator->commitBatch();
 		}
 	}
 
@@ -189,14 +190,15 @@ public function scan($dir = '') {
 				$this->db->beginTransaction();
 			}
 			try {
-				$storage->getPropagator()->beginBatch();
+				$propagator = $storage->getPropagator();
+				$propagator->beginBatch();
 				$scanner->scan($relativePath, \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG | \OC\Files\Cache\Scanner::REUSE_SIZE);
 				$cache = $storage->getCache();
 				if ($cache instanceof Cache) {
 					// only re-calculate for the root folder we scanned, anything below that is taken care of by the scanner
 					$cache->correctFolderSize($relativePath);
 				}
-				$storage->getPropagator()->commitBatch();
+				$propagator->commitBatch();
 			} catch (StorageNotAvailableException $e) {
 				$this->logger->error('Storage ' . $storage->getId() . ' not available');
 				$this->logger->logException($e);

From aacf391f8b5501c130327fa08118bb1af3b3cfbe Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 12 Aug 2016 15:00:24 +0200
Subject: [PATCH 050/219] Fix subadmin permission check for
 addToGroup/removeFromGroup

Fixes issue where subadmins could never add users to a group.
Added missing unit tests
---
 apps/provisioning_api/lib/Users.php       |  48 ++--
 apps/provisioning_api/tests/UsersTest.php | 268 ++++++++++++++++++----
 2 files changed, 258 insertions(+), 58 deletions(-)

diff --git a/apps/provisioning_api/lib/Users.php b/apps/provisioning_api/lib/Users.php
index 271eaccfde6c..a1430862a508 100644
--- a/apps/provisioning_api/lib/Users.php
+++ b/apps/provisioning_api/lib/Users.php
@@ -421,6 +421,27 @@ public function getUsersGroups($parameters) {
 		
 	}
 
+	/**
+	 * Returns whether the given user can manage the given group
+	 *
+	 * @param IUser $user user to check access
+	 * @param IGroup|null $group group to check or null
+	 *
+	 * @return true if the user can manage the group
+	 */
+	private function canUserManageGroup($user, $group) {
+		if ($this->groupManager->isAdmin($user->getUID())) {
+			return true;
+		}
+
+		if ($group !== null) {
+			$subAdminManager = $this->groupManager->getSubAdmin();
+			return $subAdminManager->isSubAdminofGroup($user, $group);
+		}
+
+		return false;
+	}
+
 	/**
 	 * @param array $parameters
 	 * @return OC_OCS_Result
@@ -432,22 +453,22 @@ public function addToGroup($parameters) {
 			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
 		}
 
-		// Check they're an admin
-		if(!$this->groupManager->isAdmin($user->getUID())) {
-			// This user doesn't have rights to add a user to this group
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
 		$groupId = !empty($_POST['groupid']) ? $_POST['groupid'] : null;
 		if($groupId === null) {
 			return new OC_OCS_Result(null, 101);
 		}
 
 		$group = $this->groupManager->get($groupId);
-		$targetUser = $this->userManager->get($parameters['userid']);
-		if($group === null) {
+		if ($group === null) {
 			return new OC_OCS_Result(null, 102);
 		}
+
+		// Check they're an admin or subadmin of the group
+		if(!$this->canUserManageGroup($user, $group)) {
+			return new OC_OCS_Result(null, 104);
+		}
+
+		$targetUser = $this->userManager->get($parameters['userid']);
 		if($targetUser === null) {
 			return new OC_OCS_Result(null, 103);
 		}
@@ -478,16 +499,14 @@ public function removeFromGroup($parameters) {
 			return new OC_OCS_Result(null, 102);
 		}
 
+		if(!$this->canUserManageGroup($loggedInUser, $group)) {
+			return new OC_OCS_Result(null, 104);
+		}
+
 		$targetUser = $this->userManager->get($parameters['userid']);
 		if($targetUser === null) {
 			return new OC_OCS_Result(null, 103);
 		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if(!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminofGroup($loggedInUser, $group)) {
-			return new OC_OCS_Result(null, 104);
-		}
 		// Check they aren't removing themselves from 'admin' or their 'subadmin; group
 		if($parameters['userid'] === $loggedInUser->getUID()) {
 			if($this->groupManager->isAdmin($loggedInUser->getUID())) {
@@ -496,6 +515,7 @@ public function removeFromGroup($parameters) {
 				}
 			} else {
 				// Not an admin, check they are not removing themself from their subadmin group
+				$subAdminManager = $this->groupManager->getSubAdmin();
 				$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
 				foreach ($subAdminGroups as $key => $group) {
 					$subAdminGroups[$key] = $group->getGID();
diff --git a/apps/provisioning_api/tests/UsersTest.php b/apps/provisioning_api/tests/UsersTest.php
index 5ecfbdc275ee..39aa19640668 100644
--- a/apps/provisioning_api/tests/UsersTest.php
+++ b/apps/provisioning_api/tests/UsersTest.php
@@ -1630,11 +1630,7 @@ public function testAddToGroupNotLoggedIn() {
 	public function testAddToGroupWithTargetGroupNotExisting() {
 		$_POST['groupid'] = 'GroupToAddTo';
 
-		$loggedInUser = $this->getMock('OCP\IUser');
-		$loggedInUser
-			->expects($this->once())
-			->method('getUID')
-			->will($this->returnValue('admin'));
+		$loggedInUser = $this->getMock('\OCP\IUser');
 		$this->userSession
 			->expects($this->once())
 			->method('getUser')
@@ -1644,45 +1640,60 @@ public function testAddToGroupWithTargetGroupNotExisting() {
 			->method('get')
 			->with('GroupToAddTo')
 			->will($this->returnValue(null));
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('admin')
-			->will($this->returnValue(true));
 
 		$expected = new \OC_OCS_Result(null, 102);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
 	}
 
 	public function testAddToGroupWithNoGroupSpecified() {
-		$loggedInUser = $this->getMock('OCP\IUser');
+		$loggedInUser = $this->getMock('\OCP\IUser');
+		$this->userSession
+			->expects($this->once())
+			->method('getUser')
+			->will($this->returnValue($loggedInUser));
+
+		$expected = new \OC_OCS_Result(null, 101);
+		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
+	}
+
+	public function testAddToGroupWithTargetUserNotExisting() {
+		$_POST['groupid'] = 'GroupToAddTo';
+
+		$loggedInUser = $this->getMock('\OCP\IUser');
 		$loggedInUser
 			->expects($this->once())
 			->method('getUID')
 			->will($this->returnValue('admin'));
+		$targetGroup = $this->getMock('\OCP\IGroup');
 		$this->userSession
 			->expects($this->once())
 			->method('getUser')
 			->will($this->returnValue($loggedInUser));
+		$this->groupManager
+			->expects($this->once())
+			->method('get')
+			->with('GroupToAddTo')
+			->will($this->returnValue($targetGroup));
 		$this->groupManager
 			->expects($this->once())
 			->method('isAdmin')
 			->with('admin')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(null, 101);
+		$expected = new \OC_OCS_Result(null, 103);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
 	}
 
-	public function testAddToGroupWithTargetUserNotExisting() {
+	public function testAddToGroupWithoutPermission() {
 		$_POST['groupid'] = 'GroupToAddTo';
 
 		$loggedInUser = $this->getMock('OCP\IUser');
 		$loggedInUser
 			->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('admin'));
-		$targetGroup = $this->getMock('OCP\IGroup');
+			->will($this->returnValue('unauthorizedUser'));
+		$targetUser = $this->getMock('\OCP\IUser');
+		$targetGroup = $this->getMock('\OCP\IGroup');
 		$this->userSession
 			->expects($this->once())
 			->method('getUser')
@@ -1692,38 +1703,157 @@ public function testAddToGroupWithTargetUserNotExisting() {
 			->method('get')
 			->with('GroupToAddTo')
 			->will($this->returnValue($targetGroup));
+		$subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+			->disableOriginalConstructor()->getMock();
+		$this->groupManager
+			->expects($this->once())
+			->method('getSubAdmin')
+			->will($this->returnValue($subAdminManager));
 		$this->groupManager
 			->expects($this->once())
 			->method('isAdmin')
-			->with('admin')
-			->will($this->returnValue(true));
+			->with('unauthorizedUser')
+			->will($this->returnValue(false));
 
-		$expected = new \OC_OCS_Result(null, 103);
+		$expected = new \OC_OCS_Result(null, 104);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
 	}
 
-	public function testAddToGroupWithoutPermission() {
-		$_POST['groupid'] = 'GroupToAddTo';
+	public function testAddToOutsideGroupAsSubAdminFromSubAdmin() {
+		$_POST['groupid'] = 'outsidegroup';
 
 		$loggedInUser = $this->getMock('OCP\IUser');
 		$loggedInUser
+			->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('subadmin'));
+		$targetUser = $this->getMock('\OCP\IUser');
+		$subadminGroup = $this->getMock('\OCP\IGroup');
+		$subadminGroup
+			->expects($this->any())
+			->method('getGID')
+			->will($this->returnValue('subadmin'));
+		$targetGroup = $this->getMock('\OCP\IGroup');
+		$targetGroup
+			->expects($this->any())
+			->method('getGID')
+			->will($this->returnValue('outsidegroup'));
+		$this->userSession
+			->expects($this->once())
+			->method('getUser')
+			->will($this->returnValue($loggedInUser));
+		$this->groupManager
+			->expects($this->any())
+			->method('get')
+			->will($this->returnValueMap([
+				['subadmin', $subadminGroup],
+				['outsidegroup', $targetGroup]
+			]));
+		$subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+			->disableOriginalConstructor()->getMock();
+		$subAdminManager
+			->expects($this->once())
+			->method('isSubAdminofGroup')
+			->with($loggedInUser, $targetGroup)
+			->will($this->returnValue(false));
+		$this->groupManager
 			->expects($this->once())
+			->method('getSubAdmin')
+			->will($this->returnValue($subAdminManager));
+		$this->groupManager
+			->expects($this->any())
+			->method('isAdmin')
+			->with('subadmin')
+			->will($this->returnValue(false));
+
+		$expected = new \OC_OCS_Result(null, 104);
+		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'subadmin']));
+	}
+
+	public function testAddToGroupSuccessful() {
+		$_POST['groupid'] = 'admin';
+		$loggedInUser = $this->getMock('\OCP\IUser');
+		$loggedInUser
+			->expects($this->any())
 			->method('getUID')
 			->will($this->returnValue('admin'));
+		$targetUser = $this->getMock('\OCP\IUser');
+		$targetGroup = $this->getMock('\OCP\IGroup');
 		$this->userSession
 			->expects($this->once())
 			->method('getUser')
 			->will($this->returnValue($loggedInUser));
 		$this->groupManager
 			->expects($this->once())
+			->method('get')
+			->with('admin')
+			->will($this->returnValue($targetGroup));
+		$this->userManager
+			->expects($this->once())
+			->method('get')
+			->with('AnotherUser')
+			->will($this->returnValue($targetUser));
+		$this->groupManager
+			->expects($this->any())
 			->method('isAdmin')
 			->with('admin')
-			->will($this->returnValue(false));
+			->will($this->returnValue(true));
+		$targetGroup
+			->expects($this->once())
+			->method('addUser')
+			->with($targetUser);
 
-		$expected = new \OC_OCS_Result(null, 997);
-		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
+		$expected = new \OC_OCS_Result(null, 100);
+		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'AnotherUser']));
 	}
 
+	public function testAddToGroupSuccessfulAsSubadmin() {
+		$_POST['groupid'] = 'group1';
+		$loggedInUser = $this->getMock('\OCP\IUser');
+		$loggedInUser
+			->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('subadmin'));
+		$targetUser = $this->getMock('\OCP\IUser');
+		$targetGroup = $this->getMock('\OCP\IGroup');
+		$this->userSession
+			->expects($this->once())
+			->method('getUser')
+			->will($this->returnValue($loggedInUser));
+		$this->groupManager
+			->expects($this->once())
+			->method('get')
+			->with('group1')
+			->will($this->returnValue($targetGroup));
+		$this->userManager
+			->expects($this->once())
+			->method('get')
+			->with('AnotherUser')
+			->will($this->returnValue($targetUser));
+		$this->groupManager
+			->expects($this->any())
+			->method('isAdmin')
+			->with('subadmin')
+			->will($this->returnValue(false));
+		$targetGroup
+			->expects($this->once())
+			->method('addUser')
+			->with($targetUser);
+		$subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+			->disableOriginalConstructor()->getMock();
+		$subAdminManager
+			->expects($this->once())
+			->method('isSubAdminOfGroup')
+			->with($loggedInUser, $targetGroup)
+			->will($this->returnValue(true));
+		$this->groupManager
+			->expects($this->once())
+			->method('getSubAdmin')
+			->will($this->returnValue($subAdminManager));
+
+		$expected = new \OC_OCS_Result(null, 100);
+		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'AnotherUser']));
+	}
 	public function testRemoveFromGroupWithoutLogIn() {
 		$this->userSession
 			->expects($this->once())
@@ -1761,8 +1891,12 @@ public function testRemoveFromGroupWithNotExistingTargetGroup() {
 	}
 
 	public function testRemoveFromGroupWithNotExistingTargetUser() {
-		$loggedInUser = $this->getMock('OCP\IUser');
-		$targetGroup = $this->getMock('OCP\IGroup');
+		$loggedInUser = $this->getMock('\OCP\IUser');
+		$loggedInUser
+			->expects($this->once())
+			->method('getUID')
+			->will($this->returnValue('subadmin'));
+		$targetGroup = $this->getMock('\OCP\IGroup');
 		$this->userSession
 			->expects($this->once())
 			->method('getUser')
@@ -1777,6 +1911,22 @@ public function testRemoveFromGroupWithNotExistingTargetUser() {
 			->method('get')
 			->with('TargetUser')
 			->will($this->returnValue(null));
+		$this->groupManager
+			->expects($this->once())
+			->method('isAdmin')
+			->with('subadmin')
+			->will($this->returnValue(false));
+		$subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+			->disableOriginalConstructor()->getMock();
+		$subAdminManager
+			->expects($this->once())
+			->method('isSubAdminofGroup')
+			->with($loggedInUser, $targetGroup)
+			->will($this->returnValue(true));
+		$this->groupManager
+			->expects($this->once())
+			->method('getSubAdmin')
+			->will($this->returnValue($subAdminManager));
 
 		$expected = new \OC_OCS_Result(null, 103);
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => ['groupid' => 'TargetGroup']]));
@@ -1799,12 +1949,7 @@ public function testRemoveFromGroupWithoutPermission() {
 			->method('get')
 			->with('TargetGroup')
 			->will($this->returnValue($targetGroup));
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('TargetUser')
-			->will($this->returnValue($targetUser));
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+		$subAdminManager = $this->getMockBuilder('\OC\Subadmin')
 			->disableOriginalConstructor()->getMock();
 		$this->groupManager
 			->expects($this->once())
@@ -1846,12 +1991,6 @@ public function testRemoveFromGroupAsAdminFromAdmin() {
 			->method('get')
 			->with('admin')
 			->will($this->returnValue($targetUser));
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->will($this->returnValue($subAdminManager));
 		$this->groupManager
 			->expects($this->any())
 			->method('isAdmin')
@@ -1901,7 +2040,7 @@ public function testRemoveFromGroupAsSubAdminFromSubAdmin() {
 			->with($loggedInUser)
 			->will($this->returnValue([$targetGroup]));
 		$this->groupManager
-			->expects($this->once())
+			->expects($this->any())
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 		$this->groupManager
@@ -1936,12 +2075,6 @@ public function testRemoveFromGroupSuccessful() {
 			->method('get')
 			->with('AnotherUser')
 			->will($this->returnValue($targetUser));
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->will($this->returnValue($subAdminManager));
 		$this->groupManager
 			->expects($this->any())
 			->method('isAdmin')
@@ -1956,6 +2089,53 @@ public function testRemoveFromGroupSuccessful() {
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'AnotherUser', '_delete' => ['groupid' => 'admin']]));
 	}
 
+	public function testRemoveFromGroupSuccessfulAsSubadmin() {
+		$loggedInUser = $this->getMock('\OCP\IUser');
+		$loggedInUser
+			->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('subadmin'));
+		$targetUser = $this->getMock('\OCP\IUser');
+		$targetGroup = $this->getMock('\OCP\IGroup');
+		$this->userSession
+			->expects($this->once())
+			->method('getUser')
+			->will($this->returnValue($loggedInUser));
+		$this->groupManager
+			->expects($this->once())
+			->method('get')
+			->with('group1')
+			->will($this->returnValue($targetGroup));
+		$this->userManager
+			->expects($this->once())
+			->method('get')
+			->with('AnotherUser')
+			->will($this->returnValue($targetUser));
+		$this->groupManager
+			->expects($this->any())
+			->method('isAdmin')
+			->with('subadmin')
+			->will($this->returnValue(false));
+		$targetGroup
+			->expects($this->once())
+			->method('removeUser')
+			->with($targetUser);
+		$subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+			->disableOriginalConstructor()->getMock();
+		$subAdminManager
+			->expects($this->once())
+			->method('isSubAdminOfGroup')
+			->with($loggedInUser, $targetGroup)
+			->will($this->returnValue(true));
+		$this->groupManager
+			->expects($this->once())
+			->method('getSubAdmin')
+			->will($this->returnValue($subAdminManager));
+
+		$expected = new \OC_OCS_Result(null, 100);
+		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'AnotherUser', '_delete' => ['groupid' => 'group1']]));
+	}
+
 	public function testAddSubAdminWithNotExistingTargetUser() {
 		$this->userManager
 			->expects($this->once())

From c8a385d61e3e534319defb94766d99a20456371e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 10 Aug 2016 10:32:25 +0200
Subject: [PATCH 051/219] Get shared storage numeric id directly from DB

To prevent recursions in initMountPoints which requires the numeric id
to populate oc_mounts
---
 apps/files_sharing/lib/SharedMount.php            |  9 +++++++++
 lib/private/Files/Config/LazyStorageMountInfo.php | 12 ++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php
index 3f5bf8ea7bff..3030e206a18e 100644
--- a/apps/files_sharing/lib/SharedMount.php
+++ b/apps/files_sharing/lib/SharedMount.php
@@ -233,4 +233,13 @@ public function getShare() {
 	public function getStorageRootId() {
 		return $this->getShare()->getNodeId();
 	}
+
+	public function getStorageNumericId() {
+		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$query->select('storage')
+			->from('filecache')
+			->where($query->expr()->eq('fileid', $query->createNamedParameter($this->share->getNodeId())));
+
+		return $query->execute()->fetchColumn();
+	}
 }
diff --git a/lib/private/Files/Config/LazyStorageMountInfo.php b/lib/private/Files/Config/LazyStorageMountInfo.php
index 5df04c4b78ea..3af6a7fddb4f 100644
--- a/lib/private/Files/Config/LazyStorageMountInfo.php
+++ b/lib/private/Files/Config/LazyStorageMountInfo.php
@@ -47,11 +47,15 @@ public function __construct(IUser $user, IMountPoint $mount) {
 	 */
 	public function getStorageId() {
 		if (!$this->storageId) {
-			$storage = $this->mount->getStorage();
-			if (!$storage) {
-				return -1;
+			if (method_exists($this->mount, 'getStorageNumericId')) {
+				$this->storageId = $this->mount->getStorageNumericId();
+			} else {
+				$storage = $this->mount->getStorage();
+				if (!$storage) {
+					return -1;
+				}
+				$this->storageId = $storage->getStorageCache()->getNumericId();
 			}
-			$this->storageId = $storage->getStorageCache()->getNumericId();
 		}
 		return parent::getStorageId();
 	}

From 3717e6237e10f42b6a73980d3033a6b5215e6bf8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 10 Aug 2016 08:26:00 +0200
Subject: [PATCH 052/219] Lazy init shared storage by tweaking jail

---
 apps/files_sharing/lib/SharedMount.php        |   2 +-
 apps/files_sharing/lib/sharedstorage.php      |  18 ++-
 lib/private/Files/Storage/Wrapper/Jail.php    |  88 +++++++-------
 lib/private/Files/Storage/Wrapper/Wrapper.php | 113 +++++++++---------
 4 files changed, 119 insertions(+), 102 deletions(-)

diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php
index 3030e206a18e..daddccf15d4c 100644
--- a/apps/files_sharing/lib/SharedMount.php
+++ b/apps/files_sharing/lib/SharedMount.php
@@ -238,7 +238,7 @@ public function getStorageNumericId() {
 		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$query->select('storage')
 			->from('filecache')
-			->where($query->expr()->eq('fileid', $query->createNamedParameter($this->share->getNodeId())));
+			->where($query->expr()->eq('fileid', $query->createNamedParameter($this->getStorageRootId())));
 
 		return $query->execute()->fetchColumn();
 	}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 4b3f4b0795dc..11b300196148 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -82,13 +82,9 @@ public function __construct($arguments) {
 
 		$this->user = $arguments['user'];
 
-		Filesystem::initMountPoints($this->superShare->getShareOwner());
-		$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
-		list($storage, $internalPath) = $this->ownerView->resolvePath($sourcePath);
-
 		parent::__construct([
-			'storage' => $storage,
-			'root' => $internalPath,
+			'storage' => null, // init later
+			'root' => null, // init later
 		]);
 	}
 
@@ -102,6 +98,10 @@ private function init() {
 			$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
 			list($this->sourceStorage, $sourceInternalPath) = $this->ownerView->resolvePath($sourcePath);
 			$this->sourceRootInfo = $this->sourceStorage->getCache()->get($sourceInternalPath);
+			// adjust jail
+			$this->storage = $this->sourceStorage;
+			$this->rootPath = $sourceInternalPath;
+
 		} catch (\Exception $e) {
 			$this->logger->logException($e);
 		}
@@ -434,4 +434,10 @@ public function file_put_contents($path, $data) {
 		return parent::file_put_contents($path, $data);
 	}
 
+	public function getWrapperStorage() {
+		$this->init();
+
+		return $this->sourceStorage;
+	}
+
 }
diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php
index 1df28e9a7477..fde1144f7a4b 100644
--- a/lib/private/Files/Storage/Wrapper/Jail.php
+++ b/lib/private/Files/Storage/Wrapper/Jail.php
@@ -45,10 +45,15 @@ class Jail extends Wrapper {
 	 */
 	public function __construct($arguments) {
 		parent::__construct($arguments);
+		// null value is allowed for lazy init, but it must set at earliest
+		// before the first file operation
 		$this->rootPath = $arguments['root'];
 	}
 
 	public function getSourcePath($path) {
+		if ($this->rootPath === null) {
+			throw new \InvalidArgumentException('Jail rootPath is null');
+		}
 		if ($path === '') {
 			return $this->rootPath;
 		} else {
@@ -67,7 +72,7 @@ public function getId() {
 	 * @return bool
 	 */
 	public function mkdir($path) {
-		return $this->storage->mkdir($this->getSourcePath($path));
+		return $this->getWrapperStorage()->mkdir($this->getSourcePath($path));
 	}
 
 	/**
@@ -77,7 +82,7 @@ public function mkdir($path) {
 	 * @return bool
 	 */
 	public function rmdir($path) {
-		return $this->storage->rmdir($this->getSourcePath($path));
+		return $this->getWrapperStorage()->rmdir($this->getSourcePath($path));
 	}
 
 	/**
@@ -87,7 +92,7 @@ public function rmdir($path) {
 	 * @return resource
 	 */
 	public function opendir($path) {
-		return $this->storage->opendir($this->getSourcePath($path));
+		return $this->getWrapperStorage()->opendir($this->getSourcePath($path));
 	}
 
 	/**
@@ -97,7 +102,7 @@ public function opendir($path) {
 	 * @return bool
 	 */
 	public function is_dir($path) {
-		return $this->storage->is_dir($this->getSourcePath($path));
+		return $this->getWrapperStorage()->is_dir($this->getSourcePath($path));
 	}
 
 	/**
@@ -107,7 +112,7 @@ public function is_dir($path) {
 	 * @return bool
 	 */
 	public function is_file($path) {
-		return $this->storage->is_file($this->getSourcePath($path));
+		return $this->getWrapperStorage()->is_file($this->getSourcePath($path));
 	}
 
 	/**
@@ -118,7 +123,7 @@ public function is_file($path) {
 	 * @return array
 	 */
 	public function stat($path) {
-		return $this->storage->stat($this->getSourcePath($path));
+		return $this->getWrapperStorage()->stat($this->getSourcePath($path));
 	}
 
 	/**
@@ -128,7 +133,7 @@ public function stat($path) {
 	 * @return bool
 	 */
 	public function filetype($path) {
-		return $this->storage->filetype($this->getSourcePath($path));
+		return $this->getWrapperStorage()->filetype($this->getSourcePath($path));
 	}
 
 	/**
@@ -139,7 +144,7 @@ public function filetype($path) {
 	 * @return int
 	 */
 	public function filesize($path) {
-		return $this->storage->filesize($this->getSourcePath($path));
+		return $this->getWrapperStorage()->filesize($this->getSourcePath($path));
 	}
 
 	/**
@@ -149,7 +154,7 @@ public function filesize($path) {
 	 * @return bool
 	 */
 	public function isCreatable($path) {
-		return $this->storage->isCreatable($this->getSourcePath($path));
+		return $this->getWrapperStorage()->isCreatable($this->getSourcePath($path));
 	}
 
 	/**
@@ -159,7 +164,7 @@ public function isCreatable($path) {
 	 * @return bool
 	 */
 	public function isReadable($path) {
-		return $this->storage->isReadable($this->getSourcePath($path));
+		return $this->getWrapperStorage()->isReadable($this->getSourcePath($path));
 	}
 
 	/**
@@ -169,7 +174,7 @@ public function isReadable($path) {
 	 * @return bool
 	 */
 	public function isUpdatable($path) {
-		return $this->storage->isUpdatable($this->getSourcePath($path));
+		return $this->getWrapperStorage()->isUpdatable($this->getSourcePath($path));
 	}
 
 	/**
@@ -179,7 +184,7 @@ public function isUpdatable($path) {
 	 * @return bool
 	 */
 	public function isDeletable($path) {
-		return $this->storage->isDeletable($this->getSourcePath($path));
+		return $this->getWrapperStorage()->isDeletable($this->getSourcePath($path));
 	}
 
 	/**
@@ -189,7 +194,7 @@ public function isDeletable($path) {
 	 * @return bool
 	 */
 	public function isSharable($path) {
-		return $this->storage->isSharable($this->getSourcePath($path));
+		return $this->getWrapperStorage()->isSharable($this->getSourcePath($path));
 	}
 
 	/**
@@ -200,7 +205,7 @@ public function isSharable($path) {
 	 * @return int
 	 */
 	public function getPermissions($path) {
-		return $this->storage->getPermissions($this->getSourcePath($path));
+		return $this->getWrapperStorage()->getPermissions($this->getSourcePath($path));
 	}
 
 	/**
@@ -210,7 +215,7 @@ public function getPermissions($path) {
 	 * @return bool
 	 */
 	public function file_exists($path) {
-		return $this->storage->file_exists($this->getSourcePath($path));
+		return $this->getWrapperStorage()->file_exists($this->getSourcePath($path));
 	}
 
 	/**
@@ -220,7 +225,7 @@ public function file_exists($path) {
 	 * @return int
 	 */
 	public function filemtime($path) {
-		return $this->storage->filemtime($this->getSourcePath($path));
+		return $this->getWrapperStorage()->filemtime($this->getSourcePath($path));
 	}
 
 	/**
@@ -230,7 +235,7 @@ public function filemtime($path) {
 	 * @return string
 	 */
 	public function file_get_contents($path) {
-		return $this->storage->file_get_contents($this->getSourcePath($path));
+		return $this->getWrapperStorage()->file_get_contents($this->getSourcePath($path));
 	}
 
 	/**
@@ -241,7 +246,7 @@ public function file_get_contents($path) {
 	 * @return bool
 	 */
 	public function file_put_contents($path, $data) {
-		return $this->storage->file_put_contents($this->getSourcePath($path), $data);
+		return $this->getWrapperStorage()->file_put_contents($this->getSourcePath($path), $data);
 	}
 
 	/**
@@ -251,7 +256,7 @@ public function file_put_contents($path, $data) {
 	 * @return bool
 	 */
 	public function unlink($path) {
-		return $this->storage->unlink($this->getSourcePath($path));
+		return $this->getWrapperStorage()->unlink($this->getSourcePath($path));
 	}
 
 	/**
@@ -262,7 +267,7 @@ public function unlink($path) {
 	 * @return bool
 	 */
 	public function rename($path1, $path2) {
-		return $this->storage->rename($this->getSourcePath($path1), $this->getSourcePath($path2));
+		return $this->getWrapperStorage()->rename($this->getSourcePath($path1), $this->getSourcePath($path2));
 	}
 
 	/**
@@ -273,7 +278,7 @@ public function rename($path1, $path2) {
 	 * @return bool
 	 */
 	public function copy($path1, $path2) {
-		return $this->storage->copy($this->getSourcePath($path1), $this->getSourcePath($path2));
+		return $this->getWrapperStorage()->copy($this->getSourcePath($path1), $this->getSourcePath($path2));
 	}
 
 	/**
@@ -284,7 +289,7 @@ public function copy($path1, $path2) {
 	 * @return resource
 	 */
 	public function fopen($path, $mode) {
-		return $this->storage->fopen($this->getSourcePath($path), $mode);
+		return $this->getWrapperStorage()->fopen($this->getSourcePath($path), $mode);
 	}
 
 	/**
@@ -295,7 +300,7 @@ public function fopen($path, $mode) {
 	 * @return string
 	 */
 	public function getMimeType($path) {
-		return $this->storage->getMimeType($this->getSourcePath($path));
+		return $this->getWrapperStorage()->getMimeType($this->getSourcePath($path));
 	}
 
 	/**
@@ -307,7 +312,7 @@ public function getMimeType($path) {
 	 * @return string
 	 */
 	public function hash($type, $path, $raw = false) {
-		return $this->storage->hash($type, $this->getSourcePath($path), $raw);
+		return $this->getWrapperStorage()->hash($type, $this->getSourcePath($path), $raw);
 	}
 
 	/**
@@ -317,7 +322,7 @@ public function hash($type, $path, $raw = false) {
 	 * @return int
 	 */
 	public function free_space($path) {
-		return $this->storage->free_space($this->getSourcePath($path));
+		return $this->getWrapperStorage()->free_space($this->getSourcePath($path));
 	}
 
 	/**
@@ -327,7 +332,7 @@ public function free_space($path) {
 	 * @return array
 	 */
 	public function search($query) {
-		return $this->storage->search($query);
+		return $this->getWrapperStorage()->search($query);
 	}
 
 	/**
@@ -339,7 +344,7 @@ public function search($query) {
 	 * @return bool
 	 */
 	public function touch($path, $mtime = null) {
-		return $this->storage->touch($this->getSourcePath($path), $mtime);
+		return $this->getWrapperStorage()->touch($this->getSourcePath($path), $mtime);
 	}
 
 	/**
@@ -350,7 +355,7 @@ public function touch($path, $mtime = null) {
 	 * @return string
 	 */
 	public function getLocalFile($path) {
-		return $this->storage->getLocalFile($this->getSourcePath($path));
+		return $this->getWrapperStorage()->getLocalFile($this->getSourcePath($path));
 	}
 
 	/**
@@ -364,7 +369,7 @@ public function getLocalFile($path) {
 	 * returning true for other changes in the folder is optional
 	 */
 	public function hasUpdated($path, $time) {
-		return $this->storage->hasUpdated($this->getSourcePath($path), $time);
+		return $this->getWrapperStorage()->hasUpdated($this->getSourcePath($path), $time);
 	}
 
 	/**
@@ -375,10 +380,13 @@ public function hasUpdated($path, $time) {
 	 * @return \OC\Files\Cache\Cache
 	 */
 	public function getCache($path = '', $storage = null) {
+		if ($this->rootPath === null) {
+			throw new \InvalidArgumentException('Jail rootPath is null');
+		}
 		if (!$storage) {
 			$storage = $this;
 		}
-		$sourceCache = $this->storage->getCache($this->getSourcePath($path), $storage);
+		$sourceCache = $this->getWrapperStorage()->getCache($this->getSourcePath($path), $storage);
 		return new CacheJail($sourceCache, $this->rootPath);
 	}
 
@@ -389,7 +397,7 @@ public function getCache($path = '', $storage = null) {
 	 * @return string
 	 */
 	public function getOwner($path) {
-		return $this->storage->getOwner($this->getSourcePath($path));
+		return $this->getWrapperStorage()->getOwner($this->getSourcePath($path));
 	}
 
 	/**
@@ -403,7 +411,7 @@ public function getWatcher($path = '', $storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
-		return $this->storage->getWatcher($this->getSourcePath($path), $storage);
+		return $this->getWrapperStorage()->getWatcher($this->getSourcePath($path), $storage);
 	}
 
 	/**
@@ -413,7 +421,7 @@ public function getWatcher($path = '', $storage = null) {
 	 * @return string
 	 */
 	public function getETag($path) {
-		return $this->storage->getETag($this->getSourcePath($path));
+		return $this->getWrapperStorage()->getETag($this->getSourcePath($path));
 	}
 
 	/**
@@ -421,7 +429,7 @@ public function getETag($path) {
 	 * @return array
 	 */
 	public function getMetaData($path) {
-		return $this->storage->getMetaData($this->getSourcePath($path));
+		return $this->getWrapperStorage()->getMetaData($this->getSourcePath($path));
 	}
 
 	/**
@@ -431,7 +439,7 @@ public function getMetaData($path) {
 	 * @throws \OCP\Lock\LockedException
 	 */
 	public function acquireLock($path, $type, ILockingProvider $provider) {
-		$this->storage->acquireLock($this->getSourcePath($path), $type, $provider);
+		$this->getWrapperStorage()->acquireLock($this->getSourcePath($path), $type, $provider);
 	}
 
 	/**
@@ -440,7 +448,7 @@ public function acquireLock($path, $type, ILockingProvider $provider) {
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 */
 	public function releaseLock($path, $type, ILockingProvider $provider) {
-		$this->storage->releaseLock($this->getSourcePath($path), $type, $provider);
+		$this->getWrapperStorage()->releaseLock($this->getSourcePath($path), $type, $provider);
 	}
 
 	/**
@@ -449,7 +457,7 @@ public function releaseLock($path, $type, ILockingProvider $provider) {
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 */
 	public function changeLock($path, $type, ILockingProvider $provider) {
-		$this->storage->changeLock($this->getSourcePath($path), $type, $provider);
+		$this->getWrapperStorage()->changeLock($this->getSourcePath($path), $type, $provider);
 	}
 
 	/**
@@ -459,7 +467,7 @@ public function changeLock($path, $type, ILockingProvider $provider) {
 	 * @return array
 	 */
 	public function resolvePath($path) {
-		return [$this->storage, $this->getSourcePath($path)];
+		return [$this->getWrapperStorage(), $this->getSourcePath($path)];
 	}
 
 	/**
@@ -472,7 +480,7 @@ public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceIntern
 		if ($sourceStorage === $this) {
 			return $this->copy($sourceInternalPath, $targetInternalPath);
 		}
-		return $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $this->getSourcePath($targetInternalPath));
+		return $this->getWrapperStorage()->copyFromStorage($sourceStorage, $sourceInternalPath, $this->getSourcePath($targetInternalPath));
 	}
 
 	/**
@@ -485,6 +493,6 @@ public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceIntern
 		if ($sourceStorage === $this) {
 			return $this->rename($sourceInternalPath, $targetInternalPath);
 		}
-		return $this->storage->moveFromStorage($sourceStorage, $sourceInternalPath, $this->getSourcePath($targetInternalPath));
+		return $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $this->getSourcePath($targetInternalPath));
 	}
 }
diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php
index 21d7db1099be..1e9e14129854 100644
--- a/lib/private/Files/Storage/Wrapper/Wrapper.php
+++ b/lib/private/Files/Storage/Wrapper/Wrapper.php
@@ -63,7 +63,7 @@ public function getWrapperStorage() {
 	 * @return string
 	 */
 	public function getId() {
-		return $this->storage->getId();
+		return $this->getWrapperStorage()->getId();
 	}
 
 	/**
@@ -73,7 +73,7 @@ public function getId() {
 	 * @return bool
 	 */
 	public function mkdir($path) {
-		return $this->storage->mkdir($path);
+		return $this->getWrapperStorage()->mkdir($path);
 	}
 
 	/**
@@ -83,7 +83,7 @@ public function mkdir($path) {
 	 * @return bool
 	 */
 	public function rmdir($path) {
-		return $this->storage->rmdir($path);
+		return $this->getWrapperStorage()->rmdir($path);
 	}
 
 	/**
@@ -93,7 +93,7 @@ public function rmdir($path) {
 	 * @return resource
 	 */
 	public function opendir($path) {
-		return $this->storage->opendir($path);
+		return $this->getWrapperStorage()->opendir($path);
 	}
 
 	/**
@@ -103,7 +103,7 @@ public function opendir($path) {
 	 * @return bool
 	 */
 	public function is_dir($path) {
-		return $this->storage->is_dir($path);
+		return $this->getWrapperStorage()->is_dir($path);
 	}
 
 	/**
@@ -113,7 +113,7 @@ public function is_dir($path) {
 	 * @return bool
 	 */
 	public function is_file($path) {
-		return $this->storage->is_file($path);
+		return $this->getWrapperStorage()->is_file($path);
 	}
 
 	/**
@@ -124,7 +124,7 @@ public function is_file($path) {
 	 * @return array
 	 */
 	public function stat($path) {
-		return $this->storage->stat($path);
+		return $this->getWrapperStorage()->stat($path);
 	}
 
 	/**
@@ -134,7 +134,7 @@ public function stat($path) {
 	 * @return bool
 	 */
 	public function filetype($path) {
-		return $this->storage->filetype($path);
+		return $this->getWrapperStorage()->filetype($path);
 	}
 
 	/**
@@ -145,7 +145,7 @@ public function filetype($path) {
 	 * @return int
 	 */
 	public function filesize($path) {
-		return $this->storage->filesize($path);
+		return $this->getWrapperStorage()->filesize($path);
 	}
 
 	/**
@@ -155,7 +155,7 @@ public function filesize($path) {
 	 * @return bool
 	 */
 	public function isCreatable($path) {
-		return $this->storage->isCreatable($path);
+		return $this->getWrapperStorage()->isCreatable($path);
 	}
 
 	/**
@@ -165,7 +165,7 @@ public function isCreatable($path) {
 	 * @return bool
 	 */
 	public function isReadable($path) {
-		return $this->storage->isReadable($path);
+		return $this->getWrapperStorage()->isReadable($path);
 	}
 
 	/**
@@ -175,7 +175,7 @@ public function isReadable($path) {
 	 * @return bool
 	 */
 	public function isUpdatable($path) {
-		return $this->storage->isUpdatable($path);
+		return $this->getWrapperStorage()->isUpdatable($path);
 	}
 
 	/**
@@ -185,7 +185,7 @@ public function isUpdatable($path) {
 	 * @return bool
 	 */
 	public function isDeletable($path) {
-		return $this->storage->isDeletable($path);
+		return $this->getWrapperStorage()->isDeletable($path);
 	}
 
 	/**
@@ -195,7 +195,7 @@ public function isDeletable($path) {
 	 * @return bool
 	 */
 	public function isSharable($path) {
-		return $this->storage->isSharable($path);
+		return $this->getWrapperStorage()->isSharable($path);
 	}
 
 	/**
@@ -206,7 +206,7 @@ public function isSharable($path) {
 	 * @return int
 	 */
 	public function getPermissions($path) {
-		return $this->storage->getPermissions($path);
+		return $this->getWrapperStorage()->getPermissions($path);
 	}
 
 	/**
@@ -216,7 +216,7 @@ public function getPermissions($path) {
 	 * @return bool
 	 */
 	public function file_exists($path) {
-		return $this->storage->file_exists($path);
+		return $this->getWrapperStorage()->file_exists($path);
 	}
 
 	/**
@@ -226,7 +226,7 @@ public function file_exists($path) {
 	 * @return int
 	 */
 	public function filemtime($path) {
-		return $this->storage->filemtime($path);
+		return $this->getWrapperStorage()->filemtime($path);
 	}
 
 	/**
@@ -236,7 +236,7 @@ public function filemtime($path) {
 	 * @return string
 	 */
 	public function file_get_contents($path) {
-		return $this->storage->file_get_contents($path);
+		return $this->getWrapperStorage()->file_get_contents($path);
 	}
 
 	/**
@@ -247,7 +247,7 @@ public function file_get_contents($path) {
 	 * @return bool
 	 */
 	public function file_put_contents($path, $data) {
-		return $this->storage->file_put_contents($path, $data);
+		return $this->getWrapperStorage()->file_put_contents($path, $data);
 	}
 
 	/**
@@ -257,7 +257,7 @@ public function file_put_contents($path, $data) {
 	 * @return bool
 	 */
 	public function unlink($path) {
-		return $this->storage->unlink($path);
+		return $this->getWrapperStorage()->unlink($path);
 	}
 
 	/**
@@ -268,7 +268,7 @@ public function unlink($path) {
 	 * @return bool
 	 */
 	public function rename($path1, $path2) {
-		return $this->storage->rename($path1, $path2);
+		return $this->getWrapperStorage()->rename($path1, $path2);
 	}
 
 	/**
@@ -279,7 +279,7 @@ public function rename($path1, $path2) {
 	 * @return bool
 	 */
 	public function copy($path1, $path2) {
-		return $this->storage->copy($path1, $path2);
+		return $this->getWrapperStorage()->copy($path1, $path2);
 	}
 
 	/**
@@ -290,7 +290,7 @@ public function copy($path1, $path2) {
 	 * @return resource
 	 */
 	public function fopen($path, $mode) {
-		return $this->storage->fopen($path, $mode);
+		return $this->getWrapperStorage()->fopen($path, $mode);
 	}
 
 	/**
@@ -301,7 +301,7 @@ public function fopen($path, $mode) {
 	 * @return string
 	 */
 	public function getMimeType($path) {
-		return $this->storage->getMimeType($path);
+		return $this->getWrapperStorage()->getMimeType($path);
 	}
 
 	/**
@@ -313,7 +313,7 @@ public function getMimeType($path) {
 	 * @return string
 	 */
 	public function hash($type, $path, $raw = false) {
-		return $this->storage->hash($type, $path, $raw);
+		return $this->getWrapperStorage()->hash($type, $path, $raw);
 	}
 
 	/**
@@ -323,7 +323,7 @@ public function hash($type, $path, $raw = false) {
 	 * @return int
 	 */
 	public function free_space($path) {
-		return $this->storage->free_space($path);
+		return $this->getWrapperStorage()->free_space($path);
 	}
 
 	/**
@@ -333,7 +333,7 @@ public function free_space($path) {
 	 * @return array
 	 */
 	public function search($query) {
-		return $this->storage->search($query);
+		return $this->getWrapperStorage()->search($query);
 	}
 
 	/**
@@ -345,7 +345,7 @@ public function search($query) {
 	 * @return bool
 	 */
 	public function touch($path, $mtime = null) {
-		return $this->storage->touch($path, $mtime);
+		return $this->getWrapperStorage()->touch($path, $mtime);
 	}
 
 	/**
@@ -356,7 +356,7 @@ public function touch($path, $mtime = null) {
 	 * @return string
 	 */
 	public function getLocalFile($path) {
-		return $this->storage->getLocalFile($path);
+		return $this->getWrapperStorage()->getLocalFile($path);
 	}
 
 	/**
@@ -370,7 +370,7 @@ public function getLocalFile($path) {
 	 * returning true for other changes in the folder is optional
 	 */
 	public function hasUpdated($path, $time) {
-		return $this->storage->hasUpdated($path, $time);
+		return $this->getWrapperStorage()->hasUpdated($path, $time);
 	}
 
 	/**
@@ -384,7 +384,7 @@ public function getCache($path = '', $storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
-		return $this->storage->getCache($path, $storage);
+		return $this->getWrapperStorage()->getCache($path, $storage);
 	}
 
 	/**
@@ -398,7 +398,7 @@ public function getScanner($path = '', $storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
-		return $this->storage->getScanner($path, $storage);
+		return $this->getWrapperStorage()->getScanner($path, $storage);
 	}
 
 
@@ -409,7 +409,7 @@ public function getScanner($path = '', $storage = null) {
 	 * @return string
 	 */
 	public function getOwner($path) {
-		return $this->storage->getOwner($path);
+		return $this->getWrapperStorage()->getOwner($path);
 	}
 
 	/**
@@ -423,28 +423,28 @@ public function getWatcher($path = '', $storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
-		return $this->storage->getWatcher($path, $storage);
+		return $this->getWrapperStorage()->getWatcher($path, $storage);
 	}
 
 	public function getPropagator($storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
-		return $this->storage->getPropagator($storage);
+		return $this->getWrapperStorage()->getPropagator($storage);
 	}
 
 	public function getUpdater($storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
-		return $this->storage->getUpdater($storage);
+		return $this->getWrapperStorage()->getUpdater($storage);
 	}
 
 	/**
 	 * @return \OC\Files\Cache\Storage
 	 */
 	public function getStorageCache() {
-		return $this->storage->getStorageCache();
+		return $this->getWrapperStorage()->getStorageCache();
 	}
 
 	/**
@@ -454,7 +454,7 @@ public function getStorageCache() {
 	 * @return string
 	 */
 	public function getETag($path) {
-		return $this->storage->getETag($path);
+		return $this->getWrapperStorage()->getETag($path);
 	}
 
 	/**
@@ -463,7 +463,7 @@ public function getETag($path) {
 	 * @return true
 	 */
 	public function test() {
-		return $this->storage->test();
+		return $this->getWrapperStorage()->test();
 	}
 
 	/**
@@ -472,7 +472,7 @@ public function test() {
 	 * @return bool wrapped storage's isLocal() value
 	 */
 	public function isLocal() {
-		return $this->storage->isLocal();
+		return $this->getWrapperStorage()->isLocal();
 	}
 
 	/**
@@ -482,7 +482,7 @@ public function isLocal() {
 	 * @return bool
 	 */
 	public function instanceOfStorage($class) {
-		return is_a($this, $class) or $this->storage->instanceOfStorage($class);
+		return is_a($this, $class) or $this->getWrapperStorage()->instanceOfStorage($class);
 	}
 
 	/**
@@ -493,7 +493,7 @@ public function instanceOfStorage($class) {
 	 * @return mixed
 	 */
 	public function __call($method, $args) {
-		return call_user_func_array(array($this->storage, $method), $args);
+		return call_user_func_array(array($this->getWrapperStorage(), $method), $args);
 	}
 
 	/**
@@ -505,7 +505,7 @@ public function __call($method, $args) {
 	 * @return array
 	 */
 	public function getDirectDownload($path) {
-		return $this->storage->getDirectDownload($path);
+		return $this->getWrapperStorage()->getDirectDownload($path);
 	}
 
 	/**
@@ -514,7 +514,7 @@ public function getDirectDownload($path) {
 	 * @return array [ available, last_checked ]
 	 */
 	public function getAvailability() {
-		return $this->storage->getAvailability();
+		return $this->getWrapperStorage()->getAvailability();
 	}
 
 	/**
@@ -523,7 +523,7 @@ public function getAvailability() {
 	 * @param bool $isAvailable
 	 */
 	public function setAvailability($isAvailable) {
-		$this->storage->setAvailability($isAvailable);
+		$this->getWrapperStorage()->setAvailability($isAvailable);
 	}
 
 	/**
@@ -533,7 +533,7 @@ public function setAvailability($isAvailable) {
 	 * @throws InvalidPathException
 	 */
 	public function verifyPath($path, $fileName) {
-		$this->storage->verifyPath($path, $fileName);
+		$this->getWrapperStorage()->verifyPath($path, $fileName);
 	}
 
 	/**
@@ -547,7 +547,7 @@ public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceIntern
 			return $this->copy($sourceInternalPath, $targetInternalPath);
 		}
 
-		return $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+		return $this->getWrapperStorage()->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
 	}
 
 	/**
@@ -561,7 +561,7 @@ public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceIntern
 			return $this->rename($sourceInternalPath, $targetInternalPath);
 		}
 
-		return $this->storage->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+		return $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
 	}
 
 	/**
@@ -569,7 +569,7 @@ public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceIntern
 	 * @return array
 	 */
 	public function getMetaData($path) {
-		return $this->storage->getMetaData($path);
+		return $this->getWrapperStorage()->getMetaData($path);
 	}
 
 	/**
@@ -579,8 +579,9 @@ public function getMetaData($path) {
 	 * @throws \OCP\Lock\LockedException
 	 */
 	public function acquireLock($path, $type, ILockingProvider $provider) {
-		if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
-			$this->storage->acquireLock($path, $type, $provider);
+		$storage = $this->getWrapperStorage();
+		if ($storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
+			$storage->acquireLock($path, $type, $provider);
 		}
 	}
 
@@ -590,8 +591,9 @@ public function acquireLock($path, $type, ILockingProvider $provider) {
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 */
 	public function releaseLock($path, $type, ILockingProvider $provider) {
-		if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
-			$this->storage->releaseLock($path, $type, $provider);
+		$storage = $this->getWrapperStorage();
+		if ($storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
+			$storage->releaseLock($path, $type, $provider);
 		}
 	}
 
@@ -601,8 +603,9 @@ public function releaseLock($path, $type, ILockingProvider $provider) {
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 */
 	public function changeLock($path, $type, ILockingProvider $provider) {
-		if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
-			$this->storage->changeLock($path, $type, $provider);
+		$storage = $this->getWrapperStorage();
+		if ($storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
+			$storage->changeLock($path, $type, $provider);
 		}
 	}
 }

From dc7d55c857707360d70fa013701424d3696af8ce Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 11 Aug 2016 10:45:05 +0200
Subject: [PATCH 053/219] Flag to not recurse into shared mounts in getPath

---
 apps/files_sharing/lib/sharedstorage.php | 2 +-
 lib/private/Files/View.php               | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 11b300196148..45d36ab4bf3d 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -95,7 +95,7 @@ private function init() {
 		$this->initialized = true;
 		try {
 			Filesystem::initMountPoints($this->superShare->getShareOwner());
-			$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId());
+			$sourcePath = $this->ownerView->getPath($this->superShare->getNodeId(), false);
 			list($this->sourceStorage, $sourceInternalPath) = $this->ownerView->resolvePath($sourcePath);
 			$this->sourceRootInfo = $this->sourceStorage->getCache()->get($sourceInternalPath);
 			// adjust jail
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 7d9771e6394d..f81e3b4ca7e9 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -61,6 +61,7 @@
 use OCP\IUser;
 use OCP\Lock\ILockingProvider;
 use OCP\Lock\LockedException;
+use OCA\Files_Sharing\SharedMount;
 
 /**
  * Class to provide access to ownCloud filesystem via a "view", and methods for
@@ -1669,10 +1670,11 @@ public function getETag($path) {
 	 * Note that the resulting path is not guarantied to be unique for the id, multiple paths can point to the same file
 	 *
 	 * @param int $id
+	 * @param bool $includeShares whether to recurse into shared mounts
 	 * @throws NotFoundException
 	 * @return string
 	 */
-	public function getPath($id) {
+	public function getPath($id, $includeShares = true) {
 		$id = (int)$id;
 		$manager = Filesystem::getMountManager();
 		$mounts = $manager->findIn($this->fakeRoot);
@@ -1684,6 +1686,11 @@ public function getPath($id) {
 			/**
 			 * @var \OC\Files\Mount\MountPoint $mount
 			 */
+			if (!$includeShares && $mount instanceof SharedMount) {
+				// prevent potential infinite loop when instantiating shared storages
+				// recursively
+				continue;
+			}
 			if ($mount->getStorage()) {
 				$cache = $mount->getStorage()->getCache();
 				$internalPath = $cache->getPathById($id);

From 837bf1c587b9ee55512390028cac9657cc0d81ea Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 11 Aug 2016 11:13:50 +0200
Subject: [PATCH 054/219] Use FailedStorage when share is invalid

---
 apps/files_sharing/lib/sharedstorage.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 45d36ab4bf3d..a25b328fcf06 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -37,6 +37,7 @@
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Storage\IStorage;
 use OCP\Lock\ILockingProvider;
+use OC\Files\Storage\FailedStorage;
 
 /**
  * Convert target path to source path and pass the function call to the correct storage provider
@@ -99,12 +100,13 @@ private function init() {
 			list($this->sourceStorage, $sourceInternalPath) = $this->ownerView->resolvePath($sourcePath);
 			$this->sourceRootInfo = $this->sourceStorage->getCache()->get($sourceInternalPath);
 			// adjust jail
-			$this->storage = $this->sourceStorage;
 			$this->rootPath = $sourceInternalPath;
 
 		} catch (\Exception $e) {
+			$this->sourceStorage = new FailedStorage(['exception' => $e]);
 			$this->logger->logException($e);
 		}
+		$this->storage = $this->sourceStorage;
 	}
 
 	/**
@@ -311,7 +313,7 @@ public function getItemType() {
 
 	public function getCache($path = '', $storage = null) {
 		$this->init();
-		if (is_null($this->sourceStorage)) {
+		if (is_null($this->sourceStorage) || $this->sourceStorage instanceof FailedStorage) {
 			return new FailedCache(false);
 		}
 		if (!$storage) {
@@ -439,5 +441,4 @@ public function getWrapperStorage() {
 
 		return $this->sourceStorage;
 	}
-
 }

From 5d6a2b8041d75a710c8878ec8ff49396ddbd687e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 16 Aug 2016 11:05:37 +0200
Subject: [PATCH 055/219] add conditional smb trace logging for debug purposes

---
 apps/files_external/lib/Lib/Storage/SMB.php | 278 +++++++++++++++-----
 1 file changed, 211 insertions(+), 67 deletions(-)

diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
index fce701821503..b92ea5930e6b 100644
--- a/apps/files_external/lib/Lib/Storage/SMB.php
+++ b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -11,7 +11,7 @@
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
- * @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
@@ -41,6 +41,7 @@
 use OC\Cache\CappedMemoryCache;
 use OC\Files\Filesystem;
 use OCP\Files\StorageNotAvailableException;
+use OCP\Util;
 
 class SMB extends \OC\Files\Storage\Common {
 	/**
@@ -64,6 +65,13 @@ class SMB extends \OC\Files\Storage\Common {
 	protected $statCache;
 
 	public function __construct($params) {
+		$loggedParams = $params;
+		// remove password from log if it is set
+		if (!empty($loggedParams['password'])) {
+			$loggedParams['password'] = '***removed***';
+		}
+		$this->log('enter: '.__FUNCTION__.'('.json_encode($loggedParams).')');
+
 		if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) {
 			if (Server::NativeAvailable()) {
 				$this->server = new NativeServer($params['host'], $params['user'], $params['password']);
@@ -80,9 +88,12 @@ public function __construct($params) {
 				$this->root .= '/';
 			}
 		} else {
-			throw new \Exception('Invalid configuration');
+			$ex = new \Exception('Invalid configuration');
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		}
 		$this->statCache = new CappedMemoryCache();
+		$this->log('leave: '.__FUNCTION__.', getId:'.$this->getId());
 	}
 
 	/**
@@ -100,7 +111,9 @@ public function getId() {
 	 * @return string
 	 */
 	protected function buildPath($path) {
-		return Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	/**
@@ -109,15 +122,23 @@ protected function buildPath($path) {
 	 * @throws StorageNotAvailableException
 	 */
 	protected function getFileInfo($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
 		try {
 			$path = $this->buildPath($path);
 			if (!isset($this->statCache[$path])) {
+				$this->log("stat fetching '{$this->root}$path'");
 				$this->statCache[$path] = $this->share->stat($path);
+			} else {
+				$this->log("stat cache hit for '$path'");
 			}
-			return $this->statCache[$path];
+			$result = $this->statCache[$path];
 		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+			$ex = new StorageNotAvailableException(
+				$e->getMessage(), $e->getCode(), $e);
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	/**
@@ -126,16 +147,20 @@ protected function getFileInfo($path) {
 	 * @throws StorageNotAvailableException
 	 */
 	protected function getFolderContents($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
 		try {
 			$path = $this->buildPath($path);
-			$files = $this->share->dir($path);
-			foreach ($files as $file) {
+			$result = $this->share->dir($path);
+			foreach ($result as $file) {
 				$this->statCache[$path . '/' . $file->getName()] = $file;
 			}
-			return $files;
 		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+			$ex = new StorageNotAvailableException(
+				$e->getMessage(), $e->getCode(), $e);
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	/**
@@ -154,50 +179,66 @@ protected function formatInfo($info) {
 	 * @return array
 	 */
 	public function stat($path) {
-		return $this->formatInfo($this->getFileInfo($path));
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = $this->formatInfo($this->getFileInfo($path));
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	/**
 	 * @param string $path
 	 * @return bool
+	 * @throws StorageNotAvailableException
 	 */
 	public function unlink($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = false;
 		try {
 			if ($this->is_dir($path)) {
-				return $this->rmdir($path);
+				$result = $this->rmdir($path);
 			} else {
 				$path = $this->buildPath($path);
 				unset($this->statCache[$path]);
 				$this->share->del($path);
-				return true;
+				$result = true;
 			}
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+			$ex = new StorageNotAvailableException(
+				$e->getMessage(), $e->getCode(), $e);
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	/**
 	 * @param string $path1 the old name
 	 * @param string $path2 the new name
 	 * @return bool
+	 * @throws StorageNotAvailableException
 	 */
 	public function rename($path1, $path2) {
+		$this->log('enter: '.__FUNCTION__."($path1, $path2)");
+		$result = false;
 		try {
 			$this->remove($path2);
 			$path1 = $this->buildPath($path1);
 			$path2 = $this->buildPath($path2);
-			return $this->share->rename($path1, $path2);
+			$result = $this->share->rename($path1, $path2);
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+			$ex = new StorageNotAvailableException(
+				$e->getMessage(), $e->getCode(), $e);
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	/**
@@ -208,37 +249,43 @@ public function rename($path1, $path2) {
 	 * @return bool
 	 */
 	public function hasUpdated($path, $time) {
+		$this->log('enter: '.__FUNCTION__."($path, $time)");
 		if (!$path and $this->root == '/') {
 			// mtime doesn't work for shares, but giving the nature of the backend,
 			// doing a full update is still just fast enough
-			return true;
+			$result = true;
 		} else {
 			$actualTime = $this->filemtime($path);
-			return $actualTime > $time;
+			$result = $actualTime > $time;
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	/**
 	 * @param string $path
 	 * @param string $mode
 	 * @return resource
+	 * @throws StorageNotAvailableException
 	 */
 	public function fopen($path, $mode) {
+		$this->log('enter: '.__FUNCTION__."($path, $mode)");
 		$fullPath = $this->buildPath($path);
+		$result = false;
 		try {
 			switch ($mode) {
 				case 'r':
 				case 'rb':
-					if (!$this->file_exists($path)) {
-						return false;
+					if ($this->file_exists($path)) {
+						$result = $this->share->read($fullPath);
 					}
-					return $this->share->read($fullPath);
+					break;
 				case 'w':
 				case 'wb':
 					$source = $this->share->write($fullPath);
-					return CallBackWrapper::wrap($source, null, null, function () use ($fullPath) {
+					$result = CallbackWrapper::wrap($source, null, null, function () use ($fullPath) {
 						unset($this->statCache[$fullPath]);
 					});
+					break;
 				case 'a':
 				case 'ab':
 				case 'r+':
@@ -257,34 +304,39 @@ public function fopen($path, $mode) {
 					}
 					if ($this->file_exists($path)) {
 						if (!$this->isUpdatable($path)) {
-							return false;
+							break;
 						}
 						$tmpFile = $this->getCachedFile($path);
 					} else {
 						if (!$this->isCreatable(dirname($path))) {
-							return false;
+							break;
 						}
 						$tmpFile = \OCP\Files::tmpFile($ext);
 					}
 					$source = fopen($tmpFile, $mode);
 					$share = $this->share;
-					return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) {
+					$result = CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) {
 						unset($this->statCache[$fullPath]);
 						$share->put($tmpFile, $fullPath);
 						unlink($tmpFile);
 					});
 			}
-			return false;
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+			$ex = new StorageNotAvailableException(
+				$e->getMessage(), $e->getCode(), $e);
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	public function rmdir($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = false;
 		try {
 			$this->statCache = array();
 			$content = $this->share->dir($this->buildPath($path));
@@ -296,112 +348,149 @@ public function rmdir($path) {
 				}
 			}
 			$this->share->rmdir($this->buildPath($path));
-			return true;
+			$result = true;
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+			$ex = new StorageNotAvailableException(
+				$e->getMessage(), $e->getCode(), $e);
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	public function touch($path, $time = null) {
+		$this->log('enter: '.__FUNCTION__."($path, $time)");
 		try {
 			if (!$this->file_exists($path)) {
 				$fh = $this->share->write($this->buildPath($path));
 				fclose($fh);
-				return true;
+				$result = true;
+			} else {
+				$result = false;
 			}
-			return false;
 		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+			$ex = new StorageNotAvailableException(
+				$e->getMessage(), $e->getCode(), $e);
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	public function opendir($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = false;
 		try {
 			$files = $this->getFolderContents($path);
+			$names = array_map(function ($info) {
+				/** @var \Icewind\SMB\IFileInfo $info */
+				return $info->getName();
+			}, $files);
+			$result = IteratorDirectory::wrap($names);
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		}
-		$names = array_map(function ($info) {
-			/** @var \Icewind\SMB\IFileInfo $info */
-			return $info->getName();
-		}, $files);
-		return IteratorDirectory::wrap($names);
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	public function filetype($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = false;
 		try {
-			return $this->getFileInfo($path)->isDirectory() ? 'dir' : 'file';
+			$result = $this->getFileInfo($path)->isDirectory() ? 'dir' : 'file';
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	public function mkdir($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = false;
 		$path = $this->buildPath($path);
 		try {
 			$this->share->mkdir($path);
-			return true;
+			$result = true;
 		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+			$ex = new StorageNotAvailableException(
+				$e->getMessage(), $e->getCode(), $e);
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		} catch (Exception $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	public function file_exists($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = false;
 		try {
 			$this->getFileInfo($path);
-			return true;
+			$result = true;
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+			$ex = new StorageNotAvailableException(
+				$e->getMessage(), $e->getCode(), $e);
+			$this->leave(__FUNCTION__, $ex);
+			throw $ex;
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	public function isReadable($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = false;
 		try {
 			$info = $this->getFileInfo($path);
-			return !$info->isHidden();
+			$result = !$info->isHidden();
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	public function isUpdatable($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = false;
 		try {
 			$info = $this->getFileInfo($path);
 			// following windows behaviour for read-only folders: they can be written into
 			// (https://support.microsoft.com/en-us/kb/326549 - "cause" section)
-			return !$info->isHidden() && (!$info->isReadOnly() || $this->is_dir($path));
+			$result = !$info->isHidden() && (!$info->isReadOnly() || $this->is_dir($path));
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	public function isDeletable($path) {
+		$this->log('enter: '.__FUNCTION__."($path)");
+		$result = false;
 		try {
 			$info = $this->getFileInfo($path);
-			return !$info->isHidden() && !$info->isReadOnly();
+			$result = !$info->isHidden() && !$info->isReadOnly();
 		} catch (NotFoundException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		} catch (ForbiddenException $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
 		}
+		return $this->leave(__FUNCTION__, $result);
 	}
 
 	/**
@@ -420,10 +509,65 @@ public static function checkDependencies() {
 	 * @return bool
 	 */
 	public function test() {
+		$this->log('enter: '.__FUNCTION__."()");
+		$result = false;
 		try {
-			return parent::test();
+			$result = parent::test();
 		} catch (Exception $e) {
-			return false;
+			$this->swallow(__FUNCTION__, $e);
+		}
+		return $this->leave(__FUNCTION__, $result);
+	}
+
+
+	/**
+	 * @param string $message
+	 * @param int $level
+	 * @param string $from
+	 */
+	private function log($message, $level = Util::DEBUG, $from = 'wnd') {
+		if (\OC::$server->getConfig()->getSystemValue('wnd.logging.enable', false) === true) {
+			Util::writeLog($from, $message, $level);
+		}
+	}
+
+	/**
+	 * if wnd.logging.enable is set to true in the config will log a leave line
+	 * with the given function, the return value or the exception
+	 *
+	 * @param $function
+	 * @param mixed $result an exception will be logged and then returned
+	 * @return mixed
+	 */
+	private function leave($function, $result) {
+		if (\OC::$server->getConfig()->getSystemValue('wnd.logging.enable', false) === false) {
+			//don't bother building log strings
+			return $result;
+		} else if ($result === true) {
+			Util::writeLog('wnd', "leave: $function, return true", Util::DEBUG);
+		} else if ($result === false) {
+			Util::writeLog('wnd', "leave: $function, return false", Util::DEBUG);
+		} else if (is_string($result)) {
+			Util::writeLog('wnd', "leave: $function, return '$result'", Util::DEBUG);
+		} else if (is_resource($result)) {
+			Util::writeLog('wnd', "leave: $function, return resource", Util::DEBUG);
+		} else if ($result instanceof \Exception) {
+			Util::writeLog('wnd', "leave: $function, throw ".get_class($result)
+				.' - code: '.$result->getCode()
+				.' message: '.$result->getMessage()
+				.' trace: '.$result->getTraceAsString(), Util::DEBUG);
+		} else {
+			Util::writeLog('wnd', "leave: $function, return ".json_encode($result), Util::DEBUG);
+		}
+		return $result;
+	}
+
+	private function swallow($function, \Exception $exception) {
+		if (\OC::$server->getConfig()->getSystemValue('wnd.logging.enable', false) === true) {
+			Util::writeLog('wnd', "$function swallowing ".get_class($exception)
+				.' - code: '.$exception->getCode()
+				.' message: '.$exception->getMessage()
+				.' trace: '.$exception->getTraceAsString(), Util::DEBUG);
 		}
 	}
 }

From 03a65e5e3a1100d8cbe0a8221c5d127cec30ca4a Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 12 Aug 2016 11:44:34 +0200
Subject: [PATCH 056/219] Improve file_target finding logic when repairing
 unmerged shares

Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
---
 lib/private/Repair/RepairUnmergedShares.php   | 40 ++++++++++-
 tests/lib/Repair/RepairUnmergedSharesTest.php | 66 ++++++++++++++++---
 2 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/lib/private/Repair/RepairUnmergedShares.php b/lib/private/Repair/RepairUnmergedShares.php
index 353877bb8737..f14e98c17619 100644
--- a/lib/private/Repair/RepairUnmergedShares.php
+++ b/lib/private/Repair/RepairUnmergedShares.php
@@ -148,6 +148,44 @@ private function getSharesWithUser($shareType, $shareWiths) {
 		return $groupedShares;
 	}
 
+	/**
+	 * Decide on the best target name based on all group shares and subshares,
+	 * goal is to increase the likeliness that the chosen name matches what
+	 * the user is expecting.
+	 *
+	 * For this, we discard the entries with parenthesis "(2)".
+	 * In case the user also renamed the duplicates to a legitimate name, this logic
+	 * will still pick the most recent one as it's the one the user is most likely to
+	 * remember renaming.
+	 *
+	 * If no suitable subshare is found, use the least recent group share instead.
+	 *
+	 * @param array $groupShares group share entries
+	 * @param array $subShares sub share entries, sorted by stime
+	 *
+	 * @return string chosen target name
+	 */
+	private function findBestTargetName($groupShares, $subShares) {
+		$pickedShare = null;
+		// note subShares are sorted by stime from oldest to newest
+		foreach ($subShares as $subShare) {
+			// skip entries that have parenthesis with numbers
+			if (preg_match('/\([0-9]*\)/', $subShare['file_target']) === 1) {
+				continue;
+			}
+			// pick any share found that would match, the last being the most recent
+			$pickedShare = $subShare;
+		}
+
+		// no suitable subshare found
+		if ($pickedShare === null) {
+			// use least recent group share target instead
+			$pickedShare = $groupShares[0];
+		}
+
+		return $pickedShare['file_target'];
+	}
+
 	/**
 	 * Fix the given received share represented by the set of group shares
 	 * and matching sub shares
@@ -171,7 +209,7 @@ private function fixThisShare($groupShares, $subShares) {
 			return false;
 		}
 
-		$targetPath = $groupShares[0]['file_target'];
+		$targetPath = $this->findBestTargetName($groupShares, $subShares);
 
 		// check whether the user opted out completely of all subshares
 		$optedOut = true;
diff --git a/tests/lib/Repair/RepairUnmergedSharesTest.php b/tests/lib/Repair/RepairUnmergedSharesTest.php
index fe9b3e5b96f3..9fe9a0738810 100644
--- a/tests/lib/Repair/RepairUnmergedSharesTest.php
+++ b/tests/lib/Repair/RepairUnmergedSharesTest.php
@@ -204,7 +204,7 @@ public function sharesDataProvider() {
 			[
 				// #2 bogus share
 				// - outsider shares with group1, group2
-				// - one subshare for each group share
+				// - one subshare for each group share, both with parenthesis
 				// - but the targets do not match when grouped
 				[
 					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
@@ -218,7 +218,7 @@ public function sharesDataProvider() {
 				[
 					['/test', 31],
 					['/test', 31],
-					// reset to original name
+					// reset to original name as the sub-names have parenthesis
 					['/test', 31],
 					['/test', 31],
 					// leave unrelated alone
@@ -228,6 +228,54 @@ public function sharesDataProvider() {
 			[
 				// #3 bogus share
 				// - outsider shares with group1, group2
+				// - one subshare for each group share, both renamed manually
+				// - but the targets do not match when grouped
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 31],
+					// child of the previous ones
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test_renamed (1 legit paren)', 31, 0],
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test_renamed (2 legit paren)', 31, 1],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					['/test', 31],
+					['/test', 31],
+					// reset to less recent subshare name
+					['/test_renamed (2 legit paren)', 31],
+					['/test_renamed (2 legit paren)', 31],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #4 bogus share
+				// - outsider shares with group1, group2
+				// - one subshare for each group share, one with parenthesis
+				// - but the targets do not match when grouped
+				[
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 31],
+					// child of the previous ones
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test (2)', 31, 0],
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/test_renamed', 31, 1],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (4)', 31],
+				],
+				[
+					['/test', 31],
+					['/test', 31],
+					// reset to less recent subshare name but without parenthesis
+					['/test_renamed', 31],
+					['/test_renamed', 31],
+					// leave unrelated alone
+					['/test (4)', 31],
+				]
+			],
+			[
+				// #5 bogus share
+				// - outsider shares with group1, group2
 				// - one subshare for each group share
 				// - first subshare not renamed (as in real world scenario)
 				// - but the targets do not match when grouped
@@ -251,7 +299,7 @@ public function sharesDataProvider() {
 				]
 			],
 			[
-				// #4 bogus share:
+				// #6 bogus share:
 				// - outsider shares with group1, group2
 				// - one subshare for each group share
 				// - non-matching targets
@@ -276,7 +324,7 @@ public function sharesDataProvider() {
 				]
 			],
 			[
-				// #5 bogus share:
+				// #7 bogus share:
 				// - outsider shares with group1, group2
 				// - one subshare for each group share
 				// - non-matching targets
@@ -301,7 +349,7 @@ public function sharesDataProvider() {
 				]
 			],
 			[
-				// #6 bogus share:
+				// #8 bogus share:
 				// - outsider shares with group1, group2 and also user2
 				// - one subshare for each group share
 				// - one extra share entry for direct share to user2
@@ -329,7 +377,7 @@ public function sharesDataProvider() {
 				]
 			],
 			[
-				// #7 bogus share:
+				// #9 bogus share:
 				// - outsider shares with group1 and also user2
 				// - no subshare at all
 				// - one extra share entry for direct share to user2
@@ -350,7 +398,7 @@ public function sharesDataProvider() {
 				]
 			],
 			[
-				// #8 legitimate share with own group:
+				// #10 legitimate share with own group:
 				// - insider shares with both groups the user is already in
 				// - no subshares in this case
 				[
@@ -368,7 +416,7 @@ public function sharesDataProvider() {
 				]
 			],
 			[
-				// #9 legitimate shares:
+				// #11 legitimate shares:
 				// - group share with same group
 				// - group share with other group
 				// - user share where recipient renamed
@@ -392,7 +440,7 @@ public function sharesDataProvider() {
 				]
 			],
 			[
-				// #10 legitimate share:
+				// #12 legitimate share:
 				// - outsider shares with group and user directly with different permissions
 				// - no subshares
 				// - same targets

From 8cca3641603d755ed2da6e4be5fc4748f591e9e2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 12 Aug 2016 12:06:57 +0200
Subject: [PATCH 057/219] Fix unmerged shares repair with mixed group and
 direct shares

Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
---
 lib/private/Repair/RepairUnmergedShares.php   | 16 +++++--
 tests/lib/Repair/RepairUnmergedSharesTest.php | 45 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/lib/private/Repair/RepairUnmergedShares.php b/lib/private/Repair/RepairUnmergedShares.php
index f14e98c17619..c29de87c4e8a 100644
--- a/lib/private/Repair/RepairUnmergedShares.php
+++ b/lib/private/Repair/RepairUnmergedShares.php
@@ -93,7 +93,7 @@ private function buildPreparedQueries() {
 		 */
 		$query = $this->connection->getQueryBuilder();
 		$query
-			->select('item_source', 'id', 'file_target', 'permissions', 'parent', 'share_type')
+			->select('item_source', 'id', 'file_target', 'permissions', 'parent', 'share_type', 'stime')
 			->from('share')
 			->where($query->expr()->eq('share_type', $query->createParameter('shareType')))
 			->andWhere($query->expr()->in('share_with', $query->createParameter('shareWiths')))
@@ -161,13 +161,23 @@ private function getSharesWithUser($shareType, $shareWiths) {
 	 * If no suitable subshare is found, use the least recent group share instead.
 	 *
 	 * @param array $groupShares group share entries
-	 * @param array $subShares sub share entries, sorted by stime
+	 * @param array $subShares sub share entries
 	 *
 	 * @return string chosen target name
 	 */
 	private function findBestTargetName($groupShares, $subShares) {
 		$pickedShare = null;
-		// note subShares are sorted by stime from oldest to newest
+		// sort by stime, this also properly sorts the direct user share if any
+		@usort($subShares, function($a, $b) {
+			if ($a['stime'] < $b['stime']) {
+				return -1;
+			} else if ($a['stime'] > $b['stime']) {
+				return 1;
+			}
+
+			return 0;
+		});
+
 		foreach ($subShares as $subShare) {
 			// skip entries that have parenthesis with numbers
 			if (preg_match('/\([0-9]*\)/', $subShare['file_target']) === 1) {
diff --git a/tests/lib/Repair/RepairUnmergedSharesTest.php b/tests/lib/Repair/RepairUnmergedSharesTest.php
index 9fe9a0738810..7304bfd69208 100644
--- a/tests/lib/Repair/RepairUnmergedSharesTest.php
+++ b/tests/lib/Repair/RepairUnmergedSharesTest.php
@@ -44,6 +44,9 @@ class RepairUnmergedSharesTest extends TestCase {
 	/** @var \OCP\IDBConnection */
 	private $connection;
 
+	/** @var int */
+	private $lastShareTime;
+
 	protected function setUp() {
 		parent::setUp();
 
@@ -92,6 +95,9 @@ protected function setUp() {
 				}
 			}));
 
+		// used to generate incremental stimes
+		$this->lastShareTime = time();
+
 		/** @var \OCP\IConfig $config */
 		$this->repair = new RepairUnmergedShares($config, $this->connection, $userManager, $groupManager);
 	}
@@ -108,6 +114,7 @@ protected function deleteAllShares() {
 	}
 
 	private function createShare($type, $sourceId, $recipient, $targetName, $permissions, $parentId = null) {
+		$this->lastShareTime += 100;
 		$qb = $this->connection->getQueryBuilder();
 		$values = [
 			'share_type' => $qb->expr()->literal($type),
@@ -119,7 +126,7 @@ private function createShare($type, $sourceId, $recipient, $targetName, $permiss
 			'file_source' => $qb->expr()->literal($sourceId),
 			'file_target' => $qb->expr()->literal($targetName),
 			'permissions' => $qb->expr()->literal($permissions),
-			'stime' => $qb->expr()->literal(time()),
+			'stime' => $qb->expr()->literal($this->lastShareTime),
 		];
 		if ($parentId !== null) {
 			$values['parent'] = $qb->expr()->literal($parentId);
@@ -458,6 +465,42 @@ public function sharesDataProvider() {
 					['/test (4)', 31],
 				]
 			],
+			[
+				// #13 bogus share:
+				// - outsider shares with group1, user2 and then group2
+				// - user renamed share as soon as it arrived before the next share (order)
+				// - one subshare for each group share
+				// - one extra share entry for direct share to user2
+				// - non-matching targets
+				[
+					// first share with group
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup1', '/test', 31],
+					// recipient renames
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/first', 31, 0],
+					// then direct share, user renames too
+					[Constants::SHARE_TYPE_USER, 123, 'user2', '/second', 31],
+					// another share with the second group
+					[Constants::SHARE_TYPE_GROUP, 123, 'recipientgroup2', '/test', 31],
+					// use renames it
+					[DefaultShareProvider::SHARE_TYPE_USERGROUP, 123, 'user2', '/third', 31, 1],
+					// different unrelated share
+					[Constants::SHARE_TYPE_GROUP, 456, 'recipientgroup1', '/test (5)', 31],
+				],
+				[
+					// group share with group1 left alone
+					['/test', 31],
+					// first subshare repaired
+					['/third', 31],
+					// direct user share repaired
+					['/third', 31],
+					// group share with group2 left alone
+					['/test', 31],
+					// second subshare repaired
+					['/third', 31],
+					// leave unrelated alone
+					['/test (5)', 31],
+				]
+			],
 		];
 	}
 

From 22d20833b59cdb62774524c2c7562f7aa4fbf3c2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 16 Aug 2016 15:44:26 +0200
Subject: [PATCH 058/219] Disable NFD encoding wrapper by default

Seems I forgot to set it back to false after testing.
Will give a performance boost for all storages.
---
 lib/private/legacy/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index 06cd1bee4cec..afd14f626e24 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -172,7 +172,7 @@ public static function setupFS($user = '') {
 		});
 
 		\OC\Files\Filesystem::addStorageWrapper('oc_encoding', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
-			if ($mount->getOption('encoding_compatibility', true) && !$storage->instanceOfStorage('\OC\Files\Storage\Shared') && !$storage->isLocal()) {
+			if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OC\Files\Storage\Shared') && !$storage->isLocal()) {
 				return new \OC\Files\Storage\Wrapper\Encoding(['storage' => $storage]);
 			}
 			return $storage;

From 35f9a562dfdf94a62977d4b7bef006f463abe7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 17 Aug 2016 11:14:57 +0200
Subject: [PATCH 059/219] 204 and 304 must not have a body, see
 https://tools.ietf.org/html/rfc7230#section-3.3

---
 lib/public/AppFramework/Http/JSONResponse.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/public/AppFramework/Http/JSONResponse.php b/lib/public/AppFramework/Http/JSONResponse.php
index 32f2947b4be9..618b7c5ef21a 100644
--- a/lib/public/AppFramework/Http/JSONResponse.php
+++ b/lib/public/AppFramework/Http/JSONResponse.php
@@ -60,15 +60,21 @@ public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
 
 	/**
 	 * Returns the rendered json
-	 * @return string the rendered json
+	 * @return string|null the rendered json
 	 * @since 6.0.0
 	 * @throws \Exception If data could not get encoded
 	 */
 	public function render() {
-		$response = json_encode($this->data, JSON_HEX_TAG);
-		if($response === false) {
-			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
-				'non UTF-8 characters in the array: %s', var_export($this->data, true)));
+		if ($this->getStatus() === Http::STATUS_NO_CONTENT
+			|| $this->getStatus() === Http::STATUS_NOT_MODIFIED
+		) {
+			$response = null;
+		} else {
+			$response = json_encode($this->data, JSON_HEX_TAG);
+			if ($response === false) {
+				throw new \Exception(sprintf('Could not json_encode due to invalid ' .
+					'non UTF-8 characters in the array: %s', var_export($this->data, true)));
+			}
 		}
 
 		return $response;

From aea66fabf41399044328d3f02921911e3f764813 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 17 Aug 2016 09:58:53 +0200
Subject: [PATCH 060/219] Improve regexp to detect duplicate folders when
 repairing unmerged shares

---
 lib/private/Repair/RepairUnmergedShares.php   |  14 ++-
 tests/lib/Repair/RepairUnmergedSharesTest.php | 102 ++++++++++++------
 2 files changed, 74 insertions(+), 42 deletions(-)

diff --git a/lib/private/Repair/RepairUnmergedShares.php b/lib/private/Repair/RepairUnmergedShares.php
index c29de87c4e8a..d57bc3779f85 100644
--- a/lib/private/Repair/RepairUnmergedShares.php
+++ b/lib/private/Repair/RepairUnmergedShares.php
@@ -148,6 +148,10 @@ private function getSharesWithUser($shareType, $shareWiths) {
 		return $groupedShares;
 	}
 
+	private function isPotentialDuplicateName($name) {
+		return (preg_match('/\(\d+\)(\.[^\.]+)?$/', $name) === 1);
+	}
+
 	/**
 	 * Decide on the best target name based on all group shares and subshares,
 	 * goal is to increase the likeliness that the chosen name matches what
@@ -169,18 +173,12 @@ private function findBestTargetName($groupShares, $subShares) {
 		$pickedShare = null;
 		// sort by stime, this also properly sorts the direct user share if any
 		@usort($subShares, function($a, $b) {
-			if ($a['stime'] < $b['stime']) {
-				return -1;
-			} else if ($a['stime'] > $b['stime']) {
-				return 1;
-			}
-
-			return 0;
+			return ((int)$a['stime'] - (int)$b['stime']);
 		});
 
 		foreach ($subShares as $subShare) {
 			// skip entries that have parenthesis with numbers
-			if (preg_match('/\([0-9]*\)/', $subShare['file_target']) === 1) {
+			if ($this->isPotentialDuplicateName($subShare['file_target'])) {
 				continue;
 			}
 			// pick any share found that would match, the last being the most recent
diff --git a/tests/lib/Repair/RepairUnmergedSharesTest.php b/tests/lib/Repair/RepairUnmergedSharesTest.php
index 7304bfd69208..7b9d25793890 100644
--- a/tests/lib/Repair/RepairUnmergedSharesTest.php
+++ b/tests/lib/Repair/RepairUnmergedSharesTest.php
@@ -28,6 +28,8 @@
 use OCP\Migration\IRepairStep;
 use Test\TestCase;
 use OC\Share20\DefaultShareProvider;
+use OCP\IUserManager;
+use OCP\IGroupManager;
 
 /**
  * Tests for repairing invalid shares
@@ -47,6 +49,12 @@ class RepairUnmergedSharesTest extends TestCase {
 	/** @var int */
 	private $lastShareTime;
 
+	/** @var IUserManager */
+	private $userManager;
+
+	/** @var IGroupManager */
+	private $groupManager;
+
 	protected function setUp() {
 		parent::setUp();
 
@@ -61,45 +69,14 @@ protected function setUp() {
 		$this->connection = \OC::$server->getDatabaseConnection();
 		$this->deleteAllShares();
 
-		$user1 = $this->getMock('\OCP\IUser');
-		$user1->expects($this->any())
-			->method('getUID')
-			->will($this->returnValue('user1'));
-
-		$user2 = $this->getMock('\OCP\IUser');
-		$user2->expects($this->any())
-			->method('getUID')
-			->will($this->returnValue('user2'));
-
-		$users = [$user1, $user2];
-
-		$groupManager = $this->getMock('\OCP\IGroupManager');
-		$groupManager->expects($this->any())
-			->method('getUserGroupIds')
-			->will($this->returnValueMap([
-				// owner
-				[$user1, ['samegroup1', 'samegroup2']],
-				// recipient
-				[$user2, ['recipientgroup1', 'recipientgroup2']],
-			]));
-
-		$userManager = $this->getMock('\OCP\IUserManager');
-		$userManager->expects($this->once())
-			->method('countUsers')
-			->will($this->returnValue([2]));
-		$userManager->expects($this->once())
-			->method('callForAllUsers')
-			->will($this->returnCallback(function(\Closure $closure) use ($users) {
-				foreach ($users as $user) {
-					$closure($user);
-				}
-			}));
+		$this->userManager = $this->getMock('\OCP\IUserManager');
+		$this->groupManager = $this->getMock('\OCP\IGroupManager');
 
 		// used to generate incremental stimes
 		$this->lastShareTime = time();
 
 		/** @var \OCP\IConfig $config */
-		$this->repair = new RepairUnmergedShares($config, $this->connection, $userManager, $groupManager);
+		$this->repair = new RepairUnmergedShares($config, $this->connection, $this->userManager, $this->groupManager);
 	}
 
 	protected function tearDown() {
@@ -510,6 +487,38 @@ public function sharesDataProvider() {
 	 * @dataProvider sharesDataProvider
 	 */
 	public function testMergeGroupShares($shares, $expectedShares) {
+		$user1 = $this->getMock('\OCP\IUser');
+		$user1->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('user1'));
+
+		$user2 = $this->getMock('\OCP\IUser');
+		$user2->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('user2'));
+
+		$users = [$user1, $user2];
+
+		$this->groupManager->expects($this->any())
+			->method('getUserGroupIds')
+			->will($this->returnValueMap([
+				// owner
+				[$user1, ['samegroup1', 'samegroup2']],
+				// recipient
+				[$user2, ['recipientgroup1', 'recipientgroup2']],
+			]));
+
+		$this->userManager->expects($this->once())
+			->method('countUsers')
+			->will($this->returnValue([2]));
+		$this->userManager->expects($this->once())
+			->method('callForAllUsers')
+			->will($this->returnCallback(function(\Closure $closure) use ($users) {
+				foreach ($users as $user) {
+					$closure($user);
+				}
+			}));
+
 		$shareIds = [];
 
 		foreach ($shares as $share) {
@@ -536,5 +545,30 @@ public function testMergeGroupShares($shares, $expectedShares) {
 			$this->assertEquals($expectedShare[1], $share['permissions']);
 		}
 	}
+
+	public function duplicateNamesProvider() {
+		return [
+			// matching
+			['filename (1).txt', true],
+			['folder (2)', true],
+			['filename (1)(2).txt', true],
+			// non-matching
+			['filename ().txt', false],
+			['folder ()', false],
+			['folder (1x)', false],
+			['folder (x1)', false],
+			['filename (a)', false],
+			['filename (1).', false],
+			['filename (1).txt.txt', false],
+			['filename (1)..txt', false],
+		];
+	}
+
+	/**
+	 * @dataProvider duplicateNamesProvider
+	 */
+	public function testIsPotentialDuplicateName($name, $expectedResult) {
+		$this->assertEquals($expectedResult, $this->invokePrivate($this->repair, 'isPotentialDuplicateName', [$name]));
+	}
 }
 

From c687c89354fc17730433f77b8f469bca659263a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 17 Aug 2016 17:09:23 +0200
Subject: [PATCH 061/219] remove reference magic

---
 apps/files_external/lib/config.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 3510b675d4d3..3af3dc6a7fb3 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -193,9 +193,9 @@ private static function prepareMountPointEntry(StorageConfig $storage, $isPerson
 	 */
 	public static function setUserVars($user, $input) {
 		if (is_array($input)) {
-			foreach ($input as &$value) {
+			foreach ($input as $key => $value) {
 				if (is_string($value)) {
-					$value = str_replace('$user', $user, $value);
+					$input[$key] = str_replace('$user', $user, $value);
 				}
 			}
 		} else {
@@ -219,8 +219,8 @@ public static function getBackendStatus($class, $options, $isPersonal, $testOnly
 		if (self::$skipTest) {
 			return StorageNotAvailableException::STATUS_SUCCESS;
 		}
-		foreach ($options as &$option) {
-			$option = self::setUserVars(OCP\User::getUser(), $option);
+		foreach ($options as $key => $option) {
+			$option[$key] = self::setUserVars(OCP\User::getUser(), $option);
 		}
 		if (class_exists($class)) {
 			try {

From 9bbf347e58c951a2624012119467bf2e6d2e65aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 18 Aug 2016 10:51:32 +0200
Subject: [PATCH 062/219] fix typo

---
 apps/files_external/lib/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 3af3dc6a7fb3..8047f5c1ddb1 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -220,7 +220,7 @@ public static function getBackendStatus($class, $options, $isPersonal, $testOnly
 			return StorageNotAvailableException::STATUS_SUCCESS;
 		}
 		foreach ($options as $key => $option) {
-			$option[$key] = self::setUserVars(OCP\User::getUser(), $option);
+			$options[$key] = self::setUserVars(OCP\User::getUser(), $option);
 		}
 		if (class_exists($class)) {
 			try {

From fb9576df9e9ce3cb1d67e40a95f614c4c8dc6510 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 18 Aug 2016 12:00:52 +0200
Subject: [PATCH 063/219] [stable9.1] Dont decrypt shared files (#25831)

* Take from https://github.com/nextcloud/server/pull/608/commits/351cab6bce41b53f9efd4ba9aed4e7435f843691 - THX @schiessle

* Fix unit tests
---
 lib/private/Encryption/DecryptAll.php   |  4 ++++
 tests/lib/Encryption/DecryptAllTest.php | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php
index 34a3e1bff911..376cdd3d5aa9 100644
--- a/lib/private/Encryption/DecryptAll.php
+++ b/lib/private/Encryption/DecryptAll.php
@@ -206,6 +206,10 @@ protected function decryptUsersFiles($uid, ProgressBar $progress, $userCount) {
 		while ($root = array_pop($directories)) {
 			$content = $this->rootView->getDirectoryContent($root);
 			foreach ($content as $file) {
+				// only decrypt files owned by the user
+				if($file->getStorage()->instanceOfStorage('OC\Files\Storage\Shared')) {
+						continue;
+				}
 				$path = $root . '/' . $file['name'];
 				if ($this->rootView->is_dir($path)) {
 					$directories[] = $path;
diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php
index d7cf2fb7baf7..3f7cb59c8f48 100644
--- a/tests/lib/Encryption/DecryptAllTest.php
+++ b/tests/lib/Encryption/DecryptAllTest.php
@@ -239,6 +239,10 @@ public function dataTestDecryptAllUsersFiles() {
 	}
 
 	public function testDecryptUsersFiles() {
+		$storage = $this->getMockBuilder('OC\Files\Storage\Shared')
+			->disableOriginalConstructor()
+			->getMock();
+
 		/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject  $instance */
 		$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
 			->setConstructorArgs(
@@ -254,15 +258,15 @@ public function testDecryptUsersFiles() {
 		$this->view->expects($this->at(0))->method('getDirectoryContent')
 			->with('/user1/files')->willReturn(
 				[
-					new FileInfo('path', null, 'intPath', ['name' => 'foo', 'type'=>'dir'], null),
-					new FileInfo('path', null, 'intPath', ['name' => 'bar', 'type'=>'file', 'encrypted'=>true], null)
+					new FileInfo('path', $storage, 'intPath', ['name' => 'foo', 'type'=>'dir'], null),
+					new FileInfo('path', $storage, 'intPath', ['name' => 'bar', 'type'=>'file', 'encrypted'=>true], null)
 				]
 			);
 
 		$this->view->expects($this->at(3))->method('getDirectoryContent')
 			->with('/user1/files/foo')->willReturn(
 				[
-					new FileInfo('path', null, 'intPath', ['name' => 'subfile', 'type'=>'file', 'encrypted'=>true], null)
+					new FileInfo('path', $storage, 'intPath', ['name' => 'subfile', 'type'=>'file', 'encrypted'=>true], null)
 				]
 			);
 

From 3737f5ad80f69dcc6cc22d553472c774ece94734 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Thu, 18 Aug 2016 13:16:34 +0200
Subject: [PATCH 064/219] ownCloud Server 9.1.1 RC1

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index ea52cf12c1a7..623ca94150a9 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 0, 16);
+$OC_Version = array(9, 1, 1, 0);
 
 // The human readable string
-$OC_VersionString = '9.1.0';
+$OC_VersionString = '9.1.0 RC1';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From 8b9536c22bc4f1a9d6b810177e9e965e51e89087 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Thu, 18 Aug 2016 13:20:29 +0200
Subject: [PATCH 065/219] correct version string to 9.1.1 RC1

---
 version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.php b/version.php
index 623ca94150a9..3695782a8e63 100644
--- a/version.php
+++ b/version.php
@@ -28,7 +28,7 @@
 $OC_Version = array(9, 1, 1, 0);
 
 // The human readable string
-$OC_VersionString = '9.1.0 RC1';
+$OC_VersionString = '9.1.1 RC1';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From 554e96cb1c69ba40df9f26d7dc7c413535a53199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 11 Aug 2016 10:11:24 +0200
Subject: [PATCH 066/219] [stable9.1] In cases where the server dictates the
 link share expiration the date is not updated on consequitive changes and
 enable/disable actions

---
 core/js/sharedialogexpirationview.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index fa5c0c009869..44856b2219b8 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -93,6 +93,7 @@
 			this.$el.find('.expirationDateContainer').toggleClass('hidden', !state);
 			if (!state) {
 				// discard expiration date
+				this.model.get('linkShare').expiration = '';
 				this.model.saveLinkShare({
 					expireDate: ''
 				});
@@ -104,8 +105,10 @@
 			$target.tooltip('hide');
 			$target.removeClass('error');
 
+			expiration = moment($target.val(), 'DD-MM-YYYY').format('YYYY-MM-DD');
+			this.model.get('linkShare').expiration = expiration;
 			this.model.saveLinkShare({
-				expiration: moment($target.val(), 'DD-MM-YYYY').format('YYYY-MM-DD')
+				expiration: expiration
 			}, {
 				error: function(model, message) {
 					if (!message) {

From c058e9456c3ae6edc4e3b6e273faf045e79230b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Fri, 19 Aug 2016 10:30:16 +0200
Subject: [PATCH 067/219] [stable9.1] Move over to new CalDAVTester repo
 (#25859) (#25863)

* Move over to new caldac tester repo

* no run.py anymore
---
 apps/dav/tests/travis/caldav/install.sh  | 12 ++++++------
 apps/dav/tests/travis/carddav/install.sh | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/dav/tests/travis/caldav/install.sh b/apps/dav/tests/travis/caldav/install.sh
index 9688ec660de1..e0ac30c9e46b 100644
--- a/apps/dav/tests/travis/caldav/install.sh
+++ b/apps/dav/tests/travis/caldav/install.sh
@@ -3,12 +3,12 @@ SCRIPT=`realpath $0`
 SCRIPTPATH=`dirname $SCRIPT`
 
 
-if [ ! -f CalDAVTester/run.py ]; then
-	cd "$SCRIPTPATH"
-    git clone https://github.com/DeepDiver1975/CalDAVTester.git
-	cd "$SCRIPTPATH/CalDAVTester"
-    python run.py -s
-	cd "$SCRIPTPATH"
+cd "$SCRIPTPATH"
+if [ ! -f CalDAVTester/testcaldav.py ]; then
+    git clone https://github.com/apple/ccs-caldavtester.git CalDAVTester
+fi
+if [ ! -f pycalendar/setup.py ]; then
+    git clone https://github.com/apple/ccs-pycalendar.git pycalendar
 fi
 
 # create test user
diff --git a/apps/dav/tests/travis/carddav/install.sh b/apps/dav/tests/travis/carddav/install.sh
index fa5d141ce0dc..db8b53bc8617 100644
--- a/apps/dav/tests/travis/carddav/install.sh
+++ b/apps/dav/tests/travis/carddav/install.sh
@@ -3,12 +3,12 @@ SCRIPT=`realpath $0`
 SCRIPTPATH=`dirname $SCRIPT`
 
 
-if [ ! -f CalDAVTester/run.py ]; then
-	cd "$SCRIPTPATH"
-    git clone https://github.com/DeepDiver1975/CalDAVTester.git
-	cd "$SCRIPTPATH/CalDAVTester"
-    python run.py -s
-	cd "$SCRIPTPATH"
+cd "$SCRIPTPATH"
+if [ ! -f CalDAVTester/testcaldav.py ]; then
+    git clone https://github.com/apple/ccs-caldavtester.git CalDAVTester
+fi
+if [ ! -f pycalendar/setup.py ]; then
+    git clone https://github.com/apple/ccs-pycalendar.git pycalendar
 fi
 
 # create test user

From e27efa5d5265054586ba6136f0d764d0052dea4d Mon Sep 17 00:00:00 2001
From: Jack Davis <JackWillDavis@users.noreply.github.com>
Date: Fri, 19 Aug 2016 09:45:39 +0100
Subject: [PATCH 068/219] [stable9.1]
 25532_issue_password_update_notification_updated (#25756)

* Password Update Notification

Added an IF ELSE statement to ensure that feedback is provided to the
user on successfully updating a user password in settings.

* Password Update Success Message

Updated the password update success message
---
 settings/js/users/users.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e0fccbd95399..7a7732338fe8 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -656,7 +656,9 @@ $(document).ready(function () {
 							OC.generateUrl('/settings/users/changepassword'),
 							{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
 							function (result) {
-								if (result.status != 'success') {
+								if(result.status == 'success') {
+									OC.Notification.showTemporary(t('admin', 'Password successfully changed'));
+								} else {
 									OC.Notification.showTemporary(t('admin', result.data.message));
 								}
 							}

From e4663497546d340540736538970ed2fe0e5bd075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Pablo=20Villafa=C3=B1ez?=
 <jvillafanez@solidgeargroup.com>
Date: Fri, 19 Aug 2016 16:49:01 +0200
Subject: [PATCH 069/219] Hide the LDAP password in the client side (#25872)

Connection checks will be done by using the configuration id, with the
stored password. LDAP password won't be sent to the client.

Conflicts:
	apps/user_ldap/ajax/testConfiguration.php
---
 apps/user_ldap/ajax/getConfiguration.php  |  7 ++++++-
 apps/user_ldap/ajax/testConfiguration.php | 21 +++++++++++++++++----
 apps/user_ldap/js/wizard/configModel.js   |  2 +-
 apps/user_ldap/js/wizard/view.js          |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/user_ldap/ajax/getConfiguration.php b/apps/user_ldap/ajax/getConfiguration.php
index 75d99eade697..736a2fb59dbe 100644
--- a/apps/user_ldap/ajax/getConfiguration.php
+++ b/apps/user_ldap/ajax/getConfiguration.php
@@ -31,4 +31,9 @@
 $prefix = (string)$_POST['ldap_serverconfig_chooser'];
 $ldapWrapper = new OCA\User_LDAP\LDAP();
 $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
-OCP\JSON::success(array('configuration' => $connection->getConfiguration()));
+$configuration = $connection->getConfiguration();
+if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') {
+	// hide password
+	$configuration['ldap_agent_password'] = '**PASSWORD SET**';
+}
+OCP\JSON::success(array('configuration' => $configuration));
diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php
index 20a82d056d26..960d8517ce30 100644
--- a/apps/user_ldap/ajax/testConfiguration.php
+++ b/apps/user_ldap/ajax/testConfiguration.php
@@ -32,13 +32,26 @@
 $l = \OC::$server->getL10N('user_ldap');
 
 $ldapWrapper = new OCA\User_LDAP\LDAP();
-$connection = new \OCA\User_LDAP\Connection($ldapWrapper, '', null);
-//needs to be true, otherwise it will also fail with an irritating message
-$_POST['ldap_configuration_active'] = 1;
+$connection = new \OCA\User_LDAP\Connection($ldapWrapper, $_POST['ldap_serverconfig_chooser']);
+
 
 try {
-	if ($connection->setConfiguration($_POST)) {
+	$configurationOk = true;
+	$conf = $connection->getConfiguration();
+	if ($conf['ldap_configuration_active'] === '0') {
+		//needs to be true, otherwise it will also fail with an irritating message
+		$conf['ldap_configuration_active'] = '1';
+		$configurationOk = $connection->setConfiguration($conf);
+	}
+	if ($configurationOk) {
 		//Configuration is okay
+		/*
+		 * Clossing the session since it won't be used from this point on. There might be a potential
+		 * race condition if a second request is made: either this request or the other might not
+		 * contact the LDAP backup server the first time when it should, but there shouldn't be any
+		 * problem with that other than the extra connection.
+		 */
+		\OC::$server->getSession()->close();
 		if ($connection->bind()) {
 			/*
 			 * This shiny if block is an ugly hack to find out whether anonymous
diff --git a/apps/user_ldap/js/wizard/configModel.js b/apps/user_ldap/js/wizard/configModel.js
index c3f1e85b592e..3732409c3e11 100644
--- a/apps/user_ldap/js/wizard/configModel.js
+++ b/apps/user_ldap/js/wizard/configModel.js
@@ -318,7 +318,7 @@ OCA = OCA || {};
 		 */
 		requestConfigurationTest: function() {
 			var url = OC.generateUrl('apps/user_ldap/ajax/testConfiguration.php');
-			var params = OC.buildQueryString(this.configuration);
+			var params = OC.buildQueryString({ldap_serverconfig_chooser: this.configID});
 			var model = this;
 			$.post(url, params, function(result) { model._processTestResult(model, result) });
 			//TODO: make sure only one test is running at a time
diff --git a/apps/user_ldap/js/wizard/view.js b/apps/user_ldap/js/wizard/view.js
index 9c7e2132dc6e..1a89eba35156 100644
--- a/apps/user_ldap/js/wizard/view.js
+++ b/apps/user_ldap/js/wizard/view.js
@@ -271,7 +271,7 @@ OCA = OCA || {};
 		 * requests a configuration test
 		 */
 		onTestButtonClick: function() {
-			this.configModel.requestWizard('ldap_action_test_connection', this.configModel.configuration);
+			this.configModel.requestWizard('ldap_action_test_connection', {ldap_serverconfig_chooser: this.configModel.configID});
 		},
 
 		/**

From ced5ba0763d22198a9a779222d73c7db0c5b9ed5 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 19 Aug 2016 17:09:34 +0200
Subject: [PATCH 070/219] Fix hidden files handling (#25865)

Hidden files (dot files) are now always rendered in the DOM to make
sure that all file operations and selection still work as expected.

Their visibility is now toggled on CSS level.
---
 apps/files/css/files.css            | 15 ++++++++
 apps/files/js/filelist.js           | 53 ++++++++++++++---------------
 apps/files/js/files.js              |  8 +++--
 apps/files/tests/js/filelistSpec.js | 37 +++++++++++++++++++-
 4 files changed, 82 insertions(+), 31 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 94eafe275209..b045b2166760 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -329,6 +329,21 @@ table td.filename .nametext {
 	margin-right: 50px;
 }
 
+.hide-hidden-files #fileList tr.hidden-file,
+.hide-hidden-files #fileList tr.hidden-file.dragging {
+	display: none;
+}
+
+#fileList tr.animate-opacity {
+	-webkit-transition:opacity 250ms;
+	-moz-transition:opacity 250ms;
+	-o-transition:opacity 250ms;
+	transition:opacity 250ms;
+}
+#fileList tr.dragging {
+	opacity: 0.2;
+}
+
 table td.filename .nametext .innernametext {
 	text-overflow: ellipsis;
 	overflow: hidden;
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4f4c833a5f3c..db3c797630bc 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -209,12 +209,6 @@
 				this._filesConfig = OCA.Files.App.getFilesConfig();
 			}
 
-			if (!_.isUndefined(this._filesConfig)) {
-				this._filesConfig.on('change:showhidden', function() {
-					self.setFiles(self.files);
-				});
-			}
-
 			if (options.dragOptions) {
 				this._dragOptions = options.dragOptions;
 			}
@@ -236,6 +230,21 @@
 			this.$table = $el.find('table:first');
 			this.$fileList = $el.find('#fileList');
 
+			if (!_.isUndefined(this._filesConfig)) {
+				this._filesConfig.on('change:showhidden', function() {
+					var showHidden = this.get('showhidden');
+					self.$el.toggleClass('hide-hidden-files', !showHidden);
+
+					if (!showHidden) {
+						// hiding files could make the page too small, need to try rendering next page
+						self._onScroll();
+					}
+				});
+
+				this.$el.toggleClass('hide-hidden-files', !this._filesConfig.get('showhidden'));
+			}
+
+
 			if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) {
 				this._detailsView = new OCA.Files.DetailsView();
 				this._detailsView.$el.insertBefore(this.$el);
@@ -875,10 +884,6 @@
 		 * @return array of DOM elements of the newly added files
 		 */
 		_nextPage: function(animate) {
-			// Save full files list while rendering
-			var allFiles = this.files;
-			this.files = this._filterHiddenFiles(this.files);
-
 			var index = this.$fileList.children().length,
 				count = this.pageSize(),
 				hidden,
@@ -926,9 +931,6 @@
 				}, 0);
 			}
 
-			// Restore full files list after rendering
-			this.files = allFiles;
-
 			return newTrs;
 		},
 
@@ -967,8 +969,6 @@
 			this.$el.find('.select-all').prop('checked', false);
 
 			// Save full files list while rendering
-			var allFiles = this.files;
-			this.files = this._filterHiddenFiles(this.files);
 
 			this.isEmpty = this.files.length === 0;
 			this._nextPage();
@@ -982,9 +982,6 @@
 			this.updateSelectionSummary();
 			$(window).scrollTop(0);
 
-			// Restore full files list after rendering
-			this.files = allFiles;
-
 			this.$fileList.trigger(jQuery.Event('updated'));
 			_.defer(function() {
 				self.$el.closest('#app-content').trigger(jQuery.Event('apprendered'));
@@ -992,18 +989,14 @@
 		},
 
 		/**
-		 * Filter hidden files of the given filesArray (dot-files)
+		 * Returns whether the given file info must be hidden
 		 *
-		 * @param filesArray files to be filtered
-		 * @returns {array}
+		 * @param {OC.Files.FileInfo} fileInfo file info
+		 * 
+		 * @return {boolean} true if the file is a hidden file, false otherwise
 		 */
-		_filterHiddenFiles: function(files) {
-			if (_.isUndefined(this._filesConfig) || this._filesConfig.get('showhidden')) {
-				return files;
-			}
-			return _.filter(files, function(file) {
-				return file.name.indexOf('.') !== 0;
-			});
+		_isHiddenFile: function(file) {
+			return file.name && file.name.charAt(0) === '.';
 		},
 
 		/**
@@ -1327,6 +1320,10 @@
 				tr.addClass('hidden');
 			}
 
+			if (this._isHiddenFile(fileData)) {
+				tr.addClass('hidden-file');
+			}
+
 			// display actions
 			this.fileActions.display(filenameTd, !options.silent, this);
 
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 8542bd504760..53e07ddb0907 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -391,14 +391,18 @@ var dragOptions={
 		if (!$selectedFiles.length) {
 			$selectedFiles = $(this);
 		}
-		$selectedFiles.closest('tr').fadeTo(250, 0.2).addClass('dragging');
+		$selectedFiles.closest('tr').addClass('animate-opacity dragging');
 	},
 	stop: function(event, ui) {
 		var $selectedFiles = $('td.filename input:checkbox:checked');
 		if (!$selectedFiles.length) {
 			$selectedFiles = $(this);
 		}
-		$selectedFiles.closest('tr').fadeTo(250, 1).removeClass('dragging');
+		var $tr = $selectedFiles.closest('tr');
+		$tr.removeClass('dragging');
+		setTimeout(function() {
+			$tr.removeClass('animate-opacity');
+		}, 300);
 	},
 	drag: function(event, ui) {
 		var scrollingArea = FileList.$container;
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 9ce35fb16ffe..2cbacb1224a6 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -24,6 +24,7 @@ describe('OCA.Files.FileList tests', function() {
 	var testFiles, testRoot, notificationStub, fileList, pageSizeStub;
 	var bcResizeStub;
 	var filesClient;
+	var filesConfig;
 	var redirectStub;
 
 	/**
@@ -54,6 +55,10 @@ describe('OCA.Files.FileList tests', function() {
 	}
 
 	beforeEach(function() {
+		filesConfig = new OC.Backbone.Model({
+			showhidden: true
+		});
+
 		filesClient = new OC.Files.Client({
 			host: 'localhost',
 			port: 80,
@@ -153,7 +158,8 @@ describe('OCA.Files.FileList tests', function() {
 		})];
 		pageSizeStub = sinon.stub(OCA.Files.FileList.prototype, 'pageSize').returns(20);
 		fileList = new OCA.Files.FileList($('#app-content-files'), {
-			filesClient: filesClient
+			filesClient: filesClient,
+			config: filesConfig
 		});
 	});
 	afterEach(function() {
@@ -407,6 +413,35 @@ describe('OCA.Files.FileList tests', function() {
 			}
 		});
 	});
+	describe('Hidden files', function() {
+		it('sets the class hidden-file for hidden files', function() {
+			var fileData = {
+				type: 'dir',
+				name: '.testFolder'
+			};
+			var $tr = fileList.add(fileData);
+
+			expect($tr).toBeDefined();
+			expect($tr.hasClass('hidden-file')).toEqual(true);
+		});
+		it('does not set the class hidden-file for visible files', function() {
+			var fileData = {
+				type: 'dir',
+				name: 'testFolder'
+			};
+			var $tr = fileList.add(fileData);
+
+			expect($tr).toBeDefined();
+			expect($tr.hasClass('hidden-file')).toEqual(false);
+		});
+		it('toggles the list\'s class when toggling hidden files', function() {
+			expect(fileList.$el.hasClass('hide-hidden-files')).toEqual(false);
+			filesConfig.set('showhidden', false);
+			expect(fileList.$el.hasClass('hide-hidden-files')).toEqual(true);
+			filesConfig.set('showhidden', true);
+			expect(fileList.$el.hasClass('hide-hidden-files')).toEqual(false);
+		});
+	});
 	describe('Removing files from the list', function() {
 		it('Removes file from list when calling remove() and updates summary', function() {
 			var $summary;

From 20aa7ee2804591de14b6464d82c98325dd260ed6 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 19 Aug 2016 23:26:16 +0200
Subject: [PATCH 071/219] Display number of hidden files in files summary
 (#25877)

When dot files are hidden, the table summary and selection summary will
not show how many hidden files were included.
---
 apps/files/js/filelist.js              |  12 ++-
 apps/files/js/filesummary.js           |  92 ++++++++++++++++------
 apps/files/tests/js/filelistSpec.js    | 104 +++++++++++++++++++++----
 apps/files/tests/js/filesummarySpec.js |  74 +++++++++++++++---
 4 files changed, 230 insertions(+), 52 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index db3c797630bc..fbbf2d3e7ec4 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -194,6 +194,7 @@
 		 * @param options.folderDropOptions folder drop options, disabled by default
 		 * @param options.scrollTo name of file to scroll to after the first load
 		 * @param {OC.Files.Client} [options.filesClient] files API client
+		 * @param {OC.Backbone.Model} [options.filesConfig] files app configuration
 		 * @private
 		 */
 		initialize: function($el, options) {
@@ -234,6 +235,7 @@
 				this._filesConfig.on('change:showhidden', function() {
 					var showHidden = this.get('showhidden');
 					self.$el.toggleClass('hide-hidden-files', !showHidden);
+					self.updateSelectionSummary();
 
 					if (!showHidden) {
 						// hiding files could make the page too small, need to try rendering next page
@@ -259,7 +261,7 @@
 
 			this.files = [];
 			this._selectedFiles = {};
-			this._selectionSummary = new OCA.Files.FileSummary();
+			this._selectionSummary = new OCA.Files.FileSummary(undefined, {config: this._filesConfig});
 			// dummy root dir info
 			this.dirInfo = new OC.Files.FileInfo({});
 
@@ -2297,7 +2299,7 @@
 			var $tr = $('<tr class="summary"></tr>');
 			this.$el.find('tfoot').append($tr);
 
-			return new OCA.Files.FileSummary($tr);
+			return new OCA.Files.FileSummary($tr, {config: this._filesConfig});
 		},
 		updateEmptyContent: function() {
 			var permissions = this.getDirectoryPermissions();
@@ -2444,6 +2446,7 @@
 			var summary = this._selectionSummary.summary;
 			var selection;
 
+			var showHidden = !!this._filesConfig.get('showhidden');
 			if (summary.totalFiles === 0 && summary.totalDirs === 0) {
 				this.$el.find('#headerName a.name>span:first').text(t('files','Name'));
 				this.$el.find('#headerSize a>span:first').text(t('files','Size'));
@@ -2470,6 +2473,11 @@
 					selection = fileInfo;
 				}
 
+				if (!showHidden && summary.totalHidden > 0) {
+					var hiddenInfo = n('files', 'including %n hidden', 'including %n hidden', summary.totalHidden);
+					selection += ' (' + hiddenInfo + ')';
+				}
+
 				this.$el.find('#headerName a.name>span:first').text(selection);
 				this.$el.find('#modified a>span:first').text('');
 				this.$el.find('table').addClass('multiselect');
diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js
index a4cefe692a89..519718cfc825 100644
--- a/apps/files/js/filesummary.js
+++ b/apps/files/js/filesummary.js
@@ -20,6 +20,15 @@
 */
 
 (function() {
+	var INFO_TEMPLATE =
+		'<span class="info">' +
+			'<span class="dirinfo"></span>' +
+			'<span class="connector"> and </span>' +
+			'<span class="fileinfo"></span>' +
+			'<span class="hiddeninfo"></span>' +
+			'<span class="filter"></span>' +
+		'</span>';
+
 	/**
 	 * The FileSummary class encapsulates the file summary values and
 	 * the logic to render it in the given container
@@ -28,26 +37,51 @@
 	 * @memberof OCA.Files
 	 *
 	 * @param $tr table row element
+	 * @param {OC.Backbone.Model} [options.filesConfig] files app configuration
 	 */
-	var FileSummary = function($tr) {
+	var FileSummary = function($tr, options) {
+		options = options || {};
+		var self = this;
 		this.$el = $tr;
+		var filesConfig = options.config;
+		if (filesConfig) {
+			this._showHidden = !!filesConfig.get('showhidden');
+			filesConfig.on('change:showhidden', function() {
+				self._showHidden = !!this.get('showhidden');
+				self.update();
+			});
+		}
 		this.clear();
 		this.render();
 	};
 
 	FileSummary.prototype = {
+		_showHidden: null,
+
 		summary: {
 			totalFiles: 0,
 			totalDirs: 0,
+			totalHidden: 0,
 			totalSize: 0,
 			filter:'',
 			sumIsPending:false
 		},
 
+		/**
+		 * Returns whether the given file info must be hidden
+		 *
+		 * @param {OC.Files.FileInfo} fileInfo file info
+		 * 
+		 * @return {boolean} true if the file is a hidden file, false otherwise
+		 */
+		_isHiddenFile: function(file) {
+			return file.name && file.name.charAt(0) === '.';
+		},
+
 		/**
 		 * Adds file
-		 * @param file file to add
-		 * @param update whether to update the display
+		 * @param {OC.Files.FileInfo} file file to add
+		 * @param {boolean} update whether to update the display
 		 */
 		add: function(file, update) {
 			if (file.name && file.name.toLowerCase().indexOf(this.summary.filter) === -1) {
@@ -59,6 +93,10 @@
 			else {
 				this.summary.totalFiles++;
 			}
+			if (this._isHiddenFile(file)) {
+				this.summary.totalHidden++;
+			}
+
 			var size = parseInt(file.size, 10) || 0;
 			if (size >=0) {
 				this.summary.totalSize += size;
@@ -71,8 +109,8 @@
 		},
 		/**
 		 * Removes file
-		 * @param file file to remove
-		 * @param update whether to update the display
+		 * @param {OC.Files.FileInfo} file file to remove
+		 * @param {boolean} update whether to update the display
 		 */
 		remove: function(file, update) {
 			if (file.name && file.name.toLowerCase().indexOf(this.summary.filter) === -1) {
@@ -84,6 +122,9 @@
 			else {
 				this.summary.totalFiles--;
 			}
+			if (this._isHiddenFile(file)) {
+				this.summary.totalHidden--;
+			}
 			var size = parseInt(file.size, 10) || 0;
 			if (size >=0) {
 				this.summary.totalSize -= size;
@@ -111,6 +152,7 @@
 			var summary = {
 				totalDirs: 0,
 				totalFiles: 0,
+				totalHidden: 0,
 				totalSize: 0,
 				filter: this.summary.filter,
 				sumIsPending: false
@@ -127,6 +169,9 @@
 				else {
 					summary.totalFiles++;
 				}
+				if (this._isHiddenFile(file)) {
+					summary.totalHidden++;
+				}
 				var size = parseInt(file.size, 10) || 0;
 				if (size >=0) {
 					summary.totalSize += size;
@@ -154,6 +199,13 @@
 			this.update();
 		},
 
+		_infoTemplate: function(data) {
+			if (!this._infoTemplateCompiled) {
+				this._infoTemplateCompiled = Handlebars.compile(INFO_TEMPLATE);
+			}
+			return this._infoTemplateCompiled(data);
+		},
+
 		/**
 		 * Renders the file summary element
 		 */
@@ -171,10 +223,12 @@
 			var $fileInfo = this.$el.find('.fileinfo');
 			var $connector = this.$el.find('.connector');
 			var $filterInfo = this.$el.find('.filter');
+			var $hiddenInfo = this.$el.find('.hiddeninfo');
 
 			// Substitute old content with new translations
 			$dirInfo.html(n('files', '%n folder', '%n folders', this.summary.totalDirs));
 			$fileInfo.html(n('files', '%n file', '%n files', this.summary.totalFiles));
+			$hiddenInfo.html(' (' + n('files', 'including %n hidden', 'including %n hidden', this.summary.totalHidden) + ')');
 			var fileSize = this.summary.sumIsPending ? t('files', 'Pending') : OC.Util.humanFileSize(this.summary.totalSize);
 			this.$el.find('.filesize').html(fileSize);
 
@@ -194,6 +248,7 @@
 			if (this.summary.totalDirs > 0 && this.summary.totalFiles > 0) {
 				$connector.removeClass('hidden');
 			}
+			$hiddenInfo.toggleClass('hidden', this.summary.totalHidden === 0 || this._showHidden)
 			if (this.summary.filter === '') {
 				$filterInfo.html('');
 				$filterInfo.addClass('hidden');
@@ -206,19 +261,7 @@
 			if (!this.$el) {
 				return;
 			}
-			// TODO: ideally this should be separate to a template or something
 			var summary = this.summary;
-			var directoryInfo = n('files', '%n folder', '%n folders', summary.totalDirs);
-			var fileInfo = n('files', '%n file', '%n files', summary.totalFiles);
-			var filterInfo = '';
-			if (this.summary.filter !== '') {
-				filterInfo = ' ' + n('files', 'matches \'{filter}\'', 'match \'{filter}\'', summary.totalFiles + summary.totalDirs, {filter: summary.filter});
-			}
-
-			var infoVars = {
-				dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">',
-				files: '</span><span class="fileinfo">'+fileInfo+'</span>'
-			};
 
 			// don't show the filesize column, if filesize is NaN (e.g. in trashbin)
 			var fileSize = '';
@@ -227,15 +270,14 @@
 				fileSize = '<td class="filesize">' + fileSize + '</td>';
 			}
 
-			var info = t('files', '{dirs} and {files}', infoVars, null, {'escape': false});
-
-			var $summary = $('<td><span class="info">'+info+'<span class="filter">'+filterInfo+'</span></span></td>'+fileSize+'<td class="date"></td>');
-
-			if (!this.summary.totalFiles && !this.summary.totalDirs) {
-				this.$el.addClass('hidden');
-			}
-
+			var $summary = $(
+				'<td>' + this._infoTemplate() + '</td>' +
+				fileSize +
+				'<td class="date"></td>'
+			);
+			this.$el.addClass('hidden');
 			this.$el.append($summary);
+			this.update();
 		}
 	};
 	OCA.Files.FileSummary = FileSummary;
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 2cbacb1224a6..35af2f89fc24 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -385,8 +385,9 @@ describe('OCA.Files.FileList tests', function() {
 			$summary = $('#filestable .summary');
 			expect($summary.hasClass('hidden')).toEqual(false);
 			// yes, ugly...
-			expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
+			expect($summary.find('.fileinfo').text()).toEqual('1 file');
 			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
+			expect($summary.find('.connector').hasClass('hidden')).toEqual(true);
 			expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
 			expect($summary.find('.filesize').text()).toEqual('12 B');
 			expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
@@ -456,7 +457,8 @@ describe('OCA.Files.FileList tests', function() {
 
 			$summary = $('#filestable .summary');
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual('1 folder and 2 files');
+			expect($summary.find('.dirinfo').text()).toEqual('1 folder');
+			expect($summary.find('.fileinfo').text()).toEqual('2 files');
 			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
 			expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
 			expect($summary.find('.filesize').text()).toEqual('69 KB');
@@ -511,7 +513,8 @@ describe('OCA.Files.FileList tests', function() {
 
 			$summary = $('#filestable .summary');
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual('1 folder and 1 file');
+			expect($summary.find('.dirinfo').text()).toEqual('1 folder');
+			expect($summary.find('.fileinfo').text()).toEqual('1 file');
 			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
 			expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
 			expect($summary.find('.filesize').text()).toEqual('57 KB');
@@ -677,12 +680,14 @@ describe('OCA.Files.FileList tests', function() {
 
 			deferredRename.resolve(201);
 
-			expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+			expect($summary.find('.dirinfo').text()).toEqual('1 folder');
+			expect($summary.find('.fileinfo').text()).toEqual('3 files');
 		});
 		it('Leaves the summary alone when cancel renaming', function() {
 			var $summary = $('#filestable .summary');
 			doCancelRename();
-			expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+			expect($summary.find('.dirinfo').text()).toEqual('1 folder');
+			expect($summary.find('.fileinfo').text()).toEqual('3 files');
 		});
 		it('Shows busy state while rename in progress', function() {
 			var $tr;
@@ -856,11 +861,14 @@ describe('OCA.Files.FileList tests', function() {
 			});
 			var $tr = fileList.add(fileData);
 
-			expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
+			expect($summary.find('.fileinfo').text()).toEqual('1 file');
 
 			var model = fileList.getModelForFile('test file');
 			model.set({size: '100'});
-			expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
+
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
+			expect($summary.find('.fileinfo').text()).toEqual('1 file');
 		});
 	})
 	describe('List rendering', function() {
@@ -877,7 +885,8 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.setFiles(testFiles);
 			$summary = $('#filestable .summary');
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+			expect($summary.find('.dirinfo').text()).toEqual('1 folder');
+			expect($summary.find('.fileinfo').text()).toEqual('3 files');
 			expect($summary.find('.filesize').text()).toEqual('69 KB');
 		});
 		it('shows headers, summary and hide empty content message after setting files', function(){
@@ -962,10 +971,12 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.setFiles([testFiles[0]]);
 			$summary = $('#filestable .summary');
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
+			expect($summary.find('.fileinfo').text()).toEqual('1 file');
 			fileList.remove('unexist.txt');
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
+			expect($summary.find('.fileinfo').text()).toEqual('1 file');
 		});
 	});
 	describe('Filtered list rendering', function() {
@@ -987,14 +998,18 @@ describe('OCA.Files.FileList tests', function() {
 			expect($('#fileList tr:not(.hidden)').length).toEqual(3);
 			expect(fileList.files.length).toEqual(4);
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual("1 folder and 2 files match 'e'");
+			expect($summary.find('.dirinfo').text()).toEqual('1 folder');
+			expect($summary.find('.fileinfo').text()).toEqual('2 files');
+			expect($summary.find('.filter').text()).toEqual(" match 'e'");
 			expect($nofilterresults.hasClass('hidden')).toEqual(true);
 
 			fileList.setFilter('ee');
 			expect($('#fileList tr:not(.hidden)').length).toEqual(1);
 			expect(fileList.files.length).toEqual(4);
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual("0 folders and 1 file matches 'ee'");
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
+			expect($summary.find('.fileinfo').text()).toEqual('1 file');
+			expect($summary.find('.filter').text()).toEqual(" matches 'ee'");
 			expect($nofilterresults.hasClass('hidden')).toEqual(true);
 
 			fileList.setFilter('eee');
@@ -1007,21 +1022,26 @@ describe('OCA.Files.FileList tests', function() {
 			expect($('#fileList tr:not(.hidden)').length).toEqual(1);
 			expect(fileList.files.length).toEqual(4);
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual("0 folders and 1 file matches 'ee'");
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
+			expect($summary.find('.fileinfo').text()).toEqual('1 file');
+			expect($summary.find('.filter').text()).toEqual(" matches 'ee'");
 			expect($nofilterresults.hasClass('hidden')).toEqual(true);
 
 			fileList.setFilter('e');
 			expect($('#fileList tr:not(.hidden)').length).toEqual(3);
 			expect(fileList.files.length).toEqual(4);
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual("1 folder and 2 files match 'e'");
+			expect($summary.find('.dirinfo').text()).toEqual('1 folder');
+			expect($summary.find('.fileinfo').text()).toEqual('2 files');
+			expect($summary.find('.filter').text()).toEqual(" match 'e'");
 			expect($nofilterresults.hasClass('hidden')).toEqual(true);
 
 			fileList.setFilter('');
 			expect($('#fileList tr:not(.hidden)').length).toEqual(4);
 			expect(fileList.files.length).toEqual(4);
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual("1 folder and 3 files");
+			expect($summary.find('.dirinfo').text()).toEqual('1 folder');
+			expect($summary.find('.fileinfo').text()).toEqual('3 files');
 			expect($nofilterresults.hasClass('hidden')).toEqual(true);
 		});
 		it('filters the list of non-rendered rows using filter()', function() {
@@ -1032,7 +1052,9 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.setFilter('63');
 			expect($('#fileList tr:not(.hidden)').length).toEqual(1);
 			expect($summary.hasClass('hidden')).toEqual(false);
-			expect($summary.find('.info').text()).toEqual("0 folders and 1 file matches '63'");
+			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
+			expect($summary.find('.fileinfo').text()).toEqual('1 file');
+			expect($summary.find('.filter').text()).toEqual(" matches '63'");
 			expect($nofilterresults.hasClass('hidden')).toEqual(true);
 		});
 		it('hides the emptyfiles notice when using filter()', function() {
@@ -1647,6 +1669,18 @@ describe('OCA.Files.FileList tests', function() {
 			$('#fileList tr td.filename input:checkbox').click();
 			expect($('.select-all').prop('checked')).toEqual(false);
 		});
+		it('Selecting all files also selects hidden files when invisible', function() {
+			filesConfig.set('showhidden', false);
+			var $tr = fileList.add(new FileInfo({
+				name: '.hidden',
+				type: 'dir',
+				mimetype: 'httpd/unix-directory',
+				size: 150
+			}));
+			$('.select-all').click();
+			expect($tr.find('td.filename input:checkbox').prop('checked')).toEqual(true);
+			expect(_.pluck(fileList.getSelectedFiles(), 'name')).toContain('.hidden');
+		});
 		it('Clicking "select all" will select/deselect all files', function() {
 			fileList.setFiles(generateFiles(0, 41));
 			$('.select-all').click();
@@ -1724,6 +1758,44 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.findFileEl('One.txt').find('input:checkbox').click().click();
 			expect($summary.text()).toEqual('Name');
 		});
+		it('Displays the number of hidden files in selection summary if hidden files are invisible', function() {
+			filesConfig.set('showhidden', false);
+			var $tr = fileList.add(new FileInfo({
+				name: '.hidden',
+				type: 'dir',
+				mimetype: 'httpd/unix-directory',
+				size: 150
+			}));
+			$('.select-all').click();
+			var $summary = $('#headerName a.name>span:first');
+			expect($summary.text()).toEqual('2 folders and 3 files (including 1 hidden)');
+		});
+		it('Does not displays the number of hidden files in selection summary if hidden files are visible', function() {
+			filesConfig.set('showhidden', true);
+			var $tr = fileList.add(new FileInfo({
+				name: '.hidden',
+				type: 'dir',
+				mimetype: 'httpd/unix-directory',
+				size: 150
+			}));
+			$('.select-all').click();
+			var $summary = $('#headerName a.name>span:first');
+			expect($summary.text()).toEqual('2 folders and 3 files');
+		});
+		it('Toggling hidden file visibility updates selection summary', function() {
+			filesConfig.set('showhidden', false);
+			var $tr = fileList.add(new FileInfo({
+				name: '.hidden',
+				type: 'dir',
+				mimetype: 'httpd/unix-directory',
+				size: 150
+			}));
+			$('.select-all').click();
+			var $summary = $('#headerName a.name>span:first');
+			expect($summary.text()).toEqual('2 folders and 3 files (including 1 hidden)');
+			filesConfig.set('showhidden', true);
+			expect($summary.text()).toEqual('2 folders and 3 files');
+		});
 		it('Select/deselect files shows/hides file actions', function() {
 			var $actions = $('#headerName .selectedActions');
 			var $checkbox = fileList.findFileEl('One.txt').find('input:checkbox');
diff --git a/apps/files/tests/js/filesummarySpec.js b/apps/files/tests/js/filesummarySpec.js
index ec94c28acb6f..e3f24d9ad43d 100644
--- a/apps/files/tests/js/filesummarySpec.js
+++ b/apps/files/tests/js/filesummarySpec.js
@@ -39,7 +39,8 @@ describe('OCA.Files.FileSummary tests', function() {
 			totalSize: 256000
 		});
 		expect($container.hasClass('hidden')).toEqual(false);
-		expect($container.find('.info').text()).toEqual('5 folders and 2 files');
+		expect($container.find('.dirinfo').text()).toEqual('5 folders');
+		expect($container.find('.fileinfo').text()).toEqual('2 files');
 		expect($container.find('.filesize').text()).toEqual('250 KB');
 	});
 	it('hides summary when no files or folders', function() {
@@ -62,7 +63,8 @@ describe('OCA.Files.FileSummary tests', function() {
 		s.add({type: 'dir', size: 100});
 		s.update();
 		expect($container.hasClass('hidden')).toEqual(false);
-		expect($container.find('.info').text()).toEqual('6 folders and 3 files');
+		expect($container.find('.dirinfo').text()).toEqual('6 folders');
+		expect($container.find('.fileinfo').text()).toEqual('3 files');
 		expect($container.find('.filesize').text()).toEqual('500 KB');
 		expect(s.summary.totalDirs).toEqual(6);
 		expect(s.summary.totalFiles).toEqual(3);
@@ -79,7 +81,8 @@ describe('OCA.Files.FileSummary tests', function() {
 		s.remove({type: 'dir', size: 100});
 		s.update();
 		expect($container.hasClass('hidden')).toEqual(false);
-		expect($container.find('.info').text()).toEqual('4 folders and 1 file');
+		expect($container.find('.dirinfo').text()).toEqual('4 folders');
+		expect($container.find('.fileinfo').text()).toEqual('1 file');
 		expect($container.find('.filesize').text()).toEqual('125 KB');
 		expect(s.summary.totalDirs).toEqual(4);
 		expect(s.summary.totalFiles).toEqual(1);
@@ -95,7 +98,9 @@ describe('OCA.Files.FileSummary tests', function() {
 			filter: 'foo'
 		});
 		expect($container.hasClass('hidden')).toEqual(false);
-		expect($container.find('.info').text()).toEqual('5 folders and 2 files match \'foo\'');
+		expect($container.find('.dirinfo').text()).toEqual('5 folders');
+		expect($container.find('.fileinfo').text()).toEqual('2 files');
+		expect($container.find('.filter').text()).toEqual(' match \'foo\'');
 		expect($container.find('.filesize').text()).toEqual('250 KB');
 	});
 	it('hides filtered summary when no files or folders', function() {
@@ -122,7 +127,9 @@ describe('OCA.Files.FileSummary tests', function() {
 		s.add({name: 'foo', type: 'dir', size: 102});
 		s.update();
 		expect($container.hasClass('hidden')).toEqual(false);
-		expect($container.find('.info').text()).toEqual('6 folders and 3 files match \'foo\'');
+		expect($container.find('.dirinfo').text()).toEqual('6 folders');
+		expect($container.find('.fileinfo').text()).toEqual('3 files');
+		expect($container.find('.filter').text()).toEqual(' match \'foo\'');
 		expect($container.find('.filesize').text()).toEqual('500 KB');
 		expect(s.summary.totalDirs).toEqual(6);
 		expect(s.summary.totalFiles).toEqual(3);
@@ -142,7 +149,9 @@ describe('OCA.Files.FileSummary tests', function() {
 		s.remove({name: 'foo', type: 'dir', size: 98});
 		s.update();
 		expect($container.hasClass('hidden')).toEqual(false);
-		expect($container.find('.info').text()).toEqual('4 folders and 1 file match \'foo\'');
+		expect($container.find('.dirinfo').text()).toEqual('4 folders');
+		expect($container.find('.fileinfo').text()).toEqual('1 file');
+		expect($container.find('.filter').text()).toEqual(' match \'foo\'');
 		expect($container.find('.filesize').text()).toEqual('125 KB');
 		expect(s.summary.totalDirs).toEqual(4);
 		expect(s.summary.totalFiles).toEqual(1);
@@ -158,7 +167,8 @@ describe('OCA.Files.FileSummary tests', function() {
 		s.add({type: 'dir', size: -1});
 		s.update();
 		expect($container.hasClass('hidden')).toEqual(false);
-		expect($container.find('.info').text()).toEqual('1 folder and 0 files');
+		expect($container.find('.dirinfo').text()).toEqual('1 folder');
+		expect($container.find('.fileinfo').hasClass('hidden')).toEqual(true);
 		expect($container.find('.filesize').text()).toEqual('Pending');
 		expect(s.summary.totalDirs).toEqual(1);
 		expect(s.summary.totalFiles).toEqual(0);
@@ -175,10 +185,56 @@ describe('OCA.Files.FileSummary tests', function() {
 		s.remove({type: 'dir', size: -1});
 		s.update();
 		expect($container.hasClass('hidden')).toEqual(true);
-		expect($container.find('.info').text()).toEqual('0 folders and 0 files');
-		expect($container.find('.filesize').text()).toEqual('0 B');
 		expect(s.summary.totalDirs).toEqual(0);
 		expect(s.summary.totalFiles).toEqual(0);
 		expect(s.summary.totalSize).toEqual(0);
 	});
+	describe('hidden files', function() {
+		var config;
+		var summary;
+
+		beforeEach(function() {
+			config = new OC.Backbone.Model();
+			summary = new FileSummary($container, {
+				config: config
+			});
+		});
+
+		it('renders hidden count section when hidden files are hidden', function() {
+			config.set('showhidden', false);
+			summary.add({name: 'abc', type: 'file', size: 256000});
+			summary.add({name: 'def', type: 'dir', size: 100});
+			summary.add({name: '.hidden', type: 'dir', size: 512000});
+			summary.update();
+			expect($container.hasClass('hidden')).toEqual(false);
+			expect($container.find('.dirinfo').text()).toEqual('2 folders');
+			expect($container.find('.fileinfo').text()).toEqual('1 file');
+			expect($container.find('.hiddeninfo').hasClass('hidden')).toEqual(false);
+			expect($container.find('.hiddeninfo').text()).toEqual(' (including 1 hidden)');
+			expect($container.find('.filesize').text()).toEqual('750 KB');
+		});
+		it('does not render hidden count section when hidden files exist but are visible', function() {
+			config.set('showhidden', true);
+			summary.add({name: 'abc', type: 'file', size: 256000});
+			summary.add({name: 'def', type: 'dir', size: 100});
+			summary.add({name: '.hidden', type: 'dir', size: 512000});
+			summary.update();
+			expect($container.hasClass('hidden')).toEqual(false);
+			expect($container.find('.dirinfo').text()).toEqual('2 folders');
+			expect($container.find('.fileinfo').text()).toEqual('1 file');
+			expect($container.find('.hiddeninfo').hasClass('hidden')).toEqual(true);
+			expect($container.find('.filesize').text()).toEqual('750 KB');
+		});
+		it('does not render hidden count section when no hidden files exist', function() {
+			config.set('showhidden', false);
+			summary.add({name: 'abc', type: 'file', size: 256000});
+			summary.add({name: 'def', type: 'dir', size: 100});
+			summary.update();
+			expect($container.hasClass('hidden')).toEqual(false);
+			expect($container.find('.dirinfo').text()).toEqual('1 folder');
+			expect($container.find('.fileinfo').text()).toEqual('1 file');
+			expect($container.find('.hiddeninfo').hasClass('hidden')).toEqual(true);
+			expect($container.find('.filesize').text()).toEqual('250 KB');
+		});
+	});
 });

From c4ba9f2f9780c97c2926204b01bc2ab87ceb67a8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 22 Aug 2016 09:45:21 +0200
Subject: [PATCH 072/219] Make sure file list files config always exists

Initialize files config with defaults in case none was passed
---
 apps/files/js/filelist.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index fbbf2d3e7ec4..f7d16e960c99 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -208,6 +208,10 @@
 				this._filesConfig = options.config;
 			} else if (!_.isUndefined(OCA.Files) && !_.isUndefined(OCA.Files.App)) {
 				this._filesConfig = OCA.Files.App.getFilesConfig();
+			} else {
+				this._filesConfig = new OC.Backbone.Model({
+					'showhidden': false
+				});
 			}
 
 			if (options.dragOptions) {

From 6c64d36f487597129fcf29349951516f11a092e8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 22 Aug 2016 10:55:30 +0200
Subject: [PATCH 073/219] =?UTF-8?q?[9.1]=20Before=20a=20user=20is=20gettin?=
 =?UTF-8?q?g=20scanned=20the=20database=20connection=20is=20re-establ?=
 =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/files/lib/Command/Scan.php | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php
index 835fa15eb128..14a28461c52f 100644
--- a/apps/files/lib/Command/Scan.php
+++ b/apps/files/lib/Command/Scan.php
@@ -27,9 +27,11 @@
 
 namespace OCA\Files\Command;
 
+use Doctrine\DBAL\Connection;
 use OC\Core\Command\Base;
 use OC\ForbiddenException;
 use OCP\Files\StorageNotAvailableException;
+use OCP\IDBConnection;
 use OCP\IUserManager;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -105,7 +107,8 @@ public function checkScanWarning($fullPath, OutputInterface $output) {
 	}
 
 	protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false) {
-		$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection(), \OC::$server->getLogger());
+		$connection = $this->reconnectToDatabase($output);
+		$scanner = new \OC\Files\Utils\Scanner($user, $connection, \OC::$server->getLogger());
 		# check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
 		# printout and count
 		if ($verbose) {
@@ -317,4 +320,26 @@ protected function formatExecTime() {
 		return date('H:i:s', $secs);
 	}
 
+	/**
+	 * @return \OCP\IDBConnection
+	 */
+	protected function reconnectToDatabase(OutputInterface $output) {
+		/** @var Connection | IDBConnection $connection*/
+		$connection = \OC::$server->getDatabaseConnection();
+		try {
+			$connection->close();
+		} catch (\Exception $ex) {
+			$output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
+		}
+		while (!$connection->isConnected()) {
+			try {
+				$connection->connect();
+			} catch (\Exception $ex) {
+				$output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
+				sleep(60);
+			}
+		}
+		return $connection;
+	}
+
 }

From 4c7135a44da41c460d3cd2f70a6a237dacb55466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 22 Aug 2016 14:16:26 +0200
Subject: [PATCH 074/219] =?UTF-8?q?[stable9.1]=20Best=20practice=20through?=
 =?UTF-8?q?=20out=20the=20web=20speak=20of=20a=20max=20avatar=20image=20si?=
 =?UTF-8?q?ze=20of=E2=80=A6=20(#25857)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Best practice through out the web speak of a max avatar image size of 96 pixels

* Respect size argument

THX @felixboehm
---
 apps/dav/lib/CardDAV/Converter.php | 2 +-
 lib/private/User/User.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
index c8d9b94c2675..f64b6c6b769e 100644
--- a/apps/dav/lib/CardDAV/Converter.php
+++ b/apps/dav/lib/CardDAV/Converter.php
@@ -161,7 +161,7 @@ public function splitFullName($fullName) {
 	 */
 	private function getAvatarImage(IUser $user) {
 		try {
-			$image = $user->getAvatarImage(-1);
+			$image = $user->getAvatarImage(96);
 			return $image;
 		} catch (\Exception $ex) {
 			return null;
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index a48941ea2c08..aa6277ca2a92 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -378,7 +378,7 @@ public function getAvatarImage($size) {
 		}
 
 		$avatar = $this->avatarManager->getAvatar($this->uid);
-		$image = $avatar->get(-1);
+		$image = $avatar->get($size);
 		if ($image) {
 			return $image;
 		}

From bbfa0fe833e7a04f64aca0fa03cffef1caa64a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 22 Aug 2016 20:25:20 +0200
Subject: [PATCH 075/219] [stable9.1] Fix issues where some user settings
 cannot be loaded when the user id differs in case sensitivity - fixes #25684
 (#25686)

---
 lib/private/User/Manager.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 055f428bb175..34ab542982cd 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -156,6 +156,16 @@ protected function getUserObject($uid, $backend, $cacheUser = true) {
 			return $this->cachedUsers[$uid];
 		}
 
+		if (method_exists($backend, 'loginName2UserName')) {
+			$loginName = $backend->loginName2UserName($uid);
+			if ($loginName !== false) {
+				$uid = $loginName;
+			}
+			if (isset($this->cachedUsers[$uid])) {
+				return $this->cachedUsers[$uid];
+			}
+		}
+
 		$user = new User($uid, $backend, $this, $this->config);
 		if ($cacheUser) {
 			$this->cachedUsers[$uid] = $user;

From 3ae319fdaa648bf0acc1e89112ef3f19d2ed4670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 22 Aug 2016 22:08:00 +0200
Subject: [PATCH 076/219] [stable9.1] Fix empty PATH_INFO (#25904)

---
 lib/private/AppFramework/Http/Request.php   |  5 ++--
 tests/lib/AppFramework/Http/RequestTest.php | 26 ++++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index eca02b2ac2b1..729c7e5377f9 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -650,8 +650,9 @@ public function getRawPathInfo() {
 	 * @return string|false Path info or false when not found
 	 */
 	public function getPathInfo() {
-		if(isset($this->server['PATH_INFO'])) {
-			return $this->server['PATH_INFO'];
+		$pathInfo = isset($this->server['PATH_INFO']) ? $this->server['PATH_INFO'] : '';
+		if($pathInfo !== '') {
+			return $pathInfo;
 		}
 
 		$pathInfo = $this->getRawPathInfo();
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index ddc2403d8668..4806a9d5ae52 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -13,6 +13,7 @@
 use OC\AppFramework\Http\Request;
 use OC\Security\CSRF\CsrfToken;
 use OC\Security\CSRF\CsrfTokenManager;
+use OCP\IRequest;
 use OCP\Security\ISecureRandom;
 use OCP\IConfig;
 
@@ -24,11 +25,11 @@
 class RequestTest extends \Test\TestCase {
 	/** @var string */
 	protected $stream = 'fakeinput://data';
-	/** @var ISecureRandom */
+	/** @var ISecureRandom | \PHPUnit_Framework_MockObject_MockObject */
 	protected $secureRandom;
-	/** @var IConfig */
+	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
 	protected $config;
-	/** @var CsrfTokenManager */
+	/** @var CsrfTokenManager | \PHPUnit_Framework_MockObject_MockObject */
 	protected $csrfTokenManager;
 
 	protected function setUp() {
@@ -1079,6 +1080,24 @@ public function testGetPathInfoWithSetEnv() {
 		$this->assertSame('apps/files/',  $request->getPathInfo());
 	}
 
+	public function testGetPathInfoWithPathInfoBeingEmpty() {
+		$request = new Request(
+			[
+				'server' => [
+					'PATH_INFO' => '',
+					'REQUEST_URI' => '/index.php/apps/files/?dir=/',
+					'SCRIPT_NAME' => 'index.php'
+				]
+			],
+			$this->secureRandom,
+			$this->config,
+			$this->csrfTokenManager,
+			$this->stream
+		);
+
+		$this->assertSame('/apps/files/',  $request->getPathInfo());
+	}
+
 	/**
 	 * @expectedException \Exception
 	 * @expectedExceptionMessage The requested uri(/foo.php) cannot be processed by the script '/var/www/index.php')
@@ -1290,6 +1309,7 @@ public function testGetRequestUriWithOverwrite($expectedUri, $overwriteWebRoot,
 			->with('overwritecondaddr')
 			->will($this->returnValue($overwriteCondAddr));
 
+		/** @var IRequest | \PHPUnit_Framework_MockObject_MockObject $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
 			->setConstructorArgs([

From cc65604955c5163470ee88d0295095fd5e152a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 23 Aug 2016 14:03:05 +0200
Subject: [PATCH 077/219] [stable9.1] Add occ command to expire the trashbin
 (#25878)

* Add occ command to expire the trashbin

* Fix versions folder in setup check
---
 .../appinfo/register_command.php              |   6 +
 .../lib/Command/ExpireTrash.php               | 127 ++++++++++++++++++
 .../appinfo/register_command.php              |   5 +
 .../lib/Command/ExpireVersions.php            | 125 +++++++++++++++++
 4 files changed, 263 insertions(+)
 create mode 100644 apps/files_trashbin/lib/Command/ExpireTrash.php
 create mode 100644 apps/files_versions/lib/Command/ExpireVersions.php

diff --git a/apps/files_trashbin/appinfo/register_command.php b/apps/files_trashbin/appinfo/register_command.php
index c5e7e1e8bdfc..d5ff96a564f5 100644
--- a/apps/files_trashbin/appinfo/register_command.php
+++ b/apps/files_trashbin/appinfo/register_command.php
@@ -20,10 +20,16 @@
  */
 
 
+use OCA\Files_Trashbin\AppInfo\Application;
 use OCA\Files_Trashbin\Command\CleanUp;
+use OCA\Files_Trashbin\Command\ExpireTrash;
 
+$app = new Application();
+$expiration = $app->getContainer()->query('Expiration');
 $userManager = OC::$server->getUserManager();
 $rootFolder = \OC::$server->getRootFolder();
 $dbConnection = \OC::$server->getDatabaseConnection();
+
 /** @var Symfony\Component\Console\Application $application */
 $application->add(new CleanUp($rootFolder, $userManager, $dbConnection));
+$application->add(new ExpireTrash($userManager, $expiration));
diff --git a/apps/files_trashbin/lib/Command/ExpireTrash.php b/apps/files_trashbin/lib/Command/ExpireTrash.php
new file mode 100644
index 000000000000..ff8277188850
--- /dev/null
+++ b/apps/files_trashbin/lib/Command/ExpireTrash.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2016, ownCloud GmbH.
+ * @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/>
+ *
+ */
+
+namespace OCA\Files_Trashbin\Command;
+
+use OCP\IUser;
+use OCP\IUserManager;
+use OCA\Files_Trashbin\Expiration;
+use OCA\Files_Trashbin\Helper;
+use OCA\Files_Trashbin\Trashbin;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ExpireTrash extends Command {
+
+	/**
+	 * @var Expiration
+	 */
+	private $expiration;
+	
+	/**
+	 * @var IUserManager
+	 */
+	private $userManager;
+
+	/**
+	 * @param IUserManager|null $userManager
+	 * @param Expiration|null $expiration
+	 */
+	public function __construct(IUserManager $userManager = null,
+								Expiration $expiration = null) {
+		parent::__construct();
+
+		$this->userManager = $userManager;
+		$this->expiration = $expiration;
+	}
+
+	protected function configure() {
+		$this
+			->setName('trashbin:expire')
+			->setDescription('Expires the users trashbin')
+			->addArgument(
+				'user_id',
+				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+				'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+
+		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
+		if (!$maxAge) {
+			$output->writeln("No expiry configured.");
+			return;
+		}
+
+		$users = $input->getArgument('user_id');
+		if (!empty($users)) {
+			foreach ($users as $user) {
+				if ($this->userManager->userExists($user)) {
+					$output->writeln("Remove deleted files of   <info>$user</info>");
+					$userObject = $this->userManager->get($user);
+					$this->expireTrashForUser($userObject);
+				} else {
+					$output->writeln("<error>Unknown user $user</error>");
+				}
+			}
+		} else {
+			$p = new ProgressBar($output);
+			$p->start();
+			$this->userManager->callForAllUsers(function(IUser $user) use ($p) {
+				$p->advance();
+				$this->expireTrashForUser($user);
+			});
+			$p->finish();
+			$output->writeln('');
+		}
+	}
+
+	function expireTrashForUser(IUser $user) {
+		$uid = $user->getUID();
+		if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) {
+			return;
+		}
+		$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+		Trashbin::deleteExpiredFiles($dirContent, $uid);
+	}
+
+	/**
+	 * Act on behalf on trash item owner
+	 * @param string $user
+	 * @return boolean
+	 */
+	protected function setupFS($user) {
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($user);
+
+		// Check if this user has a trashbin directory
+		$view = new \OC\Files\View('/' . $user);
+		if (!$view->is_dir('/files_trashbin/files')) {
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/apps/files_versions/appinfo/register_command.php b/apps/files_versions/appinfo/register_command.php
index 9f3c34f2f7c1..2c0bf3a364ca 100644
--- a/apps/files_versions/appinfo/register_command.php
+++ b/apps/files_versions/appinfo/register_command.php
@@ -20,9 +20,14 @@
  */
 
 
+use OCA\Files_Versions\AppInfo\Application;
 use OCA\Files_Versions\Command\CleanUp;
+use OCA\Files_Versions\Command\ExpireVersions;
 
+$app = new Application();
+$expiration = $app->getContainer()->query('Expiration');
 $userManager = OC::$server->getUserManager();
 $rootFolder = \OC::$server->getRootFolder();
 /** @var Symfony\Component\Console\Application $application */
 $application->add(new CleanUp($rootFolder, $userManager));
+$application->add(new ExpireVersions($userManager, $expiration));
diff --git a/apps/files_versions/lib/Command/ExpireVersions.php b/apps/files_versions/lib/Command/ExpireVersions.php
new file mode 100644
index 000000000000..f384420f22f7
--- /dev/null
+++ b/apps/files_versions/lib/Command/ExpireVersions.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2016, ownCloud GmbH.
+ * @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/>
+ *
+ */
+
+namespace OCA\Files_Versions\Command;
+
+use OCA\Files_Versions\Expiration;
+use OCA\Files_Versions\Storage;
+use OCP\IUser;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ExpireVersions extends Command {
+
+	/**
+	 * @var Expiration
+	 */
+	private $expiration;
+	
+	/**
+	 * @var IUserManager
+	 */
+	private $userManager;
+
+	/**
+	 * @param IUserManager|null $userManager
+	 * @param Expiration|null $expiration
+	 */
+	public function __construct(IUserManager $userManager = null,
+								Expiration $expiration = null) {
+		parent::__construct();
+
+		$this->userManager = $userManager;
+		$this->expiration = $expiration;
+	}
+
+	protected function configure() {
+		$this
+			->setName('versions:expire')
+			->setDescription('Expires the users file versions')
+			->addArgument(
+				'user_id',
+				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+				'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+
+		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
+		if (!$maxAge) {
+			$output->writeln("No expiry configured.");
+			return;
+		}
+
+		$users = $input->getArgument('user_id');
+		if (!empty($users)) {
+			foreach ($users as $user) {
+				if ($this->userManager->userExists($user)) {
+					$output->writeln("Remove deleted files of   <info>$user</info>");
+					$userObject = $this->userManager->get($user);
+					$this->expireVersionsForUser($userObject);
+				} else {
+					$output->writeln("<error>Unknown user $user</error>");
+				}
+			}
+		} else {
+			$p = new ProgressBar($output);
+			$p->start();
+			$this->userManager->callForAllUsers(function(IUser $user) use ($p) {
+				$p->advance();
+				$this->expireVersionsForUser($user);
+			});
+			$p->finish();
+			$output->writeln('');
+		}
+	}
+
+	function expireVersionsForUser(IUser $user) {
+		$uid = $user->getUID();
+		if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) {
+			return;
+		}
+		Storage::expireOlderThanMaxForUser($uid);
+	}
+
+	/**
+	 * Act on behalf on versions item owner
+	 * @param string $user
+	 * @return boolean
+	 */
+	protected function setupFS($user) {
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($user);
+
+		// Check if this user has a version directory
+		$view = new \OC\Files\View('/' . $user);
+		if (!$view->is_dir('/files_versions')) {
+			return false;
+		}
+
+		return true;
+	}
+}

From 85e8a46e148a01d12a755e03d681b3096428c675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 23 Aug 2016 15:12:10 +0200
Subject: [PATCH 078/219] [stable9.1] 2FA can now be enabled and disabled via
 the provisioning api (#25911)

* [stable9.1] 2FA can now be enabled and disabled via the provisioning api

* [9.1] Return proper 'true' and 'false' values for two_factor_auth_enabled in provisioning api
---
 apps/provisioning_api/appinfo/routes.php  |   3 +-
 apps/provisioning_api/lib/Users.php       | 182 +++++++++++---------
 apps/provisioning_api/tests/UsersTest.php | 197 +++++++++++++---------
 3 files changed, 218 insertions(+), 164 deletions(-)

diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php
index 3201f9a6ceeb..43224ab342b2 100644
--- a/apps/provisioning_api/appinfo/routes.php
+++ b/apps/provisioning_api/appinfo/routes.php
@@ -38,7 +38,8 @@
 	\OC::$server->getConfig(),
 	\OC::$server->getGroupManager(),
 	\OC::$server->getUserSession(),
-	\OC::$server->getLogger()
+	\OC::$server->getLogger(),
+	\OC::$server->getTwoFactorAuthManager()
 );
 API::register('get', '/cloud/users', [$users, 'getUsers'], 'provisioning_api', API::SUBADMIN_AUTH);
 API::register('post', '/cloud/users', [$users, 'addUser'], 'provisioning_api', API::SUBADMIN_AUTH);
diff --git a/apps/provisioning_api/lib/Users.php b/apps/provisioning_api/lib/Users.php
index a1430862a508..323948d96efd 100644
--- a/apps/provisioning_api/lib/Users.php
+++ b/apps/provisioning_api/lib/Users.php
@@ -28,14 +28,18 @@
 
 namespace OCA\Provisioning_API;
 
-use \OC_OCS_Result;
+use OC\OCS\Result;
 use \OC_Helper;
+use OCP\API;
 use OCP\Files\NotFoundException;
 use OCP\IConfig;
+use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\ILogger;
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use OCP\Util;
 
 class Users {
 
@@ -49,6 +53,8 @@ class Users {
 	private $userSession;
 	/** @var ILogger */
 	private $logger;
+	/** @var \OC\Authentication\TwoFactorAuth\Manager */
+	private $twoFactorAuthManager;
 
 	/**
 	 * @param IUserManager $userManager
@@ -61,18 +67,20 @@ public function __construct(IUserManager $userManager,
 								IConfig $config,
 								IGroupManager $groupManager,
 								IUserSession $userSession,
-								ILogger $logger) {
+								ILogger $logger,
+								\OC\Authentication\TwoFactorAuth\Manager $twoFactorAuthManager ) {
 		$this->userManager = $userManager;
 		$this->config = $config;
 		$this->groupManager = $groupManager;
 		$this->userSession = $userSession;
 		$this->logger = $logger;
+		$this->twoFactorAuthManager = $twoFactorAuthManager;
 	}
 
 	/**
 	 * returns a list of users
 	 *
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function getUsers() {
 		$search = !empty($_GET['search']) ? $_GET['search'] : '';
@@ -82,7 +90,7 @@ public function getUsers() {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
 		if ($user === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 
 		// Admin? Or SubAdmin?
@@ -107,17 +115,17 @@ public function getUsers() {
 
 			$users = array_slice($users, $offset, $limit);
 		} else {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 		$users = array_keys($users);
 
-		return new OC_OCS_Result([
+		return new Result([
 			'users' => $users
 		]);
 	}
 
 	/**
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function addUser() {
 		$userId = isset($_POST['userid']) ? $_POST['userid'] : null;
@@ -128,26 +136,26 @@ public function addUser() {
 		$subAdminManager = $this->groupManager->getSubAdmin();
 
 		if (!$isAdmin && !$subAdminManager->isSubAdmin($user)) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 
 		if($this->userManager->userExists($userId)) {
 			$this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
-			return new OC_OCS_Result(null, 102, 'User already exists');
+			return new Result(null, 102, 'User already exists');
 		}
 
 		if(is_array($groups)) {
 			foreach ($groups as $group) {
 				if(!$this->groupManager->groupExists($group)){
-					return new OC_OCS_Result(null, 104, 'group '.$group.' does not exist');
+					return new Result(null, 104, 'group '.$group.' does not exist');
 				}
 				if(!$isAdmin && !$subAdminManager->isSubAdminofGroup($user, $this->groupManager->get($group))) {
-					return new OC_OCS_Result(null, 105, 'insufficient privileges for group '. $group);
+					return new Result(null, 105, 'insufficient privileges for group '. $group);
 				}
 			}
 		} else {
 			if(!$isAdmin) {
-				return new OC_OCS_Result(null, 106, 'no group specified (required for subadmins)');
+				return new Result(null, 106, 'no group specified (required for subadmins)');
 			}
 		}
 		
@@ -161,10 +169,10 @@ public function addUser() {
 					$this->logger->info('Added userid '.$userId.' to group '.$group, ['app' => 'ocs_api']);
 				}
 			}
-			return new OC_OCS_Result(null, 100);
+			return new Result(null, 100);
 		} catch (\Exception $e) {
 			$this->logger->error('Failed addUser attempt with exception: '.$e->getMessage(), ['app' => 'ocs_api']);
-			return new OC_OCS_Result(null, 101, 'Bad request');
+			return new Result(null, 101, 'Bad request');
 		}
 	}
 
@@ -172,7 +180,7 @@ public function addUser() {
 	 * gets user info
 	 *
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function getUser($parameters) {
 		$userId = $parameters['userid'];
@@ -180,7 +188,7 @@ public function getUser($parameters) {
 		// Check if user is logged in
 		$currentLoggedInUser = $this->userSession->getUser();
 		if ($currentLoggedInUser === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 
 		$data = [];
@@ -188,7 +196,7 @@ public function getUser($parameters) {
 		// Check if the target user exists
 		$targetUserObject = $this->userManager->get($userId);
 		if($targetUserObject === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested user could not be found');
+			return new Result(null, API::RESPOND_NOT_FOUND, 'The requested user could not be found');
 		}
 
 		// Admin? Or SubAdmin?
@@ -198,7 +206,7 @@ public function getUser($parameters) {
 		} else {
 			// Check they are looking up themselves
 			if($currentLoggedInUser->getUID() !== $userId) {
-				return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+				return new Result(null, API::RESPOND_UNAUTHORISED);
 			}
 		}
 
@@ -206,15 +214,16 @@ public function getUser($parameters) {
 		$data['quota'] = $this->fillStorageInfo($userId);
 		$data['email'] = $targetUserObject->getEMailAddress();
 		$data['displayname'] = $targetUserObject->getDisplayName();
+		$data['two_factor_auth_enabled'] = $this->twoFactorAuthManager->isTwoFactorAuthenticated($targetUserObject) ? 'true' : 'false';
 
-		return new OC_OCS_Result($data);
+		return new Result($data);
 	}
 
 	/** 
 	 * edit users
 	 *
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function editUser($parameters) {
 		/** @var string $targetUserId */
@@ -223,12 +232,12 @@ public function editUser($parameters) {
 		// Check if user is logged in
 		$currentLoggedInUser = $this->userSession->getUser();
 		if ($currentLoggedInUser === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 
 		$targetUser = $this->userManager->get($targetUserId);
 		if($targetUser === null) {
-			return new OC_OCS_Result(null, 997);
+			return new Result(null, 997);
 		}
 
 		if($targetUserId === $currentLoggedInUser->getUID()) {
@@ -236,6 +245,7 @@ public function editUser($parameters) {
 			$permittedFields[] = 'display';
 			$permittedFields[] = 'email';
 			$permittedFields[] = 'password';
+			$permittedFields[] = 'two_factor_auth_enabled';
 			// If admin they can edit their own quota
 			if($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
 				$permittedFields[] = 'quota';
@@ -250,14 +260,15 @@ public function editUser($parameters) {
 				$permittedFields[] = 'quota';
 				$permittedFields[] = 'password';
 				$permittedFields[] = 'email';
+				$permittedFields[] = 'two_factor_auth_enabled';
 			} else {
 				// No rights
-				return new OC_OCS_Result(null, 997);
+				return new Result(null, 997);
 			}
 		}
 		// Check if permitted to edit this field
 		if(!in_array($parameters['_put']['key'], $permittedFields)) {
-			return new OC_OCS_Result(null, 997);
+			return new Result(null, 997);
 		}
 		// Process the edit
 		switch($parameters['_put']['key']) {
@@ -270,17 +281,17 @@ public function editUser($parameters) {
 					if (is_numeric($quota)) {
 						$quota = floatval($quota);
 					} else {
-						$quota = \OCP\Util::computerFileSize($quota);
+						$quota = Util::computerFileSize($quota);
 					}
 					if ($quota === false) {
-						return new OC_OCS_Result(null, 103, "Invalid quota value {$parameters['_put']['value']}");
+						return new Result(null, 103, "Invalid quota value {$parameters['_put']['value']}");
 					}
 					if($quota === 0) {
 						$quota = 'default';
 					}else if($quota === -1) {
 						$quota = 'none';
 					} else {
-						$quota = \OCP\Util::humanFileSize($quota);
+						$quota = Util::humanFileSize($quota);
 					}
 				}
 				$targetUser->setQuota($quota);
@@ -288,54 +299,61 @@ public function editUser($parameters) {
 			case 'password':
 				$targetUser->setPassword($parameters['_put']['value']);
 				break;
+			case 'two_factor_auth_enabled':
+				if ($parameters['_put']['value'] === true) {
+					$this->twoFactorAuthManager->enableTwoFactorAuthentication($targetUser);
+				} else {
+					$this->twoFactorAuthManager->disableTwoFactorAuthentication($targetUser);
+				}
+				break;
 			case 'email':
 				if(filter_var($parameters['_put']['value'], FILTER_VALIDATE_EMAIL)) {
 					$targetUser->setEMailAddress($parameters['_put']['value']);
 				} else {
-					return new OC_OCS_Result(null, 102);
+					return new Result(null, 102);
 				}
 				break;
 			default:
-				return new OC_OCS_Result(null, 103);
+				return new Result(null, 103);
 				break;
 		}
-		return new OC_OCS_Result(null, 100);
+		return new Result(null, 100);
 	}
 
 	/**
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function deleteUser($parameters) {
 		// Check if user is logged in
 		$currentLoggedInUser = $this->userSession->getUser();
 		if ($currentLoggedInUser === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 
 		$targetUser = $this->userManager->get($parameters['userid']);
 
 		if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			return new OC_OCS_Result(null, 101);
+			return new Result(null, 101);
 		}
 
 		// If not permitted
 		$subAdminManager = $this->groupManager->getSubAdmin();
 		if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			return new OC_OCS_Result(null, 997);
+			return new Result(null, 997);
 		}
 
 		// Go ahead with the delete
 		if($targetUser->delete()) {
-			return new OC_OCS_Result(null, 100);
+			return new Result(null, 100);
 		} else {
-			return new OC_OCS_Result(null, 101);
+			return new Result(null, 101);
 		}
 	}
 
 	/**
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function disableUser($parameters) {
 		return $this->setEnabled($parameters, false);
@@ -343,7 +361,7 @@ public function disableUser($parameters) {
 
 	/**
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function enableUser($parameters) {
 		return $this->setEnabled($parameters, true);
@@ -352,50 +370,50 @@ public function enableUser($parameters) {
 	/**
 	 * @param array $parameters
 	 * @param bool $value
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	private function setEnabled($parameters, $value) {
 		// Check if user is logged in
 		$currentLoggedInUser = $this->userSession->getUser();
 		if ($currentLoggedInUser === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 
 		$targetUser = $this->userManager->get($parameters['userid']);
 		if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			return new OC_OCS_Result(null, 101);
+			return new Result(null, 101);
 		}
 
 		// If not permitted
 		$subAdminManager = $this->groupManager->getSubAdmin();
 		if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			return new OC_OCS_Result(null, 997);
+			return new Result(null, 997);
 		}
 
 		// enable/disable the user now
 		$targetUser->setEnabled($value);
-		return new OC_OCS_Result(null, 100);
+		return new Result(null, 100);
 	}
 
 	/**
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function getUsersGroups($parameters) {
 		// Check if user is logged in
 		$loggedInUser = $this->userSession->getUser();
 		if ($loggedInUser === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 
 		$targetUser = $this->userManager->get($parameters['userid']);
 		if($targetUser === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND);
+			return new Result(null, API::RESPOND_NOT_FOUND);
 		}
 
 		if($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
 			// Self lookup or admin lookup
-			return new OC_OCS_Result([
+			return new Result([
 				'groups' => $this->groupManager->getUserGroupIds($targetUser)
 			]);
 		} else {
@@ -412,10 +430,10 @@ public function getUsersGroups($parameters) {
 					$getSubAdminsGroups,
 					$this->groupManager->getUserGroupIds($targetUser)
 				);
-				return new OC_OCS_Result(array('groups' => $groups));
+				return new Result(array('groups' => $groups));
 			} else {
 				// Not permitted
-				return new OC_OCS_Result(null, 997);
+				return new Result(null, 997);
 			}
 		}
 		
@@ -444,74 +462,74 @@ private function canUserManageGroup($user, $group) {
 
 	/**
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function addToGroup($parameters) {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
 		if ($user === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 
 		$groupId = !empty($_POST['groupid']) ? $_POST['groupid'] : null;
 		if($groupId === null) {
-			return new OC_OCS_Result(null, 101);
+			return new Result(null, 101);
 		}
 
 		$group = $this->groupManager->get($groupId);
 		if ($group === null) {
-			return new OC_OCS_Result(null, 102);
+			return new Result(null, 102);
 		}
 
 		// Check they're an admin or subadmin of the group
 		if(!$this->canUserManageGroup($user, $group)) {
-			return new OC_OCS_Result(null, 104);
+			return new Result(null, 104);
 		}
 
 		$targetUser = $this->userManager->get($parameters['userid']);
 		if($targetUser === null) {
-			return new OC_OCS_Result(null, 103);
+			return new Result(null, 103);
 		}
 
 		// Add user to group
 		$group->addUser($targetUser);
-		return new OC_OCS_Result(null, 100);
+		return new Result(null, 100);
 	}
 
 	/**
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function removeFromGroup($parameters) {
 		// Check if user is logged in
 		$loggedInUser = $this->userSession->getUser();
 		if ($loggedInUser === null) {
-			return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+			return new Result(null, API::RESPOND_UNAUTHORISED);
 		}
 
 		$group = !empty($parameters['_delete']['groupid']) ? $parameters['_delete']['groupid'] : null;
 		if($group === null) {
-			return new OC_OCS_Result(null, 101);
+			return new Result(null, 101);
 		}
 
 		$group = $this->groupManager->get($group);
 		if($group === null) {
-			return new OC_OCS_Result(null, 102);
+			return new Result(null, 102);
 		}
 
 		if(!$this->canUserManageGroup($loggedInUser, $group)) {
-			return new OC_OCS_Result(null, 104);
+			return new Result(null, 104);
 		}
 
 		$targetUser = $this->userManager->get($parameters['userid']);
 		if($targetUser === null) {
-			return new OC_OCS_Result(null, 103);
+			return new Result(null, 103);
 		}
 		// Check they aren't removing themselves from 'admin' or their 'subadmin; group
 		if($parameters['userid'] === $loggedInUser->getUID()) {
 			if($this->groupManager->isAdmin($loggedInUser->getUID())) {
 				if($group->getGID() === 'admin') {
-					return new OC_OCS_Result(null, 105, 'Cannot remove yourself from the admin group');
+					return new Result(null, 105, 'Cannot remove yourself from the admin group');
 				}
 			} else {
 				// Not an admin, check they are not removing themself from their subadmin group
@@ -522,21 +540,21 @@ public function removeFromGroup($parameters) {
 				}
 
 				if(in_array($group->getGID(), $subAdminGroups, true)) {
-					return new OC_OCS_Result(null, 105, 'Cannot remove yourself from this group as you are a SubAdmin');
+					return new Result(null, 105, 'Cannot remove yourself from this group as you are a SubAdmin');
 				}
 			}
 		}
 
 		// Remove user from group
 		$group->removeUser($targetUser);
-		return new OC_OCS_Result(null, 100);
+		return new Result(null, 100);
 	}
 
 	/**
 	 * Creates a subadmin
 	 *
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function addSubAdmin($parameters) {
 		$group = $this->groupManager->get($_POST['groupid']);
@@ -544,28 +562,28 @@ public function addSubAdmin($parameters) {
 
 		// Check if the user exists
 		if($user === null) {
-			return new OC_OCS_Result(null, 101, 'User does not exist');
+			return new Result(null, 101, 'User does not exist');
 		}
 		// Check if group exists
 		if($group === null) {
-			return new OC_OCS_Result(null, 102, 'Group:'.$_POST['groupid'].' does not exist');
+			return new Result(null, 102, 'Group:'.$_POST['groupid'].' does not exist');
 		}
 		// Check if trying to make subadmin of admin group
 		if(strtolower($_POST['groupid']) === 'admin') {
-			return new OC_OCS_Result(null, 103, 'Cannot create subadmins for admin group');
+			return new Result(null, 103, 'Cannot create subadmins for admin group');
 		}
 
 		$subAdminManager = $this->groupManager->getSubAdmin();
 
 		// We cannot be subadmin twice
 		if ($subAdminManager->isSubAdminofGroup($user, $group)) {
-			return new OC_OCS_Result(null, 100);
+			return new Result(null, 100);
 		}
 		// Go
 		if($subAdminManager->createSubAdmin($user, $group)) {
-			return new OC_OCS_Result(null, 100);
+			return new Result(null, 100);
 		} else {
-			return new OC_OCS_Result(null, 103, 'Unknown error occurred');
+			return new Result(null, 103, 'Unknown error occurred');
 		}
 	}
 
@@ -573,7 +591,7 @@ public function addSubAdmin($parameters) {
 	 * Removes a subadmin from a group
 	 *
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function removeSubAdmin($parameters) {
 		$group = $this->groupManager->get($parameters['_delete']['groupid']);
@@ -582,22 +600,22 @@ public function removeSubAdmin($parameters) {
 
 		// Check if the user exists
 		if($user === null) {
-			return new OC_OCS_Result(null, 101, 'User does not exist');
+			return new Result(null, 101, 'User does not exist');
 		}
 		// Check if the group exists
 		if($group === null) {
-			return new OC_OCS_Result(null, 101, 'Group does not exist');
+			return new Result(null, 101, 'Group does not exist');
 		}
 		// Check if they are a subadmin of this said group
 		if(!$subAdminManager->isSubAdminofGroup($user, $group)) {
-			return new OC_OCS_Result(null, 102, 'User is not a subadmin of this group');
+			return new Result(null, 102, 'User is not a subadmin of this group');
 		}
 
 		// Go
 		if($subAdminManager->deleteSubAdmin($user, $group)) {
-			return new OC_OCS_Result(null, 100);
+			return new Result(null, 100);
 		} else {
-			return new OC_OCS_Result(null, 103, 'Unknown error occurred');
+			return new Result(null, 103, 'Unknown error occurred');
 		}
 	}
 
@@ -605,13 +623,13 @@ public function removeSubAdmin($parameters) {
 	 * Get the groups a user is a subadmin of
 	 *
 	 * @param array $parameters
-	 * @return OC_OCS_Result
+	 * @return Result
 	 */
 	public function getUserSubAdminGroups($parameters) {
 		$user = $this->userManager->get($parameters['userid']);
 		// Check if the user exists
 		if($user === null) {
-			return new OC_OCS_Result(null, 101, 'User does not exist');
+			return new Result(null, 101, 'User does not exist');
 		}
 
 		// Get the subadmin groups
@@ -621,9 +639,9 @@ public function getUserSubAdminGroups($parameters) {
 		}
 
 		if(!$groups) {
-			return new OC_OCS_Result(null, 102, 'Unknown error occurred');
+			return new Result(null, 102, 'Unknown error occurred');
 		} else {
-			return new OC_OCS_Result($groups);
+			return new Result($groups);
 		}
 	}
 
diff --git a/apps/provisioning_api/tests/UsersTest.php b/apps/provisioning_api/tests/UsersTest.php
index 39aa19640668..c49ad1d75e8a 100644
--- a/apps/provisioning_api/tests/UsersTest.php
+++ b/apps/provisioning_api/tests/UsersTest.php
@@ -28,6 +28,7 @@
 
 namespace OCA\Provisioning_API\Tests;
 
+use OC\OCS\Result;
 use OCA\Provisioning_API\Users;
 use OCP\API;
 use OCP\IUserManager;
@@ -51,6 +52,8 @@ class UsersTest extends OriginalTest {
 	protected $logger;
 	/** @var Users | PHPUnit_Framework_MockObject_MockObject */
 	protected $api;
+	/** @var \OC\Authentication\TwoFactorAuth\Manager | PHPUnit_Framework_MockObject_MockObject */
+	private $twoFactorAuthManager;
 
 	protected function tearDown() {
 		$_GET = null;
@@ -68,6 +71,13 @@ protected function setUp() {
 			->getMock();
 		$this->userSession = $this->getMock('OCP\IUserSession');
 		$this->logger = $this->getMock('OCP\ILogger');
+		$this->twoFactorAuthManager = $this->getMockBuilder('\OC\Authentication\TwoFactorAuth\Manager')
+			->disableOriginalConstructor()
+			->setMethods(['isTwoFactorAuthenticated', 'enableTwoFactorAuthentication'])
+			->getMock();
+		$this->twoFactorAuthManager->expects($this->any())
+			->method('isTwoFactorAuthenticated')
+			->willReturn(false);
 		$this->api = $this->getMockBuilder('OCA\Provisioning_API\Users')
 			->setConstructorArgs([
 				$this->userManager,
@@ -75,6 +85,7 @@ protected function setUp() {
 				$this->groupManager,
 				$this->userSession,
 				$this->logger,
+				$this->twoFactorAuthManager
 			])
 			->setMethods(['fillStorageInfo'])
 			->getMock();
@@ -86,7 +97,7 @@ public function testGetUsersNotLoggedIn() {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
+		$expected = new Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->getUsers());
 	}
 
@@ -112,7 +123,7 @@ public function testGetUsersAsAdmin() {
 			->with('MyCustomSearch', null, null)
 			->will($this->returnValue(['Admin' => [], 'Foo' => [], 'Bar' => []]));
 
-		$expected = new \OC_OCS_Result([
+		$expected = new Result([
 			'users' => [
 				'Admin',
 				'Foo',
@@ -169,7 +180,7 @@ public function testGetUsersAsSubAdmin() {
 			->method('displayNamesInGroup')
 			->will($this->onConsecutiveCalls(['AnotherUserInTheFirstGroup' => []], ['UserInTheSecondGroup' => []]));
 
-		$expected = new \OC_OCS_Result([
+		$expected = new Result([
 			'users' => [
 				'AnotherUserInTheFirstGroup',
 				'UserInTheSecondGroup',
@@ -206,7 +217,7 @@ public function testGetUsersAsRegularUser() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
+		$expected = new Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->getUsers());
 	}
 
@@ -236,7 +247,7 @@ public function testAddUserAlreadyExisting() {
 			->with('adminUser')
 			->willReturn(true);
 
-		$expected = new \OC_OCS_Result(null, 102, 'User already exists');
+		$expected = new Result(null, 102, 'User already exists');
 		$this->assertEquals($expected, $this->api->addUser());
 	}
 
@@ -268,7 +279,7 @@ public function testAddUserNonExistingGroup() {
 			->with('NonExistingGroup')
 			->willReturn(false);
 
-		$expected = new \OC_OCS_Result(null, 104, 'group NonExistingGroup does not exist');
+		$expected = new Result(null, 104, 'group NonExistingGroup does not exist');
 		$this->assertEquals($expected, $this->api->addUser());
 	}
 
@@ -306,7 +317,7 @@ public function testAddUserExistingGroupNonExistingGroup() {
 				['NonExistingGroup', false]
 			]));
 
-		$expected = new \OC_OCS_Result(null, 104, 'group NonExistingGroup does not exist');
+		$expected = new Result(null, 104, 'group NonExistingGroup does not exist');
 		$this->assertEquals($expected, $this->api->addUser());
 	}
 
@@ -341,7 +352,7 @@ public function testAddUserSuccessful() {
 			->with('adminUser')
 			->willReturn(true);
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->addUser());
 	}
 
@@ -397,7 +408,7 @@ public function testAddUserExistingGroup() {
 				['Added userid NewUser to group ExistingGroup', ['app' => 'ocs_api']]
 			);
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->addUser());
 	}
 
@@ -433,7 +444,7 @@ public function testAddUserUnsuccessful() {
 			->with('adminUser')
 			->willReturn(true);
 
-		$expected = new \OC_OCS_Result(null, 101, 'Bad request');
+		$expected = new Result(null, 101, 'Bad request');
 		$this->assertEquals($expected, $this->api->addUser());
 	}
 
@@ -467,7 +478,7 @@ public function testAddUserAsRegularUser() {
 			->with()
 			->willReturn($subAdminManager);
 
-		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
+		$expected = new Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->addUser());	
 	}
 
@@ -501,7 +512,7 @@ public function testAddUserAsSubAdminNoGroup() {
 			->with()
 			->willReturn($subAdminManager);
 
-		$expected = new \OC_OCS_Result(null, 106, 'no group specified (required for subadmins)');
+		$expected = new Result(null, 106, 'no group specified (required for subadmins)');
 		$this->assertEquals($expected, $this->api->addUser());	
 	}
 
@@ -552,7 +563,7 @@ public function testAddUserAsSubAdminValidGroupNotSubAdmin() {
 			->with('ExistingGroup')
 			->willReturn(true);
 
-		$expected = new \OC_OCS_Result(null, 105, 'insufficient privileges for group ExistingGroup');
+		$expected = new Result(null, 105, 'insufficient privileges for group ExistingGroup');
 		$this->assertEquals($expected, $this->api->addUser());	
 	}
 
@@ -645,7 +656,7 @@ public function testAddUserAsSubAdminExistingGroups() {
 			->willReturn(true);
 
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->addUser());
 	}
 
@@ -656,7 +667,7 @@ public function testGetUserNotLoggedIn() {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
+		$expected = new Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
 	}
 
@@ -672,7 +683,7 @@ public function testGetUserTargetDoesNotExist() {
 			->with('UserToGet')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, API::RESPOND_NOT_FOUND, 'The requested user could not be found');
+		$expected = new Result(null, API::RESPOND_NOT_FOUND, 'The requested user could not be found');
 		$this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
 	}
 
@@ -715,12 +726,13 @@ public function testGetUserAsAdmin() {
 			->method('getDisplayName')
 			->will($this->returnValue('Demo User'));
 
-		$expected = new \OC_OCS_Result(
+		$expected = new Result(
 			[
 				'enabled' => 'true',
 				'quota' => ['DummyValue'],
 				'email' => 'demo@owncloud.org',
 				'displayname' => 'Demo User',
+				'two_factor_auth_enabled' => 'false'
 			]
 		);
 		$this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
@@ -778,12 +790,13 @@ public function testGetUserAsSubAdminAndUserIsAccessible() {
 			->method('getDisplayName')
 			->will($this->returnValue('Demo User'));
 
-		$expected = new \OC_OCS_Result(
+		$expected = new Result(
 			[
 				'enabled' => 'true',
 				'quota' => ['DummyValue'],
 				'email' => 'demo@owncloud.org',
 				'displayname' => 'Demo User',
+				'two_factor_auth_enabled' => 'false'
 			]
 		);
 		$this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
@@ -823,7 +836,7 @@ public function testGetUserAsSubAdminAndUserIsNotAccessible() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
+		$expected = new Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
 	}
 
@@ -874,10 +887,11 @@ public function testGetUserAsSubAdminSelfLookup() {
 			->method('getEMailAddress')
 			->will($this->returnValue('subadmin@owncloud.org'));
 
-		$expected = new \OC_OCS_Result([
+		$expected = new Result([
 			'quota' => ['DummyValue'],
 			'email' => 'subadmin@owncloud.org',
 			'displayname' => 'Subadmin User',
+			'two_factor_auth_enabled' => 'false'
 		]);
 		$this->assertEquals($expected, $this->api->getUser(['userid' => 'subadmin']));
 	}
@@ -888,7 +902,7 @@ public function testEditUserNotLoggedIn() {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
+		$expected = new Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit']));
 	}
 
@@ -913,7 +927,7 @@ public function testEditUserRegularUserSelfEditChangeDisplayName() {
 			->method('setDisplayName')
 			->with('NewDisplayName');
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'display', 'value' => 'NewDisplayName']]));
 	}
 
@@ -938,7 +952,7 @@ public function testEditUserRegularUserSelfEditChangeEmailValid() {
 			->method('setEMailAddress')
 			->with('demo@owncloud.org');
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'email', 'value' => 'demo@owncloud.org']]));
 	}
 
@@ -959,7 +973,7 @@ public function testEditUserRegularUserSelfEditChangeEmailInvalid() {
 			->with('UserToEdit')
 			->will($this->returnValue($targetUser));
 
-		$expected = new \OC_OCS_Result(null, 102);
+		$expected = new Result(null, 102);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'email', 'value' => 'demo.org']]));
 	}
 
@@ -984,7 +998,7 @@ public function testEditUserRegularUserSelfEditChangePassword() {
 			->method('setPassword')
 			->with('NewPassword');
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'password', 'value' => 'NewPassword']]));
 	}
 
@@ -1005,10 +1019,34 @@ public function testEditUserRegularUserSelfEditChangeQuota() {
 			->with('UserToEdit')
 			->will($this->returnValue($targetUser));
 
-		$expected = new \OC_OCS_Result(null, 997);
+		$expected = new Result(null, 997);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => 'NewQuota']]));
 	}
 
+	public function testEditTwoFactor() {
+		$loggedInUser = $this->getMock('OCP\IUser');
+		$loggedInUser
+			->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('UserToEdit'));
+		$targetUser = $this->getMock('OCP\IUser');
+		$this->userSession
+			->expects($this->once())
+			->method('getUser')
+			->will($this->returnValue($loggedInUser));
+		$this->userManager
+			->expects($this->once())
+			->method('get')
+			->with('UserToEdit')
+			->will($this->returnValue($targetUser));
+		$this->twoFactorAuthManager
+			->expects($this->once())
+			->method('enableTwoFactorAuthentication');
+
+		$expected = new Result(null, 100);
+		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'two_factor_auth_enabled', 'value' => true]]));
+	}
+
 	public function testEditUserAdminUserSelfEditChangeValidQuota() {
 		$loggedInUser = $this->getMock('OCP\IUser');
 		$loggedInUser
@@ -1034,7 +1072,7 @@ public function testEditUserAdminUserSelfEditChangeValidQuota() {
 			->with('UserToEdit')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
 	}
 
@@ -1060,7 +1098,7 @@ public function testEditUserAdminUserSelfEditChangeInvalidQuota() {
 			->with('UserToEdit')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(null, 103, 'Invalid quota value ABC');
+		$expected = new Result(null, 103, 'Invalid quota value ABC');
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => 'ABC']]));
 	}
 
@@ -1096,7 +1134,7 @@ public function testEditUserAdminUserEditChangeValidQuota() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
 	}
 
@@ -1132,7 +1170,7 @@ public function testEditUserSubadminUserAccessible() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
 	}
 
@@ -1165,7 +1203,7 @@ public function testEditUserSubadminUserInaccessible() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 997);
+		$expected = new Result(null, 997);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
 	}
 
@@ -1175,7 +1213,7 @@ public function testDeleteUserNotLoggedIn() {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 997);
+		$expected = new Result(null, 997);
 		$this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
 	}
 
@@ -1195,7 +1233,7 @@ public function testDeleteUserNotExistingUser() {
 			->with('UserToDelete')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 101);
+		$expected = new Result(null, 101);
 		$this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
 	}
 
@@ -1220,7 +1258,7 @@ public function testDeleteUserSelf() {
 			->with('UserToDelete')
 			->will($this->returnValue($targetUser));
 
-		$expected = new \OC_OCS_Result(null, 101);
+		$expected = new Result(null, 101);
 		$this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
 	}
 
@@ -1254,7 +1292,7 @@ public function testDeleteSuccessfulUserAsAdmin() {
 			->method('delete')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
 	}
 
@@ -1288,7 +1326,7 @@ public function testDeleteUnsuccessfulUserAsAdmin() {
 			->method('delete')
 			->will($this->returnValue(false));
 
-		$expected = new \OC_OCS_Result(null, 101);
+		$expected = new Result(null, 101);
 		$this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
 	}
 
@@ -1333,7 +1371,7 @@ public function testDeleteSuccessfulUserAsSubadmin() {
 			->method('delete')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
 	}
 
@@ -1378,7 +1416,7 @@ public function testDeleteUnsuccessfulUserAsSubadmin() {
 			->method('delete')
 			->will($this->returnValue(false));
 
-		$expected = new \OC_OCS_Result(null, 101);
+		$expected = new Result(null, 101);
 		$this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
 	}
 
@@ -1419,7 +1457,7 @@ public function testDeleteUserAsSubAdminAndUserIsNotAccessible() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 997);
+		$expected = new Result(null, 997);
 		$this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
 	}
 
@@ -1429,7 +1467,7 @@ public function testGetUsersGroupsNotLoggedIn() {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 997);
+		$expected = new Result(null, 997);
 		$this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
 	}
 
@@ -1440,7 +1478,7 @@ public function testGetUsersGroupsTargetUserNotExisting() {
 			->method('getUser')
 			->will($this->returnValue($loggedInUser));
 
-		$expected = new \OC_OCS_Result(null, 998);
+		$expected = new Result(null, 998);
 		$this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
 	}
 
@@ -1470,7 +1508,7 @@ public function testGetUsersGroupsSelfTargetted() {
 			->with($targetUser)
 			->will($this->returnValue(['DummyValue']));
 
-		$expected = new \OC_OCS_Result(['groups' => ['DummyValue']]);
+		$expected = new Result(['groups' => ['DummyValue']]);
 		$this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
 	}
 
@@ -1505,7 +1543,7 @@ public function testGetUsersGroupsForAdminUser() {
 			->with('admin')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(['groups' => ['DummyValue']]);
+		$expected = new Result(['groups' => ['DummyValue']]);
 		$this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
 	}
 
@@ -1566,7 +1604,7 @@ public function testGetUsersGroupsForSubAdminUserAndUserIsAccessible() {
 			->with($targetUser)
 			->will($this->returnValue(['Group1']));
 
-		$expected = new \OC_OCS_Result(['groups' => ['Group1']]);
+		$expected = new Result(['groups' => ['Group1']]);
 		$this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
 	}
 
@@ -1613,7 +1651,7 @@ public function testGetUsersGroupsForSubAdminUserAndUserIsInaccessible() {
 			->with($targetUser)
 			->will($this->returnValue(['Group1']));
 
-		$expected = new \OC_OCS_Result(null, 997);
+		$expected = new Result(null, 997);
 		$this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
 	}
 
@@ -1623,7 +1661,7 @@ public function testAddToGroupNotLoggedIn() {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 997);
+		$expected = new Result(null, 997);
 		$this->assertEquals($expected, $this->api->addToGroup([]));
 	}
 
@@ -1641,7 +1679,7 @@ public function testAddToGroupWithTargetGroupNotExisting() {
 			->with('GroupToAddTo')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 102);
+		$expected = new Result(null, 102);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
 	}
 
@@ -1652,7 +1690,7 @@ public function testAddToGroupWithNoGroupSpecified() {
 			->method('getUser')
 			->will($this->returnValue($loggedInUser));
 
-		$expected = new \OC_OCS_Result(null, 101);
+		$expected = new Result(null, 101);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
 	}
 
@@ -1680,7 +1718,7 @@ public function testAddToGroupWithTargetUserNotExisting() {
 			->with('admin')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(null, 103);
+		$expected = new Result(null, 103);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
 	}
 
@@ -1692,7 +1730,6 @@ public function testAddToGroupWithoutPermission() {
 			->expects($this->once())
 			->method('getUID')
 			->will($this->returnValue('unauthorizedUser'));
-		$targetUser = $this->getMock('\OCP\IUser');
 		$targetGroup = $this->getMock('\OCP\IGroup');
 		$this->userSession
 			->expects($this->once())
@@ -1715,7 +1752,7 @@ public function testAddToGroupWithoutPermission() {
 			->with('unauthorizedUser')
 			->will($this->returnValue(false));
 
-		$expected = new \OC_OCS_Result(null, 104);
+		$expected = new Result(null, 104);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
 	}
 
@@ -1727,7 +1764,6 @@ public function testAddToOutsideGroupAsSubAdminFromSubAdmin() {
 			->expects($this->any())
 			->method('getUID')
 			->will($this->returnValue('subadmin'));
-		$targetUser = $this->getMock('\OCP\IUser');
 		$subadminGroup = $this->getMock('\OCP\IGroup');
 		$subadminGroup
 			->expects($this->any())
@@ -1766,7 +1802,7 @@ public function testAddToOutsideGroupAsSubAdminFromSubAdmin() {
 			->with('subadmin')
 			->will($this->returnValue(false));
 
-		$expected = new \OC_OCS_Result(null, 104);
+		$expected = new Result(null, 104);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'subadmin']));
 	}
 
@@ -1803,7 +1839,7 @@ public function testAddToGroupSuccessful() {
 			->method('addUser')
 			->with($targetUser);
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'AnotherUser']));
 	}
 
@@ -1851,7 +1887,7 @@ public function testAddToGroupSuccessfulAsSubadmin() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->addToGroup(['userid' => 'AnotherUser']));
 	}
 	public function testRemoveFromGroupWithoutLogIn() {
@@ -1860,7 +1896,7 @@ public function testRemoveFromGroupWithoutLogIn() {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 997);
+		$expected = new Result(null, 997);
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => ['groupid' => 'TargetGroup']]));
 	}
 
@@ -1870,7 +1906,7 @@ public function testRemoveFromGroupWithNoTargetGroup() {
 			->expects($this->once())
 			->method('getUser')
 			->will($this->returnValue($loggedInUser));
-		$expected = new \OC_OCS_Result(null, 101);
+		$expected = new Result(null, 101);
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => []]));
 	}
 
@@ -1886,7 +1922,7 @@ public function testRemoveFromGroupWithNotExistingTargetGroup() {
 			->with('TargetGroup')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 102);
+		$expected = new Result(null, 102);
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => ['groupid' => 'TargetGroup']]));
 	}
 
@@ -1928,7 +1964,7 @@ public function testRemoveFromGroupWithNotExistingTargetUser() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 103);
+		$expected = new Result(null, 103);
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => ['groupid' => 'TargetGroup']]));
 	}
 
@@ -1938,7 +1974,6 @@ public function testRemoveFromGroupWithoutPermission() {
 			->expects($this->once())
 			->method('getUID')
 			->will($this->returnValue('unauthorizedUser'));
-		$targetUser = $this->getMock('OCP\IUser');
 		$targetGroup = $this->getMock('OCP\IGroup');
 		$this->userSession
 			->expects($this->once())
@@ -1961,7 +1996,7 @@ public function testRemoveFromGroupWithoutPermission() {
 			->with('unauthorizedUser')
 			->will($this->returnValue(false));
 
-		$expected = new \OC_OCS_Result(null, 104);
+		$expected = new Result(null, 104);
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => ['groupid' => 'TargetGroup']]));
 	}
 
@@ -1997,7 +2032,7 @@ public function testRemoveFromGroupAsAdminFromAdmin() {
 			->with('admin')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(null, 105, 'Cannot remove yourself from the admin group');
+		$expected = new Result(null, 105, 'Cannot remove yourself from the admin group');
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'admin', '_delete' => ['groupid' => 'admin']]));
 	}
 
@@ -2049,7 +2084,7 @@ public function testRemoveFromGroupAsSubAdminFromSubAdmin() {
 			->with('subadmin')
 			->will($this->returnValue(false));
 
-		$expected = new \OC_OCS_Result(null, 105, 'Cannot remove yourself from this group as you are a SubAdmin');
+		$expected = new Result(null, 105, 'Cannot remove yourself from this group as you are a SubAdmin');
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'subadmin', '_delete' => ['groupid' => 'subadmin']]));
 	}
 
@@ -2085,7 +2120,7 @@ public function testRemoveFromGroupSuccessful() {
 			->method('removeUser')
 			->with($targetUser);
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'AnotherUser', '_delete' => ['groupid' => 'admin']]));
 	}
 
@@ -2132,7 +2167,7 @@ public function testRemoveFromGroupSuccessfulAsSubadmin() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'AnotherUser', '_delete' => ['groupid' => 'group1']]));
 	}
 
@@ -2143,7 +2178,7 @@ public function testAddSubAdminWithNotExistingTargetUser() {
 			->with('NotExistingUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 101, 'User does not exist');
+		$expected = new Result(null, 101, 'User does not exist');
 		$this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'NotExistingUser']));
 	}
 
@@ -2162,7 +2197,7 @@ public function testAddSubAdminWithNotExistingTargetGroup() {
 			->with('NotExistingGroup')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 102, 'Group:NotExistingGroup does not exist');
+		$expected = new Result(null, 102, 'Group:NotExistingGroup does not exist');
 		$this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
 	}
 
@@ -2182,7 +2217,7 @@ public function testAddSubAdminToAdminGroup() {
 			->with('ADmiN')
 			->will($this->returnValue($targetGroup));
 
-		$expected = new \OC_OCS_Result(null, 103, 'Cannot create subadmins for admin group');
+		$expected = new Result(null, 103, 'Cannot create subadmins for admin group');
 		$this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
 	}
 
@@ -2213,7 +2248,7 @@ public function testAddSubAdminTwice() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
 	}
 
@@ -2249,7 +2284,7 @@ public function testAddSubAdminSuccessful() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
 	}
 
@@ -2285,7 +2320,7 @@ public function testAddSubAdminUnsuccessful() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 103, 'Unknown error occurred');
+		$expected = new Result(null, 103, 'Unknown error occurred');
 		$this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
 	}
 
@@ -2296,7 +2331,7 @@ public function testRemoveSubAdminNotExistingTargetUser() {
 			->with('NotExistingUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 101, 'User does not exist');
+		$expected = new Result(null, 101, 'User does not exist');
 		$this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'NotExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
 	}
 
@@ -2313,7 +2348,7 @@ public function testRemoveSubAdminNotExistingTargetGroup() {
 			->with('GroupToDeleteFrom')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 101, 'Group does not exist');
+		$expected = new Result(null, 101, 'Group does not exist');
 		$this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'ExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
 	}
 
@@ -2342,7 +2377,7 @@ public function testRemoveSubAdminFromNotASubadmin() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 102, 'User is not a subadmin of this group');
+		$expected = new Result(null, 102, 'User is not a subadmin of this group');
 		$this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'ExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
 	}
 
@@ -2376,7 +2411,7 @@ public function testRemoveSubAdminSuccessful() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'ExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
 	}
 
@@ -2410,7 +2445,7 @@ public function testRemoveSubAdminUnsuccessful() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 103, 'Unknown error occurred');
+		$expected = new Result(null, 103, 'Unknown error occurred');
 		$this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'ExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
 	}
 
@@ -2421,7 +2456,7 @@ public function testGetUserSubAdminGroupsNotExistingTargetUser() {
 			->with('RequestedUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, 101, 'User does not exist');
+		$expected = new Result(null, 101, 'User does not exist');
 		$this->assertEquals($expected, $this->api->getUserSubAdminGroups(['userid' => 'RequestedUser']));
 	}
 
@@ -2449,7 +2484,7 @@ public function testGetUserSubAdminGroupsWithGroups() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(['TargetGroup'], 100);
+		$expected = new Result(['TargetGroup'], 100);
 		$this->assertEquals($expected, $this->api->getUserSubAdminGroups(['userid' => 'RequestedUser']));
 	}
 
@@ -2472,7 +2507,7 @@ public function testGetUserSubAdminGroupsWithoutGroups() {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, 102, 'Unknown error occurred');
+		$expected = new Result(null, 102, 'Unknown error occurred');
 		$this->assertEquals($expected, $this->api->getUserSubAdminGroups(['userid' => 'RequestedUser']));
 	}
 
@@ -2500,7 +2535,7 @@ public function testEnableUser() {
 			->method('isAdmin')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->enableUser(['userid' => 'RequestedUser']));
 	}
 
@@ -2528,7 +2563,7 @@ public function testDisableUser() {
 			->method('isAdmin')
 			->will($this->returnValue(true));
 
-		$expected = new \OC_OCS_Result(null, 100);
+		$expected = new Result(null, 100);
 		$this->assertEquals($expected, $this->api->disableUser(['userid' => 'RequestedUser']));
 	}
 }

From 7633cd967d45584dc101e581546dd092e032eb3e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 23 Aug 2016 17:22:10 +0200
Subject: [PATCH 079/219] Users page lazy multiselect group dropdowns

Instead of pre-rendering all multiselects with lots of group entries,
the current groups are now displayed as simple labels.
Behind the labels there is a pencil icon like for other fields.
When clicking the pencil icon, the dropdown will be spawned and will
open itself.
Upon closing of the dropdown, the label comes back with the updated
selection and the dropdown is destroyed.
---
 core/js/multiselect.js                       |  52 +++---
 settings/css/settings.css                    |   9 +
 settings/js/users/groups.js                  |   4 -
 settings/js/users/users.js                   | 174 ++++++++++---------
 settings/templates/users/main.php            |   4 +-
 settings/templates/users/part.createuser.php |  11 +-
 settings/templates/users/part.userlist.php   |   8 +-
 7 files changed, 143 insertions(+), 119 deletions(-)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 71cf3e10a698..bdf420a2f7fa 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -32,7 +32,7 @@
 			'onuncheck':false,
 			'minWidth': 'default;'
 		};
-		var slideDuration = 200;
+		var slideDuration = 0;
 		$(this).attr('data-msid', multiSelectId);
 		$.extend(settings,options);
 		$.each(this.children(),function(i,option) {
@@ -75,6 +75,26 @@
 
 		var self = this;
 		self.menuDirection = 'down';
+
+		function closeDropDown() {
+			if(!button.parent().data('preventHide')) {
+				// How can I save the effect in a var?
+				if(self.menuDirection === 'down') {
+					button.parent().children('ul').slideUp(slideDuration,function() {
+						button.parent().children('ul').remove();
+						button.removeClass('active down');
+						$(self).trigger($.Event('dropdownclosed', settings));
+					});
+				} else {
+					button.parent().children('ul').fadeOut(slideDuration,function() {
+						button.parent().children('ul').remove();
+						button.removeClass('active up');
+						$(self).trigger($.Event('dropdownclosed', settings));
+					});
+				}
+			}
+		}
+
 		button.click(function(event){
 
 			var button=$(this);
@@ -83,21 +103,20 @@
 					button.parent().children('ul').slideUp(slideDuration,function() {
 						button.parent().children('ul').remove();
 						button.removeClass('active down');
+						$(self).trigger($.Event('dropdownclosed', settings));
 					});
 				} else {
 					button.parent().children('ul').fadeOut(slideDuration,function() {
 						button.parent().children('ul').remove();
 						button.removeClass('active up');
+						$(self).trigger($.Event('dropdownclosed', settings));
 					});
 				}
 				return;
 			}
+			// tell other lists to shut themselves
 			var lists=$('ul.multiselectoptions');
-			lists.slideUp(slideDuration,function(){
-				lists.remove();
-				$('div.multiselect').removeClass('active');
-				button.addClass('active');
-			});
+			lists.trigger($.Event('shut'));
 			button.addClass('active');
 			event.stopPropagation();
 			var options=$(this).parent().next().children();
@@ -309,29 +328,16 @@
 				list.detach().insertBefore($(this));
 				list.addClass('up');
 				button.addClass('up');
-				list.fadeIn();
+				list.show();
 				self.menuDirection = 'up';
 			}
 			list.click(function(event) {
 				event.stopPropagation();
 			});
+			list.one('shut', closeDropDown);
 		});
-		$(window).click(function() {
-			if(!button.parent().data('preventHide')) {
-				// How can I save the effect in a var?
-				if(self.menuDirection === 'down') {
-					button.parent().children('ul').slideUp(slideDuration,function() {
-						button.parent().children('ul').remove();
-						button.removeClass('active down');
-					});
-				} else {
-					button.parent().children('ul').fadeOut(slideDuration,function() {
-						button.parent().children('ul').remove();
-						button.removeClass('active up');
-					});
-				}
-			}
-		});
+
+		$(window).click(closeDropDown);
 
 		return span;
 	};
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 3951aa898cf8..96d4b701b75a 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -243,6 +243,15 @@ span.usersLastLoginTooltip { white-space: nowrap; }
 	top: 3px;
 }
 
+#newuser .groups {
+	display: inline;
+}
+
+#newuser .groupsListContainer.hidden,
+#userlist .groupsListContainer.hidden {
+	display: none;
+}
+
 tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:pointer; }
 tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
 td.remove {
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 36ebbd2fa6e3..61903d576d7b 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -136,10 +136,6 @@ GroupList = {
 					var addedGroup = result.groupname;
 					UserList.availableGroups = $.unique($.merge(UserList.availableGroups, [addedGroup]));
 					GroupList.addGroup(result.groupname);
-
-					$('.groupsselect, .subadminsselect')
-						.append($('<option>', { value: result.groupname })
-							.text(result.groupname));
 				}
 				GroupList.toggleAddGroup();
 			}).fail(function(result) {
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 7a7732338fe8..13a8f9e459e5 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -57,9 +57,6 @@ var UserList = {
 		var $tr = $userListBody.find('tr:first-child').clone();
 		// this removes just the `display:none` of the template row
 		$tr.removeAttr('style');
-		var subAdminsEl;
-		var subAdminSelect;
-		var groupsSelect;
 
 		/**
 		 * Avatar or placeholder
@@ -86,32 +83,17 @@ var UserList = {
 		$tr.find('td.mailAddress > .action').tooltip({placement: 'top'});
 		$tr.find('td.password > .action').tooltip({placement: 'top'});
 
+
 		/**
 		 * groups and subadmins
 		 */
-		// make them look like the multiselect buttons
-		// until they get time to really get initialized
-		groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'no group') + '"></select>')
-			.data('username', user.name)
-			.data('user-groups', user.groups);
-		if ($tr.find('td.subadmins').length > 0) {
-			subAdminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'no group') + '">')
-				.data('username', user.name)
-				.data('user-groups', user.groups)
-				.data('subadmin', user.subadmin);
-			$tr.find('td.subadmins').empty();
-		}
-		$.each(this.availableGroups, function (i, group) {
-			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
-			if (typeof subAdminSelect !== 'undefined' && group !== 'admin') {
-				subAdminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
-			}
-		});
-		$tr.find('td.groups').empty().append(groupsSelect);
-		subAdminsEl = $tr.find('td.subadmins');
-		if (subAdminsEl.length > 0) {
-			subAdminsEl.append(subAdminSelect);
-		}
+		var $tdGroups = $tr.find('td.groups');
+		this._updateGroupListLabel($tdGroups, user.groups);
+		$tdGroups.find('.action').tooltip({placement: 'top'});
+
+		var $tdSubadmins = $tr.find('td.subadmins');
+		this._updateGroupListLabel($tdSubadmins, user.subadmin);
+		$tdSubadmins.find('.action').tooltip({placement: 'top'});
 
 		/**
 		 * remove action
@@ -195,10 +177,6 @@ var UserList = {
 		// defer init so the user first sees the list appear more quickly
 		window.setTimeout(function(){
 			$quotaSelect.singleSelect();
-			UserList.applyGroupSelect(groupsSelect);
-			if (subAdminSelect) {
-				UserList.applySubadminSelect(subAdminSelect);
-			}
 		}, 0);
 		return $tr;
 	},
@@ -319,7 +297,7 @@ var UserList = {
 	},
 	markRemove: function(uid) {
 		var $tr = UserList.getRow(uid);
-		var groups = $tr.find('.groups .groupsselect').val();
+		var groups = $tr.find('.groups').data('groups');
 		for(var i in groups) {
 			var gid = groups[i];
 			var $li = GroupList.getGroupLI(gid);
@@ -334,7 +312,7 @@ var UserList = {
 	},
 	undoRemove: function(uid) {
 		var $tr = UserList.getRow(uid);
-		var groups = $tr.find('.groups .groupsselect').val();
+		var groups = $tr.find('.groups').data('groups');
 		for(var i in groups) {
 			var gid = groups[i];
 			var $li = GroupList.getGroupLI(gid);
@@ -435,19 +413,9 @@ var UserList = {
 			});
 	},
 
-	applyGroupSelect: function (element) {
-		var checked = [];
+	applyGroupSelect: function (element, user, checked) {
 		var $element = $(element);
-		var user = UserList.getUID($element);
 
-		if ($element.data('user-groups')) {
-			if (typeof $element.data('user-groups') === 'string') {
-				checked = $element.data('user-groups').split(", ");
-			}
-			else {
-				checked = $element.data('user-groups');
-			}
-		}
 		var checkHandler = null;
 		if(user) { // Only if in a user row, and not the #newusergroups select
 			checkHandler = function (group) {
@@ -487,13 +455,6 @@ var UserList = {
 			};
 		}
 		var addGroup = function (select, group) {
-			$('select[multiple]').each(function (index, element) {
-				$element = $(element);
-				if ($element.find('option').filterAttr('value', group).length === 0 &&
-					select.data('msid') !== $element.data('msid')) {
-					$element.append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
-				}
-			});
 			GroupList.addGroup(escapeHTML(group));
 		};
 		var label;
@@ -514,19 +475,8 @@ var UserList = {
 		});
 	},
 
-	applySubadminSelect: function (element) {
-		var checked = [];
+	applySubadminSelect: function (element, user, checked) {
 		var $element = $(element);
-		var user = UserList.getUID($element);
-
-		if ($element.data('subadmin')) {
-			if (typeof $element.data('subadmin') === 'string') {
-				checked = $element.data('subadmin').split(", ");
-			}
-			else {
-				checked = $element.data('subadmin');
-			}
-		}
 		var checkHandler = function (group) {
 			if (group === 'admin') {
 				return false;
@@ -542,15 +492,7 @@ var UserList = {
 			);
 		};
 
-		var addSubAdmin = function (group) {
-			$('select[multiple]').each(function (index, element) {
-				if ($(element).find('option').filterAttr('value', group).length === 0) {
-					$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
-				}
-			});
-		};
 		$element.multiSelect({
-			createCallback: addSubAdmin,
 			createText: null,
 			checked: checked,
 			oncheck: checkHandler,
@@ -599,6 +541,76 @@ var UserList = {
 				}
 			}
 		);
+	},
+
+	/**
+	 * Creates a temporary jquery.multiselect selector on the given group field
+	 */
+	_triggerGroupEdit: function($td, isSubadminSelect) {
+		var $groupsListContainer = $td.find('.groupsListContainer');
+		var placeholder = $groupsListContainer.attr('data-placeholder') || t('settings', 'no group');
+		var user = UserList.getUID($td);
+		var checked = $td.data('groups') || [];
+		var extraGroups = [].concat(checked);
+
+		$td.find('.multiselectoptions').remove();
+
+		// jquery.multiselect can only work with select+options in DOM ? We'll give jquery.multiselect what it wants...
+		var $groupsSelect;
+		if (isSubadminSelect) {
+			$groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" title="' + placeholder + '"></select>');
+		} else {
+			$groupsSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" title="' + placeholder + '"></select>')
+		}
+
+		function createItem(group) {
+			if (isSubadminSelect && group === 'admin') {
+				// can't become subadmin of "admin" group
+				return;
+			}
+			$groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
+		}
+
+		$.each(this.availableGroups, function (i, group) {
+			// some new groups might be selected but not in the available groups list yet
+			var extraIndex = extraGroups.indexOf(group);
+			if (extraIndex >= 0) {
+				// remove extra group as it was found
+				extraGroups.splice(extraIndex, 1);
+			}
+			createItem(group);
+		});
+		$.each(extraGroups, function (i, group) {
+			createItem(group);
+		});
+
+		$td.append($groupsSelect);
+
+		if (isSubadminSelect) {
+			UserList.applySubadminSelect($groupsSelect, user, checked);
+		} else {
+			UserList.applyGroupSelect($groupsSelect, user, checked);
+		}
+
+		$groupsListContainer.addClass('hidden');
+		$td.find('.multiselect:not(.groupsListContainer):first').click();
+		$groupsSelect.on('dropdownclosed', function(e) {
+			$groupsSelect.remove();
+			$td.find('.multiselect:not(.groupsListContainer)').parent().remove();
+			$td.find('.multiselectoptions').remove();
+			$groupsListContainer.removeClass('hidden');
+			UserList._updateGroupListLabel($td, e.checked);
+		});
+	},
+
+	/**
+	 * Updates the groups list td with the given groups selection
+	 */
+	_updateGroupListLabel: function($td, groups) {
+		var placeholder = $td.find('.groupsListContainer').attr('data-placeholder');
+		var $groupsEl = $td.find('.groupsList');
+		$groupsEl.text(groups.join(', ') || placeholder || t('settings', 'no group'));
+		$td.data('groups', groups);
 	}
 };
 
@@ -623,13 +635,6 @@ $(document).ready(function () {
 	// TODO: move other init calls inside of initialize
 	UserList.initialize($('#userlist'));
 
-	$('.groupsselect').each(function (index, element) {
-		UserList.applyGroupSelect(element);
-	});
-	$('.subadminsselect').each(function (index, element) {
-		UserList.applySubadminSelect(element);
-	});
-
 	$userListBody.on('click', '.password', function (event) {
 		event.stopPropagation();
 
@@ -773,11 +778,24 @@ $(document).ready(function () {
 			});
 	});
 
+	$('#newuser .groupsListContainer').on('click', function (event) {
+		event.stopPropagation();
+		var $div = $(this).closest('.groups');
+		UserList._triggerGroupEdit($div);
+	});
+	$userListBody.on('click', '.groups .groupsListContainer, .subadmins .groupsListContainer', function (event) {
+		event.stopPropagation();
+		var $td = $(this).closest('td');
+		var isSubadminSelect = $td.hasClass('subadmins');
+		UserList._triggerGroupEdit($td, isSubadminSelect);
+	});
+
 	// init the quota field select box after it is shown the first time
 	$('#app-settings').one('show', function() {
 		$(this).find('#default_quota').singleSelect().on('change', UserList.onQuotaSelect);
 	});
 
+	UserList._updateGroupListLabel($('#newuser .groups'), []);
 	$('#newuser').submit(function (event) {
 		event.preventDefault();
 		var username = $('#newusername').val();
@@ -813,7 +831,7 @@ $(document).ready(function () {
 		}
 
 		promise.then(function() {
-			var groups = $('#newusergroups').val() || [];
+			var groups = $('#newuser .groups').data('groups') || [];
 			$.post(
 				OC.generateUrl('/settings/users/users'),
 				{
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
index f50f83b38b36..b363a4c4da82 100644
--- a/settings/templates/users/main.php
+++ b/settings/templates/users/main.php
@@ -19,10 +19,10 @@
 
 $userlistParams = array();
 $allGroups=array();
-foreach($_["groups"] as $group) {
+foreach($_["adminGroup"] as $group) {
 	$allGroups[] = $group['name'];
 }
-foreach($_["adminGroup"] as $group) {
+foreach($_["groups"] as $group) {
 	$allGroups[] = $group['name'];
 }
 $userlistParams['subadmingroups'] = $allGroups;
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index 0fc5a2bdeaae..6f23d06cfa3f 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -10,16 +10,7 @@
 		<input id="newemail" type="text" style="display:none"
 			   placeholder="<?php p($l->t('E-Mail'))?>"
 			   autocomplete="off" autocapitalize="off" autocorrect="off" />
-		<select
-			class="groupsselect" id="newusergroups" data-placeholder="groups"
-			title="<?php p($l->t('Groups'))?>" multiple="multiple">
-			<?php foreach($_["adminGroup"] as $adminGroup): ?>
-				<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
-			<?php endforeach; ?>
-			<?php foreach($_["groups"] as $group): ?>
-				<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
-			<?php endforeach;?>
-		</select>
+		<div class="groups"><div class="groupsListContainer multiselect button" data-placeholder="<?php p($l->t('Groups'))?>"><span class="title groupsList"></span><span class="icon-triangle-s"></span></div></div>
 		<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
 	</form>
 	<?php if((bool)$_['recoveryAdminEnabled']): ?>
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index 697d0f3f1428..d6c613b7e783 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -38,9 +38,13 @@
 				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
 				alt="<?php p($l->t('change email address'))?>" title="<?php p($l->t('change email address'))?>"/>
 			</td>
-			<td class="groups"></td>
+			<td class="groups"><div class="groupsListContainer multiselect button"
+				><span class="title groupsList"></span><span class="icon-triangle-s"></span></div>
+			</td>
 		<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<td class="subadmins"></td>
+			<td class="subadmins"><div class="groupsListContainer multiselect button"
+				><span class="title groupsList"></span><span class="icon-triangle-s"></span></div>
+			</td>
 		<?php endif;?>
 			<td class="quota">
 				<select class="quota-user" data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">

From ef16b119de7ff7223d1c55ba74a52532d1fb358d Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 16 Aug 2016 09:01:29 +0000
Subject: [PATCH 080/219] Added testcases about adding and removing users to
 groups using subadmins

---
 .../features/provisioning-v1.feature          | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index d44903c27438..a331a29ace2c 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -493,6 +493,65 @@ Feature: provisioning
 		And As an "admin"
 		And user "subadmin" is disabled
 
+	Scenario: a subadmin can add users to groups the subadmin is responsible for
+		Given As an "admin"
+		And user "subadmin" exists
+		And user "brand-new-user" exists
+		And group "new-group" exists
+		And Assure user "subadmin" is subadmin of group "new-group"
+		And As an "subadmin"
+		When sending "POST" to "/cloud/users/brand-new-user/groups" with
+			| groupid | new-group |
+		Then the OCS status code should be "100"
+		And the HTTP status code should be "200"
+		And user "brand-new-user" belongs to group "new-group"
+
+	Scenario: a subadmin cannot add users to groups the subadmin is not responsible for
+		Given As an "admin"
+		And user "other-subadmin" exists
+		And user "brand-new-user" exists
+		And group "new-group" exists
+		And group "other-group" exists
+		And Assure user "other-subadmin" is subadmin of group "other-group"
+		And As an "other-subadmin"
+		When sending "POST" to "/cloud/users/brand-new-user/groups" with
+			| groupid | new-group |
+		Then the OCS status code should be "104"
+		And the HTTP status code should be "200"
+		And As an "admin"
+		And user "brand-new-user" does not belongs to group "new-group"
+
+	Scenario: a subadmin can remove users to groups the subadmin is responsible for
+		Given As an "admin"
+		And user "subadmin" exists
+		And user "brand-new-user" exists
+		And group "new-group" exists
+		And user "brand-new-user" belongs to group "new-group"
+		And Assure user "subadmin" is subadmin of group "new-group"
+		And As an "subadmin"
+		When sending "DELETE" to "/cloud/users/brand-new-user/groups" with
+			| groupid | new-group |
+		Then the OCS status code should be "100"
+		And the HTTP status code should be "200"
+		And As an "admin"
+		And user "brand-new-user" does not belong to group "new-group"
+
+	Scenario: a subadmin cannot remove users to groups the subadmin is not responsible for
+		Given As an "admin"
+		And user "other-subadmin" exists
+		And user "brand-new-user" exists
+		And group "new-group" exists
+		And group "other-group" exists
+		And user "brand-new-user" belongs to group "new-group"
+		And Assure user "other-subadmin" is subadmin of group "other-group"
+		And As an "other-subadmin"
+		When sending "DELETE" to "/cloud/users/brand-new-user/groups" with
+			| groupid | new-group |
+		Then the OCS status code should be "104"
+		And the HTTP status code should be "200"
+		And As an "admin"
+		And user "brand-new-user" belongs to group "new-group"
+
 	Scenario: Making a web request with an enabled user
 	    Given As an "admin"
 		And user "user0" exists

From 8c7491cac2a7fa2c8542e0e52a83d9ce6d4e878e Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 16 Aug 2016 10:40:30 +0000
Subject: [PATCH 081/219] Only check the pertenence to groups

---
 .../features/bootstrap/Provisioning.php       | 20 +++++++++++++++++++
 .../features/provisioning-v1.feature          |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/build/integration/features/bootstrap/Provisioning.php b/build/integration/features/bootstrap/Provisioning.php
index 6cf575144836..f4ac9f3346a3 100644
--- a/build/integration/features/bootstrap/Provisioning.php
+++ b/build/integration/features/bootstrap/Provisioning.php
@@ -150,6 +150,26 @@ public function checkThatUserBelongsToGroup($user, $group) {
 		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
 	}
 
+	/**
+	 * @Then /^check that user "([^"]*)" does not belong to group "([^"]*)"$/
+	 * @param string $user
+	 * @param string $group
+	 */
+	public function checkThatUserDoesNotBelongToGroup($user, $group) {
+		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+
+		$this->response = $client->get($fullUrl, $options);
+		$respondedArray = $this->getArrayOfGroupsResponded($this->response);
+		sort($respondedArray);
+		PHPUnit_Framework_Assert::assertNotContains($group, $respondedArray);
+		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
+	}
+
 	public function userBelongsToGroup($user, $group) {
 		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
 		$client = new Client();
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index a331a29ace2c..574e4fe375e4 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -504,7 +504,7 @@ Feature: provisioning
 			| groupid | new-group |
 		Then the OCS status code should be "100"
 		And the HTTP status code should be "200"
-		And user "brand-new-user" belongs to group "new-group"
+		And check that user "brand-new-user" belongs to group "new-group"
 
 	Scenario: a subadmin cannot add users to groups the subadmin is not responsible for
 		Given As an "admin"
@@ -519,7 +519,7 @@ Feature: provisioning
 		Then the OCS status code should be "104"
 		And the HTTP status code should be "200"
 		And As an "admin"
-		And user "brand-new-user" does not belongs to group "new-group"
+		And check that user "brand-new-user" does not belongs to group "new-group"
 
 	Scenario: a subadmin can remove users to groups the subadmin is responsible for
 		Given As an "admin"
@@ -534,7 +534,7 @@ Feature: provisioning
 		Then the OCS status code should be "100"
 		And the HTTP status code should be "200"
 		And As an "admin"
-		And user "brand-new-user" does not belong to group "new-group"
+		And check that user "brand-new-user" does not belong to group "new-group"
 
 	Scenario: a subadmin cannot remove users to groups the subadmin is not responsible for
 		Given As an "admin"
@@ -550,7 +550,7 @@ Feature: provisioning
 		Then the OCS status code should be "104"
 		And the HTTP status code should be "200"
 		And As an "admin"
-		And user "brand-new-user" belongs to group "new-group"
+		And check that user "brand-new-user" belongs to group "new-group"
 
 	Scenario: Making a web request with an enabled user
 	    Given As an "admin"

From 7d641bbfdfc11086bd1e1423e39a05346d77cfc3 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 16 Aug 2016 14:00:30 +0000
Subject: [PATCH 082/219] Change of user missing

---
 build/integration/features/provisioning-v1.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 574e4fe375e4..6a61bba63289 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -504,6 +504,7 @@ Feature: provisioning
 			| groupid | new-group |
 		Then the OCS status code should be "100"
 		And the HTTP status code should be "200"
+		And As an "admin"
 		And check that user "brand-new-user" belongs to group "new-group"
 
 	Scenario: a subadmin cannot add users to groups the subadmin is not responsible for

From 4a0b0bc53f9abef292f6e1724bf6e8d46d9e1c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Wed, 17 Aug 2016 10:32:33 +0000
Subject: [PATCH 083/219] Typo in scenario

---
 build/integration/features/provisioning-v1.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 6a61bba63289..342d43141fc2 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -520,7 +520,7 @@ Feature: provisioning
 		Then the OCS status code should be "104"
 		And the HTTP status code should be "200"
 		And As an "admin"
-		And check that user "brand-new-user" does not belongs to group "new-group"
+		And check that user "brand-new-user" does not belong to group "new-group"
 
 	Scenario: a subadmin can remove users to groups the subadmin is responsible for
 		Given As an "admin"

From 74c2c63b31039f17ab79c50ae84b4abacbb06fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 29 Aug 2016 09:15:17 +0200
Subject: [PATCH 084/219] [stable9.1] Don't log credentials of
 LoginController::tryLogin (#25902) (#25935)

* Don't log credentials of LoginController::tryLogin - fixes #25895

* Don't log password in loginWithPassword
---
 lib/private/Log.php      |  8 ++++++--
 tests/lib/LoggerTest.php | 43 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/lib/private/Log.php b/lib/private/Log.php
index 49223521916d..b65f48ec5181 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -66,6 +66,7 @@ class Log implements ILogger {
 		'checkPassword',
 		'updatePrivateKeyPassword',
 		'validateUserPass',
+		'loginWithPassword',
 
 		// TokenProvider
 		'getToken',
@@ -84,6 +85,9 @@ class Log implements ILogger {
 		'calculateHMAC',
 		'encrypt',
 		'decrypt',
+
+		//LoginController
+		'tryLogin'
 	];
 
 	/**
@@ -304,14 +308,14 @@ public function log($level, $message, array $context = array()) {
 	 * @since 8.2.0
 	 */
 	public function logException($exception, array $context = array()) {
-		$exception = array(
+		$exception = [
 			'Exception' => get_class($exception),
 			'Message' => $exception->getMessage(),
 			'Code' => $exception->getCode(),
 			'Trace' => $exception->getTraceAsString(),
 			'File' => $exception->getFile(),
 			'Line' => $exception->getLine(),
-		);
+		];
 		$exception['Trace'] = preg_replace('!(' . implode('|', $this->methodsWithSensitiveParameters) . ')\(.*\)!', '$1(*** sensitive parameters replaced ***)', $exception['Trace']);
 		$msg = isset($context['message']) ? $context['message'] : 'Exception';
 		$msg .= ': ' . json_encode($exception);
diff --git a/tests/lib/LoggerTest.php b/tests/lib/LoggerTest.php
index 4b80c01f3436..43dc8fcd3513 100644
--- a/tests/lib/LoggerTest.php
+++ b/tests/lib/LoggerTest.php
@@ -9,14 +9,17 @@
 namespace Test;
 
 use OC\Log;
+use OCP\IConfig;
+use OCP\Util;
 
 class LoggerTest extends TestCase {
-	/**
-	 * @var \OCP\ILogger
-	 */
+	/** @var \OCP\ILogger */
 	private $logger;
 	static private $logs = array();
 
+	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
+	private $config;
+
 	protected function setUp() {
 		parent::setUp();
 
@@ -40,7 +43,7 @@ public function testAppCondition() {
 		$this->config->expects($this->any())
 			->method('getValue')
 			->will(($this->returnValueMap([
-				['loglevel', \OCP\Util::WARN, \OCP\Util::WARN],
+				['loglevel', Util::WARN, Util::WARN],
 				['log.condition', [], ['apps' => ['files']]]
 			])));
 		$logger = $this->logger;
@@ -122,4 +125,36 @@ public function testDetectvalidateUserPass($user, $password) {
 			$this->assertContains('validateUserPass(*** sensitive parameters replaced ***)', $logLine);
 		}
 	}
+
+	/**
+	 * @dataProvider userAndPasswordData
+	 */
+	public function testDetecttryLogin($user, $password) {
+		$e = new \Exception('test');
+		$this->logger->logException($e);
+		$logLines = $this->getLogs();
+
+		foreach($logLines as $logLine) {
+			$this->assertNotContains($user, $logLine);
+			$this->assertNotContains($password, $logLine);
+			$this->assertContains('tryLogin(*** sensitive parameters replaced ***)', $logLine);
+		}
+	}
+
+	//loginWithPassword
+	/**
+	 * @dataProvider userAndPasswordData
+	 */
+	public function testDetectloginWithPassword($user, $password) {
+		$e = new \Exception('test');
+		$this->logger->logException($e);
+		$logLines = $this->getLogs();
+
+		foreach($logLines as $logLine) {
+			$this->assertNotContains($user, $logLine);
+			$this->assertNotContains($password, $logLine);
+			$this->assertContains('loginWithPassword(*** sensitive parameters replaced ***)', $logLine);
+		}
+	}
+
 }

From 1b558ae2015da0645cc8cf0657e55c55c23cf2d6 Mon Sep 17 00:00:00 2001
From: VicDeo <dubiniuk@owncloud.com>
Date: Mon, 29 Aug 2016 10:27:15 +0300
Subject: [PATCH 085/219] Fix redirection taking care of protocol and port
 (#25956)

---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 54f865b2cad9..1f3079b039ea 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -266,7 +266,7 @@ public static function checkInstalled() {
 			if (OC::$CLI) {
 				throw new Exception('Not installed');
 			} else {
-				$url = 'http://' . $_SERVER['SERVER_NAME'] . OC::$WEBROOT . '/index.php';
+				$url = OC::$WEBROOT . '/index.php';
 				header('Location: ' . $url);
 			}
 			exit();

From c195ee678dd1c4efb3dc6fe99155c3a029f3a607 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 25 Aug 2016 18:06:13 +0200
Subject: [PATCH 086/219] Prevent error with orphaned shares when updating user
 mount cache

---
 apps/files_sharing/lib/SharedMount.php      | 7 ++++++-
 apps/files_sharing/lib/sharedstorage.php    | 5 ++++-
 lib/private/Files/Config/UserMountCache.php | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php
index daddccf15d4c..c2942d90bdd1 100644
--- a/apps/files_sharing/lib/SharedMount.php
+++ b/apps/files_sharing/lib/SharedMount.php
@@ -240,6 +240,11 @@ public function getStorageNumericId() {
 			->from('filecache')
 			->where($query->expr()->eq('fileid', $query->createNamedParameter($this->getStorageRootId())));
 
-		return $query->execute()->fetchColumn();
+		$result = $query->execute();
+		$row = $result->fetch();
+		if ($row) {
+			return $row['storage'];
+		}
+		return -1;
 	}
 }
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 08fdc80fb334..36983c87d006 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -38,6 +38,7 @@
 use OCP\Files\Storage\IStorage;
 use OCP\Lock\ILockingProvider;
 use OC\Files\Storage\FailedStorage;
+use OCP\Files\NotFoundException;
 
 /**
  * Convert target path to source path and pass the function call to the correct storage provider
@@ -104,7 +105,9 @@ private function init() {
 
 		} catch (\Exception $e) {
 			$this->sourceStorage = new FailedStorage(['exception' => $e]);
-			$this->logger->logException($e);
+			if (!$e instanceof NotFoundException) {
+				$this->logger->logException($e);
+			}
 		}
 		$this->storage = $this->sourceStorage;
 	}
diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
index bc6ad1b34f01..7ef73739c9e5 100644
--- a/lib/private/Files/Config/UserMountCache.php
+++ b/lib/private/Files/Config/UserMountCache.php
@@ -143,7 +143,8 @@ private function addToCache(ICachedMountInfo $mount) {
 				'mount_point' => $mount->getMountPoint()
 			], ['root_id', 'user_id']);
 		} else {
-			$this->logger->error('Error getting storage info for mount at ' . $mount->getMountPoint());
+			// in some cases this is legitimate, like orphaned shares
+			$this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
 		}
 	}
 

From 0fae262b0b1be241ca5be350f8d9b09936a60b25 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 30 Aug 2016 12:19:48 +0200
Subject: [PATCH 087/219] Added closeCursor in SharedMount numeric id (#25979)

---
 apps/files_sharing/lib/SharedMount.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php
index c2942d90bdd1..bab1530764e5 100644
--- a/apps/files_sharing/lib/SharedMount.php
+++ b/apps/files_sharing/lib/SharedMount.php
@@ -242,6 +242,7 @@ public function getStorageNumericId() {
 
 		$result = $query->execute();
 		$row = $result->fetch();
+		$result->closeCursor();
 		if ($row) {
 			return $row['storage'];
 		}

From 5119b630dff808b232aec216694e8d6cfa390911 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 30 Aug 2016 12:20:01 +0200
Subject: [PATCH 088/219] Allow space for federated share id search (#25981)

---
 apps/files_sharing/lib/API/Sharees.php       |  2 +-
 apps/files_sharing/tests/API/ShareesTest.php | 52 ++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/API/Sharees.php b/apps/files_sharing/lib/API/Sharees.php
index ea7830ae4c0a..d65395913791 100644
--- a/apps/files_sharing/lib/API/Sharees.php
+++ b/apps/files_sharing/lib/API/Sharees.php
@@ -318,7 +318,7 @@ protected function getRemote($search) {
 			$this->result['remotes'] = [];
 		}
 
-		if (!$foundRemoteById && substr_count($search, '@') >= 1 && substr_count($search, ' ') === 0 && $this->offset === 0) {
+		if (!$foundRemoteById && substr_count($search, '@') >= 1 && $this->offset === 0) {
 			$this->result['exact']['remotes'][] = [
 				'label' => $search,
 				'value' => [
diff --git a/apps/files_sharing/tests/API/ShareesTest.php b/apps/files_sharing/tests/API/ShareesTest.php
index 00e3a133fa9f..ec125f61a689 100644
--- a/apps/files_sharing/tests/API/ShareesTest.php
+++ b/apps/files_sharing/tests/API/ShareesTest.php
@@ -942,6 +942,58 @@ public function dataGetRemote() {
 				[],
 				true,
 			],
+			// contact with space
+			[
+				'user name@localhost',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User Name @ Localhost',
+						'CLOUD' => [
+							'user name@localhost',
+						],
+					],
+				],
+				false,
+				[
+					['label' => 'User Name @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'user name@localhost', 'server' => 'localhost']],
+				],
+				[],
+				true,
+			],
+			// remote with space, no contact
+			[
+				'user space@remote',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
+				],
+				false,
+				[
+					['label' => 'user space@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'user space@remote']],
+				],
+				[],
+				true,
+			],
 		];
 	}
 

From 22c1ea893be2fe09194ff5e6362e64c01ab77a1a Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 5 Jul 2016 11:08:19 +0200
Subject: [PATCH 089/219] Add integration test for sharing with group, then
 user in group

Add integration test for the use case where a group share exists and
then the same owner creates a direct share to a user in that group.
---
 build/integration/features/sharing-v1.feature | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index 0faf5f516d3e..313b2477ce92 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -41,6 +41,21 @@ Feature: sharing
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
 
+  Scenario: Creating a new share with user who already received a share through their group
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "sharing-group" exists
+    And user "user1" belongs to group "sharing-group"
+    And file "welcome.txt" of user "user0" is shared with group "sharing-group"
+    And As an "user0"
+    Then sending "POST" to "/apps/files_sharing/api/v1/shares" with
+      | path | welcome.txt |
+      | shareWith | user1 |
+      | shareType | 0 |
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+
   Scenario: Creating a new public share
     Given user "user0" exists
     And As an "user0"

From 794229a783c4ec5708f016236fb92fa2b9873bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Tue, 30 Aug 2016 10:53:19 +0000
Subject: [PATCH 090/219] Creating the folder when the tests run

Conflicts:
	build/integration/features/bootstrap/BasicStructure.php
	build/integration/run.sh
---
 .../features/bootstrap/BasicStructure.php     | 25 +++++++++++++++++++
 build/integration/run.sh                      | 11 ++++++++
 2 files changed, 36 insertions(+)

diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 9248b2cd252f..b14e41ca6479 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -310,5 +310,30 @@ public static function removeFilesFromSkeleton(){
 			rmdir("../../core/skeleton/PARENT");
 		}
 	}
+
+	/**
+	 * @BeforeScenario @local_storage
+	 */
+	public static function removeFilesFromLocalStorageBefore(){
+		$dir = "./work/local_storage/";
+		$di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS);
+		$ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST);
+		foreach ( $ri as $file ) {
+			$file->isDir() ?  rmdir($file) : unlink($file);
+		}
+	}
+
+	/**
+	 * @AfterScenario @local_storage
+	 */
+	public static function removeFilesFromLocalStorageAfter(){
+		$dir = "./work/local_storage/";
+		$di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS);
+		$ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST);
+		foreach ( $ri as $file ) {
+			$file->isDir() ?  rmdir($file) : unlink($file);
+		}
+	}
+
 }
 
diff --git a/build/integration/run.sh b/build/integration/run.sh
index 5a222bda3e3f..1917a86939ed 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -24,6 +24,17 @@ echo $PHPPID_FED
 export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
 export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/"
 
+
+#Enable external storage app
+../../occ app:enable files_external
+
+mkdir -p work/local_storage
+OUTPUT_CREATE_STORAGE=`../../occ files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage` 
+
+ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}`
+
+../../occ files_external:option $ID_STORAGE enable_sharing true
+
 vendor/bin/behat -f junit -f pretty $SCENARIO_TO_RUN
 RESULT=$?
 

From 2061fed3e29501609cc1ab88c2a9213702024255 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Mon, 8 Aug 2016 13:17:28 +0000
Subject: [PATCH 091/219] Added feature and context, not working yet, option to
 allow sharing needs to be added

---
 .../bootstrap/ExternalStorageContext.php      | 24 +++++++++++++++++
 .../features/external-storage.feature         | 26 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 build/integration/features/bootstrap/ExternalStorageContext.php
 create mode 100644 build/integration/features/external-storage.feature

diff --git a/build/integration/features/bootstrap/ExternalStorageContext.php b/build/integration/features/bootstrap/ExternalStorageContext.php
new file mode 100644
index 000000000000..90dc06cf5714
--- /dev/null
+++ b/build/integration/features/bootstrap/ExternalStorageContext.php
@@ -0,0 +1,24 @@
+<?php
+
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+use Behat\Gherkin\Node\TableNode;
+use GuzzleHttp\Client;
+use GuzzleHttp\Message\ResponseInterface;
+
+class ExternalStorageContext implements \Behat\Behat\Context\Context {
+	
+
+	/**
+	 * @AfterScenario
+	 */
+	public static function removeFilesFromLocalStorage(){
+		$dir = "./local_storage/";
+		$di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS);
+		$ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST);
+		foreach ( $ri as $file ) {
+    		$file->isDir() ?  rmdir($file) : unlink($file);
+		}
+	}
+}
diff --git a/build/integration/features/external-storage.feature b/build/integration/features/external-storage.feature
new file mode 100644
index 000000000000..ac8bd971edff
--- /dev/null
+++ b/build/integration/features/external-storage.feature
@@ -0,0 +1,26 @@
+Feature: external-storage
+  Background:
+    Given using api version "1"
+    Given using dav path "remote.php/webdav"
+
+  Scenario: Share by link a file inside a local external storage
+    Given user "user0" exists
+    And user "user1" exists
+    And As an "user0"
+    And user "user0" created a folder "/local_storage/foo"
+    And User "user0" moved file "/textfile0.txt" to "/local_storage/foo/textfile0.txt"
+    And folder "/local_storage/foo" of user "user0" is shared with user "user1"
+    And As an "user1"
+    When creating a share with
+      | path | foo |
+      | shareType | 3 |
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+    And Share fields of last share match with
+      | id | A_NUMBER |
+      | url | AN_URL |
+      | token | A_TOKEN |
+      | mimetype | httpd/unix-directory |
+    And Public shared file "/foo/textfile0.txt" can be downloaded
+
+

From 46f23622c41c3695b94fe922de9f8bc9b801209c Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 9 Aug 2016 08:24:03 +0000
Subject: [PATCH 092/219] Removed extra context added needed option and remove
 storage after external storage scenarios

Conflicts:
	build/integration/features/bootstrap/BasicStructure.php
	build/integration/run.sh
---
 .../features/bootstrap/BasicStructure.php     |  1 -
 .../bootstrap/ExternalStorageContext.php      | 24 -------------------
 .../features/external-storage.feature         |  2 +-
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 build/integration/features/bootstrap/ExternalStorageContext.php

diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index b14e41ca6479..4ca2c56e9d7f 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -334,6 +334,5 @@ public static function removeFilesFromLocalStorageAfter(){
 			$file->isDir() ?  rmdir($file) : unlink($file);
 		}
 	}
-
 }
 
diff --git a/build/integration/features/bootstrap/ExternalStorageContext.php b/build/integration/features/bootstrap/ExternalStorageContext.php
deleted file mode 100644
index 90dc06cf5714..000000000000
--- a/build/integration/features/bootstrap/ExternalStorageContext.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-use Behat\Gherkin\Node\TableNode;
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\ResponseInterface;
-
-class ExternalStorageContext implements \Behat\Behat\Context\Context {
-	
-
-	/**
-	 * @AfterScenario
-	 */
-	public static function removeFilesFromLocalStorage(){
-		$dir = "./local_storage/";
-		$di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS);
-		$ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST);
-		foreach ( $ri as $file ) {
-    		$file->isDir() ?  rmdir($file) : unlink($file);
-		}
-	}
-}
diff --git a/build/integration/features/external-storage.feature b/build/integration/features/external-storage.feature
index ac8bd971edff..9e53b01346ef 100644
--- a/build/integration/features/external-storage.feature
+++ b/build/integration/features/external-storage.feature
@@ -3,6 +3,7 @@ Feature: external-storage
     Given using api version "1"
     Given using dav path "remote.php/webdav"
 
+  @local_storage
   Scenario: Share by link a file inside a local external storage
     Given user "user0" exists
     And user "user1" exists
@@ -21,6 +22,5 @@ Feature: external-storage
       | url | AN_URL |
       | token | A_TOKEN |
       | mimetype | httpd/unix-directory |
-    And Public shared file "/foo/textfile0.txt" can be downloaded
 
 

From d87dbad598c849aa2db1bfeee324386be87b6ee7 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Wed, 10 Aug 2016 07:26:35 +0000
Subject: [PATCH 093/219] Run as current user

Conflicts:
	build/integration/run.sh
---
 build/integration/run.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/integration/run.sh b/build/integration/run.sh
index 1917a86939ed..fa3bafea4682 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -24,7 +24,6 @@ echo $PHPPID_FED
 export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
 export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/"
 
-
 #Enable external storage app
 ../../occ app:enable files_external
 
@@ -41,6 +40,8 @@ RESULT=$?
 kill $PHPPID
 kill $PHPPID_FED
 
+../../occ files_external:delete -y $ID_STORAGE
+
 if [ -z $HIDE_OC_LOGS ]; then
 	tail "../../data/owncloud.log"
 fi

From 12b28f8b86873dcd715b51066385a3b21d838cbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Fri, 12 Aug 2016 07:11:07 +0000
Subject: [PATCH 094/219] Added local_storage folder

---
 build/integration/local_storage/.gitignore | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 build/integration/local_storage/.gitignore

diff --git a/build/integration/local_storage/.gitignore b/build/integration/local_storage/.gitignore
new file mode 100644
index 000000000000..5e7d2734cfc6
--- /dev/null
+++ b/build/integration/local_storage/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

From d4d3e3b1289a5dab8ec01de94972e210b9537bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Fri, 26 Aug 2016 07:57:48 +0000
Subject: [PATCH 095/219] External storage was not enabled and content was not
 deleted before scenarios

Conflicts:
	build/integration/features/bootstrap/BasicStructure.php
	build/integration/run.sh
---
 build/integration/run.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/integration/run.sh b/build/integration/run.sh
index fa3bafea4682..ec3b1bfd63c7 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -42,6 +42,9 @@ kill $PHPPID_FED
 
 ../../occ files_external:delete -y $ID_STORAGE
 
+#Disable external storage app
+../../occ app:disable files_external
+
 if [ -z $HIDE_OC_LOGS ]; then
 	tail "../../data/owncloud.log"
 fi

From c145ca0bac78b73b68cee1d8ac0b1b16bfab823a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Fri, 26 Aug 2016 10:52:11 +0000
Subject: [PATCH 096/219] Changed enabled/disabled app in provisioning api
 tests

---
 build/integration/features/provisioning-v1.feature | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 342d43141fc2..d51cda47b686 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -293,6 +293,7 @@ Feature: provisioning
 			| provisioning_api |
 			| systemtags |
 			| updatenotification |
+			| files_external |
 
 	Scenario: get app info
 		Given As an "admin"
@@ -302,19 +303,19 @@ Feature: provisioning
 
 	Scenario: enable an app
 		Given As an "admin"
-		And app "files_external" is disabled
-		When sending "POST" to "/cloud/apps/files_external"
+		And app "user_ldap" is disabled
+		When sending "POST" to "/cloud/apps/user_ldap"
 		Then the OCS status code should be "100"
 		And the HTTP status code should be "200"
-		And app "files_external" is enabled
+		And app "user_ldap" is enabled
 
 	Scenario: disable an app
 		Given As an "admin"
-		And app "files_external" is enabled
-		When sending "DELETE" to "/cloud/apps/files_external"
+		And app "user_ldap" is enabled
+		When sending "DELETE" to "/cloud/apps/user_ldap"
 		Then the OCS status code should be "100"
 		And the HTTP status code should be "200"
-		And app "files_external" is disabled
+		And app "user_ldap" is disabled
 
 	Scenario: disable an user
 		Given As an "admin"

From 8fe2daaa9eff1f9472fc8c67c0407fd39dd1f46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Fri, 2 Sep 2016 10:35:01 +0200
Subject: [PATCH 097/219] [stable9.1] Comments field is not properly escaped
 (#26008) (#26009)

---
 apps/comments/js/commentstabview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index f71567f04d1a..2614d7e9c125 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -31,7 +31,7 @@
 		'{{/if}}' +
 		'    </div>' +
 		'    <form class="newCommentForm">' +
-		'        <textarea class="message" placeholder="{{newMessagePlaceholder}}">{{{message}}}</textarea>' +
+		'        <textarea class="message" placeholder="{{newMessagePlaceholder}}">{{message}}</textarea>' +
 		'        <input class="submit" type="submit" value="{{submitText}}" />' +
 		'{{#if isEditMode}}' +
 		'        <input class="cancel" type="button" value="{{cancelText}}" />' +

From 7c042a47e82271f61020009e19b52715c0ef178c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 6 Sep 2016 08:24:20 +0200
Subject: [PATCH 098/219] forward port smbfixes (#25951)

---
 apps/files_external/lib/Lib/Storage/SMB.php   | 227 +++++++++++++-----
 apps/files_external/tests/Storage/SmbTest.php |   4 +-
 2 files changed, 170 insertions(+), 61 deletions(-)

diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
index b92ea5930e6b..19d5b499e284 100644
--- a/apps/files_external/lib/Lib/Storage/SMB.php
+++ b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Jesús Macias <jmacias@solidgear.es>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
@@ -11,7 +11,7 @@
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
- * @copyright Copyright (c) 2016, ownCloud GmbH.
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
  *
  * This code is free software: you can redistribute it and/or modify
@@ -30,20 +30,24 @@
 
 namespace OCA\Files_External\Lib\Storage;
 
+use Icewind\SMB\Exception\AlreadyExistsException;
 use Icewind\SMB\Exception\ConnectException;
 use Icewind\SMB\Exception\Exception;
 use Icewind\SMB\Exception\ForbiddenException;
 use Icewind\SMB\Exception\NotFoundException;
+use Icewind\SMB\FileInfo;
 use Icewind\SMB\NativeServer;
 use Icewind\SMB\Server;
+use Icewind\SMB\Share;
 use Icewind\Streams\CallbackWrapper;
 use Icewind\Streams\IteratorDirectory;
 use OC\Cache\CappedMemoryCache;
 use OC\Files\Filesystem;
+use OC\Files\Storage\Common;
 use OCP\Files\StorageNotAvailableException;
 use OCP\Util;
 
-class SMB extends \OC\Files\Storage\Common {
+class SMB extends Common {
 	/**
 	 * @var \Icewind\SMB\Server
 	 */
@@ -74,8 +78,10 @@ public function __construct($params) {
 
 		if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) {
 			if (Server::NativeAvailable()) {
+				$this->log('using native libsmbclient');
 				$this->server = new NativeServer($params['host'], $params['user'], $params['password']);
 			} else {
+				$this->log('falling back to smbclient');
 				$this->server = new Server($params['host'], $params['user'], $params['password']);
 			}
 			$this->share = $this->server->getShare(trim($params['share'], '/'));
@@ -120,24 +126,66 @@ protected function buildPath($path) {
 	 * @param string $path
 	 * @return \Icewind\SMB\IFileInfo
 	 * @throws StorageNotAvailableException
+	 * @throws ForbiddenException
+	 * @throws NotFoundException
 	 */
 	protected function getFileInfo($path) {
 		$this->log('enter: '.__FUNCTION__."($path)");
-		try {
 			$path = $this->buildPath($path);
 			if (!isset($this->statCache[$path])) {
-				$this->log("stat fetching '{$this->root}$path'");
-				$this->statCache[$path] = $this->share->stat($path);
+				try {
+					$this->log("stat fetching '$path'");
+					try {
+						$this->statCache[$path] = $this->share->stat($path);
+					} catch (NotFoundException $e) {
+						if ($this->share instanceof Share) {
+							// smbclient may have problems with the allinfo cmd
+							$this->log("stat for '$path' failed, trying to read parent dir");
+							$infos = $this->share->dir(dirname($path));
+							foreach ($infos as $fileInfo) {
+								if ($fileInfo->getName() === basename($path)) {
+									$this->statCache[$path] = $fileInfo;
+									break;
+								}
+							}
+							if (empty($this->statCache[$path])) {
+								$this->leave(__FUNCTION__, $e);
+								throw $e;
+							}
+						} else {
+							// trust the results of libsmb
+							$this->leave(__FUNCTION__, $e);
+							throw $e;
+						}
+					}
+					if ($this->isRootDir($path) && $this->statCache[$path]->isHidden()) {
+						$this->log("unhiding stat for '$path'");
+						// make root never hidden, may happen when accessing a shared drive (mode is 22, archived and readonly - neither is true ... whatever)
+						if ($this->statCache[$path]->isReadOnly()) {
+							$mode = FileInfo::MODE_DIRECTORY & FileInfo::MODE_READONLY;
+						} else {
+							$mode = FileInfo::MODE_DIRECTORY;
+						}
+						$this->statCache[$path] = new FileInfo($path, '', 0, $this->statCache[$path]->getMTime(), $mode);
+					}
+				} catch (ConnectException $e) {
+					$ex = new StorageNotAvailableException(
+						$e->getMessage(), $e->getCode(), $e);
+					$this->leave(__FUNCTION__, $ex);
+					throw $ex;
+				} catch (ForbiddenException $e) {
+					if ($this->remoteIsShare() && $this->isRootDir($path)) { //mtime may not work for share root
+						$this->log("faking stat for forbidden '$path'");
+						$this->statCache[$path] = new FileInfo($path, '', 0, $this->shareMTime(), FileInfo::MODE_DIRECTORY);
+					} else {
+						$this->leave(__FUNCTION__, $e);
+						throw $e;
+					}
+				}
 			} else {
 				$this->log("stat cache hit for '$path'");
 			}
 			$result = $this->statCache[$path];
-		} catch (ConnectException $e) {
-			$ex = new StorageNotAvailableException(
-				$e->getMessage(), $e->getCode(), $e);
-			$this->leave(__FUNCTION__, $ex);
-			throw $ex;
-		}
 		return $this->leave(__FUNCTION__, $result);
 	}
 
@@ -150,9 +198,18 @@ protected function getFolderContents($path) {
 		$this->log('enter: '.__FUNCTION__."($path)");
 		try {
 			$path = $this->buildPath($path);
-			$result = $this->share->dir($path);
-			foreach ($result as $file) {
-				$this->statCache[$path . '/' . $file->getName()] = $file;
+			$result = [];
+			$children = $this->share->dir($path);
+			foreach ($children as $fileInfo) {
+				// check if the file is readable before adding it to the list
+				// can't use "isReadable" function here, use smb internals instead
+				if ($fileInfo->isHidden()) {
+					$this->log("{$fileInfo->getName()} isn't readable, skipping", Util::DEBUG);
+				} else {
+					$result[] = $fileInfo;
+					//remember entry so we can answer file_exists and filetype without a full stat
+					$this->statCache[$path . '/' . $fileInfo->getName()] = $fileInfo;
+				}
 			}
 		} catch (ConnectException $e) {
 			$ex = new StorageNotAvailableException(
@@ -168,12 +225,51 @@ protected function getFolderContents($path) {
 	 * @return array
 	 */
 	protected function formatInfo($info) {
-		return array(
+		$result = [
 			'size' => $info->getSize(),
-			'mtime' => $info->getMTime()
-		);
+			'mtime' => $info->getMTime(),
+		];
+		if ($info->isDirectory()) {
+			$result['type'] = 'dir';
+		} else {
+			$result['type'] = 'file';
+		}
+		return $result;
 	}
 
+	/**
+	 * Rename the files
+	 *
+	 * @param string $source the old name of the path
+	 * @param string $target the new name of the path
+	 * @return bool true if the rename is successful, false otherwise
+	 */
+	public function rename($source, $target) {
+		$this->log("enter: rename('$source', '$target')", Util::DEBUG);
+		try {
+			$result = $this->share->rename($this->root . $source, $this->root . $target);
+			$this->removeFromCache($this->root . $source);
+			$this->removeFromCache($this->root . $target);
+		} catch (AlreadyExistsException $e) {
+			$this->unlink($target);
+			$result = $this->share->rename($this->root . $source, $this->root . $target);
+			$this->removeFromCache($this->root . $source);
+			$this->removeFromCache($this->root . $target);
+			$this->swallow(__FUNCTION__, $e);
+		} catch (\Exception $e) {
+			$this->swallow(__FUNCTION__, $e);
+			$result = false;
+		}
+		return $this->leave(__FUNCTION__, $result);
+	}
+
+	private function removeFromCache($path) {
+		$path = trim($path, '/');
+		// TODO The CappedCache does not really clear by prefix. It just clears all.
+		//$this->dirCache->clear($path);
+		$this->statCache->clear($path);
+		//$this->xattrCache->clear($path);
+	}
 	/**
 	 * @param string $path
 	 * @return array
@@ -184,6 +280,45 @@ public function stat($path) {
 		return $this->leave(__FUNCTION__, $result);
 	}
 
+	/**
+	 * get the best guess for the modification time of the share
+	 * NOTE: modification times do not bubble up the directory tree, basically
+	 * we are just guessing a time
+	 *
+	 * @return int the calculated mtime for the folder
+	 */
+	private function shareMTime() {
+		$this->log('enter: '.__FUNCTION__, Util::DEBUG);
+		$files = $this->share->dir($this->root);
+		$result = 0;
+		foreach ($files as $fileInfo) {
+			if ($fileInfo->getMTime() > $result) {
+				$result = $fileInfo->getMTime();
+			}
+		}
+		return $this->leave(__FUNCTION__, $result);
+	}
+	/**
+	 * Check if the path is our root dir (not the smb one)
+	 *
+	 * @param string $path the path
+	 * @return bool true if it's root, false if not
+	 */
+	private function isRootDir($path) {
+		$this->log('enter: '.__FUNCTION__."($path)", Util::DEBUG);
+		$result = $path === '' || $path === '/' || $path === '.';
+		return $this->leave(__FUNCTION__, $result);
+	}
+	/**
+	 * Check if our root points to a smb share
+	 *
+	 * @return bool true if our root points to a share false otherwise
+	 */
+	private function remoteIsShare() {
+		$this->log('enter: '.__FUNCTION__, Util::DEBUG);
+		$result = $this->share->getName() && (!$this->root || $this->root === '/');
+		return $this->leave(__FUNCTION__, $result);
+	}
 	/**
 	 * @param string $path
 	 * @return bool
@@ -214,33 +349,6 @@ public function unlink($path) {
 		return $this->leave(__FUNCTION__, $result);
 	}
 
-	/**
-	 * @param string $path1 the old name
-	 * @param string $path2 the new name
-	 * @return bool
-	 * @throws StorageNotAvailableException
-	 */
-	public function rename($path1, $path2) {
-		$this->log('enter: '.__FUNCTION__."($path1, $path2)");
-		$result = false;
-		try {
-			$this->remove($path2);
-			$path1 = $this->buildPath($path1);
-			$path2 = $this->buildPath($path2);
-			$result = $this->share->rename($path1, $path2);
-		} catch (NotFoundException $e) {
-			$this->swallow(__FUNCTION__, $e);
-		} catch (ForbiddenException $e) {
-			$this->swallow(__FUNCTION__, $e);
-		} catch (ConnectException $e) {
-			$ex = new StorageNotAvailableException(
-				$e->getMessage(), $e->getCode(), $e);
-			$this->leave(__FUNCTION__, $ex);
-			throw $ex;
-		}
-		return $this->leave(__FUNCTION__, $result);
-	}
-
 	/**
 	 * check if a file or folder has been updated since $time
 	 *
@@ -250,14 +358,8 @@ public function rename($path1, $path2) {
 	 */
 	public function hasUpdated($path, $time) {
 		$this->log('enter: '.__FUNCTION__."($path, $time)");
-		if (!$path and $this->root == '/') {
-			// mtime doesn't work for shares, but giving the nature of the backend,
-			// doing a full update is still just fast enough
-			$result = true;
-		} else {
-			$actualTime = $this->filemtime($path);
-			$result = $actualTime > $time;
-		}
+		$actualTime = $this->filemtime($path);
+		$result = $actualTime > $time;
 		return $this->leave(__FUNCTION__, $result);
 	}
 
@@ -282,7 +384,7 @@ public function fopen($path, $mode) {
 				case 'w':
 				case 'wb':
 					$source = $this->share->write($fullPath);
-					$result = CallbackWrapper::wrap($source, null, null, function () use ($fullPath) {
+					$result = CallBackWrapper::wrap($source, null, null, function () use ($fullPath) {
 						unset($this->statCache[$fullPath]);
 					});
 					break;
@@ -311,7 +413,7 @@ public function fopen($path, $mode) {
 						if (!$this->isCreatable(dirname($path))) {
 							break;
 						}
-						$tmpFile = \OCP\Files::tmpFile($ext);
+						$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 					}
 					$source = fopen($tmpFile, $mode);
 					$share = $this->share;
@@ -338,7 +440,7 @@ public function rmdir($path) {
 		$this->log('enter: '.__FUNCTION__."($path)");
 		$result = false;
 		try {
-			$this->statCache = array();
+			$this->removeFromCache($path);
 			$content = $this->share->dir($this->buildPath($path));
 			foreach ($content as $file) {
 				if ($file->isDirectory()) {
@@ -417,8 +519,7 @@ public function mkdir($path) {
 		$result = false;
 		$path = $this->buildPath($path);
 		try {
-			$this->share->mkdir($path);
-			$result = true;
+			$result = $this->share->mkdir($path);
 		} catch (ConnectException $e) {
 			$ex = new StorageNotAvailableException(
 				$e->getMessage(), $e->getCode(), $e);
@@ -519,7 +620,6 @@ public function test() {
 		return $this->leave(__FUNCTION__, $result);
 	}
 
-
 	/**
 	 * @param string $message
 	 * @param int $level
@@ -557,7 +657,7 @@ private function leave($function, $result) {
 				.' message: '.$result->getMessage()
 				.' trace: '.$result->getTraceAsString(), Util::DEBUG);
 		} else {
-			Util::writeLog('wnd', "leave: $function, return ".json_encode($result), Util::DEBUG);
+			Util::writeLog('wnd', "leave: $function, return ".json_encode($result, true), Util::DEBUG);
 		}
 		return $result;
 	}
@@ -570,4 +670,11 @@ private function swallow($function, \Exception $exception) {
 				.' trace: '.$exception->getTraceAsString(), Util::DEBUG);
 		}
 	}
+
+	/**
+	 * immediately close / free connection
+	 */
+	public function __destruct() {
+		unset($this->share);
+	}
 }
diff --git a/apps/files_external/tests/Storage/SmbTest.php b/apps/files_external/tests/Storage/SmbTest.php
index 48f18bfa3a70..9193127c5710 100644
--- a/apps/files_external/tests/Storage/SmbTest.php
+++ b/apps/files_external/tests/Storage/SmbTest.php
@@ -50,12 +50,14 @@ protected function setUp() {
 		}
 		$config['root'] .= $id; //make sure we have an new empty folder to work in
 		$this->instance = new SMB($config);
-		$this->instance->mkdir('/');
+		$this->assertTrue($this->instance->mkdir('/'));
 	}
 
 	protected function tearDown() {
 		if ($this->instance) {
 			$this->instance->rmdir('');
+			// force disconnect of the client
+			unset($this->instance);
 		}
 
 		parent::tearDown();

From 35604587144f7a2b144b8e7fa68039c78d6651f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 6 Sep 2016 15:27:30 +0200
Subject: [PATCH 099/219] [stable9.1] Fix failing preview unit tests (#26039)

---
 lib/private/Preview.php   |  2 +-
 tests/lib/PreviewTest.php | 49 +++++++++++++++++----------------------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/lib/private/Preview.php b/lib/private/Preview.php
index 8bc262d70478..9459d18fa05d 100644
--- a/lib/private/Preview.php
+++ b/lib/private/Preview.php
@@ -130,7 +130,7 @@ public function __construct(
 		$this->setFile($file);
 		$this->setMaxX((int)$maxX);
 		$this->setMaxY((int)$maxY);
-		$this->setScalingUp($scalingUp);
+		$this->setScalingup($scalingUp);
 
 		$this->preview = null;
 
diff --git a/tests/lib/PreviewTest.php b/tests/lib/PreviewTest.php
index 6ca88253468f..d8265d8a26ee 100644
--- a/tests/lib/PreviewTest.php
+++ b/tests/lib/PreviewTest.php
@@ -23,8 +23,10 @@
 namespace Test;
 
 use OC\Files\FileInfo;
+use OC\Files\Filesystem;
 use OC\Files\Storage\Temporary;
 use OC\Files\View;
+use OC\Preview;
 use Test\Traits\MountProviderTrait;
 use Test\Traits\UserTrait;
 
@@ -41,7 +43,7 @@ class PreviewTest extends TestCase {
 
 	const TEST_PREVIEW_USER1 = "test-preview-user1";
 
-	/** @var \OC\Files\View */
+	/** @var View */
 	private $rootView;
 	/**
 	 * Note that using 756 with an image with a ratio of 1.6 brings interesting rounding issues
@@ -77,10 +79,10 @@ protected function setUp() {
 		$this->createUser(self::TEST_PREVIEW_USER1, self::TEST_PREVIEW_USER1);
 		$this->loginAsUser(self::TEST_PREVIEW_USER1);
 
-		$storage = new \OC\Files\Storage\Temporary([]);
-		\OC\Files\Filesystem::mount($storage, [], '/' . self::TEST_PREVIEW_USER1 . '/');
+		$storage = new Temporary([]);
+		Filesystem::mount($storage, [], '/' . self::TEST_PREVIEW_USER1 . '/');
 
-		$this->rootView = new \OC\Files\View('');
+		$this->rootView = new View('');
 		$this->rootView->mkdir('/' . self::TEST_PREVIEW_USER1);
 		$this->rootView->mkdir('/' . self::TEST_PREVIEW_USER1 . '/files');
 
@@ -133,7 +135,7 @@ public function testIsPreviewDeleted() {
 		$x = 50;
 		$y = 50;
 
-		$preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y);
+		$preview = new Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y);
 		$preview->getPreview();
 
 		$fileInfo = $this->rootView->getFileInfo($sampleFile);
@@ -164,14 +166,14 @@ public function testAreAllPreviewsDeleted() {
 		$x = 50;
 		$y = 50;
 
-		$preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y);
+		$preview = new Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y);
 		$preview->getPreview();
 
 		$fileInfo = $this->rootView->getFileInfo($sampleFile);
 		/** @var int $fileId */
 		$fileId = $fileInfo['fileid'];
 
-		$thumbCacheFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER .
+		$thumbCacheFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . Preview::THUMBNAILS_FOLDER .
 			'/' . $fileId . '/';
 
 		$this->assertSame(true, $this->rootView->is_dir($thumbCacheFolder), "$thumbCacheFolder \n");
@@ -203,7 +205,7 @@ public function testIsTransparent($extension, $data, $expectedResult) {
 
 		$sample = '/' . self::TEST_PREVIEW_USER1 . '/files/test.' . $extension;
 		$this->rootView->file_put_contents($sample, $data);
-		$preview = new \OC\Preview(
+		$preview = new Preview(
 			self::TEST_PREVIEW_USER1, 'files/', 'test.' . $extension, $x,
 			$y
 		);
@@ -233,7 +235,7 @@ public function testUnsupportedPreviewsReturnEmptyObject() {
 		$this->rootView->file_put_contents($imgPath, $imgData);
 
 		$preview =
-			new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'testimage.odt', $width, $height);
+			new Preview(self::TEST_PREVIEW_USER1, 'files/', 'testimage.odt', $width, $height);
 		$preview->getPreview();
 		$image = $preview->getPreview();
 
@@ -310,8 +312,6 @@ public static function dimensionsDataProvider() {
 	public function testCreateMaxAndNormalPreviewsAtFirstRequest(
 		$sampleId, $widthAdjustment, $heightAdjustment, $keepAspect = false, $scalingUp = false
 	) {
-		//$this->markTestSkipped('Not testing this at this time');
-
 		// Get the right sample for the experiment
 		$this->getSample($sampleId);
 		$sampleWidth = $this->sampleWidth;
@@ -328,7 +328,7 @@ public function testCreateMaxAndNormalPreviewsAtFirstRequest(
 		$preview = $this->createPreview($previewWidth, $previewHeight);
 
 		// There should be no cached thumbnails
-		$thumbnailFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER .
+		$thumbnailFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . Preview::THUMBNAILS_FOLDER .
 			'/' . $sampleFileId;
 		$this->assertSame(false, $this->rootView->is_dir($thumbnailFolder));
 
@@ -562,10 +562,10 @@ public function testIsBiggerWithAspectRatioCached(
 	 * @param int $width
 	 * @param int $height
 	 *
-	 * @return \OC\Preview
+	 * @return Preview
 	 */
 	private function createPreview($width, $height) {
-		$preview = new \OC\Preview(
+		$preview = new Preview(
 			self::TEST_PREVIEW_USER1, 'files/', $this->sampleFilename, $width,
 			$height
 		);
@@ -581,7 +581,7 @@ private function createPreview($width, $height) {
 	/**
 	 * Creates the Max preview which will be used in the rest of the test
 	 *
-	 * @return \OC\Preview
+	 * @return Preview
 	 */
 	private function createMaxPreview() {
 		$this->keepAspect = true;
@@ -741,7 +741,7 @@ private function buildCachePath($fileId, $width, $height, $user = false, $postfi
 			$userPath = '/' . self::TEST_PREVIEW_USER1 . '/';
 		}
 
-		return $userPath . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId
+		return $userPath . Preview::THUMBNAILS_FOLDER . '/' . $fileId
 		. '/' . $width . '-' . $height . $postfix . '.png';
 	}
 
@@ -779,14 +779,7 @@ private function prepareSample($fileName, $sampleWidth, $sampleHeight) {
 	 * @param $sampleId
 	 */
 	private function getSample($sampleId) {
-		// Corrects a rounding difference when using the EPS (Imagick converted) sample
-		$filename = $this->samples[$sampleId]['sampleFileName'];
-		$splitFileName = pathinfo($filename);
-		$extension = $splitFileName['extension'];
-		$correction = ($extension === 'eps') ? 1 : 0;
 		$maxPreviewHeight = $this->samples[$sampleId]['maxPreviewHeight'];
-		$maxPreviewHeight = $maxPreviewHeight - $correction;
-
 		$this->sampleFileId = $this->samples[$sampleId]['sampleFileId'];
 		$this->sampleFilename = $this->samples[$sampleId]['sampleFileName'];
 		$this->sampleWidth = $this->samples[$sampleId]['sampleWidth'];
@@ -891,7 +884,7 @@ public function testKeepAspectRatio() {
 		$originalHeight = 1050;
 		$originalAspectRation = $originalWidth / $originalHeight;
 
-		$preview = new \OC\Preview(
+		$preview = new Preview(
 			self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg',
 			150,
 			150
@@ -911,13 +904,13 @@ public function testKeepAspectRatioCover() {
 		$originalHeight = 1050;
 		$originalAspectRation = $originalWidth / $originalHeight;
 
-		$preview = new \OC\Preview(
+		$preview = new Preview(
 			self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg',
 			150,
 			150
 		);
 		$preview->setKeepAspect(true);
-		$preview->setMode(\OC\Preview::MODE_COVER);
+		$preview->setMode(Preview::MODE_COVER);
 		$image = $preview->getPreview();
 
 		$aspectRatio = $image->width() / $image->height();
@@ -929,7 +922,7 @@ public function testKeepAspectRatioCover() {
 
 	public function testSetFileWithInfo() {
 		$info = new FileInfo('/foo', null, '/foo', ['mimetype' => 'foo/bar'], null);
-		$preview = new \OC\Preview();
+		$preview = new Preview();
 		$preview->setFile('/foo', $info);
 		$this->assertEquals($info, $this->invokePrivate($preview, 'getFileInfo'));
 	}
@@ -945,7 +938,7 @@ public function testIsCached() {
 
 		\OC_Util::tearDownFS();
 		\OC_Util::setupFS($userId);
-		$preview = new \OC\Preview($userId, 'files');
+		$preview = new Preview($userId, 'files');
 		$view = new View('/' . $userId . '/files');
 		$view->file_put_contents('test.png', file_get_contents($sourceFile));
 		$info = $view->getFileInfo('test.png');

From d8d29f2221f50e842f76cf12cebfab40d7357cfc Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 29 Aug 2016 11:21:44 +0200
Subject: [PATCH 100/219] Allow increasing permissions for share owner

In some cases, the owner of the share is also recipient through a group
share. The owner must still be able to increase permissions in that
situation.
---
 apps/files_sharing/lib/API/Share20OCS.php     |   2 +-
 .../tests/API/Share20OCSTest.php              | 108 ++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/API/Share20OCS.php b/apps/files_sharing/lib/API/Share20OCS.php
index 436b8d15ac8f..3372e5f2cb2a 100644
--- a/apps/files_sharing/lib/API/Share20OCS.php
+++ b/apps/files_sharing/lib/API/Share20OCS.php
@@ -665,7 +665,7 @@ public function updateShare($id) {
 			}
 		}
 
-		if ($permissions !== null) {
+		if ($permissions !== null && $share->getShareOwner() !== $this->currentUser->getUID()) {
 			/* Check if this is an incomming share */
 			$incomingShares = $this->shareManager->getSharedWith($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_USER, $share->getNode(), -1, 0);
 			$incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0));
diff --git a/apps/files_sharing/tests/API/Share20OCSTest.php b/apps/files_sharing/tests/API/Share20OCSTest.php
index 6435c992f25c..27ea30860b52 100644
--- a/apps/files_sharing/tests/API/Share20OCSTest.php
+++ b/apps/files_sharing/tests/API/Share20OCSTest.php
@@ -1764,6 +1764,114 @@ public function testUpdateOtherPermissions() {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
+	public function testUpdateShareCannotIncreasePermissions() {
+		$ocs = $this->mockFormatShare();
+
+		$date = new \DateTime('2000-01-01');
+
+		$folder = $this->getMock('\OCP\Files\Folder');
+
+		$share = \OC::$server->getShareManager()->newShare();
+		$share
+			->setId(42)
+			->setSharedBy($this->currentUser->getUID())
+			->setShareOwner('anotheruser')
+			->setShareType(\OCP\Share::SHARE_TYPE_GROUP)
+			->setSharedWith('group1')
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setNode($folder);
+
+		// note: updateShare will modify the received instance but getSharedWith will reread from the database,
+		// so their values will be different
+		$incomingShare = \OC::$server->getShareManager()->newShare();
+		$incomingShare
+			->setId(42)
+			->setSharedBy($this->currentUser->getUID())
+			->setShareOwner('anotheruser')
+			->setShareType(\OCP\Share::SHARE_TYPE_GROUP)
+			->setSharedWith('group1')
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setNode($folder);
+
+		$this->request
+			->method('getParam')
+			->will($this->returnValueMap([
+				['permissions', null, '31'],
+			]));
+
+		$this->shareManager->method('getShareById')->with('ocinternal:42')->willReturn($share);
+
+		$this->shareManager->expects($this->any(0))
+			->method('getSharedWith')
+			->will($this->returnValueMap([
+				['currentUser', \OCP\Share::SHARE_TYPE_USER, $share->getNode(), -1, 0, []],
+				['currentUser', \OCP\Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0, [$incomingShare]]
+			]));
+
+		$this->shareManager->expects($this->never())->method('updateShare');
+
+		$expected = new \OC_OCS_Result(null, 404, 'Cannot increase permissions');
+		$result = $ocs->updateShare(42);
+
+		$this->assertEquals($expected->getMeta(), $result->getMeta());
+		$this->assertEquals($expected->getData(), $result->getData());
+	}
+
+	public function testUpdateShareCanIncreasePermissionsIfOwner() {
+		$ocs = $this->mockFormatShare();
+
+		$date = new \DateTime('2000-01-01');
+
+		$folder = $this->getMock('\OCP\Files\Folder');
+
+		$share = \OC::$server->getShareManager()->newShare();
+		$share
+			->setId(42)
+			->setSharedBy($this->currentUser->getUID())
+			->setShareOwner($this->currentUser->getUID())
+			->setShareType(\OCP\Share::SHARE_TYPE_GROUP)
+			->setSharedWith('group1')
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setNode($folder);
+
+		// note: updateShare will modify the received instance but getSharedWith will reread from the database,
+		// so their values will be different
+		$incomingShare = \OC::$server->getShareManager()->newShare();
+		$incomingShare
+			->setId(42)
+			->setSharedBy($this->currentUser->getUID())
+			->setShareOwner($this->currentUser->getUID())
+			->setShareType(\OCP\Share::SHARE_TYPE_GROUP)
+			->setSharedWith('group1')
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setNode($folder);
+
+		$this->request
+			->method('getParam')
+			->will($this->returnValueMap([
+				['permissions', null, '31'],
+			]));
+
+		$this->shareManager->method('getShareById')->with('ocinternal:42')->willReturn($share);
+
+		$this->shareManager->expects($this->any(0))
+			->method('getSharedWith')
+			->will($this->returnValueMap([
+				['currentUser', \OCP\Share::SHARE_TYPE_USER, $share->getNode(), -1, 0, []],
+				['currentUser', \OCP\Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0, [$incomingShare]]
+			]));
+
+		$this->shareManager->expects($this->once())
+			->method('updateShare')
+			->with($share)
+			->willReturn($share);
+
+		$expected = new \OC_OCS_Result();
+		$result = $ocs->updateShare(42);
+
+		$this->assertEquals($expected->getMeta(), $result->getMeta());
+		$this->assertEquals($expected->getData(), $result->getData());
+	}
 	public function dataFormatShare() {
 		$file = $this->getMock('\OCP\Files\File');
 		$folder = $this->getMock('\OCP\Files\Folder');

From a2d01aab8a1990fd7813d835865a478f5ecaf6eb Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Tue, 6 Sep 2016 23:19:07 +0300
Subject: [PATCH 101/219] Pass web requests to occ controller if upgrade is
 needed

---
 lib/base.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index 1f3079b039ea..9d0b1219f542 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -890,6 +890,12 @@ public static function handleRequest() {
 				OC_Util::setupFS();
 				OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo());
 				return;
+			} catch (\OC\NeedsUpdateException $e) {
+				if ($isOccControllerRequested && $needUpgrade){
+					OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo());
+					return;
+				}
+				throw $e;
 			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
 				//header('HTTP/1.0 404 Not Found');
 			} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {

From 4f0d8d49437abc7571a6a4ff78641f1ae9f044b3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 6 Sep 2016 12:57:14 +0200
Subject: [PATCH 102/219] Fix fed share test call to return proper result

Fixes an issue where retrying a previously failed federated share would
not properly reset the availability flag because the return value was
undefined instead of "true".
---
 apps/files_sharing/lib/External/Storage.php   |  2 +-
 .../tests/ExternalStorageTest.php             | 28 +++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php
index bc8d898f8ef3..2344f6cf132a 100644
--- a/apps/files_sharing/lib/External/Storage.php
+++ b/apps/files_sharing/lib/External/Storage.php
@@ -184,7 +184,7 @@ public function hasUpdated($path, $time) {
 
 	public function test() {
 		try {
-			parent::test();
+			return parent::test();
 		} catch (StorageInvalidException $e) {
 			// check if it needs to be removed
 			$this->checkStorageAvailability();
diff --git a/apps/files_sharing/tests/ExternalStorageTest.php b/apps/files_sharing/tests/ExternalStorageTest.php
index c5ff4ad02364..af8cde100427 100644
--- a/apps/files_sharing/tests/ExternalStorageTest.php
+++ b/apps/files_sharing/tests/ExternalStorageTest.php
@@ -66,14 +66,11 @@ function optionsProvider() {
 		);
 	}
 
-	/**
-	 * @dataProvider optionsProvider
-	 */
-	public function testStorageMountOptions($inputUri, $baseUri) {
+	private function getTestStorage($uri) {
 		$certificateManager = \OC::$server->getCertificateManager();
-		$storage = new TestSharingExternalStorage(
+		return new TestSharingExternalStorage(
 			array(
-				'remote' => $inputUri,
+				'remote' => $uri,
 				'owner' => 'testOwner',
 				'mountpoint' => 'remoteshare',
 				'token' => 'abcdef',
@@ -82,8 +79,20 @@ public function testStorageMountOptions($inputUri, $baseUri) {
 				'certificateManager' => $certificateManager
 			)
 		);
+	}
+
+	/**
+	 * @dataProvider optionsProvider
+	 */
+	public function testStorageMountOptions($inputUri, $baseUri) {
+		$storage = $this->getTestStorage($inputUri);
 		$this->assertEquals($baseUri, $storage->getBaseUri());
 	}
+
+	public function testIfTestReturnsTheValue() {
+		$result = $this->getTestStorage('https://remoteserver')->test();
+		$this->assertSame(true, $result);
+	}
 }
 
 /**
@@ -94,4 +103,11 @@ class TestSharingExternalStorage extends \OCA\Files_Sharing\External\Storage {
 	public function getBaseUri() {
 		return $this->createBaseUri();
 	}
+
+	public function stat($path) {
+		if ($path === '') {
+			return true;
+		}
+		return parent::stat($path);
+	}
 }

From 39182a49abc7624153417410d40e1aba57f6e726 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 2 Sep 2016 11:23:55 +0200
Subject: [PATCH 103/219] Prefilter inaccessible shares in
 DefaultShareProvider::getSharedWith()

The DefaultShareProvider now does a DB-level check to find out whether
file_source is accessible at all (deleted file) or whether it's in the
trashbin of a home storage.

One small corner case where the home storage id is in md5 form cannot
be covered properly with this approach.
---
 lib/private/Share20/DefaultShareProvider.php  |  46 ++++-
 .../lib/Share20/DefaultShareProviderTest.php  | 180 +++++++++++++++---
 2 files changed, 195 insertions(+), 31 deletions(-)

diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index aa8f1729a9d9..a3d7a5bb83a9 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -581,6 +581,25 @@ public function getSharesByPath(Node $path) {
 		return $shares;
 	}
 
+	/**
+	 * Returns whether the given database result can be interpreted as
+	 * a share with accessible file (not trashed, not deleted)
+	 */
+	private function isAccessibleResult($data) {
+		// exclude shares leading to deleted file entries
+		if ($data['fileid'] === null) {
+			return false;
+		}
+
+		// exclude shares leading to trashbin on home storages
+		$pathSections = explode('/', $data['path'], 2);
+		// FIXME: would not detect rare md5'd home storage case properly
+		if ($pathSections[0] !== 'files' && explode(':', $data['storage_string_id'], 2)[0] === 'home') {
+			return false;
+		}
+		return true;
+	}
+
 	/**
 	 * @inheritdoc
 	 */
@@ -591,11 +610,14 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
 		if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
 			//Get shares directly with this user
 			$qb = $this->dbConn->getQueryBuilder();
-			$qb->select('*')
-				->from('share');
+			$qb->select('s.*', 'f.fileid', 'f.path')
+				->selectAlias('st.id', 'storage_string_id')
+				->from('share', 's')
+				->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+				->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
 
 			// Order by id
-			$qb->orderBy('id');
+			$qb->orderBy('s.id');
 
 			// Set limit and offset
 			if ($limit !== -1) {
@@ -618,7 +640,9 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
 			$cursor = $qb->execute();
 
 			while($data = $cursor->fetch()) {
-				$shares[] = $this->createShare($data);
+				if ($this->isAccessibleResult($data)) {
+					$shares[] = $this->createShare($data);
+				}
 			}
 			$cursor->closeCursor();
 
@@ -639,9 +663,12 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
 				}
 
 				$qb = $this->dbConn->getQueryBuilder();
-				$qb->select('*')
-					->from('share')
-					->orderBy('id')
+				$qb->select('s.*', 'f.fileid', 'f.path')
+					->selectAlias('st.id', 'storage_string_id')
+					->from('share', 's')
+					->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+					->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
+					->orderBy('s.id')
 					->setFirstResult(0);
 
 				if ($limit !== -1) {
@@ -671,7 +698,10 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
 						$offset--;
 						continue;
 					}
-					$shares2[] = $this->createShare($data);
+
+					if ($this->isAccessibleResult($data)) {
+						$shares2[] = $this->createShare($data);
+					}
 				}
 				$cursor->closeCursor();
 			}
diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
index 6ef00721a70e..3d3c80fb7803 100644
--- a/tests/lib/Share20/DefaultShareProviderTest.php
+++ b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -72,6 +72,8 @@ public function setUp() {
 
 	public function tearDown() {
 		$this->dbConn->getQueryBuilder()->delete('share')->execute();
+		$this->dbConn->getQueryBuilder()->delete('filecache')->execute();
+		$this->dbConn->getQueryBuilder()->delete('storages')->execute();
 	}
 
 	/**
@@ -776,7 +778,47 @@ public function testGetShareByTokenNotFound() {
 		$this->provider->getShareByToken('invalidtoken');
 	}
 
-	public function testGetSharedWithUser() {
+	private function createTestStorageEntry($storageStringId) {
+		$qb = $this->dbConn->getQueryBuilder();
+		$qb->insert('storages')
+			->values([
+				'id' => $qb->expr()->literal($storageStringId),
+			]);
+		$this->assertEquals(1, $qb->execute());
+		return $qb->getLastInsertId();
+	}
+
+	private function createTestFileEntry($path, $storage = 1) {
+		$qb = $this->dbConn->getQueryBuilder();
+		$qb->insert('filecache')
+			->values([
+				'storage' => $qb->expr()->literal($storage),
+				'path' => $qb->expr()->literal($path),
+				'path_hash' => $qb->expr()->literal(md5($path)),
+				'name' => $qb->expr()->literal(basename($path)),
+			]);
+		$this->assertEquals(1, $qb->execute());
+		return $qb->getLastInsertId();
+	}
+
+	public function storageAndFileNameProvider() {
+		return [
+			// regular file on regular storage
+			['home::shareOwner', 'files/test.txt', 'files/test2.txt'],
+			// regular file on external storage
+			['smb::whatever', 'files/test.txt', 'files/test2.txt'],
+			// regular file on external storage in trashbin-like folder, 
+			['smb::whatever', 'files_trashbin/files/test.txt', 'files_trashbin/files/test2.txt'],
+		];
+	}
+
+	/**
+	 * @dataProvider storageAndFileNameProvider
+	 */
+	public function testGetSharedWithUser($storageStringId, $fileName1, $fileName2) {
+		$storageId = $this->createTestStorageEntry($storageStringId);
+		$fileId = $this->createTestFileEntry($fileName1, $storageId);
+		$fileId2 = $this->createTestFileEntry($fileName2, $storageId);
 		$qb = $this->dbConn->getQueryBuilder();
 		$qb->insert('share')
 			->values([
@@ -785,7 +827,7 @@ public function testGetSharedWithUser() {
 				'uid_owner' => $qb->expr()->literal('shareOwner'),
 				'uid_initiator' => $qb->expr()->literal('sharedBy'),
 				'item_type'   => $qb->expr()->literal('file'),
-				'file_source' => $qb->expr()->literal(42),
+				'file_source' => $qb->expr()->literal($fileId),
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
@@ -800,7 +842,7 @@ public function testGetSharedWithUser() {
 				'uid_owner' => $qb->expr()->literal('shareOwner2'),
 				'uid_initiator' => $qb->expr()->literal('sharedBy2'),
 				'item_type'   => $qb->expr()->literal('file2'),
-				'file_source' => $qb->expr()->literal(43),
+				'file_source' => $qb->expr()->literal($fileId2),
 				'file_target' => $qb->expr()->literal('myTarget2'),
 				'permissions' => $qb->expr()->literal(14),
 			]);
@@ -808,7 +850,7 @@ public function testGetSharedWithUser() {
 
 		$file = $this->getMock('\OCP\Files\File');
 		$this->rootFolder->method('getUserFolder')->with('shareOwner')->will($this->returnSelf());
-		$this->rootFolder->method('getById')->with(42)->willReturn([$file]);
+		$this->rootFolder->method('getById')->with($fileId)->willReturn([$file]);
 
 		$share = $this->provider->getSharedWith('sharedWith', \OCP\Share::SHARE_TYPE_USER, null, 1 , 0);
 		$this->assertCount(1, $share);
@@ -821,7 +863,13 @@ public function testGetSharedWithUser() {
 		$this->assertEquals(\OCP\Share::SHARE_TYPE_USER, $share->getShareType());
 	}
 
-	public function testGetSharedWithGroup() {
+	/**
+	 * @dataProvider storageAndFileNameProvider
+	 */
+	public function testGetSharedWithGroup($storageStringId, $fileName1, $fileName2) {
+		$storageId = $this->createTestStorageEntry($storageStringId);
+		$fileId = $this->createTestFileEntry($fileName1, $storageId);
+		$fileId2 = $this->createTestFileEntry($fileName2, $storageId);
 		$qb = $this->dbConn->getQueryBuilder();
 		$qb->insert('share')
 			->values([
@@ -830,7 +878,7 @@ public function testGetSharedWithGroup() {
 				'uid_owner' => $qb->expr()->literal('shareOwner2'),
 				'uid_initiator' => $qb->expr()->literal('sharedBy2'),
 				'item_type'   => $qb->expr()->literal('file'),
-				'file_source' => $qb->expr()->literal(43),
+				'file_source' => $qb->expr()->literal($fileId2),
 				'file_target' => $qb->expr()->literal('myTarget2'),
 				'permissions' => $qb->expr()->literal(14),
 			]);
@@ -844,7 +892,7 @@ public function testGetSharedWithGroup() {
 				'uid_owner' => $qb->expr()->literal('shareOwner'),
 				'uid_initiator' => $qb->expr()->literal('sharedBy'),
 				'item_type'   => $qb->expr()->literal('file'),
-				'file_source' => $qb->expr()->literal(42),
+				'file_source' => $qb->expr()->literal($fileId),
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
@@ -879,7 +927,7 @@ public function testGetSharedWithGroup() {
 
 		$file = $this->getMock('\OCP\Files\File');
 		$this->rootFolder->method('getUserFolder')->with('shareOwner')->will($this->returnSelf());
-		$this->rootFolder->method('getById')->with(42)->willReturn([$file]);
+		$this->rootFolder->method('getById')->with($fileId)->willReturn([$file]);
 
 		$share = $this->provider->getSharedWith('sharedWith', \OCP\Share::SHARE_TYPE_GROUP, null, 20 , 1);
 		$this->assertCount(1, $share);
@@ -892,7 +940,12 @@ public function testGetSharedWithGroup() {
 		$this->assertEquals(\OCP\Share::SHARE_TYPE_GROUP, $share->getShareType());
 	}
 
-	public function testGetSharedWithGroupUserModified() {
+	/**
+	 * @dataProvider storageAndFileNameProvider
+	 */
+	public function testGetSharedWithGroupUserModified($storageStringId, $fileName1, $fileName2) {
+		$storageId = $this->createTestStorageEntry($storageStringId);
+		$fileId = $this->createTestFileEntry($fileName1, $storageId);
 		$qb = $this->dbConn->getQueryBuilder();
 		$qb->insert('share')
 			->values([
@@ -901,7 +954,7 @@ public function testGetSharedWithGroupUserModified() {
 				'uid_owner' => $qb->expr()->literal('shareOwner'),
 				'uid_initiator' => $qb->expr()->literal('sharedBy'),
 				'item_type'   => $qb->expr()->literal('file'),
-				'file_source' => $qb->expr()->literal(42),
+				'file_source' => $qb->expr()->literal($fileId),
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
@@ -919,7 +972,7 @@ public function testGetSharedWithGroupUserModified() {
 				'uid_owner' => $qb->expr()->literal('shareOwner'),
 				'uid_initiator' => $qb->expr()->literal('sharedBy'),
 				'item_type'   => $qb->expr()->literal('file'),
-				'file_source' => $qb->expr()->literal(42),
+				'file_source' => $qb->expr()->literal($fileId),
 				'file_target' => $qb->expr()->literal('wrongTarget'),
 				'permissions' => $qb->expr()->literal(31),
 				'parent' => $qb->expr()->literal($id),
@@ -937,7 +990,7 @@ public function testGetSharedWithGroupUserModified() {
 				'uid_owner' => $qb->expr()->literal('shareOwner'),
 				'uid_initiator' => $qb->expr()->literal('sharedBy'),
 				'item_type'   => $qb->expr()->literal('file'),
-				'file_source' => $qb->expr()->literal(42),
+				'file_source' => $qb->expr()->literal($fileId),
 				'file_target' => $qb->expr()->literal('userTarget'),
 				'permissions' => $qb->expr()->literal(0),
 				'parent' => $qb->expr()->literal($id),
@@ -965,7 +1018,7 @@ public function testGetSharedWithGroupUserModified() {
 
 		$file = $this->getMock('\OCP\Files\File');
 		$this->rootFolder->method('getUserFolder')->with('shareOwner')->will($this->returnSelf());
-		$this->rootFolder->method('getById')->with(42)->willReturn([$file]);
+		$this->rootFolder->method('getById')->with($fileId)->willReturn([$file]);
 
 		$share = $this->provider->getSharedWith('user', \OCP\Share::SHARE_TYPE_GROUP, null, -1, 0);
 		$this->assertCount(1, $share);
@@ -980,11 +1033,17 @@ public function testGetSharedWithGroupUserModified() {
 		$this->assertSame('userTarget', $share->getTarget());
 	}
 
-	public function testGetSharedWithUserWithNode() {
+	/**
+	 * @dataProvider storageAndFileNameProvider
+	 */
+	public function testGetSharedWithUserWithNode($storageStringId, $fileName1, $fileName2) {
+		$storageId = $this->createTestStorageEntry($storageStringId);
+		$fileId = $this->createTestFileEntry($fileName1, $storageId);
+		$fileId2 = $this->createTestFileEntry($fileName2, $storageId);
 		$this->addShareToDB(\OCP\Share::SHARE_TYPE_USER, 'user0', 'user1', 'user1',
-			'file', 42, 'myTarget', 31, null, null, null);
+			'file', $fileId, 'myTarget', 31, null, null, null);
 		$id = $this->addShareToDB(\OCP\Share::SHARE_TYPE_USER, 'user0', 'user1', 'user1',
-			'file', 43, 'myTarget', 31, null, null, null);
+			'file', $fileId2, 'myTarget', 31, null, null, null);
 
 		$user0 = $this->getMock('\OCP\IUser');
 		$user0->method('getUID')->willReturn('user0');
@@ -997,9 +1056,9 @@ public function testGetSharedWithUserWithNode() {
 		]);
 
 		$file = $this->getMock('\OCP\Files\File');
-		$file->method('getId')->willReturn(43);
+		$file->method('getId')->willReturn($fileId2);
 		$this->rootFolder->method('getUserFolder')->with('user1')->will($this->returnSelf());
-		$this->rootFolder->method('getById')->with(43)->willReturn([$file]);
+		$this->rootFolder->method('getById')->with($fileId2)->willReturn([$file]);
 
 		$share = $this->provider->getSharedWith('user0', \OCP\Share::SHARE_TYPE_USER, $file, -1, 0);
 		$this->assertCount(1, $share);
@@ -1013,11 +1072,17 @@ public function testGetSharedWithUserWithNode() {
 		$this->assertEquals(\OCP\Share::SHARE_TYPE_USER, $share->getShareType());
 	}
 
-	public function testGetSharedWithGroupWithNode() {
+	/**
+	 * @dataProvider storageAndFileNameProvider
+	 */
+	public function testGetSharedWithGroupWithNode($storageStringId, $fileName1, $fileName2) {
+		$storageId = $this->createTestStorageEntry($storageStringId);
+		$fileId = $this->createTestFileEntry($fileName1, $storageId);
+		$fileId2 = $this->createTestFileEntry($fileName2, $storageId);
 		$this->addShareToDB(\OCP\Share::SHARE_TYPE_GROUP, 'group0', 'user1', 'user1',
-			'file', 42, 'myTarget', 31, null, null, null);
+			'file', $fileId, 'myTarget', 31, null, null, null);
 		$id = $this->addShareToDB(\OCP\Share::SHARE_TYPE_GROUP, 'group0', 'user1', 'user1',
-			'file', 43, 'myTarget', 31, null, null, null);
+			'file', $fileId2, 'myTarget', 31, null, null, null);
 
 		$user0 = $this->getMock('\OCP\IUser');
 		$user0->method('getUID')->willReturn('user0');
@@ -1036,9 +1101,9 @@ public function testGetSharedWithGroupWithNode() {
 		$this->groupManager->method('getUserGroups')->with($user0)->willReturn([$group0]);
 
 		$node = $this->getMock('\OCP\Files\Folder');
-		$node->method('getId')->willReturn(43);
+		$node->method('getId')->willReturn($fileId2);
 		$this->rootFolder->method('getUserFolder')->with('user1')->will($this->returnSelf());
-		$this->rootFolder->method('getById')->with(43)->willReturn([$node]);
+		$this->rootFolder->method('getById')->with($fileId2)->willReturn([$node]);
 
 		$share = $this->provider->getSharedWith('user0', \OCP\Share::SHARE_TYPE_GROUP, $node, -1, 0);
 		$this->assertCount(1, $share);
@@ -1052,6 +1117,75 @@ public function testGetSharedWithGroupWithNode() {
 		$this->assertEquals(\OCP\Share::SHARE_TYPE_GROUP, $share->getShareType());
 	}
 
+	public function shareTypesProvider() {
+		return [
+			[\OCP\Share::SHARE_TYPE_USER, false],
+			[\OCP\Share::SHARE_TYPE_GROUP, false],
+			[\OCP\Share::SHARE_TYPE_USER, true],
+			[\OCP\Share::SHARE_TYPE_GROUP, true],
+		];
+	}
+
+	/**
+	 * @dataProvider shareTypesProvider
+	 */
+	public function testGetSharedWithWithDeletedFile($shareType, $trashed) {
+		if ($trashed) {
+			// exists in database but is in trash
+			$storageId = $this->createTestStorageEntry('home::shareOwner');
+			$deletedFileId = $this->createTestFileEntry('files_trashbin/files/test.txt.d1465553223', $storageId);
+		} else {
+			// fileid that doesn't exist in the database
+			$deletedFileId = 123;
+		}
+		$qb = $this->dbConn->getQueryBuilder();
+		$qb->insert('share')
+			->values([
+				'share_type' => $qb->expr()->literal($shareType),
+				'share_with' => $qb->expr()->literal('sharedWith'),
+				'uid_owner' => $qb->expr()->literal('shareOwner'),
+				'uid_initiator' => $qb->expr()->literal('sharedBy'),
+				'item_type'   => $qb->expr()->literal('file'),
+				'file_source' => $qb->expr()->literal($deletedFileId),
+				'file_target' => $qb->expr()->literal('myTarget'),
+				'permissions' => $qb->expr()->literal(13),
+			]);
+		$this->assertEquals(1, $qb->execute());
+
+		$file = $this->getMock('\OCP\Files\File');
+		$this->rootFolder->method('getUserFolder')->with('shareOwner')->will($this->returnSelf());
+		$this->rootFolder->method('getById')->with($deletedFileId)->willReturn([$file]);
+
+		$groups = [];
+		foreach(range(0, 100) as $i) {
+			$group = $this->getMock('\OCP\IGroup');
+			$group->method('getGID')->willReturn('group'.$i);
+			$groups[] = $group;
+		}
+
+		$group = $this->getMock('\OCP\IGroup');
+		$group->method('getGID')->willReturn('sharedWith');
+		$groups[] = $group;
+
+		$user = $this->getMock('\OCP\IUser');
+		$user->method('getUID')->willReturn('sharedWith');
+		$owner = $this->getMock('\OCP\IUser');
+		$owner->method('getUID')->willReturn('shareOwner');
+		$initiator = $this->getMock('\OCP\IUser');
+		$initiator->method('getUID')->willReturn('sharedBy');
+
+		$this->userManager->method('get')->willReturnMap([
+			['sharedWith', $user],
+			['shareOwner', $owner],
+			['sharedBy', $initiator],
+		]);
+		$this->groupManager->method('getUserGroups')->with($user)->willReturn($groups);
+		$this->groupManager->method('get')->with('sharedWith')->willReturn($group);
+
+		$share = $this->provider->getSharedWith('sharedWith', $shareType, null, 1 , 0);
+		$this->assertCount(0, $share);
+	}
+
 	public function testGetSharesBy() {
 		$qb = $this->dbConn->getQueryBuilder();
 		$qb->insert('share')

From f572239546b5a22c2ce2b7fc8489013b62ac75ce Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 7 Sep 2016 20:48:37 +0200
Subject: [PATCH 104/219] Increase version for 9.1.1RC2

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 3695782a8e63..8aa6605b7bfc 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 1, 0);
+$OC_Version = array(9, 1, 1, 1);
 
 // The human readable string
-$OC_VersionString = '9.1.1 RC1';
+$OC_VersionString = '9.1.1 RC2';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From 6fe80377e8907241bd4e40bde43c41f76b43ef9b Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 8 Sep 2016 15:14:20 +0200
Subject: [PATCH 105/219] Only use realpath for real directories (#26060)

In some cross-local-storage use cases, the Local storage is
instantiated with "/" as data directory. In such cases, calling
realpath() would cause PHP warnings when open_basedir is set.

This fix bypasses the realpath() call when dealing with a root storage.
---
 lib/private/Files/Storage/Local.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index 005b5f9ab91f..317f25eddcf2 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -53,7 +53,12 @@ public function __construct($arguments) {
 			throw new \InvalidArgumentException('No data directory set for local storage');
 		}
 		$this->datadir = $arguments['datadir'];
-		$this->realDataDir = rtrim(realpath($this->datadir), '/') . '/';
+		// some crazy code uses a local storage on root...
+		if ($this->datadir === '/') {
+			$this->realDataDir = $this->datadir;
+		} else {
+			$this->realDataDir = rtrim(realpath($this->datadir), '/') . '/';
+		}
 		if (substr($this->datadir, -1) !== '/') {
 			$this->datadir .= '/';
 		}

From debe1c3f8414aec1addd61c170bb5b22ec6b2853 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 9 Sep 2016 14:53:12 +0200
Subject: [PATCH 106/219] Improve chunk upload AssemblyStream performance
 (#26062) (#26072)

---
 apps/dav/lib/Upload/AssemblyStream.php        | 39 ++++++++---
 .../tests/unit/Upload/AssemblyStreamTest.php  | 66 ++++++++++++++++++-
 2 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/apps/dav/lib/Upload/AssemblyStream.php b/apps/dav/lib/Upload/AssemblyStream.php
index db600ef897bc..59fb88921a6c 100644
--- a/apps/dav/lib/Upload/AssemblyStream.php
+++ b/apps/dav/lib/Upload/AssemblyStream.php
@@ -48,6 +48,9 @@ class AssemblyStream implements \Icewind\Streams\File {
 	/** @var int */
 	private $size;
 
+	/** @var resource */
+	private $currentStream = null;
+
 	/**
 	 * @param string $path
 	 * @param string $mode
@@ -100,16 +103,36 @@ public function stream_tell() {
 	 * @return string
 	 */
 	public function stream_read($count) {
+		do {
+			if ($this->currentStream === null) {
+				list($node, $posInNode) = $this->getNodeForPosition($this->pos);
+				if (is_null($node)) {
+					// reached last node, no more data
+					return '';
+				}
+				$this->currentStream = $this->getStream($node);
+				fseek($this->currentStream, $posInNode);
+			}
 
-		list($node, $posInNode) = $this->getNodeForPosition($this->pos);
-		if (is_null($node)) {
-			return null;
-		}
-		$stream = $this->getStream($node);
+			$data = fread($this->currentStream, $count);
+			// isset is faster than strlen
+			if (isset($data[$count - 1])) {
+				// we read the full count
+				$read = $count;
+			} else {
+				// reaching end of stream, which happens less often so strlen is ok
+				$read = strlen($data);
+			}
 
-		fseek($stream, $posInNode);
-		$data = fread($stream, $count);
-		$read = strlen($data);
+			if (feof($this->currentStream)) {
+				fclose($this->currentStream);
+				$this->currentNode = null;
+				$this->currentStream = null;
+			}
+			// if no data read, try again with the next node because
+			// returning empty data can make the caller think there is no more
+			// data left to read
+		} while ($read === 0);
 
 		// update position
 		$this->pos += $read;
diff --git a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
index 80e2c8fbaf9d..be3ac2d9ab5c 100644
--- a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
+++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
@@ -32,18 +32,78 @@ public function testGetContents($expected, $nodes) {
 		$this->assertEquals($expected, $content);
 	}
 
+	/**
+	 * @dataProvider providesNodes()
+	 */
+	public function testGetContentsFread($expected, $nodes) {
+		$stream = \OCA\DAV\Upload\AssemblyStream::wrap($nodes);
+
+		$content = '';
+		while (!feof($stream)) {
+			$content .= fread($stream, 3);
+		}
+
+		$this->assertEquals($expected, $content);
+	}
+
 	function providesNodes() {
+		$data8k = $this->makeData(8192);
+		$dataLess8k = $this->makeData(8191);
 		return[
-			'one node only' => ['1234567890', [
+			'one node zero bytes' => [
+				'', [
+				$this->buildNode('0', '')
+			]],
+			'one node only' => [
+				'1234567890', [
 				$this->buildNode('0', '1234567890')
 			]],
-			'two nodes' => ['1234567890', [
+			'one node buffer boundary' => [
+				$data8k, [
+				$this->buildNode('0', $data8k)
+			]],
+			'two nodes' => [
+				'1234567890', [
 				$this->buildNode('1', '67890'),
 				$this->buildNode('0', '12345')
-			]]
+			]],
+			'two nodes end on buffer boundary' => [
+				$data8k . $data8k, [
+				$this->buildNode('1', $data8k),
+				$this->buildNode('0', $data8k)
+			]],
+			'two nodes with one on buffer boundary' => [
+				$data8k . $dataLess8k, [
+				$this->buildNode('1', $dataLess8k),
+				$this->buildNode('0', $data8k)
+			]],
+			'two nodes on buffer boundary plus one byte' => [
+				$data8k . 'X' . $data8k, [
+				$this->buildNode('1', $data8k),
+				$this->buildNode('0', $data8k . 'X')
+			]],
+			'two nodes on buffer boundary plus one byte at the end' => [
+				$data8k . $data8k . 'X', [
+				$this->buildNode('1', $data8k . 'X'),
+				$this->buildNode('0', $data8k)
+			]],
 		];
 	}
 
+	private function makeData($count) {
+		$data = '';
+		$base = '1234567890';
+		$j = 0;
+		for ($i = 0; $i < $count; $i++) {
+			$data .= $base[$j];
+			$j++;
+			if (!isset($base[$j])) {
+				$j = 0;
+			}
+		}
+		return $data;
+	}
+
 	private function buildNode($name, $data) {
 		$node = $this->getMockBuilder('\Sabre\DAV\File')
 			->setMethods(['getName', 'get', 'getSize'])

From aed4ee9f81aabdcc6c583321182a8ec6623b8c38 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 13 Sep 2016 20:00:48 +0200
Subject: [PATCH 107/219] Increased version for 9.1.1 RC3

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 8aa6605b7bfc..72f46fd32efc 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 1, 1);
+$OC_Version = array(9, 1, 1, 2);
 
 // The human readable string
-$OC_VersionString = '9.1.1 RC2';
+$OC_VersionString = '9.1.1 RC3';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From 85f45d4bc5929b6e789833bb31b4a841cd5f06e2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 19 Sep 2016 13:05:32 +0200
Subject: [PATCH 108/219] [stable9.1] Redirect to challenge page when only one
 2FA provider (#26141)

If only one two factor provider exists, spare the user from having to
select it and redirect directly to its challenge page.
---
 .../TwoFactorChallengeController.php          | 13 ++++++++
 .../TwoFactorChallengeControllerTest.php      | 31 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php
index edaf3378cd8d..1e2652c0185b 100644
--- a/core/Controller/TwoFactorChallengeController.php
+++ b/core/Controller/TwoFactorChallengeController.php
@@ -78,6 +78,19 @@ protected function getLogoutAttribute() {
 	public function selectChallenge($redirect_url) {
 		$user = $this->userSession->getUser();
 		$providers = $this->twoFactorManager->getProviders($user);
+		if (count($providers) === 1) {
+			// redirect to the challenge page
+			$provider = current($providers);
+			return new RedirectResponse(
+				$this->urlGenerator->linkToRoute(
+					'core.TwoFactorChallenge.showChallenge',
+					[
+						'challengeProviderId' => $provider->getId(),
+						'redirect_url' => $redirect_url,
+					]
+				)
+			);
+		}
 
 		$data = [
 			'providers' => $providers,
diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
index 08d8dd1452ca..56ba52d58b5b 100644
--- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php
+++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
@@ -87,6 +87,37 @@ public function testSelectChallenge() {
 		$this->assertEquals($expected, $this->controller->selectChallenge('/some/url'));
 	}
 
+	public function testSelectChallengeSingleEntry() {
+		$provider = $this->createMock('\OCP\Authentication\TwoFactorAuth\IProvider');
+		$user = $this->createMock('\OCP\IUser');
+		$providers = [$provider];
+
+		$this->userSession->expects($this->once())
+			->method('getUser')
+			->will($this->returnValue($user));
+		$this->twoFactorManager->expects($this->once())
+			->method('getProviders')
+			->with($user)
+			->will($this->returnValue($providers));
+
+		$provider->expects($this->once())
+			->method('getId')
+			->will($this->returnValue('prov1'));
+
+		$url = $this->urlGenerator->linkToRoute(
+			'core.TwoFactorChallenge.showChallenge',
+			[
+				'challengeProviderId' => 'prov1',
+				'redirect_url' => '/some/url',
+			]
+		);
+		$expected = new RedirectResponse($url);
+
+		$response = $this->controller->selectChallenge('/some/url');
+		$this->assertEquals($expected, $response);
+		$this->assertEquals($url, $response->getRedirectURL());
+	}
+
 	public function testShowChallenge() {
 		$user = $this->getMock('\OCP\IUser');
 		$provider = $this->getMockBuilder('\OCP\Authentication\TwoFactorAuth\IProvider')

From 5cc7dd8922747b1626213640461818991360edb1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 19 Sep 2016 16:45:41 +0200
Subject: [PATCH 109/219] Final 9.1.1 in version.php

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 72f46fd32efc..9b604f05a4ab 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 1, 2);
+$OC_Version = array(9, 1, 1, 3);
 
 // The human readable string
-$OC_VersionString = '9.1.1 RC3';
+$OC_VersionString = '9.1.1';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From 08a328892aced1c7e81e67f08b4da617b8b64976 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 19 Sep 2016 20:40:23 +0200
Subject: [PATCH 110/219] Allow uploading empty files (#26135)

---
 apps/files/js/file-upload.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 3257ded7b89d..c4b3d25d1ee9 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -347,10 +347,6 @@ OC.Upload = {
 							//file is a directory
 							dirUploadFailure = true;
 						}
-						if (file.size === 0) {
-							// file is empty or a directory
-							dirUploadFailure = true;
-						}
 
 						if (dirUploadFailure) {
 							data.textStatus = 'dirorzero';

From 01833b4d38f270bf14c68eaae72bd6806f298b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 20 Sep 2016 11:16:44 +0200
Subject: [PATCH 111/219] [stable9.1] Fix mimetype detection inside hidden
 folders (#26138) (#26151)

---
 lib/private/Files/Type/Detection.php   | 6 ++++--
 tests/lib/Files/Type/DetectionTest.php | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
index 6191eae2754f..48e26d4ea674 100644
--- a/lib/private/Files/Type/Detection.php
+++ b/lib/private/Files/Type/Detection.php
@@ -164,9 +164,11 @@ public function getAllMappings() {
 	public function detectPath($path) {
 		$this->loadMappings();
 
-		if (strpos($path, '.')) {
+		$fileName = basename($path);
+		// note: leading dot doesn't qualify as extension
+		if (strpos($fileName, '.') > 0) {
 			//try to guess the type by the file extension
-			$extension = strtolower(strrchr(basename($path), "."));
+			$extension = strtolower(strrchr($fileName, '.'));
 			$extension = substr($extension, 1); //remove leading .
 			return (isset($this->mimetypes[$extension]) && isset($this->mimetypes[$extension][0]))
 				? $this->mimetypes[$extension][0]
diff --git a/tests/lib/Files/Type/DetectionTest.php b/tests/lib/Files/Type/DetectionTest.php
index 5800f4eb8e3a..7f3f10929fcf 100644
--- a/tests/lib/Files/Type/DetectionTest.php
+++ b/tests/lib/Files/Type/DetectionTest.php
@@ -74,6 +74,8 @@ public function testDetectPath() {
 		$this->assertEquals('text/plain', $this->detection->detectPath('foo.txt'));
 		$this->assertEquals('image/png', $this->detection->detectPath('foo.png'));
 		$this->assertEquals('image/png', $this->detection->detectPath('foo.bar.png'));
+		$this->assertEquals('image/png', $this->detection->detectPath('.hidden/foo.png'));
+		$this->assertEquals('image/png', $this->detection->detectPath('test.jpg/foo.png'));
 		$this->assertEquals('application/octet-stream', $this->detection->detectPath('.png'));
 		$this->assertEquals('application/octet-stream', $this->detection->detectPath('foo'));
 		$this->assertEquals('application/octet-stream', $this->detection->detectPath(''));

From 716eb4ff876edc8916ed8404054347caafdbc29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Wed, 21 Sep 2016 14:37:16 +0200
Subject: [PATCH 112/219] [stable9.1] In case the build on master or any
 release branch fails an email notification is sent out (#26167)

---
 Jenkinsfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8c15c67f25f7..3ac90adfd96a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -123,6 +123,13 @@ void executeAndReport(String testResultLocation, def body) {
     }
 
     if (failed) {
+
+        if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'stable9.1' || env.BRANCH_NAME == 'stable9' || env.BRANCH_NAME == 'stable8.2') {
+            mail body: "project build error is here: ${env.BUILD_URL}" ,
+                subject: "Build on release branch failed: ${env.BRANCH_NAME}",
+                to: 'jenkins@owncloud.com'
+        }
+
         error "Test execution failed. Terminating the build"
     }
 }

From c6b37639e41298b080e42575d51f248c5f251a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 27 Sep 2016 10:11:26 +0200
Subject: [PATCH 113/219] [stable9.1] Change the minimum log level to fatal
 (#26213) (#26215)

---
 lib/private/Log.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/Log.php b/lib/private/Log.php
index b65f48ec5181..b5d869b1e99a 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -227,7 +227,7 @@ public function debug($message, array $context = array()) {
 	 * @return void
 	 */
 	public function log($level, $message, array $context = array()) {
-		$minLevel = min($this->config->getValue('loglevel', Util::WARN), Util::ERROR);
+		$minLevel = min($this->config->getValue('loglevel', Util::WARN), Util::FATAL);
 		$logCondition = $this->config->getValue('log.condition', []);
 
 		array_walk($context, [$this->normalizer, 'format']);

From 492db474c280940d7031ca92ac4256fe907a092e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Tue, 27 Sep 2016 15:36:39 +0200
Subject: [PATCH 114/219] [stable9.1] Translate file summary connector (#26221)
 (#26222)

---
 apps/files/js/filesummary.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js
index 519718cfc825..7545654ec442 100644
--- a/apps/files/js/filesummary.js
+++ b/apps/files/js/filesummary.js
@@ -23,7 +23,7 @@
 	var INFO_TEMPLATE =
 		'<span class="info">' +
 			'<span class="dirinfo"></span>' +
-			'<span class="connector"> and </span>' +
+			'<span class="connector">{{connectorLabel}}</span>' +
 			'<span class="fileinfo"></span>' +
 			'<span class="hiddeninfo"></span>' +
 			'<span class="filter"></span>' +
@@ -203,7 +203,9 @@
 			if (!this._infoTemplateCompiled) {
 				this._infoTemplateCompiled = Handlebars.compile(INFO_TEMPLATE);
 			}
-			return this._infoTemplateCompiled(data);
+			return this._infoTemplateCompiled(_.extend({
+				connectorLabel: t('files', '{dirs} and {files}', {dirs: '', files: ''})
+			}, data));
 		},
 
 		/**

From f2d7be4344d2b0f472c18dc9b5c90aed5560d8ac Mon Sep 17 00:00:00 2001
From: RealRancor <RealRancor@users.noreply.github.com>
Date: Tue, 27 Sep 2016 17:25:25 +0200
Subject: [PATCH 115/219] Backport #26087 to stable9.1 (#26230)

---
 settings/templates/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/templates/help.php b/settings/templates/help.php
index 79584aba84d1..950d6f71cef8 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -28,7 +28,7 @@
 
 	<?php if($_['admin']) { ?>
 		<li>
-			<a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md"
+			<a href="https://github.com/owncloud/core/blob/master/.github/CONTRIBUTING.md"
 				target="_blank" rel="noreferrer">
 				<?php p($l->t('Issue tracker')); ?> ↗
 			</a>

From 1b38cee3f322ae1ec8ab9cae8fbae85417c26748 Mon Sep 17 00:00:00 2001
From: RealRancor <RealRancor@users.noreply.github.com>
Date: Wed, 28 Sep 2016 09:35:21 +0200
Subject: [PATCH 116/219] Backport #26236 to stable9.1 (#26240)

---
 themes/example/defaults.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/example/defaults.php b/themes/example/defaults.php
index fe532d5b67f1..1f1b2f0162a9 100644
--- a/themes/example/defaults.php
+++ b/themes/example/defaults.php
@@ -139,7 +139,7 @@ public function getLongFooter() {
 	}
 
 	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/8.0/go.php?to=' . $key;
+		return $this->getDocBaseUrl() . '/server/9.1/go.php?to=' . $key;
 	}
 
 

From 058c79a3581bb1d9d24518781c63d86d95a0af70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Fri, 30 Sep 2016 11:34:10 +0200
Subject: [PATCH 117/219] [stable9.1] Unset user PHOTO before setting new one
 in OCA\DAV\CardDAV\Converter::updateCard (#26243) (#26246)

Signed-off-by: Olivier Mehani <shtrom@ssji.net>

#26242
---
 apps/dav/lib/CardDAV/Converter.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
index f64b6c6b769e..49feba4316b1 100644
--- a/apps/dav/lib/CardDAV/Converter.php
+++ b/apps/dav/lib/CardDAV/Converter.php
@@ -91,6 +91,7 @@ public function updateCard(VCard $vCard, IUser $user) {
 		}
 
 		if($this->propertyNeedsUpdate($vCard, 'PHOTO', $image)) {
+			unset($vCard->PHOTO);
 			$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
 			$updated = true;
 		}

From ebf8a02d6eb68131ffdb17e607c0591dde4b06f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Fri, 30 Sep 2016 12:16:25 +0200
Subject: [PATCH 118/219] [stable9.1] Merge pull request #25636 from
 owncloud/fix-birthday-calendar-component (#26056)

The birthday calendar can only hold VEVENT
---
 apps/dav/appinfo/info.xml                     |  5 +-
 apps/dav/lib/CalDAV/BirthdayService.php       |  1 +
 .../FixBirthdayCalendarComponent.php          | 62 +++++++++++++++++++
 .../unit/CardDAV/BirthdayServiceTest.php      | 11 ++++
 4 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 apps/dav/lib/Migration/FixBirthdayCalendarComponent.php

diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index 683382339407..91fe7dd54efc 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -22,10 +22,11 @@
 	</background-jobs>
 	<repair-steps>
 		<post-migration>
-			<job>OCA\DAV\Migration\Classification</job>
+			<step>OCA\DAV\Migration\Classification</step>
+			<step>OCA\DAV\Migration\FixBirthdayCalendarComponent</step>
 		</post-migration>
 		<live-migration>
-			<job>OCA\DAV\Migration\GenerateBirthdays</job>
+			<step>OCA\DAV\Migration\GenerateBirthdays</step>
 		</live-migration>
 	</repair-steps>
 </info>
diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
index 26e3d22ce4e6..571fb6dace63 100644
--- a/apps/dav/lib/CalDAV/BirthdayService.php
+++ b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -108,6 +108,7 @@ public function ensureCalendarExists($principal) {
 		$this->calDavBackEnd->createCalendar($principal, self::BIRTHDAY_CALENDAR_URI, [
 			'{DAV:}displayname' => 'Contact birthdays',
 			'{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
+			'components'   => 'VEVENT',
 		]);
 
 		return $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
diff --git a/apps/dav/lib/Migration/FixBirthdayCalendarComponent.php b/apps/dav/lib/Migration/FixBirthdayCalendarComponent.php
new file mode 100644
index 000000000000..03bd298ff1d4
--- /dev/null
+++ b/apps/dav/lib/Migration/FixBirthdayCalendarComponent.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2016, ownCloud GmbH.
+ * @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/>
+ *
+ */
+
+namespace OCA\DAV\Migration;
+
+use OCA\DAV\CalDAV\BirthdayService;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class FixBirthdayCalendarComponent implements IRepairStep {
+
+	/** @var IDBConnection */
+	private $connection;
+
+	/**
+	 * FixBirthdayCalendarComponent constructor.
+	 *
+	 * @param IDBConnection $connection
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getName() {
+		return 'Fix component of birthday calendars';
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function run(IOutput $output) {
+		$query = $this->connection->getQueryBuilder();
+		$updated = $query->update('calendars')
+			->set('components', $query->createNamedParameter('VEVENT'))
+			->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
+			->execute();
+
+		$output->info("$updated birthday calendars updated.");
+	}
+}
diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
index be680b219d8e..de066fdf8741 100644
--- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
+++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
@@ -178,6 +178,17 @@ public function testGetAllAffectedPrincipals() {
 		], $users);
 	}
 
+	public function testBirthdayCalendarHasComponentEvent() {
+		$this->calDav->expects($this->once())
+			->method('createCalendar')
+			->with('principal001', 'contact_birthdays', [
+				'{DAV:}displayname' => 'Contact birthdays',
+				'{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
+				'components'   => 'VEVENT',
+			]);
+		$this->service->ensureCalendarExists('principal001');
+	}
+
 	public function providesBirthday() {
 		return [
 			[true,

From 8b20b12584bb49b46913ffb9ed273c15b245cc27 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 30 Sep 2016 13:30:16 +0200
Subject: [PATCH 119/219] Tear down FS between cron jobs (#26223)

Because some cron jobs do not always properly clean up their FS usage
and others might not clean up before setting up the FS, this could
cause potential side effects.

To make sure we exclude side effects, we tear down the FS between cron
jobs.
---
 cron.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cron.php b/cron.php
index c5ce895eb7e7..65f59cd47317 100644
--- a/cron.php
+++ b/cron.php
@@ -120,6 +120,8 @@
 
 			$logger->debug('Run ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
 			$job->execute($jobList, $logger);
+			// clean up after unclean jobs
+			\OC_Util::tearDownFS();
 			$logger->debug('Finished ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
 
 			$jobList->setLastJob($job);

From bede190a3019b82740b8c5ec5b538ccc325f77a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Tue, 4 Oct 2016 14:51:54 +0200
Subject: [PATCH 120/219] [stable9.1] Changed request to not add a prefix to
 the url (#26256)

* Changed request to not add a prefix to the url

* Expecting forbidden instead of service unavailable

* Handling login exceptions
---
 .../features/bootstrap/BasicStructure.php     | 30 +++++++++++++++++++
 .../features/provisioning-v1.feature          |  7 ++---
 index.php                                     |  3 ++
 lib/private/legacy/response.php               |  1 +
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 4ca2c56e9d7f..76ac7a81e3cf 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -145,6 +145,36 @@ public function sendingToWith($verb, $url, $body) {
 		}
 	}
 
+	/**
+	 * @When /^sending "([^"]*)" with exact url to "([^"]*)"$/
+	 * @param string $verb
+	 * @param string $url
+	 */
+	public function sendingToDirectUrl($verb, $url) {
+		$this->sendingToWithDirectUrl($verb, $url, null);
+	}
+
+	public function sendingToWithDirectUrl($verb, $url, $body) {
+		$fullUrl = substr($this->baseUrl, 0, -5) . $url;
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		} else {
+			$options['auth'] = [$this->currentUser, $this->regularUser];
+		}
+		if ($body instanceof \Behat\Gherkin\Node\TableNode) {
+			$fd = $body->getRowsHash();
+			$options['body'] = $fd;
+		}
+
+		try {
+			$this->response = $client->send($client->createRequest($verb, $fullUrl, $options));
+		} catch (\GuzzleHttp\Exception\ClientException $ex) {
+			$this->response = $ex->getResponse();
+		}
+	}
+
 	public function isExpectedUrl($possibleUrl, $finalPart){
 		$baseUrlChopped = substr($this->baseUrl, 0, -4);
 		$endCharacter = strlen($baseUrlChopped) + strlen($finalPart);
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index d51cda47b686..921ed3489fa9 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -558,7 +558,7 @@ Feature: provisioning
 	    Given As an "admin"
 		And user "user0" exists
 		And As an "user0"
-		When sending "GET" to "/index.php/apps/files"
+		When sending "GET" with exact url to "/index.php/apps/files"
 		Then the HTTP status code should be "200"
 
 	Scenario: Making a web request with a disabled user
@@ -566,7 +566,6 @@ Feature: provisioning
 		And user "user0" exists
 		And assure user "user0" is disabled
 		And As an "user0"
-		When sending "GET" to "/index.php/apps/files"
-		Then the OCS status code should be "999"
-    	And the HTTP status code should be "200"
+		When sending "GET" with exact url to "/index.php/apps/files"
+		And the HTTP status code should be "403"
 
diff --git a/index.php b/index.php
index 489a6382c90a..eebb02cb5ab9 100644
--- a/index.php
+++ b/index.php
@@ -47,6 +47,9 @@
 } catch (\OC\HintException $ex) {
 	OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
 	OC_Template::printErrorPage($ex->getMessage(), $ex->getHint());
+} catch (\OC\User\LoginException $ex) {
+	OC_Response::setStatus(OC_Response::STATUS_FORBIDDEN);
+	OC_Template::printErrorPage($ex->getMessage(), $ex->getHint());
 } catch (Exception $ex) {
 	\OC::$server->getLogger()->logException($ex, ['app' => 'index']);
 
diff --git a/lib/private/legacy/response.php b/lib/private/legacy/response.php
index 54a9385b7a6a..5e2dad6128c4 100644
--- a/lib/private/legacy/response.php
+++ b/lib/private/legacy/response.php
@@ -32,6 +32,7 @@ class OC_Response {
 	const STATUS_NOT_MODIFIED = 304;
 	const STATUS_TEMPORARY_REDIRECT = 307;
 	const STATUS_BAD_REQUEST = 400;
+	const STATUS_FORBIDDEN = 403;
 	const STATUS_NOT_FOUND = 404;
 	const STATUS_INTERNAL_SERVER_ERROR = 500;
 	const STATUS_SERVICE_UNAVAILABLE = 503;

From 75eacd17d47743b69bd2ae8ce3e6b65ba0960c00 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Thu, 22 Sep 2016 12:14:49 +0000
Subject: [PATCH 121/219] Added sharing again an own file while belonging to a
 group scenario to stable9.1

---
 build/integration/features/sharing-v1.feature | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index 313b2477ce92..9e317da6e95e 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -883,3 +883,34 @@ Feature: sharing
     And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
     And as "user1" the folder "merge-test-outside-groups-renamebeforesecondshare" does not exist
 
+  Scenario: Empting trashbin
+    Given As an "admin"
+    And user "user0" exists
+    And User "user0" deletes file "/textfile0.txt"
+    When User "user0" empties trashbin
+    Then the HTTP status code should be "200"
+
+  Scenario: orphaned shares
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And user "user0" created a folder "/common"
+    And user "user0" created a folder "/common/sub"
+    And file "/common/sub" of user "user0" is shared with user "user1"
+    And User "user0" deletes folder "/common"
+    When User "user0" empties trashbin
+    Then as "user1" the folder "sub" does not exist
+
+  Scenario: sharing again an own file while belonging to a group
+    Given As an "admin"
+    Given user "user0" exists
+    And group "sharing-group" exists
+    And user "user0" belongs to group "sharing-group"
+    And file "welcome.txt" of user "user0" is shared with group "sharing-group"
+    And Deleting last share
+    When sending "POST" to "/apps/files_sharing/api/v1/shares" with
+      | path | welcome.txt |
+      | shareWith | sharing-group |
+      | shareType | 1 |
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"

From d44aff91f9ad9444e180645004ea58ce3d6205d5 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 4 Oct 2016 15:09:48 +0000
Subject: [PATCH 122/219] Removed cases not belonging to this PR

---
 build/integration/features/sharing-v1.feature | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index 9e317da6e95e..c5609d643f47 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -883,24 +883,6 @@ Feature: sharing
     And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
     And as "user1" the folder "merge-test-outside-groups-renamebeforesecondshare" does not exist
 
-  Scenario: Empting trashbin
-    Given As an "admin"
-    And user "user0" exists
-    And User "user0" deletes file "/textfile0.txt"
-    When User "user0" empties trashbin
-    Then the HTTP status code should be "200"
-
-  Scenario: orphaned shares
-    Given As an "admin"
-    And user "user0" exists
-    And user "user1" exists
-    And user "user0" created a folder "/common"
-    And user "user0" created a folder "/common/sub"
-    And file "/common/sub" of user "user0" is shared with user "user1"
-    And User "user0" deletes folder "/common"
-    When User "user0" empties trashbin
-    Then as "user1" the folder "sub" does not exist
-
   Scenario: sharing again an own file while belonging to a group
     Given As an "admin"
     Given user "user0" exists

From 82cd86a2079c515df5889648c828c29e51424dab Mon Sep 17 00:00:00 2001
From: VicDeo <dubiniuk@owncloud.com>
Date: Thu, 8 Sep 2016 22:54:14 +0300
Subject: [PATCH 123/219] Allow one more origin. Log the reason of occ
 controller failure (#26031)

* Log the reason of occ controller failure

* Allow requests from SERVER_ADDR
---
 core/Controller/OccController.php           | 23 ++++++++++++++++++---
 tests/Core/Controller/OccControllerTest.php | 10 ++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/core/Controller/OccController.php b/core/Controller/OccController.php
index 917d02f37f19..0d63c131789b 100644
--- a/core/Controller/OccController.php
+++ b/core/Controller/OccController.php
@@ -26,6 +26,7 @@
 use OC\Console\Application;
 use OCP\IConfig;
 use OCP\IRequest;
+use OCP\ILogger;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 
@@ -48,6 +49,8 @@ class OccController extends Controller {
 	private $config;
 	/** @var Application */
 	private $console;
+	/** @var ILogger */
+	private $logger;
 
 	/**
 	 * OccController constructor.
@@ -56,12 +59,14 @@ class OccController extends Controller {
 	 * @param IRequest $request
 	 * @param IConfig $config
 	 * @param Application $console
+	 * @param ILogger $logger
 	 */
 	public function __construct($appName, IRequest $request,
-								IConfig $config, Application $console) {
+								IConfig $config, Application $console, ILogger $logger) {
 		parent::__construct($appName, $request);
 		$this->config = $config;
 		$this->console = $console;
+		$this->logger = $logger;
 	}
 
 	/**
@@ -108,6 +113,13 @@ public function execute($command, $token, $params = []) {
 			];
 
 		} catch (\UnexpectedValueException $e){
+			$this->logger->warning(
+				'Invalid request to occ controller. Details: "{details}"',
+				[
+					'app' => 'core',
+					'details' => $e->getMessage()
+				]
+			);
 			$json = [
 				'exitCode' => 126,
 				'response' => 'Not allowed',
@@ -123,8 +135,13 @@ public function execute($command, $token, $params = []) {
 	 * @param $token
 	 */
 	protected function validateRequest($command, $token){
-		if (!in_array($this->request->getRemoteAddress(), ['::1', '127.0.0.1', 'localhost'])) {
-			throw new \UnexpectedValueException('Web executor is not allowed to run from a different host');
+		$allowedHosts = ['::1', '127.0.0.1', 'localhost'];
+		if (isset($this->request->server['SERVER_ADDR'])){
+			array_push($allowedHosts, $this->request->server['SERVER_ADDR']);
+		}
+
+		if (!in_array($this->request->getRemoteAddress(), $allowedHosts)) {
+			throw new \UnexpectedValueException('Web executor is not allowed to run from a host ' . $this->request->getRemoteAddress());
 		}
 
 		if (!in_array($command, $this->allowedCommands)) {
diff --git a/tests/Core/Controller/OccControllerTest.php b/tests/Core/Controller/OccControllerTest.php
index 682d9170096b..46221d68b545 100644
--- a/tests/Core/Controller/OccControllerTest.php
+++ b/tests/Core/Controller/OccControllerTest.php
@@ -46,7 +46,8 @@ class OccControllerTest extends TestCase {
 	private $console;
 
 	public function testFromInvalidLocation(){
-		$this->getControllerMock('example.org');
+		$fakeHost = 'example.org';
+		$this->getControllerMock($fakeHost);
 
 		$response = $this->controller->execute('status', '');
 		$responseData = $response->getData();
@@ -55,7 +56,7 @@ public function testFromInvalidLocation(){
 		$this->assertEquals(126, $responseData['exitCode']);
 
 		$this->assertArrayHasKey('details', $responseData);
-		$this->assertEquals('Web executor is not allowed to run from a different host', $responseData['details']);
+		$this->assertEquals('Web executor is not allowed to run from a host ' . $fakeHost, $responseData['details']);
 	}
 
 	public function testNotWhiteListedCommand(){
@@ -136,7 +137,10 @@ private function getControllerMock($host){
 			'core',
 			$this->request,
 			$this->config,
-			$this->console
+			$this->console,
+			$this->getMockBuilder('\OCP\ILogger')
+				->disableOriginalConstructor()
+				->getMock()
 		);
 	}
 

From 9dd64d120d6aaa94247cb52120bb80cccd420d17 Mon Sep 17 00:00:00 2001
From: VicDeo <dubiniuk@owncloud.com>
Date: Wed, 21 Sep 2016 19:51:51 +0300
Subject: [PATCH 124/219] Use classname with namespace to inject dependencies
 automatically (#26105)

---
 core/Application.php | 12 ------------
 core/routes.php      |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/core/Application.php b/core/Application.php
index 8ea2672e54ea..705202d58577 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -126,18 +126,6 @@ public function __construct(array $urlParams=array()){
 				$c->query('SecureRandom')
 			);
 		});
-		$container->registerService('OccController', function(SimpleContainer $c) {
-			return new OccController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->query('Config'),
-				new \OC\Console\Application(
-					$c->query('Config'),
-					$c->query('ServerContainer')->getEventDispatcher(),
-					$c->query('Request')
-				)
-			);
-		});
 
 		/**
 		 * Core class wrappers
diff --git a/core/routes.php b/core/routes.php
index c473408e2e95..0199fe360b95 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -48,7 +48,7 @@
 		['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
 		['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
 		['name' => 'token#generateToken', 'url' => '/token/generate', 'verb' => 'POST'],
-		['name' => 'occ#execute', 'url' => '/occ/{command}', 'verb' => 'POST'],
+		['name' => 'OC\Core\Controller\Occ#execute', 'url' => '/occ/{command}', 'verb' => 'POST'],
 		['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
 		['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
 		['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],

From 16fd8f4c86b8176187b2dd4409a2597fa1a86f4f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 7 Oct 2016 17:16:51 +0200
Subject: [PATCH 125/219] [stable9.1] Improve user list rendering perf by not
 resorting after every add (#26282)

The call to UserList.add() was wrong and was passing "user.lastLogin"
as the sort argument which would cause the list to be resorted over and
over again for every added item after loading the next page of users.
---
 settings/js/users/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 13a8f9e459e5..3a32da35807a 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -393,7 +393,7 @@ var UserList = {
 					if(UserList.has(user.name)) {
 						return true;
 					}
-					var $tr = UserList.add(user, user.lastLogin, false, user.backend);
+					var $tr = UserList.add(user, false);
 					trs.push($tr);
 					loadedUsers++;
 				});

From 94f7f3824b7903f370c8975d508aadd726d13cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 10 Oct 2016 21:44:40 +0200
Subject: [PATCH 126/219] [stable9.1] Fix logClientIn for non-existing users
 (#26292) (#26307)

The check for two factor enforcement would return true for non-existing
users. This fix makes it return false in order to be able to perform
the regular login which will then fail and return false.

This prevents throwing PasswordLoginForbidden for non-existing users.
---
 lib/private/User/Session.php   |  3 +++
 tests/lib/User/SessionTest.php | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index dcc2e66c6c38..407b7b09305d 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -349,6 +349,9 @@ protected function isTwoFactorEnforced($username) {
 		$user = $this->manager->get($username);
 		if (is_null($user)) {
 			$users = $this->manager->getByEmail($username);
+			if (empty($users)) {
+				return false;
+			}
 			if (count($users) !== 1) {
 				return true;
 			}
diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php
index 9bde2c664b60..704c6f8a8f68 100644
--- a/tests/lib/User/SessionTest.php
+++ b/tests/lib/User/SessionTest.php
@@ -373,6 +373,32 @@ public function testLogClientInNoTokenPasswordWith2fa() {
 		$userSession->logClientIn('john', 'doe', $request);
 	}
 
+	public function testLogClientInUnexist() {
+		$manager = $this->getMockBuilder('\OC\User\Manager')
+			->disableOriginalConstructor()
+			->getMock();
+		$session = $this->getMock('\OCP\ISession');
+		$request = $this->getMock('\OCP\IRequest');
+		$user = $this->getMock('\OCP\IUser');
+
+		/** @var \OC\User\Session $userSession */
+		$userSession = $this->getMockBuilder('\OC\User\Session')
+			->setConstructorArgs([$manager, $session, $this->timeFactory, $this->tokenProvider, $this->config])
+			->setMethods(['login', 'supportsCookies', 'createSessionToken', 'getUser'])
+			->getMock();
+
+		$this->tokenProvider->expects($this->once())
+			->method('getToken')
+			->with('doe')
+			->will($this->throwException(new \OC\Authentication\Exceptions\InvalidTokenException()));
+		$this->config->expects($this->once())
+			->method('getSystemValue')
+			->with('token_auth_enforced', false)
+			->will($this->returnValue(false));
+
+		$this->assertFalse($userSession->logClientIn('unexist', 'doe', $request));
+	}
+
 	public function testLogClientInWithTokenPassword() {
 		$manager = $this->getMockBuilder('\OC\User\Manager')
 			->disableOriginalConstructor()

From 3a4f8b6bb13abbc9067f97d11340652c88d1a17f Mon Sep 17 00:00:00 2001
From: Claudemir Todo Bom <claudemir@todobom.com>
Date: Wed, 28 Sep 2016 13:31:16 -0300
Subject: [PATCH 127/219] [stable9.1] fix issue #23600 - mail invites through
 v1 webdav (#26188)

---
 apps/dav/appinfo/v1/caldav.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php
index 50348a602023..f4025d169a55 100644
--- a/apps/dav/appinfo/v1/caldav.php
+++ b/apps/dav/appinfo/v1/caldav.php
@@ -75,6 +75,8 @@
 }
 
 $server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+$server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin());
+$server->addPlugin(new OCA\DAV\CalDAV\Schedule\IMipPlugin( \OC::$server->getMailer(), \OC::$server->getLogger()));
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger()));
 
 // And off we go!

From 08fbfddab9a73b7035131748e8d2ea961c22cb42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Fri, 23 Sep 2016 21:47:47 +0200
Subject: [PATCH 128/219] [stable9.1] Don't parse info.xml but reuse already
 cached app infos - fixes #25603 (#25968)

* Don't parse info.xml but reuse already cached app infos - fixes #25603

* Use === in InfoParser. Fixes test

* InfoParser should not depend on UrlGenerator - fixes issue with session being closed too early
---
 core/register_command.php                     |  2 +-
 lib/private/App/InfoParser.php                | 32 +++----------------
 lib/private/AppFramework/App.php              | 19 +++--------
 lib/private/legacy/app.php                    | 17 +++++++++-
 tests/data/app/expected-info.json             |  4 +--
 tests/lib/App/CodeChecker/InfoCheckerTest.php |  4 +--
 tests/lib/App/InfoParserTest.php              | 17 ++--------
 7 files changed, 31 insertions(+), 64 deletions(-)

diff --git a/core/register_command.php b/core/register_command.php
index ebb6ce8b7235..b1e6f2f72f87 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -34,7 +34,7 @@
 /** @var $application Symfony\Component\Console\Application */
 $application->add(new OC\Core\Command\Status);
 $application->add(new OC\Core\Command\Check(\OC::$server->getConfig()));
-$infoParser = new \OC\App\InfoParser(\OC::$server->getURLGenerator());
+$infoParser = new \OC\App\InfoParser();
 $application->add(new OC\Core\Command\App\CheckCode($infoParser));
 $application->add(new OC\Core\Command\L10n\CreateJs());
 $application->add(new \OC\Core\Command\Integrity\SignApp(
diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php
index 0923f7d2c206..9ed55c3507bc 100644
--- a/lib/private/App/InfoParser.php
+++ b/lib/private/App/InfoParser.php
@@ -25,20 +25,8 @@
 
 namespace OC\App;
 
-use OCP\IURLGenerator;
-
 class InfoParser {
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/**
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(IURLGenerator $urlGenerator) {
-		$this->urlGenerator = $urlGenerator;
-	}
-
 	/**
 	 * @param string $file the xml file to be loaded
 	 * @return null|array where null is an indicator for an error
@@ -51,15 +39,18 @@ public function parse($file) {
 		libxml_use_internal_errors(true);
 		$loadEntities = libxml_disable_entity_loader(false);
 		$xml = simplexml_load_file($file);
+
 		libxml_disable_entity_loader($loadEntities);
-		if ($xml == false) {
+		if ($xml === false) {
 			libxml_clear_errors();
 			return null;
 		}
 		$array = $this->xmlToArray($xml);
+
 		if (is_null($array)) {
 			return null;
 		}
+
 		if (!array_key_exists('info', $array)) {
 			$array['info'] = [];
 		}
@@ -97,17 +88,6 @@ public function parse($file) {
 			$array['two-factor-providers'] = [];
 		}
 
-		if (array_key_exists('documentation', $array) && is_array($array['documentation'])) {
-			foreach ($array['documentation'] as $key => $url) {
-				// If it is not an absolute URL we assume it is a key
-				// i.e. admin-ldap will get converted to go.php?to=admin-ldap
-				if (!$this->isHTTPURL($url)) {
-					$url = $this->urlGenerator->linkToDocs($url);
-				}
-
-				$array['documentation'][$key] = $url;
-			}
-		}
 		if (array_key_exists('types', $array)) {
 			if (is_array($array['types'])) {
 				foreach ($array['types'] as $type => $v) {
@@ -192,8 +172,4 @@ function xmlToArray($xml) {
 
 		return $array;
 	}
-
-	private function isHTTPURL($url) {
-		return stripos($url, 'https://') === 0 || stripos($url, 'http://') === 0;
-	}
 }
diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php
index c6cf8057799a..e28c40f9effa 100644
--- a/lib/private/AppFramework/App.php
+++ b/lib/private/AppFramework/App.php
@@ -51,22 +51,11 @@ class App {
 	 */
 	public static function buildAppNamespace($appId, $topNamespace='OCA\\') {
 		// first try to parse the app's appinfo/info.xml <namespace> tag
-		$appPath = OC_App::getAppPath($appId);
-		if ($appPath !== false) {
-			$filePath = "$appPath/appinfo/info.xml";
-			if (is_file($filePath)) {
-				$loadEntities = libxml_disable_entity_loader(false);
-				$xml = @simplexml_load_file($filePath);
-				libxml_disable_entity_loader($loadEntities);
-				if ($xml) {
-					$result = $xml->xpath('/info/namespace');
-					if ($result && count($result) > 0) {
-						// take first namespace result
-						return $topNamespace . trim((string) $result[0]);
-					}
-				}
-			}
+		$appInfo = \OC_App::getAppInfo($appId);
+		if (isset($appInfo['namespace'])) {
+			return $topNamespace . trim($appInfo['namespace']);
 		}
+
 		// if the tag is not found, fall back to uppercasing the first letter
 		return $topNamespace . ucfirst($appId);
 	}
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 5fac17904248..553ded280a43 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -45,6 +45,7 @@
  *
  */
 use OC\App\DependencyAnalyzer;
+use OC\App\InfoParser;
 use OC\App\Platform;
 use OC\Installer;
 use OC\OCSClient;
@@ -658,7 +659,7 @@ public static function getAppInfo($appId, $path = false) {
 			$file = $appPath . '/appinfo/info.xml';
 		}
 
-		$parser = new \OC\App\InfoParser(\OC::$server->getURLGenerator());
+		$parser = new InfoParser();
 		$data = $parser->parse($file);
 
 		if (is_array($data)) {
@@ -821,6 +822,7 @@ public static function listAllApps($onlyLocal = false,
 		//we don't want to show configuration for these
 		$blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
 		$appList = array();
+		$urlGenerator = \OC::$server->getURLGenerator();
 
 		foreach ($installedApps as $app) {
 			if (array_search($app, $blacklist) === false) {
@@ -874,6 +876,19 @@ public static function listAllApps($onlyLocal = false,
 						}
 					}
 				}
+				// fix documentation
+				if (isset($info['documentation']) && is_array($info['documentation'])) {
+					foreach ($info['documentation'] as $key => $url) {
+						// If it is not an absolute URL we assume it is a key
+						// i.e. admin-ldap will get converted to go.php?to=admin-ldap
+						if (stripos($url, 'https://') !== 0 && stripos($url, 'http://') !== 0) {
+							$url = $urlGenerator->linkToDocs($url);
+						}
+
+						$info['documentation'][$key] = $url;
+					}
+				}
+
 				$info['version'] = OC_App::getAppVersion($app);
 				$appList[] = $info;
 			}
diff --git a/tests/data/app/expected-info.json b/tests/data/app/expected-info.json
index 6d8d85ab5524..6ddd3ae8568f 100644
--- a/tests/data/app/expected-info.json
+++ b/tests/data/app/expected-info.json
@@ -10,8 +10,8 @@
 	"requiremin": "4",
 	"shipped": "true",
 	"documentation": {
-		"user": "https://docs.example.com/server/go.php?to=user-encryption",
-		"admin": "https://docs.example.com/server/go.php?to=admin-encryption"
+		"user": "user-encryption",
+		"admin": "admin-encryption"
 	},
 	"rememberlogin": "false",
 	"types": ["filesystem"],
diff --git a/tests/lib/App/CodeChecker/InfoCheckerTest.php b/tests/lib/App/CodeChecker/InfoCheckerTest.php
index 1032e800be19..c16874fbd339 100644
--- a/tests/lib/App/CodeChecker/InfoCheckerTest.php
+++ b/tests/lib/App/CodeChecker/InfoCheckerTest.php
@@ -44,9 +44,7 @@ public static function tearDownAfterClass() {
 
 	protected function setUp() {
 		parent::setUp();
-		$infoParser = new InfoParser(\OC::$server->getURLGenerator());
-
-		$this->infoChecker = new InfoChecker($infoParser);
+		$this->infoChecker = new InfoChecker(new InfoParser());
 	}
 
 	public function appInfoData() {
diff --git a/tests/lib/App/InfoParserTest.php b/tests/lib/App/InfoParserTest.php
index 7f52507bcf75..af2dfd2ef1cd 100644
--- a/tests/lib/App/InfoParserTest.php
+++ b/tests/lib/App/InfoParserTest.php
@@ -10,27 +10,16 @@
 namespace Test\App;
 
 use OC;
-use OCP\IURLGenerator;
+use OC\App\InfoParser;
 use Test\TestCase;
 
 class InfoParserTest extends TestCase {
 
-	/** @var \OC\App\InfoParser */
+	/** @var InfoParser */
 	private $parser;
 
 	public function setUp() {
-		$urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')
-			->disableOriginalConstructor()
-			->getMock();
-
-		/** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject $urlGenerator */
-		$urlGenerator->expects($this->any())
-			->method('linkToDocs')
-			->will($this->returnCallback(function ($url) {
-				return "https://docs.example.com/server/go.php?to=$url";
-			}));
-
-		$this->parser = new \OC\App\InfoParser($urlGenerator);
+		$this->parser = new InfoParser();
 	}
 
 	/**

From ff75a9a13c3277eed449727878f5b1782fff1641 Mon Sep 17 00:00:00 2001
From: RealRancor <RealRancor@users.noreply.github.com>
Date: Sun, 31 Jul 2016 13:57:31 +0200
Subject: [PATCH 129/219] [stable9.1] forum.owncloud.org ->
 central.owncloud.org (#25644)

---
 CONTRIBUTING.md             | 2 +-
 README.md                   | 2 +-
 core/js/update.js           | 2 +-
 settings/templates/help.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 66d54c61e984..118f52d4aa74 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ Help us to maximize the effort we can spend fixing issues and adding new feature
 
 [template]: https://raw.github.com/owncloud/core/master/issue_template.md
 [mailinglist]: https://mailman.owncloud.org/mailman/listinfo/owncloud
-[forum]: https://forum.owncloud.org/
+[forum]: https://central.owncloud.org/
 [irc]: https://webchat.freenode.net/?channels=owncloud&uio=d4
 
 ## Contributing to Source Code
diff --git a/README.md b/README.md
index 6d23a3659937..915398b26eef 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ https://owncloud.org/contribute/
 Learn about the different ways you can get support for ownCloud: https://owncloud.org/support/
 
 ## Get in touch
-* :clipboard: [Forum](https://forum.owncloud.org)
+* :clipboard: [Forum](https://central.owncloud.org)
 * :envelope: [Mailing list](https://mailman.owncloud.org/mailman/listinfo)
 * :hash: [IRC channel](https://webchat.freenode.net/?channels=owncloud)
 * :busts_in_silhouette: [Facebook] (https://facebook.com/ownclouders)
diff --git a/core/js/update.js b/core/js/update.js
index 31b97c568949..f1f7a9ca2d8b 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -72,7 +72,7 @@
 				var span = $('<span>')
 					.addClass('bold');
 				if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') {
-					span.append(t('core', 'The update was unsuccessful. For more information <a href="{url}">check our forum post</a> covering this issue.', {'url': 'https://forum.owncloud.org/viewtopic.php?f=17&t=32087'}));
+					span.append(t('core', 'The update was unsuccessful. For more information <a href="{url}">check our forum post</a> covering this issue.', {'url': 'https://central.owncloud.org/t/updates-between-multiple-major-versions-are-unsupported/815'}));
 				} else {
 					span.append(t('core', 'The update was unsuccessful. ' +
 						'Please report this issue to the ' +
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 950d6f71cef8..efdb567da0bb 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -21,7 +21,7 @@
 			</a>
 		</li>
 		<li>
-			<a href="https://forum.owncloud.org" target="_blank" rel="noreferrer">
+			<a href="https://central.owncloud.org" target="_blank" rel="noreferrer">
 				<?php p($l->t('Forum')); ?> ↗
 			</a>
 		</li>

From 6b4c35e954ae0c296b8e0a7da637a3074a6dc268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Fri, 23 Sep 2016 19:57:07 +0200
Subject: [PATCH 130/219] [stable9.1] Return ETag and OC-ETag in case of a move
 (#25683)

---
 .../Connector/Sabre/CopyEtagHeaderPlugin.php  | 26 ++++++++++++-
 apps/dav/lib/Server.php                       | 16 +++++---
 .../Sabre/CopyEtagHeaderPluginTest.php        | 37 ++++++++++++++++---
 3 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php
index 49b6a7b2de76..ed39a3a96f73 100644
--- a/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php
@@ -31,6 +31,9 @@
  * or mangle Etag headers.
  */
 class CopyEtagHeaderPlugin extends \Sabre\DAV\ServerPlugin {
+
+	/** @var \Sabre\DAV\Server */
+	private $server;
 	/**
 	 * This initializes the plugin.
 	 *
@@ -39,7 +42,10 @@ class CopyEtagHeaderPlugin extends \Sabre\DAV\ServerPlugin {
 	 * @return void
 	 */
 	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('afterMethod', array($this, 'afterMethod'));
+		$this->server = $server;
+
+		$server->on('afterMethod', [$this, 'afterMethod']);
+		$server->on('afterMove', [$this, 'afterMove']);
 	}
 
 	/**
@@ -54,4 +60,22 @@ public function afterMethod(RequestInterface $request, ResponseInterface $respon
 			$response->setHeader('OC-ETag', $eTag);
 		}
 	}
+
+	/**
+	 * Called after a node is moved.
+	 *
+	 * This allows the backend to move all the associated properties.
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @return void
+	 */
+	function afterMove($source, $destination) {
+		$node = $this->server->tree->getNodeForPath($destination);
+		if ($node instanceof File) {
+			$eTag = $node->getETag();
+			$this->server->httpResponse->setHeader('OC-ETag', $eTag);
+			$this->server->httpResponse->setHeader('ETag', $eTag);
+		}
+	}
 }
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index e36d3e280cee..fe0f262c42c7 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -26,13 +26,18 @@
 
 use OCA\DAV\CalDAV\Schedule\IMipPlugin;
 use OCA\DAV\CardDAV\ImageExportPlugin;
+use OCA\DAV\Comments\CommentsPlugin;
 use OCA\DAV\Connector\Sabre\Auth;
 use OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin;
+use OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin;
 use OCA\DAV\Connector\Sabre\DavAclPlugin;
 use OCA\DAV\Connector\Sabre\DummyGetResponsePlugin;
+use OCA\DAV\Connector\Sabre\FakeLockerPlugin;
 use OCA\DAV\Connector\Sabre\FilesPlugin;
+use OCA\DAV\Connector\Sabre\QuotaPlugin;
 use OCA\DAV\Files\BrowserErrorPagePlugin;
 use OCA\DAV\Files\CustomPropertiesBackend;
+use OCA\DAV\SystemTag\SystemTagPlugin;
 use OCP\IRequest;
 use OCP\SabrePluginEvent;
 use Sabre\CardDAV\VCFExportPlugin;
@@ -110,25 +115,27 @@ public function __construct(IRequest $request, $baseUri) {
 		$this->server->addPlugin(new ImageExportPlugin(\OC::$server->getLogger()));
 
 		// system tags plugins
-		$this->server->addPlugin(new \OCA\DAV\SystemTag\SystemTagPlugin(
+		$this->server->addPlugin(new SystemTagPlugin(
 			\OC::$server->getSystemTagManager(),
 			\OC::$server->getGroupManager(),
 			\OC::$server->getUserSession()
 		));
 
 		// comments plugin
-		$this->server->addPlugin(new \OCA\DAV\Comments\CommentsPlugin(
+		$this->server->addPlugin(new CommentsPlugin(
 			\OC::$server->getCommentsManager(),
 			\OC::$server->getUserSession()
 		));
 
+		$this->server->addPlugin(new CopyEtagHeaderPlugin());
+
 		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
 		// we do not provide locking we emulate it using a fake locking plugin.
 		if($request->isUserAgent([
 			'/WebDAVFS/',
 			'/Microsoft Office OneNote 2013/',
 		])) {
-			$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin());
+			$this->server->addPlugin(new FakeLockerPlugin());
 		}
 
 		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
@@ -162,8 +169,7 @@ public function __construct(IRequest $request, $baseUri) {
 					)
 				);
 				$this->server->addPlugin(
-					new \OCA\DAV\Connector\Sabre\QuotaPlugin($view));
-
+					new QuotaPlugin($view));
 			}
 		});
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
index 9b5e19459765..a9a60988d31c 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
@@ -22,23 +22,28 @@
  */
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
+use OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin;
+use Sabre\DAV\Server;
+use Test\TestCase;
+
 /**
  * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
-class CopyEtagHeaderPluginTest extends \Test\TestCase {
+class CopyEtagHeaderPluginTest extends TestCase {
 
-	/**
-	 * @var \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin
-	 */
+	/** @var CopyEtagHeaderPlugin */
 	private $plugin;
 
+	/** @var Server */
+	private $server;
+
 	public function setUp() {
 		parent::setUp();
 		$this->server = new \Sabre\DAV\Server();
-		$this->plugin = new \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin();
+		$this->plugin = new CopyEtagHeaderPlugin();
 		$this->plugin->initialize($this->server);
 	}
 
@@ -60,4 +65,26 @@ public function testNoopWhenEmpty() {
 
 		$this->assertNull($response->getHeader('OC-Etag'));
 	}
+
+	public function testAfterMove() {
+		$node = $this->getMockBuilder('OCA\DAV\Connector\Sabre\File')
+			->disableOriginalConstructor()
+			->getMock();
+		$node->expects($this->once())
+			->method('getETag')
+			->willReturn('123456');
+		$tree = $this->getMockBuilder('Sabre\DAV\Tree')
+			->disableOriginalConstructor()
+			->getMock();
+		$tree->expects($this->once())
+			->method('getNodeForPath')
+			->with('test.txt')
+			->willReturn($node);
+
+		$this->server->tree = $tree;
+		$this->plugin->afterMove('', 'test.txt');
+
+		$this->assertEquals('123456', $this->server->httpResponse->getHeader('OC-Etag'));
+		$this->assertEquals('123456', $this->server->httpResponse->getHeader('Etag'));
+	}
 }

From 0df4cdc66005b580f565ce18ba8e4f12e6166995 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 10 Oct 2016 23:25:34 +0200
Subject: [PATCH 131/219]  Tear down FS after user update in CardDAV sync job
 (#26320)

Because fetching the user information will also fetch the avatar, the
avatar code sets up the FS and leaves the mount points cached, we need
to call tearDownFS to clear that up.
---
 apps/dav/lib/CardDAV/SyncService.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php
index 859b636c73a6..e3e3c931932e 100644
--- a/apps/dav/lib/CardDAV/SyncService.php
+++ b/apps/dav/lib/CardDAV/SyncService.php
@@ -263,6 +263,8 @@ public function syncInstance(\Closure $progressCallback = null) {
 		$systemAddressBook = $this->getLocalSystemAddressBook();
 		$this->userManager->callForAllUsers(function($user) use ($systemAddressBook, $progressCallback) {
 			$this->updateUser($user);
+			// avatar fetching sets up FS, need to clear again
+			\OC_Util::tearDownFS();
 			if (!is_null($progressCallback)) {
 				$progressCallback();
 			}

From 522e71450c17fb19daeed1d0bcc6b4f656033ea4 Mon Sep 17 00:00:00 2001
From: Aaron Wood <aaronjwood@gmail.com>
Date: Wed, 20 Jul 2016 08:20:45 -0400
Subject: [PATCH 132/219] [stable9.1] Escape special characters (#25429)

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Use correct method in the AbstractMapping class

* Change the getNamesBySearch method so that input can be properly escaped while still supporting matches

* Don't escape hardcoded wildcard
---
 apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php | 2 +-
 apps/user_ldap/lib/Access.php                            | 2 +-
 apps/user_ldap/lib/Mapping/AbstractMapping.php           | 6 ++++--
 apps/user_ldap/tests/Mapping/AbstractMappingTest.php     | 2 +-
 lib/private/Group/Database.php                           | 4 ++--
 lib/private/Repair/RepairLegacyStorages.php              | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php
index d0d348e170ef..b319350c7f09 100644
--- a/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php
+++ b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php
@@ -327,7 +327,7 @@ private function loadChildrenProperties(Directory $node, $requestedProperties) {
 
 		$result = $this->connection->executeQuery(
 			$sql,
-			array($this->user, rtrim($path, '/') . '/%', $requestedProperties),
+			array($this->user, $this->connection->escapeLikeParameter(rtrim($path, '/')) . '/%', $requestedProperties),
 			array(null, null, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY)
 		);
 
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index 4d0753696ffe..cdf123314773 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -623,7 +623,7 @@ private function _createAltInternalOwnCloudNameForUsers($name) {
 	 * "Developers"
 	 */
 	private function _createAltInternalOwnCloudNameForGroups($name) {
-		$usedNames = $this->groupMapper->getNamesBySearch($name.'_%');
+		$usedNames = $this->groupMapper->getNamesBySearch($name, "", '_%');
 		if(!($usedNames) || count($usedNames) === 0) {
 			$lastNo = 1; //will become name_2
 		} else {
diff --git a/apps/user_ldap/lib/Mapping/AbstractMapping.php b/apps/user_ldap/lib/Mapping/AbstractMapping.php
index 54fe7db366fb..67fbd9fe8519 100644
--- a/apps/user_ldap/lib/Mapping/AbstractMapping.php
+++ b/apps/user_ldap/lib/Mapping/AbstractMapping.php
@@ -138,16 +138,18 @@ public function getNameByDN($fdn) {
 	/**
 	 * Searches mapped names by the giving string in the name column
 	 * @param string $search
+	 * @param string $prefixMatch
+	 * @param string $postfixMatch
 	 * @return string[]
 	 */
-	public function getNamesBySearch($search) {
+	public function getNamesBySearch($search, $prefixMatch = "", $postfixMatch = "") {
 		$query = $this->dbc->prepare('
 			SELECT `owncloud_name`
 			FROM `'. $this->getTableName() .'`
 			WHERE `owncloud_name` LIKE ?
 		');
 
-		$res = $query->execute(array($search));
+		$res = $query->execute(array($prefixMatch.$this->dbc->escapeLikeParameter($search).$postfixMatch));
 		$names = array();
 		if($res !== false) {
 			while($row = $query->fetch()) {
diff --git a/apps/user_ldap/tests/Mapping/AbstractMappingTest.php b/apps/user_ldap/tests/Mapping/AbstractMappingTest.php
index ddd99d31709b..a2e9f850913e 100644
--- a/apps/user_ldap/tests/Mapping/AbstractMappingTest.php
+++ b/apps/user_ldap/tests/Mapping/AbstractMappingTest.php
@@ -164,7 +164,7 @@ public function testGetMethods() {
 	public function testSearch() {
 		list($mapper,) = $this->initTest();
 
-		$names = $mapper->getNamesBySearch('%oo%');
+		$names = $mapper->getNamesBySearch('oo', '%', '%');
 		$this->assertTrue(is_array($names));
 		$this->assertSame(2, count($names));
 		$this->assertTrue(in_array('Foobar', $names));
diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php
index 36d19f74cc67..64f249d4d257 100644
--- a/lib/private/Group/Database.php
+++ b/lib/private/Group/Database.php
@@ -285,7 +285,7 @@ public function usersInGroup($gid, $search = '', $limit = null, $offset = null)
 		$parameters = [$gid];
 		$searchLike = '';
 		if ($search !== '') {
-			$parameters[] = '%' . $search . '%';
+			$parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
 			$searchLike = ' AND `uid` LIKE ?';
 		}
 
@@ -311,7 +311,7 @@ public function countUsersInGroup($gid, $search = '') {
 		$parameters = [$gid];
 		$searchLike = '';
 		if ($search !== '') {
-			$parameters[] = '%' . $search . '%';
+			$parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
 			$searchLike = ' AND `uid` LIKE ?';
 		}
 
diff --git a/lib/private/Repair/RepairLegacyStorages.php b/lib/private/Repair/RepairLegacyStorages.php
index 8ef20cdf3c21..096300f51c24 100644
--- a/lib/private/Repair/RepairLegacyStorages.php
+++ b/lib/private/Repair/RepairLegacyStorages.php
@@ -172,7 +172,7 @@ public function run(IOutput $out) {
 		$sql = 'SELECT `id`, `numeric_id` FROM `*PREFIX*storages`'
 			. ' WHERE `id` LIKE ?'
 			. ' ORDER BY `id`';
-		$result = $this->connection->executeQuery($sql, array($dataDirId . '%'));
+		$result = $this->connection->executeQuery($sql, array($this->connection->escapeLikeParameter($dataDirId) . '%'));
 
 		while ($row = $result->fetch()) {
 			$currentId = $row['id'];

From fb278ef07292371c2644f2c7b31032c56573b410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Pablo=20Villaf=C3=A1=C3=B1ez?=
 <jvillafanez@solidgear.es>
Date: Tue, 11 Oct 2016 13:22:42 +0200
Subject: [PATCH 133/219] New command to update group mappings

---
 apps/user_ldap/appinfo/register_command.php |   1 +
 apps/user_ldap/lib/Command/UpdateGroup.php  | 220 ++++++++++++++++++++
 2 files changed, 221 insertions(+)
 create mode 100644 apps/user_ldap/lib/Command/UpdateGroup.php

diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php
index c2e0e8aec3e6..f6664666b126 100644
--- a/apps/user_ldap/appinfo/register_command.php
+++ b/apps/user_ldap/appinfo/register_command.php
@@ -52,3 +52,4 @@
 $application->add(new OCA\User_LDAP\Command\CheckUser(
 	$uBackend, $helper, $deletedUsersIndex, $userMapping)
 );
+$application->add(new OCA\User_LDAP\Command\UpdateGroup(new LDAP(), $helper, $dbConnection));
diff --git a/apps/user_ldap/lib/Command/UpdateGroup.php b/apps/user_ldap/lib/Command/UpdateGroup.php
new file mode 100644
index 000000000000..bc4c0cfbac51
--- /dev/null
+++ b/apps/user_ldap/lib/Command/UpdateGroup.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2016, ownCloud GmbH.
+ * @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/>
+ *
+ */
+
+namespace OCA\User_LDAP\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use \OCA\User_LDAP\Helper;
+use \OCA\User_LDAP\LDAP;
+use \OCA\User_LDAP\Group_Proxy;
+use \OCA\User_LDAP\Mapping\GroupMapping;
+use \OCP\IDBConnection;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+
+class UpdateGroup extends Command {
+
+	const ERROR_CODE_MISSING_CONF = 1;
+	const ERROR_CODE_MISSING_MAPPING = 2;
+
+	public function __construct(LDAP $ldap, Helper $helper, IDBConnection $connection) {
+		$this->connection = $connection;
+		$this->ldap = $ldap;
+		$this->helper = $helper;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('ldap:update-group')
+			->setDescription('update the specified group membership information stored locally')
+			->addArgument(
+					'groupID',
+					InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+					'the group ID'
+				)
+			->addOption(
+					'hide-warning',
+					null,
+					InputOption::VALUE_NONE,
+					'Group membership attribute is critical for this command to work properly. This option hides the warning and the additional output associated with it.'
+				);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$groupIDs = $input->getArgument('groupID');
+		// make sure we don't have duplicated groups in the parameters
+		$groupIDs = array_unique($groupIDs);
+
+		$helper = $this->helper;
+		$availableConfigs = $helper->getServerConfigurationPrefixes();
+
+		if (!$input->getOption('hide-warning')) {
+			$output->writeln("Group membership attribute is critical for this command, please verify.");
+			// show configuration information, useful to debug
+			foreach ($availableConfigs as $aconfig) {
+				$config = new \OCA\User_LDAP\Configuration($aconfig);
+				$message = '* ' . $config->ldapHost . ':' . $config->ldapPort . ' -> ' . $config->ldapGroupMemberAssocAttr;
+				$output->writeln($message);
+			}
+		}
+
+
+		if (empty($availableConfigs)) {
+			$output->writeln('<error>No active configurations available</error>');
+			return self::ERROR_CODE_MISSING_CONF;
+		}
+
+		if (!$this->checkGroupMappingExists($groupIDs)) {
+			$output->writeln("<error>Some of the groups are unknown</error>");
+			return self::ERROR_CODE_MISSING_MAPPING;
+		}
+
+		$groupProxy = new Group_Proxy($availableConfigs, $this->ldap);
+
+		foreach ($groupIDs as $groupID) {
+			$output->writeln("checking group \"$groupID\"...");
+			if (!$groupProxy->groupExists($groupID)) {
+				$output->writeln("\"$groupID\" doesn't exist in LDAP any more, removing local mapping");
+				$this->removeGroupMapping($groupID);
+			} else {
+				$output->writeln("updating \"$groupID\" group membership information locally", OutputInterface::VERBOSITY_VERBOSE);
+				$userList = $groupProxy->usersInGroup($groupID);
+				$userChanges = $this->updateGroupMapping($groupID, $userList);
+
+				$output->writeln("triggering hooks", OutputInterface::VERBOSITY_VERBOSE);
+				$output->writeln("new users:");
+				foreach ($userChanges['added'] as $addedUser) {
+					$output->writeln($addedUser);
+					\OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $groupID));
+				}
+				$output->writeln("removed users:");
+				foreach ($userChanges['removed'] as $removedUser) {
+					$output->writeln($removedUser);
+					\OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $groupID));
+				}
+			}
+		}
+	}
+
+
+	private function removeGroupMapping($groupName) {
+		$this->connection->beginTransaction();
+
+		try {
+			$query = $this->connection->getQueryBuilder();
+			$query->delete('ldap_group_mapping')
+				->where($query->expr()->eq('owncloud_name', $query->createParameter('group')))
+				->setParameter('group', $groupName)
+				->execute();
+
+			$query2 = $this->connection->getQueryBuilder();
+			$query2->delete('ldap_group_members')
+				->where($query->expr()->eq('owncloudname', $query->createParameter('group')))
+				->setParameter('group', $groupName)
+				->execute();
+
+			$this->connection->commit();
+		} catch (\Exception $e) {
+			// Rollback and rethrow the exception
+			$this->connection->rollback();
+			throw $e;
+		}
+	}
+
+	/**
+	 * Return and array with 2 lists: one for the users added and another for the users removed from
+	 * the group:
+	 * ['added' => ['user1', 'user20'], 'removed' => ['user22']]
+	 *
+	 * @param string $groupName name of the group to be checked
+	 * @param array $userList array of user names to be compared. For example: ['user1', 'user44'].
+	 * The list will usually come from the LDAP server and will be compared against the information
+	 * in the DB.
+	 */
+	private function updateGroupMapping($groupName, $userList) {
+		$query = $this->connection->getQueryBuilder();
+		$needToInsert = false;
+		$result = $query->select('*')
+			->from('ldap_group_members')
+			->where($query->expr()->eq('owncloudname', $query->createParameter('group')))
+			->setParameter('group', $groupName)
+			->execute();
+		$row = $result->fetch();
+		if ($row) {
+			$needToInsert = false;
+			$mappedList = unserialize($row['owncloudusers']);
+		} else {
+			$needToInsert = true;
+		}
+		if ($needToInsert) {
+			$query2 = $this->connection->getQueryBuilder();
+			$query2->insert('ldap_group_members')
+				->setValue('owncloudname', $query2->createParameter('group'))
+				->setValue('owncloudusers', $query2->createParameter('users'))
+				->setParameter('group', $groupName)
+				->setParameter('users', serialize($userList))
+				->execute();
+			return array('added' => $userList, 'removed' => array());
+		} else {
+			$query2 = $this->connection->getQueryBuilder();
+			$query2->update('ldap_group_members')
+				->set('owncloudusers', $query2->createParameter('users'))
+				->where($query2->expr()->eq('owncloudname', $query2->createParameter('group')))
+				->setParameter('group', $groupName)
+				->setParameter('users', serialize($userList))
+				->execute();
+			// calculate changes
+			$usersAdded = array_diff($userList, $mappedList);
+			$usersRemoved = array_diff($mappedList, $userList);
+			return array('added' => $usersAdded, 'removed' => $usersRemoved);
+		}
+	}
+
+	/**
+	 * Make sure $groupNames doesn't contain duplicated values. This function could behave
+	 * unexpectedly otherwise.
+	 *
+	 * Take advantage of the owncloud_name column in the DB has a unique constraint.
+	 *
+	 * @return true if the count($groupNames) matches the number of
+	 */
+	private function checkGroupMappingExists($groupNames) {
+		$query = $this->connection->getQueryBuilder();
+		$query->select($query->createFunction('count(owncloud_name) as ngroups'))
+			->from('ldap_group_mapping')
+			->where($query->expr()->in('owncloud_name', $query->createParameter('groups')))
+			->setParameter('groups', $groupNames, IQueryBuilder::PARAM_STR_ARRAY);
+		$result = $query->execute();
+		$row = $result->fetch();
+
+		$countValue = intval($row['ngroups']);
+		$result->closeCursor();
+		$requestedGroupNameCount = count($groupNames);
+		return $countValue === $requestedGroupNameCount;
+	}
+}

From 83b752de213571e48a1a7a422fd8c04dff2e2ff8 Mon Sep 17 00:00:00 2001
From: RealRancor <RealRancor@users.noreply.github.com>
Date: Wed, 12 Oct 2016 13:02:11 +0200
Subject: [PATCH 134/219] Backport #26316 to stable9.1 (#26348)

---
 index.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/index.php b/index.php
index eebb02cb5ab9..127e2faafd44 100644
--- a/index.php
+++ b/index.php
@@ -32,6 +32,13 @@
 	return;
 }
 
+// running oC on Windows is unsupported since 8.1, this has to happen here because
+// is seems that the autoloader on Windows fails later and just throws an exception.
+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+	echo 'ownCloud Server does not support Microsoft Windows.';
+	return;
+}
+
 try {
 	
 	require_once 'lib/base.php';

From a25c0d580cda186d4d6ea08a7ae6a620584e2101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Thu, 25 Aug 2016 07:13:48 +0200
Subject: [PATCH 135/219] [stable9.1] Add missing unit tests (#25936)

* Adjust unit test execution after folder rename

* Adjust login controller tests to match current behavior

* Fix broken unit tests
---
 core/Controller/AvatarController.php          |  10 +-
 core/Controller/LoginController.php           |  14 +-
 settings/Controller/CheckSetupController.php  |  21 ++-
 .../Core/Controller/AvatarControllerTest.php  | 175 ++++++++++--------
 tests/Core/Controller/LoginControllerTest.php |  23 ++-
 .../Controller/CheckSetupControllerTest.php   |  48 +++--
 tests/phpunit-autotest.xml                    |   4 +-
 7 files changed, 179 insertions(+), 116 deletions(-)

diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 1bff58cfc4ea..6eb561630a39 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -174,7 +174,7 @@ public function postAvatar($path) {
 		} elseif (!is_null($files)) {
 			if (
 				$files['error'][0] === 0 &&
-				 is_uploaded_file($files['tmp_name'][0]) &&
+				$this->isUploadFile($files['tmp_name'][0]) &&
 				!\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
 			) {
 				if ($files['size'][0] > 20*1024*1024) {
@@ -324,4 +324,12 @@ public function postCroppedAvatar($crop) {
 			return new DataResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
 		}
 	}
+
+	/**
+	 * @param string $file
+	 * @return bool
+	 */
+	protected function isUploadFile($file) {
+		return is_uploaded_file($file);
+	}
 }
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index fa41af67b89c..e2832be91bd7 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -106,7 +106,7 @@ public function logout() {
 	 */
 	public function showLoginForm($user, $redirect_url, $remember_login) {
 		if ($this->userSession->isLoggedIn()) {
-			return new RedirectResponse(OC_Util::getDefaultPageUrl());
+			return new RedirectResponse($this->getDefaultUrl());
 		}
 
 		$parameters = array();
@@ -196,6 +196,9 @@ public function tryLogin($user, $password, $redirect_url) {
 		$this->userSession->login($user, $password);
 		$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password);
 
+		// User has successfully logged in, now remove the password reset link, when it is available
+		$this->config->deleteUserValue($loginResult->getUID(), 'owncloud', 'lostpassword');
+
 		if ($this->twoFactorManager->isTwoFactorAuthenticated($loginResult)) {
 			$this->twoFactorManager->prepareTwoFactorLogin($loginResult);
 			if (!is_null($redirect_url)) {
@@ -215,7 +218,14 @@ public function tryLogin($user, $password, $redirect_url) {
 			}
 		}
 
-		return new RedirectResponse(OC_Util::getDefaultPageUrl());
+		return new RedirectResponse($this->getDefaultUrl());
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getDefaultUrl() {
+		return OC_Util::getDefaultPageUrl();
 	}
 
 }
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 7e30616d1f52..52ef34d4ee5c 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -212,12 +212,7 @@ private function isUsedTlsLibOutdated() {
 	 * @return array
 	 */
 	private function isPhpSupported() {
-		$eol = false;
-
-		//PHP 5.4 is EOL on 14 Sep 2015
-		if (version_compare(PHP_VERSION, '5.5.0') === -1) {
-			$eol = true;
-		}
+		$eol = $this->isEndOfLive();
 
 		return ['eol' => $eol, 'version' => PHP_VERSION];
 	}
@@ -347,4 +342,18 @@ public function check() {
 			]
 		);
 	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isEndOfLive() {
+		$eol = false;
+
+		//PHP 5.4 is EOL on 14 Sep 2015
+		if (version_compare(PHP_VERSION, '5.5.0') === -1) {
+			$eol = true;
+			return $eol;
+		}
+		return $eol;
+	}
 }
diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php
index 937d8aaf17b6..057b4e94957d 100644
--- a/tests/Core/Controller/AvatarControllerTest.php
+++ b/tests/Core/Controller/AvatarControllerTest.php
@@ -21,24 +21,22 @@
 
 namespace Tests\Core\Controller;
 
-use OC\Core\Application;
-use OCP\AppFramework\IAppContainer;
+use OC\Core\Controller\AvatarController;
 use OCP\AppFramework\Http;
 use OCP\Files\File;
+use OCP\Files\Folder;
 use OCP\Files\NotFoundException;
+use OCP\IAvatarManager;
+use OCP\IL10N;
+use OCP\ILogger;
+use OCP\IRequest;
 use OCP\IUser;
 use OCP\IAvatar;
-use Punic\Exception;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use Test\TestCase;
 use Test\Traits\UserTrait;
 
-/**
- * Overwrite is_uploaded_file in this namespace to allow proper unit testing of 
- * the postAvatar call.
- */
-function is_uploaded_file($filename) {
-	return file_exists($filename);
-}
-
 /**
  * Class AvatarControllerTest
  *
@@ -46,55 +44,80 @@ function is_uploaded_file($filename) {
  *
  * @package OC\Core\Controller
  */
-class AvatarControllerTest extends \Test\TestCase {
+class AvatarControllerTest extends TestCase {
 	use UserTrait;
 
-	/** @var IAppContainer */
-	private $container;
 	/** @var \OC\Core\Controller\AvatarController */
 	private $avatarController;
-	/** @var IAvatar */
+	/** @var IAvatar | \PHPUnit_Framework_MockObject_MockObject */
 	private $avatarMock;
-	/** @var IUser */
+	/** @var IUser | \PHPUnit_Framework_MockObject_MockObject */
 	private $userMock;
-	/** @var File */
+	/** @var File | \PHPUnit_Framework_MockObject_MockObject*/
 	private $avatarFile;
-	
+	/** @var IRequest | \PHPUnit_Framework_MockObject_MockObject */
+	private $request;
+	/** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */
+	private $l10N;
+	/** @var IAvatarManager | \PHPUnit_Framework_MockObject_MockObject */
+	private $avatarManager;
+	/** @var \OC\Cache\File | \PHPUnit_Framework_MockObject_MockObject */
+	private $cache;
+	/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject */
+	private $userManager;
+	/** @var IUserSession | \PHPUnit_Framework_MockObject_MockObject */
+	private $userSession;
+	/** @var Folder | \PHPUnit_Framework_MockObject_MockObject */
+	private $userFolder;
+	/** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */
+	private $logger;
+
 	protected function setUp() {
 		parent::setUp();
 		$this->createUser('userid', 'pass');
 		$this->loginAsUser('userid');
 		
-		$app = new Application;
-		$this->container = $app->getContainer();
-		$this->container['AppName'] = 'core';
-		$this->container['AvatarManager'] = $this->getMock('OCP\IAvatarManager');
-		$this->container['Cache'] = $this->getMockBuilder('OC\Cache\File')
-			->disableOriginalConstructor()->getMock();
-		$this->container['L10N'] = $this->getMock('OCP\IL10N');
-		$this->container['L10N']->method('t')->will($this->returnArgument(0));
-		$this->container['UserManager'] = $this->getMock('OCP\IUserManager');
-		$this->container['UserSession'] = $this->getMock('OCP\IUserSession');
-		$this->container['Request'] = $this->getMock('OCP\IRequest');
-		$this->container['UserFolder'] = $this->getMock('OCP\Files\Folder');
-		$this->container['Logger'] = $this->getMock('OCP\ILogger');
+		$this->avatarManager = $this->getMock('OCP\IAvatarManager');
+		$this->cache = $this->getMockBuilder('OC\Cache\File')->disableOriginalConstructor()->getMock();
+		$this->l10N = $this->getMock('OCP\IL10N');
+		$this->l10N->expects($this->any())->method('t')->will($this->returnArgument(0));
+		$this->userManager = $this->getMock('OCP\IUserManager');
+		$this->userSession = $this->getMock('OCP\IUserSession');
+		$this->request = $this->getMock('OCP\IRequest');
+		$this->userFolder = $this->getMock('OCP\Files\Folder');
+		$this->logger = $this->getMock('OCP\ILogger');
 
 		$this->avatarMock = $this->getMock('OCP\IAvatar');
 		$this->userMock = $this->getMock('OCP\IUser');
 
-		$this->avatarController = $this->container['AvatarController'];
+		$this->avatarController = $this->getMock('OC\Core\Controller\AvatarController', ['isUploadFile'],[
+			'core',
+			$this->request,
+			$this->avatarManager,
+			$this->cache,
+			$this->l10N,
+			$this->userManager,
+			$this->userSession,
+			$this->userFolder,
+			$this->logger]);
+		$this->avatarController
+			->expects($this->any())
+			->method('isUploadFile')
+			->willReturnCallback(function ($file){
+			return file_exists($file);
+		});
 
 		// Configure userMock
-		$this->userMock->method('getDisplayName')->willReturn('displayName');
-		$this->userMock->method('getUID')->willReturn('userId');
-		$this->container['UserManager']->method('get')
+		$this->userMock->expects($this->any())->method('getDisplayName')->willReturn('displayName');
+		$this->userMock->expects($this->any())->method('getUID')->willReturn('userId');
+		$this->userManager->expects($this->any())->method('get')
 			->willReturnMap([['userId', $this->userMock]]);
-		$this->container['UserSession']->method('getUser')->willReturn($this->userMock);
+		$this->userSession->expects($this->any())->method('getUser')->willReturn($this->userMock);
 
 		$this->avatarFile = $this->getMock('OCP\Files\File');
-		$this->avatarFile->method('getContent')->willReturn('image data');
-		$this->avatarFile->method('getMimeType')->willReturn('image type');
-		$this->avatarFile->method('getEtag')->willReturn('my etag');
+		$this->avatarFile->expects($this->any())->method('getContent')->willReturn('image data');
+		$this->avatarFile->expects($this->any())->method('getMimeType')->willReturn('image type');
+		$this->avatarFile->expects($this->any())->method('getEtag')->willReturn('my etag');
 	}
 
 	public function tearDown() {
@@ -106,8 +129,8 @@ public function tearDown() {
 	 * Fetch an avatar if a user has no avatar
 	 */
 	public function testGetAvatarNoAvatar() {
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
-		$this->avatarMock->method('getFile')->will($this->throwException(new NotFoundException()));
+		$this->avatarManager->expects($this->any())->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarMock->expects($this->any())->method('getFile')->will($this->throwException(new NotFoundException()));
 		$response = $this->avatarController->getAvatar('userId', 32);
 
 		//Comment out until JS is fixed
@@ -120,8 +143,8 @@ public function testGetAvatarNoAvatar() {
 	 * Fetch the user's avatar
 	 */
 	public function testGetAvatar() {
-		$this->avatarMock->method('getFile')->willReturn($this->avatarFile);
-		$this->container['AvatarManager']->method('getAvatar')->with('userId')->willReturn($this->avatarMock);
+		$this->avatarMock->expects($this->any())->method('getFile')->willReturn($this->avatarFile);
+		$this->avatarManager->expects($this->any())->method('getAvatar')->with('userId')->willReturn($this->avatarMock);
 
 		$response = $this->avatarController->getAvatar('userId', 32);
 
@@ -129,14 +152,15 @@ public function testGetAvatar() {
 		$this->assertArrayHasKey('Content-Type', $response->getHeaders());
 		$this->assertEquals('image type', $response->getHeaders()['Content-Type']);
 
-		$this->assertEquals('my etag', $response->getEtag());
+		$this->assertEquals('my etag', $response->getETag());
 	}
 
 	/**
 	 * Fetch the avatar of a non-existing user
 	 */
 	public function testGetAvatarNoUser() {
-		$this->container['AvatarManager']
+		$this->avatarManager
+			->expects($this->any())
 			->method('getAvatar')
 			->with('userDoesNotExist')
 			->will($this->throwException(new \Exception('user does not exist')));
@@ -158,7 +182,7 @@ public function testGetAvatarSize() {
 			->with($this->equalTo(32))
 			->willReturn($this->avatarFile);
 
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarManager->expects($this->any())->method('getAvatar')->willReturn($this->avatarMock);
 
 		$this->avatarController->getAvatar('userId', 32);
 	}
@@ -172,7 +196,7 @@ public function testGetAvatarSizeMin() {
 			->with($this->equalTo(64))
 			->willReturn($this->avatarFile);
 
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarManager->expects($this->any())->method('getAvatar')->willReturn($this->avatarMock);
 
 		$this->avatarController->getAvatar('userId', 0);
 	}
@@ -186,7 +210,7 @@ public function testGetAvatarSizeMax() {
 			->with($this->equalTo(2048))
 			->willReturn($this->avatarFile);
 
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarManager->expects($this->any())->method('getAvatar')->willReturn($this->avatarMock);
 
 		$this->avatarController->getAvatar('userId', 2049);
 	}
@@ -195,7 +219,7 @@ public function testGetAvatarSizeMax() {
 	 * Remove an avatar
 	 */
 	public function testDeleteAvatar() {
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarManager->expects($this->any())->method('getAvatar')->willReturn($this->avatarMock);
 
 		$response = $this->avatarController->deleteAvatar();
 		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
@@ -205,10 +229,10 @@ public function testDeleteAvatar() {
 	 * Test what happens if the removing of the avatar fails
 	 */
 	public function testDeleteAvatarException() {
-		$this->avatarMock->method('remove')->will($this->throwException(new \Exception("foo")));
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarMock->expects($this->any())->method('remove')->will($this->throwException(new \Exception("foo")));
+		$this->avatarManager->expects($this->any())->method('getAvatar')->willReturn($this->avatarMock);
 
-		$this->container['Logger']->expects($this->once())
+		$this->logger->expects($this->once())
 			->method('logException')
 			->with(new \Exception("foo"));
 		$expectedResponse = new Http\DataResponse(['data' => ['message' => 'An error occurred. Please contact your admin.']], Http::STATUS_BAD_REQUEST);
@@ -227,7 +251,7 @@ public function testTmpAvatarNoTmp() {
 	 * Fetch tmp avatar
 	 */
 	public function testTmpAvatarValid() {
-		$this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->cache->expects($this->once())->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
 
 		$response = $this->avatarController->getTmpAvatar();
 		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
@@ -253,11 +277,11 @@ public function testPostAvatarFile() {
 		$this->assertTrue($copyRes);
 
 		//Create file in cache
-		$this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->cache->expects($this->once())->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
 
 		//Create request return
 		$reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [filesize(\OC::$SERVERROOT.'/tests/data/testimage.jpg')]];
-		$this->container['Request']->method('getUploadedFile')->willReturn($reqRet);
+		$this->request->expects($this->once())->method('getUploadedFile')->willReturn($reqRet);
 
 		$response = $this->avatarController->postAvatar(null);
 
@@ -274,7 +298,7 @@ public function testPostAvatarFile() {
 	public function testPostAvatarInvalidFile() {
 		//Create request return
 		$reqRet = ['error' => [1], 'tmp_name' => ['foo']];
-		$this->container['Request']->method('getUploadedFile')->willReturn($reqRet);
+		$this->request->expects($this->once())->method('getUploadedFile')->willReturn($reqRet);
 
 		$response = $this->avatarController->postAvatar(null);
 
@@ -291,11 +315,11 @@ public function testPostAvatarFileGif() {
 		$this->assertTrue($copyRes);
 
 		//Create file in cache
-		$this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.gif'));
+		$this->cache->expects($this->once())->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.gif'));
 
 		//Create request return
 		$reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => filesize(\OC::$SERVERROOT.'/tests/data/testimage.gif')];
-		$this->container['Request']->method('getUploadedFile')->willReturn($reqRet);
+		$this->request->expects($this->once())->method('getUploadedFile')->willReturn($reqRet);
 
 		$response = $this->avatarController->postAvatar(null);
 
@@ -312,8 +336,8 @@ public function testPostAvatarFromFile() {
 		//Mock node API call
 		$file = $this->getMockBuilder('OCP\Files\File')
 			->disableOriginalConstructor()->getMock();
-		$file->method('getContent')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
-		$this->container['UserFolder']->method('get')->willReturn($file);
+		$file->expects($this->any())->method('getContent')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->userFolder->expects($this->once())->method('get')->willReturn($file);
 
 		//Create request return
 		$response = $this->avatarController->postAvatar('avatar.jpg');
@@ -327,7 +351,8 @@ public function testPostAvatarFromFile() {
 	 */
 	public function testPostAvatarFromNoFile() {
 		$file = $this->getMock('OCP\Files\Node');
-		$this->container['UserFolder']
+		$this->userFolder
+			->expects($this->once())
 			->method('get')
 			->with('folder')
 			->willReturn($file);
@@ -343,15 +368,15 @@ public function testPostAvatarFromNoFile() {
 	 * Test what happens if the upload of the avatar fails
 	 */
 	public function testPostAvatarException() {
-		$this->container['Cache']->expects($this->once())
+		$this->cache->expects($this->once())
 			->method('set')
 			->will($this->throwException(new \Exception("foo")));
 		$file = $this->getMockBuilder('OCP\Files\File')
 			->disableOriginalConstructor()->getMock();
-		$file->method('getContent')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
-		$this->container['UserFolder']->method('get')->willReturn($file);
+		$file->expects($this->any())->method('getContent')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->userFolder->expects($this->once())->method('get')->willReturn($file);
 
-		$this->container['Logger']->expects($this->once())
+		$this->logger->expects($this->once())
 			->method('logException')
 			->with(new \Exception("foo"));
 		$expectedResponse = new Http\DataResponse(['data' => ['message' => 'An error occurred. Please contact your admin.']], Http::STATUS_OK);
@@ -381,10 +406,10 @@ public function testPostCroppedAvatarNoTmpAvatar() {
 	 * Test with non square crop
 	 */
 	public function testPostCroppedAvatarNoSquareCrop() {
-		$this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->cache->expects($this->once())->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
 
-		$this->avatarMock->method('set')->will($this->throwException(new \OC\NotSquareException));
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarMock->expects($this->any())->method('set')->will($this->throwException(new \OC\NotSquareException));
+		$this->avatarManager->expects($this->any())->method('getAvatar')->willReturn($this->avatarMock);
 		$response = $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 11]);
 
 		$this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
@@ -394,8 +419,8 @@ public function testPostCroppedAvatarNoSquareCrop() {
 	 * Check for proper reply on proper crop argument
 	 */
 	public function testPostCroppedAvatarValidCrop() {
-		$this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->cache->expects($this->once())->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->avatarManager->expects($this->any())->method('getAvatar')->willReturn($this->avatarMock);
 		$response = $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 10]);
 
 		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
@@ -406,12 +431,12 @@ public function testPostCroppedAvatarValidCrop() {
 	 * Test what happens if the cropping of the avatar fails
 	 */
 	public function testPostCroppedAvatarException() {
-		$this->container['Cache']->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->cache->expects($this->once())->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT.'/tests/data/testimage.jpg'));
 
-		$this->avatarMock->method('set')->will($this->throwException(new \Exception('foo')));
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarMock->expects($this->once())->method('set')->will($this->throwException(new \Exception('foo')));
+		$this->avatarManager->expects($this->any())->method('getAvatar')->willReturn($this->avatarMock);
 
-		$this->container['Logger']->expects($this->once())
+		$this->logger->expects($this->once())
 			->method('logException')
 			->with(new \Exception('foo'));
 		$expectedResponse = new Http\DataResponse(['data' => ['message' => 'An error occurred. Please contact your admin.']], Http::STATUS_BAD_REQUEST);
@@ -426,7 +451,7 @@ public function testFileTooBig() {
 		$fileName = \OC::$SERVERROOT.'/tests/data/testimage.jpg';
 		//Create request return
 		$reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [21*1024*1024]];
-		$this->container['Request']->method('getUploadedFile')->willReturn($reqRet);
+		$this->request->expects($this->once())->method('getUploadedFile')->willReturn($reqRet);
 
 		$response = $this->avatarController->postAvatar(null);
 
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index d6fa772d38be..836e4ffd7be0 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -174,6 +174,7 @@ public function testShowLoginFormWithErrorsInSession() {
 				'alt_login' => [],
 				'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
 				'rememberLoginState' => 0,
+				'resetPasswordLink' => null,
 			],
 			'guest'
 		);
@@ -232,6 +233,7 @@ public function testShowLoginFormWithPasswordResetOption($canChangePassword,
 				'alt_login' => [],
 				'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
 				'rememberLoginState' => 0,
+				'resetPasswordLink' => false
 			],
 			'guest'
 		);
@@ -270,6 +272,7 @@ public function testShowLoginFormForUserNamedNull() {
 				'alt_login' => [],
 				'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
 				'rememberLoginState' => 0,
+				'resetPasswordLink' => false
 			],
 			'guest'
 		);
@@ -315,12 +318,24 @@ public function testLoginWithValidCredentials() {
 			->method('isTwoFactorAuthenticated')
 			->with($user)
 			->will($this->returnValue(false));
-		$this->urlGenerator->expects($this->once())
-			->method('linkToRoute')
-			->with('files.view.index')
-			->will($this->returnValue($indexPageUrl));
 
 		$expected = new \OCP\AppFramework\Http\RedirectResponse($indexPageUrl);
+
+		$this->loginController = $this->getMock('OC\Core\Controller\LoginController',
+			['getDefaultUrl'], [
+			'core',
+			$this->request,
+			$this->userManager,
+			$this->config,
+			$this->session,
+			$this->userSession,
+			$this->urlGenerator,
+			$this->twoFactorManager
+		]);
+		$this->loginController->expects($this->once())
+			->method('getDefaultUrl')
+			->willReturn($indexPageUrl);
+
 		$this->assertEquals($expected, $this->loginController->tryLogin($user, $password, null));
 	}
 
diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
index f48e9c04f3d1..96e2ca9ad5fa 100644
--- a/tests/Settings/Controller/CheckSetupControllerTest.php
+++ b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -35,40 +35,28 @@
 use Test\TestCase;
 use OC\IntegrityCheck\Checker;
 
-/**
- * Mock version_compare
- * @param string $version1
- * @param string $version2
- * @return int
- */
-function version_compare($version1, $version2) {
-	return CheckSetupControllerTest::$version_compare;
-}
-
 /**
  * Class CheckSetupControllerTest
  *
  * @package Tests\Settings\Controller
  */
 class CheckSetupControllerTest extends TestCase {
-	/** @var int */
-	public static $version_compare;
 
-	/** @var CheckSetupController */
+	/** @var CheckSetupController | \PHPUnit_Framework_MockObject_MockObject */
 	private $checkSetupController;
-	/** @var IRequest */
+	/** @var IRequest | \PHPUnit_Framework_MockObject_MockObject */
 	private $request;
-	/** @var IConfig */
+	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
 	private $config;
-	/** @var IClientService */
+	/** @var IClientService | \PHPUnit_Framework_MockObject_MockObject*/
 	private $clientService;
-	/** @var IURLGenerator */
+	/** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */
 	private $urlGenerator;
 	/** @var OC_Util */
 	private $util;
-	/** @var IL10N */
+	/** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */
 	private $l10n;
-	/** @var Checker */
+	/** @var Checker | \PHPUnit_Framework_MockObject_MockObject */
 	private $checker;
 
 	public function setUp() {
@@ -106,7 +94,7 @@ public function setUp() {
 				$this->l10n,
 				$this->checker,
 				])
-			->setMethods(['getCurlVersion'])->getMock();
+			->setMethods(['getCurlVersion', 'isEndOfLive'])->getMock();
 	}
 
 	public function testIsInternetConnectionWorkingDisabledViaConfig() {
@@ -233,7 +221,11 @@ public function testIsMemcacheConfiguredTrue() {
 	}
 
 	public function testIsPhpSupportedFalse() {
-		self::$version_compare = -1;
+
+		$this->checkSetupController
+			->expects($this->once())
+			->method('isEndOfLive')
+			->willReturn(true);
 
 		$this->assertEquals(
 			['eol' => true, 'version' => PHP_VERSION],
@@ -242,16 +234,17 @@ public function testIsPhpSupportedFalse() {
 	}
 
 	public function testIsPhpSupportedTrue() {
-		self::$version_compare = 0;
+
+		$this->checkSetupController
+			->expects($this->exactly(2))
+			->method('isEndOfLive')
+			->willReturnOnConsecutiveCalls(false, false);
 
 		$this->assertEquals(
 			['eol' => false, 'version' => PHP_VERSION],
 			self::invokePrivate($this->checkSetupController, 'isPhpSupported')
 		);
 
-
-		self::$version_compare = 1;
-
 		$this->assertEquals(
 			['eol' => false, 'version' => PHP_VERSION],
 			self::invokePrivate($this->checkSetupController, 'isPhpSupported')
@@ -335,7 +328,10 @@ public function testCheck() {
 			->method('linkToDocs')
 			->with('admin-security')
 			->willReturn('https://doc.owncloud.org/server/8.1/admin_manual/configuration_server/hardening.html');
-		self::$version_compare = -1;
+		$this->checkSetupController
+			->expects($this->once())
+			->method('isEndOfLive')
+			->willReturn(true);
 		$this->urlGenerator->expects($this->at(2))
 			->method('linkToDocs')
 			->with('admin-reverse-proxy')
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 07de887c8cbf..72f56b19f918 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -8,8 +8,8 @@
 >
 	<testsuite name='ownCloud'>
 		<directory suffix='.php'>lib/</directory>
-		<directory suffix='.php'>settings/</directory>
-		<directory suffix='.php'>core/</directory>
+		<directory suffix='.php'>Settings/</directory>
+		<directory suffix='.php'>Core/</directory>
 		<directory suffix='.php'>ocs-provider/</directory>
 		<file>apps.php</file>
 	</testsuite>

From af440186f3aa3e747e33e65f278764d0a2203809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Oct 2016 23:36:51 +0200
Subject: [PATCH 136/219] Fix the tests for 9.1

---
 tests/Core/Controller/TwoFactorChallengeControllerTest.php | 4 ++--
 tests/Settings/Controller/AuthSettingsControllerTest.php   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
index 56ba52d58b5b..34c7ef4cb7a0 100644
--- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php
+++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
@@ -88,8 +88,8 @@ public function testSelectChallenge() {
 	}
 
 	public function testSelectChallengeSingleEntry() {
-		$provider = $this->createMock('\OCP\Authentication\TwoFactorAuth\IProvider');
-		$user = $this->createMock('\OCP\IUser');
+		$provider = $this->getMock('\OCP\Authentication\TwoFactorAuth\IProvider');
+		$user = $this->getMock('\OCP\IUser');
 		$providers = [$provider];
 
 		$this->userSession->expects($this->once())
diff --git a/tests/Settings/Controller/AuthSettingsControllerTest.php b/tests/Settings/Controller/AuthSettingsControllerTest.php
index ee67b221022b..6310d9ec5437 100644
--- a/tests/Settings/Controller/AuthSettingsControllerTest.php
+++ b/tests/Settings/Controller/AuthSettingsControllerTest.php
@@ -107,6 +107,7 @@ public function testCreate() {
 		$expected = [
 			'token' => $newToken,
 			'deviceToken' => $deviceToken,
+			'loginName' => 'User13',
 		];
 		$this->assertEquals($expected, $this->controller->create($name));
 	}

From a283b956d10f10b2e1cd82a8a620e97ca2573232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 12 Oct 2016 13:20:34 +0200
Subject: [PATCH 137/219] Fix test

---
 tests/Core/Controller/TwoFactorChallengeControllerTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
index 34c7ef4cb7a0..ab6690f9d348 100644
--- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php
+++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
@@ -23,6 +23,7 @@
 namespace Test\Core\Controller;
 
 use OC\Core\Controller\TwoFactorChallengeController;
+use OCP\AppFramework\Http\RedirectResponse;
 use Test\TestCase;
 
 class TwoFactorChallengeControllerTest extends TestCase {

From fe1806c5a7f09a9c6cf6669cdce7986b1df9231d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 10 Oct 2016 09:25:58 +0200
Subject: [PATCH 138/219] [stable9.1] Merge pull request #26295 from
 owncloud/analyse-dependencies-on-app-enable-as-well

App dependencies are now analysed on app enable as well - not only on app install.
---
 lib/private/App/DependencyAnalyzer.php   |  3 ++
 lib/private/legacy/app.php               | 37 +++++++++++++++++-------
 tests/lib/App/DependencyAnalyzerTest.php | 12 +++++---
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php
index db9130badcd3..790c208731c8 100644
--- a/lib/private/App/DependencyAnalyzer.php
+++ b/lib/private/App/DependencyAnalyzer.php
@@ -223,6 +223,9 @@ private function analyzeLibraries(array $dependencies) {
 		if (!is_array($libs)) {
 			$libs = array($libs);
 		}
+		if (isset($libs['@value'])) {
+			$libs = [$libs];
+		}
 		foreach ($libs as $lib) {
 			$libName = $this->getValue($lib);
 			$libVersion = $this->platform->getLibraryVersion($libName);
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 553ded280a43..f3db4067d26d 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -328,6 +328,13 @@ public static function enable($app, $groups = null) {
 		self::$enabledAppsCache = array(); // flush
 		if (!Installer::isInstalled($app)) {
 			$app = self::installApp($app);
+		} else {
+			// check for required dependencies
+			$config = \OC::$server->getConfig();
+			$l = \OC::$server->getL10N('core');
+			$info = self::getAppInfo($app);
+
+			self::checkAppDependencies($config, $l, $info);
 		}
 
 		$appManager = \OC::$server->getAppManager();
@@ -1159,16 +1166,7 @@ public static function installApp($app) {
 			}
 
 			// check for required dependencies
-			$dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l);
-			$missing = $dependencyAnalyzer->analyze($info);
-			if (!empty($missing)) {
-				$missingMsg = join(PHP_EOL, $missing);
-				throw new \Exception(
-					$l->t('App "%s" cannot be installed because the following dependencies are not fulfilled: %s',
-						array($info['name'], $missingMsg)
-					)
-				);
-			}
+			self::checkAppDependencies($config, $l, $info);
 
 			$config->setAppValue($app, 'enabled', 'yes');
 			if (isset($appData['id'])) {
@@ -1335,4 +1333,23 @@ public static function parseAppInfo(array $data) {
 
 		return $data;
 	}
+
+	/**
+	 * @param $config
+	 * @param $l
+	 * @param $info
+	 * @throws Exception
+	 */
+	protected static function checkAppDependencies($config, $l, $info) {
+		$dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l);
+		$missing = $dependencyAnalyzer->analyze($info);
+		if (!empty($missing)) {
+			$missingMsg = join(PHP_EOL, $missing);
+			throw new \Exception(
+				$l->t('App "%s" cannot be installed because the following dependencies are not fulfilled: %s',
+					[$info['name'], $missingMsg]
+				)
+			);
+		}
+	}
 }
diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php
index 7882f6dd0315..2da6529bae28 100644
--- a/tests/lib/App/DependencyAnalyzerTest.php
+++ b/tests/lib/App/DependencyAnalyzerTest.php
@@ -9,7 +9,7 @@
 
 namespace Test\App;
 
-use OC;
+use OC\App\DependencyAnalyzer;
 use OC\App\Platform;
 use OCP\IL10N;
 use Test\TestCase;
@@ -22,11 +22,11 @@ class DependencyAnalyzerTest extends TestCase {
 	/** @var IL10N */
 	private $l10nMock;
 
-	/** @var \OC\App\DependencyAnalyzer */
+	/** @var DependencyAnalyzer */
 	private $analyser;
 
 	public function setUp() {
-		$this->platformMock = $this->getMockBuilder('\OC\App\Platform')
+		$this->platformMock = $this->getMockBuilder(Platform::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->platformMock->expects($this->any())
@@ -67,7 +67,7 @@ public function setUp() {
 				return vsprintf($text, $parameters);
 			}));
 
-		$this->analyser = new \OC\App\DependencyAnalyzer($this->platformMock, $this->l10nMock);
+		$this->analyser = new DependencyAnalyzer($this->platformMock, $this->l10nMock);
 	}
 
 	/**
@@ -101,6 +101,8 @@ public function testPhpVersion($expectedMissing, $minVersion, $maxVersion, $intS
 
 	/**
 	 * @dataProvider providesDatabases
+	 * @param $expectedMissing
+	 * @param $databases
 	 */
 	public function testDatabases($expectedMissing, $databases) {
 		$app = array(
@@ -247,6 +249,8 @@ function providesLibs() {
 				array(array('@attributes' => array('min-version' => '2.3', 'max-version' => '2.3'), '@value' => 'curl'))),
 			array(array(),
 				array(array('@attributes' => array('min-version' => '2', 'max-version' => '2'), '@value' => 'curl'))),
+			array(array(),
+				array('@attributes' => array('min-version' => '2', 'max-version' => '2'), '@value' => 'curl')),
 		);
 	}
 

From db197999cd40476d2428471d9b9a2d19178605a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Oct 2016 12:45:24 +0200
Subject: [PATCH 139/219] PHP 5.4 compliant

---
 tests/lib/App/DependencyAnalyzerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php
index 2da6529bae28..aa7aecf8434a 100644
--- a/tests/lib/App/DependencyAnalyzerTest.php
+++ b/tests/lib/App/DependencyAnalyzerTest.php
@@ -26,7 +26,7 @@ class DependencyAnalyzerTest extends TestCase {
 	private $analyser;
 
 	public function setUp() {
-		$this->platformMock = $this->getMockBuilder(Platform::class)
+		$this->platformMock = $this->getMockBuilder('\OC\App\Platform')
 			->disableOriginalConstructor()
 			->getMock();
 		$this->platformMock->expects($this->any())

From 71b6b860085951052cddb3e666152bfecb173316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Thu, 13 Oct 2016 17:48:43 +0200
Subject: [PATCH 140/219] [stable9.1] Allow php 5.3 syntax in index.php so that
 the proper error can be generated and not a parse exception - fixes #26317
 (#26330) (#26363)

---
 index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index 127e2faafd44..fcc7ad514eaf 100644
--- a/index.php
+++ b/index.php
@@ -46,7 +46,7 @@
 	OC::handleRequest();
 
 } catch(\OC\ServiceUnavailableException $ex) {
-	\OC::$server->getLogger()->logException($ex, ['app' => 'index']);
+	\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
 
 	//show the user a detailed error page
 	OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
@@ -56,15 +56,15 @@
 	OC_Template::printErrorPage($ex->getMessage(), $ex->getHint());
 } catch (\OC\User\LoginException $ex) {
 	OC_Response::setStatus(OC_Response::STATUS_FORBIDDEN);
-	OC_Template::printErrorPage($ex->getMessage(), $ex->getHint());
+	OC_Template::printErrorPage($ex->getMessage());
 } catch (Exception $ex) {
-	\OC::$server->getLogger()->logException($ex, ['app' => 'index']);
+	\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
 
 	//show the user a detailed error page
 	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
 	OC_Template::printExceptionErrorPage($ex);
 } catch (Error $ex) {
-	\OC::$server->getLogger()->logException($ex, ['app' => 'index']);
+	\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
 	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
 	OC_Template::printExceptionErrorPage($ex);
 }

From dc7d7b7df93211a18a5bd9f89dd7b5b73c2417eb Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 13 Oct 2016 10:53:04 +0200
Subject: [PATCH 141/219] Fix post_unshareFromSelf hook parameter format

When unsharing from self in a group share situation, the share items
passed to the post_unshareFromSelf hook were using the wrong format in
which the attribute names (ex: "share_type") have non camel-case format.

This fix makes sure that in group sharing case we use the correct
format. It looks like the code was already producing it but in
array_merge it was not using it and adding the unprocessed one.
---
 .../tests/GroupEtagPropagationTest.php        | 22 +++++++++++++++++++
 lib/private/Share/Share.php                   |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/tests/GroupEtagPropagationTest.php b/apps/files_sharing/tests/GroupEtagPropagationTest.php
index 9769079a624e..2f2d6b65c081 100644
--- a/apps/files_sharing/tests/GroupEtagPropagationTest.php
+++ b/apps/files_sharing/tests/GroupEtagPropagationTest.php
@@ -121,4 +121,26 @@ public function testGroupReShareSubFolderRecipientWrites() {
 
 		$this->assertAllUnchanged();
 	}
+
+	public function testRecipientUnsharesFromSelf() {
+		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue(
+			$this->rootView->unlink('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test')
+		);
+		$this->assertEtagsChanged([self::TEST_FILES_SHARING_API_USER2]);
+
+		$this->assertAllUnchanged();
+	}
+
+	public function testRecipientUnsharesFromSelfUniqueGroupShare() {
+		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
+		// rename to create an extra entry in the share table
+		$this->rootView->rename('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test', '/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test_renamed');
+		$this->assertTrue(
+			$this->rootView->unlink('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test_renamed')
+		);
+		$this->assertEtagsChanged([self::TEST_FILES_SHARING_API_USER2]);
+
+		$this->assertAllUnchanged();
+	}
 }
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index bcda779e7339..4bcd84074aff 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -1057,7 +1057,7 @@ public static function unshareFromSelf($itemType, $itemOrigin, $originIsSource =
 			if (isset($groupShare['file_target'])) {
 				$shareTmp['fileTarget'] = $groupShare['file_target'];
 			}
-			$listOfUnsharedItems = array_merge($listOfUnsharedItems, array($groupShare));
+			$listOfUnsharedItems = array_merge($listOfUnsharedItems, array($shareTmp));
 			$itemUnshared = true;
 		} elseif (!$itemUnshared && isset($uniqueGroupShare)) {
 			$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
@@ -1072,7 +1072,7 @@ public static function unshareFromSelf($itemType, $itemOrigin, $originIsSource =
 			if (isset($uniqueGroupShare['file_target'])) {
 				$shareTmp['fileTarget'] = $uniqueGroupShare['file_target'];
 			}
-			$listOfUnsharedItems = array_merge($listOfUnsharedItems, array($uniqueGroupShare));
+			$listOfUnsharedItems = array_merge($listOfUnsharedItems, array($shareTmp));
 			$itemUnshared = true;
 		}
 

From 6fe9f1df7ac2f2dbb84ac78506d2eb5f82dde4e0 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 4 Oct 2016 12:28:41 +0200
Subject: [PATCH 142/219] Add using casing check/fix for initMountPoints

---
 apps/files/lib/Command/TransferOwnership.php | 13 +++--
 lib/private/AvatarManager.php                |  3 ++
 lib/private/Files/Filesystem.php             | 14 +++--
 lib/private/Files/Node/Root.php              |  9 ++++
 lib/private/Share/Share.php                  |  9 ++++
 tests/lib/AvatarManagerTest.php              | 33 +++++++++++-
 tests/lib/Files/FilesystemTest.php           | 35 ++++++++++++
 tests/lib/Files/Node/RootTest.php            | 56 ++++++++++++++++++++
 tests/lib/TestCase.php                       |  3 ++
 9 files changed, 165 insertions(+), 10 deletions(-)

diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php
index 230667afdf96..7f47b7a7a6d2 100644
--- a/apps/files/lib/Command/TransferOwnership.php
+++ b/apps/files/lib/Command/TransferOwnership.php
@@ -89,17 +89,20 @@ protected function configure() {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$this->sourceUser = $input->getArgument('source-user');
-		$this->destinationUser = $input->getArgument('destination-user');
-		if (!$this->userManager->userExists($this->sourceUser)) {
+		$sourceUserObject = $this->userManager->get($input->getArgument('source-user'));
+		$destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
+		if (is_null($sourceUserObject)) {
 			$output->writeln("<error>Unknown source user $this->sourceUser</error>");
 			return;
 		}
-		if (!$this->userManager->userExists($this->destinationUser)) {
+		if (is_null($destinationUserObject)) {
 			$output->writeln("<error>Unknown destination user $this->destinationUser</error>");
 			return;
 		}
-		
+
+		$this->sourceUser = $sourceUserObject->getUID();
+		$this->destinationUser = $destinationUserObject->getUID();
+
 		// target user has to be ready
 		if (!\OC::$server->getEncryptionManager()->isReadyForUser($this->destinationUser)) {
 			$output->writeln("<error>The target user is not ready to accept files. The user has at least to be logged in once.</error>");
diff --git a/lib/private/AvatarManager.php b/lib/private/AvatarManager.php
index 7eb91b4999e3..709ae2d153cd 100644
--- a/lib/private/AvatarManager.php
+++ b/lib/private/AvatarManager.php
@@ -84,6 +84,9 @@ public function getAvatar($userId) {
 			throw new \Exception('user does not exist');
 		}
 
+		// casing might not be the same
+		$userId = $user->getUID();
+
 		/*
 		 * Fix for #22119
 		 * Basically we do not want to copy the skeleton folder
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index 3d3345a5c80f..12961742f591 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -393,9 +393,6 @@ public static function initMountPoints($user = '') {
 		if ($user === null || $user === false || $user === '') {
 			throw new \OC\User\NoUserException('Attempted to initialize mount points for null user and no user in session');
 		}
-		if (isset(self::$usersSetup[$user])) {
-			return;
-		}
 
 		$userManager = \OC::$server->getUserManager();
 		$userObject = $userManager->get($user);
@@ -405,6 +402,17 @@ public static function initMountPoints($user = '') {
 			throw new \OC\User\NoUserException('Backends provided no user object for ' . $user);
 		}
 
+		// workaround in case of different casings
+		if ($user !== $userObject->getUID()) {
+			$stack = json_encode(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 50));
+			\OCP\Util::writeLog('files', 'initMountPoints() called with wrong user casing. This could be a bug. Expected: "' . $userObject->getUID() . '" got "' . $user . '". Stack: ' . $stack, \OCP\Util::WARN);
+		}
+		$user = $userObject->getUID();
+
+		if (isset(self::$usersSetup[$user])) {
+			return;
+		}
+
 		self::$usersSetup[$user] = true;
 
 		/** @var \OC\Files\Config\MountProviderCollection $mountConfigManager */
diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php
index 476d3ef5fdd9..32210b330b62 100644
--- a/lib/private/Files/Node/Root.php
+++ b/lib/private/Files/Node/Root.php
@@ -334,6 +334,15 @@ public function getName() {
 	 * @return \OCP\Files\Folder
 	 */
 	public function getUserFolder($userId) {
+		$userObject = \OC::$server->getUserManager()->get($userId);
+
+		if (is_null($userObject)) {
+			\OCP\Util::writeLog('files', 'Backends provided no user object for ' . $userId, \OCP\Util::ERROR);
+			throw new \OC\User\NoUserException('Backends provided no user object for ' . $userId);
+		}
+
+		$userId = $userObject->getUID();
+
 		\OC\Files\Filesystem::initMountPoints($userId);
 		$dir = '/' . $userId;
 		$folder = null;
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index bcda779e7339..1e451b579320 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -134,6 +134,15 @@ public static function isEnabled() {
 	 *       not '/admin/data/file.txt'
 	 */
 	public static function getUsersSharingFile($path, $ownerUser, $includeOwner = false, $returnUserPaths = false, $recursive = true) {
+		$userManager = \OC::$server->getUserManager();
+		$userObject = $userManager->get($ownerUser);
+
+		if (is_null($ownerUser)) {
+			\OCP\Util::writeLog('files', ' Backends provided no user object for ' . $ownerUser, \OCP\Util::ERROR);
+			throw new \OC\User\NoUserException('Backends provided no user object for ' . $ownerUser);
+		}
+
+		$ownerUser = $userObject->getUID();
 
 		Filesystem::initMountPoints($ownerUser);
 		$shares = $sharePaths = $fileTargets = array();
diff --git a/tests/lib/AvatarManagerTest.php b/tests/lib/AvatarManagerTest.php
index 2dd6ff349230..f49c178033db 100644
--- a/tests/lib/AvatarManagerTest.php
+++ b/tests/lib/AvatarManagerTest.php
@@ -30,7 +30,6 @@
  * @group DB
  */
 class AvatarManagerTest extends \Test\TestCase {
-	use UserTrait;
 	use MountProviderTrait;
 
 	/** @var AvatarManager */
@@ -39,10 +38,29 @@ class AvatarManagerTest extends \Test\TestCase {
 	/** @var \OC\Files\Storage\Temporary */
 	private $storage;
 
+	/** @var \OCP\IUser */
+	private $user;
+
 	public function setUp() {
 		parent::setUp();
 
-		$this->createUser('valid-user', 'valid-user');
+		\OC_User::clearBackends();
+		// needed for loginName2UserName mapping
+		$userBackend = $this->getMock('\OC\User\Database');
+		\OC::$server->getUserManager()->registerBackend($userBackend);
+
+		$userBackend->expects($this->any())
+			->method('userExists')
+			->will($this->returnValueMap([
+				['valid-user', true],
+				['vaLid-USER', true],
+			]));
+		$userBackend->expects($this->any())
+			->method('loginName2UserName')
+			->will($this->returnValueMap([
+				['valid-user', 'valid-user'],
+				['vaLid-USER', 'valid-user'],
+			]));
 
 		$this->storage = new \OC\Files\Storage\Temporary();
 		$this->registerMount('valid-user', $this->storage, '/valid-user/');
@@ -50,6 +68,10 @@ public function setUp() {
 		$this->avatarManager = \OC::$server->getAvatarManager();
 	}
 
+	public function tearDown() {
+		\OC_User::clearBackends();
+	}
+
 	/**
 	 * @expectedException \Exception
 	 * @expectedExceptionMessage user does not exist
@@ -65,4 +87,11 @@ public function testGetAvatarValidUser() {
 		$this->assertFalse($this->storage->file_exists('files'));
 	}
 
+	public function testGetAvatarValidUserDifferentCasing() {
+		$avatar = $this->avatarManager->getAvatar('vaLid-USER');
+
+		$this->assertInstanceOf('\OCP\IAvatar', $avatar);
+		$this->assertFalse($this->storage->file_exists('files'));
+	}
+
 }
diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php
index 76e3f4716335..1deeb7502dfb 100644
--- a/tests/lib/Files/FilesystemTest.php
+++ b/tests/lib/Files/FilesystemTest.php
@@ -79,6 +79,7 @@ private function getStorageData() {
 
 	protected function setUp() {
 		parent::setUp();
+		\OC_User::clearBackends();
 		$userBackend = new \Test\Util\User\Dummy();
 		$userBackend->createUser(self::TEST_FILESYSTEM_USER1, self::TEST_FILESYSTEM_USER1);
 		$userBackend->createUser(self::TEST_FILESYSTEM_USER2, self::TEST_FILESYSTEM_USER2);
@@ -93,6 +94,7 @@ protected function tearDown() {
 
 		$this->logout();
 		$this->invokePrivate('\OC\Files\Filesystem', 'normalizedPathCache', [null]);
+		\OC_User::clearBackends();
 		parent::tearDown();
 	}
 
@@ -390,6 +392,39 @@ public function testLocalMountWhenUserDoesNotExistTwice() {
 		$this->assertEquals(2, $thrown);
 	}
 
+	public function testUserNameCasing() {
+		$this->logout();
+		$userId = $this->getUniqueID('user_');
+
+		\OC_User::clearBackends();
+		// needed for loginName2UserName mapping
+		$userBackend = $this->getMock('\OC\User\Database');
+		\OC::$server->getUserManager()->registerBackend($userBackend);
+
+		$userBackend->expects($this->once())
+			->method('userExists')
+			->with(strtoupper($userId))
+			->will($this->returnValue(true));
+		$userBackend->expects($this->once())
+			->method('loginName2UserName')
+			->with(strtoupper($userId))
+			->will($this->returnValue($userId));
+
+		$view = new \OC\Files\View();
+		$this->assertFalse($view->file_exists('/' . $userId));
+
+		\OC\Files\Filesystem::initMountPoints(strtoupper($userId));
+
+		list($storage1, $path1) = $view->resolvePath('/' . $userId);
+		list($storage2, $path2) = $view->resolvePath('/' . strtoupper($userId));
+
+		$this->assertTrue($storage1->instanceOfStorage('\OCP\Files\IHomeStorage'));
+		$this->assertEquals('', $path1);
+
+		// not mounted, still on the local root storage
+		$this->assertEquals(strtoupper($userId), $path2);
+	}
+
 	/**
 	 * Tests that the home storage is used for the user's mount point
 	 */
diff --git a/tests/lib/Files/Node/RootTest.php b/tests/lib/Files/Node/RootTest.php
index 1b4824cba767..55939c831ad9 100644
--- a/tests/lib/Files/Node/RootTest.php
+++ b/tests/lib/Files/Node/RootTest.php
@@ -11,6 +11,7 @@
 use OC\Files\FileInfo;
 use OCP\Files\NotPermittedException;
 use OC\Files\Mount\Manager;
+use OC\User\NoUserException;
 
 /**
  * @group DB
@@ -101,4 +102,59 @@ public function testGetNoStorages() {
 
 		$root->get('/bar/foo');
 	}
+
+	public function testGetUserFolder() {
+		$this->logout();
+		$manager = new Manager();
+		/**
+		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+		 */
+		$view = new \OC\Files\View();
+
+		$user1 = $this->getUniqueID('user1_');
+		$user2 = $this->getUniqueID('user2_');
+
+		\OC_User::clearBackends();
+		// needed for loginName2UserName mapping
+		$userBackend = $this->getMock('\OC\User\Database');
+		\OC::$server->getUserManager()->registerBackend($userBackend);
+
+		$userBackend->expects($this->any())
+			->method('userExists')
+			->will($this->returnValueMap([
+				[$user1, true],
+				[$user2, true],
+				[strtoupper($user1), true],
+				[strtoupper($user2), true],
+			]));
+		$userBackend->expects($this->any())
+			->method('loginName2UserName')
+			->will($this->returnValueMap([
+				[strtoupper($user1), $user1],
+				[$user1, $user1],
+				[strtoupper($user2), $user2],
+				[$user2, $user2],
+			]));
+
+		$this->loginAsUser($user1);
+		$root = new \OC\Files\Node\Root($manager, $view, null);
+
+		$folder = $root->getUserFolder($user1);
+		$this->assertEquals('/' . $user1 . '/files', $folder->getPath());
+
+		$folder = $root->getUserFolder($user2);
+		$this->assertEquals('/' . $user2 . '/files', $folder->getPath());
+
+		// case difference must not matter here
+		$folder = $root->getUserFolder(strtoupper($user2));
+		$this->assertEquals('/' . $user2 . '/files', $folder->getPath());
+
+		$thrown = false;
+		try {
+			$folder = $root->getUserFolder($this->getUniqueID('unexist'));
+		} catch (NoUserException $e) {
+			$thrown = true;
+		}
+		$this->assertTrue($thrown);
+	}
 }
diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
index a1f65f8ac822..da7b584ea667 100644
--- a/tests/lib/TestCase.php
+++ b/tests/lib/TestCase.php
@@ -229,6 +229,9 @@ public static function tearDownAfterClass() {
 		self::tearDownAfterClassCleanStrayHooks();
 		self::tearDownAfterClassCleanStrayLocks();
 
+		\OC_User::clearBackends();
+		\OC_User::useBackend('dummy');
+
 		parent::tearDownAfterClass();
 	}
 

From c82d62a03c94a0a45489b85750b8445e33397f59 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 18 Oct 2016 11:35:54 +0200
Subject: [PATCH 143/219] Fix initMountPoints to set usersSetup earlier

This is needed because in some cases like LDAP, the user manager itself
might trigger avatar updates which would internally also call
initMountPoints with the same user. This could cause the same user to
be setup twice, and in some sharing situations could cause recursive
deduplication of shares by adding "(2)" every time.
---
 lib/private/Files/Filesystem.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index 12961742f591..332071571a3e 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -394,26 +394,36 @@ public static function initMountPoints($user = '') {
 			throw new \OC\User\NoUserException('Attempted to initialize mount points for null user and no user in session');
 		}
 
+		if (isset(self::$usersSetup[$user])) {
+			return;
+		}
+
+		self::$usersSetup[$user] = true;
+
 		$userManager = \OC::$server->getUserManager();
 		$userObject = $userManager->get($user);
 
 		if (is_null($userObject)) {
 			\OCP\Util::writeLog('files', ' Backends provided no user object for ' . $user, \OCP\Util::ERROR);
+			// reset flag, this will make it possible to rethrow the exception if called again
+			unset(self::$usersSetup[$user]);
 			throw new \OC\User\NoUserException('Backends provided no user object for ' . $user);
 		}
 
+		$realUid = $userObject->getUID();
 		// workaround in case of different casings
-		if ($user !== $userObject->getUID()) {
+		if ($user !== $realUid) {
 			$stack = json_encode(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 50));
-			\OCP\Util::writeLog('files', 'initMountPoints() called with wrong user casing. This could be a bug. Expected: "' . $userObject->getUID() . '" got "' . $user . '". Stack: ' . $stack, \OCP\Util::WARN);
-		}
-		$user = $userObject->getUID();
+			\OCP\Util::writeLog('files', 'initMountPoints() called with wrong user casing. This could be a bug. Expected: "' . $realUid . '" got "' . $user . '". Stack: ' . $stack, \OCP\Util::WARN);
+			$user = $realUid;
 
-		if (isset(self::$usersSetup[$user])) {
-			return;
-		}
+			// again with the correct casing
+			if (isset(self::$usersSetup[$user])) {
+				return;
+			}
 
-		self::$usersSetup[$user] = true;
+			self::$usersSetup[$user] = true;
+		}
 
 		/** @var \OC\Files\Config\MountProviderCollection $mountConfigManager */
 		$mountConfigManager = \OC::$server->getMountProviderCollection();

From cb6b995e0755ef0c6aecc05183099faf39ed386c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Pablo=20Villaf=C3=A1=C3=B1ez?=
 <jvillafanez@solidgear.es>
Date: Mon, 17 Oct 2016 13:55:12 +0200
Subject: [PATCH 144/219] Skip over missing groups

---
 apps/user_ldap/lib/Command/UpdateGroup.php | 38 ++++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/apps/user_ldap/lib/Command/UpdateGroup.php b/apps/user_ldap/lib/Command/UpdateGroup.php
index bc4c0cfbac51..64e8c1614385 100644
--- a/apps/user_ldap/lib/Command/UpdateGroup.php
+++ b/apps/user_ldap/lib/Command/UpdateGroup.php
@@ -89,14 +89,15 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			return self::ERROR_CODE_MISSING_CONF;
 		}
 
-		if (!$this->checkGroupMappingExists($groupIDs)) {
-			$output->writeln("<error>Some of the groups are unknown</error>");
-			return self::ERROR_CODE_MISSING_MAPPING;
+		$splittedGroups = $this->checkGroupMappingExists($groupIDs);
+		if (!empty($splittedGroups['notinDB'])) {
+			$missingGroups = implode(', ', $splittedGroups['notinDB']);
+			$output->writeln("<error>Following groups are missing in the DB and will be skipped: $missingGroups</error>");
 		}
 
 		$groupProxy = new Group_Proxy($availableConfigs, $this->ldap);
 
-		foreach ($groupIDs as $groupID) {
+		foreach ($splittedGroups['inDB'] as $groupID) {
 			$output->writeln("checking group \"$groupID\"...");
 			if (!$groupProxy->groupExists($groupID)) {
 				$output->writeln("\"$groupID\" doesn't exist in LDAP any more, removing local mapping");
@@ -196,25 +197,34 @@ private function updateGroupMapping($groupName, $userList) {
 	}
 
 	/**
-	 * Make sure $groupNames doesn't contain duplicated values. This function could behave
-	 * unexpectedly otherwise.
+	 * Split the list of group names into those which are in the DB and those which aren't
+	 * As an example, checkGroupMappingExists(['g1', 'g2', 'g3', 'missing', 'another']) could return:
+	 * ['inDB' => ['g1', 'g2', 'g3'], 'notinDB' => ['missing', 'another']]
 	 *
-	 * Take advantage of the owncloud_name column in the DB has a unique constraint.
-	 *
-	 * @return true if the count($groupNames) matches the number of
+	 * @param array<String> $groupNames list of group names
+	 * @return array returns an array containing 2 arrays: 'inDB' for those group names that are in
+	 * the DB and 'notinDB' for those that aren't
 	 */
 	private function checkGroupMappingExists($groupNames) {
+		$groups = array('inDB' => array(), 'notinDB' => array());
 		$query = $this->connection->getQueryBuilder();
-		$query->select($query->createFunction('count(owncloud_name) as ngroups'))
+		$query->select('owncloud_name')
 			->from('ldap_group_mapping')
 			->where($query->expr()->in('owncloud_name', $query->createParameter('groups')))
 			->setParameter('groups', $groupNames, IQueryBuilder::PARAM_STR_ARRAY);
 		$result = $query->execute();
-		$row = $result->fetch();
 
-		$countValue = intval($row['ngroups']);
+		// fill with those which are inside the DB
+		while (($row = $result->fetch()) !== false) {
+			if (in_array($row['owncloud_name'], $groupNames, true)) {
+				$groups['inDB'][] = $row['owncloud_name'];
+			}
+		}
+
 		$result->closeCursor();
-		$requestedGroupNameCount = count($groupNames);
-		return $countValue === $requestedGroupNameCount;
+
+		// fill with the missing ones
+		$groups['notinDB'] = array_diff($groupNames, $groups['inDB']);
+		return $groups;
 	}
 }

From 26dbe006df8f2c47e59d7d697f2fcfa1786d7327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Pablo=20Villaf=C3=A1=C3=B1ez?=
 <jvillafanez@solidgear.es>
Date: Wed, 19 Oct 2016 09:39:28 +0200
Subject: [PATCH 145/219] Fix minor typo

---
 apps/user_ldap/lib/Command/UpdateGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/Command/UpdateGroup.php b/apps/user_ldap/lib/Command/UpdateGroup.php
index 64e8c1614385..0a7d3bc373e8 100644
--- a/apps/user_ldap/lib/Command/UpdateGroup.php
+++ b/apps/user_ldap/lib/Command/UpdateGroup.php
@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		$splittedGroups = $this->checkGroupMappingExists($groupIDs);
 		if (!empty($splittedGroups['notinDB'])) {
 			$missingGroups = implode(', ', $splittedGroups['notinDB']);
-			$output->writeln("<error>Following groups are missing in the DB and will be skipped: $missingGroups</error>");
+			$output->writeln("<error>The following groups are missing in the DB and will be skipped: $missingGroups</error>");
 		}
 
 		$groupProxy = new Group_Proxy($availableConfigs, $this->ldap);

From cc92cdb240604d4223bdbbfcd2832495a39779d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Fri, 23 Sep 2016 16:07:14 +0200
Subject: [PATCH 146/219] [stable9.1] Use correct name for background jobs

fixes #26202
---
 apps/dav/appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index 91fe7dd54efc..dfc0aa2eeb6b 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -18,7 +18,7 @@
 		<owncloud min-version="9.1" max-version="9.1" />
 	</dependencies>
 	<background-jobs>
-		<job>OCA\DAV\CardDAV\Sync\SyncJob</job>
+		<job>OCA\DAV\CardDAV\SyncJob</job>
 	</background-jobs>
 	<repair-steps>
 		<post-migration>

From cc5ae2aba7893c59b69339b84ab537543b2b1fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 19 Oct 2016 11:36:34 +0200
Subject: [PATCH 147/219] [stable9.1] Set version to 0.2.7 to trigger setup of
 background job

---
 apps/dav/appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index dfc0aa2eeb6b..aad0b9962a98 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>ownCloud WebDAV endpoint</description>
 	<licence>AGPL</licence>
 	<author>owncloud.org</author>
-	<version>0.2.6</version>
+	<version>0.2.7</version>
 	<default_enable/>
 	<types>
 		<filesystem/>

From 80c95de8f249e665dd3cc7bc6f78ef6dab3c6d4e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 19 Oct 2016 20:18:01 +0200
Subject: [PATCH 148/219] Set version to 9.1.2 RC1

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 9b604f05a4ab..8b037aeff973 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 1, 3);
+$OC_Version = array(9, 1, 2, 3);
 
 // The human readable string
-$OC_VersionString = '9.1.1';
+$OC_VersionString = '9.1.2 RC1';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From ba01c08acbada1cc80e76a16eb88d5f5b22f889c Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 20 Oct 2016 12:57:22 +0200
Subject: [PATCH 149/219] Sanitize length headers when validating quota
 (#26416)

---
 apps/dav/lib/Connector/Sabre/QuotaPlugin.php  | 26 ++++++++-----
 .../unit/Connector/Sabre/QuotaPluginTest.php  | 39 +++++++++++--------
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
index a093c52851c8..82367369f310 100644
--- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
@@ -24,6 +24,11 @@
  *
  */
 namespace OCA\DAV\Connector\Sabre;
+use OCP\Files\FileInfo;
+use OCP\Files\StorageNotAvailableException;
+use Sabre\DAV\Exception\InsufficientStorage;
+use Sabre\DAV\Exception\ServiceUnavailable;
+use Sabre\HTTP\URLUtil;
 
 /**
  * This plugin check user quota and deny creating files when they exceeds the quota.
@@ -76,17 +81,16 @@ public function initialize(\Sabre\DAV\Server $server) {
 	 * This method is called before any HTTP method and validates there is enough free space to store the file
 	 *
 	 * @param string $uri
-	 * @param null $data
-	 * @throws \Sabre\DAV\Exception\InsufficientStorage
+	 * @throws InsufficientStorage
 	 * @return bool
 	 */
-	public function checkQuota($uri, $data = null) {
+	public function checkQuota($uri) {
 		$length = $this->getLength();
 		if ($length) {
 			if (substr($uri, 0, 1) !== '/') {
 				$uri = '/' . $uri;
 			}
-			list($parentUri, $newName) = \Sabre\HTTP\URLUtil::splitPath($uri);
+			list($parentUri, $newName) = URLUtil::splitPath($uri);
 			if(is_null($parentUri)) {
 				$parentUri = '';
 			}
@@ -101,11 +105,11 @@ public function checkQuota($uri, $data = null) {
 				$uri = rtrim($parentUri, '/') . '/' . $info['name'];
 			}
 			$freeSpace = $this->getFreeSpace($uri);
-			if ($freeSpace !== \OCP\Files\FileInfo::SPACE_UNKNOWN && $length > $freeSpace) {
+			if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $length > $freeSpace) {
 				if (isset($chunkHandler)) {
 					$chunkHandler->cleanup();
 				}
-				throw new \Sabre\DAV\Exception\InsufficientStorage();
+				throw new InsufficientStorage();
 			}
 		}
 		return true;
@@ -119,12 +123,13 @@ public function getFileChunking($info) {
 	public function getLength() {
 		$req = $this->server->httpRequest;
 		$length = $req->getHeader('X-Expected-Entity-Length');
-		if (!$length) {
+		if (!is_numeric($length)) {
 			$length = $req->getHeader('Content-Length');
+			$length = is_numeric($length) ? $length : null;
 		}
 
 		$ocLength = $req->getHeader('OC-Total-Length');
-		if ($length && $ocLength) {
+		if (is_numeric($length) && is_numeric($ocLength)) {
 			return max($length, $ocLength);
 		}
 
@@ -134,13 +139,14 @@ public function getLength() {
 	/**
 	 * @param string $uri
 	 * @return mixed
+	 * @throws ServiceUnavailable
 	 */
 	public function getFreeSpace($uri) {
 		try {
 			$freeSpace = $this->view->free_space(ltrim($uri, '/'));
 			return $freeSpace;
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+		} catch (StorageNotAvailableException $e) {
+			throw new ServiceUnavailable($e->getMessage());
 		}
 	}
 }
diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
index c6a1bc3dd4b6..56c6ea675f72 100644
--- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
@@ -22,22 +22,20 @@
  *
  */
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
+use Test\TestCase;
+
 /**
  * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
-class QuotaPluginTest extends \Test\TestCase {
+class QuotaPluginTest extends TestCase {
 
-	/**
-	 * @var \Sabre\DAV\Server
-	 */
+	/** @var \Sabre\DAV\Server | \PHPUnit_Framework_MockObject_MockObject */
 	private $server;
 
-	/**
-	 * @var \OCA\DAV\Connector\Sabre\QuotaPlugin
-	 */
+	/** @var \OCA\DAV\Connector\Sabre\QuotaPlugin | \PHPUnit_Framework_MockObject_MockObject */
 	private $plugin;
 
 	private function init($quota, $checkedPath = '') {
@@ -124,13 +122,19 @@ public function quotaExceededProvider() {
 	}
 
 	public function lengthProvider() {
-		return array(
-			array(null, array()),
-			array(1024, array('X-EXPECTED-ENTITY-LENGTH' => '1024')),
-			array(512, array('CONTENT-LENGTH' => '512')),
-			array(2048, array('OC-TOTAL-LENGTH' => '2048', 'CONTENT-LENGTH' => '1024')),
-			array(4096, array('OC-TOTAL-LENGTH' => '2048', 'X-EXPECTED-ENTITY-LENGTH' => '4096')),
-		);
+		return [
+			[null, []],
+			[1024, ['X-EXPECTED-ENTITY-LENGTH' => '1024']],
+			[512, ['CONTENT-LENGTH' => '512']],
+			[2048, ['OC-TOTAL-LENGTH' => '2048', 'CONTENT-LENGTH' => '1024']],
+			[4096, ['OC-TOTAL-LENGTH' => '2048', 'X-EXPECTED-ENTITY-LENGTH' => '4096']],
+			[null, ['X-EXPECTED-ENTITY-LENGTH' => 'A']],
+			[null, ['CONTENT-LENGTH' => 'A']],
+			[1024, ['OC-TOTAL-LENGTH' => 'A', 'CONTENT-LENGTH' => '1024']],
+			[1024, ['OC-TOTAL-LENGTH' => 'A', 'X-EXPECTED-ENTITY-LENGTH' => '1024']],
+			[null, ['OC-TOTAL-LENGTH' => '2048', 'X-EXPECTED-ENTITY-LENGTH' => 'A']],
+			[null, ['OC-TOTAL-LENGTH' => '2048', 'CONTENT-LENGTH' => 'A']],
+		];
 	}
 
 	public function quotaChunkedOkProvider() {
@@ -211,8 +215,11 @@ public function testCheckQuotaChunkedFail($quota, $chunkTotalSize, $headers) {
 	}
 
 	private function buildFileViewMock($quota, $checkedPath) {
-		// mock filesysten
-		$view = $this->getMock('\OC\Files\View', array('free_space'), array(), '', false);
+		// mock file systen
+		$view = $this->getMockBuilder('\OC\Files\View')
+			->setMethods(['free_space'])
+			->setConstructorArgs([])
+			->getMock();
 		$view->expects($this->any())
 			->method('free_space')
 			->with($this->identicalTo($checkedPath))

From 0ab64baa0e0445d98240b81883af9fcdbcf1fe57 Mon Sep 17 00:00:00 2001
From: RealRancor <RealRancor@users.noreply.github.com>
Date: Mon, 24 Oct 2016 10:08:28 +0200
Subject: [PATCH 150/219] [stable9.1] Fix misleading SSL/TLS SMTP email
 configuration (#26447)

---
 settings/templates/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 0cdefe100833..95201311e668 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -34,8 +34,8 @@
 
 $mail_smtpsecure = [
 	''		=> $l->t('None'),
-	'ssl'	=> $l->t('SSL'),
-	'tls'	=> $l->t('TLS'),
+	'ssl'	=> $l->t('SSL/TLS'),
+	'tls'	=> $l->t('STARTTLS'),
 ];
 
 $mail_smtpmode = [

From 2b3b8af6e84028cebe2398b7cbbffae267e03a9b Mon Sep 17 00:00:00 2001
From: RealRancor <RealRancor@users.noreply.github.com>
Date: Mon, 24 Oct 2016 22:18:03 +0200
Subject: [PATCH 151/219] stable9.1 is not compatible with PHP 7.1 (#26432)

---
 console.php | 8 ++++++++
 index.php   | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/console.php b/console.php
index ed19d41d4846..72359654c34f 100644
--- a/console.php
+++ b/console.php
@@ -41,6 +41,14 @@
 	return;
 }
 
+// Show warning if PHP 7.1 is used as ownCloud is not compatible with PHP 7.1 until
+// version 9.2.0.
+if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
+	echo 'This version of ownCloud is not compatible with PHP 7.1.<br/>';
+	echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 9.2.0.';
+	return;
+}
+
 function exceptionHandler($exception) {
 	echo "An unhandled exception has been thrown:" . PHP_EOL;
 	echo $exception;
diff --git a/index.php b/index.php
index fcc7ad514eaf..136ddcbe0068 100644
--- a/index.php
+++ b/index.php
@@ -32,6 +32,14 @@
 	return;
 }
 
+// Show warning if PHP 7.1 is used as ownCloud is not compatible with PHP 7.1 until
+// version 9.2.0.
+if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
+	echo 'This version of ownCloud is not compatible with PHP 7.1.<br/>';
+	echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 9.2.0.';
+	return;
+}
+
 // running oC on Windows is unsupported since 8.1, this has to happen here because
 // is seems that the autoloader on Windows fails later and just throws an exception.
 if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {

From 6bf3be3877d9d9fda9c66926fe273fe79cbaf58e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 25 Oct 2016 10:16:25 +0200
Subject: [PATCH 152/219] [stable9.1] Merge pull request #26459 from
 owncloud/limit-carddav-image-export-mime-types

Limit carddav image export mime types
---
 apps/dav/lib/CardDAV/ImageExportPlugin.php       | 10 ++++++++--
 .../tests/unit/CardDAV/ImageExportPluginTest.php | 16 ++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/apps/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php
index fcd36b3ff35a..1a0e99b28e72 100644
--- a/apps/dav/lib/CardDAV/ImageExportPlugin.php
+++ b/apps/dav/lib/CardDAV/ImageExportPlugin.php
@@ -86,6 +86,7 @@ function httpGet(RequestInterface $request, ResponseInterface $response) {
 
 		if ($result = $this->getPhoto($node)) {
 			$response->setHeader('Content-Type', $result['Content-Type']);
+			$response->setHeader('Content-Disposition', 'attachment');
 			$response->setStatus(200);
 
 			$response->setBody($result['body']);
@@ -120,6 +121,11 @@ function getPhoto(Card $node) {
 				}
 				$val = file_get_contents($val);
 			}
+
+			if (!in_array($type, ['image/png', 'image/jpeg', 'image/gif'])) {
+				$type = 'application/octet-stream';
+			}
+
 			return [
 				'Content-Type' => $type,
 				'body' => $val
@@ -136,7 +142,7 @@ private function readCard($cardData) {
 
 	/**
 	 * @param Binary $photo
-	 * @return Parameter
+	 * @return string
 	 */
 	private function getType($photo) {
 		$params = $photo->parameters();
@@ -151,6 +157,6 @@ private function getType($photo) {
 				return 'image/' . strtolower($type);
 			}
 		}
-		return '';
+		return 'application/octet-stream';
 	}
 }
diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
index 3a9dc144584b..25a367cbd947 100644
--- a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
+++ b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
@@ -92,7 +92,7 @@ public function testNotACard() {
 	 * @param bool $expected
 	 * @param array $getPhotoResult
 	 */
-	public function testCardWithOrWithoutPhoto($expected, $getPhotoResult) {
+	public function testCardWithOrWithoutPhoto($expectedContentType, $getPhotoResult) {
 		$this->request->expects($this->once())->method('getQueryParameters')->willReturn(['photo' => true]);
 		$this->request->expects($this->once())->method('getPath')->willReturn('/files/welcome.txt');
 
@@ -101,20 +101,22 @@ public function testCardWithOrWithoutPhoto($expected, $getPhotoResult) {
 
 		$this->plugin->expects($this->once())->method('getPhoto')->willReturn($getPhotoResult);
 
-		if (!$expected) {
-			$this->response->expects($this->once())->method('setHeader');
-			$this->response->expects($this->once())->method('setStatus');
+		if (is_string($expectedContentType)) {
+			$this->response->expects($this->exactly(2))->method('setHeader')->withConsecutive(
+				['Content-Type', $expectedContentType],
+				['Content-Disposition', 'attachment']);
+			$this->response->expects($this->once())->method('setStatus')->with(200);
 			$this->response->expects($this->once())->method('setBody');
 		}
 
 		$result = $this->plugin->httpGet($this->request, $this->response);
-		$this->assertEquals($expected, $result);
+		$this->assertEquals(!is_string($expectedContentType), $result);
 	}
 
 	public function providesCardWithOrWithoutPhoto() {
 		return [
 			[true, null],
-			[false, ['Content-Type' => 'image/jpeg', 'body' => '1234']],
+			['image/jpeg', ['Content-Type' => 'image/jpeg', 'body' => '1234']],
 		];
 	}
 
@@ -143,6 +145,8 @@ public function providesPhotoData() {
 			'vcard 3 with PHOTO URL' => [false, "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO;TYPE=JPEG;VALUE=URI:http://example.com/photo.jpg\r\nEND:VCARD\r\n"],
 			'vcard 4 with PHOTO' => [['Content-Type' => 'image/jpeg', 'body' => '12345'], "BEGIN:VCARD\r\nVERSION:4.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO:data:image/jpeg;base64,MTIzNDU=\r\nEND:VCARD\r\n"],
 			'vcard 4 with PHOTO URL' => [false, "BEGIN:VCARD\r\nVERSION:4.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO;MEDIATYPE=image/jpeg:http://example.org/photo.jpg\r\nEND:VCARD\r\n"],
+			'vcard 3 with bad PHOTO' => [['Content-Type' => 'application/octet-stream', 'body' => '12345'], "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO;ENCODING=b;TYPE=TXT:MTIzNDU=\r\nEND:VCARD\r\n"],
+			'vcard 4 with bad PHOTO' => [['Content-Type' => 'application/octet-stream', 'body' => '12345'], "BEGIN:VCARD\r\nVERSION:4.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO:data:video/mpeg;base64,MTIzNDU=\r\nEND:VCARD\r\n"],
 		];
 	}
 }

From 96b8afe48570bc70088ccd8f897e9d71997d336e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 25 Oct 2016 10:15:39 +0200
Subject: [PATCH 153/219] [stable9.1] Merge pull request #26460 from
 owncloud/throw-exceptions-not-printable

Don't print exception messages in html
---
 apps/dav/lib/Files/BrowserErrorPagePlugin.php | 17 ++++-------------
 apps/dav/templates/exception.php              | 14 --------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/apps/dav/lib/Files/BrowserErrorPagePlugin.php b/apps/dav/lib/Files/BrowserErrorPagePlugin.php
index 5fe6f412f976..9d74ad78062b 100644
--- a/apps/dav/lib/Files/BrowserErrorPagePlugin.php
+++ b/apps/dav/lib/Files/BrowserErrorPagePlugin.php
@@ -80,38 +80,29 @@ public function logException(\Exception $ex) {
 		}
 		$this->server->httpResponse->addHeaders($headers);
 		$this->server->httpResponse->setStatus($httpCode);
-		$body = $this->generateBody($ex);
+		$body = $this->generateBody();
 		$this->server->httpResponse->setBody($body);
 		$this->sendResponse();
 	}
 
 	/**
 	 * @codeCoverageIgnore
-	 * @param \Exception $ex
-	 * @param int $httpCode
 	 * @return bool|string
 	 */
-	public function generateBody(\Exception $exception) {
+	public function generateBody() {
 		$request = \OC::$server->getRequest();
 		$content = new OC_Template('dav', 'exception', 'guest');
 		$content->assign('title', $this->server->httpResponse->getStatusText());
-		$content->assign('message', $exception->getMessage());
-		$content->assign('errorClass', get_class($exception));
-		$content->assign('errorMsg', $exception->getMessage());
-		$content->assign('errorCode', $exception->getCode());
-		$content->assign('file', $exception->getFile());
-		$content->assign('line', $exception->getLine());
-		$content->assign('trace', $exception->getTraceAsString());
-		$content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
 		$content->assign('remoteAddr', $request->getRemoteAddress());
 		$content->assign('requestID', $request->getId());
 		return $content->fetchPage();
 	}
 
-	/*
+	/**
 	 * @codeCoverageIgnore
 	 */
 	public function sendResponse() {
 		$this->server->sapi->sendResponse($this->server->httpResponse);
+		exit();
 	}
 }
diff --git a/apps/dav/templates/exception.php b/apps/dav/templates/exception.php
index 01c4eea4b5ad..e01b5fda2c4c 100644
--- a/apps/dav/templates/exception.php
+++ b/apps/dav/templates/exception.php
@@ -6,25 +6,11 @@
 ?>
 <span class="error error-wide">
 	<h2><strong><?php p($_['title']) ?></strong></h2>
-		<p><?php p($_['message']) ?></p>
 	<br>
 
 	<h2><strong><?php p($l->t('Technical details')) ?></strong></h2>
 	<ul>
 		<li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li>
 		<li><?php p($l->t('Request ID: %s', $_['requestID'])) ?></li>
-		<?php if($_['debugMode']): ?>
-			<li><?php p($l->t('Type: %s', $_['errorClass'])) ?></li>
-			<li><?php p($l->t('Code: %s', $_['errorCode'])) ?></li>
-			<li><?php p($l->t('Message: %s', $_['errorMsg'])) ?></li>
-			<li><?php p($l->t('File: %s', $_['file'])) ?></li>
-			<li><?php p($l->t('Line: %s', $_['line'])) ?></li>
-		<?php endif; ?>
 	</ul>
-
-	<?php if($_['debugMode']): ?>
-		<br />
-		<h2><strong><?php p($l->t('Trace')) ?></strong></h2>
-		<pre><?php p($_['trace']) ?></pre>
-	<?php endif; ?>
 </span>

From 50cd11b583804107c98ca69e7d31472dacd0767d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 25 Oct 2016 13:35:49 +0200
Subject: [PATCH 154/219] Exclude more invalid chars from files UI path
 (#26474)

Prevent newlines and zero byte chars to be used in files UI URL and
redirect to root if one is detected.

Added additional hardening in case the request fails with 400 or the
XMLHttpRequest throw a DOMException, both can happen with invalid paths
as well.
---
 apps/files/js/filelist.js           | 32 ++++++++++++++++++++++-------
 apps/files/tests/js/filelistSpec.js | 10 ++++++++-
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index f7d16e960c99..71cecf058aca 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1402,11 +1402,18 @@
 
 		_isValidPath: function(path) {
 			var sections = path.split('/');
-			for (var i = 0; i < sections.length; i++) {
+			var i;
+			for (i = 0; i < sections.length; i++) {
 				if (sections[i] === '..') {
 					return false;
 				}
 			}
+			var specialChars = [decodeURIComponent('%00'), decodeURIComponent('%0A')];
+			for (i = 0; i < specialChars.length; i++) {
+				if (path.indexOf(specialChars[i]) !== -1) {
+					return false;
+				}
+			}
 			return true;
 		},
 
@@ -1419,6 +1426,7 @@
 		_setCurrentDir: function(targetDir, changeUrl, fileId) {
 			targetDir = targetDir.replace(/\\/g, '/');
 			if (!this._isValidPath(targetDir)) {
+				OC.Notification.showTemporary(t('files', 'Invalid path'));
 				targetDir = '/';
 				changeUrl = true;
 			}
@@ -1521,12 +1529,22 @@
 			this._currentFileModel = null;
 			this.$el.find('.select-all').prop('checked', false);
 			this.showMask();
-			this._reloadCall = this.filesClient.getFolderContents(
-				this.getCurrentDirectory(), {
-					includeParent: true,
-					properties: this._getWebdavProperties()
+			try {
+				this._reloadCall = this.filesClient.getFolderContents(
+					this.getCurrentDirectory(), {
+						includeParent: true,
+						properties: this._getWebdavProperties()
+					}
+				);
+			} catch (e) {
+				if (e instanceof DOMException) {
+					console.error(e);
+					this.changeDirectory('/');
+					OC.Notification.showTemporary(t('files', 'Invalid path'));
+					return;
 				}
-			);
+				throw e;
+			}
 			if (this._detailsView) {
 				// close sidebar
 				this._updateDetailsView(null);
@@ -1543,7 +1561,7 @@
 			}
 
 			// Firewall Blocked request?
-			if (status === 403) {
+			if (status === 403 || status === 400) {
 				// Go home
 				this.changeDirectory('/');
 				OC.Notification.showTemporary(t('files', 'This operation is forbidden'));
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 35af2f89fc24..90df1ab0a485 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1400,7 +1400,9 @@ describe('OCA.Files.FileList tests', function() {
 				'/../abc',
 				'/abc/..',
 				'/abc/../',
-				'/../abc/'
+				'/../abc/',
+				'/zero' + decodeURIComponent('%00') + 'byte/',
+				'/really who adds new' + decodeURIComponent('%0A') + 'lines in their paths/',
 			], function(path) {
 				fileList.changeDirectory(path);
 				expect(fileList.getCurrentDirectory()).toEqual('/');
@@ -1416,6 +1418,12 @@ describe('OCA.Files.FileList tests', function() {
 				expect(fileList.getCurrentDirectory()).toEqual(path);
 			});
 		});
+		it('switches to root dir in case of bad request', function() {
+			fileList.changeDirectory('/unexist');
+			// can happen in case of invalid chars in the URL
+			deferredList.reject(400);
+			expect(fileList.getCurrentDirectory()).toEqual('/');
+		});
 		it('switches to root dir when current directory does not exist', function() {
 			fileList.changeDirectory('/unexist');
 			deferredList.reject(404);

From f79e451b4a74cb90e94ef0d463969ba6c0e8582d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 25 Oct 2016 13:02:50 +0200
Subject: [PATCH 155/219] Fix malformed attribute in files app

---
 apps/files/templates/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 42ce941a4a58..92345d3063e1 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -14,7 +14,7 @@
 <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
 <input type="hidden" name="owner" id="owner" value="<?php p($_['owner']); ?>" />
 <input type="hidden" name="ownerDisplayName" id="ownerDisplayName" value="<?php p($_['ownerDisplayName']); ?>" />
-<input type="hidden" name="fileNotFound" id="fileNotFound" value="<?php p($_['fileNotFound']); ?>"" />
+<input type="hidden" name="fileNotFound" id="fileNotFound" value="<?php p($_['fileNotFound']); ?>" />
 <?php if (!$_['isPublic']) :?>
 <input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" />
 <input type="hidden" name="mailPublicNotificationEnabled" id="mailPublicNotificationEnabled" value="<?php p($_['mailPublicNotificationEnabled']) ?>" />

From 8ebd903790a6932f96ff924ed563af512cdadcb3 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Tue, 25 Oct 2016 03:05:35 +0300
Subject: [PATCH 156/219] Allow integrity check via OccController

---
 core/Controller/OccController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/Controller/OccController.php b/core/Controller/OccController.php
index 0d63c131789b..9dffd79d1b02 100644
--- a/core/Controller/OccController.php
+++ b/core/Controller/OccController.php
@@ -41,6 +41,7 @@ class OccController extends Controller {
 		'check',
 		'config:list',
 		'maintenance:mode',
+		'integrity:check-core',
 		'status',
 		'upgrade'
 	];

From 3067040a30acea791fef5803969c544904247918 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 25 Oct 2016 20:42:14 +0200
Subject: [PATCH 157/219] Set version to 9.1.2RC2

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 8b037aeff973..78fd0ad41a0e 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 2, 3);
+$OC_Version = array(9, 1, 2, 4);
 
 // The human readable string
-$OC_VersionString = '9.1.2 RC1';
+$OC_VersionString = '9.1.2 RC2';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From ef33460a4d6375da7bfedacccf9ead157c529a1d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 2 Nov 2016 10:22:36 +0100
Subject: [PATCH 158/219] Hack to prevent warning for read-only wrapper in
 public links

Storage wrappers should normally always be registered inside a presetup
hook. However in the public link scenario this is not possible and
there is currently no good alternative with the current architecture.

Instead of logging a warning every time, this fix prevents the warning
to be shown but also adds a FIXME in the code for the future. This is
ok because this app is already using private/internal APIs at the
moment and should be reworked properly in the future.
---
 apps/dav/appinfo/v1/publicwebdav.php | 3 +++
 lib/private/Files/Filesystem.php     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/apps/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php
index 07004f43bd7f..4042a84eef36 100644
--- a/apps/dav/appinfo/v1/publicwebdav.php
+++ b/apps/dav/appinfo/v1/publicwebdav.php
@@ -68,9 +68,12 @@
 	$owner = $share->getShareOwner();
 	$fileId = $share->getNodeId();
 
+	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(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));
 	});
+	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 
 	OC_Util::setupFS($owner);
 	$ownerView = \OC\Files\Filesystem::getView();
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index 332071571a3e..22811181343a 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -212,10 +212,13 @@ class Filesystem {
 
 	/**
 	 * @param bool $shouldLog
+	 * @return bool previous value
 	 * @internal
 	 */
 	public static function logWarningWhenAddingStorageWrapper($shouldLog) {
+		$previousValue = self::$logWarningWhenAddingStorageWrapper;
 		self::$logWarningWhenAddingStorageWrapper = (bool) $shouldLog;
+		return $previousValue;
 	}
 
 	/**

From 900b804d0584987bbe54083fca2da7ec118c9275 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 2 Nov 2016 16:27:43 +0100
Subject: [PATCH 159/219] Skip broken shares when transferring ownership

---
 apps/files/lib/Command/TransferOwnership.php | 36 ++++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php
index 7f47b7a7a6d2..ba26902bf8f5 100644
--- a/apps/files/lib/Command/TransferOwnership.php
+++ b/apps/files/lib/Command/TransferOwnership.php
@@ -220,22 +220,28 @@ private function restoreShares(OutputInterface $output) {
 		$progress = new ProgressBar($output, count($this->shares));
 
 		foreach($this->shares as $share) {
-			if ($share->getSharedWith() === $this->destinationUser) {
-				// Unmount the shares before deleting, so we don't try to get the storage later on.
-				$shareMountPoint = $this->mountManager->find('/' . $this->destinationUser . '/files' . $share->getTarget());
-				if ($shareMountPoint) {
-					$this->mountManager->removeMount($shareMountPoint->getMountPoint());
-				}
-				$this->shareManager->deleteShare($share);
-			} else {
-				if ($share->getShareOwner() === $this->sourceUser) {
-					$share->setShareOwner($this->destinationUser);
-				}
-				if ($share->getSharedBy() === $this->sourceUser) {
-					$share->setSharedBy($this->destinationUser);
-				}
+			try {
+				if ($share->getSharedWith() === $this->destinationUser) {
+					// Unmount the shares before deleting, so we don't try to get the storage later on.
+					$shareMountPoint = $this->mountManager->find('/' . $this->destinationUser . '/files' . $share->getTarget());
+					if ($shareMountPoint) {
+						$this->mountManager->removeMount($shareMountPoint->getMountPoint());
+					}
+					$this->shareManager->deleteShare($share);
+				} else {
+					if ($share->getShareOwner() === $this->sourceUser) {
+						$share->setShareOwner($this->destinationUser);
+					}
+					if ($share->getSharedBy() === $this->sourceUser) {
+						$share->setSharedBy($this->destinationUser);
+					}
 
-				$this->shareManager->updateShare($share);
+					$this->shareManager->updateShare($share);
+				}
+			} catch (\OCP\Files\NotFoundException $e) {
+				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+			} catch (\Exception $e) {
+				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
 			}
 			$progress->advance();
 		}

From d47c589b0429eafa5add3a9ffc1c89f8ecccf9cc Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 8 Nov 2016 11:28:42 +0100
Subject: [PATCH 160/219] Set version to 9.1.2

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 78fd0ad41a0e..691b43dbf641 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 2, 4);
+$OC_Version = array(9, 1, 2, 5);
 
 // The human readable string
-$OC_VersionString = '9.1.2 RC2';
+$OC_VersionString = '9.1.2';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From dc0ea933aae9c0b4af1aaf0497d0936a4327f70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Thu, 10 Nov 2016 15:22:34 +0100
Subject: [PATCH 161/219] [stable9.1] We need to ensure that the app holding
 the objectstore implementation is loaded - fixes owncloud/objectstore#38
 (#26506)

---
 lib/private/legacy/util.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index afd14f626e24..65d35112806b 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -97,6 +97,11 @@ private static function initObjectStoreRootFS($config) {
 		}
 
 		// instantiate object store implementation
+		$name = $config['class'];
+		if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) {
+			$segments = explode('\\', $name);
+			OC_App::loadApp(strtolower($segments[1]));
+		}
 		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
 		// mount with plain / root object store implementation
 		$config['class'] = '\OC\Files\ObjectStore\ObjectStoreStorage';

From 7f1fbc8aab458fe8edb913d18cf59d689322aefb Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 10 Nov 2016 15:35:09 +0100
Subject: [PATCH 162/219] First process group shares and then user shares
 (#26568)

This prevents a validation failure where the code checks whether a file
is already shared with another user, but the check disables itself when
the owner is the same. Processing the groups first prevents the check
to kick in too early when the group share still has the old owner while
we try transferring the user share.
---
 apps/files/lib/Command/TransferOwnership.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php
index 7f47b7a7a6d2..11e719470e99 100644
--- a/apps/files/lib/Command/TransferOwnership.php
+++ b/apps/files/lib/Command/TransferOwnership.php
@@ -184,7 +184,7 @@ private function collectUsersShares(OutputInterface $output) {
 		$output->writeln("Collecting all share information for files and folder of $this->sourceUser ...");
 
 		$progress = new ProgressBar($output, count($this->shares));
-		foreach([\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE] as $shareType) {
+		foreach([\OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE] as $shareType) {
 		$offset = 0;
 			while (true) {
 				$sharePage = $this->shareManager->getSharesBy($this->sourceUser, $shareType, null, true, 50, $offset);

From 556eb1d29f242da29c53dc6b8ac573b66acf77e1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 10 Nov 2016 15:44:18 +0100
Subject: [PATCH 163/219] [stable9.1] Skip local shares in bkg scan and occ
 files:scan (#26590)

Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.
---
 lib/private/Files/Utils/Scanner.php   | 20 +++++++++++++++-----
 tests/lib/Files/Utils/ScannerTest.php | 20 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php
index 0fbe0967877c..21d567db5dbe 100644
--- a/lib/private/Files/Utils/Scanner.php
+++ b/lib/private/Files/Utils/Scanner.php
@@ -117,14 +117,19 @@ protected function attachListener($mount) {
 	public function backgroundScan($dir) {
 		$mounts = $this->getMounts($dir);
 		foreach ($mounts as $mount) {
-			if (is_null($mount->getStorage())) {
+			$storage = $mount->getStorage();
+			if (is_null($storage)) {
 				continue;
 			}
 			// don't scan the root storage
-			if ($mount->getStorage()->instanceOfStorage('\OC\Files\Storage\Local') && $mount->getMountPoint() === '/') {
+			if ($storage->instanceOfStorage('\OC\Files\Storage\Local') && $mount->getMountPoint() === '/') {
+				continue;
+			}
+
+			// don't scan received local shares, these can be scanned when scanning the owner's storage
+			if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
 				continue;
 			}
-			$storage = $mount->getStorage();
 			$scanner = $storage->getScanner();
 			$this->attachListener($mount);
 
@@ -155,10 +160,10 @@ public function scan($dir = '') {
 		}
 		$mounts = $this->getMounts($dir);
 		foreach ($mounts as $mount) {
-			if (is_null($mount->getStorage())) {
+			$storage = $mount->getStorage();
+			if (is_null($storage)) {
 				continue;
 			}
-			$storage = $mount->getStorage();
 			// if the home storage isn't writable then the scanner is run as the wrong user
 			if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
 				(!$storage->isCreatable('') or !$storage->isCreatable('files'))
@@ -170,6 +175,11 @@ public function scan($dir = '') {
 				}
 
 			}
+
+			// don't scan received local shares, these can be scanned when scanning the owner's storage
+			if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
+				continue;
+			}
 			$relativePath = $mount->getInternalPath($dir);
 			$scanner = $storage->getScanner();
 			$scanner->setUseTransactions(false);
diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php
index 0c8e41c24c7e..bcc115c6caa7 100644
--- a/tests/lib/Files/Utils/ScannerTest.php
+++ b/tests/lib/Files/Utils/ScannerTest.php
@@ -187,4 +187,24 @@ public function testPropagateEtag() {
 
 		$this->assertNotEquals($oldRoot->getEtag(), $newRoot->getEtag());
 	}
+
+	public function testSkipLocalShares() {
+		$sharedStorage = $this->getMock('OCA\Files_Sharing\SharedStorage');
+		$sharedMount = new MountPoint($sharedStorage, '/share');
+		Filesystem::getMountManager()->addMount($sharedMount);
+
+		$sharedStorage->expects($this->any())
+			->method('instanceOfStorage')
+			->will($this->returnValueMap([
+				['OCA\Files_Sharing\ISharedStorage', true],
+			]));
+		$sharedStorage->expects($this->never())
+			->method('getScanner');
+
+		$scanner = new TestScanner('', \OC::$server->getDatabaseConnection(), \OC::$server->getLogger());
+		$scanner->addMount($sharedMount);
+		$scanner->scan('');
+
+		$scanner->backgroundScan('');
+	}
 }

From 709d3247543e9b07399424ab2064e1302c2ce9c5 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 11 Nov 2016 10:16:38 +0100
Subject: [PATCH 164/219] Fixed disappearing of share info in file view
 (#26535)

---
 apps/files_sharing/js/share.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 07ec5f766a10..25cbbb019c2b 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -71,6 +71,12 @@
 				var fileInfo = oldElementToFile.apply(this, arguments);
 				fileInfo.sharePermissions = $el.attr('data-share-permissions') || undefined;
 				fileInfo.shareOwner = $el.attr('data-share-owner') || undefined;
+
+				if( $el.attr('data-share-types')){
+					var shareTypes = $el.attr('data-share-types').split(',');
+					fileInfo.shareTypes = shareTypes;
+				}
+
 				return fileInfo;
 			};
 
@@ -246,4 +252,3 @@
 })();
 
 OC.Plugins.register('OCA.Files.FileList', OCA.Sharing.Util);
-

From a2fdd6f2e4f515abf6c38a913b4c96b2a67cb850 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 11 Nov 2016 13:28:35 +0100
Subject: [PATCH 165/219] Allow file operations on part files on perm masked
 storage (#26606)

When uploading a file to a storage that has reduced permissions, we
still need to be able to create or rename the part files to the final
file. This fix makes that rename possible.
---
 .../Files/Storage/Wrapper/PermissionsMask.php | 13 +++++---
 .../Storage/Wrapper/PermissionsMaskTest.php   | 30 +++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php
index 466b0a80e1cd..af18e08d6290 100644
--- a/lib/private/Files/Storage/Wrapper/PermissionsMask.php
+++ b/lib/private/Files/Storage/Wrapper/PermissionsMask.php
@@ -76,8 +76,13 @@ public function getPermissions($path) {
 		return $this->storage->getPermissions($path) & $this->mask;
 	}
 
+	private function isPartFile($path) {
+		return pathinfo($path, PATHINFO_EXTENSION) === 'part';
+	}
+
 	public function rename($path1, $path2) {
-		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
+		// allow renaming part files
+		return ($this->isPartFile($path1) || $this->checkMask(Constants::PERMISSION_UPDATE)) && parent::rename($path1, $path2);
 	}
 
 	public function copy($path1, $path2) {
@@ -86,7 +91,7 @@ public function copy($path1, $path2) {
 
 	public function touch($path, $mtime = null) {
 		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-		return $this->checkMask($permissions) and parent::touch($path, $mtime);
+		return ($this->isPartFile($path) || $this->checkMask($permissions)) && parent::touch($path, $mtime);
 	}
 
 	public function mkdir($path) {
@@ -103,7 +108,7 @@ public function unlink($path) {
 
 	public function file_put_contents($path, $data) {
 		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-		return $this->checkMask($permissions) and parent::file_put_contents($path, $data);
+		return ($this->isPartFile($path) || $this->checkMask($permissions)) && parent::file_put_contents($path, $data);
 	}
 
 	public function fopen($path, $mode) {
@@ -111,7 +116,7 @@ public function fopen($path, $mode) {
 			return parent::fopen($path, $mode);
 		} else {
 			$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-			return $this->checkMask($permissions) ? parent::fopen($path, $mode) : false;
+			return ($this->isPartFile($path) || $this->checkMask($permissions)) ? parent::fopen($path, $mode) : false;
 		}
 	}
 
diff --git a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
index c3421553643b..8c1a94e270ef 100644
--- a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
+++ b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
@@ -102,4 +102,34 @@ public function testFopenNewFileNoCreate() {
 		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE);
 		$this->assertFalse($storage->fopen('foo', 'w'));
 	}
+
+	public function testRenameExistingFileNoUpdate() {
+		$this->sourceStorage->touch('foo');
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE);
+		$this->assertFalse($storage->rename('foo', 'bar'));
+		$this->assertTrue($storage->file_exists('foo'));
+		$this->assertFalse($storage->file_exists('bar'));
+	}
+
+	public function testRenamePartFileNoPerms() {
+		$this->sourceStorage->touch('foo.part');
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE - Constants::PERMISSION_CREATE);
+		$this->assertTrue($storage->rename('foo.part', 'bar'));
+		$this->assertFalse($storage->file_exists('foo.part'));
+		$this->assertTrue($storage->file_exists('bar'));
+	}
+
+	public function testFopenPartFileNoPerms() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE - Constants::PERMISSION_CREATE);
+		$res = $storage->fopen('foo.part', 'w');
+		fwrite($res, 'foo');
+		fclose($res);
+		$this->assertTrue($storage->file_exists('foo.part'));
+	}
+
+	public function testFilePutContentsPartFileNoPerms() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE - Constants::PERMISSION_CREATE);
+		$this->assertEquals(3, $storage->file_put_contents('foo.part', 'bar'));
+		$this->assertTrue($storage->file_exists('foo.part'));
+	}
 }

From aefbe29971fc68ba1251466c97f5ea2306fcde44 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 11 Nov 2016 13:29:00 +0100
Subject: [PATCH 166/219] Transfer ownership only analyze home storage (#26566)

When transferring ownership, only the local files will be transferred
during the rename operation. This means that the analyzing code doesn't
need to recurse into any mount points.

Furthermore this fixes issues where FailedStorage might appear as mount
points as a result of inaccessible external storages or shares. So this
makes it more robust.
---
 apps/files/lib/Command/TransferOwnership.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php
index 60f79fc23338..185b66f9d33f 100644
--- a/apps/files/lib/Command/TransferOwnership.php
+++ b/apps/files/lib/Command/TransferOwnership.php
@@ -153,6 +153,11 @@ protected function analyse(OutputInterface $output) {
 		$this->walkFiles($view, "$this->sourceUser/files",
 				function (FileInfo $fileInfo) use ($progress, $self) {
 					if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
+						// only analyze into folders from main storage,
+						// sub-storages have an empty internal path
+						if ($fileInfo->getInternalPath() === '' && $fileInfo->getPath() !== '') {
+							return false;
+						}
 						return true;
 					}
 					$progress->advance();

From fa7f9a191e5921da76f822a6a92ef723cc0cf7f5 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 7 Nov 2016 12:25:05 +0100
Subject: [PATCH 167/219] Add repair step to fix file share permissions

---
 lib/private/Repair/RepairInvalidShares.php   | 33 ++++++++++
 tests/lib/Repair/RepairInvalidSharesTest.php | 67 ++++++++++++++++++++
 version.php                                  |  2 +-
 3 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/lib/private/Repair/RepairInvalidShares.php b/lib/private/Repair/RepairInvalidShares.php
index 728632486d01..4f7ca2699e28 100644
--- a/lib/private/Repair/RepairInvalidShares.php
+++ b/lib/private/Repair/RepairInvalidShares.php
@@ -26,6 +26,7 @@
 
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
+use Doctrine\DBAL\Platforms\OraclePlatform;
 
 /**
  * Repairs shares with invalid data
@@ -90,6 +91,35 @@ private function addShareLinkDeletePermission(IOutput $out) {
 		}
 	}
 
+	/**
+	 * Adjust file share permissions
+	 */
+	private function adjustFileSharePermissions(IOutput $out) {
+		$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
+		$builder = $this->connection->getQueryBuilder();
+
+
+		if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
+			$permsFunc = $builder->createFunction(
+				'bitand(' . $builder->getColumnName('permissions') . ', ' . $mask . ')'
+			);
+		} else {
+			$permsFunc = $builder->createFunction(
+				'(' . $builder->getColumnName('permissions') . ' & ' . $mask . ')'
+			);
+		}
+		$builder
+			->update('share')
+			->set('permissions', $permsFunc)
+			->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
+			->andWhere($builder->expr()->neq('permissions', $permsFunc));
+
+		$updatedEntries = $builder->execute();
+		if ($updatedEntries > 0) {
+			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+		}
+	}
+
 	/**
 	 * Remove shares where the parent share does not exist anymore
 	 */
@@ -136,6 +166,9 @@ public function run(IOutput $out) {
 			// this situation was only possible before 9.1
 			$this->addShareLinkDeletePermission($out);
 		}
+		if (version_compare($ocVersionFromBeforeUpdate, '9.1.2.6', '<')) {
+			$this->adjustFileSharePermissions($out);
+		}
 
 		$this->removeSharesNonExistingParent($out);
 	}
diff --git a/tests/lib/Repair/RepairInvalidSharesTest.php b/tests/lib/Repair/RepairInvalidSharesTest.php
index 1ac42e53bf6a..83dbed7d2021 100644
--- a/tests/lib/Repair/RepairInvalidSharesTest.php
+++ b/tests/lib/Repair/RepairInvalidSharesTest.php
@@ -278,6 +278,73 @@ public function testSharesNonExistingParent() {
 		$result->closeCursor();
 	}
 
+	public function fileSharePermissionsProvider() {
+		return [
+			// unchanged for folder
+			[
+				'folder',
+				31,
+				31,
+			],
+			// unchanged for read-write + share
+			[
+				'file',
+				\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE,
+				\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE,
+			],
+			// fixed for all perms
+			[
+				'file',
+				\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_SHARE,
+				\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE,
+			],
+		];
+	}
+
+	/**
+	 * Test adjusting file share permissions
+	 *
+	 * @dataProvider fileSharePermissionsProvider
+	 */
+	public function testFileSharePermissions($itemType, $testPerms, $expectedPerms) {
+		$qb = $this->connection->getQueryBuilder();
+		$qb->insert('share')
+			->values([
+				'share_type' => $qb->expr()->literal(Constants::SHARE_TYPE_LINK),
+				'uid_owner' => $qb->expr()->literal('user1'),
+				'item_type' => $qb->expr()->literal($itemType),
+				'item_source' => $qb->expr()->literal(123),
+				'item_target' => $qb->expr()->literal('/123'),
+				'file_source' => $qb->expr()->literal(123),
+				'file_target' => $qb->expr()->literal('/test'),
+				'permissions' => $qb->expr()->literal($testPerms),
+				'stime' => $qb->expr()->literal(time()),
+			])
+			->execute();
+
+		$shareId = $this->getLastShareId();
+
+		/** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */
+		$outputMock = $this->getMockBuilder('\OCP\Migration\IOutput')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->repair->run($outputMock);
+
+		$results = $this->connection->getQueryBuilder()
+			->select('*')
+			->from('share')
+			->orderBy('permissions', 'ASC')
+			->execute()
+			->fetchAll();
+
+		$this->assertCount(1, $results);
+
+		$updatedShare = $results[0];
+
+		$this->assertEquals($expectedPerms, $updatedShare['permissions']);
+	}
+
 	/**
 	 * @return int
 	 */
diff --git a/version.php b/version.php
index 691b43dbf641..9b4a027adcc3 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 2, 5);
+$OC_Version = array(9, 1, 2, 6);
 
 // The human readable string
 $OC_VersionString = '9.1.2';

From 1ec9796a236dd3d3953700731062ef0d70425f72 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Nov 2016 09:39:06 +0100
Subject: [PATCH 168/219] [stable9.1] Fallback to share link owner when no
 owner found (#26587)

When creating link shares from external storage, the filesystem cannot
find an owner in some scenarios (ex: system-wide mounts). In such
cases, fall back to using the current user's trashbin which happens to
also be the user who created the link share.

Fixes an issue where this scenario made deletion impossible due to
missing user information.
---
 apps/files_trashbin/lib/Trashbin.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index 6dfd71fd8c78..64aae584a285 100644
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -87,6 +87,10 @@ public static function getUidAndFilename($filename) {
 		if (!$userManager->userExists($uid)) {
 			$uid = User::getUser();
 		}
+		if (!$uid) {
+			// no owner, usually because of share link from ext storage
+			return [null, null];
+		}
 		Filesystem::initMountPoints($uid);
 		if ($uid != User::getUser()) {
 			$info = Filesystem::getFileInfo($filename);
@@ -203,6 +207,12 @@ public static function move2trash($file_path) {
 		list(, $user) = explode('/', $root);
 		list($owner, $ownerPath) = self::getUidAndFilename($file_path);
 
+		// if no owner found (ex: ext storage + share link), will use the current user's trashbin then
+		if (is_null($owner)) {
+			$owner = $user;
+			$ownerPath = $file_path;
+		}
+
 		$ownerView = new View('/' . $owner);
 		// file has been deleted in between
 		if (is_null($ownerPath) || $ownerPath === '' || !$ownerView->file_exists('/files/' . $ownerPath)) {

From 66bc5b538a9dd3bc132d71d323633258ed785aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 14 Nov 2016 13:46:21 +0100
Subject: [PATCH 169/219] behat will only only pass if all tests pass

---
 build/integration/run.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/integration/run.sh b/build/integration/run.sh
index ec3b1bfd63c7..ab8ea8ba2f94 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -34,7 +34,7 @@ ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}`
 
 ../../occ files_external:option $ID_STORAGE enable_sharing true
 
-vendor/bin/behat -f junit -f pretty $SCENARIO_TO_RUN
+vendor/bin/behat --strict -f junit -f pretty $SCENARIO_TO_RUN
 RESULT=$?
 
 kill $PHPPID
@@ -49,5 +49,6 @@ if [ -z $HIDE_OC_LOGS ]; then
 	tail "../../data/owncloud.log"
 fi
 
+echo "runsh: Exit code: $RESULT"
 exit $RESULT
 

From c6b2a43bec04012e86d5409902bfef29b6e1d1d1 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Mon, 26 Sep 2016 10:44:14 +0000
Subject: [PATCH 170/219] Added test checking quota after usage

Conflicts:
	build/integration/features/bootstrap/BasicStructure.php
---
 .../features/bootstrap/BasicStructure.php       | 17 +++++++++++++++++
 build/integration/features/bootstrap/WebDav.php | 14 ++++++++++++++
 .../integration/features/webdav-related.feature | 10 ++++++++++
 3 files changed, 41 insertions(+)

diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 76ac7a81e3cf..d81e21e8097b 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -301,6 +301,23 @@ public function modifyTextOfFile($user, $filename, $text) {
 		file_put_contents("../../data/$user/files" . "$filename", "$text");
 	}
 
+	/**
+	 * @When User :user empties trashbin
+	 * @param string $user
+	 */
+	public function emptyTrashbin($user) {
+		$body = new \Behat\Gherkin\Node\TableNode([['allfiles', 'true'], ['dir', '%2F']]);
+		$this->sendingToWithDirectUrl('POST', "/index.php/apps/files_trashbin/ajax/delete.php", $body);
+		$this->theHTTPStatusCodeShouldBe('200');
+	}
+
+	public function createFileSpecificSize($user, $name, $size){
+		$file = fopen("data/" . "$name", 'w');
+		fseek($file, $size - 1 ,SEEK_CUR);
+		fwrite($file,'a'); // write a dummy char at SIZE position
+		fclose($file);
+	}
+
 	/**
 	 * @BeforeSuite
 	 */
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index a63b752a0151..9a8287a9ba6d 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -400,6 +400,20 @@ public function userUploadsAFileTo($user, $source, $destination)
 		}
 	}
 
+	/**
+	 * @When User :user adds a file of :bytes bytes to :destination
+	 * @param string $user
+	 * @param string $bytes
+	 * @param string $destination
+	 */
+	public function userAddsAFileTo($user, $bytes, $destination){
+		$filename = "filespecificSize.txt";
+		$this->createFileSpecificSize($user, $filename, $bytes);
+		PHPUnit_Framework_Assert::assertEquals(1, file_exists("data/$filename"));
+		$this->userUploadsAFileTo($user, "data/$filename", $destination);
+		$this->removeFile("data/", $filename);
+	}
+
 	/**
 	 * @When User :user uploads file with content :content to :destination
 	 */
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index 5ab4d0a08a48..4315849ef9f3 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -178,6 +178,16 @@ Feature: webdav-related
 		When User "user0" uploads file "data/textfile.txt" to "/testquota/asdf.txt"
 		Then the HTTP status code should be "201"
 
+	Scenario: Retrieving folder quota when quota is set and a file was uploaded
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user0" has a quota of "1 KB"
+		And user "user0" adds a file of 93 bytes to "/prueba.txt"
+		When as "user0" gets properties of folder "/" with
+		  |{DAV:}quota-available-bytes|
+		Then the single response should contain a property "{DAV:}quota-available-bytes" with value "600"
+
 	Scenario: download a public shared file with range
 		Given user "user0" exists
 		And As an "user0"

From 94a27b988908b94b85aa55f48dec63a152ff3c5b Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Mon, 26 Sep 2016 12:10:24 +0000
Subject: [PATCH 171/219] Added quota calculation test when a file is recieved

---
 .../features/bootstrap/BasicStructure.php            |  2 +-
 build/integration/features/bootstrap/WebDav.php      |  3 ++-
 build/integration/features/webdav-related.feature    | 12 ++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index d81e21e8097b..5b245f33e230 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -311,7 +311,7 @@ public function emptyTrashbin($user) {
 		$this->theHTTPStatusCodeShouldBe('200');
 	}
 
-	public function createFileSpecificSize($user, $name, $size){
+	public function createFileSpecificSize($name, $size){
 		$file = fopen("data/" . "$name", 'w');
 		fseek($file, $size - 1 ,SEEK_CUR);
 		fwrite($file,'a'); // write a dummy char at SIZE position
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 9a8287a9ba6d..ffaea67d2003 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -408,10 +408,11 @@ public function userUploadsAFileTo($user, $source, $destination)
 	 */
 	public function userAddsAFileTo($user, $bytes, $destination){
 		$filename = "filespecificSize.txt";
-		$this->createFileSpecificSize($user, $filename, $bytes);
+		$this->createFileSpecificSize($filename, $bytes);
 		PHPUnit_Framework_Assert::assertEquals(1, file_exists("data/$filename"));
 		$this->userUploadsAFileTo($user, "data/$filename", $destination);
 		$this->removeFile("data/", $filename);
+		PHPUnit_Framework_Assert::assertEquals(1, file_exists("../../data/$user/files$destination"));
 	}
 
 	/**
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index 4315849ef9f3..b870b026576c 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -188,6 +188,18 @@ Feature: webdav-related
 		  |{DAV:}quota-available-bytes|
 		Then the single response should contain a property "{DAV:}quota-available-bytes" with value "600"
 
+	Scenario: Retrieving folder quota when quota is set and a file was recieved
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user1" exists
+		And user "user1" has a quota of "1 KB"
+		And user "user0" adds a file of 93 bytes to "/user0.txt"
+		And file "user0.txt" of user "user0" is shared with user "user1"
+		When as "user1" gets properties of folder "/" with
+		  |{DAV:}quota-available-bytes|
+		Then the single response should contain a property "{DAV:}quota-available-bytes" with value "693"
+
 	Scenario: download a public shared file with range
 		Given user "user0" exists
 		And As an "user0"

From 3c24afe241135d85cf870d1ba732e675dd9c4a28 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 27 Sep 2016 11:09:55 +0000
Subject: [PATCH 172/219] Adapted favorites and dav2 features

Conflicts:
	build/integration/features/bootstrap/WebDav.php
	build/integration/features/favorites.feature
---
 .../integration/features/bootstrap/WebDav.php | 57 +++++++++++++++----
 build/integration/features/dav-v2.feature     | 20 +++----
 build/integration/features/favorites.feature  | 45 +++++++++++++--
 3 files changed, 97 insertions(+), 25 deletions(-)

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index ffaea67d2003..5c1b9699ab54 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -12,6 +12,8 @@ trait WebDav {
 
 	/** @var string*/
 	private $davPath = "remote.php/webdav";
+	/** @var boolean*/
+	private $usingOldDavPath = true;
 	/** @var ResponseInterface */
 	private $response;
 
@@ -22,7 +24,39 @@ public function usingDavPath($davPath) {
 		$this->davPath = $davPath;
 	}
 
-	public function getFilesPath(){
+	/**
+	 * @Given /^using old dav path$/
+	 */
+	public function usingOldDavPath() {
+		$this->davPath = "remote.php/webdav";
+		$this->usingOldDavPath = true;
+	}
+
+	/**
+	 * @Given /^using new dav path$/
+	 */
+	public function usingNewDavPath() {
+		$this->davPath = "remote.php/dav";
+		$this->usingOldDavPath = false;
+	}
+
+	/*public function getDavFilesPath($user){
+		if ($this->usingOldDavPath === true){
+			return $this->davPath . '/';
+		} else {
+			return $this->davPath . '/files/' . $user . '/';
+		}
+	}*/
+
+	public function getDavFilesPath($user){
+		if ($this->usingOldDavPath === true){
+			return $this->davPath;
+		} else {
+			return $this->davPath . '/files/' . $user;
+		}
+	}
+
+	public function getFilesPath($user){
 		$basePath = '';
 		if ($this->davPath === "remote.php/dav"){
 			$basePath = '/files/' . $this->currentUser . '/';
@@ -33,7 +67,7 @@ public function getFilesPath(){
 	}
 
 	public function makeDavRequest($user, $method, $path, $headers, $body = null){
-		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath . "$path";
+		$fullUrl = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user) . "$path";
 		$client = new GClient();
 		$options = [];
 		if ($user === 'admin') {
@@ -62,7 +96,7 @@ public function makeDavRequest($user, $method, $path, $headers, $body = null){
 	 * @param string $fileDestination
 	 */
 	public function userMovedFile($user, $entry, $fileSource, $fileDestination){
-		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
+		$fullUrl = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user);
 		$headers['Destination'] = $fullUrl . $fileDestination;
 		$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
 		PHPUnit_Framework_Assert::assertEquals(201, $this->response->getStatusCode());
@@ -75,7 +109,7 @@ public function userMovedFile($user, $entry, $fileSource, $fileDestination){
 	 * @param string $fileDestination
 	 */
 	public function userMovesFile($user, $entry, $fileSource, $fileDestination){
-		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
+		$fullUrl = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user);
 		$headers['Destination'] = $fullUrl . $fileDestination;
 		try {
 			$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
@@ -91,7 +125,7 @@ public function userMovesFile($user, $entry, $fileSource, $fileDestination){
 	 * @param string $fileDestination
 	 */
 	public function userCopiesFile($user, $fileSource, $fileDestination){
-		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
+		$fullUrl = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user);
 		$headers['Destination'] = $fullUrl . $fileDestination;
 		try {
 			$this->response = $this->makeDavRequest($user, "COPY", $fileSource, $headers);
@@ -343,8 +377,9 @@ public function listFolder($user, $path, $folderDepth, $properties = null){
 		return $response;
 	}
 
-	public function makeSabrePath($path) {
-		return $this->encodePath($this->davPath . '/' . ltrim($path, '/'));
+
+	public function makeSabrePath($user, $path) {
+		return $this->encodePath($this->getDavFilesPath($user));
 	}
 
 	public function getSabreClient($user) {
@@ -375,7 +410,7 @@ public function checkElementList($user, $expectedElements){
 			$elementRows = $expectedElements->getRows();
 			$elementsSimplified = $this->simplifyArray($elementRows);
 			foreach($elementsSimplified as $expectedElement) {
-				$webdavPath = "/" . $this->davPath . $expectedElement;
+				$webdavPath = "/" . $this->getDavFilesPath($user) . $expectedElement;
 				if (!array_key_exists($webdavPath,$elementList)){
 					PHPUnit_Framework_Assert::fail("$webdavPath" . " is not in propfind answer");
 				}
@@ -450,7 +485,7 @@ public function userDeletesFile($user, $file)  {
 	 */
 	public function userCreatedAFolder($user, $destination){
 		try {
-			$this->response = $this->makeDavRequest($user, "MKCOL", $this->getFilesPath() . ltrim($destination, $this->getFilesPath()), []);
+			$this->response = $this->makeDavRequest($user, "MKCOL", $destination, []);
 		} catch (\GuzzleHttp\Exception\ServerException $e) {
 			// 4xx and 5xx responses cause an exception
 			$this->response = $e->getResponse();
@@ -498,7 +533,7 @@ public function userUploadsNewChunkFileOfWithToId($user, $num, $data, $id)
 	public function userMovesNewChunkFileWithIdToMychunkedfile($user, $id, $dest)
 	{
 		$source = '/uploads/'.$user.'/'.$id.'/.file';
-		$destination = substr($this->baseUrl, 0, -4) . $this->davPath . '/files/'.$user.$dest;
+		$destination = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user) . $dest;
 		$this->makeDavRequest($user, 'MOVE', $source, [
 			'Destination' => $destination
 		]);
@@ -560,7 +595,7 @@ public function changeFavStateOfAnElement($user, $path, $favOrUnfav, $folderDept
 			];
 		}
 
-		$response = $client->proppatch($this->davPath . '/' . ltrim($path, '/'), $properties, $folderDepth);
+		$response = $client->proppatch($this->getDavFilesPath($user), $properties, $folderDepth);
 		return $response;
 	}
 
diff --git a/build/integration/features/dav-v2.feature b/build/integration/features/dav-v2.feature
index a57b7f26c436..ab5c6e46306f 100644
--- a/build/integration/features/dav-v2.feature
+++ b/build/integration/features/dav-v2.feature
@@ -3,24 +3,24 @@ Feature: dav-v2
 		Given using api version "1"
 
 	Scenario: moving a file new endpoint way
-		Given using dav path "remote.php/dav"
+		Given using new dav path
 		And As an "admin"
 		And user "user0" exists
-		When User "user0" moves file "/files/user0/textfile0.txt" to "/files/user0/FOLDER/textfile0.txt"
+		When User "user0" moves file "/textfile0.txt" to "/FOLDER/textfile0.txt"
 		Then the HTTP status code should be "201"
 
 	Scenario: download a file with range using new endpoint
-		Given using dav path "remote.php/dav"
+		Given using new dav path
 		And As an "admin"
 		And user "user0" exists
 		And As an "user0"
-		When Downloading file "/files/user0/welcome.txt" with range "bytes=51-77"
+		When Downloading file "/welcome.txt" with range "bytes=51-77"
 		Then Downloaded content should be "example file for developers"
 
 	Scenario: Downloading a file on the new endpoint should serve security headers
-		Given using dav path "remote.php/dav/files/admin/"
+		Given using new dav path
 		And As an "admin"
-		When Downloading file "welcome.txt"
+		When Downloading file "/welcome.txt"
 		Then The following headers should be set
 			|Content-Disposition|attachment; filename*=UTF-8''welcome.txt; filename="welcome.txt"|
 			|Content-Security-Policy|default-src 'none';|
@@ -55,16 +55,16 @@ Feature: dav-v2
 		Then the HTTP status code should be "207"
 
 	Scenario: Uploading a file having 0B as quota
-		Given using dav path "remote.php/dav"
+		Given using new dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user0" has a quota of "0 B"
 		And As an "user0"
-		When User "user0" uploads file "data/textfile.txt" to "/files/user0/asdf.txt"
+		When User "user0" uploads file "data/textfile.txt" to "/asdf.txt"
 		Then the HTTP status code should be "507"
 
 	Scenario: Uploading a file as recipient using webdav new endpoint having quota
-		Given using dav path "remote.php/dav"
+		Given using new dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user1" exists
@@ -78,5 +78,5 @@ Feature: dav-v2
 		  | permissions | 31 |
 		  | shareWith | user0 |
 		And As an "user0"
-		When User "user0" uploads file "data/textfile.txt" to "/files/user0/testquota/asdf.txt"
+		When User "user0" uploads file "data/textfile.txt" to "/testquota/asdf.txt"
 		Then the HTTP status code should be "201"
diff --git a/build/integration/features/favorites.feature b/build/integration/features/favorites.feature
index 86643fdd1e29..550ae31c2f14 100644
--- a/build/integration/features/favorites.feature
+++ b/build/integration/features/favorites.feature
@@ -3,7 +3,7 @@ Feature: favorite
         Given using api version "1"
 
     Scenario: Favorite a folder
-        Given using dav path "remote.php/webdav"
+        Given using old dav path
         And As an "admin"
         And user "user0" exists
         When user "user0" favorites element "/FOLDER"
@@ -12,7 +12,7 @@ Feature: favorite
         And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "1"
 
     Scenario: Favorite and unfavorite a folder
-        Given using dav path "remote.php/webdav"
+        Given using old dav path
         And As an "admin"
         And user "user0" exists
         When user "user0" favorites element "/FOLDER"
@@ -22,7 +22,7 @@ Feature: favorite
         And the single response should contain a property "{http://owncloud.org/ns}favorite" with value ""
 
     Scenario: Favorite a file
-        Given using dav path "remote.php/webdav"
+        Given using old dav path
         And As an "admin"
         And user "user0" exists
         When user "user0" favorites element "/textfile0.txt"
@@ -31,7 +31,7 @@ Feature: favorite
         And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "1"
 
     Scenario: Favorite and unfavorite a file
-        Given using dav path "remote.php/webdav"
+        Given using old dav path
         And As an "admin"
         And user "user0" exists
         When user "user0" favorites element "/textfile0.txt"
@@ -40,3 +40,40 @@ Feature: favorite
             |{http://owncloud.org/ns}favorite|
         And the single response should contain a property "{http://owncloud.org/ns}favorite" with value ""
 
+    Scenario: Favorite a folder new endpoint
+        Given using new dav path
+        And As an "admin"
+        And user "user0" exists
+        When user "user0" favorites element "/FOLDER"
+        Then as "user0" gets properties of folder "/FOLDER" with
+            |{http://owncloud.org/ns}favorite|
+        And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "1"
+
+    Scenario: Favorite and unfavorite a folder new endpoint
+        Given using new dav path
+        And As an "admin"
+        And user "user0" exists
+        When user "user0" favorites element "/FOLDER"
+        And user "user0" unfavorites element "/FOLDER"
+        Then as "user0" gets properties of folder "/FOLDER" with
+            |{http://owncloud.org/ns}favorite|
+        And the single response should contain a property "{http://owncloud.org/ns}favorite" with value ""
+
+    Scenario: Favorite a file new endpoint
+        Given using new dav path
+        And As an "admin"
+        And user "user0" exists
+        When user "user0" favorites element "/textfile0.txt"
+        Then as "user0" gets properties of file "/textfile0.txt" with
+            |{http://owncloud.org/ns}favorite|
+        And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "1"
+
+    Scenario: Favorite and unfavorite a file new endpoint
+        Given using new dav path
+        And As an "admin"
+        And user "user0" exists
+        When user "user0" favorites element "/textfile0.txt"
+        And user "user0" unfavorites element "/textfile0.txt"
+        Then as "user0" gets properties of file "/textfile0.txt" with
+            |{http://owncloud.org/ns}favorite|
+        And the single response should contain a property "{http://owncloud.org/ns}favorite" with value ""

From b45e2677b1fdb39de60af9df2d26d4e68995beb5 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 27 Sep 2016 12:39:50 +0000
Subject: [PATCH 173/219] Adapted sharing and external features, random
 failures in sharing:857

Conflicts:
	build/integration/features/sharing-v1.feature
---
 .../integration/features/bootstrap/WebDav.php |  15 +-
 .../features/external-storage.feature         |   2 +-
 build/integration/features/sharing-v1.feature | 131 ++++++++++--------
 3 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 5c1b9699ab54..2991bbb7d7b4 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -254,12 +254,12 @@ public function downloadedContentShouldStartWith($start) {
 	}
 
 	/**
-	 * @Then /^as "([^"]*)" gets properties of folder "([^"]*)" with$/
+	 * @Then /^as "([^"]*)" gets properties of (file|folder|entry) "([^"]*)" with$/
 	 * @param string $user
 	 * @param string $path
 	 * @param \Behat\Gherkin\Node\TableNode|null $propertiesTable
 	 */
-	public function asGetsPropertiesOfFolderWith($user, $path, $propertiesTable) {
+	public function asGetsPropertiesOfFolderWith($user, $elementType, $path, $propertiesTable) {
 		$properties = null;
 		if ($propertiesTable instanceof \Behat\Gherkin\Node\TableNode) {
 			foreach ($propertiesTable->getRows() as $row) {
@@ -379,7 +379,7 @@ public function listFolder($user, $path, $folderDepth, $properties = null){
 
 
 	public function makeSabrePath($user, $path) {
-		return $this->encodePath($this->getDavFilesPath($user));
+		return $this->encodePath($this->getDavFilesPath($user) . $path);
 	}
 
 	public function getSabreClient($user) {
@@ -599,13 +599,4 @@ public function changeFavStateOfAnElement($user, $path, $favOrUnfav, $folderDept
 		return $response;
 	}
 
-	/**
-	 * @Then /^as "([^"]*)" gets properties of file "([^"]*)" with$/
-	 * @param string $user
-	 * @param string $path
-	 * @param \Behat\Gherkin\Node\TableNode|null $propertiesTable
-	 */
-	public function asGetsPropertiesOfFileWith($user, $path, $propertiesTable) {
-		$this->asGetsPropertiesOfFolderWith($user, $path, $propertiesTable);
-	}
 }
diff --git a/build/integration/features/external-storage.feature b/build/integration/features/external-storage.feature
index 9e53b01346ef..7fbdf828fb88 100644
--- a/build/integration/features/external-storage.feature
+++ b/build/integration/features/external-storage.feature
@@ -1,7 +1,7 @@
 Feature: external-storage
   Background:
     Given using api version "1"
-    Given using dav path "remote.php/webdav"
+    Given using old dav path
 
   @local_storage
   Scenario: Share by link a file inside a local external storage
diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index c5609d643f47..2fce00998fda 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -1,7 +1,7 @@
 Feature: sharing
   Background:
     Given using api version "1"
-    Given using dav path "remote.php/webdav"
+    Given using old dav path
 
   Scenario: Creating a new share with user
     Given user "user0" exists
@@ -548,7 +548,7 @@ Feature: sharing
       | /myFOLDER/myTMP/ |
 
   Scenario: Check quota of owners parent directory of a shared file
-    Given using dav path "remote.php/webdav"
+    Given using old dav path
     And As an "admin"
     And user "user0" exists
     And user "user1" exists
@@ -622,7 +622,7 @@ Feature: sharing
     Given user "user0" exists
     And user "user1" exists
     And User "user0" uploads file with content "foo" to "/tmp.txt"
-    And file "tmp.txt" of user "user0" is shared with user "user1"
+    And file "/tmp.txt" of user "user0" is shared with user "user1"
     When as "user1" gets properties of folder "/tmp.txt" with
       |{http://open-collaboration-services.org/ns}share-permissions |
     Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "19"
@@ -741,16 +741,17 @@ Feature: sharing
     And the HTTP status code should be "401"
 
   Scenario: Merging shares for recipient when shared from outside with group and member
-    Given As an "admin"
+    Given using old dav path
+    And As an "admin"
     And user "user0" exists
     And user "user1" exists
     And group "group1" exists
     And user "user1" belongs to group "group1"
-    And user "user0" created a folder "merge-test-outside"
-    When folder "merge-test-outside" of user "user0" is shared with group "group1"
-    And folder "merge-test-outside" of user "user0" is shared with user "user1"
-    Then as "user1" the folder "merge-test-outside" exists
-    And as "user1" the folder "merge-test-outside (2)" does not exist
+    And user "user0" created a folder "/merge-test-outside"
+    When folder "/merge-test-outside" of user "user0" is shared with group "group1"
+    And folder "/merge-test-outside" of user "user0" is shared with user "user1"
+    Then as "user1" the folder "/merge-test-outside" exists
+    And as "user1" the folder "/merge-test-outside (2)" does not exist
 
   Scenario: Merging shares for recipient when shared from outside with group and member with different permissions
     Given As an "admin"
@@ -758,13 +759,13 @@ Feature: sharing
     And user "user1" exists
     And group "group1" exists
     And user "user1" belongs to group "group1"
-    And user "user0" created a folder "merge-test-outside-perms"
-    When folder "merge-test-outside-perms" of user "user0" is shared with group "group1" with permissions 1
-    And folder "merge-test-outside-perms" of user "user0" is shared with user "user1" with permissions 31
-    Then as "user1" gets properties of folder "merge-test-outside-perms" with
+    And user "user0" created a folder "/merge-test-outside-perms"
+    When folder "/merge-test-outside-perms" of user "user0" is shared with group "group1" with permissions 1
+    And folder "/merge-test-outside-perms" of user "user0" is shared with user "user1" with permissions 31
+    Then as "user1" gets properties of folder "/merge-test-outside-perms" with
         |{http://owncloud.org/ns}permissions|
     And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
-    And as "user1" the folder "merge-test-outside-perms (2)" does not exist
+    And as "user1" the folder "/merge-test-outside-perms (2)" does not exist
 
   Scenario: Merging shares for recipient when shared from outside with two groups
     Given As an "admin"
@@ -774,11 +775,11 @@ Feature: sharing
     And group "group2" exists
     And user "user1" belongs to group "group1"
     And user "user1" belongs to group "group2"
-    And user "user0" created a folder "merge-test-outside-twogroups"
-    When folder "merge-test-outside-twogroups" of user "user0" is shared with group "group1"
-    And folder "merge-test-outside-twogroups" of user "user0" is shared with group "group2"
-    Then as "user1" the folder "merge-test-outside-twogroups" exists
-    And as "user1" the folder "merge-test-outside-twogroups (2)" does not exist
+    And user "user0" created a folder "/merge-test-outside-twogroups"
+    When folder "/merge-test-outside-twogroups" of user "user0" is shared with group "group1"
+    And folder "/merge-test-outside-twogroups" of user "user0" is shared with group "group2"
+    Then as "user1" the folder "/merge-test-outside-twogroups" exists
+    And as "user1" the folder "/merge-test-outside-twogroups (2)" does not exist
 
   Scenario: Merging shares for recipient when shared from outside with two groups with different permissions
     Given As an "admin"
@@ -788,13 +789,13 @@ Feature: sharing
     And group "group2" exists
     And user "user1" belongs to group "group1"
     And user "user1" belongs to group "group2"
-    And user "user0" created a folder "merge-test-outside-twogroups-perms"
-    When folder "merge-test-outside-twogroups-perms" of user "user0" is shared with group "group1" with permissions 1
-    And folder "merge-test-outside-twogroups-perms" of user "user0" is shared with group "group2" with permissions 31
-    Then as "user1" gets properties of folder "merge-test-outside-twogroups-perms" with
+    And user "user0" created a folder "/merge-test-outside-twogroups-perms"
+    When folder "/merge-test-outside-twogroups-perms" of user "user0" is shared with group "group1" with permissions 1
+    And folder "/merge-test-outside-twogroups-perms" of user "user0" is shared with group "group2" with permissions 31
+    Then as "user1" gets properties of folder "/merge-test-outside-twogroups-perms" with
         |{http://owncloud.org/ns}permissions|
     And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
-    And as "user1" the folder "merge-test-outside-twogroups-perms (2)" does not exist
+    And as "user1" the folder "/merge-test-outside-twogroups-perms (2)" does not exist
 
   Scenario: Merging shares for recipient when shared from outside with two groups and member
     Given As an "admin"
@@ -804,24 +805,24 @@ Feature: sharing
     And group "group2" exists
     And user "user1" belongs to group "group1"
     And user "user1" belongs to group "group2"
-    And user "user0" created a folder "merge-test-outside-twogroups-member-perms"
-    When folder "merge-test-outside-twogroups-member-perms" of user "user0" is shared with group "group1" with permissions 1
-    And folder "merge-test-outside-twogroups-member-perms" of user "user0" is shared with group "group2" with permissions 31
-    And folder "merge-test-outside-twogroups-member-perms" of user "user0" is shared with user "user1" with permissions 1
-    Then as "user1" gets properties of folder "merge-test-outside-twogroups-member-perms" with
+    And user "user0" created a folder "/merge-test-outside-twogroups-member-perms"
+    When folder "/merge-test-outside-twogroups-member-perms" of user "user0" is shared with group "group1" with permissions 1
+    And folder "/merge-test-outside-twogroups-member-perms" of user "user0" is shared with group "group2" with permissions 31
+    And folder "/merge-test-outside-twogroups-member-perms" of user "user0" is shared with user "user1" with permissions 1
+    Then as "user1" gets properties of folder "/merge-test-outside-twogroups-member-perms" with
         |{http://owncloud.org/ns}permissions|
     And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
-    And as "user1" the folder "merge-test-outside-twogroups-member-perms (2)" does not exist
+    And as "user1" the folder "/merge-test-outside-twogroups-member-perms (2)" does not exist
 
   Scenario: Merging shares for recipient when shared from inside with group
     Given As an "admin"
     And user "user0" exists
     And group "group1" exists
     And user "user0" belongs to group "group1"
-    And user "user0" created a folder "merge-test-inside-group"
+    And user "user0" created a folder "/merge-test-inside-group"
     When folder "/merge-test-inside-group" of user "user0" is shared with group "group1"
-    Then as "user0" the folder "merge-test-inside-group" exists
-    And as "user0" the folder "merge-test-inside-group (2)" does not exist
+    Then as "user0" the folder "/merge-test-inside-group" exists
+    And as "user0" the folder "/merge-test-inside-group (2)" does not exist
 
   Scenario: Merging shares for recipient when shared from inside with two groups
     Given As an "admin"
@@ -830,12 +831,12 @@ Feature: sharing
     And group "group2" exists
     And user "user0" belongs to group "group1"
     And user "user0" belongs to group "group2"
-    And user "user0" created a folder "merge-test-inside-twogroups"
-    When folder "merge-test-inside-twogroups" of user "user0" is shared with group "group1"
-    And folder "merge-test-inside-twogroups" of user "user0" is shared with group "group2"
-    Then as "user0" the folder "merge-test-inside-twogroups" exists
-    And as "user0" the folder "merge-test-inside-twogroups (2)" does not exist
-    And as "user0" the folder "merge-test-inside-twogroups (3)" does not exist
+    And user "user0" created a folder "/merge-test-inside-twogroups"
+    When folder "/merge-test-inside-twogroups" of user "user0" is shared with group "group1"
+    And folder "/merge-test-inside-twogroups" of user "user0" is shared with group "group2"
+    Then as "user0" the folder "/merge-test-inside-twogroups" exists
+    And as "user0" the folder "/merge-test-inside-twogroups (2)" does not exist
+    And as "user0" the folder "/merge-test-inside-twogroups (3)" does not exist
 
   Scenario: Merging shares for recipient when shared from inside with group with less permissions
     Given As an "admin"
@@ -844,14 +845,14 @@ Feature: sharing
     And group "group2" exists
     And user "user0" belongs to group "group1"
     And user "user0" belongs to group "group2"
-    And user "user0" created a folder "merge-test-inside-twogroups-perms"
-    When folder "merge-test-inside-twogroups-perms" of user "user0" is shared with group "group1"
-    And folder "merge-test-inside-twogroups-perms" of user "user0" is shared with group "group2"
-    Then as "user0" gets properties of folder "merge-test-inside-twogroups-perms" with
+    And user "user0" created a folder "/merge-test-inside-twogroups-perms"
+    When folder "/merge-test-inside-twogroups-perms" of user "user0" is shared with group "group1"
+    And folder "/merge-test-inside-twogroups-perms" of user "user0" is shared with group "group2"
+    Then as "user0" gets properties of folder "/merge-test-inside-twogroups-perms" with
         |{http://owncloud.org/ns}permissions|
     And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "RDNVCK"
-    And as "user0" the folder "merge-test-inside-twogroups-perms (2)" does not exist
-    And as "user0" the folder "merge-test-inside-twogroups-perms (3)" does not exist
+    And as "user0" the folder "/merge-test-inside-twogroups-perms (2)" does not exist
+    And as "user0" the folder "/merge-test-inside-twogroups-perms (3)" does not exist
 
   Scenario: Merging shares for recipient when shared from outside with group then user and recipient renames in between
     Given As an "admin"
@@ -859,14 +860,14 @@ Feature: sharing
     And user "user1" exists
     And group "group1" exists
     And user "user1" belongs to group "group1"
-    And user "user0" created a folder "merge-test-outside-groups-renamebeforesecondshare"
-    When folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with group "group1"
+    And user "user0" created a folder "/merge-test-outside-groups-renamebeforesecondshare"
+    When folder "/merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with group "group1"
     And User "user1" moved folder "/merge-test-outside-groups-renamebeforesecondshare" to "/merge-test-outside-groups-renamebeforesecondshare-renamed"
-    And folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with user "user1"
-    Then as "user1" gets properties of folder "merge-test-outside-groups-renamebeforesecondshare-renamed" with
+    And folder "/merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with user "user1"
+    Then as "user1" gets properties of folder "/merge-test-outside-groups-renamebeforesecondshare-renamed" with
         |{http://owncloud.org/ns}permissions|
     And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
-    And as "user1" the folder "merge-test-outside-groups-renamebeforesecondshare" does not exist
+    And as "user1" the folder "/merge-test-outside-groups-renamebeforesecondshare" does not exist
 
   Scenario: Merging shares for recipient when shared from outside with user then group and recipient renames in between
     Given As an "admin"
@@ -874,14 +875,32 @@ Feature: sharing
     And user "user1" exists
     And group "group1" exists
     And user "user1" belongs to group "group1"
-    And user "user0" created a folder "merge-test-outside-groups-renamebeforesecondshare"
-    When folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with user "user1"
+    And user "user0" created a folder "/merge-test-outside-groups-renamebeforesecondshare"
+    When folder "/merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with user "user1"
     And User "user1" moved folder "/merge-test-outside-groups-renamebeforesecondshare" to "/merge-test-outside-groups-renamebeforesecondshare-renamed"
-    And folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with group "group1"
-    Then as "user1" gets properties of folder "merge-test-outside-groups-renamebeforesecondshare-renamed" with
+    And folder "/merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with group "group1"
+    Then as "user1" gets properties of folder "/merge-test-outside-groups-renamebeforesecondshare-renamed" with
         |{http://owncloud.org/ns}permissions|
     And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
-    And as "user1" the folder "merge-test-outside-groups-renamebeforesecondshare" does not exist
+    And as "user1" the folder "/merge-test-outside-groups-renamebeforesecondshare" does not exist
+  
+  Scenario: Empting trashbin
+    Given As an "admin"
+    And user "user0" exists
+    And User "user0" deletes file "/textfile0.txt"
+    When User "user0" empties trashbin
+    Then the HTTP status code should be "200"
+
+  Scenario: orphaned shares
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And user "user0" created a folder "/common"
+    And user "user0" created a folder "/common/sub"
+    And file "/common/sub" of user "user0" is shared with user "user1"
+    And User "user0" deletes folder "/common"
+    When User "user0" empties trashbin
+    Then as "user1" the folder "/sub" does not exist
 
   Scenario: sharing again an own file while belonging to a group
     Given As an "admin"
@@ -895,4 +914,4 @@ Feature: sharing
       | shareWith | sharing-group |
       | shareType | 1 |
     Then the OCS status code should be "100"
-    And the HTTP status code should be "200"
+    And the HTTP status code should be "200"
\ No newline at end of file

From 4f2a219942b9818c7ba234c96add640d4183a32c Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 27 Sep 2016 14:46:13 +0000
Subject: [PATCH 174/219] Added weddav related feature

---
 .../integration/features/bootstrap/WebDav.php | 25 ++++++----
 .../features/webdav-related.feature           | 46 +++++++++----------
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 2991bbb7d7b4..e1a3b323cec8 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -66,8 +66,13 @@ public function getFilesPath($user){
 		return $basePath;
 	}
 
-	public function makeDavRequest($user, $method, $path, $headers, $body = null){
-		$fullUrl = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user) . "$path";
+	public function makeDavRequest($user, $method, $path, $headers, $body = null, $type = "files"){
+		if ( $type === "files" ){
+			echo "user: " . $user . " method: " . $method . " path: " . $path . " type: " . $type;
+			$fullUrl = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user) . "$path";
+		} else if ( $type === "uploads" ){
+			$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath . "$path";
+		} 
 		$client = new GClient();
 		$options = [];
 		if ($user === 'admin') {
@@ -504,8 +509,8 @@ public function userUploadsChunkFileOfWithToWithChecksum($user, $num, $total, $d
 	{
 		$num -= 1;
 		$data = \GuzzleHttp\Stream\Stream::factory($data);
-		$file = $destination . '-chunking-42-'.$total.'-'.$num;
-		$this->makeDavRequest($user, 'PUT', $file, ['OC-Chunked' => '1'], $data);
+		$file = $destination . '-chunking-42-' . $total . '-' . $num;
+		$this->makeDavRequest($user, 'PUT', $file, ['OC-Chunked' => '1'], $data,  "uploads");
 	}
 
 	/**
@@ -514,7 +519,7 @@ public function userUploadsChunkFileOfWithToWithChecksum($user, $num, $total, $d
 	public function userCreatesANewChunkingUploadWithId($user, $id)
 	{
 		$destination = '/uploads/'.$user.'/'.$id;
-		$this->makeDavRequest($user, 'MKCOL', $destination, []);
+		$this->makeDavRequest($user, 'MKCOL', $destination, [], null, "uploads");
 	}
 
 	/**
@@ -523,8 +528,8 @@ public function userCreatesANewChunkingUploadWithId($user, $id)
 	public function userUploadsNewChunkFileOfWithToId($user, $num, $data, $id)
 	{
 		$data = \GuzzleHttp\Stream\Stream::factory($data);
-		$destination = '/uploads/'.$user.'/'.$id.'/'.$num;
-		$this->makeDavRequest($user, 'PUT', $destination, [], $data);
+		$destination = '/uploads/'. $user .'/'. $id .'/' . $num;
+		$this->makeDavRequest($user, 'PUT', $destination, [], $data, "uploads");
 	}
 
 	/**
@@ -532,11 +537,11 @@ public function userUploadsNewChunkFileOfWithToId($user, $num, $data, $id)
 	 */
 	public function userMovesNewChunkFileWithIdToMychunkedfile($user, $id, $dest)
 	{
-		$source = '/uploads/'.$user.'/'.$id.'/.file';
+		$source = '/uploads/' . $user . '/' . $id . '/.file';
 		$destination = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user) . $dest;
 		$this->makeDavRequest($user, 'MOVE', $source, [
 			'Destination' => $destination
-		]);
+		], null, "uploads");
 	}
 
 
@@ -595,7 +600,7 @@ public function changeFavStateOfAnElement($user, $path, $favOrUnfav, $folderDept
 			];
 		}
 
-		$response = $client->proppatch($this->getDavFilesPath($user), $properties, $folderDepth);
+		$response = $client->proppatch($this->getDavFilesPath($user) . $path, $properties, $folderDepth);
 		return $response;
 	}
 
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index b870b026576c..68d620eb8ecf 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -3,7 +3,7 @@ Feature: webdav-related
 		Given using api version "1"
 
 	Scenario: Moving a file
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And As an "user0"
@@ -12,7 +12,7 @@ Feature: webdav-related
 		And Downloaded content when downloading file "/FOLDER/welcome.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Moving and overwriting a file old way
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And As an "user0"
@@ -21,7 +21,7 @@ Feature: webdav-related
 		And Downloaded content when downloading file "/textfile0.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Moving a file to a folder with no permissions
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user1" exists
@@ -39,7 +39,7 @@ Feature: webdav-related
  		Then the HTTP status code should be "404"
 
 	Scenario: Moving a file to overwrite a file in a folder with no permissions
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user1" exists
@@ -57,7 +57,7 @@ Feature: webdav-related
 		And Downloaded content when downloading file "/testshare/overwritethis.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Copying a file
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And As an "user0"
@@ -66,7 +66,7 @@ Feature: webdav-related
 		And Downloaded content when downloading file "/FOLDER/welcome.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Copying and overwriting a file
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And As an "user0"
@@ -75,7 +75,7 @@ Feature: webdav-related
 		And Downloaded content when downloading file "/textfile1.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: Copying a file to a folder with no permissions
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user1" exists
@@ -93,7 +93,7 @@ Feature: webdav-related
 		And the HTTP status code should be "404"
 
 	Scenario: Copying a file to overwrite a file into a folder with no permissions
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user1" exists
@@ -111,13 +111,13 @@ Feature: webdav-related
 		And Downloaded content when downloading file "/testshare/overwritethis.txt" with range "bytes=0-6" should be "Welcome"
 
 	Scenario: download a file with range
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		When Downloading file "/welcome.txt" with range "bytes=51-77"
 		Then Downloaded content should be "example file for developers"
 
 	Scenario: Upload forbidden if quota is 0
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user0" has a quota of "0"
@@ -125,7 +125,7 @@ Feature: webdav-related
 		Then the HTTP status code should be "507"
 
 	Scenario: Retrieving folder quota when no quota is set
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		When user "user0" has unlimited quota
@@ -134,7 +134,7 @@ Feature: webdav-related
 		And the single response should contain a property "{DAV:}quota-available-bytes" with value "-3"
 
 	Scenario: Retrieving folder quota when quota is set
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		When user "user0" has a quota of "10 MB"
@@ -143,7 +143,7 @@ Feature: webdav-related
 		And the single response should contain a property "{DAV:}quota-available-bytes" with value "10485429"
 
 	Scenario: Retrieving folder quota of shared folder with quota when no quota is set for recipient
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user1" exists
@@ -161,7 +161,7 @@ Feature: webdav-related
 		And the single response should contain a property "{DAV:}quota-available-bytes" with value "10485429"
 
 	Scenario: Uploading a file as recipient using webdav having quota
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user1" exists
@@ -179,7 +179,7 @@ Feature: webdav-related
 		Then the HTTP status code should be "201"
 
 	Scenario: Retrieving folder quota when quota is set and a file was uploaded
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user0" has a quota of "1 KB"
@@ -189,7 +189,7 @@ Feature: webdav-related
 		Then the single response should contain a property "{DAV:}quota-available-bytes" with value "600"
 
 	Scenario: Retrieving folder quota when quota is set and a file was recieved
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		And user "user0" exists
 		And user "user1" exists
@@ -219,7 +219,7 @@ Feature: webdav-related
 		Then Downloaded content should be "wnCloud"
 
 	Scenario: Downloading a file on the old endpoint should serve security headers
-		Given using dav path "remote.php/webdav"
+		Given using old dav path
 		And As an "admin"
 		When Downloading file "/welcome.txt"
 		Then The following headers should be set
@@ -356,7 +356,7 @@ Feature: webdav-related
 			| 3 |
 
 	Scenario: Upload chunked file asc with new chunking
-		Given using dav path "remote.php/dav"
+		Given using new dav path
 		And user "user0" exists
 		And user "user0" creates a new chunking upload with id "chunking-42"
 		And user "user0" uploads new chunk file "1" with "AAAAA" to id "chunking-42"
@@ -364,11 +364,11 @@ Feature: webdav-related
 		And user "user0" uploads new chunk file "3" with "CCCCC" to id "chunking-42"
 		And user "user0" moves new chunk file with id "chunking-42" to "/myChunkedFile.txt"
 		When As an "user0"
-		And Downloading file "/files/user0/myChunkedFile.txt"
+		And Downloading file "/myChunkedFile.txt"
 		Then Downloaded content should be "AAAAABBBBBCCCCC"
 
 	Scenario: Upload chunked file desc with new chunking
-		Given using dav path "remote.php/dav"
+		Given using new dav path
 		And user "user0" exists
 		And user "user0" creates a new chunking upload with id "chunking-42"
 		And user "user0" uploads new chunk file "3" with "CCCCC" to id "chunking-42"
@@ -376,11 +376,11 @@ Feature: webdav-related
 		And user "user0" uploads new chunk file "1" with "AAAAA" to id "chunking-42"
 		And user "user0" moves new chunk file with id "chunking-42" to "/myChunkedFile.txt"
 		When As an "user0"
-		And Downloading file "/files/user0/myChunkedFile.txt"
+		And Downloading file "/myChunkedFile.txt"
 		Then Downloaded content should be "AAAAABBBBBCCCCC"
 
 	Scenario: Upload chunked file random with new chunking
-		Given using dav path "remote.php/dav"
+		Given using new dav path
 		And user "user0" exists
 		And user "user0" creates a new chunking upload with id "chunking-42"
 		And user "user0" uploads new chunk file "2" with "BBBBB" to id "chunking-42"
@@ -388,7 +388,7 @@ Feature: webdav-related
 		And user "user0" uploads new chunk file "1" with "AAAAA" to id "chunking-42"
 		And user "user0" moves new chunk file with id "chunking-42" to "/myChunkedFile.txt"
 		When As an "user0"
-		And Downloading file "/files/user0/myChunkedFile.txt"
+		And Downloading file "/myChunkedFile.txt"
 		Then Downloaded content should be "AAAAABBBBBCCCCC"
 
 	Scenario: A disabled user cannot use webdav

From 0ed3bb4f92a5cd4010bf2a195332c5145b09315b Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Wed, 28 Sep 2016 07:11:50 +0000
Subject: [PATCH 175/219] Removed forgotten leftovers

Conflicts:
	build/integration/features/bootstrap/WebDav.php
---
 .../integration/features/bootstrap/WebDav.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index e1a3b323cec8..bba1bc9ccdac 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -40,14 +40,6 @@ public function usingNewDavPath() {
 		$this->usingOldDavPath = false;
 	}
 
-	/*public function getDavFilesPath($user){
-		if ($this->usingOldDavPath === true){
-			return $this->davPath . '/';
-		} else {
-			return $this->davPath . '/files/' . $user . '/';
-		}
-	}*/
-
 	public function getDavFilesPath($user){
 		if ($this->usingOldDavPath === true){
 			return $this->davPath;
@@ -56,19 +48,8 @@ public function getDavFilesPath($user){
 		}
 	}
 
-	public function getFilesPath($user){
-		$basePath = '';
-		if ($this->davPath === "remote.php/dav"){
-			$basePath = '/files/' . $this->currentUser . '/';
-		} else {
-			$basePath = '/';
-		}
-		return $basePath;
-	}
-
 	public function makeDavRequest($user, $method, $path, $headers, $body = null, $type = "files"){
 		if ( $type === "files" ){
-			echo "user: " . $user . " method: " . $method . " path: " . $path . " type: " . $type;
 			$fullUrl = substr($this->baseUrl, 0, -4) . $this->getDavFilesPath($user) . "$path";
 		} else if ( $type === "uploads" ){
 			$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath . "$path";

From f6d1e52ecc57a312ce6986670579725d9f283a96 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Wed, 16 Nov 2016 09:07:18 +0000
Subject: [PATCH 176/219] Added missing requirements

---
 build/integration/features/bootstrap/WebDav.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index bba1bc9ccdac..04519c539b3e 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -263,7 +263,7 @@ public function asGetsPropertiesOfFolderWith($user, $elementType, $path, $proper
 	 */
 	public function asTheFileOrFolderDoesNotExist($user, $entry, $path) {
 		$client = $this->getSabreClient($user);
-		$response = $client->request('HEAD', $this->makeSabrePath($path));
+		$response = $client->request('HEAD', $this->makeSabrePath($user, $path));
 		if ($response['statusCode'] !== 404) {
 			throw new \Exception($entry . ' "' . $path . '" expected to not exist (status code ' . $response['statusCode'] . ', expected 404)');
 		}
@@ -358,7 +358,7 @@ public function listFolder($user, $path, $folderDepth, $properties = null){
 			];
 		}
 
-		$response = $client->propfind($this->makeSabrePath($path), $properties, $folderDepth);
+		$response = $client->propfind($this->makeSabrePath($user, $path), $properties, $folderDepth);
 
 		return $response;
 	}
@@ -451,11 +451,12 @@ public function userUploadsAFileWithContentTo($user, $content, $destination)
 	}
 
 	/**
-	 * @When User :user deletes file :file
+	 * @When /^User "([^"]*)" deletes (file|folder) "([^"]*)"$/
 	 * @param string $user
+	 * @param string $type
 	 * @param string $file
 	 */
-	public function userDeletesFile($user, $file)  {
+	public function userDeletesFile($user, $type, $file)  {
 		try {
 			$this->response = $this->makeDavRequest($user, 'DELETE', $file, []);
 		} catch (\GuzzleHttp\Exception\ServerException $e) {

From 738c5e7199a1ce1f56b25670e089ec5c43a7b173 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Fri, 18 Nov 2016 09:38:15 +0000
Subject: [PATCH 177/219] Changed nothing for 0 because of previous sabre dav
 version

---
 build/integration/features/favorites.feature | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/integration/features/favorites.feature b/build/integration/features/favorites.feature
index 550ae31c2f14..a88ac13a64a6 100644
--- a/build/integration/features/favorites.feature
+++ b/build/integration/features/favorites.feature
@@ -57,7 +57,7 @@ Feature: favorite
         And user "user0" unfavorites element "/FOLDER"
         Then as "user0" gets properties of folder "/FOLDER" with
             |{http://owncloud.org/ns}favorite|
-        And the single response should contain a property "{http://owncloud.org/ns}favorite" with value ""
+        And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0"
 
     Scenario: Favorite a file new endpoint
         Given using new dav path
@@ -76,4 +76,4 @@ Feature: favorite
         And user "user0" unfavorites element "/textfile0.txt"
         Then as "user0" gets properties of file "/textfile0.txt" with
             |{http://owncloud.org/ns}favorite|
-        And the single response should contain a property "{http://owncloud.org/ns}favorite" with value ""
+        And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0"

From 4b70d84b0c14b25cc7333778c0d7dbc138ed933b Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 7 Nov 2016 22:52:07 +0100
Subject: [PATCH 178/219] Add transfer ownership integration tests (#26543)

* Add transfer ownership integration tests

* Added more transfer ownership tests and OCC checks
---
 build/integration/config/behat.yml            |   5 +-
 .../features/bootstrap/CommandLine.php        | 167 ++++++++++++++++++
 .../features/bootstrap/CommandLineContext.php |  99 +++++++++++
 .../integration/features/bootstrap/WebDav.php |   1 +
 .../features/transfer-ownership.feature       | 119 +++++++++++++
 build/integration/run.sh                      |  15 +-
 6 files changed, 398 insertions(+), 8 deletions(-)
 create mode 100644 build/integration/features/bootstrap/CommandLine.php
 create mode 100644 build/integration/features/bootstrap/CommandLineContext.php
 create mode 100644 build/integration/features/transfer-ownership.feature

diff --git a/build/integration/config/behat.yml b/build/integration/config/behat.yml
index 0c0ecef08e9c..711818d85817 100644
--- a/build/integration/config/behat.yml
+++ b/build/integration/config/behat.yml
@@ -22,6 +22,9 @@ default:
             baseUrl: http://localhost:8080
         - ChecksumsContext:
             baseUrl: http://localhost:8080
+        - CommandLineContext:
+            baseUrl: http://localhost:8080
+            ocPath: ../../
     federation:
       paths:
         - %paths.base%/../federation_features
@@ -53,8 +56,6 @@ default:
               - admin
             regular_user_password: 123456
 
-
-
   extensions:
       jarnaiz\JUnitFormatter\JUnitFormatterExtension:
           filename: report.xml
diff --git a/build/integration/features/bootstrap/CommandLine.php b/build/integration/features/bootstrap/CommandLine.php
new file mode 100644
index 000000000000..c0caf5f8e6ee
--- /dev/null
+++ b/build/integration/features/bootstrap/CommandLine.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @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/>
+ *
+ */
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+trait CommandLine {
+	/** @var int return code of last command */
+	private $lastCode;
+	/** @var string stdout of last command */
+	private $lastStdOut;
+	/** @var string stderr of last command */
+	private $lastStdErr;
+
+	/** @var string */
+	protected $ocPath = '../..';
+
+	/**
+	 * Invokes an OCC command
+	 *
+	 * @param string OCC command, the part behind "occ". For example: "files:transfer-ownership"
+	 * @return int exit code
+	 */
+	public function runOcc($args = []) {
+		$args = array_map(function($arg) {
+			return escapeshellarg($arg);
+		}, $args);
+		$args[] = '--no-ansi';
+		$args = implode(' ', $args);
+
+		$descriptor = [
+			0 => ['pipe', 'r'],
+			1 => ['pipe', 'w'],
+			2 => ['pipe', 'w'],
+		];
+		$process = proc_open('php console.php ' . $args, $descriptor, $pipes, $this->ocPath);
+		$this->lastStdOut = stream_get_contents($pipes[1]);
+		$this->lastStdErr = stream_get_contents($pipes[2]);
+		$this->lastCode = proc_close($process);
+		return $this->lastCode;
+	}
+
+	/**
+	 * @Given /^invoking occ with "([^"]*)"$/
+	 */
+	public function invokingTheCommand($cmd) {
+		$args = explode(' ', $cmd);
+		$this->runOcc($args);
+	}
+
+	/**
+	 * Find exception texts in stderr
+	 */
+	public function findExceptions() {
+		$exceptions = [];
+		$captureNext = false;
+		// the exception text usually appears after an "[Exception"] row
+		foreach (explode("\n", $this->lastStdErr) as $line) {
+			if (preg_match('/\[Exception\]/', $line)) {
+				$captureNext = true;
+				continue;
+			}
+			if ($captureNext) {
+				$exceptions[] = trim($line);
+				$captureNext = false;
+			}
+		}
+
+		return $exceptions;
+	}
+
+	/**
+	 * Finds all lines containing the given text
+	 *
+	 * @param string $input stdout or stderr output
+	 * @param string $text text to search for
+	 * @return array array of lines that matched
+	 */
+	public function findLines($input, $text) {
+		$results = [];
+		// the exception text usually appears after an "[Exception"] row
+		foreach (explode("\n", $input) as $line) {
+			if (strpos($line, $text) >= 0) {
+				$results[] = $line;
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * @Then /^the command was successful$/
+	 */
+	public function theCommandWasSuccessful() {
+		$exceptions = $this->findExceptions();
+		if ($this->lastCode !== 0) {
+			$msg = 'The command was not successful, exit code was ' . $this->lastCode . '.';
+			if (!empty($exceptions)) {
+				$msg .= ' Exceptions: ' . implode(', ', $exceptions);
+			}
+			throw new \Exception($msg);
+		} else if (!empty($exceptions)) {
+			$msg = 'The command was successful but triggered exceptions: ' . implode(', ', $exceptions);
+			throw new \Exception($msg);
+		}
+	}
+
+	/**
+	 * @Then /^the command failed with exit code ([0-9]+)$/
+	 */
+	public function theCommandFailedWithExitCode($exitCode) {
+		if ($this->lastCode !== (int)$exitCode) {
+			throw new \Exception('The command was expected to fail with exit code ' . $exitCode . ' but got ' . $this->lastCode);
+		}
+	}
+
+	/**
+	 * @Then /^the command failed with exception text "([^"]*)"$/
+	 */
+	public function theCommandFailedWithException($exceptionText) {
+		$exceptions = $this->findExceptions();
+		if (empty($exceptions)) {
+			throw new \Exception('The command did not throw any exceptions');
+		}
+
+		if (!in_array($exceptionText, $exceptions)) {
+			throw new \Exception('The command did not throw any exception with the text "' . $exceptionText . '"');
+		}
+	}
+
+	/**
+	 * @Then /^the command output contains the text "([^"]*)"$/
+	 */
+	public function theCommandOutputContainsTheText($text) {
+		$lines = $this->findLines($this->lastStdOut, $text);
+		if (empty($lines)) {
+			throw new \Exception('The command did not output the expected text on stdout "' . $exceptionText . '"');
+		}
+	}
+
+	/**
+	 * @Then /^the command error output contains the text "([^"]*)"$/
+	 */
+	public function theCommandErrorOutputContainsTheText($text) {
+		$lines = $this->findLines($this->lastStdErr, $text);
+		if (empty($lines)) {
+			throw new \Exception('The command did not output the expected text on stderr "' . $exceptionText . '"');
+		}
+	}
+}
diff --git a/build/integration/features/bootstrap/CommandLineContext.php b/build/integration/features/bootstrap/CommandLineContext.php
new file mode 100644
index 000000000000..374a14410bfd
--- /dev/null
+++ b/build/integration/features/bootstrap/CommandLineContext.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @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/>
+ *
+ */
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+
+class CommandLineContext implements \Behat\Behat\Context\Context {
+	use CommandLine;
+
+	private $lastTransferPath;
+
+	private $featureContext;
+
+	public function __construct($ocPath, $baseUrl) {
+		$this->ocPath = rtrim($ocPath, '/') . '/';
+		$this->localBaseUrl = $baseUrl;
+		$this->remoteBaseUrl = $baseUrl;
+	}
+
+	/** @BeforeScenario */
+	public function gatherContexts(BeforeScenarioScope $scope) {
+		$environment = $scope->getEnvironment();
+		// this should really be "WebDavContext" ...
+		$this->featureContext = $environment->getContext('FeatureContext');
+	}
+
+	private function findLastTransferFolderForUser($sourceUser, $targetUser) {
+		$foundPaths = [];
+		$results = $this->featureContext->listFolder($targetUser, '', 1);
+		foreach ($results as $path => $data) {
+			$path = rawurldecode($path);
+			$parts = explode(' ', $path);
+			if (basename($parts[0]) !== 'transferred') {
+				continue;
+			}
+			if (isset($parts[2]) && $parts[2] === $sourceUser) {
+				// store timestamp as key
+				$foundPaths[] = [
+					'date' => strtotime(dirname($parts[4])),
+					'path' => $path,
+				];
+			}
+		}
+
+		if (empty($foundPaths)) {
+			return null;
+		}
+
+		usort($foundPaths, function($a, $b) {
+			return $a['date'] - $b['date'];
+		});
+
+		$davPath = rtrim($this->featureContext->getDavFilesPath($targetUser), '/');
+
+		$foundPath = end($foundPaths)['path'];
+		// strip dav path
+		return substr($foundPath, strlen($davPath) + 1);
+	}
+
+	/**
+	 * @When /^transfering ownership from "([^"]+)" to "([^"]+)"/
+	 */
+	public function transferingOwnership($user1, $user2) {
+		if ($this->runOcc(['files:transfer-ownership', $user1, $user2]) === 0) {
+			$this->lastTransferPath = $this->findLastTransferFolderForUser($user1, $user2);
+		} else {
+			// failure
+			$this->lastTransferPath = null;
+		}
+	}
+
+	/**
+	 * @When /^using received transfer folder of "([^"]+)" as dav path$/
+	 */
+	public function usingTransferFolderAsDavPath($user) {
+		$davPath = $this->featureContext->getDavFilesPath($user);
+		$davPath = rtrim($davPath, '/') . $this->lastTransferPath;
+		$this->featureContext->usingDavPath($davPath);
+	}
+}
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 04519c539b3e..dc55571504b6 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -472,6 +472,7 @@ public function userDeletesFile($user, $type, $file)  {
 	 */
 	public function userCreatedAFolder($user, $destination){
 		try {
+			$destination = '/' . ltrim($destination, '/');
 			$this->response = $this->makeDavRequest($user, "MKCOL", $destination, []);
 		} catch (\GuzzleHttp\Exception\ServerException $e) {
 			// 4xx and 5xx responses cause an exception
diff --git a/build/integration/features/transfer-ownership.feature b/build/integration/features/transfer-ownership.feature
new file mode 100644
index 000000000000..92361f709009
--- /dev/null
+++ b/build/integration/features/transfer-ownership.feature
@@ -0,0 +1,119 @@
+Feature: transfer-ownership
+
+	Scenario: transfering ownership of a file
+		Given user "user0" exists
+		And user "user1" exists
+		And User "user0" uploads file "data/textfile.txt" to "/somefile.txt"
+		When transfering ownership from "user0" to "user1"
+		And the command was successful
+		And As an "user1"
+		And using received transfer folder of "user1" as dav path
+		Then Downloaded content when downloading file "/somefile.txt" with range "bytes=0-6" should be "This is"
+
+	Scenario: transfering ownership of a folder
+		Given user "user0" exists
+		And user "user1" exists
+		And User "user0" created a folder "/test"
+		And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
+		When transfering ownership from "user0" to "user1"
+		And the command was successful
+		And As an "user1"
+		And using received transfer folder of "user1" as dav path
+		Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
+
+	Scenario: transfering ownership of file shares
+		Given user "user0" exists
+		And user "user1" exists
+		And user "user2" exists
+		And User "user0" uploads file "data/textfile.txt" to "/somefile.txt"
+		And file "/somefile.txt" of user "user0" is shared with user "user2" with permissions 19
+		When transfering ownership from "user0" to "user1"
+		And the command was successful
+		And As an "user2"
+		Then Downloaded content when downloading file "/somefile.txt" with range "bytes=0-6" should be "This is"
+
+	Scenario: transfering ownership of folder shared with third user
+		Given user "user0" exists
+		And user "user1" exists
+		And user "user2" exists
+		And User "user0" created a folder "/test"
+		And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
+		And folder "/test" of user "user0" is shared with user "user2" with permissions 31
+		When transfering ownership from "user0" to "user1"
+		And the command was successful
+		And As an "user2"
+		Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
+
+	Scenario: transfering ownership of folder shared with transfer recipient
+		Given user "user0" exists
+		And user "user1" exists
+		And User "user0" created a folder "/test"
+		And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
+		And folder "/test" of user "user0" is shared with user "user1" with permissions 31
+		When transfering ownership from "user0" to "user1"
+		And the command was successful
+		And As an "user1"
+		Then as "user1" the folder "/test" does not exist
+		And using received transfer folder of "user1" as dav path
+		And Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
+
+	Scenario: transfering ownership of folder doubly shared with third user
+		Given group "group1" exists
+		And user "user0" exists
+		And user "user1" exists
+		And user "user2" exists
+    	And user "user2" belongs to group "group1"
+		And User "user0" created a folder "/test"
+		And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
+		And folder "/test" of user "user0" is shared with group "group1" with permissions 31
+		And folder "/test" of user "user0" is shared with user "user2" with permissions 31
+		When transfering ownership from "user0" to "user1"
+		And the command was successful
+		And As an "user2"
+		Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
+
+	Scenario: transfering ownership does not transfer received shares
+		Given user "user0" exists
+		And user "user1" exists
+		And user "user2" exists
+		And User "user2" created a folder "/test"
+		And folder "/test" of user "user2" is shared with user "user0" with permissions 31
+		When transfering ownership from "user0" to "user1"
+		And the command was successful
+		And As an "user1"
+		And using received transfer folder of "user1" as dav path
+		Then as "user1" the folder "/test" does not exist
+
+	@local_storage
+	Scenario: transfering ownership does not transfer external storage
+		Given user "user0" exists
+		And user "user1" exists
+		When transfering ownership from "user0" to "user1"
+		And the command was successful
+		And As an "user1"
+		And using received transfer folder of "user1" as dav path
+		Then as "user1" the folder "/local_storage" does not exist
+
+	Scenario: transfering ownership does not fail with shared trashed files
+		Given user "user0" exists
+		And user "user1" exists
+		And user "user2" exists
+		And User "user0" created a folder "/sub"
+		And User "user0" created a folder "/sub/test"
+		And folder "/sub/test" of user "user0" is shared with user "user2" with permissions 31
+		And User "user0" deletes folder "/sub"
+		When transfering ownership from "user0" to "user1"
+		Then the command was successful
+
+	Scenario: transfering ownership fails with invalid source user
+		Given user "user0" exists
+		When transfering ownership from "invalid_user" to "user0"
+		Then the command error output contains the text "Unknown source user"
+		And the command failed with exit code 1
+
+	Scenario: transfering ownership fails with invalid target user
+		Given user "user0" exists
+		When transfering ownership from "user0" to "invalid_user"
+		Then the command error output contains the text "Unknown target user"
+		And the command failed with exit code 1
+
diff --git a/build/integration/run.sh b/build/integration/run.sh
index ab8ea8ba2f94..8afbaa17bef3 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -2,6 +2,9 @@
 
 composer install
 
+OC_PATH=../../
+OCC=${OC_PATH}occ
+
 SCENARIO_TO_RUN=$1
 HIDE_OC_LOGS=$2
 
@@ -25,14 +28,14 @@ export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
 export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/"
 
 #Enable external storage app
-../../occ app:enable files_external
+$OCC app:enable files_external
 
 mkdir -p work/local_storage
-OUTPUT_CREATE_STORAGE=`../../occ files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage` 
+OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage` 
 
 ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}`
 
-../../occ files_external:option $ID_STORAGE enable_sharing true
+$OCC files_external:option $ID_STORAGE enable_sharing true
 
 vendor/bin/behat --strict -f junit -f pretty $SCENARIO_TO_RUN
 RESULT=$?
@@ -40,13 +43,13 @@ RESULT=$?
 kill $PHPPID
 kill $PHPPID_FED
 
-../../occ files_external:delete -y $ID_STORAGE
+$OCC files_external:delete -y $ID_STORAGE
 
 #Disable external storage app
-../../occ app:disable files_external
+$OCC app:disable files_external
 
 if [ -z $HIDE_OC_LOGS ]; then
-	tail "../../data/owncloud.log"
+	tail "${OC_PATH}/data/owncloud.log"
 fi
 
 echo "runsh: Exit code: $RESULT"

From 9c299610fc111a359dca513592c2da047ce91cad Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 4 Nov 2016 13:12:46 +0100
Subject: [PATCH 179/219] Transfer ownership now returns exit code on error

---
 apps/files/lib/Command/TransferOwnership.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php
index 185b66f9d33f..73d600696f69 100644
--- a/apps/files/lib/Command/TransferOwnership.php
+++ b/apps/files/lib/Command/TransferOwnership.php
@@ -93,11 +93,11 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		$destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
 		if (is_null($sourceUserObject)) {
 			$output->writeln("<error>Unknown source user $this->sourceUser</error>");
-			return;
+			return 1;
 		}
 		if (is_null($destinationUserObject)) {
 			$output->writeln("<error>Unknown destination user $this->destinationUser</error>");
-			return;
+			return 1;
 		}
 
 		$this->sourceUser = $sourceUserObject->getUID();
@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		// target user has to be ready
 		if (!\OC::$server->getEncryptionManager()->isReadyForUser($this->destinationUser)) {
 			$output->writeln("<error>The target user is not ready to accept files. The user has at least to be logged in once.</error>");
-			return;
+			return 2;
 		}
 
 		$date = date('c');

From 1167dfb5683430ff978b556bf44aad15c5184b1f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Nov 2016 12:06:01 +0100
Subject: [PATCH 180/219] Fix finding transferred folder in integration tests

---
 build/integration/features/bootstrap/CommandLineContext.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/integration/features/bootstrap/CommandLineContext.php b/build/integration/features/bootstrap/CommandLineContext.php
index 374a14410bfd..95f492a62dbe 100644
--- a/build/integration/features/bootstrap/CommandLineContext.php
+++ b/build/integration/features/bootstrap/CommandLineContext.php
@@ -55,7 +55,7 @@ private function findLastTransferFolderForUser($sourceUser, $targetUser) {
 			if (isset($parts[2]) && $parts[2] === $sourceUser) {
 				// store timestamp as key
 				$foundPaths[] = [
-					'date' => strtotime(dirname($parts[4])),
+					'date' => strtotime(trim($parts[4], '/')),
 					'path' => $path,
 				];
 			}

From 63ee829b76d027fd1b363c281aca49a44531e0e3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 22 Nov 2016 10:22:00 +0100
Subject: [PATCH 181/219] Properly expire ext storage versions (#26601)

* Properly expire ext storage versions

System-wide external storages have no real owner so the current user is
used as owner. However when running cron.php there is no current user,
so no expiry can be done.

This fix adds an user argument to the expire() function to tell for
which user to expire files. This information is anyway always available
now through the expire command job.

* Move version expire setupFS into the expire function

* Add comment about not tearing down in version Storage::expire()
---
 apps/files_versions/lib/Command/Expire.php   |  4 +---
 apps/files_versions/lib/Storage.php          | 23 ++++++++++++++------
 apps/files_versions/tests/VersioningTest.php | 14 +++++++++++-
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/apps/files_versions/lib/Command/Expire.php b/apps/files_versions/lib/Command/Expire.php
index b1f72980633e..4ea5051b9128 100644
--- a/apps/files_versions/lib/Command/Expire.php
+++ b/apps/files_versions/lib/Command/Expire.php
@@ -57,8 +57,6 @@ public function handle() {
 			return;
 		}
 
-		\OC_Util::setupFS($this->user);
-		Storage::expire($this->fileName);
-		\OC_Util::tearDownFS();
+		Storage::expire($this->fileName, $this->user);
 	}
 }
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index 5857b0646995..fa381185d8cb 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -680,30 +680,39 @@ private static function scheduleExpire($uid, $fileName) {
 	}
 
 	/**
-	 * Expire versions which exceed the quota
+	 * Expire versions which exceed the quota.
 	 *
-	 * @param string $filename
+	 * This will setup the filesystem for the given user but will not
+	 * tear it down afterwards.
+	 *
+	 * @param string $filename path to file to expire
+	 * @param string $uid user for which to expire the version
 	 * @return bool|int|null
 	 */
-	public static function expire($filename) {
+	public static function expire($filename, $uid) {
 		$config = \OC::$server->getConfig();
 		$expiration = self::getExpiration();
-		
+
 		if($config->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' && $expiration->isEnabled()) {
+			// get available disk space for user
+			$user = \OC::$server->getUserManager()->get($uid);
+			if (is_null($user)) {
+				\OCP\Util::writeLog('files_versions', 'Backends provided no user object for ' . $uid, \OCP\Util::ERROR);
+				throw new \OC\User\NoUserException('Backends provided no user object for ' . $uid);
+			}
+
+			\OC_Util::setupFS($uid);
 
 			if (!Filesystem::file_exists($filename)) {
 				return false;
 			}
 
-			list($uid, $filename) = self::getUidAndFilename($filename);
 			if (empty($filename)) {
 				// file maybe renamed or deleted
 				return false;
 			}
 			$versionsFileview = new View('/'.$uid.'/files_versions');
 
-			// get available disk space for user
-			$user = \OC::$server->getUserManager()->get($uid);
 			$softQuota = true;
 			$quota = $user->getQuota();
 			if ( $quota === null || $quota === 'none' ) {
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index 832f7bcc66fa..2c206ff051f0 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -610,7 +610,19 @@ public function testExpireNonexistingFile() {
 		// needed to have a FS setup (the background job does this)
 		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
 
-		$this->assertFalse(\OCA\Files_Versions\Storage::expire('/void/unexist.txt'));
+		$this->assertFalse(\OCA\Files_Versions\Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER));
+	}
+
+	/**
+	 * @expectedException \OC\User\NoUserException
+	 */
+	public function testExpireNonexistingUser() {
+		$this->logout();
+		// needed to have a FS setup (the background job does this)
+		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
+		\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
+
+		$this->assertFalse(\OCA\Files_Versions\Storage::expire('test.txt', 'unexist'));
 	}
 
 	public function testRestoreSameStorage() {

From d886da7a68321e699bb22a38ec9748b983ef290e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 22 Nov 2016 10:37:26 +0100
Subject: [PATCH 182/219] Skip hidden files when counting visible files in list
 (#26571)

The file list UI logic that renders the next page doesn't properly
exclude hidden files when not shown. This fix makes sure that only rows
that are actually visible are counted when rendering a page, this makes
sure that the page will always have enough elements displayed.
---
 apps/files/js/filelist.js           |  8 ++++++--
 apps/files/tests/js/filelistSpec.js | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 71cecf058aca..825146774536 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -896,7 +896,8 @@
 				tr,
 				fileData,
 				newTrs = [],
-				isAllSelected = this.isAllSelected();
+				isAllSelected = this.isAllSelected(),
+				showHidden = this._filesConfig.get('showhidden');
 
 			if (index >= this.files.length) {
 				return false;
@@ -920,7 +921,10 @@
 				}
 				newTrs.push(tr);
 				index++;
-				count--;
+				// only count visible rows
+				if (showHidden || !tr.hasClass('hidden-file')) {
+					count--;
+				}
 			}
 
 			// trigger event for newly added rows
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 90df1ab0a485..259b2ffd37b5 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1119,6 +1119,34 @@ describe('OCA.Files.FileList tests', function() {
 			expect(fileList.files.length).toEqual(65);
 			expect($('#fileList tr').length).toEqual(20);
 		});
+		it('renders the full first page despite hidden rows', function() {
+			filesConfig.set('showhidden', false);
+			var files = _.map(generateFiles(0, 23), function(data) {
+				return _.extend(data, {
+					name: '.' + data.name
+				});
+			});
+			// only hidden files + one visible
+			files.push(testFiles[0]);
+			fileList.setFiles(files);
+			expect(fileList.files.length).toEqual(25);
+			// render 24 hidden elements + the visible one
+			expect($('#fileList tr').length).toEqual(25);
+		});
+		it('renders the full first page despite hidden rows', function() {
+			filesConfig.set('showhidden', true);
+			var files = _.map(generateFiles(0, 23), function(data) {
+				return _.extend(data, {
+					name: '.' + data.name
+				});
+			});
+			// only hidden files + one visible
+			files.push(testFiles[0]);
+			fileList.setFiles(files);
+			expect(fileList.files.length).toEqual(25);
+			// render 20 first hidden elements as visible
+			expect($('#fileList tr').length).toEqual(20);
+		});
 		it('renders the second page when scrolling down (trigger nextPage)', function() {
 			// TODO: can't simulate scrolling here, so calling nextPage directly
 			fileList._nextPage(true);

From b09e81496e30bd162c76c3352dbb3a3cd61ed319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 22 Nov 2016 15:18:35 +0100
Subject: [PATCH 183/219] No challenge from FedAuth

---
 apps/federation/lib/DAV/FedAuth.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/federation/lib/DAV/FedAuth.php b/apps/federation/lib/DAV/FedAuth.php
index 21c0d61487c0..b3d39be1c84a 100644
--- a/apps/federation/lib/DAV/FedAuth.php
+++ b/apps/federation/lib/DAV/FedAuth.php
@@ -22,6 +22,8 @@
 
 use OCA\Federation\DbHandler;
 use Sabre\DAV\Auth\Backend\AbstractBasic;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 
 class FedAuth extends AbstractBasic {
 
@@ -55,4 +57,11 @@ public function __construct(DbHandler $db) {
 	protected function validateUserPass($username, $password) {
 		return $this->db->auth($username, $password);
 	}
+
+	/**
+	 * @inheritdoc
+	 */
+	function challenge(RequestInterface $request, ResponseInterface $response) {
+	}
+
 }

From 8d6a7b756ba5dd8dc7379589962d6fbd8231ee90 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 22 Nov 2016 15:27:06 +0100
Subject: [PATCH 184/219] Fix shared storage name in test mock

---
 tests/lib/Files/Utils/ScannerTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php
index bcc115c6caa7..a71005cdec3a 100644
--- a/tests/lib/Files/Utils/ScannerTest.php
+++ b/tests/lib/Files/Utils/ScannerTest.php
@@ -189,7 +189,9 @@ public function testPropagateEtag() {
 	}
 
 	public function testSkipLocalShares() {
-		$sharedStorage = $this->getMock('OCA\Files_Sharing\SharedStorage');
+		$sharedStorage = $this->getMockBuilder('OC\Files\Storage\Shared')
+			->disableOriginalConstructor()
+			->getMock();
 		$sharedMount = new MountPoint($sharedStorage, '/share');
 		Filesystem::getMountManager()->addMount($sharedMount);
 

From 274be16d6ec3f02eb10125fb1262e10e0fc7e59d Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Thu, 13 Oct 2016 13:16:30 +0000
Subject: [PATCH 185/219] Added functions to check etag of elements

---
 .../integration/features/bootstrap/WebDav.php | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index dc55571504b6..20c03073ab27 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -16,6 +16,8 @@ trait WebDav {
 	private $usingOldDavPath = true;
 	/** @var ResponseInterface */
 	private $response;
+	/** @var array */
+	private $storedETAG = NULL;
 
 	/**
 	 * @Given /^using dav path "([^"]*)"$/
@@ -587,4 +589,33 @@ public function changeFavStateOfAnElement($user, $path, $favOrUnfav, $folderDept
 		return $response;
 	}
 
+	/**
+	 * @Given user :user stores etag of element :path
+	 */
+	public function userStoresEtagOfElement($user, $path){
+		$propertiesTable = new \Behat\Gherkin\Node\TableNode([['{DAV:}getetag']]);
+		$this->asGetsPropertiesOfFolderWith($user, NULL, $path, $propertiesTable);
+		$pathETAG[$path] = $this->response['{DAV:}getetag'];
+		$this->storedETAG[$user]= $pathETAG;
+		print_r($this->storedETAG[$user][$path]);
+	}
+
+	/**
+	 * @Then etag of element :path of user :user has not changed
+	 */
+	public function checkIfETAGHasNotChanged($path, $user){
+		$propertiesTable = new \Behat\Gherkin\Node\TableNode([['{DAV:}getetag']]);
+		$this->asGetsPropertiesOfFolderWith($user, NULL, $path, $propertiesTable);
+		PHPUnit_Framework_Assert::assertEquals($this->response['{DAV:}getetag'], $this->storedETAG[$user][$path]);
+	}
+
+	/**
+	 * @Then etag of element :path of user :user has changed
+	 */
+	public function checkIfETAGHasChanged($path, $user){
+		$propertiesTable = new \Behat\Gherkin\Node\TableNode([['{DAV:}getetag']]);
+		$this->asGetsPropertiesOfFolderWith($user, NULL, $path, $propertiesTable);
+		PHPUnit_Framework_Assert::assertNotEquals($this->response['{DAV:}getetag'], $this->storedETAG[$user][$path]);
+	}
+
 }

From 32327572fb6b94b8f0cbd1d307766b5db1388dfe Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Fri, 14 Oct 2016 07:33:46 +0000
Subject: [PATCH 186/219] Changed description of variable

---
 build/integration/features/bootstrap/WebDav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 20c03073ab27..03a870d779e5 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -16,7 +16,7 @@ trait WebDav {
 	private $usingOldDavPath = true;
 	/** @var ResponseInterface */
 	private $response;
-	/** @var array */
+	/** @var map with user as key and another map as value, which has path as key and etag as value */
 	private $storedETAG = NULL;
 
 	/**

From 37b05946f6608311467b60271671f377dfa7ea98 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Fri, 14 Oct 2016 08:58:44 +0000
Subject: [PATCH 187/219] Added test case about issue 26346

Conflicts:
	build/integration/features/sharing-v1.feature
---
 build/integration/features/sharing-v1.feature | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index 2fce00998fda..785e3fb741d6 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -914,4 +914,19 @@ Feature: sharing
       | shareWith | sharing-group |
       | shareType | 1 |
     Then the OCS status code should be "100"
-    And the HTTP status code should be "200"
\ No newline at end of file
+    And the HTTP status code should be "200"
+
+  Scenario: unshare from self
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "sharing-group" exists
+    And user "user0" belongs to group "sharing-group"
+    And user "user1" belongs to group "sharing-group"
+    And file "/PARENT/parent.txt" of user "user0" is shared with group "sharing-group"
+    And user "user0" stores etag of element "/PARENT"
+    And user "user1" stores etag of element "/"
+    And As an "user1"
+    When Deleting last share
+    Then etag of element "/" of user "user1" has changed
+    And etag of element "/PARENT" of user "user0" has not changed

From 9725ee381ce164c277c450c81e9d63056a60a8dd Mon Sep 17 00:00:00 2001
From: phisch <git@philippschaffrath.de>
Date: Wed, 23 Nov 2016 12:27:06 +0100
Subject: [PATCH 188/219] commit transaction after select query

---
 lib/private/Share20/DefaultShareProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index a3d7a5bb83a9..f8e4f8b3fe36 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -158,7 +158,6 @@ public function create(\OCP\Share\IShare $share) {
 		$this->dbConn->beginTransaction();
 		$qb->execute();
 		$id = $this->dbConn->lastInsertId('*PREFIX*share');
-		$this->dbConn->commit();
 
 		// Now fetch the inserted share and create a complete share object
 		$qb = $this->dbConn->getQueryBuilder();
@@ -168,6 +167,7 @@ public function create(\OCP\Share\IShare $share) {
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
+		$this->dbConn->commit();
 		$cursor->closeCursor();
 
 		if ($data === false) {

From e9ef72462b0fce4cbe14e2b96e62e879c3b40863 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 22 Nov 2016 18:24:36 +0100
Subject: [PATCH 189/219] Add test for duplicate 401 headers on DAV

---
 .../integration/features/bootstrap/WebDav.php | 23 +++++++++++++++++++
 .../features/webdav-related.feature           | 16 +++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 03a870d779e5..259ebdfecdab 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -618,4 +618,27 @@ public function checkIfETAGHasChanged($path, $user){
 		PHPUnit_Framework_Assert::assertNotEquals($this->response['{DAV:}getetag'], $this->storedETAG[$user][$path]);
 	}
 
+	/**
+	 * @When Connecting to dav endpoint
+	 */
+	public function connectingToDavEndpoint() {
+		try {
+			$this->response = $this->makeDavRequest(null, 'PROPFIND', '', []);
+		} catch (\GuzzleHttp\Exception\ClientException $e) {
+			$this->response = $e->getResponse();
+		}
+	}
+
+	/**
+	 * @Then there are no duplicate headers
+	 */
+	public function thereAreNoDuplicateHeaders() {
+		$headers = $this->response->getHeaders();
+		foreach ($headers as $headerName => $headerValues) {
+			// if a header has multiple values, they must be different
+			if (count($headerValues) > 1 && count(array_unique($headerValues)) < count($headerValues)) {
+				throw new \Exception('Duplicate header found: ' . $headerName);
+			}
+		}
+    }
 }
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index 68d620eb8ecf..9d283402f729 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -2,6 +2,22 @@ Feature: webdav-related
 	Background:
 		Given using api version "1"
 
+	Scenario: Unauthenticated call old dav path
+		Given using old dav path
+		When connecting to dav endpoint
+		Then the HTTP status code should be "401"
+		And there are no duplicate headers
+		And The following headers should be set
+			|WWW-Authenticate|Basic realm="ownCloud"|
+
+	Scenario: Unauthenticated call new dav path
+		Given using new dav path
+		When connecting to dav endpoint
+		Then the HTTP status code should be "401"
+		And there are no duplicate headers
+		And The following headers should be set
+			|WWW-Authenticate|Basic realm="ownCloud"|
+
 	Scenario: Moving a file
 		Given using old dav path
 		And As an "admin"

From abd55c5adf9357f526f5cb182cb20fc68f29d122 Mon Sep 17 00:00:00 2001
From: phisch <git@philippschaffrath.de>
Date: Thu, 24 Nov 2016 09:40:06 +0100
Subject: [PATCH 190/219] don't try to render preview images if
 'enable_previews' has been set to false

---
 apps/files/js/filelist.js | 71 +++++++++++++++++++++------------------
 core/js/config.php        | 10 +++---
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 825146774536..d85d0d34599e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1691,44 +1691,49 @@
 				urlSpec = {};
 			ready(iconURL); // set mimeicon URL
 
-			urlSpec.file = OCA.Files.Files.fixPath(path);
-			if (options.x) {
-				urlSpec.x = options.x;
-			}
-			if (options.y) {
-				urlSpec.y = options.y;
-			}
-			if (options.a) {
-				urlSpec.a = options.a;
-			}
-			if (options.mode) {
-				urlSpec.mode = options.mode;
-			}
+			var img = new Image();
 
-			if (etag){
-				// use etag as cache buster
-				urlSpec.c = etag;
-			}
+			if (oc_appconfig.core.previewsEnabled) {
+				urlSpec.file = OCA.Files.Files.fixPath(path);
+				if (options.x) {
+					urlSpec.x = options.x;
+				}
+				if (options.y) {
+					urlSpec.y = options.y;
+				}
+				if (options.a) {
+					urlSpec.a = options.a;
+				}
+				if (options.mode) {
+					urlSpec.mode = options.mode;
+				}
 
-			previewURL = self.generatePreviewUrl(urlSpec);
-			previewURL = previewURL.replace('(', '%28');
-			previewURL = previewURL.replace(')', '%29');
+				if (etag) {
+					// use etag as cache buster
+					urlSpec.c = etag;
+				}
 
-			// preload image to prevent delay
-			// this will make the browser cache the image
-			var img = new Image();
-			img.onload = function(){
-				// if loading the preview image failed (no preview for the mimetype) then img.width will < 5
-				if (img.width > 5) {
-					ready(previewURL, img);
-				} else if (options.error) {
-					options.error();
+				previewURL = self.generatePreviewUrl(urlSpec);
+				previewURL = previewURL.replace('(', '%28');
+				previewURL = previewURL.replace(')', '%29');
+
+				// preload image to prevent delay
+				// this will make the browser cache the image
+				img.onload = function () {
+					// if loading the preview image failed (no preview for the mimetype) then img.width will < 5
+					if (img.width > 5) {
+						ready(previewURL, img);
+					} else if (options.error) {
+						options.error();
+					}
+				};
+				if (options.error) {
+					img.onerror = options.error;
 				}
-			};
-			if (options.error) {
-				img.onerror = options.error;
+				img.src = previewURL;
+			} else {
+				ready(iconURL, img);
 			}
-			img.src = previewURL;
 		},
 
 		/**
diff --git a/core/js/config.php b/core/js/config.php
index dc84d1cf2bf2..ca0185dec7f5 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -154,7 +154,8 @@
 		)
 	),
 	"oc_appconfig" => json_encode(
-			array("core" => array(
+		[
+			"core" => [
 				'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
 				'defaultExpireDate' => $defaultExpireDate,
 				'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
@@ -163,9 +164,10 @@
 				'resharingAllowed' => \OCP\Share::isResharingAllowed(),
 				'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
 				'federatedCloudShareDoc' => \OC::$server->getURLGenerator()->linkToDocs('user-sharing-federated'),
-				'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing()
-				)
-			)
+				'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing(),
+				'previewsEnabled' => \OC::$server->getConfig()->getSystemValue('enable_previews', true) === true,
+			]
+		]
 	),
 	"oc_defaults" => json_encode(
 		array(

From ee6fb9d69987b955e464f2b7a54502f59421985c Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 15 Nov 2016 17:35:41 +0000
Subject: [PATCH 191/219] Added tests about permissions and public upload

Added read and share permissions instead of all (default ones)

Added positive case

Check also permissions update

Added tests for resharing with public links when the user doesn't have enough permisssions
---
 build/integration/features/sharing-v1.feature | 176 ++++++++++++++++++
 1 file changed, 176 insertions(+)

diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index 785e3fb741d6..bfe5fd03f9df 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -916,6 +916,66 @@ Feature: sharing
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
 
+  Scenario: sharing subfolder when parent already shared
+    Given As an "admin"
+    Given user "user0" exists
+    Given user "user1" exists
+    And group "sharing-group" exists
+    And user "user0" created a folder "/test"
+    And user "user0" created a folder "/test/sub"
+    And file "/test" of user "user0" is shared with group "sharing-group"
+    And As an "user0"
+    When sending "POST" to "/apps/files_sharing/api/v1/shares" with
+      | path | /test/sub |
+      | shareWith | user1 |
+      | shareType | 0 |
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+	And as "user1" the folder "/sub" exists
+
+  Scenario: sharing subfolder when parent already shared with group of sharer
+    Given As an "admin"
+    Given user "user0" exists
+    Given user "user1" exists
+    And group "sharing-group" exists
+    And user "user0" belongs to group "sharing-group"
+    And user "user0" created a folder "/test"
+    And user "user0" created a folder "/test/sub"
+    And file "/test" of user "user0" is shared with group "sharing-group"
+    And As an "user0"
+    When sending "POST" to "/apps/files_sharing/api/v1/shares" with
+      | path | /test/sub |
+      | shareWith | user1 |
+      | shareType | 0 |
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+	And as "user1" the folder "/sub" exists
+
+  Scenario: sharing subfolder of already shared folder, GET result is correct
+    Given As an "admin"
+    Given user "user0" exists
+    Given user "user1" exists
+    Given user "user2" exists
+    Given user "user3" exists
+    Given user "user4" exists
+    And user "user0" created a folder "/folder1"
+    And file "/folder1" of user "user0" is shared with user "user1"
+    And file "/folder1" of user "user0" is shared with user "user2"
+	And user "user0" created a folder "/folder1/folder2"
+    And file "/folder1/folder2" of user "user0" is shared with user "user3"
+    And file "/folder1/folder2" of user "user0" is shared with user "user4"
+    And As an "user0"
+    When sending "GET" to "/apps/files_sharing/api/v1/shares"
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+	And the response contains 4 entries
+	And File "/folder1" should be included as path in the response
+	And File "/folder1/folder2" should be included as path in the response
+	And sending "GET" to "/apps/files_sharing/api/v1/shares?path=/folder1/folder2"
+	And the response contains 2 entries
+	And File "/folder1" should not be included as path in the response
+	And File "/folder1/folder2" should be included as path in the response
+
   Scenario: unshare from self
     Given As an "admin"
     And user "user0" exists
@@ -930,3 +990,119 @@ Feature: sharing
     When Deleting last share
     Then etag of element "/" of user "user1" has changed
     And etag of element "/PARENT" of user "user0" has not changed
+
+  Scenario: Increasing permissions is allowed for owner
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And group "new-group" exists
+    And user "user0" belongs to group "new-group"
+    And user "user1" belongs to group "new-group"
+    And Assure user "user0" is subadmin of group "new-group"
+    And As an "user0"
+    And folder "/FOLDER" of user "user0" is shared with group "new-group"
+    And Updating last share with
+      | permissions | 0 |
+    When Updating last share with
+      | permissions | 31 |
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+
+  Scenario: Adding public upload to a read only shared folder as recipient is not allowed
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And As an "user0"
+    And user "user0" created a folder "/test"
+    And folder "/test" of user "user0" is shared with user "user1" with permissions 17
+    And As an "user1"
+    And creating a share with
+      | path | /test |
+      | shareType | 3 |
+      | publicUpload | false |
+    When Updating last share with
+      | publicUpload | true |
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "200"
+
+  Scenario: Adding public upload to a shared folder as recipient is allowed with permissions
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And As an "user0"
+    And user "user0" created a folder "/test"
+    And folder "/test" of user "user0" is shared with user "user1" with permissions 31
+    And As an "user1"
+    And creating a share with
+      | path | /test |
+      | shareType | 3 |
+      | publicUpload | false |
+    When Updating last share with
+      | publicUpload | true |
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+
+  Scenario: Adding public upload to a read only shared folder as recipient is not allowed
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And As an "user0"
+    And user "user0" created a folder "/test"
+    And folder "/test" of user "user0" is shared with user "user1" with permissions 17
+    And As an "user1"
+    And creating a share with
+      | path | /test |
+      | shareType | 3 |
+      | permissions | 1 |
+    When Updating last share with
+      | permissions | 15 |
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "200"
+
+  Scenario: Adding public upload to a shared folder as recipient is allowed with permissions
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And As an "user0"
+    And user "user0" created a folder "/test"
+    And folder "/test" of user "user0" is shared with user "user1" with permissions 31
+    And As an "user1"
+    And creating a share with
+      | path | /test |
+      | shareType | 3 |
+      | permissions | 1 |
+    When Updating last share with
+      | permissions | 15 |
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+
+    Scenario: resharing using a public link with read only permissions is not allowed
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And As an "user0"
+    And user "user0" created a folder "/test"
+    And folder "/test" of user "user0" is shared with user "user1" with permissions 1
+    And As an "user1"
+    And creating a share with
+      | path | /test |
+      | shareType | 3 |
+      | publicUpload | false |
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "200"
+
+  Scenario: resharing using a public link with read and write permissions only is not allowed
+    Given As an "admin"
+    And user "user0" exists
+    And user "user1" exists
+    And As an "user0"
+    And user "user0" created a folder "/test"
+    And folder "/test" of user "user0" is shared with user "user1" with permissions 15
+    And As an "user1"
+    And creating a share with
+      | path | /test |
+      | shareType | 3 |
+      | publicUpload | false |
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "200"
+

From ba2d6def756da776e37121ff4334a1e23bb15abf Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 22 Nov 2016 12:07:45 +0100
Subject: [PATCH 192/219] Correctly convert OCS permissions params

---
 apps/files_sharing/lib/API/Share20OCS.php     |  1 +
 .../tests/API/Share20OCSTest.php              | 57 +++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/apps/files_sharing/lib/API/Share20OCS.php b/apps/files_sharing/lib/API/Share20OCS.php
index 3372e5f2cb2a..62aa24ba4719 100644
--- a/apps/files_sharing/lib/API/Share20OCS.php
+++ b/apps/files_sharing/lib/API/Share20OCS.php
@@ -634,6 +634,7 @@ public function updateShare($id) {
 
 			if ($newPermissions !== null) {
 				$share->setPermissions($newPermissions);
+				$permissions = $newPermissions;
 			}
 
 			if ($expireDate === '') {
diff --git a/apps/files_sharing/tests/API/Share20OCSTest.php b/apps/files_sharing/tests/API/Share20OCSTest.php
index 27ea30860b52..a0a8a4f64f72 100644
--- a/apps/files_sharing/tests/API/Share20OCSTest.php
+++ b/apps/files_sharing/tests/API/Share20OCSTest.php
@@ -1301,6 +1301,7 @@ public function testUpdateLinkShareClear() {
 		$share = $this->newShare();
 		$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
 			->setSharedBy($this->currentUser->getUID())
+			->setShareOwner($this->currentUser->getUID())
 			->setShareType(\OCP\Share::SHARE_TYPE_LINK)
 			->setPassword('password')
 			->setExpirationDate(new \DateTime())
@@ -1347,6 +1348,7 @@ public function testUpdateLinkShareSet() {
 		$share = \OC::$server->getShareManager()->newShare();
 		$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
 			->setSharedBy($this->currentUser->getUID())
+			->setShareOwner($this->currentUser->getUID())
 			->setShareType(\OCP\Share::SHARE_TYPE_LINK)
 			->setNode($folder);
 
@@ -1390,6 +1392,7 @@ public function testUpdateLinkShareEnablePublicUpload($params) {
 		$share = \OC::$server->getShareManager()->newShare();
 		$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
 			->setSharedBy($this->currentUser->getUID())
+			->setShareOwner($this->currentUser->getUID())
 			->setShareType(\OCP\Share::SHARE_TYPE_LINK)
 			->setPassword('password')
 			->setNode($folder);
@@ -1625,6 +1628,7 @@ public function testUpdateLinkSharePublicUploadDoesNotChangeOther() {
 		$share = \OC::$server->getShareManager()->newShare();
 		$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
 			->setSharedBy($this->currentUser->getUID())
+			->setShareOwner($this->currentUser->getUID())
 			->setShareType(\OCP\Share::SHARE_TYPE_LINK)
 			->setPassword('password')
 			->setExpirationDate($date)
@@ -1817,6 +1821,59 @@ public function testUpdateShareCannotIncreasePermissions() {
 		$this->assertEquals($expected->getData(), $result->getData());
 	}
 
+	/**
+	 * @dataProvider publicUploadParamsProvider
+	 */
+	public function testUpdateShareCannotIncreasePermissionsPublicLink($params) {
+		$ocs = $this->mockFormatShare();
+
+		$date = new \DateTime('2000-01-01');
+
+		$folder = $this->getMock('\OCP\Files\Folder');
+
+		$share = \OC::$server->getShareManager()->newShare();
+		$share
+			->setId(42)
+			->setSharedBy('anotheruser')
+			->setShareOwner('anotheruser')
+			->setShareType(\OCP\Share::SHARE_TYPE_USER)
+			->setSharedWith($this->currentUser->getUID())
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setNode($folder);
+
+		$linkShare = \OC::$server->getShareManager()->newShare();
+		$linkShare
+			->setId(43)
+			->setSharedBy($this->currentUser->getUID())
+			->setShareOwner('anotheruser')
+			->setShareType(\OCP\Share::SHARE_TYPE_LINK)
+			->setToken('dummy')
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setNode($folder);
+
+		$this->request
+			->method('getParam')
+			->will($this->returnValueMap($params));
+
+		$this->shareManager->method('getShareById')->with('ocinternal:43')->willReturn($linkShare);
+		$this->shareManager->method('shareApiLinkAllowPublicUpload')->willReturn(true);
+
+		$this->shareManager->expects($this->any())
+			->method('getSharedWith')
+			->will($this->returnValueMap([
+				[$this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_USER, $share->getNode(), -1, 0, [$share]],
+				[$this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0, []],
+			]));
+
+		$this->shareManager->expects($this->never())->method('updateShare');
+
+		$expected = new \OC\OCS\Result(null, 404, 'Cannot increase permissions');
+		$result = $ocs->updateShare(43);
+
+		$this->assertEquals($expected->getMeta(), $result->getMeta());
+		$this->assertEquals($expected->getData(), $result->getData());
+	}
+
 	public function testUpdateShareCanIncreasePermissionsIfOwner() {
 		$ocs = $this->mockFormatShare();
 

From 223bca73abc9c4f773dac77eb8eef01bc84fe20d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Nov 2016 09:43:11 +0100
Subject: [PATCH 193/219] Backport integration test functions from #26610

Partial backport of the integration tests from #26610
---
 .../features/bootstrap/Sharing.php            | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/build/integration/features/bootstrap/Sharing.php b/build/integration/features/bootstrap/Sharing.php
index 2c8c17982505..973d3bc3c922 100644
--- a/build/integration/features/bootstrap/Sharing.php
+++ b/build/integration/features/bootstrap/Sharing.php
@@ -254,6 +254,7 @@ public function isFieldInResponse($field, $contentExpected){
 	 * @param string $filename
 	 */
 	public function checkSharedFileInResponse($filename){
+		$filename = ltrim($filename, '/');
 		PHPUnit_Framework_Assert::assertEquals(True, $this->isFieldInResponse('file_target', "/$filename"));
 	}
 
@@ -263,9 +264,30 @@ public function checkSharedFileInResponse($filename){
 	 * @param string $filename
 	 */
 	public function checkSharedFileNotInResponse($filename){
+		$filename = ltrim($filename, '/');
 		PHPUnit_Framework_Assert::assertEquals(False, $this->isFieldInResponse('file_target', "/$filename"));
 	}
 
+	/**
+	 * @Then /^File "([^"]*)" should be included as path in the response$/
+	 *
+	 * @param string $filename
+	 */
+	public function checkSharedFileAsPathInResponse($filename){
+		$filename = ltrim($filename, '/');
+		PHPUnit_Framework_Assert::assertEquals(True, $this->isFieldInResponse('path', "/$filename"));
+	}
+
+	/**
+	 * @Then /^File "([^"]*)" should not be included as path in the response$/
+	 *
+	 * @param string $filename
+	 */
+	public function checkSharedFileAsPathNotInResponse($filename){
+		$filename = ltrim($filename, '/');
+		PHPUnit_Framework_Assert::assertEquals(False, $this->isFieldInResponse('path', "/$filename"));
+	}
+
 	/**
 	 * @Then /^User "([^"]*)" should be included in the response$/
 	 *
@@ -384,6 +406,14 @@ public function checkingLastShareIDIsNotIncluded(){
 		}
 	}
 
+	/**
+	 * @Then /^the response contains ([0-9]+) entries$/
+	 */
+	public function checkingTheResponseEntriesCount($count){
+		$actualCount = count($this->response->xml()->data[0]);
+		PHPUnit_Framework_Assert::assertEquals($count, $actualCount);
+	}
+
 	/**
 	 * @Then /^Share fields of last share match with$/
 	 * @param \Behat\Gherkin\Node\TableNode|null $body

From e21717029c0fea5812a398d840b1b5348b1e35da Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Nov 2016 17:46:24 +0100
Subject: [PATCH 194/219] Set version to 9.1.3 RC1

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 9b4a027adcc3..497fba1bec2f 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 2, 6);
+$OC_Version = array(9, 1, 3, 0);
 
 // The human readable string
-$OC_VersionString = '9.1.2';
+$OC_VersionString = '9.1.3 RC1';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From 2d1f84ec60460cd940aad790e586aa22d56082d9 Mon Sep 17 00:00:00 2001
From: Mirek Bauer <bauer@cesnet.cz>
Date: Mon, 5 Dec 2016 17:05:51 +0100
Subject: [PATCH 195/219] Backported #26748 fix to stable9.1

---
 settings/Controller/AppSettingsController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php
index c7722267f197..bfa9b026eced 100644
--- a/settings/Controller/AppSettingsController.php
+++ b/settings/Controller/AppSettingsController.php
@@ -289,6 +289,8 @@ public function listApps($category = '', $includeUpdateInfo = true) {
 			$groups = array();
 			if (is_string($app['groups'])) {
 				$groups = json_decode($app['groups']);
+			} elseif (is_array($app['groups'])) {
+				$groups = $app['groups'];
 			}
 			$app['groups'] = $groups;
 			$app['canUnInstall'] = !$app['active'] && $app['removable'];

From f42b1e5d35af7dc0d9359116ca8daab7016cef3e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 6 Dec 2016 16:41:15 +0100
Subject: [PATCH 196/219] [stable9.1] When grouping shares, sort by stime then
 id

If share times are equal, the first share should still win instead of
having the shares swapped.
---
 apps/files_sharing/lib/MountProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php
index 54f9feabde65..46b3597bed75 100644
--- a/apps/files_sharing/lib/MountProvider.php
+++ b/apps/files_sharing/lib/MountProvider.php
@@ -121,7 +121,7 @@ private function groupShares(array $shares) {
 		// sort by stime, the super share will be based on the least recent share
 		foreach ($tmp as &$tmp2) {
 			@usort($tmp2, function($a, $b) {
-				if ($a->getShareTime() < $b->getShareTime()) {
+				if ($a->getShareTime() <= $b->getShareTime()) {
 					return -1;
 				}
 				return 1;

From b6e85c54d50fb562bfe9a034105020ea0a335bd1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 10 Oct 2016 12:29:06 +0200
Subject: [PATCH 197/219] Fix DAV stat cache to properly cache 404

404 errors were not properly cached due to catching the wrong
exception. Now catching ClientHttpException and checking the error
code. In case of 404, adjust the stat cache accordingly.
---
 lib/private/Files/Storage/DAV.php | 99 ++++++++++++++++---------------
 1 file changed, 50 insertions(+), 49 deletions(-)

diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
index 7eb6aa199b14..960a36018772 100644
--- a/lib/private/Files/Storage/DAV.php
+++ b/lib/private/Files/Storage/DAV.php
@@ -47,7 +47,6 @@
 use OCP\Files\StorageNotAvailableException;
 use OCP\Util;
 use Sabre\DAV\Client;
-use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\Xml\Property\ResourceType;
 use Sabre\HTTP\ClientException;
 use Sabre\HTTP\ClientHttpException;
@@ -207,8 +206,10 @@ public function opendir($path) {
 				array(),
 				1
 			);
-			$id = md5('webdav' . $this->root . $path);
-			$content = array();
+			if ($response === false) {
+				return false;
+			}
+			$content = [];
 			$files = array_keys($response);
 			array_shift($files); //the first entry is the current directory
 
@@ -225,13 +226,6 @@ public function opendir($path) {
 				$content[] = $file;
 			}
 			return IteratorDirectory::wrap($content);
-		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 404) {
-				$this->statCache->clear($path . '/');
-				$this->statCache->set($path, false);
-				return false;
-			}
-			$this->convertException($e, $path);
 		} catch (\Exception $e) {
 			$this->convertException($e, $path);
 		}
@@ -246,17 +240,13 @@ public function opendir($path) {
 	 *
 	 * @param string $path path to propfind
 	 *
-	 * @return array propfind response
+	 * @return array|boolean propfind response or false if the entry was not found
 	 *
-	 * @throws NotFound
+	 * @throws ClientHttpException
 	 */
 	protected function propfind($path) {
 		$path = $this->cleanPath($path);
 		$cachedResponse = $this->statCache->get($path);
-		if ($cachedResponse === false) {
-			// we know it didn't exist
-			throw new NotFound();
-		}
 		// we either don't know it, or we know it exists but need more details
 		if (is_null($cachedResponse) || $cachedResponse === true) {
 			$this->init();
@@ -274,11 +264,15 @@ protected function propfind($path) {
 					)
 				);
 				$this->statCache->set($path, $response);
-			} catch (NotFound $e) {
-				// remember that this path did not exist
-				$this->statCache->clear($path . '/');
-				$this->statCache->set($path, false);
-				throw $e;
+			} catch (ClientHttpException $e) {
+				if ($e->getHttpStatus() === 404) {
+					$this->statCache->clear($path . '/');
+					$this->statCache->set($path, false);
+					return false;
+				}
+				$this->convertException($e, $path);
+			} catch (\Exception $e) {
+				$this->convertException($e, $path);
 			}
 		} else {
 			$response = $cachedResponse;
@@ -290,17 +284,15 @@ protected function propfind($path) {
 	public function filetype($path) {
 		try {
 			$response = $this->propfind($path);
-			$responseType = array();
+			if ($response === false) {
+				return false;
+			}
+			$responseType = [];
 			if (isset($response["{DAV:}resourcetype"])) {
 				/** @var ResourceType[] $response */
 				$responseType = $response["{DAV:}resourcetype"]->getValue();
 			}
 			return (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
-		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 404) {
-				return false;
-			}
-			$this->convertException($e, $path);
 		} catch (\Exception $e) {
 			$this->convertException($e, $path);
 		}
@@ -319,13 +311,7 @@ public function file_exists($path) {
 				return true;
 			}
 			// need to get from server
-			$this->propfind($path);
-			return true; //no 404 exception
-		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 404) {
-				return false;
-			}
-			$this->convertException($e, $path);
+			return ($this->propfind($path) !== false);
 		} catch (\Exception $e) {
 			$this->convertException($e, $path);
 		}
@@ -430,7 +416,10 @@ public function free_space($path) {
 		$path = $this->cleanPath($path);
 		try {
 			// TODO: cacheable ?
-			$response = $this->client->propfind($this->encodePath($path), array('{DAV:}quota-available-bytes'));
+			$response = $this->client->propfind($this->encodePath($path), ['{DAV:}quota-available-bytes']);
+			if ($response === false) {
+				return FileInfo::SPACE_UNKNOWN;
+			}
 			if (isset($response['{DAV:}quota-available-bytes'])) {
 				return (int)$response['{DAV:}quota-available-bytes'];
 			} else {
@@ -456,6 +445,9 @@ public function touch($path, $mtime = null) {
 				$this->client->proppatch($this->encodePath($path), ['{DAV:}lastmodified' => $mtime]);
 				// non-owncloud clients might not have accepted the property, need to recheck it
 				$response = $this->client->propfind($this->encodePath($path), ['{DAV:}getlastmodified'], 0);
+				if ($response === false) {
+					return false;
+				}
 				if (isset($response['{DAV:}getlastmodified'])) {
 					$remoteMtime = strtotime($response['{DAV:}getlastmodified']);
 					if ($remoteMtime !== $mtime) {
@@ -578,15 +570,13 @@ public function copy($path1, $path2) {
 	public function stat($path) {
 		try {
 			$response = $this->propfind($path);
-			return array(
+			if ($response === false) {
+				return [];
+			}
+			return [
 				'mtime' => strtotime($response['{DAV:}getlastmodified']),
 				'size' => (int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
-			);
-		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 404) {
-				return array();
-			}
-			$this->convertException($e, $path);
+			];
 		} catch (\Exception $e) {
 			$this->convertException($e, $path);
 		}
@@ -597,7 +587,10 @@ public function stat($path) {
 	public function getMimeType($path) {
 		try {
 			$response = $this->propfind($path);
-			$responseType = array();
+			if ($response === false) {
+				return false;
+			}
+			$responseType = [];
 			if (isset($response["{DAV:}resourcetype"])) {
 				/** @var ResourceType[] $response */
 				$responseType = $response["{DAV:}resourcetype"]->getValue();
@@ -610,11 +603,6 @@ public function getMimeType($path) {
 			} else {
 				return false;
 			}
-		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 404) {
-				return false;
-			}
-			$this->convertException($e, $path);
 		} catch (\Exception $e) {
 			$this->convertException($e, $path);
 		}
@@ -705,6 +693,9 @@ public function getPermissions($path) {
 		$this->init();
 		$path = $this->cleanPath($path);
 		$response = $this->propfind($path);
+		if ($response === false) {
+			return 0;
+		}
 		if (isset($response['{http://owncloud.org/ns}permissions'])) {
 			return $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
 		} else if ($this->is_dir($path)) {
@@ -721,6 +712,9 @@ public function getETag($path) {
 		$this->init();
 		$path = $this->cleanPath($path);
 		$response = $this->propfind($path);
+		if ($response === false) {
+			return null;
+		}
 		if (isset($response['{DAV:}getetag'])) {
 			return trim($response['{DAV:}getetag'], '"');
 		}
@@ -764,6 +758,13 @@ public function hasUpdated($path, $time) {
 			// force refresh for $path
 			$this->statCache->remove($path);
 			$response = $this->propfind($path);
+			if ($response === false) {
+				if ($path === '') {
+					// if root is gone it means the storage is not available
+					throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+				}
+				return false;
+			}
 			if (isset($response['{DAV:}getetag'])) {
 				$cachedData = $this->getCache()->get($path);
 				$etag = null;
@@ -786,7 +787,7 @@ public function hasUpdated($path, $time) {
 				return $remoteMtime > $time;
 			}
 		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 404 || $e->getHttpStatus() === 405) {
+			if ($e->getHttpStatus() === 405) {
 				if ($path === '') {
 					// if root is gone it means the storage is not available
 					throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());

From 12cee6e1855d46d45701be176135c2077ba9acb3 Mon Sep 17 00:00:00 2001
From: Semih Serhat Karakaya <karakayasemi@itu.edu.tr>
Date: Sun, 16 Oct 2016 19:53:42 +0300
Subject: [PATCH 198/219] Update file.php post hook calls

Logicaly, postHooks should emit after touch. For chunking file it is already emitting after touch.
---
 apps/dav/lib/Connector/Sabre/File.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
index 6ecb6e620662..363111c8a8e8 100644
--- a/apps/dav/lib/Connector/Sabre/File.php
+++ b/apps/dav/lib/Connector/Sabre/File.php
@@ -202,10 +202,6 @@ public function put($data) {
 				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
 			}
 
-			if ($view) {
-				$this->emitPostHooks($exists);
-			}
-
 			// allow sync clients to send the mtime along in a header
 			$request = \OC::$server->getRequest();
 			if (isset($request->server['HTTP_X_OC_MTIME'])) {
@@ -214,6 +210,10 @@ public function put($data) {
 				}
 			}
 
+			if ($view) {
+				$this->emitPostHooks($exists);
+			}
+
 			$this->refreshInfo();
 
 			if (isset($request->server['HTTP_OC_CHECKSUM'])) {

From 7f50c280bc51119e5e7b6cbb2cf925760b7246a1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 6 Dec 2016 17:35:57 +0100
Subject: [PATCH 199/219] Remove obsolete RepairLegacyStorages repair step

---
 lib/private/Repair.php                        |   2 -
 lib/private/Repair/RepairLegacyStorages.php   | 253 -------------
 tests/lib/Repair/RepairLegacyStoragesTest.php | 335 ------------------
 3 files changed, 590 deletions(-)
 delete mode 100644 lib/private/Repair/RepairLegacyStorages.php
 delete mode 100644 tests/lib/Repair/RepairLegacyStoragesTest.php

diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index c49faeaca2dc..5c8d5c60499d 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -42,7 +42,6 @@
 use OC\Repair\DropOldTables;
 use OC\Repair\FillETags;
 use OC\Repair\InnoDB;
-use OC\Repair\RepairLegacyStorages;
 use OC\Repair\RepairMimeTypes;
 use OC\Repair\SearchLuceneTables;
 use OC\Repair\UpdateOutdatedOcsIds;
@@ -126,7 +125,6 @@ public function addStep($repairStep) {
 	public static function getRepairSteps() {
 		return [
 			new RepairMimeTypes(\OC::$server->getConfig()),
-			new RepairLegacyStorages(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
 			new AssetCache(),
 			new FillETags(\OC::$server->getDatabaseConnection()),
 			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
diff --git a/lib/private/Repair/RepairLegacyStorages.php b/lib/private/Repair/RepairLegacyStorages.php
deleted file mode 100644
index 096300f51c24..000000000000
--- a/lib/private/Repair/RepairLegacyStorages.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @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/>
- *
- */
-
-namespace OC\Repair;
-
-use OC\Files\Cache\Storage;
-use OC\RepairException;
-use OCP\Migration\IOutput;
-use OCP\Migration\IRepairStep;
-
-class RepairLegacyStorages implements IRepairStep{
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var \OCP\IDBConnection
-	 */
-	protected $connection;
-
-	protected $findStorageInCacheStatement;
-	protected $renameStorageStatement;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct($config, $connection) {
-		$this->connection = $connection;
-		$this->config = $config;
-
-		$this->findStorageInCacheStatement = $this->connection->prepare(
-			'SELECT DISTINCT `storage` FROM `*PREFIX*filecache`'
-			. ' WHERE `storage` in (?, ?)'
-		);
-		$this->renameStorageStatement = $this->connection->prepare(
-			'UPDATE `*PREFIX*storages`'
-			. ' SET `id` = ?'
-			. ' WHERE `id` = ?'
-		);
-	}
-
-	public function getName() {
-		return 'Repair legacy storages';
-	}
-
-	/**
-	 * Extracts the user id	from a legacy storage id
-	 *
-	 * @param string $storageId legacy storage id in the
-	 * format "local::/path/to/datadir/userid"
-	 * @return string user id extracted from the storage id
-	 */
-	private function extractUserId($storageId) {
-		$storageId = rtrim($storageId, '/');
-		$pos = strrpos($storageId, '/');
-		return substr($storageId, $pos + 1);
-	}
-
-	/**
-	 * Fix the given legacy storage by renaming the old id
-	 * to the new id. If the new id already exists, whichever
-	 * storage that has data in the file cache will be used.
-	 * If both have data, nothing will be done and false is
-	 * returned.
-	 *
-	 * @param string $oldId old storage id
-	 * @param int $oldNumericId old storage numeric id
-	 * @param string $userId
-	 * @return bool true if fixed, false otherwise
-	 * @throws RepairException
-	 */
-	private function fixLegacyStorage($oldId, $oldNumericId, $userId = null) {
-		// check whether the new storage already exists
-		if (is_null($userId)) {
-			$userId = $this->extractUserId($oldId);
-		}
-		$newId = 'home::' . $userId;
-
-		// check if target id already exists
-		$newNumericId = Storage::getNumericStorageId($newId);
-		if (!is_null($newNumericId)) {
-			$newNumericId = (int)$newNumericId;
-			// try and resolve the conflict
-			// check which one of "local::" or "home::" needs to be kept
-			$this->findStorageInCacheStatement->execute(array($oldNumericId, $newNumericId));
-			$row1 = $this->findStorageInCacheStatement->fetch();
-			$row2 = $this->findStorageInCacheStatement->fetch();
-			$this->findStorageInCacheStatement->closeCursor();
-			if ($row2 !== false) {
-				// two results means both storages have data, not auto-fixable
-				throw new RepairException(
-					'Could not automatically fix legacy storage '
-					. '"' . $oldId . '" => "' . $newId . '"'
-					. ' because they both have data.'
-				);
-			}
-			if ($row1 === false || (int)$row1['storage'] === $oldNumericId) {
-				// old storage has data, then delete the empty new id
-				$toDelete = $newId;
-			} else if ((int)$row1['storage'] === $newNumericId) {
-				// new storage has data, then delete the empty old id
-				$toDelete = $oldId;
-			} else {
-				// unknown case, do not continue
-				return false;
-			}
-
-			// delete storage including file cache
-			Storage::remove($toDelete);
-
-			// if we deleted the old id, the new id will be used
-			// automatically
-			if ($toDelete === $oldId) {
-				// nothing more to do
-				return true;
-			}
-		}
-
-		// rename old id to new id
-		$newId = Storage::adjustStorageId($newId);
-		$oldId = Storage::adjustStorageId($oldId);
-		$rowCount = $this->renameStorageStatement->execute(array($newId, $oldId));
-		$this->renameStorageStatement->closeCursor();
-		return ($rowCount === 1);
-	}
-
-	/**
-	 * Converts legacy home storage ids in the format
-	 * "local::/data/dir/path/userid/" to the new format "home::userid"
-	 */
-	public function run(IOutput $out) {
-		// only run once
-		if ($this->config->getAppValue('core', 'repairlegacystoragesdone') === 'yes') {
-			return;
-		}
-
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/');
-		$dataDir = rtrim($dataDir, '/') . '/';
-		$dataDirId = 'local::' . $dataDir;
-
-		$count = 0;
-		$hasWarnings = false;
-
-		$this->connection->beginTransaction();
-
-		// note: not doing a direct UPDATE with the REPLACE function
-		// because regexp search/extract is needed and it is not guaranteed
-		// to work on all database types
-		$sql = 'SELECT `id`, `numeric_id` FROM `*PREFIX*storages`'
-			. ' WHERE `id` LIKE ?'
-			. ' ORDER BY `id`';
-		$result = $this->connection->executeQuery($sql, array($this->connection->escapeLikeParameter($dataDirId) . '%'));
-
-		while ($row = $result->fetch()) {
-			$currentId = $row['id'];
-			// one entry is the datadir itself
-			if ($currentId === $dataDirId) {
-				continue;
-			}
-
-			try {
-				if ($this->fixLegacyStorage($currentId, (int)$row['numeric_id'])) {
-					$count++;
-				}
-			}
-			catch (RepairException $e) {
-				$hasWarnings = true;
-				$out->warning('Could not repair legacy storage ' . $currentId . ' automatically.');
-			}
-		}
-
-		// check for md5 ids, not in the format "prefix::"
-		$sql = 'SELECT COUNT(*) AS "c" FROM `*PREFIX*storages`'
-			. ' WHERE `id` NOT LIKE \'%::%\'';
-		$result = $this->connection->executeQuery($sql);
-		$row = $result->fetch();
-
-		// find at least one to make sure it's worth
-		// querying the user list
-		if ((int)$row['c'] > 0) {
-			$userManager = \OC::$server->getUserManager();
-
-			// use chunks to avoid caching too many users in memory
-			$limit = 30;
-			$offset = 0;
-
-			do {
-				// query the next page of users
-				$results = $userManager->search('', $limit, $offset);
-				$storageIds = array();
-				foreach ($results as $uid => $userObject) {
-					$storageId = $dataDirId . $uid . '/';
-					if (strlen($storageId) <= 64) {
-						// skip short storage ids as they were handled in the previous section
-						continue;
-					}
-					$storageIds[$uid] = $storageId;
-				}
-
-				if (count($storageIds) > 0) {
-					// update the storages of these users
-					foreach ($storageIds as $uid => $storageId) {
-						$numericId = Storage::getNumericStorageId($storageId);
-						try {
-							if (!is_null($numericId) && $this->fixLegacyStorage($storageId, (int)$numericId)) {
-								$count++;
-							}
-						}
-						catch (RepairException $e) {
-							$hasWarnings = true;
-							$out->warning('Could not repair legacy storage ' . $storageId . ' automatically.');
-						}
-					}
-				}
-				$offset += $limit;
-			} while (count($results) >= $limit);
-		}
-
-		$out->info('Updated ' . $count . ' legacy home storage ids');
-
-		$this->connection->commit();
-
-		if ($hasWarnings) {
-			$out->warning('Some legacy storages could not be repaired. Please manually fix them then re-run ./occ maintenance:repair');
-		} else {
-			// if all were done, no need to redo the repair during next upgrade
-			$this->config->setAppValue('core', 'repairlegacystoragesdone', 'yes');
-		}
-	}
-}
diff --git a/tests/lib/Repair/RepairLegacyStoragesTest.php b/tests/lib/Repair/RepairLegacyStoragesTest.php
deleted file mode 100644
index aa51fe06a356..000000000000
--- a/tests/lib/Repair/RepairLegacyStoragesTest.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace Test\Repair;
-
-use OC\Files\Cache\Cache;
-use OC\Files\Cache\Storage;
-use OCP\Migration\IOutput;
-use PHPUnit_Framework_MockObject_MockObject;
-use Test\TestCase;
-
-/**
- * Tests for the converting of legacy storages to home storages.
- *
- * @group DB
- *
- * @see \OC\Repair\RepairLegacyStorages
- */
-class RepairLegacyStoragesTest extends TestCase {
-	/** @var \OCP\IDBConnection */
-	private $connection;
-	/** @var \OCP\IConfig */
-	private $config;
-	private $user;
-	/** @var \OC\Repair\RepairLegacyStorages */
-	private $repair;
-
-	private $dataDir;
-	private $oldDataDir;
-
-	private $legacyStorageId;
-	private $newStorageId;
-
-	/** @var IOutput | PHPUnit_Framework_MockObject_MockObject */
-	private $outputMock;
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->config = \OC::$server->getConfig();
-		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->oldDataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/');
-
-		$this->repair = new \OC\Repair\RepairLegacyStorages($this->config, $this->connection);
-
-		$this->outputMock = $this->getMockBuilder('\OCP\Migration\IOutput')
-			->disableOriginalConstructor()
-			->getMock();
-	}
-
-	protected function tearDown() {
-		$user = \OC::$server->getUserManager()->get($this->user);
-		if ($user) {
-			$user->delete();
-		}
-
-		$sql = 'DELETE FROM `*PREFIX*storages`';
-		$this->connection->executeQuery($sql);
-		$sql = 'DELETE FROM `*PREFIX*filecache`';
-		$this->connection->executeQuery($sql);
-		$this->config->setSystemValue('datadirectory', $this->oldDataDir);
-		$this->config->setAppValue('core', 'repairlegacystoragesdone', 'no');
-
-		parent::tearDown();
-	}
-
-	/**
-	 * @param string $dataDir
-	 * @param string $userId
-	 * @throws \Exception
-	 */
-	function prepareSettings($dataDir, $userId) {
-		// hard-coded string as we want a predictable fixed length
-		// no data will be written there
-		$this->dataDir = $dataDir;
-		$this->config->setSystemValue('datadirectory', $this->dataDir);
-
-		$this->user = $userId;
-		$this->legacyStorageId = 'local::' . $this->dataDir . $this->user . '/';
-		$this->newStorageId = 'home::' . $this->user;
-		\OC::$server->getUserManager()->createUser($this->user, $this->user);
-	}
-
-	/**
-	 * Create a storage entry
-	 *
-	 * @param string $storageId
-	 * @return int
-	 */
-	private function createStorage($storageId) {
-		$sql = 'INSERT INTO `*PREFIX*storages` (`id`)'
-			. ' VALUES (?)';
-
-		$storageId = Storage::adjustStorageId($storageId);
-		$numRows = $this->connection->executeUpdate($sql, array($storageId));
-		$this->assertEquals(1, $numRows);
-
-		return \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*storages');
-	}
-
-	/**
-	 * Returns the storage id based on the numeric id
-	 *
-	 * @param int $storageId numeric id of the storage
-	 * @return string storage id or null if not found
-	 */
-	private function getStorageId($storageId) {
-		$numericId = Storage::getNumericStorageId($storageId);
-		if (!is_null($numericId)) {
-			return (int)$numericId;
-		}
-		return null;
-	}
-
-	/**
-	 * Create dummy data in the filecache for the given storage numeric id
-	 *
-	 * @param string $storageId storage id
-	 */
-	private function createData($storageId) {
-		$cache = new Cache($storageId);
-		$cache->put(
-			'dummyfile.txt',
-			array('size' => 5, 'mtime' => 12, 'mimetype' => 'text/plain')
-		);
-	}
-
-	/**
-	 * Test that existing home storages are left alone when valid.
-	 *
-	 * @dataProvider settingsProvider
-	 *
-	 * @param string $dataDir
-	 * @param string $userId
-	 */
-	public function testNoopWithExistingHomeStorage($dataDir, $userId) {
-		$this->prepareSettings($dataDir, $userId);
-		$newStorageNumId = $this->createStorage($this->newStorageId);
-
-		$this->repair->run($this->outputMock);
-
-		$this->assertNull($this->getStorageId($this->legacyStorageId));
-		$this->assertEquals($newStorageNumId, $this->getStorageId($this->newStorageId));
-	}
-
-	/**
-	 * Test that legacy storages are converted to home storages when
-	 * the latter does not exist.
-	 *
-	 * @dataProvider settingsProvider
-	 *
-	 * @param string $dataDir
-	 * @param string $userId
-	 */
-	public function testConvertLegacyToHomeStorage($dataDir, $userId) {
-		$this->prepareSettings($dataDir, $userId);
-		$legacyStorageNumId = $this->createStorage($this->legacyStorageId);
-
-		$this->repair->run($this->outputMock);
-
-		$this->assertNull($this->getStorageId($this->legacyStorageId));
-		$this->assertEquals($legacyStorageNumId, $this->getStorageId($this->newStorageId));
-	}
-
-	/**
-	 * Test that legacy storages are converted to home storages
-	 * when home storage already exists but has no data.
-	 *
-	 * @dataProvider settingsProvider
-	 *
-	 * @param string $dataDir
-	 * @param string $userId
-	 */
-	public function testConvertLegacyToExistingEmptyHomeStorage($dataDir, $userId) {
-		$this->prepareSettings($dataDir, $userId);
-		$legacyStorageNumId = $this->createStorage($this->legacyStorageId);
-		$this->createStorage($this->newStorageId);
-
-		$this->createData($this->legacyStorageId);
-
-		$this->repair->run($this->outputMock);
-
-		$this->assertNull($this->getStorageId($this->legacyStorageId));
-		$this->assertEquals($legacyStorageNumId, $this->getStorageId($this->newStorageId));
-	}
-
-	/**
-	 * Test that legacy storages are converted to home storages
-	 * when home storage already exists and the legacy storage
-	 * has no data.
-	 *
-	 * @dataProvider settingsProvider
-	 *
-	 * @param string $dataDir
-	 * @param string $userId
-	 */
-	public function testConvertEmptyLegacyToHomeStorage($dataDir, $userId) {
-		$this->prepareSettings($dataDir, $userId);
-		$this->createStorage($this->legacyStorageId);
-		$newStorageNumId = $this->createStorage($this->newStorageId);
-
-		$this->createData($this->newStorageId);
-
-		$this->repair->run($this->outputMock);
-
-		$this->assertNull($this->getStorageId($this->legacyStorageId));
-		$this->assertEquals($newStorageNumId, $this->getStorageId($this->newStorageId));
-	}
-
-	/**
-	 * Test that nothing is done when both conflicting legacy
-	 * and home storage have data.
-	 *
-	 * @dataProvider settingsProvider
-	 *
-	 * @param string $dataDir
-	 * @param string $userId
-	 */
-	public function testConflictNoop($dataDir, $userId) {
-		$this->prepareSettings($dataDir, $userId);
-		$legacyStorageNumId = $this->createStorage($this->legacyStorageId);
-		$newStorageNumId = $this->createStorage($this->newStorageId);
-
-		$this->createData($this->legacyStorageId);
-		$this->createData($this->newStorageId);
-
-		$this->outputMock->expects($this->exactly(2))->method('warning');
-		$this->repair->run($this->outputMock);
-
-		// storages left alone
-		$this->assertEquals($legacyStorageNumId, $this->getStorageId($this->legacyStorageId));
-		$this->assertEquals($newStorageNumId, $this->getStorageId($this->newStorageId));
-
-		// do not set the done flag
-		$this->assertNotEquals('yes', $this->config->getAppValue('core', 'repairlegacystoragesdone'));
-	}
-
-	/**
-	 * Test that the data dir local entry is left alone
-	 *
-	 * @dataProvider settingsProvider
-	 *
-	 * @param string $dataDir
-	 * @param string $userId
-	 */
-	public function testDataDirEntryNoop($dataDir, $userId) {
-		$this->prepareSettings($dataDir, $userId);
-		$storageId = 'local::' . $this->dataDir;
-		$numId = $this->createStorage($storageId);
-
-		$this->repair->run($this->outputMock);
-
-		$this->assertEquals($numId, $this->getStorageId($storageId));
-	}
-
-	/**
-	 * Test that external local storages are left alone
-	 *
-	 * @dataProvider settingsProvider
-	 *
-	 * @param string $dataDir
-	 * @param string $userId
-	 */
-	public function testLocalExtStorageNoop($dataDir, $userId) {
-		$this->prepareSettings($dataDir, $userId);
-		$storageId = 'local::/tmp/somedir/' . $this->user;
-		$numId = $this->createStorage($storageId);
-
-		$this->repair->run($this->outputMock);
-
-		$this->assertEquals($numId, $this->getStorageId($storageId));
-	}
-
-	/**
-	 * Test that other external storages are left alone
-	 *
-	 * @dataProvider settingsProvider
-	 *
-	 * @param string $dataDir
-	 * @param string $userId
-	 */
-	public function testExtStorageNoop($dataDir, $userId) {
-		$this->prepareSettings($dataDir, $userId);
-		$storageId = 'smb::user@password/tmp/somedir/' . $this->user;
-		$numId = $this->createStorage($storageId);
-
-		$this->repair->run($this->outputMock);
-
-		$this->assertEquals($numId, $this->getStorageId($storageId));
-	}
-
-	/**
-	 * Provides data dir and user name
-	 */
-	function settingsProvider() {
-		return array(
-			// regular data dir
-			array(
-				'/tmp/oc-autotest/datadir/',
-				$this->getUniqueID('user_'),
-			),
-			// long datadir / short user
-			array(
-				'/tmp/oc-autotest/datadir01234567890123456789012345678901234567890123456789END/',
-				$this->getUniqueID('user_'),
-			),
-			// short datadir / long user
-			array(
-				'/tmp/oc-autotest/datadir/',
-				'u123456789012345678901234567890123456789012345678901234567890END', // 64 chars
-			),
-		);
-	}
-
-	/**
-	 * Only run the repair once
-	 */
-	public function testOnlyRunOnce() {
-		$this->outputMock->expects($this->exactly(1))->method('info');
-
-		$this->prepareSettings('/tmp/oc-autotest/datadir', $this->getUniqueID('user_'));
-		$this->assertNotEquals('yes', $this->config->getAppValue('core', 'repairlegacystoragesdone'));
-		$this->repair->run($this->outputMock);
-		$this->assertEquals('yes', $this->config->getAppValue('core', 'repairlegacystoragesdone'));
-
-		$this->outputMock->expects($this->never())->method('info');
-		$this->repair->run($this->outputMock);
-		$this->assertEquals('yes', $this->config->getAppValue('core', 'repairlegacystoragesdone'));
-	}
-}

From ae5ae4a805324240a9e9262bb1628a2172943e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 29 Sep 2016 10:16:13 +0200
Subject: [PATCH 200/219] Prevent user with empty uid

---
 apps/user_ldap/lib/User/User.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index d45e19b39d61..2ebee207a65b 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
@@ -110,6 +111,12 @@ public function __construct($username, $dn, IUserTools $access,
 		IConfig $config, FilesystemHelper $fs, Image $image,
 		LogWrapper $log, IAvatarManager $avatarManager, IUserManager $userManager) {
 
+		if ($username === null) {
+			throw new \InvalidArgumentException("uid for '$dn' must not be null!");
+		} else if ($username === '') {
+			throw new \InvalidArgumentException("uid for '$dn' must not be an empty string!");
+		}
+
 		$this->access        = $access;
 		$this->connection    = $access->getConnection();
 		$this->config        = $config;

From f9a867b70c217463289a741d4d26079eb2a80dfd Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 12 Dec 2016 18:17:54 +0100
Subject: [PATCH 201/219] Set version to 9.1.3

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 497fba1bec2f..605dd0582c94 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 3, 0);
+$OC_Version = array(9, 1, 3, 1);
 
 // The human readable string
-$OC_VersionString = '9.1.3 RC1';
+$OC_VersionString = '9.1.3';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 0);
 

From bf726da7571399e52a0f168bb6ecb774ee5509c4 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Mon, 12 Dec 2016 16:51:27 +0300
Subject: [PATCH 202/219] Do not validate return code is set is successful

---
 lib/private/Memcache/Memcached.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/private/Memcache/Memcached.php b/lib/private/Memcache/Memcached.php
index d02b62edb0e4..123e48f6b2eb 100644
--- a/lib/private/Memcache/Memcached.php
+++ b/lib/private/Memcache/Memcached.php
@@ -109,7 +109,9 @@ public function set($key, $value, $ttl = 0) {
 		} else {
 			$result = self::$cache->set($this->getNamespace() . $key, $value);
 		}
-		$this->verifyReturnCode();
+		if ($result !== true) {
+			$this->verifyReturnCode();
+		}
 		return $result;
 	}
 

From 1c6eff4826ed45642dc7e9a5b26f41964d47280b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= <sbertolin@solidgear.es>
Date: Fri, 16 Dec 2016 21:28:52 +0100
Subject: [PATCH 203/219] [Stable9.1] Add integration test for creating folder
 with colon (#26814)

* Add integration test for creating folder with colon

* Update submodule for sabre/uri update

* Update 3rdparty commit
---
 3rdparty                                         |  2 +-
 build/integration/features/bootstrap/WebDav.php  |  9 +++++++++
 .../integration/features/webdav-related.feature  | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index f65a242bbd11..9545bcc78466 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit f65a242bbd116405b13997ca0e4b6a545e290c75
+Subproject commit 9545bcc784665a9c4e7f1256d0eaaf1a39c861cf
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 259ebdfecdab..97aaf4fffabc 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -3,6 +3,7 @@
 use GuzzleHttp\Client as GClient;
 use GuzzleHttp\Message\ResponseInterface;
 use Sabre\DAV\Client as SClient;
+use Sabre\DAV\Xml\Property\ResourceType;
 
 require __DIR__ . '/../../vendor/autoload.php';
 
@@ -296,6 +297,14 @@ public function theSingleResponseShouldContainAPropertyWithValue($key, $expected
 		}
 
 		$value = $keys[$key];
+		if ($value instanceof ResourceType) {
+			$value = $value->getValue();
+			if (empty($value)) {
+				$value = '';
+			} else {
+				$value = $value[0];
+			}
+		}
 		if ($value != $expectedValue) {
 			throw new \Exception("Property \"$key\" found with value \"$value\", expected \"$expectedValue\"");
 		}
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index 9d283402f729..ac7e7969f79e 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -414,3 +414,19 @@ Feature: webdav-related
 		When Downloading file "/welcome.txt" as "userToBeDisabled"
 		Then the HTTP status code should be "503"
 
+	Scenario: Creating a folder
+		Given using old dav path
+		And user "user0" exists
+		And user "user0" created a folder "/test_folder"
+		When as "user0" gets properties of folder "/test_folder" with
+		  |{DAV:}resourcetype|
+		Then the single response should contain a property "{DAV:}resourcetype" with value "{DAV:}collection"
+
+	Scenario: Creating a folder with special chars
+		Given using old dav path
+		And user "user0" exists
+		And user "user0" created a folder "/test_folder:5"
+		When as "user0" gets properties of folder "/test_folder:5" with
+		  |{DAV:}resourcetype|
+		Then the single response should contain a property "{DAV:}resourcetype" with value "{DAV:}collection"
+

From 1bcc136d9086f49d7e4f2afca95e9e97514c8caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 19 Dec 2016 15:40:36 +0100
Subject: [PATCH 204/219] Just use moment to comupte the time left for the
 upload - translations are delivered as part of moment.js - fixes #26804

---
 apps/files/js/file-upload.js | 40 +++---------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index c4b3d25d1ee9..663fee0ad251 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -606,43 +606,9 @@ OC.Upload = {
 						bufferIndex = (bufferIndex + 1) % bufferSize;
 					}
 					var smoothRemainingSeconds = (bufferTotal / bufferSize); //seconds
-					var date = new Date(smoothRemainingSeconds * 1000);
-					var timeStringDesktop = "";
-					var timeStringMobile = ""; 
-					if(date.getUTCHours() > 0){
-						timeStringDesktop = t('files', '{hours}:{minutes}:{seconds} hour{plural_s} left' , { 
-							hours:date.getUTCHours(),
-							minutes: ('0' + date.getUTCMinutes()).slice(-2),
-							seconds: ('0' + date.getUTCSeconds()).slice(-2),
-							plural_s: ( smoothRemainingSeconds === 3600  ? "": "s") // 1 hour = 1*60m*60s = 3600s
-						});						
-						timeStringMobile = t('files', '{hours}:{minutes}h' , {
-							hours:date.getUTCHours(),
-							minutes: ('0' + date.getUTCMinutes()).slice(-2),
-							seconds: ('0' + date.getUTCSeconds()).slice(-2)
-						});
-					} else if(date.getUTCMinutes() > 0){
-						timeStringDesktop = t('files', '{minutes}:{seconds} minute{plural_s} left' , {
-							minutes: date.getUTCMinutes(),
-							seconds: ('0' + date.getUTCSeconds()).slice(-2),
-							plural_s: (smoothRemainingSeconds === 60 ? "": "s") // 1 minute = 1*60s = 60s
-						}); 
-						timeStringMobile = t('files', '{minutes}:{seconds}m' , {
-							minutes: date.getUTCMinutes(),
-							seconds: ('0' + date.getUTCSeconds()).slice(-2)
-						});
-					} else if(date.getUTCSeconds() > 0){ 
-						timeStringDesktop = t('files', '{seconds} second{plural_s} left' , {
-							seconds: date.getUTCSeconds(),
-							plural_s: (smoothRemainingSeconds === 1 ? "": "s") // 1 second = 1s = 1s
-						});
-						timeStringMobile = t('files', '{seconds}s' , {seconds: date.getUTCSeconds()});
-					} else {
-						timeStringDesktop = t('files', 'Any moment now...');
-						timeStringMobile = t('files', 'Soon...');
-					}
-					$('#uploadprogressbar .label .mobile').text(timeStringMobile);
-					$('#uploadprogressbar .label .desktop').text(timeStringDesktop);
+					var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();
+					$('#uploadprogressbar .label .mobile').text(h);
+					$('#uploadprogressbar .label .desktop').text(h);
 					$('#uploadprogressbar').attr('original-title',
 						t('files', '{loadedSize} of {totalSize} ({bitrate})' , {
 							loadedSize: humanFileSize(data.loaded),

From 4befc328928ce04e89d83ab894824d6bbb09846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 20 Dec 2016 10:41:52 +0100
Subject: [PATCH 205/219] Remove no longer needed translations

---
 apps/files/l10n/ast.js     | 8 --------
 apps/files/l10n/ast.json   | 8 --------
 apps/files/l10n/cs_CZ.js   | 8 --------
 apps/files/l10n/cs_CZ.json | 8 --------
 apps/files/l10n/da.js      | 2 --
 apps/files/l10n/da.json    | 2 --
 apps/files/l10n/de.js      | 8 --------
 apps/files/l10n/de.json    | 8 --------
 apps/files/l10n/de_DE.js   | 8 --------
 apps/files/l10n/de_DE.json | 8 --------
 apps/files/l10n/en_GB.js   | 8 --------
 apps/files/l10n/en_GB.json | 8 --------
 apps/files/l10n/es.js      | 8 --------
 apps/files/l10n/es.json    | 8 --------
 apps/files/l10n/fi_FI.js   | 3 ---
 apps/files/l10n/fi_FI.json | 3 ---
 apps/files/l10n/fr.js      | 8 --------
 apps/files/l10n/fr.json    | 8 --------
 apps/files/l10n/he.js      | 8 --------
 apps/files/l10n/he.json    | 8 --------
 apps/files/l10n/is.js      | 8 --------
 apps/files/l10n/is.json    | 8 --------
 apps/files/l10n/it.js      | 8 --------
 apps/files/l10n/it.json    | 8 --------
 apps/files/l10n/ja.js      | 8 --------
 apps/files/l10n/ja.json    | 8 --------
 apps/files/l10n/ko.js      | 1 -
 apps/files/l10n/ko.json    | 1 -
 apps/files/l10n/nb_NO.js   | 2 --
 apps/files/l10n/nb_NO.json | 2 --
 apps/files/l10n/nl.js      | 8 --------
 apps/files/l10n/nl.json    | 8 --------
 apps/files/l10n/pl.js      | 8 --------
 apps/files/l10n/pl.json    | 8 --------
 apps/files/l10n/pt_BR.js   | 8 --------
 apps/files/l10n/pt_BR.json | 8 --------
 apps/files/l10n/pt_PT.js   | 8 --------
 apps/files/l10n/pt_PT.json | 8 --------
 apps/files/l10n/ro.js      | 6 ------
 apps/files/l10n/ro.json    | 6 ------
 apps/files/l10n/ru.js      | 8 --------
 apps/files/l10n/ru.json    | 8 --------
 apps/files/l10n/sl.js      | 5 -----
 apps/files/l10n/sl.json    | 5 -----
 apps/files/l10n/sq.js      | 8 --------
 apps/files/l10n/sq.json    | 8 --------
 apps/files/l10n/sv.js      | 8 --------
 apps/files/l10n/sv.json    | 8 --------
 apps/files/l10n/th_TH.js   | 8 --------
 apps/files/l10n/th_TH.json | 8 --------
 apps/files/l10n/tr.js      | 1 -
 apps/files/l10n/tr.json    | 1 -
 apps/files/l10n/zh_CN.js   | 8 --------
 apps/files/l10n/zh_CN.json | 8 --------
 54 files changed, 360 deletions(-)

diff --git a/apps/files/l10n/ast.js b/apps/files/l10n/ast.js
index 092610b7140e..bd9054353260 100644
--- a/apps/files/l10n/ast.js
+++ b/apps/files/l10n/ast.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.",
     "Uploading..." : "Xubiendo...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "Falten {hours}:{minutes}:{seconds} hour{plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "Falten {minutes}:{seconds} minute{plural_s} ",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "Falten {seconds} second{plural_s}",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "En cualquier momentu...",
-    "Soon..." : "Pronto...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
     "Actions" : "Aiciones",
diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json
index 7631a9149f2d..0bc3c8209459 100644
--- a/apps/files/l10n/ast.json
+++ b/apps/files/l10n/ast.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.",
     "Uploading..." : "Xubiendo...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "Falten {hours}:{minutes}:{seconds} hour{plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "Falten {minutes}:{seconds} minute{plural_s} ",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "Falten {seconds} second{plural_s}",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "En cualquier momentu...",
-    "Soon..." : "Pronto...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
     "Actions" : "Aiciones",
diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
index 97a5c5b7c849..9f588df4da64 100644
--- a/apps/files/l10n/cs_CZ.js
+++ b/apps/files/l10n/cs_CZ.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.",
     "Uploading..." : "Odesílám...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "zbývá {hours}:{minutes}:{seconds} hour{plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "zbývá {minutes}:{seconds} minute{plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} sekund{plural_s} zbývá",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Každou chvíli...",
-    "Soon..." : "Brzy...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
     "Actions" : "Činnosti",
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
index e504862e0d39..12ed48aad8b2 100644
--- a/apps/files/l10n/cs_CZ.json
+++ b/apps/files/l10n/cs_CZ.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.",
     "Uploading..." : "Odesílám...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "zbývá {hours}:{minutes}:{seconds} hour{plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "zbývá {minutes}:{seconds} minute{plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} sekund{plural_s} zbývá",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Každou chvíli...",
-    "Soon..." : "Brzy...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
     "Actions" : "Činnosti",
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index e585ccacc1c6..45e713973b48 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -32,8 +32,6 @@ OC.L10N.register(
     "Could not get result from server." : "Kunne ikke hente resultat fra server.",
     "Uploading..." : "Uploader...",
     "..." : "...",
-    "Any moment now..." : "Når som helst...",
-    "Soon..." : "Snart...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
     "Actions" : "Handlinger",
     "Download" : "Download",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index 499533d77ba8..d42491c37291 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -30,8 +30,6 @@
     "Could not get result from server." : "Kunne ikke hente resultat fra server.",
     "Uploading..." : "Uploader...",
     "..." : "...",
-    "Any moment now..." : "Når som helst...",
-    "Soon..." : "Snart...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
     "Actions" : "Handlinger",
     "Download" : "Download",
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index 0866279a435f..b481144d41ed 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "Uploading..." : "Hochladen…",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig",
-    "{seconds}s" : "{seconds}n",
-    "Any moment now..." : "Jeden Augenblick...",
-    "Soon..." : "Bald...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
     "Actions" : "Aktionen",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index 0f2939217d96..7e148c5c1590 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "Uploading..." : "Hochladen…",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig",
-    "{seconds}s" : "{seconds}n",
-    "Any moment now..." : "Jeden Augenblick...",
-    "Soon..." : "Bald...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
     "Actions" : "Aktionen",
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index 6a2f0ab1f59a..27b7020e26ac 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "Uploading..." : "Hochladen…",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig",
-    "{seconds}s" : "{seconds}n",
-    "Any moment now..." : "Jeden Augenblick...",
-    "Soon..." : "Bald...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
     "Actions" : "Aktionen",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index 047299f9510d..346f4a62afa0 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "Uploading..." : "Hochladen…",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig",
-    "{seconds}s" : "{seconds}n",
-    "Any moment now..." : "Jeden Augenblick...",
-    "Soon..." : "Bald...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
     "Actions" : "Aktionen",
diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js
index 82ed2364dd6b..348e5f87c93a 100644
--- a/apps/files/l10n/en_GB.js
+++ b/apps/files/l10n/en_GB.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Could not get result from server.",
     "Uploading..." : "Uploading...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} left",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} second{plural_s} left",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Any moment now...",
-    "Soon..." : "Soon...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
     "Actions" : "Actions",
diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json
index 98b3d2000cb9..142d8f0bbf66 100644
--- a/apps/files/l10n/en_GB.json
+++ b/apps/files/l10n/en_GB.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Could not get result from server.",
     "Uploading..." : "Uploading...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} left",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} second{plural_s} left",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Any moment now...",
-    "Soon..." : "Soon...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
     "Actions" : "Actions",
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index bf0b9b545031..3740a86f8c97 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "Uploading..." : "Subiendo...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hora{plural_s} pendiente",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuto{plural_s} pendiente",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} segundo{plural_s} pendiente",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "En cualquier momento...",
-    "Soon..." : "Dentro de poco...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
     "Actions" : "Acciones",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index d623ed90c966..48732ac190e7 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "Uploading..." : "Subiendo...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hora{plural_s} pendiente",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuto{plural_s} pendiente",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} segundo{plural_s} pendiente",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "En cualquier momento...",
-    "Soon..." : "Dentro de poco...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
     "Actions" : "Acciones",
diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js
index 8bf1c47612a9..c438a1f9382f 100644
--- a/apps/files/l10n/fi_FI.js
+++ b/apps/files/l10n/fi_FI.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.",
     "Uploading..." : "Lähetetään...",
     "..." : "...",
-    "{seconds}s" : "{seconds} s",
-    "Any moment now..." : "Minä tahansa hetkenä...",
-    "Soon..." : "Pian...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
     "Actions" : "Toiminnot",
diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json
index dc8d168ffb5a..c63f827fff04 100644
--- a/apps/files/l10n/fi_FI.json
+++ b/apps/files/l10n/fi_FI.json
@@ -31,9 +31,6 @@
     "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.",
     "Uploading..." : "Lähetetään...",
     "..." : "...",
-    "{seconds}s" : "{seconds} s",
-    "Any moment now..." : "Minä tahansa hetkenä...",
-    "Soon..." : "Pian...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
     "Actions" : "Toiminnot",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index b09bea28607d..2bb8d674fd5b 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "Uploading..." : "Téléversement en cours…",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} heure{plural_s} restante{plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} restante{plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} seconde{plural_s} restante{plural_s}",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "D'un instant à l'autre...",
-    "Soon..." : "Bientôt...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
     "Actions" : "Actions",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 882c40094df1..2c4468525736 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "Uploading..." : "Téléversement en cours…",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} heure{plural_s} restante{plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} restante{plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} seconde{plural_s} restante{plural_s}",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "D'un instant à l'autre...",
-    "Soon..." : "Bientôt...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
     "Actions" : "Actions",
diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js
index 13b0922efd2c..504126ad9db5 100644
--- a/apps/files/l10n/he.js
+++ b/apps/files/l10n/he.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.",
     "Uploading..." : "העלאה...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left",
-    "{hours}:{minutes}h" : "{hours}:{minutes}שעות",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} דקות{plural_s} נשארו",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}דקות",
-    "{seconds} second{plural_s} left" : "{seconds} שניות{plural_s} נשארו",
-    "{seconds}s" : "{seconds}שניות",
-    "Any moment now..." : "עכשיו בכל רגע...",
-    "Soon..." : "בקרוב...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} מתוך {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
     "Actions" : "פעולות",
diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json
index 57ecefe49b2b..afcd9d10f460 100644
--- a/apps/files/l10n/he.json
+++ b/apps/files/l10n/he.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.",
     "Uploading..." : "העלאה...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left",
-    "{hours}:{minutes}h" : "{hours}:{minutes}שעות",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} דקות{plural_s} נשארו",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}דקות",
-    "{seconds} second{plural_s} left" : "{seconds} שניות{plural_s} נשארו",
-    "{seconds}s" : "{seconds}שניות",
-    "Any moment now..." : "עכשיו בכל רגע...",
-    "Soon..." : "בקרוב...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} מתוך {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
     "Actions" : "פעולות",
diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js
index 579ac88f97f4..71711d00eddf 100644
--- a/apps/files/l10n/is.js
+++ b/apps/files/l10n/is.js
@@ -32,14 +32,6 @@ OC.L10N.register(
     "Could not get result from server." : "Fékk ekki niðurstöður frá þjóni.",
     "Uploading..." : "Sendi inn ...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} klukkustundir eftir",
-    "{hours}:{minutes}h" : "{hours}:{minutes}klst",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} mínútur eftir",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}mín",
-    "{seconds} second{plural_s} left" : "{seconds} sekúndur eftir",
-    "{seconds}s" : "{seconds}sek",
-    "Any moment now..." : "Á hverri stundu...",
-    "Soon..." : "Bráðum...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} af {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending hætta.",
     "Actions" : "Aðgerðir",
diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json
index 2b4f980ca6d7..ed1eeb3a4a49 100644
--- a/apps/files/l10n/is.json
+++ b/apps/files/l10n/is.json
@@ -30,14 +30,6 @@
     "Could not get result from server." : "Fékk ekki niðurstöður frá þjóni.",
     "Uploading..." : "Sendi inn ...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} klukkustundir eftir",
-    "{hours}:{minutes}h" : "{hours}:{minutes}klst",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} mínútur eftir",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}mín",
-    "{seconds} second{plural_s} left" : "{seconds} sekúndur eftir",
-    "{seconds}s" : "{seconds}sek",
-    "Any moment now..." : "Á hverri stundu...",
-    "Soon..." : "Bráðum...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} af {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending hætta.",
     "Actions" : "Aðgerðir",
diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
index b560e6623cab..89aca6e2d116 100644
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Impossibile ottenere il risultato dal server.",
     "Uploading..." : "Caricamento in corso...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} ore rimanenti",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuti rimanenti",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} secondi rimanenti",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Da un momento all'altro...",
-    "Soon..." : "Presto...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} di {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
     "Actions" : "Azioni",
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
index 253fc5198aa9..cff67996012a 100644
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Impossibile ottenere il risultato dal server.",
     "Uploading..." : "Caricamento in corso...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} ore rimanenti",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuti rimanenti",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} secondi rimanenti",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Da un momento all'altro...",
-    "Soon..." : "Presto...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} di {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
     "Actions" : "Azioni",
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index b65fee08f491..c9acfea79d12 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "サーバーから結果を取得できませんでした。",
     "Uploading..." : "アップロード中...",
     "..." : "…",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "残り{hours}:{minutes}:{seconds} 時間",
-    "{hours}:{minutes}h" : "{hours}:{minutes} 時間",
-    "{minutes}:{seconds} minute{plural_s} left" : "残り{minutes}:{seconds} 分",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds} 分",
-    "{seconds} second{plural_s} left" : "残り{minutes}:{seconds} 秒",
-    "{seconds}s" : "{seconds} 秒",
-    "Any moment now..." : "もうすぐ…",
-    "Soon..." : "もうすぐ…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{totalSize} 中 {loadedSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
     "Actions" : "アクション",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index 435e6bdc8e77..683f24b0907e 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "サーバーから結果を取得できませんでした。",
     "Uploading..." : "アップロード中...",
     "..." : "…",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "残り{hours}:{minutes}:{seconds} 時間",
-    "{hours}:{minutes}h" : "{hours}:{minutes} 時間",
-    "{minutes}:{seconds} minute{plural_s} left" : "残り{minutes}:{seconds} 分",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds} 分",
-    "{seconds} second{plural_s} left" : "残り{minutes}:{seconds} 秒",
-    "{seconds}s" : "{seconds} 秒",
-    "Any moment now..." : "もうすぐ…",
-    "Soon..." : "もうすぐ…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{totalSize} 中 {loadedSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
     "Actions" : "アクション",
diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js
index 9b4afb356bac..6d2872d6c811 100644
--- a/apps/files/l10n/ko.js
+++ b/apps/files/l10n/ko.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.",
     "Uploading..." : "업로드 중...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} 시간 {plural_s} 남음",
     "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
     "Actions" : "작업",
     "Download" : "다운로드",
diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json
index e31db19186c6..6f8b9bcde91a 100644
--- a/apps/files/l10n/ko.json
+++ b/apps/files/l10n/ko.json
@@ -30,7 +30,6 @@
     "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.",
     "Uploading..." : "업로드 중...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} 시간 {plural_s} 남음",
     "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
     "Actions" : "작업",
     "Download" : "다운로드",
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index 8ac4dc800aeb..bcba63017812 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -33,8 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Fikk ikke resultat fra serveren.",
     "Uploading..." : "Laster opp...",
     "..." : "...",
-    "Any moment now..." : "Veldig snatt...",
-    "Soon..." : "Snart...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} av {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
     "Actions" : "Handlinger",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index 90fd01acfb74..1a94bd4d37df 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -31,8 +31,6 @@
     "Could not get result from server." : "Fikk ikke resultat fra serveren.",
     "Uploading..." : "Laster opp...",
     "..." : "...",
-    "Any moment now..." : "Veldig snatt...",
-    "Soon..." : "Snart...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} av {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
     "Actions" : "Handlinger",
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
index 974349d6333f..f60a63d259e1 100644
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.",
     "Uploading..." : "Uploading...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} uur{plural_s} over",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuten{plural_s} over",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} seconden{plural_s} over",
-    "{seconds}s" : "{seconds}en",
-    "Any moment now..." : "Heel snel nu...",
-    "Soon..." : "Binnenkort...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} van {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
     "Actions" : "Acties",
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
index 6caa76f49c11..3a4caf90bdcd 100644
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.",
     "Uploading..." : "Uploading...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} uur{plural_s} over",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuten{plural_s} over",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} seconden{plural_s} over",
-    "{seconds}s" : "{seconds}en",
-    "Any moment now..." : "Heel snel nu...",
-    "Soon..." : "Binnenkort...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} van {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
     "Actions" : "Acties",
diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js
index c5273a36ebdb..254ee98d7f67 100644
--- a/apps/files/l10n/pl.js
+++ b/apps/files/l10n/pl.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Nie można uzyskać wyniku z serwera.",
     "Uploading..." : "Wgrywanie....",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "Pozostało {hours}:{minutes}:{seconds} hour{plural_s} ",
-    "{hours}:{minutes}h" : "{hours}:{minutes}godz.",
-    "{minutes}:{seconds} minute{plural_s} left" : "Pozostało {minutes}:{seconds} minute{plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}min.",
-    "{seconds} second{plural_s} left" : "Pozostało sekund: {seconds}",
-    "{seconds}s" : "{seconds} s",
-    "Any moment now..." : "Jeszcze chwilę...",
-    "Soon..." : "Wkrótce...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
     "Actions" : "Akcje",
diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json
index c0be569faf64..388af099ba26 100644
--- a/apps/files/l10n/pl.json
+++ b/apps/files/l10n/pl.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Nie można uzyskać wyniku z serwera.",
     "Uploading..." : "Wgrywanie....",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "Pozostało {hours}:{minutes}:{seconds} hour{plural_s} ",
-    "{hours}:{minutes}h" : "{hours}:{minutes}godz.",
-    "{minutes}:{seconds} minute{plural_s} left" : "Pozostało {minutes}:{seconds} minute{plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}min.",
-    "{seconds} second{plural_s} left" : "Pozostało sekund: {seconds}",
-    "{seconds}s" : "{seconds} s",
-    "Any moment now..." : "Jeszcze chwilę...",
-    "Soon..." : "Wkrótce...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
     "Actions" : "Akcje",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index 7bc2a94deb10..5c3f2c6da621 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "Uploading..." : "Enviando...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hora{plural_s} esquerda",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuto{plural_s} esquerda",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} segundo{plural_s} esquerda",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "A qualquer momento...",
-    "Soon..." : "Logo...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
     "Actions" : "Ações",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index f16c8c374a64..832b2cf14512 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "Uploading..." : "Enviando...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hora{plural_s} esquerda",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuto{plural_s} esquerda",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} segundo{plural_s} esquerda",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "A qualquer momento...",
-    "Soon..." : "Logo...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
     "Actions" : "Ações",
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
index ee1e36360668..317218d163d1 100644
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@@ -32,14 +32,6 @@ OC.L10N.register(
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "Uploading..." : "A enviar...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "Tempo restante: {hours}:{minutes}:{seconds} hora{plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "faltam: {minutes}:{seconds} minute{plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "faltam: {seconds} segundo{plural_s}",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Agora, a qualquer momento...",
-    "Soon..." : "Brevemente...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
     "Actions" : "Ações",
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
index e08a3841470d..501cd9c88c46 100644
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@@ -30,14 +30,6 @@
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "Uploading..." : "A enviar...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "Tempo restante: {hours}:{minutes}:{seconds} hora{plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "faltam: {minutes}:{seconds} minute{plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "faltam: {seconds} segundo{plural_s}",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Agora, a qualquer momento...",
-    "Soon..." : "Brevemente...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
     "Actions" : "Ações",
diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js
index 78a7cc314fa6..ea9d8b2adb43 100644
--- a/apps/files/l10n/ro.js
+++ b/apps/files/l10n/ro.js
@@ -31,12 +31,6 @@ OC.L10N.register(
     "Could not get result from server." : "Nu se poate obține rezultatul de la server.",
     "Uploading..." : "Încărcare",
     "..." : "...",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} secunde{plural_s} rămase",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "În orice moment...",
-    "Soon..." : "În curând...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
     "Actions" : "Acțiuni",
     "Download" : "Descarcă",
diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json
index 7c9a4b222624..5720b16ce10b 100644
--- a/apps/files/l10n/ro.json
+++ b/apps/files/l10n/ro.json
@@ -29,12 +29,6 @@
     "Could not get result from server." : "Nu se poate obține rezultatul de la server.",
     "Uploading..." : "Încărcare",
     "..." : "...",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} secunde{plural_s} rămase",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "În orice moment...",
-    "Soon..." : "În curând...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
     "Actions" : "Acțiuni",
     "Download" : "Descarcă",
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index 4696c49e99d6..ad1a7d0cb562 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Не удалось получить ответ от сервера.",
     "Uploading..." : "Загрузка...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "Осталось часов {hours}:{minutes}:{seconds} {plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}ч",
-    "{minutes}:{seconds} minute{plural_s} left" : "Осталось минут {minutes}:{seconds} {plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}м",
-    "{seconds} second{plural_s} left" : "Осталось секунд {seconds} {plural_s}",
-    "{seconds}s" : "{seconds}с",
-    "Any moment now..." : "В любой момент...",
-    "Soon..." : "Скоро...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} из {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
     "Actions" : "Действия",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 49b7814c6a3d..9501a6a6108e 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Не удалось получить ответ от сервера.",
     "Uploading..." : "Загрузка...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "Осталось часов {hours}:{minutes}:{seconds} {plural_s}",
-    "{hours}:{minutes}h" : "{hours}:{minutes}ч",
-    "{minutes}:{seconds} minute{plural_s} left" : "Осталось минут {minutes}:{seconds} {plural_s}",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}м",
-    "{seconds} second{plural_s} left" : "Осталось секунд {seconds} {plural_s}",
-    "{seconds}s" : "{seconds}с",
-    "Any moment now..." : "В любой момент...",
-    "Soon..." : "Скоро...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} из {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
     "Actions" : "Действия",
diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js
index e9f2247d098e..cb6a4c071ff7 100644
--- a/apps/files/l10n/sl.js
+++ b/apps/files/l10n/sl.js
@@ -32,11 +32,6 @@ OC.L10N.register(
     "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.",
     "Uploading..." : "Poteka pošiljanje ...",
     "..." : "...",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}min",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Vsak trenutek ...",
-    "Soon..." : "Kmalu",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} od {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
     "Actions" : "Dejanja",
diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json
index 742932630431..b30f66f96910 100644
--- a/apps/files/l10n/sl.json
+++ b/apps/files/l10n/sl.json
@@ -30,11 +30,6 @@
     "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.",
     "Uploading..." : "Poteka pošiljanje ...",
     "..." : "...",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}min",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Vsak trenutek ...",
-    "Soon..." : "Kmalu",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} od {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
     "Actions" : "Dejanja",
diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js
index b104afdd7233..90a2beb6dca6 100644
--- a/apps/files/l10n/sq.js
+++ b/apps/files/l10n/sq.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "S’mori dot përfundime nga shërbyesi.",
     "Uploading..." : "Po ngarkohet...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{orë}:{minuta}:{sekonda} orë{shumë_s} majtas",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minuta}:{sekonda} minuta{shumë_s} majtas",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{sekonda} sekonda{shumë_s} majtas",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Në çdo çast tani…",
-    "Soon..." : "Së shpejti…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} nga {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Ngarkimi i kartelës është në punë e sipër. Largimi nga faqja do të anulojë ngarkimin.",
     "Actions" : "Veprime",
diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json
index 80e5f104fa64..a2e3b6d06955 100644
--- a/apps/files/l10n/sq.json
+++ b/apps/files/l10n/sq.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "S’mori dot përfundime nga shërbyesi.",
     "Uploading..." : "Po ngarkohet...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{orë}:{minuta}:{sekonda} orë{shumë_s} majtas",
-    "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minuta}:{sekonda} minuta{shumë_s} majtas",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{sekonda} sekonda{shumë_s} majtas",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Në çdo çast tani…",
-    "Soon..." : "Së shpejti…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} nga {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Ngarkimi i kartelës është në punë e sipër. Largimi nga faqja do të anulojë ngarkimin.",
     "Actions" : "Veprime",
diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js
index b07bdf8b59b6..7b9d66d1a6f9 100644
--- a/apps/files/l10n/sv.js
+++ b/apps/files/l10n/sv.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Gick inte att hämta resultat från server.",
     "Uploading..." : "Laddar upp...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} timme/ar kvar",
-    "{hours}:{minutes}h" : "{hours}:{minutes}",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minut(er) kvar",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}",
-    "{seconds} second{plural_s} left" : "{seconds} sekund(er) kvar",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Alldeles strax...",
-    "Soon..." : "Snart...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} av {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
     "Actions" : "Åtgärder",
diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json
index 957088d80fcc..9f174d692aa9 100644
--- a/apps/files/l10n/sv.json
+++ b/apps/files/l10n/sv.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "Gick inte att hämta resultat från server.",
     "Uploading..." : "Laddar upp...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} timme/ar kvar",
-    "{hours}:{minutes}h" : "{hours}:{minutes}",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minut(er) kvar",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}",
-    "{seconds} second{plural_s} left" : "{seconds} sekund(er) kvar",
-    "{seconds}s" : "{seconds}s",
-    "Any moment now..." : "Alldeles strax...",
-    "Soon..." : "Snart...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} av {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
     "Actions" : "Åtgärder",
diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js
index 07fc41fb9fd0..e2201a70fdbd 100644
--- a/apps/files/l10n/th_TH.js
+++ b/apps/files/l10n/th_TH.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์",
     "Uploading..." : "กำลังอัพโหลด...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "เหลือเวลาอีก {hours} ชั่วโมง : {minutes} นาที : {seconds} วินาที",
-    "{hours}:{minutes}h" : "{hours} ชั่วโมง : {minutes} นาที",
-    "{minutes}:{seconds} minute{plural_s} left" : "เหลือเวลาอีก {minutes} นาที : {seconds} วินาที",
-    "{minutes}:{seconds}m" : "{minutes} นาที : {seconds} วินาที",
-    "{seconds} second{plural_s} left" : "เหลือเวลาอีก {seconds} วินาที",
-    "{seconds}s" : "{seconds} วินาที",
-    "Any moment now..." : "ช่วงเวลาใด ในตอนนี้...",
-    "Soon..." : "เร็วๆ นี้...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} จาก {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
     "Actions" : "การกระทำ",
diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json
index d4b62b6997d4..af5dcc06aff5 100644
--- a/apps/files/l10n/th_TH.json
+++ b/apps/files/l10n/th_TH.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์",
     "Uploading..." : "กำลังอัพโหลด...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "เหลือเวลาอีก {hours} ชั่วโมง : {minutes} นาที : {seconds} วินาที",
-    "{hours}:{minutes}h" : "{hours} ชั่วโมง : {minutes} นาที",
-    "{minutes}:{seconds} minute{plural_s} left" : "เหลือเวลาอีก {minutes} นาที : {seconds} วินาที",
-    "{minutes}:{seconds}m" : "{minutes} นาที : {seconds} วินาที",
-    "{seconds} second{plural_s} left" : "เหลือเวลาอีก {seconds} วินาที",
-    "{seconds}s" : "{seconds} วินาที",
-    "Any moment now..." : "ช่วงเวลาใด ในตอนนี้...",
-    "Soon..." : "เร็วๆ นี้...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} จาก {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
     "Actions" : "การกระทำ",
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index 19c74ccac6fa..b8afff07d435 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "Sunucudan sonuç alınamadı.",
     "Uploading..." : "Yükleniyor...",
     "..." : "...",
-    "Soon..." : "Yakında...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
     "Actions" : "Eylemler",
     "Download" : "İndir",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index ffa7195d88ec..7a7e2b5f10e7 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -31,7 +31,6 @@
     "Could not get result from server." : "Sunucudan sonuç alınamadı.",
     "Uploading..." : "Yükleniyor...",
     "..." : "...",
-    "Soon..." : "Yakında...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
     "Actions" : "Eylemler",
     "Download" : "İndir",
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index 632804a4fade..2a15d76d6acf 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -33,14 +33,6 @@ OC.L10N.register(
     "Could not get result from server." : "不能从服务器得到结果",
     "Uploading..." : "上传中...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "剩余时间：{hours}:{minutes}:{seconds} ",
-    "{hours}:{minutes}h" : "{hours}:{minutes}",
-    "{minutes}:{seconds} minute{plural_s} left" : "剩余分钟：{minutes}:{seconds} ",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}",
-    "{seconds} second{plural_s} left" : "剩下{seconds} 秒",
-    "{seconds}s" : "{seconds}秒",
-    "Any moment now..." : "现在任何时候...",
-    "Soon..." : "很快...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} / {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
     "Actions" : "动作",
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index 60db09ade1ab..66a8026c1525 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -31,14 +31,6 @@
     "Could not get result from server." : "不能从服务器得到结果",
     "Uploading..." : "上传中...",
     "..." : "...",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "剩余时间：{hours}:{minutes}:{seconds} ",
-    "{hours}:{minutes}h" : "{hours}:{minutes}",
-    "{minutes}:{seconds} minute{plural_s} left" : "剩余分钟：{minutes}:{seconds} ",
-    "{minutes}:{seconds}m" : "{minutes}:{seconds}",
-    "{seconds} second{plural_s} left" : "剩下{seconds} 秒",
-    "{seconds}s" : "{seconds}秒",
-    "Any moment now..." : "现在任何时候...",
-    "Soon..." : "很快...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} / {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
     "Actions" : "动作",

From 9b841ab8fa17ed43734de780e2265a3e9c90b8f1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 2 Dec 2016 14:55:25 +0100
Subject: [PATCH 206/219] Prevent PHP request to get killed when using fclose
 callback

---
 lib/private/Files/View.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index f81e3b4ca7e9..2798ff7d2b41 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1144,6 +1144,8 @@ private function basicOperation($operation, $path, $hooks = [], $extraParam = nu
 				$unlockLater = false;
 				if ($this->lockingEnabled && $operation === 'fopen' && is_resource($result)) {
 					$unlockLater = true;
+					// make sure our unlocking callback will still be called if connection is aborted
+					ignore_user_abort(true);
 					$result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) {
 						if (in_array('write', $hooks)) {
 							$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);

From cc82ca9baeca5a9784a9984ddf75a37ad241d6c0 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 7 Dec 2016 11:15:12 +0100
Subject: [PATCH 207/219] Add ignore_user_abort everywhere where the time limit
 is set to 0

---
 apps/dav/appinfo/v1/webdav.php | 1 +
 apps/dav/appinfo/v2/remote.php | 1 +
 lib/private/legacy/files.php   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/apps/dav/appinfo/v1/webdav.php b/apps/dav/appinfo/v1/webdav.php
index 3b733c0fbd50..88170da04022 100644
--- a/apps/dav/appinfo/v1/webdav.php
+++ b/apps/dav/appinfo/v1/webdav.php
@@ -23,6 +23,7 @@
 
 // no php execution timeout for webdav
 set_time_limit(0);
+ignore_user_abort(true);
 
 // Turn off output buffering to prevent memory problems
 \OC_Util::obEnd();
diff --git a/apps/dav/appinfo/v2/remote.php b/apps/dav/appinfo/v2/remote.php
index 4e9cf8fd0822..03504af8d4e7 100644
--- a/apps/dav/appinfo/v2/remote.php
+++ b/apps/dav/appinfo/v2/remote.php
@@ -20,6 +20,7 @@
  */
 // no php execution timeout for webdav
 set_time_limit(0);
+ignore_user_abort(true);
 
 // Turn off output buffering to prevent memory problems
 \OC_Util::obEnd();
diff --git a/lib/private/legacy/files.php b/lib/private/legacy/files.php
index cb8dc35aa5c1..fa7b58ba6928 100644
--- a/lib/private/legacy/files.php
+++ b/lib/private/legacy/files.php
@@ -147,6 +147,7 @@ public static function get($dir, $files, $params = null) {
 			$streamer->sendHeaders($name);
 			$executionTime = intval(OC::$server->getIniWrapper()->getNumeric('max_execution_time'));
 			set_time_limit(0);
+			ignore_user_abort(true);
 			if ($getType === self::ZIP_FILES) {
 				foreach ($files as $file) {
 					$file = $dir . '/' . $file;

From fe939ed21c571d7497337eb336ca0be4a12425a6 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 17 Jan 2017 17:03:47 +0100
Subject: [PATCH 208/219] [stable9.1] Skip null groups in group manager
 (#26871)

* Skip null groups in group manager

* Also skip null groups in group manager's search function

* Add more group null checks in sharing code

* Add unit tests for null group safety in group manager

* Add unit tests for sharing code null group checks

* Added tests for null groups handling in sharing code

* Ignore moveShare optional repair in mount provider

In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.

* Adjust null group handing + tests
---
 apps/files_sharing/lib/API/Share20OCS.php     |  2 +-
 apps/files_sharing/lib/MountProvider.php      | 18 ++++-
 .../tests/API/Share20OCSTest.php              |  7 +-
 .../files_sharing/tests/MountProviderTest.php | 22 +++++-
 lib/private/Group/Manager.php                 | 14 +++-
 lib/private/Share20/DefaultShareProvider.php  |  4 +
 lib/private/Share20/Manager.php               | 13 +++-
 tests/lib/Group/ManagerTest.php               | 52 +++++++++++++
 .../lib/Share20/DefaultShareProviderTest.php  | 42 +++++++++++
 tests/lib/Share20/ManagerTest.php             | 73 +++++++++++++++++++
 10 files changed, 237 insertions(+), 10 deletions(-)

diff --git a/apps/files_sharing/lib/API/Share20OCS.php b/apps/files_sharing/lib/API/Share20OCS.php
index 62aa24ba4719..579da25f8c16 100644
--- a/apps/files_sharing/lib/API/Share20OCS.php
+++ b/apps/files_sharing/lib/API/Share20OCS.php
@@ -722,7 +722,7 @@ protected function canAccessShare(\OCP\Share\IShare $share) {
 
 		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
 			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			if ($sharedWith->inGroup($this->currentUser)) {
+			if (!is_null($sharedWith) && $sharedWith->inGroup($this->currentUser)) {
 				return true;
 			}
 		}
diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php
index 46b3597bed75..ce00fb36b3c2 100644
--- a/apps/files_sharing/lib/MountProvider.php
+++ b/apps/files_sharing/lib/MountProvider.php
@@ -168,7 +168,23 @@ private function buildSuperShares(array $allShares, \OCP\IUser $user) {
 				if ($share->getTarget() !== $superShare->getTarget()) {
 					// adjust target, for database consistency
 					$share->setTarget($superShare->getTarget());
-					$this->shareManager->moveShare($share, $user->getUID());
+					try {
+						$this->shareManager->moveShare($share, $user->getUID());
+					} catch (\InvalidArgumentException $e) {
+						// ignore as it is not important and we don't want to
+						// block FS setup
+
+						// the subsequent code anyway only uses the target of the
+						// super share
+
+						// such issue can usually happen when dealing with
+						// null groups which usually appear with group backend
+						// caching inconsistencies
+						\OC::$server->getLogger()->debug(
+							'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
+							['app' => 'files_sharing']
+						);
+					}
 				}
 			}
 
diff --git a/apps/files_sharing/tests/API/Share20OCSTest.php b/apps/files_sharing/tests/API/Share20OCSTest.php
index a0a8a4f64f72..ba63110fcad9 100644
--- a/apps/files_sharing/tests/API/Share20OCSTest.php
+++ b/apps/files_sharing/tests/API/Share20OCSTest.php
@@ -521,14 +521,19 @@ public function testCanAccessShare() {
 		$this->groupManager->method('get')->will($this->returnValueMap([
 			['group', $group],
 			['group2', $group2],
+			['groupnull', null],
 		]));
 		$this->assertTrue($this->invokePrivate($this->ocs, 'canAccessShare', [$share]));
 
 		$share = $this->getMock('OCP\Share\IShare');
 		$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_GROUP);
 		$share->method('getSharedWith')->willReturn('group2');
+		$this->assertFalse($this->invokePrivate($this->ocs, 'canAccessShare', [$share]));
 
-		$this->groupManager->method('get')->with('group2')->willReturn($group);
+		// null group
+		$share = $this->getMock('OCP\Share\IShare');
+		$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_GROUP);
+		$share->method('getSharedWith')->willReturn('groupnull');
 		$this->assertFalse($this->invokePrivate($this->ocs, 'canAccessShare', [$share]));
 
 		$share = $this->getMock('OCP\Share\IShare');
diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php
index dc9d81971bd8..b68dc8dab037 100644
--- a/apps/files_sharing/tests/MountProviderTest.php
+++ b/apps/files_sharing/tests/MountProviderTest.php
@@ -267,6 +267,20 @@ public function mergeSharesDataProvider() {
 					['1', 100, 'user2', '/share2-renamed', 31],
 				],
 			],
+			// #9: share as outsider with "nullgroup" and "user1" where recipient renamed in between
+			[
+				[
+					[2, 100, 'user2', '/share2', 31], 
+				],
+				[
+					[1, 100, 'nullgroup', '/share2-renamed', 31], 
+				],
+				[
+					// use target of least recent share
+					['1', 100, 'nullgroup', '/share2-renamed', 31],
+				],
+				true
+			],
 		];
 	}
 
@@ -282,7 +296,7 @@ public function mergeSharesDataProvider() {
 	 * @param array $groupShares array of group share specs
 	 * @param array $expectedShares array of expected supershare specs
 	 */
-	public function testMergeShares($userShares, $groupShares, $expectedShares) {
+	public function testMergeShares($userShares, $groupShares, $expectedShares, $moveFails = false) {
 		$rootFolder = $this->getMock('\OCP\Files\IRootFolder');
 		$userManager = $this->getMock('\OCP\IUserManager');
 
@@ -311,6 +325,12 @@ public function testMergeShares($userShares, $groupShares, $expectedShares) {
 				return new \OC\Share20\Share($rootFolder, $userManager);
 			}));
 
+		if ($moveFails) {
+			$this->shareManager->expects($this->any())
+				->method('moveShare')
+				->will($this->throwException(new \InvalidArgumentException()));
+		}
+
 		$mounts = $this->provider->getMountsForUser($this->user, $this->loader);
 
 		$this->assertCount(count($expectedShares), $mounts);
diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php
index fb199be8afc5..a20207d013a4 100644
--- a/lib/private/Group/Manager.php
+++ b/lib/private/Group/Manager.php
@@ -212,7 +212,12 @@ public function search($search, $limit = null, $offset = null) {
 		foreach ($this->backends as $backend) {
 			$groupIds = $backend->getGroups($search, $limit, $offset);
 			foreach ($groupIds as $groupId) {
-				$groups[$groupId] = $this->get($groupId);
+				$aGroup = $this->get($groupId);
+				if (!is_null($aGroup)) {
+					$groups[$groupId] = $aGroup;
+				} else {
+					\OC::$server->getLogger()->debug('Group "' . $groupId . '" was returned by search but not found through direct access', array('app' => 'core'));
+				}
 			}
 			if (!is_null($limit) and $limit <= 0) {
 				return array_values($groups);
@@ -245,7 +250,12 @@ public function getUserIdGroups($uid) {
 			$groupIds = $backend->getUserGroups($uid);
 			if (is_array($groupIds)) {
 				foreach ($groupIds as $groupId) {
-					$groups[$groupId] = $this->get($groupId);
+					$aGroup = $this->get($groupId);
+					if (!is_null($aGroup)) {
+						$groups[$groupId] = $aGroup;
+					} else {
+						\OC::$server->getLogger()->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', array('app' => 'core'));
+					}
 				}
 			}
 		}
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index f8e4f8b3fe36..5341e6d18167 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -325,6 +325,10 @@ public function deleteFromSelf(\OCP\Share\IShare $share, $recipient) {
 			$group = $this->groupManager->get($share->getSharedWith());
 			$user = $this->userManager->get($recipient);
 
+			if (is_null($group)) {
+				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+			}
+
 			if (!$group->inGroup($user)) {
 				throw new ProviderException('Recipient not in receiving group');
 			}
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 2c08e616f82a..26f36244b83f 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -377,10 +377,12 @@ protected function userCreateChecks(\OCP\Share\IShare $share) {
 			// The share is already shared with this user via a group share
 			if ($existingShare->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
 				$group = $this->groupManager->get($existingShare->getSharedWith());
-				$user = $this->userManager->get($share->getSharedWith());
+				if (!is_null($group)) {
+					$user = $this->userManager->get($share->getSharedWith());
 
-				if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) {
-					throw new \Exception('Path already shared with this user');
+					if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) {
+						throw new \Exception('Path already shared with this user');
+					}
 				}
 			}
 		}
@@ -402,7 +404,7 @@ protected function groupCreateChecks(\OCP\Share\IShare $share) {
 		if ($this->shareWithGroupMembersOnly()) {
 			$sharedBy = $this->userManager->get($share->getSharedBy());
 			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			if (!$sharedWith->inGroup($sharedBy)) {
+			if (is_null($sharedWith) || !$sharedWith->inGroup($sharedBy)) {
 				throw new \Exception('Only sharing within your own groups is allowed');
 			}
 		}
@@ -857,6 +859,9 @@ public function moveShare(\OCP\Share\IShare $share, $recipientId) {
 
 		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
 			$sharedWith = $this->groupManager->get($share->getSharedWith());
+			if (is_null($sharedWith)) {
+				throw new \InvalidArgumentException('Group "' . $share->getSharedWith() . '" does not exist');
+			}
 			$recipient = $this->userManager->get($recipientId);
 			if (!$sharedWith->inGroup($recipient)) {
 				throw new \InvalidArgumentException('Invalid recipient');
diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php
index 907f2b594522..de9b9bd17521 100644
--- a/tests/lib/Group/ManagerTest.php
+++ b/tests/lib/Group/ManagerTest.php
@@ -276,6 +276,32 @@ public function testSearchMultipleBackendsLimitAndOffset() {
 		$this->assertEquals('group12', $group12->getGID());
 	}
 
+	public function testSearchResultExistsButGroupDoesNot() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend
+		 */
+		$backend = $this->getMock('\OC\Group\Database');
+		$backend->expects($this->once())
+			->method('getGroups')
+			->with('1')
+			->will($this->returnValue(['group1']));
+		$backend->expects($this->once())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(false));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$groups = $manager->search('1');
+		$this->assertEmpty($groups);
+	}
+
 	public function testGetUserGroups() {
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend
@@ -330,6 +356,32 @@ public function testGetUserGroupIds() {
 		}
 	}
 
+	public function testGetUserGroupsWithDeletedGroup() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend
+		 */
+		$backend = $this->getMock('\OC\Group\Database');
+		$backend->expects($this->once())
+			->method('getUserGroups')
+			->with('user1')
+			->will($this->returnValue(array('group1')));
+		$backend->expects($this->any())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(false));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$userBackend = $this->getMock('\OC_User_Backend');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$groups = $manager->getUserGroups(new User('user1', $userBackend));
+		$this->assertEmpty($groups);
+	}
+
 	public function testInGroup() {
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend
diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
index 3d3c80fb7803..eb68d65edf0f 100644
--- a/tests/lib/Share20/DefaultShareProviderTest.php
+++ b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -1513,6 +1513,48 @@ public function testDeleteFromSelfGroupUserNotInGroup() {
 		$this->provider->deleteFromSelf($share, 'user2');
 	}
 
+	/**
+	 * @expectedException \OC\Share20\Exception\ProviderException
+	 * @expectedExceptionMessage Group "group" does not exist
+	 */
+	public function testDeleteFromSelfGroupDoesNotExist() {
+		$qb = $this->dbConn->getQueryBuilder();
+		$stmt = $qb->insert('share')
+			->values([
+				'share_type'    => $qb->expr()->literal(\OCP\Share::SHARE_TYPE_GROUP),
+				'share_with'    => $qb->expr()->literal('group'),
+				'uid_owner'     => $qb->expr()->literal('user1'),
+				'uid_initiator' => $qb->expr()->literal('user1'),
+				'item_type'     => $qb->expr()->literal('file'),
+				'file_source'   => $qb->expr()->literal(1),
+				'file_target'   => $qb->expr()->literal('myTarget1'),
+				'permissions'   => $qb->expr()->literal(2)
+			])->execute();
+		$this->assertEquals(1, $stmt);
+		$id = $qb->getLastInsertId();
+
+		$user1 = $this->getMock('\OCP\IUser');
+		$user1->method('getUID')->willReturn('user1');
+		$user2 = $this->getMock('\OCP\IUser');
+		$user2->method('getUID')->willReturn('user2');
+		$this->userManager->method('get')->will($this->returnValueMap([
+			['user1', $user1],
+			['user2', $user2],
+		]));
+
+		$this->groupManager->method('get')->with('group')->willReturn(null);
+
+		$file = $this->getMock('\OCP\Files\File');
+		$file->method('getId')->willReturn(1);
+
+		$this->rootFolder->method('getUserFolder')->with('user1')->will($this->returnSelf());
+		$this->rootFolder->method('getById')->with(1)->willReturn([$file]);
+
+		$share = $this->provider->getShareById($id);
+
+		$this->provider->deleteFromSelf($share, 'user2');
+	}
+
 	public function testDeleteFromSelfUser() {
 		$qb = $this->dbConn->getQueryBuilder();
 		$stmt = $qb->insert('share')
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index d2539f8577cb..3bfe6ee0095b 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -1123,6 +1123,39 @@ public function testUserCreateChecksIdenticalPathSharedViaGroup() {
 		$this->invokePrivate($this->manager, 'userCreateChecks', [$share]);
 	}
 
+ 	public function testUserCreateChecksIdenticalPathSharedViaDeletedGroup() {
+		$share  = $this->manager->newShare();
+
+		$sharedWith = $this->getMock('\OCP\IUser');
+		$sharedWith->method('getUID')->willReturn('sharedWith');
+
+		$this->userManager->method('get')->with('sharedWith')->willReturn($sharedWith);
+
+		$path = $this->getMock('\OCP\Files\Node');
+
+		$share->setSharedWith('sharedWith')
+			->setNode($path)
+			->setShareOwner('shareOwner')
+			->setProviderId('foo')
+			->setId('bar');
+
+		$share2 = $this->manager->newShare();
+		$share2->setShareType(\OCP\Share::SHARE_TYPE_GROUP)
+			->setShareOwner('shareOwner2')
+			->setProviderId('foo')
+			->setId('baz')
+			->setSharedWith('group');
+
+		$this->groupManager->method('get')->with('group')->willReturn(null);
+
+		$this->defaultProvider
+			->method('getSharesByPath')
+			->with($path)
+			->willReturn([$share2]);
+
+		$this->assertNull($this->invokePrivate($this->manager, 'userCreateChecks', [$share]));
+	}
+
 	public function testUserCreateChecksIdenticalPathNotSharedWithUser() {
 		$share = $this->manager->newShare();
 		$sharedWith = $this->getMock('\OCP\IUser');
@@ -1200,6 +1233,29 @@ public function testGroupCreateChecksShareWithGroupMembersOnlyNotInGroup() {
 		$this->invokePrivate($this->manager, 'groupCreateChecks', [$share]);
 	}
 
+	/**
+	 * @expectedException Exception
+	 * @expectedExceptionMessage Only sharing within your own groups is allowed
+	 */
+	public function testGroupCreateChecksShareWithGroupMembersOnlyNullGroup() {
+		$share = $this->manager->newShare();
+
+		$user = $this->getMock('\OCP\IUser');
+		$share->setSharedBy('user')->setSharedWith('group');
+
+		$this->groupManager->method('get')->with('group')->willReturn(null);
+		$this->userManager->method('get')->with('user')->willReturn($user);
+
+		$this->config
+			->method('getAppValue')
+			->will($this->returnValueMap([
+				['core', 'shareapi_only_share_with_group_members', 'no', 'yes'],
+				['core', 'shareapi_allow_group_sharing', 'yes', 'yes'],
+			]));
+
+		$this->assertNull($this->invokePrivate($this->manager, 'groupCreateChecks', [$share]));
+	}
+
 	public function testGroupCreateChecksShareWithGroupMembersOnlyInGroup() {
 		$share = $this->manager->newShare();
 
@@ -2493,6 +2549,23 @@ public function testMoveShareGroupNotRecipient() {
 		$this->manager->moveShare($share, 'recipient');
 	}
 
+	/**
+	 * @expectedException \InvalidArgumentException
+	 * @expectedExceptionMessage Group "shareWith" does not exist
+	 */
+	public function testMoveShareGroupNull() {
+		$share = $this->manager->newShare();
+		$share->setShareType(\OCP\Share::SHARE_TYPE_GROUP);
+		$share->setSharedWith('shareWith');
+
+		$recipient = $this->getMock('\OCP\IUser');
+
+		$this->groupManager->method('get')->with('shareWith')->willReturn(null);
+		$this->userManager->method('get')->with('recipient')->willReturn($recipient);
+
+		$this->manager->moveShare($share, 'recipient');
+	}
+
 	public function testMoveShareGroup() {
 		$share = $this->manager->newShare();
 		$share->setShareType(\OCP\Share::SHARE_TYPE_GROUP)

From cab0fcb0bcb106e2ce2a02c8ae9e5739c5f594b1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 16 Dec 2015 17:35:53 +0100
Subject: [PATCH 209/219] Use Webdav PUT for uploads in the web browser

- uses PUT method with jquery.fileupload for regular and public file
  lists
- for IE and browsers that don't support it, use POST with iframe
  transport
- implemented Sabre plugin to handle iframe transport and redirect the
  embedded PUT request to the proper handler
- added RFC5995 POST to file collection with "add-member" property to
  make it possible to auto-rename conflicting file names
- remove obsolete ajax/upload.php and obsolete ajax routes
---
 apps/dav/lib/Connector/Sabre/FilesPlugin.php  |  51 ++
 .../Connector/Sabre/IFrameTransportPlugin.php | 188 ++++
 .../dav/lib/Connector/Sabre/ServerFactory.php |   1 +
 .../unit/Connector/Sabre/FilesPluginTest.php  |  85 +-
 .../Sabre/IFrameTransportPluginTest.php       | 164 ++++
 apps/files/ajax/upload.php                    | 253 ------
 apps/files/appinfo/routes.php                 |  12 -
 apps/files/js/app.js                          |   1 +
 apps/files/js/file-upload.js                  | 820 +++++++++++++-----
 apps/files/js/filelist.js                     | 312 ++++---
 apps/files/js/files.js                        |  11 -
 apps/files/templates/list.php                 |   3 +-
 apps/files/tests/js/fileUploadSpec.js         | 141 ++-
 apps/files/tests/js/filelistSpec.js           | 208 ++++-
 apps/files_sharing/js/public.js               |  43 +-
 apps/files_sharing/tests/js/publicAppSpec.js  |  23 +
 16 files changed, 1549 insertions(+), 767 deletions(-)
 create mode 100644 apps/dav/lib/Connector/Sabre/IFrameTransportPlugin.php
 create mode 100644 apps/dav/tests/unit/Connector/Sabre/IFrameTransportPluginTest.php
 delete mode 100644 apps/files/ajax/upload.php

diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index e924bffd5214..ea460e36fb62 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -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 {
 
@@ -155,6 +157,8 @@ public function initialize(\Sabre\DAV\Server $server) {
 		$this->server = $server;
 		$this->server->on('propFind', array($this, 'handleGetProperties'));
 		$this->server->on('propPatch', array($this, 'handleUpdateProperties'));
+		// RFC5995 to add file to the collection with a suggested name
+		$this->server->on('method:POST', [$this, 'httpPost']);
 		$this->server->on('afterBind', array($this, 'sendFileIdHeader'));
 		$this->server->on('afterWriteContent', array($this, 'sendFileIdHeader'));
 		$this->server->on('afterMethod:GET', [$this,'httpGet']);
@@ -414,4 +418,51 @@ public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
 		}
 	}
 
+	/**
+	 * POST operation on directories to create a new file
+	 * with suggested name
+	 *
+	 * @param RequestInterface $request request object
+	 * @param ResponseInterface $response response object
+	 * @return null|false
+	 */
+	public function httpPost(RequestInterface $request, ResponseInterface $response) {
+		// TODO: move this to another plugin ?
+		if (!\OC::$CLI && !\OC::$server->getRequest()->passesCSRFCheck()) {
+			throw new BadRequest('Invalid CSRF token');
+		}
+
+		list($parentPath, $name) = \Sabre\HTTP\URLUtil::splitPath($request->getPath());
+
+		// Making sure the parent node exists and is a directory
+		$node = $this->tree->getNodeForPath($parentPath);
+
+		if ($node instanceof Directory) {
+			// no Add-Member found
+			if (empty($name) || $name[0] !== '&') {
+				// suggested name required
+				throw new BadRequest('Missing suggested file name');
+			}
+
+			$name = substr($name, 1);
+
+			if (empty($name)) {
+				// suggested name required
+				throw new BadRequest('Missing suggested file name');
+			}
+
+			// make sure the name is unique
+			$name = basename(\OC_Helper::buildNotExistingFileNameForView($parentPath, $name, $this->fileView));
+
+			$node->createFile($name, $request->getBodyAsStream());
+
+			list($parentUrl, ) = \Sabre\HTTP\URLUtil::splitPath($request->getUrl());
+
+			$response->setHeader('Content-Location', $parentUrl . '/' . rawurlencode($name));
+
+			// created
+			$response->setStatus(201);
+			return false;
+		}
+	}
 }
diff --git a/apps/dav/lib/Connector/Sabre/IFrameTransportPlugin.php b/apps/dav/lib/Connector/Sabre/IFrameTransportPlugin.php
new file mode 100644
index 000000000000..af6e5a62a5e5
--- /dev/null
+++ b/apps/dav/lib/Connector/Sabre/IFrameTransportPlugin.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @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/>
+ *
+ */
+
+namespace OCA\DAV\Connector\Sabre;
+
+use Sabre\DAV\IFile;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+use Sabre\DAV\Exception\BadRequest;
+
+/**
+ * Plugin to receive Webdav PUT through POST,
+ * mostly used as a workaround for browsers that
+ * do not support PUT upload.
+ */
+class IFrameTransportPlugin extends \Sabre\DAV\ServerPlugin {
+
+	/**
+	 * @var \Sabre\DAV\Server $server
+	 */
+	private $server;
+
+	/**
+	 * This initializes the plugin.
+	 *
+	 * @param \Sabre\DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(\Sabre\DAV\Server $server) {
+		$this->server = $server;
+		$this->server->on('method:POST', [$this, 'handlePost']);
+	}
+
+	/**
+	 * POST operation
+	 *
+	 * @param RequestInterface $request request object
+	 * @param ResponseInterface $response response object
+	 * @return null|false
+	 */
+	public function handlePost(RequestInterface $request, ResponseInterface $response) {
+		try {
+			return $this->processUpload($request, $response);
+		} catch (\Sabre\DAV\Exception $e) {
+			$response->setStatus($e->getHTTPCode());
+			$response->setBody(['message' => $e->getMessage()]);
+			$this->convertResponse($response);
+			return false;
+		}
+	}
+
+	/**
+	 * Wrap and send response in JSON format
+	 *
+	 * @param ResponseInterface $response response object
+	 */
+	private function convertResponse(ResponseInterface $response) {
+		if (is_resource($response->getBody())) {
+			throw new BadRequest('Cannot request binary data with iframe transport');
+		}
+
+		$responseData = json_encode([
+			'status' => $response->getStatus(),
+			'headers' => $response->getHeaders(),
+			'data' => $response->getBody(),
+		]);
+
+		// IE needs this content type
+		$response->setHeader('Content-Type', 'text/plain');
+		$response->setHeader('Content-Length', strlen($responseData));
+		$response->setStatus(200);
+		$response->setBody($responseData);
+	}
+
+	/**
+	 * Process upload
+	 *
+	 * @param RequestInterface $request request object
+	 * @param ResponseInterface $response response object
+	 * @return null|false
+	 */
+	private function processUpload(RequestInterface $request, ResponseInterface $response) {
+		$queryParams = $request->getQueryParameters();
+
+		if (!isset($queryParams['_method'])) {
+			return null;
+		}
+
+		$method = $queryParams['_method'];
+		if ($method !== 'PUT' && $method !== 'POST') {
+			return null;
+		}
+
+		$contentType = $request->getHeader('Content-Type');
+		list($contentType) = explode(';', $contentType);
+		if ($contentType !== 'application/x-www-form-urlencoded'
+			&& $contentType !== 'multipart/form-data'
+		) {
+			return null;
+		}
+
+		if (!isset($_FILES['files'])) {
+			return null;
+		}
+
+		// TODO: move this to another plugin ?
+		if (!\OC::$CLI && !\OC::$server->getRequest()->passesCSRFCheck()) {
+			throw new BadRequest('Invalid CSRF token');
+		}
+
+		if ($_FILES) {
+			$file = current($_FILES);
+		} else {
+			return null;
+		}
+
+		if ($file['error'][0] !== 0) {
+			throw new BadRequest('Error during upload, code ' . $file['error'][0]);
+		}
+
+		if (!\OC::$CLI && !is_uploaded_file($file['tmp_name'][0])) {
+			return null;
+		}
+
+		if (count($file['tmp_name']) > 1) {
+			throw new BadRequest('Only a single file can be uploaded');
+		}
+
+		$postData = $request->getPostData();
+		if (isset($postData['headers'])) {
+			$headers = json_decode($postData['headers'], true);
+
+			// copy safe headers into the request
+			$allowedHeaders = [
+				'If',
+				'If-Match',
+				'If-None-Match',
+				'If-Modified-Since',
+				'If-Unmodified-Since',
+				'Authorization',
+			];
+
+			foreach ($allowedHeaders as $allowedHeader) {
+				if (isset($headers[$allowedHeader])) {
+					$request->setHeader($allowedHeader, $headers[$allowedHeader]);
+				}
+			}
+		}
+
+		// MEGAHACK, because the Sabre File impl reads this property directly
+		$_SERVER['CONTENT_LENGTH'] = $file['size'][0];
+		$request->setHeader('Content-Length', $file['size'][0]);
+
+		$tmpFile = $file['tmp_name'][0];
+		$resource = fopen($tmpFile, 'r');
+
+		$request->setBody($resource);
+		$request->setMethod($method);
+
+		$this->server->invokeMethod($request, $response, false);
+
+		fclose($resource);
+		unlink($tmpFile);
+
+		$this->convertResponse($response);
+
+		return false;
+	}
+
+}
diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php
index c5b4f6a9352d..02956e55861b 100644
--- a/apps/dav/lib/Connector/Sabre/ServerFactory.php
+++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php
@@ -106,6 +106,7 @@ public function createServer($baseUri,
 		// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
 		$server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin());
 		$server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
+		$server->addPlugin(new \OCA\DAV\Connector\Sabre\IFrameTransportPlugin());
 		$server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
 		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
 		// we do not provide locking we emulate it using a fake locking plugin.
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
index f3775a12915c..d5debee53607 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
+++ b/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())
@@ -550,4 +550,85 @@ public function testDownloadHeaders($isClumsyAgent, $contentDispositionHeader) {
 
 		$this->plugin->httpGet($request, $response);
 	}
+
+	public function postCreateFileProvider() {
+		$baseUrl = 'http://example.com/owncloud/remote.php/webdav/subdir/';
+		return [
+			['test.txt', 'some file.txt', 'some file.txt', $baseUrl . 'some%20file.txt'],
+			['some file.txt', 'some file.txt', 'some file (2).txt', $baseUrl . 'some%20file%20%282%29.txt'],
+		];
+	}
+
+	/**
+	 * @dataProvider postCreateFileProvider
+	 */
+	public function testPostWithAddMember($existingFile, $wantedName, $deduplicatedName, $expectedLocation) {
+		$request = $this->getMock('Sabre\HTTP\RequestInterface');
+		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
+
+		$request->expects($this->any())
+			->method('getUrl')
+			->will($this->returnValue('http://example.com/owncloud/remote.php/webdav/subdir/&' . $wantedName));
+
+		$request->expects($this->any())
+			->method('getPath')
+			->will($this->returnValue('/subdir/&' . $wantedName));
+
+		$request->expects($this->once())
+			->method('getBodyAsStream')
+			->will($this->returnValue(fopen('data://text/plain,hello', 'r')));
+
+		$this->view->expects($this->any())
+			->method('file_exists')
+			->will($this->returnCallback(function($path) use ($existingFile) {
+				return ($path === '/subdir/' . $existingFile);
+			}));
+
+		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\Directory', '/subdir');
+
+		$node->expects($this->once())
+			->method('createFile')
+			->with($deduplicatedName, $this->isType('resource'));
+
+		$response->expects($this->once())
+			->method('setStatus')
+			->with(201);
+		$response->expects($this->once())
+			->method('setHeader')
+			->with('Content-Location', $expectedLocation);
+
+		$this->assertFalse($this->plugin->httpPost($request, $response));
+	}
+
+	public function testPostOnNonDirectory() {
+		$request = $this->getMock('Sabre\HTTP\RequestInterface');
+		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
+
+		$request->expects($this->any())
+			->method('getPath')
+			->will($this->returnValue('/subdir/test.txt/&abc'));
+
+		$this->createTestNode('\OCA\DAV\Connector\Sabre\File', '/subdir/test.txt');
+
+		$this->assertNull($this->plugin->httpPost($request, $response));
+	}
+
+	/**
+	 * @expectedException \Sabre\DAV\Exception\BadRequest
+	 */
+	public function testPostWithoutAddMember() {
+		$request = $this->getMock('Sabre\HTTP\RequestInterface');
+		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
+
+		$request->expects($this->any())
+			->method('getPath')
+			->will($this->returnValue('/subdir/&'));
+
+		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\Directory', '/subdir');
+
+		$node->expects($this->never())
+			->method('createFile');
+
+		$this->plugin->httpPost($request, $response);
+	}
 }
diff --git a/apps/dav/tests/unit/Connector/Sabre/IFrameTransportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/IFrameTransportPluginTest.php
new file mode 100644
index 000000000000..485dd1b779e1
--- /dev/null
+++ b/apps/dav/tests/unit/Connector/Sabre/IFrameTransportPluginTest.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace OCA\DAV\Tests\Unit\Connector\Sabre;
+
+/**
+ * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+class IFrameTransportPluginTest extends \Test\TestCase {
+
+	/**
+	 * @var \Sabre\DAV\Server
+	 */
+	private $server;
+
+	/**
+	 * @var \OCA\DAV\Connector\Sabre\IFrameTransportPlugin
+	 */
+	private $plugin;
+
+	public function setUp() {
+		parent::setUp();
+		$this->server = $this->getMockBuilder('\Sabre\DAV\Server')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->plugin = new \OCA\DAV\Connector\Sabre\IFrameTransportPlugin();
+		$this->plugin->initialize($this->server);
+	}
+
+	public function tearDown() {
+		$_FILES = null;
+		unset($_SERVER['CONTENT_LENGTH']);
+	}
+
+	public function testPutConversion() {
+		$request = $this->getMock('Sabre\HTTP\RequestInterface');
+		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
+
+		$request->expects($this->once())
+			->method('getQueryParameters')
+			->will($this->returnValue(['_method' => 'PUT']));
+
+		$postData = [
+			'headers' => json_encode([
+				'If-None-Match' => '*',
+				'Disallowed-Header' => 'test',
+			]),
+		];
+
+		$request->expects($this->once())
+			->method('getPostData')
+			->will($this->returnValue($postData));
+
+		$request->expects($this->once())
+			->method('getHeader')
+			->with('Content-Type')
+			->will($this->returnValue('multipart/form-data'));
+
+		$tmpFileName = tempnam(sys_get_temp_dir(), 'tmpfile');
+		$fh = fopen($tmpFileName, 'w');
+		fwrite($fh, 'hello');
+		fclose($fh);
+
+		$_FILES = ['files' => [
+			'error' => [0],
+			'tmp_name' => [$tmpFileName],
+			'size' => [5],
+		]];
+
+		$request->expects($this->any())
+			->method('setHeader')
+			->withConsecutive(
+				['If-None-Match', '*'],
+				['Content-Length', 5]
+			);
+
+		$request->expects($this->once())
+			->method('setMethod')
+			->with('PUT');
+
+		$this->server->expects($this->once())
+			->method('invokeMethod')
+			->with($request, $response);
+
+		// response data before conversion
+		$response->expects($this->once())
+			->method('getHeaders')
+			->will($this->returnValue(['Test-Response-Header' => [123]]));
+
+		$response->expects($this->any())
+			->method('getBody')
+			->will($this->returnValue('test'));
+
+		$response->expects($this->once())
+			->method('getStatus')
+			->will($this->returnValue(201));
+
+		$responseBody = json_encode([
+			'status' => 201,
+			'headers' => ['Test-Response-Header' => [123]],
+			'data' => 'test',
+		]);
+
+		// response data after conversion
+		$response->expects($this->once())
+			->method('setBody')
+			->with($responseBody);
+
+		$response->expects($this->once())
+			->method('setStatus')
+			->with(200);
+
+		$response->expects($this->any())
+			->method('setHeader')
+			->withConsecutive(
+				['Content-Type', 'text/plain'],
+				['Content-Length', strlen($responseBody)]
+			);
+
+		$this->assertFalse($this->plugin->handlePost($request, $response));
+
+		$this->assertEquals(5, $_SERVER['CONTENT_LENGTH']);
+
+		$this->assertFalse(file_exists($tmpFileName));
+	}
+
+	public function testIgnoreNonPut() {
+		$request = $this->getMock('Sabre\HTTP\RequestInterface');
+		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
+
+		$request->expects($this->once())
+			->method('getQueryParameters')
+			->will($this->returnValue(['_method' => 'PROPFIND']));
+
+		$this->server->expects($this->never())
+			->method('invokeMethod')
+			->with($request, $response);
+
+		$this->assertNull($this->plugin->handlePost($request, $response));
+	}
+
+	public function testIgnoreMismatchedContentType() {
+		$request = $this->getMock('Sabre\HTTP\RequestInterface');
+		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
+
+		$request->expects($this->once())
+			->method('getQueryParameters')
+			->will($this->returnValue(['_method' => 'PUT']));
+
+		$request->expects($this->once())
+			->method('getHeader')
+			->with('Content-Type')
+			->will($this->returnValue('text/plain'));
+
+		$this->server->expects($this->never())
+			->method('invokeMethod')
+			->with($request, $response);
+
+		$this->assertNull($this->plugin->handlePost($request, $response));
+	}
+}
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
deleted file mode 100644
index 9cc9c2797004..000000000000
--- a/apps/files/ajax/upload.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/**
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Florian Pritz <bluewind@xinu.at>
- * @author Frank Karlitschek <frank@karlitschek.de>
- * @author Individual IT Services <info@individual-it.net>
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Luke Policinski <lpolicinski@gmail.com>
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Roman Geber <rgeber@owncloudapps.com>
- * @author TheSFReader <TheSFReader@gmail.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @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::$server->getSession()->close();
-
-// 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
-
-$errorCode = null;
-
-$l = \OC::$server->getL10N('files');
-if (empty($_POST['dirToken'])) {
-	// The standard case, files are uploaded through logged in users :)
-	OCP\JSON::checkLoggedIn();
-	$dir = isset($_POST['dir']) ? (string)$_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
-
-	\OC_User::setIncognitoMode(true);
-
-	$publicDirectory = !empty($_POST['subdir']) ? (string)$_POST['subdir'] : '/';
-
-	$linkItem = OCP\Share::getShareByToken((string)$_POST['dirToken']);
-	if ($linkItem === false) {
-		OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
-		die();
-	}
-
-	if (!($linkItem['permissions'] & \OCP\Constants::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']);
-		if($path === null) {
-			OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
-			die();
-		}
-		$dir = sprintf(
-			"/%s/%s",
-			$path,
-			$publicDirectory
-		);
-
-		if (!$dir || empty($dir) || $dir === false) {
-			OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
-			die();
-		}
-
-		$dir = rtrim($dir, '/');
-	}
-}
-
-OCP\JSON::callCheck();
-
-// 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: ')
-			. OC::$server->getIniWrapper()->getNumeric('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'),
-		);
-		$errorMessage = $errors[$error];
-		\OC::$server->getLogger()->alert("Upload error: $error - $errorMessage", array('app' => 'files'));
-		OCP\JSON::error(array('data' => array_merge(array('message' => $errorMessage), $storageStats)));
-		exit();
-	}
-}
-$files = $_FILES['files'];
-
-$error = false;
-
-$maxUploadFileSize = $storageStats['uploadMaxFilesize'];
-$maxHumanFileSize = OCP\Util::humanFileSize($maxUploadFileSize);
-
-$totalSize = 0;
-$isReceivedShare = \OC::$server->getRequest()->getParam('isReceivedShare', false) === 'true';
-// defer quota check for received shares
-if (!$isReceivedShare && $storageStats['freeSpace'] >= 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 (\OC\Files\Filesystem::isValidPath($dir) === true) {
-	$fileCount = count($files['name']);
-	for ($i = 0; $i < $fileCount; $i++) {
-
-		if (isset($_POST['resolution'])) {
-			$resolution = $_POST['resolution'];
-		} else {
-			$resolution = null;
-		}
-
-		// target directory for when uploading folders
-		$relativePath = '';
-		if(!empty($_POST['file_directory'])) {
-			$relativePath = '/'.$_POST['file_directory'];
-		}
-
-		// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
-		if ($resolution === 'autorename') {
-			// append a number in brackets like 'filename (2).ext'
-			$target = OCP\Files::buildNotExistingFileName($dir . $relativePath, $files['name'][$i]);
-		} else {
-			$target = \OC\Files\Filesystem::normalizePath($dir . $relativePath.'/'.$files['name'][$i]);
-		}
-
-		// relative dir to return to the client
-		if (isset($publicDirectory)) {
-			// path relative to the public root
-			$returnedDir = $publicDirectory . $relativePath;
-		} else {
-			// full path
-			$returnedDir = $dir . $relativePath;
-		}
-		$returnedDir = \OC\Files\Filesystem::normalizePath($returnedDir);
-
-
-		$exists = \OC\Files\Filesystem::file_exists($target);
-		if ($exists) {
-			$updatable = \OC\Files\Filesystem::isUpdatable($target);
-		}
-		if ( ! $exists || ($updatable && $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['name'][$i];
-						$data['uploadMaxFilesize'] = $maxUploadFileSize;
-						$data['maxHumanFilesize'] = $maxHumanFileSize;
-						$data['permissions'] = $meta['permissions'];
-						$data['directory'] = $returnedDir;
-						$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);
-				if ($updatable) {
-					$data['status'] = 'existserror';
-				} else {
-					$data['status'] = 'readonly';
-				}
-				$data['originalname'] = $files['name'][$i];
-				$data['uploadMaxFilesize'] = $maxUploadFileSize;
-				$data['maxHumanFilesize'] = $maxHumanFileSize;
-				$data['permissions'] = $meta['permissions'];
-				$data['directory'] = $returnedDir;
-				$result[] = $data;
-			}
-		}
-	}
-} else {
-	$error = $l->t('Invalid directory.');
-}
-
-if ($error === false) {
-	OCP\JSON::encodedPrint($result);
-} else {
-	OCP\JSON::error(array(array('data' => array_merge(array('message' => $error, 'code' => $errorCode), $storageStats))));
-}
diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
index cea960b1a499..202c6ebae0f1 100644
--- a/apps/files/appinfo/routes.php
+++ b/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' => '.*'))
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
index fbfa510e07e9..17e92de90ddc 100644
--- a/apps/files/js/app.js
+++ b/apps/files/js/app.js
@@ -93,6 +93,7 @@
 						direction: $('#defaultFileSortingDirection').val()
 					},
 					config: this._filesConfig,
+					enableUpload: true
 				}
 			);
 			this.files.initialize();
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 663fee0ad251..453553330c64 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -18,83 +18,448 @@
  *    - TODO music upload button
  */
 
-/* global jQuery, oc_requesttoken, humanFileSize, FileList */
+/* global jQuery, humanFileSize */
 
 /**
- * Function that will allow us to know if Ajax uploads are supported
- * @link https://github.com/New-Bamboo/example-ajax-upload/blob/master/public/index.html
- * also see article @link http://blog.new-bamboo.co.uk/2012/01/10/ridiculously-simple-ajax-uploads-with-formdata
+ * File upload object
+ *
+ * @class OC.FileUpload
+ * @classdesc
+ *
+ * Represents a file upload
+ *
+ * @param {OC.Uploader} uploader uploader
+ * @param {Object} data blueimp data
  */
-function supportAjaxUploadWithProgress() {
-	return supportFileAPI() && supportAjaxUploadProgressEvents() && supportFormData();
-
-	// Is the File API supported?
-	function supportFileAPI() {
-		var fi = document.createElement('INPUT');
-		fi.type = 'file';
-		return 'files' in fi;
-	}
+OC.FileUpload = function(uploader, data) {
+	this.uploader = uploader;
+	this.data = data;
+};
+OC.FileUpload.CONFLICT_MODE_DETECT = 0;
+OC.FileUpload.CONFLICT_MODE_OVERWRITE = 1;
+OC.FileUpload.CONFLICT_MODE_AUTORENAME = 2;
+OC.FileUpload.prototype = {
 
-	// Are progress events supported?
-	function supportAjaxUploadProgressEvents() {
-		var xhr = new XMLHttpRequest();
-		return !! (xhr && ('upload' in xhr) && ('onprogress' in xhr.upload));
-	}
+	/**
+	 * Upload element
+	 *
+	 * @type Object
+	 */
+	$uploadEl: null,
 
-	// Is FormData supported?
-	function supportFormData() {
-		return !! window.FormData;
-	}
-}
+	/**
+	 * Target folder
+	 *
+	 * @type string
+	 */
+	_targetFolder: '',
 
-/**
- * Add form data into the given form data
- *
- * @param {Array|Object} formData form data which can either be an array or an object
- * @param {Object} newData key-values to add to the form data
- *
- * @return updated form data
- */
-function addFormData(formData, newData) {
-	// in IE8, formData is an array instead of object
-	if (_.isArray(formData)) {
-		_.each(newData, function(value, key) {
-			formData.push({name: key, value: value});
+	/**
+	 * @type int
+	 */
+	_conflictMode: OC.FileUpload.CONFLICT_MODE_DETECT,
+
+	/**
+	 * New name from server after autorename
+	 *
+	 * @type String
+	 */
+	_newName: null,
+
+	/**
+	 * Returns the file to be uploaded
+	 *
+	 * @return {File} file
+	 */
+	getFile: function() {
+		return this.data.files[0];
+	},
+
+	/**
+	 * Return the final filename.
+	 * Either this is the original file name or the file name
+	 * after an autorename.
+	 *
+	 * @return {String} file name
+	 */
+	getFileName: function() {
+		// in case of autorename
+		if (this._newName) {
+			return this._newName;
+		}
+
+		if (this._conflictMode === OC.FileUpload.CONFLICT_MODE_AUTORENAME) {
+
+			var locationUrl = this.getResponseHeader('Content-Location');
+			if (locationUrl) {
+				this._newName = decodeURIComponent(OC.basename(locationUrl));
+				return this._newName;
+			}
+		}
+
+		return this.getFile().name;
+	},
+
+	setTargetFolder: function(targetFolder) {
+		this._targetFolder = targetFolder;
+	},
+
+	getTargetFolder: function() {
+		return this._targetFolder;
+	},
+
+	/**
+	 * Get full path for the target file, including relative path,
+	 * without the file name.
+	 *
+	 * @return {String} full path
+	 */
+	getFullPath: function() {
+		return OC.joinPaths(this._targetFolder, this.getFile().relativePath || '');
+	},
+
+	/**
+	 * Set conflict resolution mode.
+	 * See CONFLICT_MODE_* constants.
+	 */
+	setConflictMode: function(mode) {
+		this._conflictMode = mode;
+	},
+
+	/**
+	 * Returns whether the upload is in progress
+	 *
+	 * @return {bool}
+	 */
+	isPending: function() {
+		return this.data.state() === 'pending';
+	},
+
+	deleteUpload: function() {
+		delete this.data.jqXHR;
+	},
+
+	/**
+	 * Submit the upload
+	 */
+	submit: function() {
+		var data = this.data;
+		var file = this.getFile();
+
+		// it was a folder upload, so make sure the parent directory exists alrady
+		var folderPromise;
+		if (file.relativePath) {
+			folderPromise = this.uploader.ensureFolderExists(this.getFullPath());
+		} else {
+			folderPromise = $.Deferred().resolve().promise();
+		}
+
+		if (this.uploader.fileList) {
+			this.data.url = this.uploader.fileList.getUploadUrl(file.name, this.getFullPath());
+		}
+
+		if (!this.data.headers) {
+			this.data.headers = {};
+		}
+
+		// webdav without multipart
+		this.data.multipart = false;
+		this.data.type = 'PUT';
+
+		delete this.data.headers['If-None-Match'];
+		if (this._conflictMode === OC.FileUpload.CONFLICT_MODE_DETECT) {
+			this.data.headers['If-None-Match'] = '*';
+		} else if (this._conflictMode === OC.FileUpload.CONFLICT_MODE_AUTORENAME) {
+			// POST to parent folder, with slug
+			this.data.type = 'POST';
+			this.data.url = this.uploader.fileList.getUploadUrl('&' + file.name, this.getFullPath());
+		}
+
+		if (file.lastModified) {
+			// preserve timestamp
+			this.data.headers['X-OC-Mtime'] = file.lastModified / 1000;
+		}
+
+		if (!this.uploader.isXHRUpload()) {
+			data.formData = [];
+
+			// pass headers as parameters
+			data.formData.push({name: 'headers', value: JSON.stringify(this.data.headers)});
+			data.formData.push({name: 'requesttoken', value: OC.requestToken});
+			if (data.type === 'POST') {
+				// still add the method to the URL
+				data.url += '?_method=POST';
+			}
+		}
+
+		// wait for creation of the required directory before uploading
+		folderPromise.then(function() {
+			data.submit();
+		}, function() {
+			data.abort();
+		});
+
+	},
+
+	/**
+	 * Abort the upload
+	 */
+	abort: function() {
+		this.data.abort();
+	},
+
+	/**
+	 * Returns the server response
+	 *
+	 * @return {Object} response
+	 */
+	getResponse: function() {
+		var response = this.data.response();
+		if (typeof response.result !== 'string') {
+			//fetch response from iframe
+			response = $.parseJSON(response.result[0].body.innerText);
+			if (!response) {
+				// likely due to internal server error
+				response = {status: 500};
+			}
+		} else {
+			response = response.result;
+		}
+		return response;
+	},
+
+	/**
+	 * Returns the status code from the response
+	 *
+	 * @return {int} status code
+	 */
+	getResponseStatus: function() {
+		if (this.uploader.isXHRUpload()) {
+			var xhr = this.data.response().jqXHR;
+			if (xhr) {
+				return xhr.status;
+			}
+			return null;
+		}
+		return this.getResponse().status;
+	},
+
+	/**
+	 * Returns the response header by name
+	 *
+	 * @param {String} headerName header name
+	 * @return {Array|String} response header value(s)
+	 */
+	getResponseHeader: function(headerName) {
+		headerName = headerName.toLowerCase();
+		if (this.uploader.isXHRUpload()) {
+			return this.data.response().jqXHR.getResponseHeader(headerName);
+		}
+
+		var headers = this.getResponse().headers;
+		if (!headers) {
+			return null;
+		}
+
+		var value =  _.find(headers, function(value, key) {
+			return key.toLowerCase() === headerName;
 		});
-	} else {
-		formData = _.extend(formData, newData);
+		if (_.isArray(value) && value.length === 1) {
+			return value[0];
+		}
+		return value;
 	}
-	return formData;
-}
+};
 
 /**
  * keeps track of uploads in progress and implements callbacks for the conflicts dialog
  * @namespace
  */
-OC.Upload = {
+
+OC.Uploader = function() {
+	this.init.apply(this, arguments);
+};
+
+OC.Uploader.prototype = {
+	/**
+	 * @type Array<OC.FileUpload>
+	 */
 	_uploads: [],
+
 	/**
-	 * deletes the jqHXR object from a data selection
-	 * @param {object} data
+	 * List of directories known to exist.
+	 *
+	 * Key is the fullpath and value is boolean, true meaning that the directory
+	 * was already created so no need to create it again.
 	 */
-	deleteUpload:function(data) {
-		delete data.jqXHR;
+	_knownDirs: {},
+
+	/**
+	 * @type OCA.Files.FileList
+	 */
+	fileList: null,
+
+	/**
+	 * @type OC.Files.Client
+	 */
+	filesClient: null,
+
+	/**
+	 * Function that will allow us to know if Ajax uploads are supported
+	 * @link https://github.com/New-Bamboo/example-ajax-upload/blob/master/public/index.html
+	 * also see article @link http://blog.new-bamboo.co.uk/2012/01/10/ridiculously-simple-ajax-uploads-with-formdata
+	 */
+	_supportAjaxUploadWithProgress: function() {
+		return supportFileAPI() && supportAjaxUploadProgressEvents() && supportFormData();
+
+		// Is the File API supported?
+		function supportFileAPI() {
+			var fi = document.createElement('INPUT');
+			fi.type = 'file';
+			return 'files' in fi;
+		}
+
+		// Are progress events supported?
+		function supportAjaxUploadProgressEvents() {
+			var xhr = new XMLHttpRequest();
+			return !! (xhr && ('upload' in xhr) && ('onprogress' in xhr.upload));
+		}
+
+		// Is FormData supported?
+		function supportFormData() {
+			return !! window.FormData;
+		}
+	},
+
+	/**
+	 * Returns whether an XHR upload will be used
+	 *
+	 * @return {bool} true if XHR upload will be used,
+	 * false for iframe upload
+	 */
+	isXHRUpload: function () {
+		return !this.fileUploadParam.forceIframeTransport &&
+			((!this.fileUploadParam.multipart && $.support.xhrFileUpload) ||
+			$.support.xhrFormDataFileUpload);
+	},
+
+	/**
+	 * Makes sure that the upload folder and its parents exists
+	 *
+	 * @param {String} fullPath full path
+	 * @return {Promise} promise that resolves when all parent folders
+	 * were created
+	 */
+	ensureFolderExists: function(fullPath) {
+		if (!fullPath || fullPath === '/') {
+			return $.Deferred().resolve().promise();
+		}
+
+		// remove trailing slash
+		if (fullPath.charAt(fullPath.length - 1) === '/') {
+			fullPath = fullPath.substr(0, fullPath.length - 1);
+		}
+
+		var self = this;
+		var promise = this._knownDirs[fullPath];
+
+		if (this.fileList) {
+			// assume the current folder exists
+			this._knownDirs[this.fileList.getCurrentDirectory()] = $.Deferred().resolve().promise();
+		}
+
+		if (!promise) {
+			var deferred = new $.Deferred();
+			promise = deferred.promise();
+			this._knownDirs[fullPath] = promise;
+
+			// make sure all parents already exist
+			var parentPath = OC.dirname(fullPath);
+			var parentPromise = this._knownDirs[parentPath];
+			if (!parentPromise) {
+				parentPromise = this.ensureFolderExists(parentPath);
+			}
+
+			parentPromise.then(function() {
+				self.filesClient.createDirectory(fullPath).always(function(status) {
+					// 405 is expected if the folder already exists
+					if ((status >= 200 && status < 300) || status === 405) {
+						self.$uploadEl.trigger($.Event('fileuploadcreatedfolder'), fullPath);
+						deferred.resolve();
+						return;
+					}
+					OC.Notification.showTemporary(t('files', 'Could not create folder "{dir}"', {dir: fullPath}));
+					deferred.reject();
+				});
+			}, function() {
+				deferred.reject();
+			});
+		}
+
+		return promise;
+	},
+
+	/**
+	 * Submit the given uploads
+	 *
+	 * @param {Array} array of uploads to start
+	 */
+	submitUploads: function(uploads) {
+		var self = this;
+		_.each(uploads, function(upload) {
+			upload.submit();
+			self._uploads[upload.data.uploadId] = upload;
+		});
+	},
+
+	/**
+	 * Show conflict for the given file object
+	 *
+	 * @param {OC.FileUpload} file upload object
+	 */
+	showConflict: function(fileUpload) {
+		//show "file already exists" dialog
+		var self = this;
+		var file = fileUpload.getFile();
+		// retrieve more info about this file
+		this.filesClient.getFileInfo(fileUpload.getFullPath()).then(function(status, fileInfo) {
+			var original = fileInfo;
+			var replacement = file;
+			OC.dialogs.fileexists(fileUpload, original, replacement, self);
+		});
 	},
 	/**
 	 * cancels all uploads
 	 */
 	cancelUploads:function() {
 		this.log('canceling uploads');
-		jQuery.each(this._uploads, function(i, jqXHR) {
-			jqXHR.abort();
+		jQuery.each(this._uploads, function(i, upload) {
+			upload.abort();
 		});
-		this._uploads = [];
+		this.clear();
 	},
-	rememberUpload:function(jqXHR) {
-		if (jqXHR) {
-			this._uploads.push(jqXHR);
+	/**
+	 * Clear uploads
+	 */
+	clear: function() {
+		this._uploads = {};
+		this._knownDirs = {};
+	},
+	/**
+	 * Returns an upload by id
+	 *
+	 * @param {int} data uploadId
+	 * @return {OC.FileUpload} file upload
+	 */
+	getUpload: function(data) {
+		if (_.isString(data)) {
+			return this._uploads[data];
+		} else if (data.uploadId) {
+			return this._uploads[data.uploadId];
 		}
+		return null;
 	},
+
 	showUploadCancelMessage: _.debounce(function() {
 		OC.Notification.showTemporary(t('files', 'Upload cancelled.'), {timeout: 10});
 	}, 500),
@@ -106,8 +471,8 @@ OC.Upload = {
 	isProcessing:function() {
 		var count = 0;
 
-		jQuery.each(this._uploads, function(i, data) {
-			if (data.state() === 'pending') {
+		jQuery.each(this._uploads, function(i, upload) {
+			if (upload.isPending()) {
 				count++;
 			}
 		});
@@ -115,9 +480,8 @@ OC.Upload = {
 	},
 	/**
 	 * callback for the conflicts dialog
-	 * @param {object} data
 	 */
-	onCancel:function(data) {
+	onCancel:function() {
 		this.cancelUploads();
 	},
 	/**
@@ -147,43 +511,29 @@ OC.Upload = {
 	},
 	/**
 	 * handle skipping an upload
-	 * @param {object} data
+	 * @param {OC.FileUpload} upload
 	 */
-	onSkip:function(data) {
-		this.log('skip', null, data);
-		this.deleteUpload(data);
+	onSkip:function(upload) {
+		this.log('skip', null, upload);
+		upload.deleteUpload();
 	},
 	/**
 	 * handle replacing a file on the server with an uploaded file
-	 * @param {object} data
+	 * @param {FileUpload} data
 	 */
-	onReplace:function(data) {
-		this.log('replace', null, data);
-		if (data.data) {
-			data.data.append('resolution', 'replace');
-		} else {
-			if (!data.formData) {
-				data.formData = {};
-			}
-			addFormData(data.formData, {resolution: 'replace'});
-		}
-		data.submit();
+	onReplace:function(upload) {
+		this.log('replace', null, upload);
+		upload.setConflictMode(OC.FileUpload.CONFLICT_MODE_OVERWRITE);
+		upload.submit();
 	},
 	/**
 	 * handle uploading a file and letting the server decide a new name
-	 * @param {object} data
+	 * @param {object} upload
 	 */
-	onAutorename:function(data) {
-		this.log('autorename', null, data);
-		if (data.data) {
-			data.data.append('resolution', 'autorename');
-		} else {
-			if (!data.formData) {
-				data.formData = {};
-			}
-			addFormData(data.formData, {resolution: 'autorename'});
-		}
-		data.submit();
+	onAutorename:function(upload) {
+		this.log('autorename', null, upload);
+		upload.setConflictMode(OC.FileUpload.CONFLICT_MODE_AUTORENAME);
+		upload.submit();
 	},
 	_trace:false, //TODO implement log handler for JS per class?
 	log:function(caption, e, data) {
@@ -205,11 +555,20 @@ OC.Upload = {
 	 * @param {function} callbacks.onCancel
 	 */
 	checkExistingFiles: function (selection, callbacks) {
-		var fileList = FileList;
+		var fileList = this.fileList;
 		var conflicts = [];
 		// only keep non-conflicting uploads
 		selection.uploads = _.filter(selection.uploads, function(upload) {
-			var fileInfo = fileList.findFile(upload.files[0].name);
+			var file = upload.getFile();
+			if (file.relativePath) {
+				// can't check in subfolder contents
+				return true;
+			}
+			if (!fileList) {
+				// no list to check against
+				return true;
+			}
+			var fileInfo = fileList.findFile(file.name);
 			if (fileInfo) {
 				conflicts.push([
 					// original
@@ -225,9 +584,9 @@ OC.Upload = {
 		});
 		if (conflicts.length) {
 			// wait for template loading
-			OC.dialogs.fileexists(null, null, null, OC.Upload).done(function() {
+			OC.dialogs.fileexists(null, null, null, this).done(function() {
 				_.each(conflicts, function(conflictData) {
-					OC.dialogs.fileexists(conflictData[1], conflictData[0], conflictData[1].files[0], OC.Upload);
+					OC.dialogs.fileexists(conflictData[1], conflictData[0], conflictData[1].getFile(), this);
 				});
 			});
 		}
@@ -240,15 +599,26 @@ OC.Upload = {
 	},
 
 	_hideProgressBar: function() {
+		var self = this;
 		$('#uploadprogresswrapper .stop').fadeOut();
 		$('#uploadprogressbar').fadeOut(function() {
-			$('#file_upload_start').trigger(new $.Event('resized'));
+			self.$uploadEl.trigger(new $.Event('resized'));
 		});
 	},
 
 	_showProgressBar: function() {
 		$('#uploadprogressbar').fadeIn();
-		$('#file_upload_start').trigger(new $.Event('resized'));
+		this.$uploadEl.trigger(new $.Event('resized'));
+	},
+
+	on: function() {
+		// forward events to upload element
+		this.$uploadEl.on.apply(this.$uploadEl, arguments);
+	},
+
+	off: function() {
+		// forward events to upload element
+		this.$uploadEl.off.apply(this.$uploadEl, arguments);
 	},
 
 	/**
@@ -269,12 +639,33 @@ OC.Upload = {
 		return ($tr.attr('data-mounttype') === 'shared-root' && $tr.attr('data-mime') !== 'httpd/unix-directory');
 	},
 
-	init: function() {
+	/**
+	 * Initialize the upload object
+	 *
+	 * @param {Object} $uploadEl upload element
+	 * @param {Object} options
+	 * @param {OCA.Files.FileList} [options.fileList] file list object
+	 * @param {OC.Files.Client} [options.filesClient] files client object
+	 * @param {Object} [options.dropZone] drop zone for drag and drop upload
+	 */
+	init: function($uploadEl, options) {
 		var self = this;
-		if ( $('#file_upload_start').exists() ) {
-			var file_upload_param = {
-				dropZone: $('#content'), // restrict dropZone to content div
-				pasteZone: null, 
+		options = options || {};
+
+		this.fileList = options.fileList;
+		this.filesClient = options.filesClient || OC.Files.getClient();
+
+		$uploadEl = $($uploadEl);
+		this.$uploadEl = $uploadEl;
+
+		if ($uploadEl.exists()) {
+			$('#uploadprogresswrapper .stop').on('click', function() {
+				this.cancelUploads();
+			});
+
+			this.fileUploadParam = {
+				type: 'PUT',
+				dropZone: options.dropZone, // restrict dropZone to content div
 				autoUpload: false,
 				sequentialUploads: true,
 				//singleFileUploads is on by default, so the data.files array will always have length 1
@@ -295,9 +686,13 @@ OC.Upload = {
 				 * @returns {boolean}
 				 */
 				add: function(e, data) {
-					OC.Upload.log('add', e, data);
+					self.log('add', e, data);
 					var that = $(this), freeSpace;
 
+					var upload = new OC.FileUpload(self, data);
+					// can't link directly due to jQuery not liking cyclic deps on its ajax object
+					data.uploadId = _.uniqueId('file-upload');
+
 					// we need to collect all data upload objects before
 					// starting the upload so we can check their existence
 					// and set individual conflict actions. Unfortunately,
@@ -317,16 +712,17 @@ OC.Upload = {
 							biggestFileBytes: 0
 						};
 					}
+					// TODO: move originalFiles to a separate container, maybe inside OC.Upload
 					var selection = data.originalFiles.selection;
 
 					// add uploads
 					if ( selection.uploads.length < selection.filesToUpload ) {
 						// remember upload
-						selection.uploads.push(data);
+						selection.uploads.push(upload);
 					}
 
 					//examine file
-					var file = data.files[0];
+					var file = upload.getFile();
 					try {
 						// FIXME: not so elegant... need to refactor that method to return a value
 						Files.isFileNameValid(file.name);
@@ -336,9 +732,14 @@ OC.Upload = {
 						data.errorThrown = errorMessage;
 					}
 
+					if (data.targetDir) {
+						upload.setTargetFolder(data.targetDir);
+						delete data.targetDir;
+					}
+
 					// in case folder drag and drop is not supported file will point to a directory
 					// http://stackoverflow.com/a/20448357
-					if ( ! file.type && file.size%4096 === 0 && file.size <= 102400) {
+					if ( ! file.type && file.size % 4096 === 0 && file.size <= 102400) {
 						var dirUploadFailure = false;
 						try {
 							var reader = new FileReader();
@@ -347,6 +748,10 @@ OC.Upload = {
 							//file is a directory
 							dirUploadFailure = true;
 						}
+						if (file.size === 0) {
+							// file is empty or a directory
+							dirUploadFailure = true;
+						}
 
 						if (dirUploadFailure) {
 							data.textStatus = 'dirorzero';
@@ -390,7 +795,7 @@ OC.Upload = {
 
 					// end upload for whole selection on error
 					if (data.errorThrown) {
-						// trigger fileupload fail
+						// trigger fileupload fail handler
 						var fu = that.data('blueimp-fileupload') || that.data('fileupload');
 						fu._trigger('fail', e, data);
 						return false; //don't upload anything
@@ -405,9 +810,7 @@ OC.Upload = {
 						var callbacks = {
 
 							onNoConflicts: function (selection) {
-								$.each(selection.uploads, function(i, upload) {
-									upload.submit();
-								});
+								self.submitUploads(selection.uploads);
 							},
 							onSkipConflicts: function (selection) {
 								//TODO mark conflicting files as toskip
@@ -425,7 +828,7 @@ OC.Upload = {
 							}
 						};
 
-						OC.Upload.checkExistingFiles(selection, callbacks);
+						self.checkExistingFiles(selection, callbacks);
 
 					}
 
@@ -436,54 +839,38 @@ OC.Upload = {
 				 * @param {object} e
 				 */
 				start: function(e) {
-					OC.Upload.log('start', e, null);
+					self.log('start', e, null);
 					//hide the tooltip otherwise it covers the progress bar
 					$('#upload').tipsy('hide');
 				},
-				submit: function(e, data) {
-					OC.Upload.rememberUpload(data);
-					if (!data.formData) {
-						data.formData = {};
-					}
-
-					var fileDirectory = '';
-					if(typeof data.files[0].relativePath !== 'undefined') {
-						fileDirectory = data.files[0].relativePath;
-					}
+				fail: function(e, data) {
+					var upload = self.getUpload(data);
+					var status = upload.getResponseStatus();
+					self.log('fail', e, upload);
 
-					var params = {
-						requesttoken: oc_requesttoken,
-						dir: data.targetDir || FileList.getCurrentDirectory(),
-						file_directory: fileDirectory,
-					};
-					if (data.files[0].isReceivedShare) {
-						params.isReceivedShare = true;
+					if (data.textStatus === 'abort') {
+						self.showUploadCancelMessage();
+					} else if (status === 412) {
+						// file already exists
+						self.showConflict(upload);
+					} else if (status === 404) {
+						// target folder does not exist any more
+						OC.Notification.showTemporary(
+							t('files', 'Target folder "{dir}" does not exist any more', {dir: upload.getFullPath()})
+						);
+						self.cancelUploads();
+					} else if (status === 507) {
+						// not enough space
+						OC.Notification.showTemporary(
+							t('files', 'Not enough free space')
+						);
+						self.cancelUploads();
+					} else {
+						// HTTP connection problem or other error
+						OC.Notification.showTemporary(data.errorThrown, {timeout: 10});
 					}
 
-					addFormData(data.formData, params);
-				},
-				fail: function(e, data) {
-					OC.Upload.log('fail', e, data);
-					if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
-						if (data.textStatus === 'abort') {
-							OC.Upload.showUploadCancelMessage();
-						} else {
-							// HTTP connection problem
-							var message = t('files', 'Error uploading file "{fileName}": {message}', {
-								fileName: data.files[0].name,
-								message: data.errorThrown
-							});
-							OC.Notification.show(message, {timeout: 0, type: 'error'});
-							if (data.result) {
-								var result = JSON.parse(data.result);
-								if (result && result[0] && result[0].data && result[0].data.code === 'targetnotfound') {
-									// abort upload of next files if any
-									OC.Upload.cancelUploads();
-								}
-							}
-						}
-					}
-					OC.Upload.deleteUpload(data);
+					upload.deleteUpload();
 				},
 				/**
 				 * called for every successful upload
@@ -491,51 +878,16 @@ OC.Upload = {
 				 * @param {object} data
 				 */
 				done:function(e, data) {
-					OC.Upload.log('done', e, data);
-					// handle different responses (json or body from iframe for ie)
-					var response;
-					if (typeof data.result === 'string') {
-						response = data.result;
-					} else {
-						//fetch response from iframe
-						response = data.result[0].body.innerText;
-					}
-					var result = JSON.parse(response);
-
-					delete data.jqXHR;
-
-					var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+					var upload = self.getUpload(data);
+					var that = $(this);
+					self.log('done', e, upload);
 
-					if (result.status === 'error' && result.data && result.data.message){
-						data.textStatus = 'servererror';
-						data.errorThrown = result.data.message;
-						fu._trigger('fail', e, data);
-					} else if (typeof result[0] === 'undefined') {
-						data.textStatus = 'servererror';
-						data.errorThrown = t('files', 'Could not get result from server.');
-						fu._trigger('fail', e, data);
-					} else if (result[0].status === 'readonly') {
-						var original = result[0];
-						var replacement = data.files[0];
-						OC.dialogs.fileexists(data, original, replacement, OC.Upload);
-					} else if (result[0].status === 'existserror') {
-						//show "file already exists" dialog
-						var original = result[0];
-						var replacement = data.files[0];
-						OC.dialogs.fileexists(data, original, replacement, OC.Upload);
-					} else if (result[0].status !== 'success') {
-						//delete data.jqXHR;
-						data.textStatus = 'servererror';
-						data.errorThrown = result[0].data.message; // error message has been translated on server
+					var status = upload.getResponseStatus();
+					if (status < 200 || status >= 300) {
+						// trigger fail handler
+						var fu = that.data('blueimp-fileupload') || that.data('fileupload');
 						fu._trigger('fail', e, data);
-					} else { // Successful upload
-						// Checking that the uploaded file is the last one and contained in the current directory
-						if (data.files[0] === data.originalFiles[data.originalFiles.length - 1] &&
-							result[0].directory === FileList.getCurrentDirectory()) {
-							// Scroll to the last uploaded file and highlight all of them
-							var fileList = _.pluck(data.originalFiles, 'name');
-							FileList.highlightFiles(fileList);
-						}
+						return;
 					}
 				},
 				/**
@@ -544,15 +896,14 @@ OC.Upload = {
 				 * @param {object} data
 				 */
 				stop: function(e, data) {
-					OC.Upload.log('stop', e, data);
+					self.log('stop', e, data);
 				}
 			};
 
 			// initialize jquery fileupload (blueimp)
-			var fileupload = $('#file_upload_start').fileupload(file_upload_param);
-			window.file_upload_param = fileupload;
+			var fileupload = this.$uploadEl.fileupload(this.fileUploadParam);
 
-			if (supportAjaxUploadWithProgress()) {
+			if (this._supportAjaxUploadWithProgress()) {
 				//remaining time
 				var lastUpdate = new Date().getMilliseconds();
 				var lastSize = 0;
@@ -561,11 +912,12 @@ OC.Upload = {
 				var bufferIndex = 0;
 				var bufferTotal = 0;
 				for(var i = 0; i < bufferSize;i++){
-					buffer[i] = 0;    
+					buffer[i] = 0;
 				}
+
 				// add progress handlers
 				fileupload.on('fileuploadadd', function(e, data) {
-					OC.Upload.log('progress handle fileuploadadd', e, data);
+					self.log('progress handle fileuploadadd', e, data);
 					//show cancel button
 					//if (data.dataType !== 'iframe') { //FIXME when is iframe used? only for ie?
 					//	$('#uploadprogresswrapper .stop').show();
@@ -573,7 +925,7 @@ OC.Upload = {
 				});
 				// add progress handlers
 				fileupload.on('fileuploadstart', function(e, data) {
-					OC.Upload.log('progress handle fileuploadstart', e, data);
+					self.log('progress handle fileuploadstart', e, data);
 					$('#uploadprogresswrapper .stop').show();
 					$('#uploadprogresswrapper .label').show();
 					$('#uploadprogressbar').progressbar({value: 0});
@@ -584,14 +936,14 @@ OC.Upload = {
 							+ t('files', '...')
 							+ '</span></em>');
                     $('#uploadprogressbar').tipsy({gravity:'n', fade:true, live:true});
-					OC.Upload._showProgressBar();
+					self._showProgressBar();
 				});
 				fileupload.on('fileuploadprogress', function(e, data) {
-					OC.Upload.log('progress handle fileuploadprogress', e, data);
+					self.log('progress handle fileuploadprogress', e, data);
 					//TODO progressbar in row
 				});
 				fileupload.on('fileuploadprogressall', function(e, data) {
-					OC.Upload.log('progress handle fileuploadprogressall', e, data);
+					self.log('progress handle fileuploadprogressall', e, data);
 					var progress = (data.loaded / data.total) * 100;
 					var thisUpdate = new Date().getMilliseconds();
 					var diffUpdate = (thisUpdate - lastUpdate)/1000; // eg. 2s
@@ -606,9 +958,43 @@ OC.Upload = {
 						bufferIndex = (bufferIndex + 1) % bufferSize;
 					}
 					var smoothRemainingSeconds = (bufferTotal / bufferSize); //seconds
-					var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();
-					$('#uploadprogressbar .label .mobile').text(h);
-					$('#uploadprogressbar .label .desktop').text(h);
+					var date = new Date(smoothRemainingSeconds * 1000);
+					var timeStringDesktop = "";
+					var timeStringMobile = "";
+					if(date.getUTCHours() > 0){
+						timeStringDesktop = t('files', '{hours}:{minutes}:{seconds} hour{plural_s} left' , {
+							hours:date.getUTCHours(),
+							minutes: ('0' + date.getUTCMinutes()).slice(-2),
+							seconds: ('0' + date.getUTCSeconds()).slice(-2),
+							plural_s: ( smoothRemainingSeconds === 3600  ? "": "s") // 1 hour = 1*60m*60s = 3600s
+						});
+						timeStringMobile = t('files', '{hours}:{minutes}h' , {
+							hours:date.getUTCHours(),
+							minutes: ('0' + date.getUTCMinutes()).slice(-2),
+							seconds: ('0' + date.getUTCSeconds()).slice(-2)
+						});
+					} else if(date.getUTCMinutes() > 0){
+						timeStringDesktop = t('files', '{minutes}:{seconds} minute{plural_s} left' , {
+							minutes: date.getUTCMinutes(),
+							seconds: ('0' + date.getUTCSeconds()).slice(-2),
+							plural_s: (smoothRemainingSeconds === 60 ? "": "s") // 1 minute = 1*60s = 60s
+						});
+						timeStringMobile = t('files', '{minutes}:{seconds}m' , {
+							minutes: date.getUTCMinutes(),
+							seconds: ('0' + date.getUTCSeconds()).slice(-2)
+						});
+					} else if(date.getUTCSeconds() > 0){
+						timeStringDesktop = t('files', '{seconds} second{plural_s} left' , {
+							seconds: date.getUTCSeconds(),
+							plural_s: (smoothRemainingSeconds === 1 ? "": "s") // 1 second = 1s = 1s
+						});
+						timeStringMobile = t('files', '{seconds}s' , {seconds: date.getUTCSeconds()});
+					} else {
+						timeStringDesktop = t('files', 'Any moment now...');
+						timeStringMobile = t('files', 'Soon...');
+					}
+					$('#uploadprogressbar .label .mobile').text(timeStringMobile);
+					$('#uploadprogressbar .label .desktop').text(timeStringDesktop);
 					$('#uploadprogressbar').attr('original-title',
 						t('files', '{loadedSize} of {totalSize} ({bitrate})' , {
 							loadedSize: humanFileSize(data.loaded),
@@ -619,14 +1005,16 @@ OC.Upload = {
 					$('#uploadprogressbar').progressbar('value', progress);
 				});
 				fileupload.on('fileuploadstop', function(e, data) {
-					OC.Upload.log('progress handle fileuploadstop', e, data);
-					OC.Upload._hideProgressBar();
+					self.log('progress handle fileuploadstop', e, data);
+
+					self.clear();
+					self._hideProgressBar();
 				});
 				fileupload.on('fileuploadfail', function(e, data) {
-					OC.Upload.log('progress handle fileuploadfail', e, data);
+					self.log('progress handle fileuploadfail', e, data);
 					//if user pressed cancel hide upload progress bar and cancel button
 					if (data.errorThrown === 'abort') {
-						OC.Upload._hideProgressBar();
+						self._hideProgressBar();
 					}
 				});
 
@@ -648,36 +1036,20 @@ OC.Upload = {
 			}
 		}
 
-		$.assocArraySize = function(obj) {
-			// http://stackoverflow.com/a/6700/11236
-			var size = 0, key;
-			for (key in obj) {
-				if (obj.hasOwnProperty(key)) {
-					size++;
-				}
-			}
-			return size;
-		};
-
 		// warn user not to leave the page while upload is in progress
 		$(window).on('beforeunload', function(e) {
-			if (OC.Upload.isProcessing()) {
+			if (self.isProcessing()) {
 				return t('files', 'File upload is in progress. Leaving the page now will cancel the upload.');
 			}
 		});
 
 		//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
 		if (navigator.userAgent.search(/konqueror/i) === -1) {
-			$('#file_upload_start').attr('multiple', 'multiple');
+			this.$uploadEl.attr('multiple', 'multiple');
 		}
 
-		window.file_upload_param = file_upload_param;
-		return file_upload_param;
+		return this.fileUploadParam;
 	}
 };
 
-$(document).ready(function() {
-	OC.Upload.init();
-});
-
 
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index d85d0d34599e..7c95afbad753 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -30,6 +30,7 @@
 	 * @param {Object} [options.dragOptions] drag options, disabled by default
 	 * @param {Object} [options.folderDropOptions] folder drop options, disabled by default
 	 * @param {boolean} [options.detailsViewEnabled=true] whether to enable details view
+	 * @param {boolean} [options.enableUpload=false] whether to enable uploader
 	 * @param {OC.Files.Client} [options.filesClient] files client to use
 	 */
 	var FileList = function($el, options) {
@@ -183,6 +184,11 @@
 		_dragOptions: null,
 		_folderDropOptions: null,
 
+		/**
+		 * @type OC.Uploader
+		 */
+		_uploader: null,
+
 		/**
 		 * Initialize the file list and its components
 		 *
@@ -323,8 +329,6 @@
 
 			this.$el.find('.selectedActions a').tooltip({placement:'top'});
 
-			this.setupUploadEvents();
-
 			this.$container.on('scroll', _.bind(this._onScroll, this));
 
 			if (options.scrollTo) {
@@ -333,6 +337,20 @@
 				});
 			}
 
+			if (options.enableUpload) {
+				// TODO: auto-create this element
+				var $uploadEl = this.$el.find('#file_upload_start');
+				if ($uploadEl.exists()) {
+					this._uploader = new OC.Uploader($uploadEl, {
+						fileList: this,
+						filesClient: this.filesClient,
+						dropZone: $('#content')
+					});
+
+					this.setupUploadEvents(this._uploader);
+				}
+			}
+
 			OC.Plugins.attach('OCA.Files.FileList', this);
 		},
 
@@ -1394,6 +1412,8 @@
 				return;
 			}
 			this._setCurrentDir(targetDir, changeUrl, fileId);
+			// discard finished uploads list, we'll get it through a regular reload
+			this._uploads = {};
 			this.reload().then(function(success){
 				if (!success) {
 					self.changeDirectory(currentDir, true);
@@ -1646,6 +1666,24 @@
 			return OCA.Files.Files.getDownloadUrl(files, dir || this.getCurrentDirectory(), isDir);
 		},
 
+		getUploadUrl: function(fileName, dir) {
+			if (_.isUndefined(dir)) {
+				dir = this.getCurrentDirectory();
+			}
+
+			var pathSections = dir.split('/');
+			if (!_.isUndefined(fileName)) {
+				pathSections.push(fileName);
+			}
+			var encodedPath = '';
+			_.each(pathSections, function(section) {
+				if (section !== '') {
+					encodedPath += '/' + encodeURIComponent(section);
+				}
+			});
+			return OC.linkToRemoteBase('webdav') + encodedPath;
+		},
+
 		/**
 		 * Generates a preview URL based on the URL space.
 		 * @param urlSpec attributes for the URL
@@ -2110,19 +2148,11 @@
 				)
 				.done(function() {
 					// TODO: error handling / conflicts
-					self.filesClient.getFileInfo(
-							targetPath, {
-								properties: self._getWebdavProperties()
-							}
-						)
-						.then(function(status, data) {
-							self.add(data, {animate: true, scrollTo: true});
-							deferred.resolve(status, data);
-						})
-						.fail(function(status) {
-							OC.Notification.showTemporary(t('files', 'Could not create file "{file}"', {file: name}));
-							deferred.reject(status);
-						});
+					self.addAndFetchFileInfo(targetPath, '', {scrollTo: true}).then(function(status, data) {
+						deferred.resolve(status, data);
+					}, function() {
+						OC.Notification.showTemporary(t('files', 'Could not create file "{file}"', {file: name}));
+					});
 				})
 				.fail(function(status) {
 					if (status === 412) {
@@ -2163,32 +2193,19 @@
 			var targetPath = this.getCurrentDirectory() + '/' + name;
 
 			this.filesClient.createDirectory(targetPath)
-				.done(function(createStatus) {
-					self.filesClient.getFileInfo(
-							targetPath, {
-								properties: self._getWebdavProperties()
-							}
-						)
-						.done(function(status, data) {
-							self.add(data, {animate: true, scrollTo: true});
-							deferred.resolve(status, data);
-						})
-						.fail(function() {
-							OC.Notification.showTemporary(t('files', 'Could not create folder "{dir}"', {dir: name}));
-							deferred.reject(createStatus);
-						});
+				.done(function() {
+					self.addAndFetchFileInfo(targetPath, '', {scrollTo:true}).then(function(status, data) {
+						deferred.resolve(status, data);
+					}, function() {
+						OC.Notification.showTemporary(t('files', 'Could not create folder "{dir}"', {dir: name}));
+					});
 				})
 				.fail(function(createStatus) {
 					// method not allowed, folder might exist already
 					if (createStatus === 405) {
-						self.filesClient.getFileInfo(
-								targetPath, {
-									properties: self._getWebdavProperties()
-								}
-							)
+						// add it to the list, for completeness
+						self.addAndFetchFileInfo(targetPath, '', {scrollTo:true})
 							.done(function(status, data) {
-								// add it to the list, for completeness
-								self.add(data, {animate: true, scrollTo: true});
 								OC.Notification.showTemporary(
 									t('files', 'Could not create folder "{dir}" because it already exists', {dir: name})
 								);
@@ -2210,6 +2227,60 @@
 			return promise;
 		},
 
+		/**
+		 * Add file into the list by fetching its information from the server first.
+		 *
+		 * If the given directory does not match the current directory, nothing will
+		 * be fetched.
+		 *
+		 * @param {String} fileName file name
+		 * @param {String} [dir] optional directory, defaults to the current one
+		 * @param {Object} options same options as #add
+		 * @return {Promise} promise that resolves with the file info, or an
+		 * already resolved Promise if no info was fetched. The promise rejects
+		 * if the file was not found or an error occurred.
+		 *
+		 * @since 9.0
+		 */
+		addAndFetchFileInfo: function(fileName, dir, options) {
+			var self = this;
+			var deferred = $.Deferred();
+			if (_.isUndefined(dir)) {
+				dir = this.getCurrentDirectory();
+			} else {
+				dir = dir || '/';
+			}
+
+			var targetPath = OC.joinPaths(dir, fileName);
+
+			if ((OC.dirname(targetPath) || '/') !== this.getCurrentDirectory()) {
+				// no need to fetch information
+				deferred.resolve();
+				return deferred.promise();
+			}
+
+			var addOptions = _.extend({
+				animate: true,
+				scrollTo: false
+			}, options || {});
+
+			this.filesClient.getFileInfo(targetPath, {
+					properties: this._getWebdavProperties()
+				})
+				.then(function(status, data) {
+					// remove first to avoid duplicates
+					self.remove(data.name);
+					self.add(data, addOptions);
+					deferred.resolve(status, data);
+				})
+				.fail(function(status) {
+					OC.Notification.showTemporary(t('files', 'Could not create file "{file}"', {file: name}));
+					deferred.reject(status);
+				});
+
+			return deferred.promise();
+		},
+
 		/**
 		 * Returns whether the given file name exists in the list
 		 *
@@ -2580,17 +2651,16 @@
 		/**
 		 * Setup file upload events related to the file-upload plugin
 		 */
-		setupUploadEvents: function() {
+		setupUploadEvents: function($uploadEl) {
 			var self = this;
 
-			// handle upload events
-			var fileUploadStart = this.$el.find('#file_upload_start');
+			self._uploads = {};
 
 			// detect the progress bar resize
-			fileUploadStart.on('resized', this._onResize);
+			$uploadEl.on('resized', this._onResize);
 
-			fileUploadStart.on('fileuploaddrop', function(e, data) {
-				OC.Upload.log('filelist handle fileuploaddrop', e, data);
+			$uploadEl.on('fileuploaddrop', function(e, data) {
+				self._uploader.log('filelist handle fileuploaddrop', e, data);
 
 				if (self.$el.hasClass('hidden')) {
 					// do not upload to invisible lists
@@ -2652,13 +2722,8 @@
 					}
 				}
 			});
-			fileUploadStart.on('fileuploadadd', function(e, data) {
-				OC.Upload.log('filelist handle fileuploadadd', e, data);
-
-				//finish delete if we are uploading a deleted file
-				if (self.deleteFiles && self.deleteFiles.indexOf(data.files[0].name)!==-1) {
-					self.finishDelete(null, true); //delete file before continuing
-				}
+			$uploadEl.on('fileuploadadd', function(e, data) {
+				self._uploader.log('filelist handle fileuploadadd', e, data);
 
 				// add ui visualization to existing folder
 				if (data.context && data.context.data('type') === 'dir') {
@@ -2680,126 +2745,57 @@
 					}
 				}
 
+				if (!data.targetDir) {
+					data.targetDir = self.getCurrentDirectory();
+				}
+
 			});
 			/*
 			 * when file upload done successfully add row to filelist
 			 * update counter when uploading to sub folder
 			 */
-			fileUploadStart.on('fileuploaddone', function(e, data) {
-				OC.Upload.log('filelist handle fileuploaddone', e, data);
+			$uploadEl.on('fileuploaddone', function(e, data) {
+				self._uploader.log('filelist handle fileuploaddone', e, data);
 
-				var response;
-				if (typeof data.result === 'string') {
-					response = data.result;
-				} else {
-					// fetch response from iframe
-					response = data.result[0].body.innerText;
-				}
-				var result = JSON.parse(response);
-
-				if (typeof result[0] !== 'undefined' && result[0].status === 'success') {
-					var file = result[0];
-					var size = 0;
-
-					if (data.context && data.context.data('type') === 'dir') {
-
-						// update upload counter ui
-						var uploadText = data.context.find('.uploadtext');
-						var currentUploads = parseInt(uploadText.attr('currentUploads'), 10);
-						currentUploads -= 1;
-						uploadText.attr('currentUploads', currentUploads);
-						var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
-						if (currentUploads === 0) {
-							self.showFileBusyState(uploadText.closest('tr'), false);
-							uploadText.text(translatedText);
-							uploadText.hide();
-						} else {
-							uploadText.text(translatedText);
-						}
-
-						// update folder size
-						size = parseInt(data.context.data('size'), 10);
-						size += parseInt(file.size, 10);
-						data.context.attr('data-size', size);
-						data.context.find('td.filesize').text(humanFileSize(size));
-					} else {
-						// only append new file if uploaded into the current folder
-						if (file.directory !== self.getCurrentDirectory()) {
-							// Uploading folders actually uploads a list of files
-							// for which the target directory (file.directory) might lie deeper
-							// than the current directory
-
-							var fileDirectory = file.directory.replace('/','').replace(/\/$/, "");
-							var currentDirectory = self.getCurrentDirectory().replace('/','').replace(/\/$/, "") + '/';
-
-							if (currentDirectory !== '/') {
-								// abort if fileDirectory does not start with current one
-								if (fileDirectory.indexOf(currentDirectory) !== 0) {
-									return;
-								}
-
-								// remove the current directory part
-								fileDirectory = fileDirectory.substr(currentDirectory.length);
-							}
-
-							// only take the first section of the path
-							fileDirectory = fileDirectory.split('/');
-
-							var fd;
-							// if the first section exists / is a subdir
-							if (fileDirectory.length) {
-								fileDirectory = fileDirectory[0];
-
-								// See whether it is already in the list
-								fd = self.findFileEl(fileDirectory);
-								if (fd.length === 0) {
-									var dir = {
-										name: fileDirectory,
-										type: 'dir',
-										mimetype: 'httpd/unix-directory',
-										permissions: file.permissions,
-										size: 0,
-										id: file.parentId
-									};
-									fd = self.add(dir, {insert: true});
-								}
-
-								// update folder size
-								size = parseInt(fd.attr('data-size'), 10);
-								size += parseInt(file.size, 10);
-								fd.attr('data-size', size);
-								fd.find('td.filesize').text(OC.Util.humanFileSize(size));
-							}
-
-							return;
-						}
-
-						// add as stand-alone row to filelist
-						size = t('files', 'Pending');
-						if (data.files[0].size>=0) {
-							size=data.files[0].size;
-						}
-						//should the file exist in the list remove it
-						self.remove(file.name);
+				var status = data.jqXHR.status;
+				if (status < 200 || status >= 300) {
+					// error was handled in OC.Uploads already
+					return;
+				}
 
-						// create new file context
-						data.context = self.add(file, {animate: true});
-					}
+				var upload = self._uploader.getUpload(data);
+				var fileName = upload.getFileName();
+				var fetchInfoPromise = self.addAndFetchFileInfo(fileName, upload.getFullPath());
+				if (!self._uploads) {
+					self._uploads = {};
+				}
+				if (OC.isSamePath(OC.dirname(upload.getFullPath() + '/'), self.getCurrentDirectory())) {
+					self._uploads[fileName] = fetchInfoPromise;
 				}
 			});
-			fileUploadStart.on('fileuploadstop', function() {
-				OC.Upload.log('filelist handle fileuploadstop');
-
-				//cleanup uploading to a dir
-				var uploadText = self.$fileList.find('tr .uploadtext');
-				self.showFileBusyState(uploadText.closest('tr'), false);
-				uploadText.fadeOut();
-				uploadText.attr('currentUploads', 0);
-
+			$uploadEl.on('fileuploadcreatedfolder', function(e, fullPath) {
+				self.addAndFetchFileInfo(OC.basename(fullPath), OC.dirname(fullPath));
+			});
+			$uploadEl.on('fileuploadstop', function() {
+				self._uploader.log('filelist handle fileuploadstop');
+
+				// prepare list of uploaded file names in the current directory
+				// and discard the other ones
+				var promises = _.values(self._uploads);
+				var fileNames = _.keys(self._uploads);
+				self._uploads = [];
+
+				// as soon as all info is fetched
+				$.when.apply($, promises).then(function() {
+					// highlight uploaded files
+					self.highlightFiles(fileNames);
+				});
 				self.updateStorageStatistics();
 			});
-			fileUploadStart.on('fileuploadfail', function(e, data) {
-				OC.Upload.log('filelist handle fileuploadfail', e, data);
+			$uploadEl.on('fileuploadfail', function(e, data) {
+				self._uploader.log('filelist handle fileuploadfail', e, data);
+				
+				self._uploads = [];
 
 				//if user pressed cancel hide upload chrome
 				if (data.errorThrown === 'abort') {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 53e07ddb0907..b525ecdaed01 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -226,17 +226,6 @@
 			// TODO: move file list related code (upload) to OCA.Files.FileList
 			$('#file_action_panel').attr('activeAction', false);
 
-			// Triggers invisible file input
-			$('#upload a').on('click', function() {
-				$(this).parent().children('#file_upload_start').trigger('click');
-				return false;
-			});
-
-			// Trigger cancelling of file upload
-			$('#uploadprogresswrapper .stop').on('click', function() {
-				OC.Upload.cancelUploads();
-			});
-
 			// drag&drop support using jquery.fileupload
 			// TODO use OC.dialogs
 			$(document).bind('drop dragover', function (e) {
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index dda7a1814a07..e741849f38bb 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -75,8 +75,7 @@
 </table>
 <input type="hidden" name="dir" id="dir" value="" />
 <div class="hiddenuploadfield">
-	<input type="file" id="file_upload_start" class="hiddenuploadfield" name="files[]"
-		data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
+	<input type="file" id="file_upload_start" class="hiddenuploadfield" name="files[]" />
 </div>
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
index 0483d4649d43..bfaf0a9fe57b 100644
--- a/apps/files/tests/js/fileUploadSpec.js
+++ b/apps/files/tests/js/fileUploadSpec.js
@@ -19,11 +19,11 @@
 *
 */
 
-/* global FileList */
-
 describe('OC.Upload tests', function() {
 	var $dummyUploader;
 	var testFile;
+	var uploader;
+	var failStub;
 
 	beforeEach(function() {
 		testFile = {
@@ -46,59 +46,64 @@ describe('OC.Upload tests', function() {
 			'</div>'
 		);
 		$dummyUploader = $('#file_upload_start');
+		uploader = new OC.Uploader($dummyUploader);
+		failStub = sinon.stub();
+		$dummyUploader.on('fileuploadfail', failStub);
 	});
 	afterEach(function() {
-		delete window.file_upload_param;
 		$dummyUploader = undefined;
+		failStub = undefined;
 	});
-	describe('Adding files for upload', function() {
-		var params;
-		var failStub;
 
-		beforeEach(function() {
-			params = OC.Upload.init();
-			failStub = sinon.stub();
-			$dummyUploader.on('fileuploadfail', failStub);
-		});
-		afterEach(function() {
-			params = undefined;
-			failStub = undefined;
-		});
-
-		/**
-		 * Add file for upload
-		 * @param file file data
-		 */
-		function addFile(file) {
-			return params.add.call(
+	/**
+	 * Add file for upload
+	 * @param {Array.<File>} files array of file data to simulate upload
+	 * @return {Array.<Object>} array of uploadinfo or null if add() returned false
+	 */
+	function addFiles(uploader, files) {
+		return _.map(files, function(file) {
+			var jqXHR = {status: 200};
+			var uploadInfo = {
+				originalFiles: files,
+				files: [file],
+				jqXHR: jqXHR,
+				response: sinon.stub.returns(jqXHR),
+				submit: sinon.stub()
+			};
+			if (uploader.fileUploadParam.add.call(
 					$dummyUploader[0],
 					{},
-					{
-					originalFiles: {},
-					files: [file]
-				});
-		}
+					uploadInfo
+				)) {
+				return uploadInfo;
+			}
+			return null;
+		});
+	}
 
+	describe('Adding files for upload', function() {
 		it('adds file when size is below limits', function() {
-			var result = addFile(testFile);
-			expect(result).toEqual(true);
+			var result = addFiles(uploader, [testFile]);
+			expect(result[0]).not.toEqual(null);
+			expect(result[0].submit.calledOnce).toEqual(true);
 		});
 		it('adds file when free space is unknown', function() {
 			var result;
 			$('#free_space').val(-2);
 
-			result = addFile(testFile);
+			result = addFiles(uploader, [testFile]);
 
-			expect(result).toEqual(true);
+			expect(result[0]).not.toEqual(null);
+			expect(result[0].submit.calledOnce).toEqual(true);
 			expect(failStub.notCalled).toEqual(true);
 		});
 		it('does not add file if it exceeds upload limit', function() {
 			var result;
 			$('#upload_limit').val(1000);
 
-			result = addFile(testFile);
+			result = addFiles(uploader, [testFile]);
 
-			expect(result).toEqual(false);
+			expect(result[0]).toEqual(null);
 			expect(failStub.calledOnce).toEqual(true);
 			expect(failStub.getCall(0).args[1].textStatus).toEqual('sizeexceedlimit');
 			expect(failStub.getCall(0).args[1].errorThrown).toEqual(
@@ -109,9 +114,9 @@ describe('OC.Upload tests', function() {
 			var result;
 			$('#free_space').val(1000);
 
-			result = addFile(testFile);
+			result = addFiles(uploader, [testFile]);
 
-			expect(result).toEqual(false);
+			expect(result[0]).toEqual(null);
 			expect(failStub.calledOnce).toEqual(true);
 			expect(failStub.getCall(0).args[1].textStatus).toEqual('notenoughspace');
 			expect(failStub.getCall(0).args[1].errorThrown).toEqual(
@@ -120,12 +125,10 @@ describe('OC.Upload tests', function() {
 		});
 	});
 	describe('Upload conflicts', function() {
-		var oldFileList;
 		var conflictDialogStub;
-		var callbacks;
+		var fileList;
 
 		beforeEach(function() {
-			oldFileList = FileList;
 			$('#testArea').append(
 				'<div id="tableContainer">' +
 				'<table id="filestable">' +
@@ -145,74 +148,56 @@ describe('OC.Upload tests', function() {
 				'</table>' +
 				'</div>'
 			);
-			FileList = new OCA.Files.FileList($('#tableContainer'));
+			fileList = new OCA.Files.FileList($('#tableContainer'));
 
-			FileList.add({name: 'conflict.txt', mimetype: 'text/plain'});
-			FileList.add({name: 'conflict2.txt', mimetype: 'text/plain'});
+			fileList.add({name: 'conflict.txt', mimetype: 'text/plain'});
+			fileList.add({name: 'conflict2.txt', mimetype: 'text/plain'});
 
 			conflictDialogStub = sinon.stub(OC.dialogs, 'fileexists');
-			callbacks = {
-				onNoConflicts: sinon.stub()
-			};
+
+			uploader = new OC.Uploader($dummyUploader, {
+				fileList: fileList
+			});
 		});
 		afterEach(function() {
 			conflictDialogStub.restore();
 
-			FileList.destroy();
-			FileList = oldFileList;
+			fileList.destroy();
 		});
 		it('does not show conflict dialog when no client side conflict', function() {
-			var selection = {
-				// yes, the format of uploads is weird...
-				uploads: [
-					{files: [{name: 'noconflict.txt'}]},
-					{files: [{name: 'noconflict2.txt'}]}
-				]
-			};
-
-			OC.Upload.checkExistingFiles(selection, callbacks);
+			var result = addFiles(uploader, [{name: 'noconflict.txt'}, {name: 'noconflict2.txt'}]);
 
 			expect(conflictDialogStub.notCalled).toEqual(true);
-			expect(callbacks.onNoConflicts.calledOnce).toEqual(true);
-			expect(callbacks.onNoConflicts.calledWith(selection)).toEqual(true);
+			expect(result[0].submit.calledOnce).toEqual(true);
+			expect(result[1].submit.calledOnce).toEqual(true);
 		});
 		it('shows conflict dialog when no client side conflict', function() {
-			var selection = {
-				// yes, the format of uploads is weird...
-				uploads: [
-					{files: [{name: 'conflict.txt'}]},
-					{files: [{name: 'conflict2.txt'}]},
-					{files: [{name: 'noconflict.txt'}]}
-				]
-			};
-
 			var deferred = $.Deferred();
 			conflictDialogStub.returns(deferred.promise());
 			deferred.resolve();
 
-			OC.Upload.checkExistingFiles(selection, callbacks);
+			var result = addFiles(uploader, [
+				{name: 'conflict.txt'},
+				{name: 'conflict2.txt'},
+				{name: 'noconflict.txt'}
+			]);
 
 			expect(conflictDialogStub.callCount).toEqual(3);
-			expect(conflictDialogStub.getCall(1).args[0])
-				.toEqual({files: [ { name: 'conflict.txt' } ]});
+			expect(conflictDialogStub.getCall(1).args[0].getFileName())
+				.toEqual('conflict.txt');
 			expect(conflictDialogStub.getCall(1).args[1])
 				.toEqual({ name: 'conflict.txt', mimetype: 'text/plain', directory: '/' });
 			expect(conflictDialogStub.getCall(1).args[2]).toEqual({ name: 'conflict.txt' });
 
 			// yes, the dialog must be called several times...
-			expect(conflictDialogStub.getCall(2).args[0]).toEqual({
-				files: [ { name: 'conflict2.txt' } ]
-			});
+			expect(conflictDialogStub.getCall(2).args[0].getFileName()).toEqual('conflict2.txt');
 			expect(conflictDialogStub.getCall(2).args[1])
 				.toEqual({ name: 'conflict2.txt', mimetype: 'text/plain', directory: '/' });
 			expect(conflictDialogStub.getCall(2).args[2]).toEqual({ name: 'conflict2.txt' });
 
-			expect(callbacks.onNoConflicts.calledOnce).toEqual(true);
-			expect(callbacks.onNoConflicts.calledWith({
-				uploads: [
-					{files: [{name: 'noconflict.txt'}]}
-				]
-			})).toEqual(true);
+			expect(result[0].submit.calledOnce).toEqual(false);
+			expect(result[1].submit.calledOnce).toEqual(false);
+			expect(result[2].submit.calledOnce).toEqual(true);
 		});
 	});
 });
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 259b2ffd37b5..ed81f90b4b03 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -159,7 +159,8 @@ describe('OCA.Files.FileList tests', function() {
 		pageSizeStub = sinon.stub(OCA.Files.FileList.prototype, 'pageSize').returns(20);
 		fileList = new OCA.Files.FileList($('#app-content-files'), {
 			filesClient: filesClient,
-			config: filesConfig
+			config: filesConfig,
+			enableUpload: true
 		});
 	});
 	afterEach(function() {
@@ -2459,7 +2460,7 @@ describe('OCA.Files.FileList tests', function() {
 
 			deferredInfo.resolve(
 				200,
-			   	new FileInfo({
+				new FileInfo({
 					path: '/subdir',
 					name: 'test.txt',
 					mimetype: 'text/plain'
@@ -2519,12 +2520,70 @@ describe('OCA.Files.FileList tests', function() {
 		// TODO: error cases
 		// TODO: unique name cases
 	});
+	describe('addAndFetchFileInfo', function() {
+		var getFileInfoStub;
+		var getFileInfoDeferred;
+
+		beforeEach(function() {
+			getFileInfoDeferred = $.Deferred();
+			getFileInfoStub = sinon.stub(OC.Files.Client.prototype, 'getFileInfo');
+			getFileInfoStub.returns(getFileInfoDeferred.promise());
+		});
+		afterEach(function() {
+			getFileInfoStub.restore();
+		});
+		it('does not fetch if the given folder is not the current one', function() {
+			var promise = fileList.addAndFetchFileInfo('testfile.txt', '/another');
+			expect(getFileInfoStub.notCalled).toEqual(true);
+
+			expect(promise.state()).toEqual('resolved');
+		});
+		it('fetches info when folder is the current one', function() {
+			fileList.addAndFetchFileInfo('testfile.txt', '/subdir');
+			expect(getFileInfoStub.calledOnce).toEqual(true);
+			expect(getFileInfoStub.getCall(0).args[0]).toEqual('/subdir/testfile.txt');
+		});
+		it('adds file data to list when fetching is done', function() {
+			fileList.addAndFetchFileInfo('testfile.txt', '/subdir');
+			getFileInfoDeferred.resolve(200, {
+				name: 'testfile.txt',
+				size: 100
+			});
+			expect(fileList.findFileEl('testfile.txt').attr('data-size')).toEqual('100');
+		});
+		it('replaces file data to list when fetching is done', function() {
+			fileList.addAndFetchFileInfo('testfile.txt', '/subdir', {replace: true});
+			fileList.add({
+				name: 'testfile.txt',
+				size: 95
+			});
+			getFileInfoDeferred.resolve(200, {
+				name: 'testfile.txt',
+				size: 100
+			});
+			expect(fileList.findFileEl('testfile.txt').attr('data-size')).toEqual('100');
+		});
+		it('resolves promise with file data when fetching is done', function() {
+			var promise = fileList.addAndFetchFileInfo('testfile.txt', '/subdir', {replace: true});
+			getFileInfoDeferred.resolve(200, {
+				name: 'testfile.txt',
+				size: 100
+			});
+			expect(promise.state()).toEqual('resolved');
+			promise.then(function(status, data) {
+				expect(status).toEqual(200);
+				expect(data.name).toEqual('testfile.txt');
+				expect(data.size).toEqual(100);
+			});
+		});
+	});
 	/**
 	 * Test upload mostly by testing the code inside the event handlers
 	 * that were registered on the magic upload object
 	 */
 	describe('file upload', function() {
 		var $uploader;
+		var uploadData;
 
 		beforeEach(function() {
 			// note: this isn't the real blueimp file uploader from jquery.fileupload
@@ -2532,14 +2591,52 @@ describe('OCA.Files.FileList tests', function() {
 			// test the response of the handlers
 			$uploader = $('#file_upload_start');
 			fileList.setFiles(testFiles);
+			// simulate data structure from jquery.upload
+			uploadData = {
+				files: [{
+					name: 'upload.txt'
+				}]
+			};
 		});
 
 		afterEach(function() {
 			$uploader = null;
+			uploadData = null;
+		});
+
+		describe('enableupload', function() {
+			it('sets up uploader when enableUpload is true', function() {
+				expect(fileList._uploader).toBeDefined();
+			});
+			it('does not sets up uploader when enableUpload is false', function() {
+				fileList.destroy();
+				fileList = new OCA.Files.FileList($('#app-content-files'), {
+					filesClient: filesClient
+				});
+				expect(fileList._uploader).toBeFalsy();
+			});
 		});
 
+		describe('adding files for upload', function() {
+			/**
+			 * Simulate add event on the given target
+			 *
+			 * @return event object including the result
+			 */
+			function addFile(data) {
+				var ev = new $.Event('fileuploadadd', {});
+				// using triggerHandler instead of trigger so we can pass
+				// extra data
+				$uploader.triggerHandler(ev, data || {});
+				return ev;
+			}
+
+			it('sets target dir to the current directory', function() {
+				addFile(uploadData);
+				expect(uploadData.targetDir).toEqual('/subdir');
+			});
+		});
 		describe('dropping external files', function() {
-			var uploadData;
 
 			/**
 			 * Simulate drop event on the given target
@@ -2560,17 +2657,6 @@ describe('OCA.Files.FileList tests', function() {
 				return ev;
 			}
 
-			beforeEach(function() {
-				// simulate data structure from jquery.upload
-				uploadData = {
-					files: [{
-						relativePath: 'fileToUpload.txt'
-					}]
-				};
-			});
-			afterEach(function() {
-				uploadData = null;
-			});
 			it('drop on a tr or crumb outside file list does not trigger upload', function() {
 				var $anotherTable = $('<table><tbody><tr><td>outside<div class="crumb">crumb</div></td></tr></table>');
 				var ev;
@@ -2594,12 +2680,14 @@ describe('OCA.Files.FileList tests', function() {
 				ev = dropOn(fileList.$fileList.find('th:first'), uploadData);
 
 				expect(ev.result).not.toEqual(false);
+				expect(uploadData.targetDir).toEqual('/subdir');
 			});
 			it('drop on an element on the table container triggers upload', function() {
 				var ev;
 				ev = dropOn($('#app-content-files'), uploadData);
 
 				expect(ev.result).not.toEqual(false);
+				expect(uploadData.targetDir).toEqual('/subdir');
 			});
 			it('drop on an element inside the table does not trigger upload if no upload permission', function() {
 				$('#permissions').val(0);
@@ -2623,6 +2711,7 @@ describe('OCA.Files.FileList tests', function() {
 				ev = dropOn(fileList.findFileEl('One.txt').find('td:first'), uploadData);
 
 				expect(ev.result).not.toEqual(false);
+				expect(uploadData.targetDir).toEqual('/subdir');
 			});
 			it('drop on a folder row inside the table triggers upload to target folder', function() {
 				var ev;
@@ -2655,6 +2744,97 @@ describe('OCA.Files.FileList tests', function() {
 				expect(fileList.findFileEl('afile.txt').find('.uploadtext').length).toEqual(0);
 			});
 		});
+
+		describe('after folder creation due to folder upload', function() {
+			it('fetches folder info', function() {
+				var fetchInfoStub = sinon.stub(fileList, 'addAndFetchFileInfo');
+
+				var ev = new $.Event('fileuploadcreatedfolder', {});
+				$uploader.triggerHandler(ev, '/subdir/newfolder');
+
+				expect(fetchInfoStub.calledOnce).toEqual(true);
+				expect(fetchInfoStub.getCall(0).args[0]).toEqual('newfolder');
+				expect(fetchInfoStub.getCall(0).args[1]).toEqual('/subdir');
+
+				fetchInfoStub.restore();
+			});
+		});
+
+		describe('after upload', function() {
+			var fetchInfoStub;
+
+			beforeEach(function() {
+				fetchInfoStub = sinon.stub(fileList, 'addAndFetchFileInfo');
+
+			});
+			afterEach(function() {
+				fetchInfoStub.restore();
+			});
+
+
+			function createUpload(name, dir) {
+				var data = {
+					files: [{
+						name: name
+					}],
+					upload: {
+						getFileName: sinon.stub().returns(name),
+						getFullPath: sinon.stub().returns(dir)
+					},
+					jqXHR: {
+						status: 200
+					}
+				}
+				return data;
+			}
+
+			/**
+			 * Simulate add event on the given target
+			 *
+			 * @return event object including the result
+			 */
+			function addFile(data) {
+				var ev = new $.Event('fileuploaddone', {});
+				// using triggerHandler instead of trigger so we can pass
+				// extra data
+				var deferred = $.Deferred();
+				fetchInfoStub.returns(deferred.promise());
+				$uploader.triggerHandler(ev, data || {});
+				return deferred;
+			}
+
+			it('fetches file info', function() {
+				addFile(createUpload('upload.txt', '/subdir'));
+				expect(fetchInfoStub.calledOnce).toEqual(true);
+				expect(fetchInfoStub.getCall(0).args[0]).toEqual('upload.txt');
+				expect(fetchInfoStub.getCall(0).args[1]).toEqual('/subdir');
+			});
+			it('highlights all uploaded files after all fetches are done', function() {
+				var highlightStub = sinon.stub(fileList, 'highlightFiles');
+				var def1 = addFile(createUpload('upload.txt', '/subdir'));
+				var def2 = addFile(createUpload('upload2.txt', '/subdir'));
+				var def3 = addFile(createUpload('upload3.txt', '/another'));
+				$uploader.triggerHandler(new $.Event('fileuploadstop'));
+
+				expect(highlightStub.notCalled).toEqual(true);
+				def1.resolve();
+				expect(highlightStub.notCalled).toEqual(true);
+				def2.resolve();
+				def3.resolve();
+				expect(highlightStub.calledOnce).toEqual(true);
+				expect(highlightStub.getCall(0).args[0]).toEqual(['upload.txt', 'upload2.txt']);
+
+				highlightStub.restore();
+			});
+			it('queries storage stats', function() {
+				var statStub = sinon.stub(fileList, 'updateStorageStatistics');
+				addFile(createUpload('upload.txt', '/subdir'));
+				expect(statStub.notCalled).toEqual(true);
+				$uploader.triggerHandler(new $.Event('fileuploadstop'));
+				expect(statStub.calledOnce).toEqual(true);
+				statStub.restore();
+			});
+		});
 	});
 	describe('Handling errors', function () {
 		var deferredList;
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 572ccc47b719..9c45dc6259ae 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -71,7 +71,8 @@ OCA.Sharing.PublicApp = {
 					folderDropOptions: folderDropOptions,
 					fileActions: fileActions,
 					detailsViewEnabled: false,
-					filesClient: filesClient
+					filesClient: filesClient,
+					enableUpload: true
 				}
 			);
 			this.files = OCA.Files.Files;
@@ -169,6 +170,30 @@ OCA.Sharing.PublicApp = {
 				return OC.generateUrl('/s/' + token + '/download') + '?' + OC.buildQueryString(params);
 			};
 
+			this.fileList.getUploadUrl = function(fileName, dir) {
+				if (_.isUndefined(dir)) {
+					dir = this.getCurrentDirectory();
+				}
+
+				var pathSections = dir.split('/');
+				if (!_.isUndefined(fileName)) {
+					pathSections.push(fileName);
+				}
+				var encodedPath = '';
+				_.each(pathSections, function(section) {
+					if (section !== '') {
+						encodedPath += '/' + encodeURIComponent(section);
+					}
+				});
+				var base = '';
+
+				if (!this._uploader.isXHRUpload()) {
+					// also add auth in URL due to POST workaround
+					base = OC.getProtocol() + '://' + token + '@' + OC.getHost() + (OC.getPort() ? ':' + OC.getPort() : '');
+				}
+				return base + OC.getRootPath() + '/public.php/webdav' + encodedPath;
+			};
+
 			this.fileList.getAjaxUrl = function (action, params) {
 				params = params || {};
 				params.t = token;
@@ -202,20 +227,12 @@ OCA.Sharing.PublicApp = {
 				OCA.Files.FileList.prototype.updateEmptyContent.apply(this, arguments);
 			};
 
-			var file_upload_start = $('#file_upload_start');
-			file_upload_start.on('fileuploadadd', function (e, data) {
-				var fileDirectory = '';
-				if (typeof data.files[0].relativePath !== 'undefined') {
-					fileDirectory = data.files[0].relativePath;
+			this.fileList._uploader.on('fileuploadadd', function(e, data) {
+				if (!data.headers) {
+					data.headers = {};
 				}
 
-				// Add custom data to the upload handler
-				data.formData = {
-					requesttoken: $('#publicUploadRequestToken').val(),
-					dirToken: $('#dirToken').val(),
-					subdir: data.targetDir || self.fileList.getCurrentDirectory(),
-					file_directory: fileDirectory
-				};
+				data.headers.Authorization = 'Basic ' + btoa(token + ':');
 			});
 
 			// do not allow sharing from the public page
diff --git a/apps/files_sharing/tests/js/publicAppSpec.js b/apps/files_sharing/tests/js/publicAppSpec.js
index 585657448822..e8ec9899ecc5 100644
--- a/apps/files_sharing/tests/js/publicAppSpec.js
+++ b/apps/files_sharing/tests/js/publicAppSpec.js
@@ -87,10 +87,18 @@ describe('OCA.Sharing.PublicApp tests', function() {
 		});
 
 		it('Uses public webdav endpoint', function() {
+			App._initialized = false;
+			fakeServer.restore();
+			window.fakeServer = sinon.fakeServer.create();
+
+			// uploader function messes up with fakeServer
+			var uploaderDetectStub = sinon.stub(OC.Uploader.prototype, '_supportAjaxUploadWithProgress');
+			App.initialize($('#preview'));
 			expect(fakeServer.requests.length).toEqual(1);
 			expect(fakeServer.requests[0].method).toEqual('PROPFIND');
 			expect(fakeServer.requests[0].url).toEqual('https://example.com:9876/owncloud/public.php/webdav/subdir');
 			expect(fakeServer.requests[0].requestHeaders.Authorization).toEqual('Basic c2g0dG9rOm51bGw=');
+			uploaderDetectStub.restore();
 		});
 
 		describe('Download Url', function() {
@@ -118,5 +126,20 @@ describe('OCA.Sharing.PublicApp tests', function() {
 					.toEqual(OC.webroot + '/index.php/apps/files_sharing/ajax/test.php?a=1&b=x%20y&t=sh4tok');
 			});
 		});
+		describe('Upload Url', function() {
+			var fileList;
+
+			beforeEach(function() {
+				fileList = App.fileList;
+			});
+			it('returns correct upload URL', function() {
+				expect(fileList.getUploadUrl('some file.txt'))
+					.toEqual('/owncloud/public.php/webdav/subdir/some%20file.txt');
+			});
+			it('returns correct upload URL with specified dir', function() {
+				expect(fileList.getUploadUrl('some file.txt', 'sub'))
+					.toEqual('/owncloud/public.php/webdav/sub/some%20file.txt');
+			});
+		});
 	});
 });

From f589c22e86a515b4de6a331e20a8b131be3b2625 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 21 Dec 2015 13:10:03 +0100
Subject: [PATCH 210/219] JS utility function to compare paths

---
 core/js/js.js                   | 22 +++++++++++
 core/js/tests/specs/coreSpec.js | 65 +++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/core/js/js.js b/core/js/js.js
index 7f98668dcb27..3c0666c00dd9 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -425,6 +425,28 @@ var OC={
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
 	},
 
+	/**
+	 * Returns whether the given paths are the same, without
+	 * leading, trailing or doubled slashes and also removing
+	 * the dot sections.
+	 *
+	 * @param {String} path1 first path
+	 * @param {String} path2 second path
+	 * @return {bool} true if the paths are the same
+	 *
+	 * @since 9.0
+	 */
+	isSamePath: function(path1, path2) {
+		var filterDot = function(p) {
+			return p !== '.';
+		};
+		var pathSections1 = _.filter((path1 || '').split('/'), filterDot);
+		var pathSections2 = _.filter((path2 || '').split('/'), filterDot);
+		path1 = OC.joinPaths.apply(OC, pathSections1);
+		path2 = OC.joinPaths.apply(OC, pathSections2);
+		return path1 === path2;
+	},
+
 	/**
 	 * Join path sections
 	 *
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 3d19a38c4168..caca6f7c53e4 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -188,6 +188,71 @@ describe('Core base tests', function() {
 			expect(OC.joinPaths('/', '//', '/')).toEqual('/');
 		});
 	});
+	describe('isSamePath', function() {
+		it('recognizes empty paths are equal', function() {
+			expect(OC.isSamePath('', '')).toEqual(true);
+			expect(OC.isSamePath('/', '')).toEqual(true);
+			expect(OC.isSamePath('//', '')).toEqual(true);
+			expect(OC.isSamePath('/', '/')).toEqual(true);
+			expect(OC.isSamePath('/', '//')).toEqual(true);
+		});
+		it('recognizes path with single sections as equal regardless of extra slashes', function() {
+			expect(OC.isSamePath('abc', 'abc')).toEqual(true);
+			expect(OC.isSamePath('/abc', 'abc')).toEqual(true);
+			expect(OC.isSamePath('//abc', 'abc')).toEqual(true);
+			expect(OC.isSamePath('abc', '/abc')).toEqual(true);
+			expect(OC.isSamePath('abc/', 'abc')).toEqual(true);
+			expect(OC.isSamePath('abc/', 'abc/')).toEqual(true);
+			expect(OC.isSamePath('/abc/', 'abc/')).toEqual(true);
+			expect(OC.isSamePath('/abc/', '/abc/')).toEqual(true);
+			expect(OC.isSamePath('//abc/', '/abc/')).toEqual(true);
+			expect(OC.isSamePath('//abc//', '/abc/')).toEqual(true);
+
+			expect(OC.isSamePath('abc', 'def')).toEqual(false);
+			expect(OC.isSamePath('/abc', 'def')).toEqual(false);
+			expect(OC.isSamePath('//abc', 'def')).toEqual(false);
+			expect(OC.isSamePath('abc', '/def')).toEqual(false);
+			expect(OC.isSamePath('abc/', 'def')).toEqual(false);
+			expect(OC.isSamePath('abc/', 'def/')).toEqual(false);
+			expect(OC.isSamePath('/abc/', 'def/')).toEqual(false);
+			expect(OC.isSamePath('/abc/', '/def/')).toEqual(false);
+			expect(OC.isSamePath('//abc/', '/def/')).toEqual(false);
+			expect(OC.isSamePath('//abc//', '/def/')).toEqual(false);
+		});
+		it('recognizes path with multiple sections as equal regardless of extra slashes', function() {
+			expect(OC.isSamePath('abc/def', 'abc/def')).toEqual(true);
+			expect(OC.isSamePath('/abc/def', 'abc/def')).toEqual(true);
+			expect(OC.isSamePath('abc/def', '/abc/def')).toEqual(true);
+			expect(OC.isSamePath('abc/def/', '/abc/def/')).toEqual(true);
+			expect(OC.isSamePath('/abc/def/', '/abc/def/')).toEqual(true);
+			expect(OC.isSamePath('/abc/def/', 'abc/def/')).toEqual(true);
+			expect(OC.isSamePath('//abc/def/', 'abc/def/')).toEqual(true);
+			expect(OC.isSamePath('//abc/def//', 'abc/def/')).toEqual(true);
+
+			expect(OC.isSamePath('abc/def', 'abc/ghi')).toEqual(false);
+			expect(OC.isSamePath('/abc/def', 'abc/ghi')).toEqual(false);
+			expect(OC.isSamePath('abc/def', '/abc/ghi')).toEqual(false);
+			expect(OC.isSamePath('abc/def/', '/abc/ghi/')).toEqual(false);
+			expect(OC.isSamePath('/abc/def/', '/abc/ghi/')).toEqual(false);
+			expect(OC.isSamePath('/abc/def/', 'abc/ghi/')).toEqual(false);
+			expect(OC.isSamePath('//abc/def/', 'abc/ghi/')).toEqual(false);
+			expect(OC.isSamePath('//abc/def//', 'abc/ghi/')).toEqual(false);
+		});
+		it('recognizes path entries with dot', function() {
+			expect(OC.isSamePath('.', '')).toEqual(true);
+			expect(OC.isSamePath('.', '.')).toEqual(true);
+			expect(OC.isSamePath('.', '/')).toEqual(true);
+			expect(OC.isSamePath('/.', '/')).toEqual(true);
+			expect(OC.isSamePath('/./', '/')).toEqual(true);
+			expect(OC.isSamePath('/./', '/.')).toEqual(true);
+			expect(OC.isSamePath('/./', '/./')).toEqual(true);
+			expect(OC.isSamePath('/./', '/./')).toEqual(true);
+
+			expect(OC.isSamePath('a/./b', 'a/b')).toEqual(true);
+			expect(OC.isSamePath('a/b/.', 'a/b')).toEqual(true);
+			expect(OC.isSamePath('./a/b', 'a/b')).toEqual(true);
+		});
+	});
 	describe('filePath', function() {
 		beforeEach(function() {
 			OC.webroot = 'http://localhost';

From 5f7c4424253320704feeb9b23dc36276c59118d1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 15 Jul 2016 13:19:16 +0200
Subject: [PATCH 211/219] Goodbye Iframe transport !

Not needed any more in IE >= 11
---
 .../Connector/Sabre/IFrameTransportPlugin.php | 188 ------------------
 .../dav/lib/Connector/Sabre/ServerFactory.php |   1 -
 .../Sabre/IFrameTransportPluginTest.php       | 164 ---------------
 3 files changed, 353 deletions(-)
 delete mode 100644 apps/dav/lib/Connector/Sabre/IFrameTransportPlugin.php
 delete mode 100644 apps/dav/tests/unit/Connector/Sabre/IFrameTransportPluginTest.php

diff --git a/apps/dav/lib/Connector/Sabre/IFrameTransportPlugin.php b/apps/dav/lib/Connector/Sabre/IFrameTransportPlugin.php
deleted file mode 100644
index af6e5a62a5e5..000000000000
--- a/apps/dav/lib/Connector/Sabre/IFrameTransportPlugin.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @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/>
- *
- */
-
-namespace OCA\DAV\Connector\Sabre;
-
-use Sabre\DAV\IFile;
-use Sabre\HTTP\RequestInterface;
-use Sabre\HTTP\ResponseInterface;
-use Sabre\DAV\Exception\BadRequest;
-
-/**
- * Plugin to receive Webdav PUT through POST,
- * mostly used as a workaround for browsers that
- * do not support PUT upload.
- */
-class IFrameTransportPlugin extends \Sabre\DAV\ServerPlugin {
-
-	/**
-	 * @var \Sabre\DAV\Server $server
-	 */
-	private $server;
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('method:POST', [$this, 'handlePost']);
-	}
-
-	/**
-	 * POST operation
-	 *
-	 * @param RequestInterface $request request object
-	 * @param ResponseInterface $response response object
-	 * @return null|false
-	 */
-	public function handlePost(RequestInterface $request, ResponseInterface $response) {
-		try {
-			return $this->processUpload($request, $response);
-		} catch (\Sabre\DAV\Exception $e) {
-			$response->setStatus($e->getHTTPCode());
-			$response->setBody(['message' => $e->getMessage()]);
-			$this->convertResponse($response);
-			return false;
-		}
-	}
-
-	/**
-	 * Wrap and send response in JSON format
-	 *
-	 * @param ResponseInterface $response response object
-	 */
-	private function convertResponse(ResponseInterface $response) {
-		if (is_resource($response->getBody())) {
-			throw new BadRequest('Cannot request binary data with iframe transport');
-		}
-
-		$responseData = json_encode([
-			'status' => $response->getStatus(),
-			'headers' => $response->getHeaders(),
-			'data' => $response->getBody(),
-		]);
-
-		// IE needs this content type
-		$response->setHeader('Content-Type', 'text/plain');
-		$response->setHeader('Content-Length', strlen($responseData));
-		$response->setStatus(200);
-		$response->setBody($responseData);
-	}
-
-	/**
-	 * Process upload
-	 *
-	 * @param RequestInterface $request request object
-	 * @param ResponseInterface $response response object
-	 * @return null|false
-	 */
-	private function processUpload(RequestInterface $request, ResponseInterface $response) {
-		$queryParams = $request->getQueryParameters();
-
-		if (!isset($queryParams['_method'])) {
-			return null;
-		}
-
-		$method = $queryParams['_method'];
-		if ($method !== 'PUT' && $method !== 'POST') {
-			return null;
-		}
-
-		$contentType = $request->getHeader('Content-Type');
-		list($contentType) = explode(';', $contentType);
-		if ($contentType !== 'application/x-www-form-urlencoded'
-			&& $contentType !== 'multipart/form-data'
-		) {
-			return null;
-		}
-
-		if (!isset($_FILES['files'])) {
-			return null;
-		}
-
-		// TODO: move this to another plugin ?
-		if (!\OC::$CLI && !\OC::$server->getRequest()->passesCSRFCheck()) {
-			throw new BadRequest('Invalid CSRF token');
-		}
-
-		if ($_FILES) {
-			$file = current($_FILES);
-		} else {
-			return null;
-		}
-
-		if ($file['error'][0] !== 0) {
-			throw new BadRequest('Error during upload, code ' . $file['error'][0]);
-		}
-
-		if (!\OC::$CLI && !is_uploaded_file($file['tmp_name'][0])) {
-			return null;
-		}
-
-		if (count($file['tmp_name']) > 1) {
-			throw new BadRequest('Only a single file can be uploaded');
-		}
-
-		$postData = $request->getPostData();
-		if (isset($postData['headers'])) {
-			$headers = json_decode($postData['headers'], true);
-
-			// copy safe headers into the request
-			$allowedHeaders = [
-				'If',
-				'If-Match',
-				'If-None-Match',
-				'If-Modified-Since',
-				'If-Unmodified-Since',
-				'Authorization',
-			];
-
-			foreach ($allowedHeaders as $allowedHeader) {
-				if (isset($headers[$allowedHeader])) {
-					$request->setHeader($allowedHeader, $headers[$allowedHeader]);
-				}
-			}
-		}
-
-		// MEGAHACK, because the Sabre File impl reads this property directly
-		$_SERVER['CONTENT_LENGTH'] = $file['size'][0];
-		$request->setHeader('Content-Length', $file['size'][0]);
-
-		$tmpFile = $file['tmp_name'][0];
-		$resource = fopen($tmpFile, 'r');
-
-		$request->setBody($resource);
-		$request->setMethod($method);
-
-		$this->server->invokeMethod($request, $response, false);
-
-		fclose($resource);
-		unlink($tmpFile);
-
-		$this->convertResponse($response);
-
-		return false;
-	}
-
-}
diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php
index 02956e55861b..c5b4f6a9352d 100644
--- a/apps/dav/lib/Connector/Sabre/ServerFactory.php
+++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php
@@ -106,7 +106,6 @@ public function createServer($baseUri,
 		// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
 		$server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin());
 		$server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
-		$server->addPlugin(new \OCA\DAV\Connector\Sabre\IFrameTransportPlugin());
 		$server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
 		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
 		// we do not provide locking we emulate it using a fake locking plugin.
diff --git a/apps/dav/tests/unit/Connector/Sabre/IFrameTransportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/IFrameTransportPluginTest.php
deleted file mode 100644
index 485dd1b779e1..000000000000
--- a/apps/dav/tests/unit/Connector/Sabre/IFrameTransportPluginTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-namespace OCA\DAV\Tests\Unit\Connector\Sabre;
-
-/**
- * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-class IFrameTransportPluginTest extends \Test\TestCase {
-
-	/**
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var \OCA\DAV\Connector\Sabre\IFrameTransportPlugin
-	 */
-	private $plugin;
-
-	public function setUp() {
-		parent::setUp();
-		$this->server = $this->getMockBuilder('\Sabre\DAV\Server')
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->plugin = new \OCA\DAV\Connector\Sabre\IFrameTransportPlugin();
-		$this->plugin->initialize($this->server);
-	}
-
-	public function tearDown() {
-		$_FILES = null;
-		unset($_SERVER['CONTENT_LENGTH']);
-	}
-
-	public function testPutConversion() {
-		$request = $this->getMock('Sabre\HTTP\RequestInterface');
-		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
-
-		$request->expects($this->once())
-			->method('getQueryParameters')
-			->will($this->returnValue(['_method' => 'PUT']));
-
-		$postData = [
-			'headers' => json_encode([
-				'If-None-Match' => '*',
-				'Disallowed-Header' => 'test',
-			]),
-		];
-
-		$request->expects($this->once())
-			->method('getPostData')
-			->will($this->returnValue($postData));
-
-		$request->expects($this->once())
-			->method('getHeader')
-			->with('Content-Type')
-			->will($this->returnValue('multipart/form-data'));
-
-		$tmpFileName = tempnam(sys_get_temp_dir(), 'tmpfile');
-		$fh = fopen($tmpFileName, 'w');
-		fwrite($fh, 'hello');
-		fclose($fh);
-
-		$_FILES = ['files' => [
-			'error' => [0],
-			'tmp_name' => [$tmpFileName],
-			'size' => [5],
-		]];
-
-		$request->expects($this->any())
-			->method('setHeader')
-			->withConsecutive(
-				['If-None-Match', '*'],
-				['Content-Length', 5]
-			);
-
-		$request->expects($this->once())
-			->method('setMethod')
-			->with('PUT');
-
-		$this->server->expects($this->once())
-			->method('invokeMethod')
-			->with($request, $response);
-
-		// response data before conversion
-		$response->expects($this->once())
-			->method('getHeaders')
-			->will($this->returnValue(['Test-Response-Header' => [123]]));
-
-		$response->expects($this->any())
-			->method('getBody')
-			->will($this->returnValue('test'));
-
-		$response->expects($this->once())
-			->method('getStatus')
-			->will($this->returnValue(201));
-
-		$responseBody = json_encode([
-			'status' => 201,
-			'headers' => ['Test-Response-Header' => [123]],
-			'data' => 'test',
-		]);
-
-		// response data after conversion
-		$response->expects($this->once())
-			->method('setBody')
-			->with($responseBody);
-
-		$response->expects($this->once())
-			->method('setStatus')
-			->with(200);
-
-		$response->expects($this->any())
-			->method('setHeader')
-			->withConsecutive(
-				['Content-Type', 'text/plain'],
-				['Content-Length', strlen($responseBody)]
-			);
-
-		$this->assertFalse($this->plugin->handlePost($request, $response));
-
-		$this->assertEquals(5, $_SERVER['CONTENT_LENGTH']);
-
-		$this->assertFalse(file_exists($tmpFileName));
-	}
-
-	public function testIgnoreNonPut() {
-		$request = $this->getMock('Sabre\HTTP\RequestInterface');
-		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
-
-		$request->expects($this->once())
-			->method('getQueryParameters')
-			->will($this->returnValue(['_method' => 'PROPFIND']));
-
-		$this->server->expects($this->never())
-			->method('invokeMethod')
-			->with($request, $response);
-
-		$this->assertNull($this->plugin->handlePost($request, $response));
-	}
-
-	public function testIgnoreMismatchedContentType() {
-		$request = $this->getMock('Sabre\HTTP\RequestInterface');
-		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
-
-		$request->expects($this->once())
-			->method('getQueryParameters')
-			->will($this->returnValue(['_method' => 'PUT']));
-
-		$request->expects($this->once())
-			->method('getHeader')
-			->with('Content-Type')
-			->will($this->returnValue('text/plain'));
-
-		$this->server->expects($this->never())
-			->method('invokeMethod')
-			->with($request, $response);
-
-		$this->assertNull($this->plugin->handlePost($request, $response));
-	}
-}

From 7acd7bbd3e201d8c481bd36367bffbbde3cf0daf Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 15 Jul 2016 16:03:02 +0200
Subject: [PATCH 212/219] Add support for chunked upload

Hacked around Blueimp's jquery.fileupload to make it work with our new
chunking API.
---
 apps/files/js/file-upload.js | 135 +++++++++++++++++++++++++----------
 apps/files/js/filelist.js    |  20 +++---
 2 files changed, 110 insertions(+), 45 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 453553330c64..5f5f6303cf8d 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -18,7 +18,7 @@
  *    - TODO music upload button
  */
 
-/* global jQuery, humanFileSize */
+/* global jQuery, humanFileSize, md5 */
 
 /**
  * File upload object
@@ -34,12 +34,21 @@
 OC.FileUpload = function(uploader, data) {
 	this.uploader = uploader;
 	this.data = data;
+	var path = OC.joinPaths(this.uploader.fileList.getCurrentDirectory(), this.getFile().name);
+	this.id = 'web-file-upload-' + md5(path) + '-' + (new Date()).getTime();
 };
 OC.FileUpload.CONFLICT_MODE_DETECT = 0;
 OC.FileUpload.CONFLICT_MODE_OVERWRITE = 1;
 OC.FileUpload.CONFLICT_MODE_AUTORENAME = 2;
 OC.FileUpload.prototype = {
 
+	/**
+	 * Unique upload id
+	 *
+	 * @type string
+	 */
+	id: null,
+
 	/**
 	 * Upload element
 	 *
@@ -66,6 +75,15 @@ OC.FileUpload.prototype = {
 	 */
 	_newName: null,
 
+	/**
+	 * Returns the unique upload id
+	 *
+	 * @return string
+	 */
+	getId: function() {
+		return this.id;
+	},
+
 	/**
 	 * Returns the file to be uploaded
 	 *
@@ -143,6 +161,7 @@ OC.FileUpload.prototype = {
 	 * Submit the upload
 	 */
 	submit: function() {
+		var self = this;
 		var data = this.data;
 		var file = this.getFile();
 
@@ -192,19 +211,54 @@ OC.FileUpload.prototype = {
 			}
 		}
 
+		var chunkFolderPromise;
+		if ($.support.blobSlice
+			&& this.uploader.fileUploadParam.maxChunkSize
+			&& this.getFile().size > this.uploader.fileUploadParam.maxChunkSize
+		) {
+			data.isChunked = true;
+			chunkFolderPromise = this.uploader.davClient.createDirectory(
+				'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
+			);
+			// TODO: if fails, it means same id already existed, need to retry
+		} else {
+			chunkFolderPromise = $.Deferred().resolve().promise();
+		}
+
 		// wait for creation of the required directory before uploading
-		folderPromise.then(function() {
+		$.when(folderPromise, chunkFolderPromise).then(function() {
 			data.submit();
 		}, function() {
-			data.abort();
+			self.abort();
 		});
 
 	},
 
+	/**
+	 * Process end of transfer
+	 */
+	done: function() {
+		if (!this.data.isChunked) {
+			return $.Deferred().resolve().promise();
+		}
+
+		var uid = OC.getCurrentUser().uid;
+		return this.uploader.davClient.move(
+			'uploads/' + encodeURIComponent(uid) + '/' + encodeURIComponent(this.getId()) + '/.file',
+			'files/' + encodeURIComponent(uid) + '/' + OC.joinPaths(this.getFullPath(), this.getFileName())
+		);
+	},
+
 	/**
 	 * Abort the upload
 	 */
 	abort: function() {
+		if (this.data.isChunked) {
+			// delete transfer directory for this upload
+			this.uploader.davClient.remove(
+				'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
+			);
+		}
 		this.data.abort();
 	},
 
@@ -280,7 +334,7 @@ OC.Uploader = function() {
 	this.init.apply(this, arguments);
 };
 
-OC.Uploader.prototype = {
+OC.Uploader.prototype = _.extend({
 	/**
 	 * @type Array<OC.FileUpload>
 	 */
@@ -384,7 +438,7 @@ OC.Uploader.prototype = {
 				self.filesClient.createDirectory(fullPath).always(function(status) {
 					// 405 is expected if the folder already exists
 					if ((status >= 200 && status < 300) || status === 405) {
-						self.$uploadEl.trigger($.Event('fileuploadcreatedfolder'), fullPath);
+						self.trigger('createdfolder', fullPath);
 						deferred.resolve();
 						return;
 					}
@@ -407,8 +461,8 @@ OC.Uploader.prototype = {
 	submitUploads: function(uploads) {
 		var self = this;
 		_.each(uploads, function(upload) {
-			upload.submit();
 			self._uploads[upload.data.uploadId] = upload;
+			upload.submit();
 		});
 	},
 
@@ -611,16 +665,6 @@ OC.Uploader.prototype = {
 		this.$uploadEl.trigger(new $.Event('resized'));
 	},
 
-	on: function() {
-		// forward events to upload element
-		this.$uploadEl.on.apply(this.$uploadEl, arguments);
-	},
-
-	off: function() {
-		// forward events to upload element
-		this.$uploadEl.off.apply(this.$uploadEl, arguments);
-	},
-
 	/**
 	 * Returns whether the given file is known to be a received shared file
 	 *
@@ -654,6 +698,12 @@ OC.Uploader.prototype = {
 
 		this.fileList = options.fileList;
 		this.filesClient = options.filesClient || OC.Files.getClient();
+		this.davClient = new OC.Files.Client({
+			host: OC.getHost(),
+			port: OC.getPort(),
+			root: OC.getRootPath() + '/remote.php/dav/',
+			useHTTPS: OC.getProtocol() === 'https'
+		});
 
 		$uploadEl = $($uploadEl);
 		this.$uploadEl = $uploadEl;
@@ -668,6 +718,7 @@ OC.Uploader.prototype = {
 				dropZone: options.dropZone, // restrict dropZone to content div
 				autoUpload: false,
 				sequentialUploads: true,
+				maxChunkSize: 10000000,
 				//singleFileUploads is on by default, so the data.files array will always have length 1
 				/**
 				 * on first add of every selection
@@ -691,7 +742,7 @@ OC.Uploader.prototype = {
 
 					var upload = new OC.FileUpload(self, data);
 					// can't link directly due to jQuery not liking cyclic deps on its ajax object
-					data.uploadId = _.uniqueId('file-upload');
+					data.uploadId = upload.getId();
 
 					// we need to collect all data upload objects before
 					// starting the upload so we can check their existence
@@ -845,7 +896,10 @@ OC.Uploader.prototype = {
 				},
 				fail: function(e, data) {
 					var upload = self.getUpload(data);
-					var status = upload.getResponseStatus();
+					var status = null;
+					if (upload) {
+						status = upload.getResponseStatus();
+					}
 					self.log('fail', e, upload);
 
 					if (data.textStatus === 'abort') {
@@ -918,10 +972,7 @@ OC.Uploader.prototype = {
 				// add progress handlers
 				fileupload.on('fileuploadadd', function(e, data) {
 					self.log('progress handle fileuploadadd', e, data);
-					//show cancel button
-					//if (data.dataType !== 'iframe') { //FIXME when is iframe used? only for ie?
-					//	$('#uploadprogresswrapper .stop').show();
-					//}
+					self.trigger('add', e, data);
 				});
 				// add progress handlers
 				fileupload.on('fileuploadstart', function(e, data) {
@@ -937,10 +988,12 @@ OC.Uploader.prototype = {
 							+ '</span></em>');
                     $('#uploadprogressbar').tipsy({gravity:'n', fade:true, live:true});
 					self._showProgressBar();
+					self.trigger('start', e, data);
 				});
 				fileupload.on('fileuploadprogress', function(e, data) {
 					self.log('progress handle fileuploadprogress', e, data);
 					//TODO progressbar in row
+					self.trigger('progress', e, data);
 				});
 				fileupload.on('fileuploadprogressall', function(e, data) {
 					self.log('progress handle fileuploadprogressall', e, data);
@@ -1003,6 +1056,7 @@ OC.Uploader.prototype = {
 						})
 					);
 					$('#uploadprogressbar').progressbar('value', progress);
+					self.trigger('progressall', e, data);
 				});
 				fileupload.on('fileuploadstop', function(e, data) {
 					self.log('progress handle fileuploadstop', e, data);
@@ -1016,23 +1070,32 @@ OC.Uploader.prototype = {
 					if (data.errorThrown === 'abort') {
 						self._hideProgressBar();
 					}
+					self.trigger('fail', e, data);
 				});
 
-			} else {
-				// for all browsers that don't support the progress bar
-				// IE 8 & 9
-
-				// show a spinner
-				fileupload.on('fileuploadstart', function() {
-					$('#upload').addClass('icon-loading');
-					$('#upload .icon-upload').hide();
+				fileupload.on('fileuploadchunksend', function(e, data) {
+					// modify the request to adjust it to our own chunking
+					var upload = self.getUpload(data);
+					var range = data.contentRange.split(' ')[1];
+					var chunkId = range.split('/')[0];
+					data.url = OC.getRootPath() +
+						'/remote.php/dav/uploads' +
+						'/' + encodeURIComponent(OC.getCurrentUser().uid) +
+						'/' + encodeURIComponent(upload.getId()) +
+						'/' + encodeURIComponent(chunkId);
+					delete data.contentRange;
+					delete data.headers['Content-Range'];
 				});
-
-				// hide a spinner
-				fileupload.on('fileuploadstop fileuploadfail', function() {
-					$('#upload').removeClass('icon-loading');
-					$('#upload .icon-upload').show();
+				fileupload.on('fileuploaddone', function(e, data) {
+					var upload = self.getUpload(data);
+					upload.done().then(function() {
+						self.trigger('done', e, upload);
+					});
+				});
+				fileupload.on('fileuploaddrop', function(e, data) {
+					self.trigger('drop', e, data);
 				});
+
 			}
 		}
 
@@ -1050,6 +1113,6 @@ OC.Uploader.prototype = {
 
 		return this.fileUploadParam;
 	}
-};
+}, OC.Backbone.Events);
 
 
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 7c95afbad753..d0f42a60dbbf 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2650,16 +2650,18 @@
 
 		/**
 		 * Setup file upload events related to the file-upload plugin
+		 *
+		 * @param {OC.Uploader} uploader
 		 */
-		setupUploadEvents: function($uploadEl) {
+		setupUploadEvents: function(uploader) {
 			var self = this;
 
 			self._uploads = {};
 
 			// detect the progress bar resize
-			$uploadEl.on('resized', this._onResize);
+			uploader.on('resized', this._onResize);
 
-			$uploadEl.on('fileuploaddrop', function(e, data) {
+			uploader.on('drop', function(e, data) {
 				self._uploader.log('filelist handle fileuploaddrop', e, data);
 
 				if (self.$el.hasClass('hidden')) {
@@ -2722,7 +2724,7 @@
 					}
 				}
 			});
-			$uploadEl.on('fileuploadadd', function(e, data) {
+			uploader.on('add', function(e, data) {
 				self._uploader.log('filelist handle fileuploadadd', e, data);
 
 				// add ui visualization to existing folder
@@ -2754,16 +2756,16 @@
 			 * when file upload done successfully add row to filelist
 			 * update counter when uploading to sub folder
 			 */
-			$uploadEl.on('fileuploaddone', function(e, data) {
+			uploader.on('done', function(e, upload) {
 				self._uploader.log('filelist handle fileuploaddone', e, data);
 
+				var data = upload.data;
 				var status = data.jqXHR.status;
 				if (status < 200 || status >= 300) {
 					// error was handled in OC.Uploads already
 					return;
 				}
 
-				var upload = self._uploader.getUpload(data);
 				var fileName = upload.getFileName();
 				var fetchInfoPromise = self.addAndFetchFileInfo(fileName, upload.getFullPath());
 				if (!self._uploads) {
@@ -2773,10 +2775,10 @@
 					self._uploads[fileName] = fetchInfoPromise;
 				}
 			});
-			$uploadEl.on('fileuploadcreatedfolder', function(e, fullPath) {
+			uploader.on('createdfolder', function(e, fullPath) {
 				self.addAndFetchFileInfo(OC.basename(fullPath), OC.dirname(fullPath));
 			});
-			$uploadEl.on('fileuploadstop', function() {
+			uploader.on('stop', function() {
 				self._uploader.log('filelist handle fileuploadstop');
 
 				// prepare list of uploaded file names in the current directory
@@ -2792,7 +2794,7 @@
 				});
 				self.updateStorageStatistics();
 			});
-			$uploadEl.on('fileuploadfail', function(e, data) {
+			uploader.on('fail', function(e, data) {
 				self._uploader.log('filelist handle fileuploadfail', e, data);
 				
 				self._uploads = [];

From 2fc92db77da9e6b1a37260a366566e4889800b05 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 31 Aug 2016 16:32:14 +0200
Subject: [PATCH 213/219] Fix js unit tests for webdav put upload changes

---
 apps/files/js/file-upload.js          | 15 ++++-
 apps/files/js/filelist.js             |  8 +--
 apps/files/tests/js/fileUploadSpec.js |  2 +-
 apps/files/tests/js/filelistSpec.js   | 86 +++++++++++----------------
 4 files changed, 53 insertions(+), 58 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 5f5f6303cf8d..40595fbe44e4 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -34,7 +34,12 @@
 OC.FileUpload = function(uploader, data) {
 	this.uploader = uploader;
 	this.data = data;
-	var path = OC.joinPaths(this.uploader.fileList.getCurrentDirectory(), this.getFile().name);
+	var path = '';
+	if (this.uploader.fileList) {
+		path = OC.joinPaths(this.uploader.fileList.getCurrentDirectory(), this.getFile().name);
+	} else {
+		path = this.getFile().name;
+	}
 	this.id = 'web-file-upload-' + md5(path) + '-' + (new Date()).getTime();
 };
 OC.FileUpload.CONFLICT_MODE_DETECT = 0;
@@ -364,6 +369,9 @@ OC.Uploader.prototype = _.extend({
 	 * also see article @link http://blog.new-bamboo.co.uk/2012/01/10/ridiculously-simple-ajax-uploads-with-formdata
 	 */
 	_supportAjaxUploadWithProgress: function() {
+		if (window.TESTING) {
+			return true;
+		}
 		return supportFileAPI() && supportAjaxUploadProgressEvents() && supportFormData();
 
 		// Is the File API supported?
@@ -718,7 +726,6 @@ OC.Uploader.prototype = _.extend({
 				dropZone: options.dropZone, // restrict dropZone to content div
 				autoUpload: false,
 				sequentialUploads: true,
-				maxChunkSize: 10000000,
 				//singleFileUploads is on by default, so the data.files array will always have length 1
 				/**
 				 * on first add of every selection
@@ -924,7 +931,9 @@ OC.Uploader.prototype = _.extend({
 						OC.Notification.showTemporary(data.errorThrown, {timeout: 10});
 					}
 
-					upload.deleteUpload();
+					if (upload) {
+						upload.deleteUpload();
+					}
 				},
 				/**
 				 * called for every successful upload
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index d0f42a60dbbf..c7fdb59dec9c 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2712,16 +2712,16 @@
 					// add target dir
 					data.targetDir = dir;
 				} else {
-					// we are dropping somewhere inside the file list, which will
-					// upload the file to the current directory
-					data.targetDir = self.getCurrentDirectory();
-
 					// cancel uploads to current dir if no permission
 					var isCreatable = (self.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0;
 					if (!isCreatable) {
 						self._showPermissionDeniedNotification();
 						return false;
 					}
+
+					// we are dropping somewhere inside the file list, which will
+					// upload the file to the current directory
+					data.targetDir = self.getCurrentDirectory();
 				}
 			});
 			uploader.on('add', function(e, data) {
diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
index bfaf0a9fe57b..19f8cde7e442 100644
--- a/apps/files/tests/js/fileUploadSpec.js
+++ b/apps/files/tests/js/fileUploadSpec.js
@@ -48,7 +48,7 @@ describe('OC.Upload tests', function() {
 		$dummyUploader = $('#file_upload_start');
 		uploader = new OC.Uploader($dummyUploader);
 		failStub = sinon.stub();
-		$dummyUploader.on('fileuploadfail', failStub);
+		uploader.on('fail', failStub);
 	});
 	afterEach(function() {
 		$dummyUploader = undefined;
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index ed81f90b4b03..dc573816630a 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2582,15 +2582,12 @@ describe('OCA.Files.FileList tests', function() {
 	 * that were registered on the magic upload object
 	 */
 	describe('file upload', function() {
-		var $uploader;
 		var uploadData;
+		var uploader;
 
 		beforeEach(function() {
-			// note: this isn't the real blueimp file uploader from jquery.fileupload
-			// but it makes it possible to simulate the event triggering to
-			// test the response of the handlers
-			$uploader = $('#file_upload_start');
 			fileList.setFiles(testFiles);
+			uploader = fileList._uploader;
 			// simulate data structure from jquery.upload
 			uploadData = {
 				files: [{
@@ -2600,7 +2597,7 @@ describe('OCA.Files.FileList tests', function() {
 		});
 
 		afterEach(function() {
-			$uploader = null;
+			uploader = null;
 			uploadData = null;
 		});
 
@@ -2624,11 +2621,7 @@ describe('OCA.Files.FileList tests', function() {
 			 * @return event object including the result
 			 */
 			function addFile(data) {
-				var ev = new $.Event('fileuploadadd', {});
-				// using triggerHandler instead of trigger so we can pass
-				// extra data
-				$uploader.triggerHandler(ev, data || {});
-				return ev;
+				uploader.trigger('add', {}, data || {});
 			}
 
 			it('sets target dir to the current directory', function() {
@@ -2650,11 +2643,8 @@ describe('OCA.Files.FileList tests', function() {
 						target: $target
 					}
 				};
-				var ev = new $.Event('fileuploaddrop', eventData);
-				// using triggerHandler instead of trigger so we can pass
-				// extra data
-				$uploader.triggerHandler(ev, data || {});
-				return ev;
+				uploader.trigger('drop', eventData, data || {});
+				return !!data.targetDir;
 			}
 
 			it('drop on a tr or crumb outside file list does not trigger upload', function() {
@@ -2662,62 +2652,62 @@ describe('OCA.Files.FileList tests', function() {
 				var ev;
 				$('#testArea').append($anotherTable);
 				ev = dropOn($anotherTable.find('tr'), uploadData);
-				expect(ev.result).toEqual(false);
+				expect(ev).toEqual(false);
 
-				ev = dropOn($anotherTable.find('.crumb'));
-				expect(ev.result).toEqual(false);
+				ev = dropOn($anotherTable.find('.crumb'), uploadData);
+				expect(ev).toEqual(false);
 			});
 			it('drop on an element outside file list container does not trigger upload', function() {
 				var $anotherEl = $('<div>outside</div>');
 				var ev;
 				$('#testArea').append($anotherEl);
-				ev = dropOn($anotherEl);
+				ev = dropOn($anotherEl, uploadData);
 
-				expect(ev.result).toEqual(false);
+				expect(ev).toEqual(false);
 			});
 			it('drop on an element inside the table triggers upload', function() {
 				var ev;
 				ev = dropOn(fileList.$fileList.find('th:first'), uploadData);
 
-				expect(ev.result).not.toEqual(false);
+				expect(ev).not.toEqual(false);
 				expect(uploadData.targetDir).toEqual('/subdir');
 			});
 			it('drop on an element on the table container triggers upload', function() {
 				var ev;
 				ev = dropOn($('#app-content-files'), uploadData);
 
-				expect(ev.result).not.toEqual(false);
+				expect(ev).not.toEqual(false);
 				expect(uploadData.targetDir).toEqual('/subdir');
 			});
 			it('drop on an element inside the table does not trigger upload if no upload permission', function() {
 				$('#permissions').val(0);
 				var ev;
-				ev = dropOn(fileList.$fileList.find('th:first'));
+				ev = dropOn(fileList.$fileList.find('th:first'), uploadData);
 
-				expect(ev.result).toEqual(false);
+				expect(ev).toEqual(false);
 				expect(notificationStub.calledOnce).toEqual(true);
 			});
 			it('drop on an folder does not trigger upload if no upload permission on that folder', function() {
 				var $tr = fileList.findFileEl('somedir');
 				var ev;
 				$tr.data('permissions', OC.PERMISSION_READ);
-				ev = dropOn($tr);
+				ev = dropOn($tr, uploadData);
 
-				expect(ev.result).toEqual(false);
+				expect(ev).toEqual(false);
 				expect(notificationStub.calledOnce).toEqual(true);
 			});
 			it('drop on a file row inside the table triggers upload to current folder', function() {
 				var ev;
 				ev = dropOn(fileList.findFileEl('One.txt').find('td:first'), uploadData);
 
-				expect(ev.result).not.toEqual(false);
+				expect(ev).not.toEqual(false);
 				expect(uploadData.targetDir).toEqual('/subdir');
 			});
 			it('drop on a folder row inside the table triggers upload to target folder', function() {
 				var ev;
 				ev = dropOn(fileList.findFileEl('somedir').find('td:eq(2)'), uploadData);
 
-				expect(ev.result).not.toEqual(false);
+				expect(ev).not.toEqual(false);
 				expect(uploadData.targetDir).toEqual('/subdir/somedir');
 			});
 			it('drop on a breadcrumb inside the table triggers upload to target folder', function() {
@@ -2725,7 +2715,7 @@ describe('OCA.Files.FileList tests', function() {
 				fileList.changeDirectory('a/b/c/d');
 				ev = dropOn(fileList.$el.find('.crumb:eq(2)'), uploadData);
 
-				expect(ev.result).not.toEqual(false);
+				expect(ev).not.toEqual(false);
 				expect(uploadData.targetDir).toEqual('/a/b');
 			});
 			it('renders upload indicator element for folders only', function() {
@@ -2749,8 +2739,7 @@ describe('OCA.Files.FileList tests', function() {
 			it('fetches folder info', function() {
 				var fetchInfoStub = sinon.stub(fileList, 'addAndFetchFileInfo');
 
-				var ev = new $.Event('fileuploadcreatedfolder', {});
-				$uploader.triggerHandler(ev, '/subdir/newfolder');
+				uploader.trigger('createdfolder', {}, '/subdir/newfolder');
 
 				expect(fetchInfoStub.calledOnce).toEqual(true);
 				expect(fetchInfoStub.getCall(0).args[0]).toEqual('newfolder');
@@ -2773,19 +2762,16 @@ describe('OCA.Files.FileList tests', function() {
 
 
 			function createUpload(name, dir) {
-				var data = {
-					files: [{
-						name: name
-					}],
-					upload: {
-						getFileName: sinon.stub().returns(name),
-						getFullPath: sinon.stub().returns(dir)
-					},
-					jqXHR: {
-						status: 200
+				var jqXHR = {
+					status: 200
+				};
+				return {
+					getFileName: sinon.stub().returns(name),
+					getFullPath: sinon.stub().returns(dir),
+					data: {
+						jqXHR: jqXHR
 					}
-				}
-				return data;
+				};
 			}
 
 			/**
@@ -2794,12 +2780,12 @@ describe('OCA.Files.FileList tests', function() {
 			 * @return event object including the result
 			 */
 			function addFile(data) {
-				var ev = new $.Event('fileuploaddone', {});
-				// using triggerHandler instead of trigger so we can pass
-				// extra data
+				var ev = new $.Event('done', {
+					jqXHR: {status: 200}
+				});
 				var deferred = $.Deferred();
 				fetchInfoStub.returns(deferred.promise());
-				$uploader.triggerHandler(ev, data || {});
+				uploader.trigger('done', ev, data || {});
 				return deferred;
 			}
 
@@ -2814,7 +2800,7 @@ describe('OCA.Files.FileList tests', function() {
 				var def1 = addFile(createUpload('upload.txt', '/subdir'));
 				var def2 = addFile(createUpload('upload2.txt', '/subdir'));
 				var def3 = addFile(createUpload('upload3.txt', '/another'));
-				$uploader.triggerHandler(new $.Event('fileuploadstop'));
+				uploader.trigger('stop', {});
 
 				expect(highlightStub.notCalled).toEqual(true);
 				def1.resolve();
@@ -2830,7 +2816,7 @@ describe('OCA.Files.FileList tests', function() {
 				var statStub = sinon.stub(fileList, 'updateStorageStatistics');
 				addFile(createUpload('upload.txt', '/subdir'));
 				expect(statStub.notCalled).toEqual(true);
-				$uploader.triggerHandler(new $.Event('fileuploadstop'));
+				uploader.trigger('stop', {});
 				expect(statStub.calledOnce).toEqual(true);
 				statStub.restore();
 			});

From 23310ac4718171e42ab155a195de4d5cc2efeb61 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Sat, 3 Sep 2016 18:06:35 +0200
Subject: [PATCH 214/219] More fixes to file upload

---
 apps/files/js/file-upload.js        | 28 +++++++++++---------
 apps/files/js/filelist.js           | 24 +++++++++++------
 apps/files/tests/js/filelistSpec.js |  2 +-
 core/js/files/client.js             | 41 ++++++++++++++++++++++++++++-
 4 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 40595fbe44e4..b82f78d23bca 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -204,6 +204,14 @@ OC.FileUpload.prototype = {
 			this.data.headers['X-OC-Mtime'] = file.lastModified / 1000;
 		}
 
+		var userName = this.uploader.filesClient.getUserName();
+		var password = this.uploader.filesClient.getPassword();
+		if (userName) {
+			// copy username/password from DAV client
+			this.data.headers['Authorization'] =
+				'Basic ' + btoa(userName + ':' + (password || ''));
+		}
+
 		if (!this.uploader.isXHRUpload()) {
 			data.formData = [];
 
@@ -222,7 +230,7 @@ OC.FileUpload.prototype = {
 			&& this.getFile().size > this.uploader.fileUploadParam.maxChunkSize
 		) {
 			data.isChunked = true;
-			chunkFolderPromise = this.uploader.davClient.createDirectory(
+			chunkFolderPromise = this.uploader.filesClient.createDirectory(
 				'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
 			);
 			// TODO: if fails, it means same id already existed, need to retry
@@ -248,7 +256,7 @@ OC.FileUpload.prototype = {
 		}
 
 		var uid = OC.getCurrentUser().uid;
-		return this.uploader.davClient.move(
+		return this.uploader.filesClient.move(
 			'uploads/' + encodeURIComponent(uid) + '/' + encodeURIComponent(this.getId()) + '/.file',
 			'files/' + encodeURIComponent(uid) + '/' + OC.joinPaths(this.getFullPath(), this.getFileName())
 		);
@@ -260,7 +268,7 @@ OC.FileUpload.prototype = {
 	abort: function() {
 		if (this.data.isChunked) {
 			// delete transfer directory for this upload
-			this.uploader.davClient.remove(
+			this.uploader.filesClient.remove(
 				'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
 			);
 		}
@@ -343,7 +351,7 @@ OC.Uploader.prototype = _.extend({
 	/**
 	 * @type Array<OC.FileUpload>
 	 */
-	_uploads: [],
+	_uploads: {},
 
 	/**
 	 * List of directories known to exist.
@@ -586,7 +594,7 @@ OC.Uploader.prototype = _.extend({
 	onReplace:function(upload) {
 		this.log('replace', null, upload);
 		upload.setConflictMode(OC.FileUpload.CONFLICT_MODE_OVERWRITE);
-		upload.submit();
+		this.submitUploads([upload]);
 	},
 	/**
 	 * handle uploading a file and letting the server decide a new name
@@ -595,7 +603,7 @@ OC.Uploader.prototype = _.extend({
 	onAutorename:function(upload) {
 		this.log('autorename', null, upload);
 		upload.setConflictMode(OC.FileUpload.CONFLICT_MODE_AUTORENAME);
-		upload.submit();
+		this.submitUploads([upload]);
 	},
 	_trace:false, //TODO implement log handler for JS per class?
 	log:function(caption, e, data) {
@@ -706,19 +714,13 @@ OC.Uploader.prototype = _.extend({
 
 		this.fileList = options.fileList;
 		this.filesClient = options.filesClient || OC.Files.getClient();
-		this.davClient = new OC.Files.Client({
-			host: OC.getHost(),
-			port: OC.getPort(),
-			root: OC.getRootPath() + '/remote.php/dav/',
-			useHTTPS: OC.getProtocol() === 'https'
-		});
 
 		$uploadEl = $($uploadEl);
 		this.$uploadEl = $uploadEl;
 
 		if ($uploadEl.exists()) {
 			$('#uploadprogresswrapper .stop').on('click', function() {
-				this.cancelUploads();
+				self.cancelUploads();
 			});
 
 			this.fileUploadParam = {
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c7fdb59dec9c..bdc0fb5beccc 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2774,8 +2774,13 @@
 				if (OC.isSamePath(OC.dirname(upload.getFullPath() + '/'), self.getCurrentDirectory())) {
 					self._uploads[fileName] = fetchInfoPromise;
 				}
+
+				var uploadText = self.$fileList.find('tr .uploadtext');
+				self.showFileBusyState(uploadText.closest('tr'), false);
+				uploadText.fadeOut();
+				uploadText.attr('currentUploads', 0);
 			});
-			uploader.on('createdfolder', function(e, fullPath) {
+			uploader.on('createdfolder', function(fullPath) {
 				self.addAndFetchFileInfo(OC.basename(fullPath), OC.dirname(fullPath));
 			});
 			uploader.on('stop', function() {
@@ -2793,6 +2798,11 @@
 					self.highlightFiles(fileNames);
 				});
 				self.updateStorageStatistics();
+
+				var uploadText = self.$fileList.find('tr .uploadtext');
+				self.showFileBusyState(uploadText.closest('tr'), false);
+				uploadText.fadeOut();
+				uploadText.attr('currentUploads', 0);
 			});
 			uploader.on('fail', function(e, data) {
 				self._uploader.log('filelist handle fileuploadfail', e, data);
@@ -2800,13 +2810,11 @@
 				self._uploads = [];
 
 				//if user pressed cancel hide upload chrome
-				if (data.errorThrown === 'abort') {
-					//cleanup uploading to a dir
-					var uploadText = self.$fileList.find('tr .uploadtext');
-					self.showFileBusyState(uploadText.closest('tr'), false);
-					uploadText.fadeOut();
-					uploadText.attr('currentUploads', 0);
-				}
+				//cleanup uploading to a dir
+				var uploadText = self.$fileList.find('tr .uploadtext');
+				self.showFileBusyState(uploadText.closest('tr'), false);
+				uploadText.fadeOut();
+				uploadText.attr('currentUploads', 0);
 				self.updateStorageStatistics();
 			});
 
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index dc573816630a..73130342d9c7 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2739,7 +2739,7 @@ describe('OCA.Files.FileList tests', function() {
 			it('fetches folder info', function() {
 				var fetchInfoStub = sinon.stub(fileList, 'addAndFetchFileInfo');
 
-				uploader.trigger('createdfolder', {}, '/subdir/newfolder');
+				uploader.trigger('createdfolder', '/subdir/newfolder');
 
 				expect(fetchInfoStub.calledOnce).toEqual(true);
 				expect(fetchInfoStub.getCall(0).args[0]).toEqual('newfolder');
diff --git a/core/js/files/client.js b/core/js/files/client.js
index 0bf5a69e19c9..94cc98c5047e 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -705,8 +705,47 @@
 		 */
 		addFileInfoParser: function(parserFunction) {
 			this._fileInfoParsers.push(parserFunction);
-		}
+		},
 
+		/**
+		 * Returns the dav.Client instance used internally
+		 *
+		 * @since 9.2
+		 * @return {dav.Client}
+		 */
+		getClient: function() {
+			return this._client;
+		},
+
+		/**
+		 * Returns the user name
+		 *
+		 * @since 9.2
+		 * @return {String} userName
+		 */
+		getUserName: function() {
+			return this._client.userName;
+		},
+
+		/**
+		 * Returns the password 
+		 *
+		 * @since 9.2
+		 * @return {String} password
+		 */
+		getPassword: function() {
+			return this._client.password;
+		},
+
+		/**
+		 * Returns the base URL
+		 *
+		 * @since 9.2
+		 * @return {String} base URL
+		 */
+		getBaseUrl: function() {
+			return this._client.baseUrl;
+		}
 	};
 
 	/**

From 24f4962c868aea3140957fe4b7c54b2dd1d5b86a Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 15 Sep 2016 18:58:18 +0200
Subject: [PATCH 215/219] Allow uploading empty files (#26113)

---
 apps/files/js/file-upload.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index b82f78d23bca..430c633e8fc8 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -808,10 +808,6 @@ OC.Uploader.prototype = _.extend({
 							//file is a directory
 							dirUploadFailure = true;
 						}
-						if (file.size === 0) {
-							// file is empty or a directory
-							dirUploadFailure = true;
-						}
 
 						if (dirUploadFailure) {
 							data.textStatus = 'dirorzero';

From 67a46bac1e6d7f8506d42640152de71370313703 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 19 Sep 2016 21:29:48 +0200
Subject: [PATCH 216/219] Remove upload_limit in files app as it is not needed
 with PUT upload (#26069)

The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size
---
 apps/files/js/file-upload.js                      | 15 +--------------
 apps/files/js/files.js                            |  2 --
 apps/files/list.php                               |  2 --
 apps/files/templates/list.php                     |  2 --
 apps/files/tests/js/fileUploadSpec.js             | 14 --------------
 .../lib/Controllers/ShareController.php           |  4 +---
 6 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 430c633e8fc8..8c11794abb06 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -768,8 +768,7 @@ OC.Uploader.prototype = _.extend({
 						data.originalFiles.selection = {
 							uploads: [],
 							filesToUpload: data.originalFiles.length,
-							totalBytes: 0,
-							biggestFileBytes: 0
+							totalBytes: 0
 						};
 					}
 					// TODO: move originalFiles to a separate container, maybe inside OC.Upload
@@ -824,18 +823,6 @@ OC.Uploader.prototype = _.extend({
 					} else {
 						// add size
 						selection.totalBytes += file.size;
-						// update size of biggest file
-						selection.biggestFileBytes = Math.max(selection.biggestFileBytes, file.size);
-					}
-
-					// check PHP upload limit against biggest file
-					if (selection.biggestFileBytes > $('#upload_limit').val()) {
-						data.textStatus = 'sizeexceedlimit';
-						data.errorThrown = t('files',
-							'Total file size {size1} exceeds upload limit {size2}', {
-							'size1': humanFileSize(selection.biggestFileBytes),
-							'size2': humanFileSize($('#upload_limit').val())
-						});
 					}
 
 					// check free space
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index b525ecdaed01..11c54179fcf1 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -59,7 +59,6 @@
 				return;
 			}
 			if (response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
-				$('#max_upload').val(response.data.uploadMaxFilesize);
 				$('#free_space').val(response.data.freeSpace);
 				$('#upload.button').attr('data-original-title', response.data.maxHumanFilesize);
 				$('#usedSpacePercent').val(response.data.usedSpacePercent);
@@ -71,7 +70,6 @@
 				return;
 			}
 			if (response[0].uploadMaxFilesize !== undefined) {
-				$('#max_upload').val(response[0].uploadMaxFilesize);
 				$('#upload.button').attr('data-original-title', response[0].maxHumanFilesize);
 				$('#usedSpacePercent').val(response[0].usedSpacePercent);
 				Files.displayStorageWarnings();
diff --git a/apps/files/list.php b/apps/files/list.php
index 6d2c463a2d91..ac13130e0639 100644
--- a/apps/files/list.php
+++ b/apps/files/list.php
@@ -26,11 +26,9 @@
 $config = \OC::$server->getConfig();
 // TODO: move this to the generated config.js
 $publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
-$uploadLimit=OCP\Util::uploadLimit();
 
 // renders the controls and table headers template
 $tmpl = new OCP\Template('files', 'list', '');
-$tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit
 $tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
 $tmpl->printPage();
 
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index e741849f38bb..d66f12f4aff0 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -15,8 +15,6 @@
 			 through ajax instead (updateStorageStatistics).
 	*/ ?>
 	<input type="hidden" name="permissions" value="" id="permissions">
-	<input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php isset($_['uploadMaxFilesize']) ? p($_['uploadMaxFilesize']) : '' ?>">
-	<input type="hidden" id="upload_limit" value="<?php isset($_['uploadLimit']) ? p($_['uploadLimit']) : '' ?>">
 	<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
 	<?php if(isset($_['dirToken'])):?>
 	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
index 19f8cde7e442..fa686dbf3e25 100644
--- a/apps/files/tests/js/fileUploadSpec.js
+++ b/apps/files/tests/js/fileUploadSpec.js
@@ -35,7 +35,6 @@ describe('OC.Upload tests', function() {
 		// need a dummy button because file-upload checks on it
 		$('#testArea').append(
 			'<input type="file" id="file_upload_start" name="files[]" multiple="multiple">' +
-			'<input type="hidden" id="upload_limit" name="upload_limit" value="10000000">' + // 10 MB
 			'<input type="hidden" id="free_space" name="free_space" value="50000000">' + // 50 MB
 			// TODO: handlebars!
 			'<div id="new">' +
@@ -97,19 +96,6 @@ describe('OC.Upload tests', function() {
 			expect(result[0].submit.calledOnce).toEqual(true);
 			expect(failStub.notCalled).toEqual(true);
 		});
-		it('does not add file if it exceeds upload limit', function() {
-			var result;
-			$('#upload_limit').val(1000);
-
-			result = addFiles(uploader, [testFile]);
-
-			expect(result[0]).toEqual(null);
-			expect(failStub.calledOnce).toEqual(true);
-			expect(failStub.getCall(0).args[1].textStatus).toEqual('sizeexceedlimit');
-			expect(failStub.getCall(0).args[1].errorThrown).toEqual(
-				'Total file size 5 KB exceeds upload limit 1000 B'
-			);
-		});
 		it('does not add file if it exceeds free space', function() {
 			var result;
 			$('#free_space').val(1000);
diff --git a/apps/files_sharing/lib/Controllers/ShareController.php b/apps/files_sharing/lib/Controllers/ShareController.php
index 96c0a0ca5569..5534b61247d1 100644
--- a/apps/files_sharing/lib/Controllers/ShareController.php
+++ b/apps/files_sharing/lib/Controllers/ShareController.php
@@ -327,8 +327,7 @@ public function showShare($token, $path = '') {
 				$freeSpace = (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
 			}
 
-			$uploadLimit = Util::uploadLimit();
-			$maxUploadFilesize = min($freeSpace, $uploadLimit);
+			$maxUploadFilesize = $freeSpace;
 
 			$folder = new Template('files', 'list', '');
 			$folder->assign('dir', $rootFolder->getRelativePath($path->getPath()));
@@ -339,7 +338,6 @@ public function showShare($token, $path = '') {
 			$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
 			$folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 			$folder->assign('freeSpace', $freeSpace);
-			$folder->assign('uploadLimit', $uploadLimit); // PHP upload limit
 			$folder->assign('usedSpacePercent', 0);
 			$folder->assign('trash', false);
 			$shareTmpl['folder'] = $folder->fetchPage();

From fc81d1982c09ee598d45ae114d89821d47a34644 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 21 Sep 2016 18:49:15 +0200
Subject: [PATCH 217/219] Highlight files and update storage stats at end of
 upload (#26164)

Properly trigger the "stop" even from the uploader.
Also update storage stats at the end of all uploads instead of for each
upload.
---
 apps/files/js/file-upload.js        |  1 +
 apps/files/js/filelist.js           |  2 +-
 apps/files/tests/js/filelistSpec.js | 17 +++++++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 8c11794abb06..30eaa4445b32 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1057,6 +1057,7 @@ OC.Uploader.prototype = _.extend({
 
 					self.clear();
 					self._hideProgressBar();
+					self.trigger('stop', e, data);
 				});
 				fileupload.on('fileuploadfail', function(e, data) {
 					self.log('progress handle fileuploadfail', e, data);
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index bdc0fb5beccc..3f28d66a32b6 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2796,8 +2796,8 @@
 				$.when.apply($, promises).then(function() {
 					// highlight uploaded files
 					self.highlightFiles(fileNames);
+					self.updateStorageStatistics();
 				});
-				self.updateStorageStatistics();
 
 				var uploadText = self.$fileList.find('tr .uploadtext');
 				self.showFileBusyState(uploadText.closest('tr'), false);
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 73130342d9c7..2d51d380ec10 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2812,13 +2812,22 @@ describe('OCA.Files.FileList tests', function() {
 
 				highlightStub.restore();
 			});
-			it('queries storage stats', function() {
+			it('queries storage stats after all fetches are done', function() {
 				var statStub = sinon.stub(fileList, 'updateStorageStatistics');
-				addFile(createUpload('upload.txt', '/subdir'));
-				expect(statStub.notCalled).toEqual(true);
+				var highlightStub = sinon.stub(fileList, 'highlightFiles');
+				var def1 = addFile(createUpload('upload.txt', '/subdir'));
+				var def2 = addFile(createUpload('upload2.txt', '/subdir'));
+				var def3 = addFile(createUpload('upload3.txt', '/another'));
 				uploader.trigger('stop', {});
+
+				expect(statStub.notCalled).toEqual(true);
+				def1.resolve();
+				expect(statStub.notCalled).toEqual(true);
+				def2.resolve();
+				def3.resolve();
 				expect(statStub.calledOnce).toEqual(true);
-				statStub.restore();
+
+				highlightStub.restore();
 			});
 		});
 	});

From 4519b8cc90270706ad6fc541c148fbf4238fba99 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 9 Sep 2016 12:19:29 +0200
Subject: [PATCH 218/219] Upload autorename on client side

Removes the need for POST to collection which would hit against upload
limits.

The client tries to auto rename the file by adding a suffix "(2)".
It tries to use the file list on the client side to guess a
suitable name. In case a file still cannot be uploaded and creates a
conflict, which can happen when the file was concurrently uploaded, the
logic will continue increasing the suffix.
---
 apps/dav/lib/Connector/Sabre/FilesPlugin.php  | 54 +-----------
 .../unit/Connector/Sabre/FilesPluginTest.php  | 81 ------------------
 apps/files/js/file-upload.js                  | 85 ++++++++++++-------
 .../js/templates/detailsview.handlebars.js    | 28 ++++++
 apps/files/tests/js/fileUploadSpec.js         | 61 ++++++++++++-
 5 files changed, 141 insertions(+), 168 deletions(-)
 create mode 100644 apps/files/js/templates/detailsview.handlebars.js

diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index ea460e36fb62..d9ca17569a37 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <bjoern@schiessle.org>
+ * @author Joas Schilling <coding@schilljs.com>
  * @author Lukas Reschke <lukas@statuscode.ch>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
@@ -9,7 +10,7 @@
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
- * @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;
@@ -157,8 +157,6 @@ public function initialize(\Sabre\DAV\Server $server) {
 		$this->server = $server;
 		$this->server->on('propFind', array($this, 'handleGetProperties'));
 		$this->server->on('propPatch', array($this, 'handleUpdateProperties'));
-		// RFC5995 to add file to the collection with a suggested name
-		$this->server->on('method:POST', [$this, 'httpPost']);
 		$this->server->on('afterBind', array($this, 'sendFileIdHeader'));
 		$this->server->on('afterWriteContent', array($this, 'sendFileIdHeader'));
 		$this->server->on('afterMethod:GET', [$this,'httpGet']);
@@ -417,52 +415,4 @@ public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
 			}
 		}
 	}
-
-	/**
-	 * POST operation on directories to create a new file
-	 * with suggested name
-	 *
-	 * @param RequestInterface $request request object
-	 * @param ResponseInterface $response response object
-	 * @return null|false
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		// TODO: move this to another plugin ?
-		if (!\OC::$CLI && !\OC::$server->getRequest()->passesCSRFCheck()) {
-			throw new BadRequest('Invalid CSRF token');
-		}
-
-		list($parentPath, $name) = \Sabre\HTTP\URLUtil::splitPath($request->getPath());
-
-		// Making sure the parent node exists and is a directory
-		$node = $this->tree->getNodeForPath($parentPath);
-
-		if ($node instanceof Directory) {
-			// no Add-Member found
-			if (empty($name) || $name[0] !== '&') {
-				// suggested name required
-				throw new BadRequest('Missing suggested file name');
-			}
-
-			$name = substr($name, 1);
-
-			if (empty($name)) {
-				// suggested name required
-				throw new BadRequest('Missing suggested file name');
-			}
-
-			// make sure the name is unique
-			$name = basename(\OC_Helper::buildNotExistingFileNameForView($parentPath, $name, $this->fileView));
-
-			$node->createFile($name, $request->getBodyAsStream());
-
-			list($parentUrl, ) = \Sabre\HTTP\URLUtil::splitPath($request->getUrl());
-
-			$response->setHeader('Content-Location', $parentUrl . '/' . rawurlencode($name));
-
-			// created
-			$response->setStatus(201);
-			return false;
-		}
-	}
 }
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
index d5debee53607..1bc87bbc829a 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -550,85 +550,4 @@ public function testDownloadHeaders($isClumsyAgent, $contentDispositionHeader) {
 
 		$this->plugin->httpGet($request, $response);
 	}
-
-	public function postCreateFileProvider() {
-		$baseUrl = 'http://example.com/owncloud/remote.php/webdav/subdir/';
-		return [
-			['test.txt', 'some file.txt', 'some file.txt', $baseUrl . 'some%20file.txt'],
-			['some file.txt', 'some file.txt', 'some file (2).txt', $baseUrl . 'some%20file%20%282%29.txt'],
-		];
-	}
-
-	/**
-	 * @dataProvider postCreateFileProvider
-	 */
-	public function testPostWithAddMember($existingFile, $wantedName, $deduplicatedName, $expectedLocation) {
-		$request = $this->getMock('Sabre\HTTP\RequestInterface');
-		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
-
-		$request->expects($this->any())
-			->method('getUrl')
-			->will($this->returnValue('http://example.com/owncloud/remote.php/webdav/subdir/&' . $wantedName));
-
-		$request->expects($this->any())
-			->method('getPath')
-			->will($this->returnValue('/subdir/&' . $wantedName));
-
-		$request->expects($this->once())
-			->method('getBodyAsStream')
-			->will($this->returnValue(fopen('data://text/plain,hello', 'r')));
-
-		$this->view->expects($this->any())
-			->method('file_exists')
-			->will($this->returnCallback(function($path) use ($existingFile) {
-				return ($path === '/subdir/' . $existingFile);
-			}));
-
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\Directory', '/subdir');
-
-		$node->expects($this->once())
-			->method('createFile')
-			->with($deduplicatedName, $this->isType('resource'));
-
-		$response->expects($this->once())
-			->method('setStatus')
-			->with(201);
-		$response->expects($this->once())
-			->method('setHeader')
-			->with('Content-Location', $expectedLocation);
-
-		$this->assertFalse($this->plugin->httpPost($request, $response));
-	}
-
-	public function testPostOnNonDirectory() {
-		$request = $this->getMock('Sabre\HTTP\RequestInterface');
-		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
-
-		$request->expects($this->any())
-			->method('getPath')
-			->will($this->returnValue('/subdir/test.txt/&abc'));
-
-		$this->createTestNode('\OCA\DAV\Connector\Sabre\File', '/subdir/test.txt');
-
-		$this->assertNull($this->plugin->httpPost($request, $response));
-	}
-
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 */
-	public function testPostWithoutAddMember() {
-		$request = $this->getMock('Sabre\HTTP\RequestInterface');
-		$response = $this->getMock('Sabre\HTTP\ResponseInterface');
-
-		$request->expects($this->any())
-			->method('getPath')
-			->will($this->returnValue('/subdir/&'));
-
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\Directory', '/subdir');
-
-		$node->expects($this->never())
-			->method('createFile');
-
-		$this->plugin->httpPost($request, $response);
-	}
 }
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 30eaa4445b32..7e04657f5331 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -100,26 +100,14 @@ OC.FileUpload.prototype = {
 
 	/**
 	 * Return the final filename.
-	 * Either this is the original file name or the file name
-	 * after an autorename.
 	 *
 	 * @return {String} file name
 	 */
 	getFileName: function() {
-		// in case of autorename
+		// autorenamed name
 		if (this._newName) {
 			return this._newName;
 		}
-
-		if (this._conflictMode === OC.FileUpload.CONFLICT_MODE_AUTORENAME) {
-
-			var locationUrl = this.getResponseHeader('Content-Location');
-			if (locationUrl) {
-				this._newName = decodeURIComponent(OC.basename(locationUrl));
-				return this._newName;
-			}
-		}
-
 		return this.getFile().name;
 	},
 
@@ -141,9 +129,20 @@ OC.FileUpload.prototype = {
 		return OC.joinPaths(this._targetFolder, this.getFile().relativePath || '');
 	},
 
+	/**
+	 * Returns conflict resolution mode.
+	 *
+	 * @return {int} conflict mode
+	 */
+	getConflictMode: function() {
+		return this._conflictMode || OC.FileUpload.CONFLICT_MODE_DETECT;
+	},
+
 	/**
 	 * Set conflict resolution mode.
 	 * See CONFLICT_MODE_* constants.
+	 *
+	 * @param {int} mode conflict mode
 	 */
 	setConflictMode: function(mode) {
 		this._conflictMode = mode;
@@ -162,6 +161,30 @@ OC.FileUpload.prototype = {
 		delete this.data.jqXHR;
 	},
 
+	/**
+	 * Trigger autorename and append "(2)".
+	 * Multiple calls will increment the appended number.
+	 */
+	autoRename: function() {
+		var name = this.getFile().name;
+		if (!this._renameAttempt) {
+			this._renameAttempt = 1;
+		}
+
+		var dotPos = name.lastIndexOf('.');
+		var extPart = '';
+		if (dotPos > 0) {
+			this._newName = name.substr(0, dotPos);
+			extPart = name.substr(dotPos);
+		} else {
+			this._newName = name;
+		}
+
+		// generate new name
+		this._renameAttempt++;
+		this._newName = this._newName + ' (' + this._renameAttempt + ')' + extPart;
+	},
+
 	/**
 	 * Submit the upload
 	 */
@@ -179,7 +202,7 @@ OC.FileUpload.prototype = {
 		}
 
 		if (this.uploader.fileList) {
-			this.data.url = this.uploader.fileList.getUploadUrl(file.name, this.getFullPath());
+			this.data.url = this.uploader.fileList.getUploadUrl(this.getFileName(), this.getFullPath());
 		}
 
 		if (!this.data.headers) {
@@ -191,12 +214,9 @@ OC.FileUpload.prototype = {
 		this.data.type = 'PUT';
 
 		delete this.data.headers['If-None-Match'];
-		if (this._conflictMode === OC.FileUpload.CONFLICT_MODE_DETECT) {
+		if (this._conflictMode === OC.FileUpload.CONFLICT_MODE_DETECT
+			|| this._conflictMode === OC.FileUpload.CONFLICT_MODE_AUTORENAME) {
 			this.data.headers['If-None-Match'] = '*';
-		} else if (this._conflictMode === OC.FileUpload.CONFLICT_MODE_AUTORENAME) {
-			// POST to parent folder, with slug
-			this.data.type = 'POST';
-			this.data.url = this.uploader.fileList.getUploadUrl('&' + file.name, this.getFullPath());
 		}
 
 		if (file.lastModified) {
@@ -212,18 +232,6 @@ OC.FileUpload.prototype = {
 				'Basic ' + btoa(userName + ':' + (password || ''));
 		}
 
-		if (!this.uploader.isXHRUpload()) {
-			data.formData = [];
-
-			// pass headers as parameters
-			data.formData.push({name: 'headers', value: JSON.stringify(this.data.headers)});
-			data.formData.push({name: 'requesttoken', value: OC.requestToken});
-			if (data.type === 'POST') {
-				// still add the method to the URL
-				data.url += '?_method=POST';
-			}
-		}
-
 		var chunkFolderPromise;
 		if ($.support.blobSlice
 			&& this.uploader.fileUploadParam.maxChunkSize
@@ -491,6 +499,14 @@ OC.Uploader.prototype = _.extend({
 		//show "file already exists" dialog
 		var self = this;
 		var file = fileUpload.getFile();
+		// already attempted autorename but the server said the file exists ? (concurrently added)
+		if (fileUpload.getConflictMode() === OC.FileUpload.CONFLICT_MODE_AUTORENAME) {
+			// attempt another autorename, defer to let the current callback finish
+			_.defer(function() {
+				self.onAutorename(fileUpload);
+			});
+			return;
+		}
 		// retrieve more info about this file
 		this.filesClient.getFileInfo(fileUpload.getFullPath()).then(function(status, fileInfo) {
 			var original = fileInfo;
@@ -603,6 +619,13 @@ OC.Uploader.prototype = _.extend({
 	onAutorename:function(upload) {
 		this.log('autorename', null, upload);
 		upload.setConflictMode(OC.FileUpload.CONFLICT_MODE_AUTORENAME);
+
+		do {
+			upload.autoRename();
+			// if file known to exist on the client side, retry
+		} while (this.fileList && this.fileList.inList(upload.getFileName()));
+
+		// resubmit upload
 		this.submitUploads([upload]);
 	},
 	_trace:false, //TODO implement log handler for JS per class?
diff --git a/apps/files/js/templates/detailsview.handlebars.js b/apps/files/js/templates/detailsview.handlebars.js
new file mode 100644
index 000000000000..c109da77a63d
--- /dev/null
+++ b/apps/files/js/templates/detailsview.handlebars.js
@@ -0,0 +1,28 @@
+(function() {
+  var template = Handlebars.template, templates = OCA.Files.Templates = OCA.Files.Templates || {};
+templates['detailsview'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<ul class=\"tabHeaders\">\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tabHeaders : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</ul>\n";
+},"2":function(container,depth0,helpers,partials,data) {
+    var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "	<li class=\"tabHeader\" data-tabid=\""
+    + alias4(((helper = (helper = helpers.tabId || (depth0 != null ? depth0.tabId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tabId","hash":{},"data":data}) : helper)))
+    + "\" data-tabindex=\""
+    + alias4(((helper = (helper = helpers.tabIndex || (depth0 != null ? depth0.tabIndex : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tabIndex","hash":{},"data":data}) : helper)))
+    + "\">\n		<a href=\"#\">"
+    + alias4(((helper = (helper = helpers.label || (depth0 != null ? depth0.label : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"label","hash":{},"data":data}) : helper)))
+    + "</a>\n	</li>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : {};
+
+  return "<div class=\"detailFileInfoContainer\"></div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tabHeaders : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "<div class=\"tabsContainer\">\n</div>\n<a class=\"close icon-close\" href=\"#\" alt=\""
+    + container.escapeExpression(((helper = (helper = helpers.closeLabel || (depth0 != null ? depth0.closeLabel : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"closeLabel","hash":{},"data":data}) : helper)))
+    + "\"></a>\n";
+},"useData":true});
+})();
diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
index fa686dbf3e25..81a0a2df6106 100644
--- a/apps/files/tests/js/fileUploadSpec.js
+++ b/apps/files/tests/js/fileUploadSpec.js
@@ -144,6 +144,10 @@ describe('OC.Upload tests', function() {
 			uploader = new OC.Uploader($dummyUploader, {
 				fileList: fileList
 			});
+
+			var deferred = $.Deferred();
+			conflictDialogStub.returns(deferred.promise());
+			deferred.resolve();
 		});
 		afterEach(function() {
 			conflictDialogStub.restore();
@@ -158,10 +162,6 @@ describe('OC.Upload tests', function() {
 			expect(result[1].submit.calledOnce).toEqual(true);
 		});
 		it('shows conflict dialog when no client side conflict', function() {
-			var deferred = $.Deferred();
-			conflictDialogStub.returns(deferred.promise());
-			deferred.resolve();
-
 			var result = addFiles(uploader, [
 				{name: 'conflict.txt'},
 				{name: 'conflict2.txt'},
@@ -185,5 +185,58 @@ describe('OC.Upload tests', function() {
 			expect(result[1].submit.calledOnce).toEqual(false);
 			expect(result[2].submit.calledOnce).toEqual(true);
 		});
+		it('cancels upload when skipping file in conflict mode', function() {
+			var fileData = {name: 'conflict.txt'};
+			var uploadData = addFiles(uploader, [
+				fileData
+			]);
+
+			var upload = new OC.FileUpload(uploader, uploadData[0]);
+			var deleteStub = sinon.stub(upload, 'deleteUpload');
+
+			uploader.onSkip(upload);
+			expect(deleteStub.calledOnce).toEqual(true);
+		});
+		it('overwrites file when choosing replace in conflict mode', function() {
+			var fileData = {name: 'conflict.txt'};
+			var uploadData = addFiles(uploader, [
+				fileData
+			]);
+
+			expect(uploadData[0].submit.notCalled).toEqual(true);
+
+			var upload = new OC.FileUpload(uploader, uploadData[0]);
+
+			uploader.onReplace(upload);
+			expect(upload.getConflictMode()).toEqual(OC.FileUpload.CONFLICT_MODE_OVERWRITE);
+			expect(uploadData[0].submit.calledOnce).toEqual(true);
+		});
+		it('autorenames file when choosing replace in conflict mode', function() {
+			// needed for _.defer call
+			var clock = sinon.useFakeTimers();
+			var fileData = {name: 'conflict.txt'};
+			var uploadData = addFiles(uploader, [
+				fileData
+			]);
+
+			expect(uploadData[0].submit.notCalled).toEqual(true);
+
+			var upload = new OC.FileUpload(uploader, uploadData[0]);
+			var getResponseStatusStub = sinon.stub(upload, 'getResponseStatus');
+
+			uploader.onAutorename(upload);
+			expect(upload.getConflictMode()).toEqual(OC.FileUpload.CONFLICT_MODE_AUTORENAME);
+			expect(upload.getFileName()).toEqual('conflict (2).txt');
+			expect(uploadData[0].submit.calledOnce).toEqual(true);
+
+			// in case of server-side conflict, tries to rename again
+			getResponseStatusStub.returns(412);
+			uploader.fileUploadParam.fail.call($dummyUploader[0], {}, uploadData[0]);
+			clock.tick(500);
+			expect(upload.getFileName()).toEqual('conflict (3).txt');
+			expect(uploadData[0].submit.calledTwice).toEqual(true);
+
+			clock.restore();
+		});
 	});
 });

From 3c7233e5ffb2e0eaeb30b3fcafcb6234867c6585 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 7 Oct 2016 16:27:54 +0200
Subject: [PATCH 219/219] Enable chunking for bigger files in web upload

---
 apps/files/js/file-upload.js | 25 ++++++++++++++++++++-----
 core/js/files/client.js      | 12 +++++++++++-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 7e04657f5331..df3fd8e1a8f8 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -224,8 +224,8 @@ OC.FileUpload.prototype = {
 			this.data.headers['X-OC-Mtime'] = file.lastModified / 1000;
 		}
 
-		var userName = this.uploader.filesClient.getUserName();
-		var password = this.uploader.filesClient.getPassword();
+		var userName = this.uploader.davClient.getUserName();
+		var password = this.uploader.davClient.getPassword();
 		if (userName) {
 			// copy username/password from DAV client
 			this.data.headers['Authorization'] =
@@ -238,7 +238,7 @@ OC.FileUpload.prototype = {
 			&& this.getFile().size > this.uploader.fileUploadParam.maxChunkSize
 		) {
 			data.isChunked = true;
-			chunkFolderPromise = this.uploader.filesClient.createDirectory(
+			chunkFolderPromise = this.uploader.davClient.createDirectory(
 				'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
 			);
 			// TODO: if fails, it means same id already existed, need to retry
@@ -264,7 +264,7 @@ OC.FileUpload.prototype = {
 		}
 
 		var uid = OC.getCurrentUser().uid;
-		return this.uploader.filesClient.move(
+		return this.uploader.davClient.move(
 			'uploads/' + encodeURIComponent(uid) + '/' + encodeURIComponent(this.getId()) + '/.file',
 			'files/' + encodeURIComponent(uid) + '/' + OC.joinPaths(this.getFullPath(), this.getFileName())
 		);
@@ -276,7 +276,7 @@ OC.FileUpload.prototype = {
 	abort: function() {
 		if (this.data.isChunked) {
 			// delete transfer directory for this upload
-			this.uploader.filesClient.remove(
+			this.uploader.davClient.remove(
 				'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
 			);
 		}
@@ -379,6 +379,13 @@ OC.Uploader.prototype = _.extend({
 	 */
 	filesClient: null,
 
+	/**
+	 * Webdav client pointing at the root "dav" endpoint
+	 *
+	 * @type OC.Files.Client
+	 */
+	davClient: null,
+
 	/**
 	 * Function that will allow us to know if Ajax uploads are supported
 	 * @link https://github.com/New-Bamboo/example-ajax-upload/blob/master/public/index.html
@@ -737,6 +744,13 @@ OC.Uploader.prototype = _.extend({
 
 		this.fileList = options.fileList;
 		this.filesClient = options.filesClient || OC.Files.getClient();
+		this.davClient = new OC.Files.Client({
+			host: this.filesClient.getHost(),
+			root: OC.linkToRemoteBase('dav'),
+			useHTTPS: OC.getProtocol() === 'https',
+			userName: this.filesClient.getUserName(),
+			password: this.filesClient.getPassword()
+		});
 
 		$uploadEl = $($uploadEl);
 		this.$uploadEl = $uploadEl;
@@ -750,6 +764,7 @@ OC.Uploader.prototype = _.extend({
 				type: 'PUT',
 				dropZone: options.dropZone, // restrict dropZone to content div
 				autoUpload: false,
+				maxChunkSize: 10 * 1000 * 1000, // 10 MB
 				sequentialUploads: true,
 				//singleFileUploads is on by default, so the data.files array will always have length 1
 				/**
diff --git a/core/js/files/client.js b/core/js/files/client.js
index 94cc98c5047e..3afa8532e41a 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -37,6 +37,7 @@
 		}
 
 		url += options.host + this._root;
+		this._host = options.host;
 		this._defaultHeaders = options.defaultHeaders || {
 				'X-Requested-With': 'XMLHttpRequest',
 				'requesttoken': OC.requestToken
@@ -745,6 +746,16 @@
 		 */
 		getBaseUrl: function() {
 			return this._client.baseUrl;
+		},
+
+		/**
+		 * Returns the host
+		 *
+		 * @since 9.2
+		 * @return {String} base URL
+		 */
+		getHost: function() {
+			return this._host;
 		}
 	};
 
@@ -782,7 +793,6 @@
 
 		var client = new OC.Files.Client({
 			host: OC.getHost(),
-			port: OC.getPort(),
 			root: OC.linkToRemoteBase('webdav'),
 			useHTTPS: OC.getProtocol() === 'https'
 		});