Changeset 1768

Timestamp:

10/10/04 18:02:30 (4 years ago)

Author:

saxmatt

Message:

Move to cookiehash define, use wp_login() function for auth.php.

Files:

• trunk/wp-admin/auth.php (modified) (1 diff)
• trunk/wp-admin/link-manager.php (modified) (4 diffs)
• trunk/wp-admin/profile.php (modified) (1 diff)
• trunk/wp-comments-popup.php (modified) (1 diff)
• trunk/wp-comments.php (modified) (1 diff)
• trunk/wp-includes/functions-user.php (deleted)
• trunk/wp-includes/functions.php (modified) (2 diffs)
• trunk/wp-includes/template-functions-comment.php (modified) (3 diffs)
• trunk/wp-includes/template-functions-post.php (modified) (2 diffs)
• trunk/wp-login.php (modified) (3 diffs)
• trunk/wp-settings.php (modified) (1 diff)

trunk/wp-admin/auth.php

@@ -1 +1 @@
-<?php
-
-require_once('../wp-config.php');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    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');
-
-
-
-
-
+
+
-    exit();
-}

trunk/wp-admin/link-manager.php

@@ -74 +74 @@
-}
-
-$cookiehash
-$cookiehash
+COOKIEHASH
+COOKIEHASH
-
-if ('' != $_POST['assign']) $action = 'assign';
@@ -270 +270 @@
-      WHERE link_id=$link_id");
-    } // end if save
-$cookiehash
+COOKIEHASH
-    header('Location: ' . $this_file);
-    break;
@@ -297 +297 @@
-    }
-    $links_show_cat_id = $cat_id;
-"links_show_cat_id_".$cookiehash
+'links_show_cat_id_' . COOKIEHASH
-    header('Location: '.$this_file);
-    break;
@@ -568 +568 @@
-    $links_show_order = $order_by;
-
-.$cookiehash
-.$cookiehash
+ . COOKIEHASH
+ . COOKIEHASH
-    $standalone=0;
-    include_once ("./admin-header.php");

trunk/wp-admin/profile.php

@@ -80 +80 @@
-        $newuser_pass = $_POST["pass1"];
-        $updatepassword = "user_pass=MD5('$newuser_pass'), ";
-.$cookiehash
-.$cookiehash
+ . COOKIEHASH
+ . COOKIEHASH
-    }
-

trunk/wp-comments-popup.php

