diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-10-19 11:42:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 11:42:37 +0200 |
| commit | 7de6f7cd077bc6aab052b00f3c785f9b79efc076 (patch) | |
| tree | 2da569e01b481a77839a125320ac484ea6ef959c /apps/user_ldap | |
| parent | 3f352d5f3b8208b871f1e0e54d87f0900c0ebfe3 (diff) | |
| parent | 3e2015a24c5121422c952485704c15c15a49e3b7 (diff) | |
| download | nextcloud-server-7de6f7cd077bc6aab052b00f3c785f9b79efc076.tar.gz nextcloud-server-7de6f7cd077bc6aab052b00f3c785f9b79efc076.zip | |
Merge pull request #6677 from nextcloud/downstream-dont-reset-quota
don't reset quota
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/Connection.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/lib/User/User.php | 1 | ||||
| -rw-r--r-- | apps/user_ldap/tests/User/UserTest.php | 25 |
3 files changed, 12 insertions, 18 deletions
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php index 440f5d2444e..3350dd6a5cd 100644 --- a/apps/user_ldap/lib/Connection.php +++ b/apps/user_ldap/lib/Connection.php @@ -436,8 +436,8 @@ class Connection extends LDAPUtility { || ($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 index 5017f35ed0a..a46b0053b40 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -529,7 +529,6 @@ class User { $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 index 637842d9ac7..5f6148b1332 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -453,9 +453,8 @@ class UserTest extends \Test\TestCase { ->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 @@ class UserTest extends \Test\TestCase { ->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 @@ class UserTest extends \Test\TestCase { ->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 @@ class UserTest extends \Test\TestCase { ->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 @@ class UserTest extends \Test\TestCase { ->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') |