Check for valid LDAP-resource before querying.

Check if we have get valid link identifier from
self::getConnectionResource() before using ldap_search() and
ldap_get_entries(), otherwise return an empty array.

Signed-off-by: Benjamin Diele <benjamin@diele.be>

1 files changed, 17 insertions, 5 deletions

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 5cd7e0241bf..6a6d744a0f1 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -469,11 +469,23 @@ class OC_LDAP {
 		if(!is_null($attr) && !is_array($attr)) {
 			$attr = array(strtolower($attr));
 		}
-		$sr = @ldap_search(self::getConnectionResource(), $base, $filter, $attr);
-		$findings = @ldap_get_entries(self::getConnectionResource(), $sr );
-		// if we're here, probably no connection ressource is returned.
-		// to make ownCloud behave nicely, we simply give back an empty array.
-		if(is_null($findings)) {
+
+		// See if we have a resource, that way we can get rid of the
+		// error-supressing.
+		$link_resource = self::getConnectionResource();
+		if($link_resource)
+		{
+			$sr = ldap_search($link_resource, $base, $filter, $attr);
+			$findings = ldap_get_entries($link_resource, $sr );
+			// if we're here, probably no connection ressource is returned.
+			// to make ownCloud behave nicely, we simply give back an empty array.
+			if(is_null($findings)) {
+				return array();
+			}
+		} else
+		{
+			// Seems like we didn't find any resource.
+			// Return an empty array just like before.
 			return array();
 		}