Changeset 1734

Timestamp:

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

Author:

saxmatt

Message:

Code cleanup and some fixes from the WP Japan folks.

Location:

trunk

Files:

• wp-includes/functions-user.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)
• wp-settings.php (modified) (2 diffs)
• wp-trackback.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;
+        }
     }
 }

trunk/wp-includes/functions.php

@@ -560 +560 @@
 // ( or just any time between timer_start() and timer_stop() )
 
-function timer_start() {
-    global $timestart;
-    $mtime = microtime();
-    $mtime = explode(' ',$mtime);
-    $mtime = $mtime[1] + $mtime[0];
-    $timestart = $mtime;
-    return true;
-}
-
 function timer_stop($display = 0, $precision = 3) { //if called like timer_stop(1), will echo $timetotal
     global $timestart, $timeend;

trunk/wp-login.php

@@ -1 +1 @@
 <?php
 require('./wp-config.php');
-
-function login($username, $password, $already_md5 = false) {
-    global $wpdb, $error;
-    if ( !$already_md5 )
-        $pwd = md5($password);
-
-    if ( !$username )
-        return false;
-
-    if ( !$password ) {
-        $error = __('<strong>Error</strong>: The password field is empty.');
-        return false;
-    }
-
-    $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;
-    } else {
-
-        if ( $login->user_login == $username && $login->user_pass == $pwd ) {
-            return true;
-        } else {
-            $error = __('<strong>Error</strong>: Incorrect password.');
-            $pwd = '';
-            return false;
-        }
-    }
-}
 
 if (!function_exists('add_magic_quotes')) {

trunk/wp-settings.php

@@ -10 +10 @@
     die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.1' );
 
+function timer_start() {
+    global $timestart;
+    $mtime = explode(' ', microtime() );
+    $mtime = $mtime[1] + $mtime[0];
+    $timestart = $mtime;
+    return true;
+}
+timer_start();
 
 // Change to E_ALL for development/debugging
@@ -41 +49 @@
 
 require (ABSPATH . WPINC . '/functions.php');
-timer_start();
 require (ABSPATH . WPINC . '/functions-formatting.php');
 require (ABSPATH . WPINC . '/functions-user.php');

trunk/wp-trackback.php

@@ -35 +35 @@
 $excerpt = $_POST['excerpt'];
 $blog_name = $_POST['blog_name'];
+$charset = $_POST['charset'];
+
+if ($charset)
+    $charset = strtoupper( trim($charset) );
+else
+    $charset = 'auto';
+
+if ( function_exists('mb_convert_encoding') ) {
+    $title = mb_convert_encoding($title, get_settings('blog_charset'), $charset);
+    $excerpt = mb_convert_encoding($excerpt, get_settings('blog_charset'), $charset);
+    $blog_name = mb_convert_encoding($blog_name, get_settings('blog_charset'), $charset);
+}
 
 if ( is_single() )