makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed various issues, blank space usernames, incorrect email abuse headers, incorrect email language for bulk email, slashes in emails

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1454 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-26 14:12:25 +00:00
parent 1d3f1cee55
commit c7b63e7b6a
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/profile.php
View file

@ -1845,7 +1845,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
header("Location: " . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true)); header("Location: " . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
} }
$sql = "SELECT username, user_email, user_viewemail, user_emailtime, user_sig, user_sig_bbcode_uid $sql = "SELECT username, user_email, user_viewemail, user_lang
FROM " . USERS_TABLE . " FROM " . USERS_TABLE . "
WHERE user_id = $user_id"; WHERE user_id = $user_id";
if( $result = $db->sql_query($sql) ) if( $result = $db->sql_query($sql) )
@ -1854,12 +1854,11 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
$username = $row['username']; $username = $row['username'];
$user_email = $row['user_email']; $user_email = $row['user_email'];
$user_sig = $row['user_sig']; $user_lang = $row['user_lang'];
$user_sig_bbcode_uid = $row['user_sig_bbcode_uid'];
if( $row['user_viewemail'] ) if( $row['user_viewemail'] )
{ {
if( time() - $row['user_emailtime'] < $board_config['flood_interval'] ) if( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] )
{ {
message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']); message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']);
} }
@ -1907,11 +1906,11 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
} }
$email_headers .= "Return-Path: " . $userdata['user_email'] . "\n"; $email_headers .= "Return-Path: " . $userdata['user_email'] . "\n";
$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n"; $email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
$email_headers .= "X-AntiAbuse: User_id - " . $user_id . "\n"; $email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
$email_headers .= "X-AntiAbuse: Username - " . $username . "\n"; $email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n"; $email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
$emailer->use_template("profile_send_email"); $emailer->use_template("profile_send_email", $user_lang);
$emailer->email_address($user_email); $emailer->email_address($user_email);
$emailer->set_subject($subject); $emailer->set_subject($subject);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);