[wp-cvs] wordpress wp-login.php,1.38,1.39

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20917

Modified Files:
	wp-login.php 
Log Message:
Automatic login fixes.

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** wp-login.php	5 Oct 2004 16:22:31 -0000	1.38
--- wp-login.php	6 Oct 2004 05:31:52 -0000	1.39
***************
*** 139,143 ****
  	if( !empty($_POST) ) {
  		$log = $_POST['log'];
! 		$pwd = $_POST['pwd'];
  		$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
  	}
--- 139,143 ----
  	if( !empty($_POST) ) {
  		$log = $_POST['log'];
! 		$pwd = md5($_POST['pwd']);
  		$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
  	}
***************
*** 156,162 ****
  	} else {
  		$user_login = $log;
! 		$user_pass = md5($pwd);
! 		setcookie('wordpressuser_'.$cookiehash, $user_login, time() + 31536000, COOKIEPATH);
! 		setcookie('wordpresspass_'.$cookiehash, md5($user_pass), time() + 31536000, COOKIEPATH);
  
  		header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
--- 156,162 ----
  	} else {
  		$user_login = $log;
! 		$user_pass = $pwd;
! 		setcookie('wordpressuser_'. COOKIEHASH, $user_login, time() + 31536000, COOKIEPATH);
! 		setcookie('wordpresspass_'. COOKIEHASH, md5($user_pass), time() + 31536000, COOKIEPATH);
  
  		header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
***************
*** 176,183 ****
  	}
  
! 	if ( !login($user_login, $user_pass_md5, true) ) {
! 		if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) )
! 			$error = 'Your session has expired.';
! 	} else {
  		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');
--- 176,180 ----
  	}
  
! 	if ( login($user_login, $user_pass_md5, true) ) {
  		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');
***************
*** 186,189 ****
--- 183,189 ----
  		header('Location: wp-admin/');
  		exit();
+ 	} else {
+ 		if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) )
+ 			$error = 'Your session has expired.';
  	}
  	?>
***************
*** 211,215 ****
  ?>
  
! <form name="loginform" id="loginform" action="wp-login.php?action=login" method="post">
  <p><label><?php _e('Login') ?>: <input type="text" name="log" id="log" value="" size="20" tabindex="1" /></label></p>
  <p><label><?php _e('Password') ?>: <input type="password" name="pwd" value="" size="20" tabindex="2" /></label></p>
--- 211,215 ----
  ?>
  
! <form name="loginform" id="loginform" action="wp-login.php" method="post">
  <p><label><?php _e('Login') ?>: <input type="text" name="log" id="log" value="" size="20" tabindex="1" /></label></p>
  <p><label><?php _e('Password') ?>: <input type="password" name="pwd" value="" size="20" tabindex="2" /></label></p>