From 15afbfd198f9f54cee8717776b4f45f73d9b1cbf Mon Sep 17 00:00:00 2001
From: "Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>
Date: Thu, 6 Dec 2012 18:09:47 +0100
Subject: Add an $excludingBackend optional parameter

to the userExists method both in OCP\User and in OC_User.
---
 lib/public/user.php | 6 +++---
 lib/user.php        | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/public/user.php b/lib/public/user.php
index b320ce8ea0c..9e50115ab70 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -65,12 +65,12 @@ class User {
 	/**
 	 * @brief check if a user exists
 	 * @param string $uid the username
+	 * @param string $excludingBackend (default none) 
 	 * @return boolean
 	 */
-	public static function userExists( $uid ) {
-		return \OC_USER::userExists( $uid );
+	public static function userExists( $uid, $excludingBackend = null ) {
+		return \OC_USER::userExists( $uid, $excludingBackend );
 	}
-
 	/**
 	 * @brief Loggs the user out including all the session data
 	 * @returns true
diff --git a/lib/user.php b/lib/user.php
index 31c93740d77..d55c6165a09 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -407,10 +407,15 @@ class OC_User {
 	/**
 	 * @brief check if a user exists
 	 * @param string $uid the username
+	 * @param string $excludingBackend (default none)
 	 * @return boolean
 	 */
-	public static function userExists($uid) {
+	public static function userExists($uid, $excludingBackend=null) {
 		foreach(self::$_usedBackends as $backend) {
+			if (!is_null($excludingBackend) && !strcmp(get_class($backend),$excludingBackend)) {
+			    OC_Log::write('OC_User', $excludingBackend . 'excluded from user existance check.', OC_Log::DEBUG);
+			    continue;
+			}
 			$result=$backend->userExists($uid);
 			if($result===true) {
 				return true;
-- 
cgit v1.2.3