mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
fixed more bugs, obviously.
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3678 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -27,6 +27,9 @@ if ( !defined('IN_PHPBB') )
|
||||
exit;
|
||||
}
|
||||
|
||||
$unhtml_specialchars_match = array('#>#', '#<#', '#"#', '#&#');
|
||||
$unhtml_specialchars_replace = array('>', '<', '"', '&');
|
||||
|
||||
// ---------------------------------------
|
||||
// Load agreement template since user has not yet
|
||||
// agreed to registration conditions/coppa
|
||||
@@ -463,7 +466,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
|
||||
|
||||
$emailer->assign_vars(array(
|
||||
'SITENAME' => $board_config['sitename'],
|
||||
'USERNAME' => $username,
|
||||
'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, $username),
|
||||
'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '',
|
||||
|
||||
'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
|
||||
@@ -574,7 +577,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
|
||||
$emailer->assign_vars(array(
|
||||
'SITENAME' => $board_config['sitename'],
|
||||
'WELCOME_MSG' => sprintf($lang['Welcome_subject'], $board_config['sitename']),
|
||||
'USERNAME' => $username,
|
||||
'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, $username),
|
||||
'PASSWORD' => $password_confirm,
|
||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
|
||||
|
||||
@@ -596,7 +599,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
|
||||
$emailer->assign_vars(array(
|
||||
'SITENAME' => $board_config['sitename'],
|
||||
'WELCOME_MSG' => sprintf($lang['Welcome_subject'], $board_config['sitename']),
|
||||
'USERNAME' => $username,
|
||||
'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, $username),
|
||||
'PASSWORD' => $password_confirm,
|
||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
|
||||
|
||||
@@ -632,7 +635,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
|
||||
$emailer->extra_headers($email_headers . "Bcc: $bcc_list\n");
|
||||
|
||||
$emailer->assign_vars(array(
|
||||
'USERNAME' => $username,
|
||||
'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, $username),
|
||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
|
||||
|
||||
'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
|
||||
|
Reference in New Issue
Block a user