Changeset 2733
- Timestamp:
- 07/23/05 06:56:59 (3 years ago)
- Files:
-
- trunk/wp-includes/pluggable-functions.php (modified) (2 diffs)
- trunk/wp-login.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wp-includes/pluggable-functions.php
r2726 r2733 175 175 176 176 if ( !function_exists('wp_setcookie') ) : 177 function wp_setcookie($username, $password, $already_md5 = false, $home = '', $siteurl = '' ) {177 function wp_setcookie($username, $password, $already_md5 = false, $home = '', $siteurl = '', $remember = false) { 178 178 if ( !$already_md5 ) 179 179 $password = md5( md5($password) ); // Double hash the password in the cookie. … … 192 192 } 193 193 194 setcookie(USER_COOKIE, $username, time() + 31536000, $cookiepath, COOKIE_DOMAIN); 195 setcookie(PASS_COOKIE, $password, time() + 31536000, $cookiepath, COOKIE_DOMAIN); 194 if ( $remember ) 195 $expire = time() + 31536000; 196 else 197 $expire = 0; 198 199 setcookie(USER_COOKIE, $username, $expire, $cookiepath, COOKIE_DOMAIN); 200 setcookie(PASS_COOKIE, $password, $expire, $cookiepath, COOKIE_DOMAIN); 196 201 197 202 if ( $cookiepath != $sitecookiepath ) { 198 setcookie(USER_COOKIE, $username, time() + 31536000, $sitecookiepath, COOKIE_DOMAIN);199 setcookie(PASS_COOKIE, $password, time() + 31536000, $sitecookiepath, COOKIE_DOMAIN);203 setcookie(USER_COOKIE, $username, $expire, $sitecookiepath, COOKIE_DOMAIN); 204 setcookie(PASS_COOKIE, $password, $expire, $sitecookiepath, COOKIE_DOMAIN); 200 205 } 201 206 } trunk/wp-login.php
r2726 r2733 164 164 $user_login = $_POST['log']; 165 165 $user_pass = $_POST['pwd']; 166 $rememberme = $_POST['rememberme']; 166 167 $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']); 167 168 } elseif ( !empty($_COOKIE) ) { … … 183 184 184 185 if ( wp_login($user_login, $user_pass, $using_cookie) ) { 185 if ( !$using_cookie) {186 wp_setcookie($user_login, $user_pass );186 if ( !$using_cookie) { 187 wp_setcookie($user_login, $user_pass, false, '', '', $rememberme); 187 188 } 188 189 do_action('wp_login', $user_login); … … 227 228 <p><label><?php _e('Username:') ?><br /><input type="text" name="log" id="log" value="" size="20" tabindex="1" /></label></p> 228 229 <p><label><?php _e('Password:') ?><br /> <input type="password" name="pwd" id="pwd" value="" size="20" tabindex="2" /></label></p> 230 <p> 231 <label><input name="rememberme" type="checkbox" id="rememberme" value="forever" checked="checked" /> 232 <?php _e('Remember me'); ?></label></p> 229 233 <p class="submit"> 230 234 <input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> »" tabindex="3" />
