summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2015-10-30 19:20:42 +0100
committerArthur Schiwon <blizzz@owncloud.com>2015-10-30 19:20:42 +0100
commita2f2ffb8dbcb7f9cb0fe139f592be0d4772bec20 (patch)
treefb698d6d9faa6d60f80a09883ef3185747c5e6d4 /apps
parent6911d8f0a4e688f3c84f2dd117424f887820750a (diff)
downloadnextcloud-server-a2f2ffb8dbcb7f9cb0fe139f592be0d4772bec20.tar.gz
nextcloud-server-a2f2ffb8dbcb7f9cb0fe139f592be0d4772bec20.zip
if a user that is flag as deleted shows up again, remove that flag. Fixes #20090
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/lib/access.php5
-rw-r--r--apps/user_ldap/lib/user/offlineuser.php7
2 files changed, 12 insertions, 0 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index dd8ffe14bca..bb423ecb016 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -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);
}
}
diff --git a/apps/user_ldap/lib/user/offlineuser.php b/apps/user_ldap/lib/user/offlineuser.php
index 72c02427928..3456a27b412 100644
--- a/apps/user_ldap/lib/user/offlineuser.php
+++ b/apps/user_ldap/lib/user/offlineuser.php
@@ -86,6 +86,13 @@ class OfflineUser {
}
/**
+ * 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
*/