[wp-cvs] wordpress wp-login.php,1.43,1.44

[Ryan Boren]

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

Modified Files:
	wp-login.php 
Log Message:
Login cleanup.

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** wp-login.php	13 Oct 2004 02:21:36 -0000	1.43
--- wp-login.php	27 Nov 2004 22:54:23 -0000	1.44
***************
*** 87,91 ****
  <?php
  if ($error)
! 	echo "<div id='loginerror'>$error</div>";
  ?>
  
--- 87,91 ----
  <?php
  if ($error)
! 	echo "<div id='login_error'>$error</div>";
  ?>
  
***************
*** 141,182 ****
  default:
  
  	if( !empty($_POST) ) {
! 		$log = $_POST['log'];
! 		$pwd = $_POST['pwd'];
  		$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
! 	} else {
! 		$log = '';
! 		$pwd = '';
! 		$redirect_to = '';
  	}
  	
! 	$user = get_userdatabylogin($log);
! 	
  	if (0 == $user->user_level) {
  		$redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
  	}
  
! 	if ($log && $pwd) {
! 		if ( wp_login($log, $pwd) ) {
! 			$user_login = $log;
! 			$user_pass = md5(md5($pwd)); // Double hash the password in the cookie.
! 			setcookie('wordpressuser_'. COOKIEHASH, $user_login, time() + 31536000, COOKIEPATH);
! 			setcookie('wordpresspass_'. COOKIEHASH, $user_pass, time() + 31536000, COOKIEPATH);
! 			
  			if ($is_IIS)
  				header("Refresh: 0;url=$redirect_to");
  			else
  				header("Location: $redirect_to");
- 		}
- 	} else if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) && !empty($_COOKIE['wordpresspass_' . COOKIEHASH]) ) {
- 		$user_login = $_COOKIE['wordpressuser_' . COOKIEHASH];
- 		$user_pass_md5 = $_COOKIE['wordpresspass_' . COOKIEHASH];
- 
- 		if ( wp_login($user_login, $user_pass_md5, true) ) {
- 			header('Location: wp-admin/');
  			exit();
  		} else {
! 			if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) )
! 				$error = 'Your session has expired.';
  		}
  	}
--- 141,184 ----
  default:
  
+ 	$user_login = '';
+ 	$user_pass = '';
+ 	$redirect_to = '';
+ 	$using_cookie = false;
+ 
  	if( !empty($_POST) ) {
! 		$user_login = $_POST['log'];
! 		$user_pass = $_POST['pwd'];
  		$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
! 	} elseif ( !empty($_COOKIE) ) {
! 		if (! empty($_COOKIE['wordpressuser_' . COOKIEHASH]))
! 			$user_login = $_COOKIE['wordpressuser_' . COOKIEHASH];
! 		if (! empty($_COOKIE['wordpresspass_' . COOKIEHASH])) {
! 			$user_pass = $_COOKIE['wordpresspass_' . COOKIEHASH];
! 			$using_cookie = true;
! 		}
! 		$redirect_to = 'wp-admin/';
  	}
  	
! 	$user = get_userdatabylogin($user_login);
  	if (0 == $user->user_level) {
  		$redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
  	}
  
! 	if ($user_login && $user_pass) {
! 		if ( wp_login($user_login, $user_pass, $using_cookie) ) {
! 			if (! $using_cookie) {
! 				$user_pass = md5(md5($user_pass)); // Double hash the password in the cookie.
! 				setcookie('wordpressuser_'. COOKIEHASH, $user_login, time() + 31536000, COOKIEPATH);
! 				setcookie('wordpresspass_'. COOKIEHASH, $user_pass, time() + 31536000, COOKIEPATH);
! 			}
! 
  			if ($is_IIS)
  				header("Refresh: 0;url=$redirect_to");
  			else
  				header("Location: $redirect_to");
  			exit();
  		} else {
! 			if ($using_cookie)			
! 				$error = __('Your session has expired.');
  		}
  	}