[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.58.2.4,1.58.2.5 usercp_register.php,1.20.2.13,1.20.2.14

[James A. <th...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv28883/includes

Modified Files:
      Tag: phpBB-2_0_0
	sessions.php usercp_register.php 
Log Message:
Fixes for bugs: 387, 519, 522, and 456


Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.58.2.4
retrieving revision 1.58.2.5
diff -C2 -r1.58.2.4 -r1.58.2.5
*** sessions.php	20 Jun 2002 17:01:23 -0000	1.58.2.4
--- sessions.php	27 Jun 2002 20:06:44 -0000	1.58.2.5
***************
*** 118,123 ****
  	if ( $user_id != ANONYMOUS )
  	{
! 		$sql .= " OR ban_email LIKE '" . str_replace("\'", "''", $row['user_email']) . "' 
! 			OR ban_email LIKE '" . substr(str_replace("\'", "''", $row['user_email']), strpos(str_replace("\'", "''", $row['user_email']), "@")) . "'";
  	}
  	if ( !($result = $db->sql_query($sql)) )
--- 118,123 ----
  	if ( $user_id != ANONYMOUS )
  	{
! 		$sql .= " OR ban_email LIKE '" . str_replace("\'", "''", $userdata['user_email']) . "' 
! 			OR ban_email LIKE '" . substr(str_replace("\'", "''", $userdata['user_email']), strpos(str_replace("\'", "''", $userdata['user_email']), "@")) . "'";
  	}
  	if ( !($result = $db->sql_query($sql)) )

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.20.2.13
retrieving revision 1.20.2.14
diff -C2 -r1.20.2.13 -r1.20.2.14
*** usercp_register.php	23 Jun 2002 02:47:56 -0000	1.20.2.13
--- usercp_register.php	27 Jun 2002 20:06:44 -0000	1.20.2.14
***************
*** 606,610 ****
  			if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN )
  			{
! 				$emailer->use_template("admin_activate", stripslashes($user_lang));
  				$emailer->email_address($board_config['board_email']);
  				$emailer->set_subject(); //$lang['New_account_subject']
--- 606,611 ----
  			if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN )
  			{
! 				//$emailer->use_template("admin_activate", stripslashes($user_lang));
! 				$emailer->use_template("admin_activate", $board_config['default_lang']);
  				$emailer->email_address($board_config['board_email']);
  				$emailer->set_subject(); //$lang['New_account_subject']