mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Fixes for bugs: 387, 519, 522, and 456

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2647 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
James Atkinson
2002-06-27 20:06:44 +00:00
parent 35e91d29d5
commit f37d9e964d
6 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/sessions.php
View File

@@ -117,8 +117,8 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
OR ban_userid = $user_id";
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']), "@")) . "'";
$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)) )
{

3
phpBB/includes/usercp_register.php
View File

@@ -605,7 +605,8 @@ if ( isset($HTTP_POST_VARS['submit']) )
if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN )
{
$emailer->use_template("admin_activate", stripslashes($user_lang));
//$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']
$emailer->extra_headers($email_headers);