|
From: Paul S. O. <ps...@us...> - 2001-11-26 14:12:28
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv23628
Modified Files:
profile.php
Log Message:
Fixed various issues, blank space usernames, incorrect email abuse headers, incorrect email language for bulk email, slashes in emails
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -r1.144 -r1.145
*** profile.php 2001/11/26 09:50:30 1.144
--- profile.php 2001/11/26 14:12:25 1.145
***************
*** 1846,1850 ****
}
! $sql = "SELECT username, user_email, user_viewemail, user_emailtime, user_sig, user_sig_bbcode_uid
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";
--- 1846,1850 ----
}
! $sql = "SELECT username, user_email, user_viewemail, user_lang
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";
***************
*** 1855,1864 ****
$username = $row['username'];
$user_email = $row['user_email'];
! $user_sig = $row['user_sig'];
! $user_sig_bbcode_uid = $row['user_sig_bbcode_uid'];
if( $row['user_viewemail'] )
{
! if( time() - $row['user_emailtime'] < $board_config['flood_interval'] )
{
message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']);
--- 1855,1863 ----
$username = $row['username'];
$user_email = $row['user_email'];
! $user_lang = $row['user_lang'];
if( $row['user_viewemail'] )
{
! if( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] )
{
message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']);
***************
*** 1908,1916 ****
$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 IP - " . decode_ip($user_ip) . "\r\n";
! $emailer->use_template("profile_send_email");
$emailer->email_address($user_email);
$emailer->set_subject($subject);
--- 1907,1915 ----
$email_headers .= "Return-Path: " . $userdata['user_email'] . "\n";
$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\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", $user_lang);
$emailer->email_address($user_email);
$emailer->set_subject($subject);
|