diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-21 14:16:21 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-21 14:16:21 +0000 |
| commit | b776bf2cf3b32d59e031eab25665ea8e0fde25e4 (patch) | |
| tree | c1a2b8ca0cdc2362590a6d62e2054626ea437a00 | |
| parent | 786c8c2a06233e4b9c31678c44aa5bfec79cf8a2 (diff) | |
| download | forums-b776bf2cf3b32d59e031eab25665ea8e0fde25e4.tar forums-b776bf2cf3b32d59e031eab25665ea8e0fde25e4.tar.gz forums-b776bf2cf3b32d59e031eab25665ea8e0fde25e4.tar.bz2 forums-b776bf2cf3b32d59e031eab25665ea8e0fde25e4.tar.xz forums-b776bf2cf3b32d59e031eab25665ea8e0fde25e4.zip | |
Update email form inline with emailer changes
git-svn-id: file:///svn/phpbb/trunk@3903 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/memberlist.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 18764f81e6..a95fe37056 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -312,20 +312,20 @@ switch ($mode) include($phpbb_root_path . 'includes/emailer.'.$phpEx); $emailer = new emailer(); - $emailer->use_template('profile_send_email', $row['user_lang']); - $emailer->email_address($row['user_email']); - $emailer->set_subject($subject); + $emailer->template('profile_send_email', $row['user_lang']); + $emailer->subject($subject); - $email_headers = ''; + $emailer->replyto($user->data['user_email']); + $emailer->to($row['user_email'], $row['username']); 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"; - $email_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\n"; - $email_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\n"; - $emailer->extra_headers($email_headers); + + $emailer->headers('X-AntiAbuse: Board servername - ' . $server_name); + $emailer->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); + $emailer->headers('X-AntiAbuse: Username - ' . $user->data['username']); + $emailer->headers('X-AntiAbuse: User IP - ' . $user->ip); $emailer->assign_vars(array( 'SITENAME' => $config['sitename'], @@ -347,7 +347,7 @@ switch ($mode) } $template->assign_vars(array( - 'USERNAME' => $username, + 'USERNAME' => addslashes($row['username']), 'ERROR_MESSAGE' => (!empty($error_msg)) ? $error_msg : '', 'S_POST_ACTION' => "memberlist.$phpEx$SID&mode=email&u=$user_id") |