Changeset 69

Timestamp:

05/23/2003 10:21:37 PM (23 years ago)

Author:

mikelittle

Message:

Changed cookie name to avoid conflict with parallel b2 installations.

Location:

trunk

Files:

• b2-include/b2functions.php (modified) (1 diff)
• b2-include/b2verifauth.php (modified) (2 diffs)
• b2login.php (modified) (4 diffs)
• wp-admin/b2profile.php (modified) (2 diffs)

trunk/b2-include/b2functions.php

@@ -21 +21 @@
         global $HTTP_COOKIE_VARS,$user_login,$userdata,$user_level,$user_ID,$user_nickname,$user_email,$user_url,$user_pass_md5;
         // *** retrieving user's data from cookies and db - no spoofing
-        $user_login = $HTTP_COOKIE_VARS["cafeloguser"];
+        $user_login = $HTTP_COOKIE_VARS["wordpressuser"];
         $userdata = get_userdatabylogin($user_login);
         $user_level = $userdata["user_level"];

trunk/b2-include/b2verifauth.php

@@ -12 +12 @@
         global $tableusers,$tablesettings,$tablecategories,$tableposts,$tablecomments;
 
-        if (!empty($HTTP_COOKIE_VARS["cafeloguser"])) {
-                $user_login = $HTTP_COOKIE_VARS["cafeloguser"];
-                $user_pass_md5 = $HTTP_COOKIE_VARS["cafelogpass"];
+        if (!empty($HTTP_COOKIE_VARS["wordpressuser"])) {
+                $user_login = $HTTP_COOKIE_VARS["wordpressuser"];
+                $user_pass_md5 = $HTTP_COOKIE_VARS["wordpresspass"];
         } else {
                 return false;
@@ -46 +46 @@
                 header("Cache-Control: no-cache, must-revalidate");
                 header("Pragma: no-cache");
-                if (!empty($HTTP_COOKIE_VARS["cafeloguser"])) {
+                if (!empty($HTTP_COOKIE_VARS["wordpressuser"])) {
                         $error="<b>Error</b>: wrong login or password";
                 }

trunk/b2login.php

@@ -50 +50 @@
 case "logout":
 
-        setcookie("cafeloguser");
-        setcookie("cafelogpass");
+        setcookie("wordpressuser");
+        setcookie("wordpresspass");
         header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
         header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -131 +131 @@
                 $user_login=$log;
                 $user_pass=$pwd;
-                setcookie("cafeloguser",$user_login,time()+31536000);
+                setcookie("wordpressuser",$user_login,time()+31536000);
                 if ($pass_is_md5) {
-                        setcookie("cafelogpass",$user_pass,time()+31536000);
-                } else {
-                        setcookie("cafelogpass",md5($user_pass),time()+31536000);
-                }
-                if (empty($HTTP_COOKIE_VARS["cafelogblogid"])) {
-                        setcookie("cafelogblogid","1",time()+31536000);
+                        setcookie("wordpresspass",$user_pass,time()+31536000);
+                } else {
+                        setcookie("wordpresspass",md5($user_pass),time()+31536000);
+                }
+                if (empty($HTTP_COOKIE_VARS["wordpressblogid"])) {
+                        setcookie("wordpressblogid","1",time()+31536000);
                 }
                 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
@@ -255 +255 @@
 default:
 
-        if((!empty($HTTP_COOKIE_VARS["cafeloguser"])) && (!empty($HTTP_COOKIE_VARS["cafelogpass"]))) {
-                $user_login = $HTTP_COOKIE_VARS["cafeloguser"];
-                $user_pass_md5 = $HTTP_COOKIE_VARS["cafelogpass"];
+        if((!empty($HTTP_COOKIE_VARS["wordpressuser"])) && (!empty($HTTP_COOKIE_VARS["wordpresspass"]))) {
+                $user_login = $HTTP_COOKIE_VARS["wordpressuser"];
+                $user_pass_md5 = $HTTP_COOKIE_VARS["wordpresspass"];
         }
 
@@ -274 +274 @@
 
         if ( !(checklogin()) ) {
-                if (!empty($HTTP_COOKIE_VARS["cafeloguser"])) {
+                if (!empty($HTTP_COOKIE_VARS["wordpressuser"])) {
                         $error="Error: wrong login/password"; //, or your session has expired.";
                 }

trunk/wp-admin/b2profile.php

@@ -82 +82 @@
                 $newuser_pass = $HTTP_POST_VARS["pass1"];
                 $updatepassword = "user_pass='$newuser_pass', ";
-                setcookie("cafelogpass",md5($newuser_pass),time()+31536000);
+                setcookie("wordpresspass",md5($newuser_pass),time()+31536000);
         }
 
@@ -121 +121 @@
 
 */      $profiledata=get_userdata($user);
-        if ($HTTP_COOKIE_VARS["cafeloguser"] == $profiledata["user_login"])
+        if ($HTTP_COOKIE_VARS["wordpressuser"] == $profiledata["user_login"])
                 header ("Location: b2profile.php");