Changeset 1574

Timestamp:

03/26/08 20:19:52 (7 months ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Applied attachment:ticket:332:ldapauth-messages.diff and attachment:ticket:333:ldapauth-userexists.diff, closes #332 and #333

Files:

• devel/auth/ldap/lib.php (modified) (3 diffs)

devel/auth/ldap/lib.php

@@ -91 +91 @@
-        function ldap_do_auth($ds, $basedn, $username, $password, $filter_attr, $search_attr) {
-
+        global $messages;
+
-        $sr = @ldap_search($ds, $basedn, $filter_attr ."=". $username, array_values($search_attr));
-
@@ -132 +134 @@
-
-        function ldap_create_elgg_user($username, $password, $user_info) {
+
+                global $messages;
+
-                if(!validate_username($username)) {
-            $messages[] = __gettext("Error! LDAP Username does not meet Elgg requirements");
@@ -243 +248 @@
-                // If we need to create the user
-
-
+username_is_available($username) && 
-                        ldap_create_elgg_user($username, $password,$ldap_user_info);
-                                }