[Pkg-owncloud-commits] [owncloud] 06/86: if a user that is flag as deleted shows up again, remove that flag. Fixes #20090

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.1.5
in repository owncloud.

commit 21600c7b1a8706b091c3a9846e0218c87e117680
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Fri Oct 30 19:20:42 2015 +0100

    if a user that is flag as deleted shows up again, remove that flag. Fixes #20090
    
    Conflicts:
    	apps/user_ldap/lib/access.php
---
 apps/user_ldap/lib/access.php           | 5 +++++
 apps/user_ldap/lib/user/offlineuser.php | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 81b0974..bb1d441 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -34,6 +34,7 @@
 
 namespace OCA\user_ldap\lib;
 
+use OCA\user_ldap\lib\user\OfflineUser;
 use OCA\User_LDAP\Mapping\AbstractMapping;
 
 /**
@@ -705,6 +706,10 @@ class Access extends LDAPUtility implements user\IUserTools {
 			}
 			$this->cacheUserExists($ocName);
 			$user = $this->userManager->get($ocName);
+			if($user instanceof OfflineUser) {
+				$user->unmark();
+				$user = $this->userManager->get($ocName);
+			}
 			if(!is_null($user)) {
 				$user->processAttributes($userRecord);
 			}
diff --git a/apps/user_ldap/lib/user/offlineuser.php b/apps/user_ldap/lib/user/offlineuser.php
index 0727eb5..336370a 100644
--- a/apps/user_ldap/lib/user/offlineuser.php
+++ b/apps/user_ldap/lib/user/offlineuser.php
@@ -85,6 +85,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
 	 */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git