Changeset 10437 for trunk/wp-includes/pluggable.php

Timestamp:

01/24/2009 10:38:19 PM (18 years ago)

Author:

westi

Message:

Make authentication more pluggable than ever before. See #8938 props wnorris.

File:

• trunk/wp-includes/pluggable.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -423 +423 @@
 function wp_authenticate($username, $password) {
         $username = sanitize_user($username);
-
-        if ( '' == $username )
-                return new WP_Error('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
-
-        if ( '' == $password )
-                return new WP_Error('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
-
-        $user = get_userdatabylogin($username);
-
-        if ( !$user || ($user->user_login != $username) ) {
-                do_action( 'wp_login_failed', $username );
-                return new WP_Error('invalid_username', __('<strong>ERROR</strong>: Invalid username.'));
-        }
-
-        $user = apply_filters('wp_authenticate_user', $user, $password);
-        if ( is_wp_error($user) ) {
-                do_action( 'wp_login_failed', $username );
-                return $user;
-        }
-
-        if ( !wp_check_password($password, $user->user_pass, $user->ID) ) {
-                do_action( 'wp_login_failed', $username );
-                return new WP_Error('incorrect_password', __('<strong>ERROR</strong>: Incorrect password.'));
-        }
-
-        return new WP_User($user->ID);
+        $password = trim($password);
+
+        $user = apply_filters('authenticate', null, $username, $password);
+
+        if ($user == null) {
+                // TODO what should the error message be? (Or would these even happen?)
+                // Only needed if all authentication handlers fail to return anything.
+                $user = new WP_Error('authentication_failed', __('<strong>ERROR</strong>: Invalid username or incorrect password.'));
+        }
+
+        if (is_wp_error($user)) {
+                do_action('wp_login_failed', $username);
+        }
+
+        return $user;
 }
 endif;