mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6677 from nextcloud/downstream-dont-reset-quota 

don't reset quota
This commit is contained in:
Lukas Reschke 2017-10-19 11:42:37 +02:00 committed by GitHub
parent 3f352d5f3b 3e2015a24c
commit 7de6f7cd07
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/user_ldap/lib/Connection.php
View File

@ -436,8 +436,8 @@ class Connection extends LDAPUtility {
|| ($agent !== '' && $pwd === '') || ($agent !== '' && $pwd === '')
) { ) {
\OCP\Util::writeLog('user_ldap', \OCP\Util::writeLog('user_ldap',
$errorStr.'either no password is given for the'. $errorStr.'either no password is given for the '.
'user agent or a password is given, but not an'. 'user agent or a password is given, but not an '.
'LDAP agent.', 'LDAP agent.',
\OCP\Util::WARN); \OCP\Util::WARN);
$configurationOK = false; $configurationOK = false;

1
apps/user_ldap/lib/User/User.php
View File

@ -529,7 +529,6 @@ class User {
$targetUser->setQuota($quota); $targetUser->setQuota($quota);
} else { } else {
$this->log->log('not suitable default quota found for user ' . $this->uid . ': [' . $defaultQuota . ']', \OCP\Util::WARN); $this->log->log('not suitable default quota found for user ' . $this->uid . ': [' . $defaultQuota . ']', \OCP\Util::WARN);
$targetUser->setQuota('default');
} }
} else { } else {
$this->log->log('trying to set a quota for user ' . $this->uid . ' but the user is missing', \OCP\Util::ERROR); $this->log->log('trying to set a quota for user ' . $this->uid . ' but the user is missing', \OCP\Util::ERROR);

25
apps/user_ldap/tests/User/UserTest.php
View File

@ -453,9 +453,8 @@ class UserTest extends \Test\TestCase {
->will($this->returnValue(false)); ->will($this->returnValue(false));
$user = $this->createMock('\OCP\IUser'); $user = $this->createMock('\OCP\IUser');
$user->expects($this->once()) $user->expects($this->never())
->method('setQuota') ->method('setQuota');
->with('default');
$userMgr->expects($this->once()) $userMgr->expects($this->once())
->method('get') ->method('get')
@ -495,9 +494,8 @@ class UserTest extends \Test\TestCase {
->method('__get'); ->method('__get');
$user = $this->createMock('\OCP\IUser'); $user = $this->createMock('\OCP\IUser');
$user->expects($this->once()) $user->expects($this->never())
->method('setQuota') ->method('setQuota');
->with('default');
$userMgr->expects($this->once()) $userMgr->expects($this->once())
->method('get') ->method('get')
@ -633,9 +631,8 @@ class UserTest extends \Test\TestCase {
->will($this->returnValue(false)); ->will($this->returnValue(false));
$user = $this->createMock('\OCP\IUser'); $user = $this->createMock('\OCP\IUser');
$user->expects($this->once()) $user->expects($this->never())
->method('setQuota') ->method('setQuota');
->with('default');
$userMgr->expects($this->once()) $userMgr->expects($this->once())
->method('get') ->method('get')
@ -681,9 +678,8 @@ class UserTest extends \Test\TestCase {
->will($this->returnValue(array('23 flush'))); ->will($this->returnValue(array('23 flush')));
$user = $this->createMock('\OCP\IUser'); $user = $this->createMock('\OCP\IUser');
$user->expects($this->once()) $user->expects($this->never())
->method('setQuota') ->method('setQuota');
->with('default');
$userMgr->expects($this->once()) $userMgr->expects($this->once())
->method('get') ->method('get')
@ -726,9 +722,8 @@ class UserTest extends \Test\TestCase {
->method('readAttribute'); ->method('readAttribute');
$user = $this->createMock('\OCP\IUser'); $user = $this->createMock('\OCP\IUser');
$user->expects($this->once()) $user->expects($this->never())
->method('setQuota') ->method('setQuota');
->with('default');
$userMgr->expects($this->once()) $userMgr->expects($this->once())
->method('get') ->method('get')