[Pkg-owncloud-commits] [owncloud] 49/62: Backport of #16890 to stable8

[David Prévot]

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

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

commit 7bd7056a4c426730c2885c0e301bea4ebdae5524
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Thu Jun 11 18:24:45 2015 +0200

    Backport of #16890 to stable8
    
    the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway
    
    delete user test to take getHome into account to ensure it is also deleted subsequently
---
 apps/user_ldap/tests/user_ldap.php |  5 ++++-
 apps/user_ldap/user_ldap.php       | 11 ++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index 119b0b1..f8ac4a1 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -253,12 +253,15 @@ class Test_User_Ldap_Direct extends \Test\TestCase {
 		$config = $this->getMock('\OCP\IConfig');
 		$config->expects($this->exactly(2))
 			->method('getUserValue')
-			->will($this->returnValue(1));
+			->will($this->onConsecutiveCalls('1', '/var/vhome/jdings/'));
 
 		$backend = new UserLDAP($access, $config);
 
 		$result = $backend->deleteUser('jeremy');
 		$this->assertTrue($result);
+
+		$home = $backend->getHome('jeremy');
+		$this->assertSame($home, '/var/vhome/jdings/');
 	}
 
 	/**
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index c65c68d..69c4af0 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -196,6 +196,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 		}
 		//getting dn, if false the user does not exist. If dn, he may be mapped only, requires more checking.
 		$user = $this->access->userManager->get($uid);
+
 		if(is_null($user)) {
 			\OCP\Util::writeLog('user_ldap', 'No DN found for '.$uid.' on '.
 				$this->access->connection->ldapHost, \OCP\Util::DEBUG);
@@ -247,16 +248,16 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 	* @return string|bool
 	*/
 	public function getHome($uid) {
-		// user Exists check required as it is not done in user proxy!
-		if(!$this->userExists($uid)) {
-			return false;
-		}
-
 		if(isset($this->homesToKill[$uid]) && !empty($this->homesToKill[$uid])) {
 			//a deleted user who needs some clean up
 			return $this->homesToKill[$uid];
 		}
 
+		// user Exists check required as it is not done in user proxy!
+		if(!$this->userExists($uid)) {
+			return false;
+		}
+
 		$cacheKey = 'getHome'.$uid;
 		if($this->access->connection->isCached($cacheKey)) {
 			return $this->access->connection->getFromCache($cacheKey);

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