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

Merge pull request #20192 from owncloud/fix-20090 

if a user that is flag as deleted shows up again, remove that flag. F…
This commit is contained in:
Thomas Müller 2015-11-02 11:28:28 +01:00
parent c5caebbd1f a2f2ffb8db
commit a8641fdc95
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/user_ldap/lib/access.php
View File

@ -35,6 +35,7 @@
namespace OCA\user_ldap\lib; namespace OCA\user_ldap\lib;
use OCA\user_ldap\lib\user\OfflineUser;
use OCA\User_LDAP\Mapping\AbstractMapping; use OCA\User_LDAP\Mapping\AbstractMapping;
/** /**
@ -696,6 +697,10 @@ class Access extends LDAPUtility implements user\IUserTools {
$ocName = $this->dn2ocname($userRecord['dn'][0], $userRecord[$displayNameAttribute]); $ocName = $this->dn2ocname($userRecord['dn'][0], $userRecord[$displayNameAttribute]);
$this->cacheUserExists($ocName); $this->cacheUserExists($ocName);
$user = $this->userManager->get($ocName); $user = $this->userManager->get($ocName);
if($user instanceof OfflineUser) {
$user->unmark();
$user = $this->userManager->get($ocName);
}
$user->processAttributes($userRecord); $user->processAttributes($userRecord);
} }
} }

7
apps/user_ldap/lib/user/offlineuser.php
View File

@ -85,6 +85,13 @@ class OfflineUser {
$this->fetchDetails(); $this->fetchDetails();
} }
/**
* remove the Delete-flag from the user.
*/
public function unmark() {
$this->config->setUserValue($this->ocName, 'user_ldap', 'isDeleted', '0');
}
/** /**
* exports the user details in an assoc array * exports the user details in an assoc array
* @return array * @return array