From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 4 Jul 2011 17:04:15 +0000 (+0200)
Subject: Hopefully fix errors if ldap plugin is not configured
X-Git-Tag: v3.0~267^2~438
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7f0dc638ae5bb651baa171825921055d95cb1c63;p=nextcloud-server.git

Hopefully fix errors if ldap plugin is not configured
---

diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 1ee9809b3bb..d6ed8c741e7 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -26,6 +26,7 @@ require_once('User/backend.php');
 class OC_USER_LDAP extends OC_USER_BACKEND {
 
 	protected $ds;
+	protected $configured = false;
 
 	// cached settings
 	protected $ldap_host;
@@ -42,6 +43,17 @@ class OC_USER_LDAP extends OC_USER_BACKEND {
 		$this->ldap_password = OC_APPCONFIG::getValue('user_ldap', 'ldap_password','');
 		$this->ldap_base = OC_APPCONFIG::getValue('user_ldap', 'ldap_base','');
 		$this->ldap_filter = OC_APPCONFIG::getValue('user_ldap', 'ldap_filter','');
+
+		if( !empty($this->ldap_host)
+			&& !empty($this->ldap_port)
+			&& !empty($this->ldap_dn)
+			&& !empty($this->ldap_password)
+			&& !empty($this->ldap_base)
+			&& !empty($this->ldap_filter)
+		)
+		{
+			$this->configured = true;
+		}
 	}
 
 	function __destruct() {
@@ -66,6 +78,9 @@ class OC_USER_LDAP extends OC_USER_BACKEND {
 	}
 
 	private function getDn( $uid ) {
+		if(!$this->configured)
+			return false;
+
 		// connect to server
 		$ds = $this->getDs();
 		if( !$ds )
@@ -90,7 +105,7 @@ class OC_USER_LDAP extends OC_USER_BACKEND {
 	}
 
 	public function userExists( $uid ) {
-		$dn = getDn($uid);
+		$dn = $this->getDn($uid);
 		return !empty($dn);
 	}