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:
commit
a8641fdc95
|
@ -35,6 +35,7 @@
|
|||
|
||||
namespace OCA\user_ldap\lib;
|
||||
|
||||
use OCA\user_ldap\lib\user\OfflineUser;
|
||||
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]);
|
||||
$this->cacheUserExists($ocName);
|
||||
$user = $this->userManager->get($ocName);
|
||||
if($user instanceof OfflineUser) {
|
||||
$user->unmark();
|
||||
$user = $this->userManager->get($ocName);
|
||||
}
|
||||
$user->processAttributes($userRecord);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -85,6 +85,13 @@ class OfflineUser {
|
|||
$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
|
||||
* @return array
|
||||
|
|
Loading…
Reference in New Issue