[Wpmu-ldap-commits] SF.net SVN: wpmu-ldap:[104] trunk/ldap/lib

[<axe...@us...>]

Revision: 104
          http://wpmu-ldap.svn.sourceforge.net/wpmu-ldap/?rev=104&view=rev
Author:   axelseaa
Date:     2010-01-31 18:35:00 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
missed a few attribute calls when setting up the globals

Modified Paths:
--------------
    trunk/ldap/lib/ldap_ro.php
    trunk/ldap/lib/wpmu_ldap.functions.php

Modified: trunk/ldap/lib/ldap_ro.php
===================================================================
--- trunk/ldap/lib/ldap_ro.php	2010-01-31 04:05:08 UTC (rev 103)
+++ trunk/ldap/lib/ldap_ro.php	2010-01-31 18:35:00 UTC (rev 104)
@@ -29,7 +29,10 @@
 		}
 		
 		// Set up the search stuff
-		$attributes_to_get = array ("fullName", "mail", "givenName", "sn", "phone");
+		$attributes_to_get = array (get_site_option('ldapAttributeMail',LDAP_DEFAULT_ATTRIBUTE_MAIL),
+					    get_site_option('ldapAttributeGivenname',LDAP_DEFAULT_ATTRIBUTE_GIVENNAME),
+					    get_site_option('ldapAttributeSn',LDAP_DEFAULT_ATTRIBUTE_SN),
+					    get_site_option('ldapAttributePhone',LDAP_DEFAULT_ATTRIBUTE_PHONE));
 		if (get_site_option('ldapLinuxWindows'))
 			$uid = get_site_option('ldapAttributeNixSearch',LDAP_DEFAULT_ATTRIBUTE_NIXSEARCH); //Linux
 		else
@@ -83,7 +86,15 @@
 		// First, connect to the LDAP server
 		$this->Dock();
 		
-		$attributes_to_get = array ("fullName", "mail", "givenName", "sn", "phone", "homeDirectory", "member", "zenwmMACAddress", "uniquemember", "dn");
+		$attributes_to_get = array (get_site_option('ldapAttributeMail',LDAP_DEFAULT_ATTRIBUTE_MAIL),
+					    get_site_option('ldapAttributeGivenname',LDAP_DEFAULT_ATTRIBUTE_GIVENNAME),
+					    get_site_option('ldapAttributeSn',LDAP_DEFAULT_ATTRIBUTE_SN),
+					    get_site_option('ldapAttributePhone',LDAP_DEFAULT_ATTRIBUTE_PHONE),
+					    get_site_option('ldapAttributeHomedir',LDAP_DEFAULT_ATTRIBUTE_HOMEDIR),
+					    get_site_option('ldapAttributeMember',LDAP_DEFAULT_ATTRIBUTE_MEMBER),
+					    get_site_option('ldapAttributeMacaddress',LDAP_DEFAULT_ATTRIBUTE_MACADDRESS),
+					    "dn");
+
 		$this->SetSearchCriteria ("(cn=$in_username)", $attributes_to_get);
 		$this->Search();
 		

Modified: trunk/ldap/lib/wpmu_ldap.functions.php
===================================================================
--- trunk/ldap/lib/wpmu_ldap.functions.php	2010-01-31 04:05:08 UTC (rev 103)
+++ trunk/ldap/lib/wpmu_ldap.functions.php	2010-01-31 18:35:00 UTC (rev 104)
@@ -178,7 +178,10 @@
         $server = new LDAP_ro($ldapString);
         $server->DebugOff();
 
-	$attributes_to_get = array ("fullName", "mail", "givenName", "sn", "phone");
+        $attributes_to_get = array (get_site_option('ldapAttributeMail',LDAP_DEFAULT_ATTRIBUTE_MAIL),
+                                    get_site_option('ldapAttributeGivenname',LDAP_DEFAULT_ATTRIBUTE_GIVENNAME),
+                                    get_site_option('ldapAttributeSn',LDAP_DEFAULT_ATTRIBUTE_SN),
+                                    get_site_option('ldapAttributePhone',LDAP_DEFAULT_ATTRIBUTE_PHONE));
 
 	$userDataArray = null;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.