Merge pull request #6910 from nextcloud/backport-6677-s12

[stable12] don't reset quota
nextcloud · Oct 23, 2017 · ad66244 · ad66244
2 parents aaad2ab + 791fa69
commit ad66244
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
@@ -436,8 +436,8 @@ private function doCriticalValidation() {
 			|| ($agent !== '' && $pwd === '')
 		) {
 			\OCP\Util::writeLog('user_ldap',
-								$errorStr.'either no password is given for the'.
-								'user agent or a password is given, but not an'.
+								$errorStr.'either no password is given for the '.
+								'user agent or a password is given, but not an '.
 								'LDAP agent.',
 				\OCP\Util::WARN);
 			$configurationOK = false;

diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
@@ -529,7 +529,6 @@ public function updateQuota($valueFromLDAP = null) {
 				$targetUser->setQuota($quota);
 			} else {
 				$this->log->log('not suitable default quota found for user ' . $this->uid . ': [' . $defaultQuota . ']', \OCP\Util::WARN);
-				$targetUser->setQuota('default');
 			}
 		} else {
 			$this->log->log('trying to set a quota for user ' . $this->uid . ' but the user is missing', \OCP\Util::ERROR);

diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php
@@ -453,9 +453,8 @@ public function testUpdateQuotaNoneProvided() {
 			->will($this->returnValue(false));
 
 		$user = $this->createMock('\OCP\IUser');
-		$user->expects($this->once())
-			->method('setQuota')
-			->with('default');
+		$user->expects($this->never())
+			->method('setQuota');
 
 		$userMgr->expects($this->once())
 			->method('get')
@@ -495,9 +494,8 @@ public function testUpdateQuotaNoneConfigured() {
 			->method('__get');
 
 		$user = $this->createMock('\OCP\IUser');
-		$user->expects($this->once())
-			->method('setQuota')
-			->with('default');
+		$user->expects($this->never())
+			->method('setQuota');
 
 		$userMgr->expects($this->once())
 			->method('get')
@@ -633,9 +631,8 @@ public function testUpdateWrongDefaultQuotaProvided() {
 			->will($this->returnValue(false));
 
 		$user = $this->createMock('\OCP\IUser');
-		$user->expects($this->once())
-			->method('setQuota')
-			->with('default');
+		$user->expects($this->never())
+			->method('setQuota');
 
 		$userMgr->expects($this->once())
 			->method('get')
@@ -681,9 +678,8 @@ public function testUpdateWrongQuotaAndDefaultAllProvided() {
 			->will($this->returnValue(array('23 flush')));
 
 		$user = $this->createMock('\OCP\IUser');
-		$user->expects($this->once())
-			->method('setQuota')
-			->with('default');
+		$user->expects($this->never())
+			->method('setQuota');
 
 		$userMgr->expects($this->once())
 			->method('get')
@@ -726,9 +722,8 @@ public function testUpdateWrongDefaultQuotaNotProvided() {
 			->method('readAttribute');
 
 		$user = $this->createMock('\OCP\IUser');
-		$user->expects($this->once())
-			->method('setQuota')
-			->with('default');
+		$user->expects($this->never())
+			->method('setQuota');
 
 		$userMgr->expects($this->once())
 			->method('get')