@@ -32 +32 @@
-<?php
-// this line is WordPress' motor, do not delete it.
-.$cookiehash])) ? trim($_COOKIE['comment_author_'.$cookiehash
-$cookiehash])) ? trim($_COOKIE['comment_author_email_'.$cookiehash
-$cookiehash])) ? trim($_COOKIE['comment_author_url_'.$cookiehash
+ . COOKIEHASH])) ? trim($_COOKIE['comment_author_'. COOKIEHASH
+ COOKIEHASH])) ? trim($_COOKIE['comment_author_email_'. COOKIEHASH
+ COOKIEHASH])) ? trim($_COOKIE['comment_author_url_'. COOKIEHASH
-$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved = '1' ORDER BY comment_date");
-$commentstatus = $wpdb->get_row("SELECT comment_status, post_password FROM $wpdb->posts WHERE ID = $id");
-$cookiehash
+ COOKIEHASH
-    echo(get_the_password_form());
-} else { ?>

trunk/wp-comments.php

@@ -1 @@
-.$cookiehash
+ . COOKIEHASH
-<p><?php _e('Enter your password to view comments.'); ?></p>
-<?php return; endif; ?>

trunk/wp-includes/functions.php

@@ -157 +157 @@
-
-function get_currentuserinfo() { // a bit like get_userdata(), on steroids
-, $cookiehash
+
-    // *** retrieving user's data from cookies and db - no spoofing
-
-$cookiehash
-$cookiehash
+COOKIEHASH
+COOKIEHASH
-    $userdata = get_userdatabylogin($user_login);
-    $user_level = $userdata->user_level;
@@ -1891 +1891 @@
-}
-
+function wp_login($username, $password, $already_md5 = false) {
+    global $wpdb, $error;
+
+    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.');
+        return false;
+    } else {
+
+        if ( ($login->user_login == $username && $login->user_pass == $password) || ($already_md5 && $login->user_login == $username && md5($login->user_pass) == $password) ) {
+            return true;
+        } else {
+            $error = __('<strong>Error</strong>: Incorrect password.');
+            $pwd = '';
+            return false;
+        }
+    }
+}
+
-?>

trunk/wp-includes/template-functions-comment.php

@@ -18 +18 @@
-
-function comments_template() {
-, $cookiehash
+
-
-    if ( is_single() || $withcomments ) :
-        $req = get_settings('require_name_email');
-$cookiehash]) ? trim(stripslashes($_COOKIE['comment_author_'.$cookiehash
-$cookiehash]) ? trim(stripslashes($_COOKIE['comment_author_email_'.$cookiehash
-$cookiehash]) ? trim(stripslashes($_COOKIE['comment_author_url_'.$cookiehash
+COOKIEHASH]) ? trim(stripslashes($_COOKIE['comment_author_'.COOKIEHASH
+COOKIEHASH]) ? trim(stripslashes($_COOKIE['comment_author_email_'.COOKIEHASH
+COOKIEHASH]) ? trim(stripslashes($_COOKIE['comment_author_url_'.COOKIEHASH
-        $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
-
@@ -91 +91 @@
-
-function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
-, $cookiehash
+
-    global $querystring_start, $querystring_equal, $querystring_separator;
-    global $comment_count_cache;
@@ -106 +106 @@
-    } else {
-        if (!empty($post->post_password)) { // if there's a password
-$cookiehash
+COOKIEHASH
-                echo('Enter your password to view comments');
-                return;

trunk/wp-includes/template-functions-post.php

@@ -98 +98 @@
-function get_the_content($more_link_text = '(more...)', $stripteaser = 0, $more_file = '') {
-    global $id, $post, $more, $single, $withcomments, $page, $pages, $multipage, $numpages;
-, $cookiehash
+
-    global $pagenow;
-    $output = '';
-
-    if (!empty($post->post_password)) { // if there's a password
-$cookiehash
+COOKIEHASH
-            $output = get_the_password_form();
-            return $output;
@@ -177 +177 @@
-function get_the_excerpt($fakeit = true) {
-    global $id, $post;
-    global $cookiehash;
-    $output = '';
-    $output = $post->post_excerpt;
-    if (!empty($post->post_password)) { // if there's a password
-$cookiehash
+COOKIEHASH
-            $output = __('There is no excerpt because this is a protected post.');
-            return $output;

trunk/wp-login.php

@@ -149 +149 @@
-    }
-
-if ( !login($log, $pwd) ) {
-   header('Expires: Wed, 11 Jan 1984 05:00:00
-   header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT
-   header('Cache-Control: no-cache, must-revalidat
-
-} else
+header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . '
+header('Cache-Control: no-cache, must-revalidate
+header('Pragma: no-cach
+
+if ( wp_login($log, $pwd) )
-        $user_login = $log;
-        $user_pass = $pwd;
@@ -160 +160 @@
-        setcookie('wordpresspass_'. COOKIEHASH, md5($user_pass), time() + 31536000, COOKIEPATH);
-
-        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');
-
-        if ($is_IIS)
-            header("Refresh: 0;url=$redirect_to");
@@ -176 +171 @@
-    }
-
-
+wp_
-        header('Expires: Wed, 5 Jun 1979 23:41:00 GMT'); // Michel's birthday
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');

trunk/wp-settings.php

@@ -69 +69 @@
-
-    // Used to guarantee unique hash cookies
-
+ // Remove in 1.4
-    define('COOKIEHASH', $cookiehash); 
-endif;