Changeset 1734 for trunk/wp-includes/functions-user.php

Timestamp:

10/04/2004 08:03:52 AM (20 years ago)

Author:

saxmatt

Message:

Code cleanup and some fixes from the WP Japan folks.

File:

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

trunk/wp-includes/functions-user.php

@@ -1 +1 @@
 <?php
 
-function verify_login($user, $password) {
-    global $wpdb;
-    $user = $wpdb->escape($user);
-    $password = $password;
+function login($username, $password, $already_md5 = false) {
+    global $wpdb, $error;
+    if ( !$already_md5 )
+        $pwd = md5($password);
 
-    if ( $user = $wpdb->get_row("SELECT user_login, user_pass FROM $wpdb->users WHERE user_login = '$user'") ) {
-        if ( $user->user_pass = md5($password) )
-            return true;
-        else
-            return false;
-    } else {
+    if ( !$username )
         return false;
-    }
-}
 
-function verify_current() {
-    if (!empty($_COOKIE['wordpressuser_' . COOKIEHASH])) {
-        $user_login = $_COOKIE['wordpressuser_' . COOKIEHASH];
-        $user_pass = $_COOKIE['wordpresspass_' . COOKIEHASH];
-    } else {
+    if ( !$password ) {
+        $error = __('<strong>Error</strong>: The password field is empty.');
         return false;
     }
 
-    if ('' == $user_login)
+    $login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'");
+
+    if (!$login) {
+        $error = __('<strong>Error</strong>: Wrong login.');
+        $pwd = '';
         return false;
-    if ('' == $user_pass)
-        return false;
+    } else {
 
-    if ( verify_login($user_login, $user_pass) ) {
-        return true;
-    } else {
-        header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-        header('Cache-Control: no-cache, must-revalidate');
-        header('Pragma: no-cache');
-        header('Location: ' . get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']) );
-        exit();
+        if ( $login->user_login == $username && $login->user_pass == $pwd ) {
+            return true;
+        } else {
+            $error = __('<strong>Error</strong>: Incorrect password.');
+            $pwd = '';
+            return false;
+        }
     }
 }