diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-26 14:12:25 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-26 14:12:25 +0000 |
| commit | c7b63e7b6a087c2cc92230c456d2e2d54c346b7e (patch) | |
| tree | 93c4ff1b1f8fb1d2065d59a171c71dcf5559652a | |
| parent | 1d3f1cee552ed6986e6109ad1e5df432d4c944f4 (diff) | |
| download | forums-c7b63e7b6a087c2cc92230c456d2e2d54c346b7e.tar forums-c7b63e7b6a087c2cc92230c456d2e2d54c346b7e.tar.gz forums-c7b63e7b6a087c2cc92230c456d2e2d54c346b7e.tar.bz2 forums-c7b63e7b6a087c2cc92230c456d2e2d54c346b7e.tar.xz forums-c7b63e7b6a087c2cc92230c456d2e2d54c346b7e.zip | |
Fixed various issues, blank space usernames, incorrect email abuse headers, incorrect email language for bulk email, slashes in emails
git-svn-id: file:///svn/phpbb/trunk@1454 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/profile.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/phpBB/profile.php b/phpBB/profile.php index cfaabeb3c3..da95e749d7 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -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)); } - $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 . " WHERE user_id = $user_id"; if( $result = $db->sql_query($sql) ) @@ -1854,12 +1854,11 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) $username = $row['username']; $user_email = $row['user_email']; - $user_sig = $row['user_sig']; - $user_sig_bbcode_uid = $row['user_sig_bbcode_uid']; + $user_lang = $row['user_lang']; 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']); } @@ -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 .= "X-AntiAbuse: Board servername - " . $server_name . "\n"; - $email_headers .= "X-AntiAbuse: User_id - " . $user_id . "\n"; - $email_headers .= "X-AntiAbuse: Username - " . $username . "\n"; + $email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n"; + $email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\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->set_subject($subject); $emailer->extra_headers($email_headers); |