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

Update email form inline with emailer changes

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3903 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-04-21 14:16:21 +00:00
parent 786c8c2a06
commit b776bf2cf3
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/memberlist.php
View file

@ -312,20 +312,20 @@ switch ($mode)
include($phpbb_root_path . 'includes/emailer.'.$phpEx); include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$emailer = new emailer(); $emailer = new emailer();
$emailer->use_template('profile_send_email', $row['user_lang']); $emailer->template('profile_send_email', $row['user_lang']);
$emailer->email_address($row['user_email']); $emailer->subject($subject);
$emailer->set_subject($subject);
$email_headers = ''; $emailer->replyto($user->data['user_email']);
$emailer->to($row['user_email'], $row['username']);
if (!empty($_POST['cc_email'])) if (!empty($_POST['cc_email']))
{ {
$email_headers = "Cc: " . $user->data['user_email'] . "\n"; $emailer->cc($user->data['user_email'], $user->data['username']);
} }
$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
$email_headers .= 'X-AntiAbuse: User_id - ' . $user->data['user_id'] . "\n"; $emailer->headers('X-AntiAbuse: Board servername - ' . $server_name);
$email_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\n"; $emailer->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$email_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\n"; $emailer->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$emailer->extra_headers($email_headers); $emailer->headers('X-AntiAbuse: User IP - ' . $user->ip);
$emailer->assign_vars(array( $emailer->assign_vars(array(
'SITENAME' => $config['sitename'], 'SITENAME' => $config['sitename'],
@ -347,7 +347,7 @@ switch ($mode)
} }
$template->assign_vars(array( $template->assign_vars(array(
'USERNAME' => $username, 'USERNAME' => addslashes($row['username']),
'ERROR_MESSAGE' => (!empty($error_msg)) ? $error_msg : '', 'ERROR_MESSAGE' => (!empty($error_msg)) ? $error_msg : '',
'S_POST_ACTION' => "memberlist.$phpEx$SID&mode=email&u=$user_id") 'S_POST_ACTION' => "memberlist.$phpEx$SID&mode=email&u=$user_id")