[wp-cvs] wordpress wp-login.php,1.30,1.31

[Matthew Mullenweg]

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

Modified Files:
	wp-login.php 
Log Message:
Move functions out of switch statement, PHP5 fix

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wp-login.php	9 Aug 2004 09:29:25 -0000	1.30
--- wp-login.php	4 Oct 2004 04:30:45 -0000	1.31
***************
*** 1,4 ****
  <?php
! require(dirname(__FILE__) . '/wp-config.php');
  
  if (!function_exists('add_magic_quotes')) {
--- 1,52 ----
  <?php
! require('./wp-config.php');
! 
! function login() {
! 	global $wpdb, $log, $pwd, $error, $user_ID;
! 	global $pass_is_md5;
! 	$user_login = &$log;
! 	$pwd = md5($pwd);
! 	$password = &$pwd;
! 	if (!$user_login) {
! 		$error = __('<strong>Error</strong>: the login field is empty.');
! 		return false;
! 	}
! 
! 	if (!$password) {
! 		$error = __('<strong>Error</strong>: the password field is empty.');
! 		return false;
! 	}
! 
! 	$query = "SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$user_login' AND user_pass = '$password'";
! 
! 	$login = $wpdb->get_row($query);
! 
! 	if (!$login) {
! 		$error = __('<strong>Error</strong>: wrong login or password.');
! 		$pwd = '';
! 		return false;
! 	} else {
! 	$user_ID = $login->ID;
! 		if (($pass_is_md5 == 0 && $login->user_login == $user_login && $login->user_pass == $password) || ($pass_is_md5 == 1 && $login->user_login == $user_login && $login->user_pass == md5($password))) {
! 			return true;
! 		} else {
! 			$error = __('<strong>Error</strong>: wrong login or password.');
! 			$pwd = '';
! 		return false;
! 		}
! 	}
! }
! 
! function checklogin() {
! 	global $user_login, $user_pass_md5, $user_ID;
! 
! 	$userdata = get_userdatabylogin($user_login);
! 
! 	if ($user_pass_md5 != md5($userdata->user_pass)) {
! 		return false;
! 	} else {
! 		return true;
! 	}
! }
  
  if (!function_exists('add_magic_quotes')) {
***************
*** 75,114 ****
  	}
  
- 	function login() {
- 		global $wpdb, $log, $pwd, $error, $user_ID;
- 		global $pass_is_md5;
- 		$user_login = &$log;
- 		$pwd = md5($pwd);
- 		$password = &$pwd;
- 		if (!$user_login) {
- 			$error = __('<strong>Error</strong>: the login field is empty.');
- 			return false;
- 		}
- 
- 		if (!$password) {
- 			$error = __('<strong>Error</strong>: the password field is empty.');
- 			return false;
- 		}
- 
- 		$query = "SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$user_login' AND user_pass = '$password'";
- 	
- 		$login = $wpdb->get_row($query);
- 
- 		if (!$login) {
- 			$error = __('<strong>Error</strong>: wrong login or password.');
- 			$pwd = '';
- 			return false;
- 		} else {
- 		$user_ID = $login->ID;
- 			if (($pass_is_md5 == 0 && $login->user_login == $user_login && $login->user_pass == $password) || ($pass_is_md5 == 1 && $login->user_login == $user_login && $login->user_pass == md5($password))) {
- 				return true;
- 			} else {
- 				$error = __('<strong>Error</strong>: wrong login or password.');
- 				$pwd = '';
- 			return false;
- 			}
- 		}
- 	}
- 
  	if (!login()) {
  		header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
--- 123,126 ----
***************
*** 241,256 ****
  	}
  
- 	function checklogin() {
- 		global $user_login, $user_pass_md5, $user_ID;
- 
- 		$userdata = get_userdatabylogin($user_login);
- 
- 		if ($user_pass_md5 != md5($userdata->user_pass)) {
- 			return false;
- 		} else {
- 			return true;
- 		}
- 	} 
- 
  	if ( !(checklogin()) ) {
  		if (!empty($_COOKIE['wordpressuser_'.$cookiehash])) {
--- 253,256 ----