From 93082a12f1322b00c1777cea8076e0264787f646 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 27 Oct 2009 07:16:50 -0700 Subject: [PATCH] Add an get_admin_user api call and use it to determine the admin user instead of calling lookup by name with a hardcoded name. --- .../ldap/libraries/drivers/IdentityProvider/Ldap.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php b/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php index 38139916..60bfe432 100644 --- a/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php +++ b/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php @@ -50,6 +50,13 @@ class IdentityProvider_Ldap_Driver implements IdentityProvider_Driver { return self::$_guest_user; } + /** + * @see IdentityProvider_Driver::admin_user. + */ + public function admin_user() { + return self::lookup_user_by_name(self::$_params["admins"][0];); + } + /** * @see IdentityProvider_Driver::create_user. */ @@ -89,9 +96,6 @@ class IdentityProvider_Ldap_Driver implements IdentityProvider_Driver { * specified by the "admins" driver params */ public function lookup_user_by_name($name) { - if ($name == "admin") { - $name = self::$_params["admins"][0]; - } $result = ldap_search(self::$_connection, self::$_params["user_domain"], "uid=$name"); $entries = ldap_get_entries(self::$_connection, $result); if ($entries["count"] > 0) {