Changeset 1108 for trunk/wp-login.php

Timestamp:

04/20/2004 10:56:47 PM (21 years ago)

Author:

saxmatt

Message:

Changed to superglobals, and eliminated $use_cache (since we always do).

File:

• trunk/wp-login.php (modified) (8 diffs)

trunk/wp-login.php

@@ -16 +16 @@
 
 if (!get_magic_quotes_gpc()) {
-    $HTTP_GET_VARS    = add_magic_quotes($HTTP_GET_VARS);
-    $HTTP_POST_VARS   = add_magic_quotes($HTTP_POST_VARS);
-    $HTTP_COOKIE_VARS = add_magic_quotes($HTTP_COOKIE_VARS);
+    $_GET    = add_magic_quotes($_GET);
+    $_POST   = add_magic_quotes($_POST);
+    $_COOKIE = add_magic_quotes($_COOKIE);
 }
 
@@ -26 +26 @@
     $wpvar = $wpvarstoreset[$i];
     if (!isset($$wpvar)) {
-        if (empty($HTTP_POST_VARS["$wpvar"])) {
-            if (empty($HTTP_GET_VARS["$wpvar"])) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
                 $$wpvar = '';
             } else {
-                $$wpvar = $HTTP_GET_VARS["$wpvar"];
+                $$wpvar = $_GET["$wpvar"];
             }
         } else {
-            $$wpvar = $HTTP_POST_VARS["$wpvar"];
+            $$wpvar = $_POST["$wpvar"];
         }
     }
@@ -59 +59 @@
 case 'login':
 
-    if(!empty($HTTP_POST_VARS)) {
-        $log = $HTTP_POST_VARS['log'];
-        $pwd = $HTTP_POST_VARS['pwd'];
-        $redirect_to = $HTTP_POST_VARS['redirect_to'];
+    if(!empty($_POST)) {
+        $log = $_POST['log'];
+        $pwd = $_POST['pwd'];
+        $redirect_to = $_POST['redirect_to'];
     }
     
@@ -123 +123 @@
         setcookie('wordpressuser_'.$cookiehash, $user_login, time()+31536000);
         setcookie('wordpresspass_'.$cookiehash, md5($user_pass), time()+31536000);
-        if (empty($HTTP_COOKIE_VARS['wordpressblogid_'.$cookiehash])) {
+        if (empty($_COOKIE['wordpressblogid_'.$cookiehash])) {
             setcookie('wordpressblogid_'.$cookiehash, 1,time()+31536000);
         }
@@ -201 +201 @@
 case 'retrievepassword':
 
-    $user_login = $HTTP_POST_VARS["user_login"];
+    $user_login = $_POST["user_login"];
     $user_data = get_userdatabylogin($user_login);
     $user_email = $user_data->user_email;
@@ -233 +233 @@
 default:
 
-    if((!empty($HTTP_COOKIE_VARS['wordpressuser_'.$cookiehash])) && (!empty($HTTP_COOKIE_VARS['wordpresspass_'.$cookiehash]))) {
-        $user_login = $HTTP_COOKIE_VARS['wordpressuser_'.$cookiehash];
-        $user_pass_md5 = $HTTP_COOKIE_VARS['wordpresspass_'.$cookiehash];
+    if((!empty($_COOKIE['wordpressuser_'.$cookiehash])) && (!empty($_COOKIE['wordpresspass_'.$cookiehash]))) {
+        $user_login = $_COOKIE['wordpressuser_'.$cookiehash];
+        $user_pass_md5 = $_COOKIE['wordpresspass_'.$cookiehash];
     }
 
@@ -251 +251 @@
 
     if ( !(checklogin()) ) {
-        if (!empty($HTTP_COOKIE_VARS['wordpressuser_'.$cookiehash])) {
+        if (!empty($_COOKIE['wordpressuser_'.$cookiehash])) {
             $error="Error: wrong login/password"; //, or your session has expired.";
         }
@@ -299 +299 @@
     <input type="hidden" name="popuptitle" value="<?php echo $popuptitle ?>" />
 <?php } ?>
-<?php if (isset($HTTP_GET_VARS["redirect_to"])) { ?>
-    <input type="hidden" name="redirect_to" value="<?php echo $HTTP_GET_VARS["redirect_to"] ?>" />
+<?php if (isset($_GET["redirect_to"])) { ?>
+    <input type="hidden" name="redirect_to" value="<?php echo $_GET["redirect_to"] ?>" />
 <?php } else { ?>
     <input type="hidden" name="redirect_to" value="wp-admin/" />