[wp-cvs] wordpress wp-login.php,1.41,1.42

Mon Oct 11 07:00:24 UTC 2004

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

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

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** wp-login.php	10 Oct 2004 18:07:33 -0000	1.41
--- wp-login.php	11 Oct 2004 07:00:21 -0000	1.42
***************
*** 143,148 ****
  	if( !empty($_POST) ) {
  		$log = $_POST['log'];
! 		$pwd = md5($_POST['pwd']);
  		$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
  	}
  	
--- 143,152 ----
  	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 = '';
  	}
  	
***************
*** 153,180 ****
  	}
  
! 	if ( wp_login($log, $pwd) ) {
! 		$user_login = $log;
! 		$user_pass = $pwd;
! 		setcookie('wordpressuser_'. COOKIEHASH, $user_login, time() + 31536000, COOKIEPATH);
! 		setcookie('wordpresspass_'. COOKIEHASH, md5($user_pass), time() + 31536000, COOKIEPATH);
! 
! 		if ($is_IIS)
! 			header("Refresh: 0;url=$redirect_to");
! 		else
! 			header("Location: $redirect_to");
! 	}
! 
! 	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.';
  	}
  	?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--- 157,185 ----
  	}
  
! 	if ($log && $pwd) {
! 		if ( wp_login($log, $pwd) ) {
! 			$user_login = $log;
! 			$user_pass = md5($pwd);
! 			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.';
! 		}
  	}
+ 
  	?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">