Changeset 2107

Timestamp:

01/20/05 04:56:24 (4 years ago)

Author:

rboren

Message:

wp_setcookie() and wp_clearcookie(). Set cookies for both siteurl and home if they are not the same. Update cookies whenever home or siteurl change.

Files:

• trunk/wp-admin/options.php (modified) (4 diffs)
• trunk/wp-admin/profile.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/vars.php (modified) (1 diff)
• trunk/wp-login.php (modified) (2 diffs)

trunk/wp-admin/options.php

@@ -28 +28 @@
-
-case 'update':
-    
+   
-    
-    if (!$_POST['page_options']) {
@@ -40 +40 @@
-
-    $options = $wpdb->get_results("SELECT $wpdb->options.option_id, option_name, option_type, option_value, option_admin_level FROM $wpdb->options WHERE option_name IN ($option_names)");
+
+        // Save for later.
+        $old_siteurl = get_settings('siteurl');
+        $old_home = get_settings('home');
-
-// HACK
@@ -57 +61 @@
-                }
-                if( in_array($option->option_name, $nonbools) && $new_val == '0' ) $new_val = 'closed';
-
+ {
-                    $result = $wpdb->query("UPDATE $wpdb->options SET option_value = '$new_val' WHERE option_name = '$option->option_name'");
+                                        $any_changed++;
+                                }
-            }
-        }
@@ -66 +72 @@
-    
-    if ($any_changed) {
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
-        //$referred = str_replace('?updated=true' , '', $_SERVER['HTTP_REFERER']);
-        $referred = remove_query_arg('updated' , $_SERVER['HTTP_REFERER']);
-        //$goback = str_replace('?updated=true', '', $_SERVER['HTTP_REFERER']) . '?updated=true';
-        $goback = add_query_arg('updated', 'true', $_SERVER['HTTP_REFERER']);
-
+   
-    header('Location: ' . $goback);
-    break;

trunk/wp-admin/profile.php

@@ -63 +63 @@
-        $newuser_pass = $_POST["pass1"];
-        $updatepassword = "user_pass=MD5('$newuser_pass'), ";
-setcookie('wordpresspass_' . COOKIEHASH, " ", time() - 31536000, COOKIEPATH
-setcookie('wordpresspass_' . COOKIEHASH, md5(md5($newuser_pass)), time() + 31536000, COOKIEPATH
+wp_clearcookie(
+wp_setcookie($user_login, $newuser_pass
-    }
-

trunk/wp-includes/functions.php

@@ -1629 +1629 @@
-}
-
+function wp_setcookie($username, $password, $already_md5 = false, $home = '', $siteurl = '') {
+    if ( ! $already_md5)
+        $password = md5(md5($password)); // Double hash the password in the cookie.
+
+    if (empty($home))
+        $cookiepath = COOKIEPATH;
+    else
+        $cookiepath = preg_replace('|https?://[^/]+|i', '', $home . '/' );
+
+    if (empty($siteurl)) {
+        $sitecookiepath = SITECOOKIEPATH;
+        $cookiehash = COOKIEHASH;
+    } else {
+        $sitecookiepath = preg_replace('|https?://[^/]+|i', '', $siteurl . '/' );
+        $cookiehash = md5($siteurl);
+    }
+
+    setcookie('wordpressuser_'. $cookiehash, $username, time() + 31536000, $cookiepath);
+    setcookie('wordpresspass_'. $cookiehash, $password, time() + 31536000, $cookiepath);
+
+    if ( $cookiepath != $sitecookiepath ) {
+        setcookie('wordpressuser_'. $cookiehash, $username, time() + 31536000, $sitecookiepath);
+        setcookie('wordpresspass_'. $cookiehash, $password, time() + 31536000, $sitecookiepath);
+    }
+}
+
+function wp_clearcookie() {
+    setcookie('wordpressuser_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
+    setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
+    setcookie('wordpressuser_' . COOKIEHASH, ' ', time() - 31536000, SITECOOKIEPATH);
+    setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, SITECOOKIEPATH);
+}
+
-?>

trunk/wp-includes/vars.php

@@ -114 +114 @@
-// Path for cookies
-define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('home') . '/' ) );
+define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('siteurl') . '/' ) );
-
-// Some default filters

trunk/wp-login.php

@@ -21 +21 @@
-case 'logout':
-
-
-
+
-    header('Expires: Mon, 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, max-age=0');
-    header('Pragma: no-cache');
-
-    header('Location: wp-login.php');
-    exit();
@@ -135 +133 @@
-        if ( wp_login($user_login, $user_pass, $using_cookie) ) {
-            if (! $using_cookie) {
-
-
-
+
-            }
-