diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-31 00:06:34 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-31 00:06:34 +0000 |
| commit | e1f7400b8da1088ebabd351fe9b6e1f246c34531 (patch) | |
| tree | f5271ef99c1d83076002f1cb9d43e8728e40398e /phpBB/includes/usercp_email.php | |
| parent | f74fa81851cb9b03cd84400e9a4817f216b09a5b (diff) | |
| download | forums-e1f7400b8da1088ebabd351fe9b6e1f246c34531.tar forums-e1f7400b8da1088ebabd351fe9b6e1f246c34531.tar.gz forums-e1f7400b8da1088ebabd351fe9b6e1f246c34531.tar.bz2 forums-e1f7400b8da1088ebabd351fe9b6e1f246c34531.tar.xz forums-e1f7400b8da1088ebabd351fe9b6e1f246c34531.zip | |
pre-freeze on main templates, various bug fixes (highlighting search results, various search related issues, blah blah). These updates need _thorough_ checking, quickly
git-svn-id: file:///svn/phpbb/trunk@2448 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/usercp_email.php')
| -rw-r--r-- | phpBB/includes/usercp_email.php | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/phpBB/includes/usercp_email.php b/phpBB/includes/usercp_email.php index 1ffcf6be71..7970c4f1c8 100644 --- a/phpBB/includes/usercp_email.php +++ b/phpBB/includes/usercp_email.php @@ -94,16 +94,16 @@ if ( $result = $db->sql_query($sql) ) include($phpbb_root_path . 'includes/emailer.'.$phpEx); $emailer = new emailer($board_config['smtp_delivery']); - $email_headers = "From: " . $userdata['user_email'] . "\n"; + $email_headers = 'From: ' . $userdata['user_email'] . "\n"; if ( !empty($HTTP_POST_VARS['cc_email']) ) { $email_headers .= "Cc: " . $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: 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"; + $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); @@ -138,20 +138,9 @@ if ( $result = $db->sql_query($sql) ) include($phpbb_root_path . 'includes/page_header.'.$phpEx); $template->set_filenames(array( - 'body' => 'profile_send_email.tpl', - 'jumpbox' => 'jumpbox.tpl') + 'body' => 'profile_send_email.tpl') ); - - $jumpbox = make_jumpbox(); - $template->assign_vars(array( - 'L_GO' => $lang['Go'], - 'L_JUMP_TO' => $lang['Jump_to'], - 'L_SELECT_FORUM' => $lang['Select_forum'], - - 'S_JUMPBOX_LIST' => $jumpbox, - 'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx")) - ); - $template->assign_var_from_handle('JUMPBOX', 'jumpbox'); + make_jumpbox('viewforum.'.$phpEx); if ( $error ) { @@ -164,15 +153,9 @@ if ( $result = $db->sql_query($sql) ) $template->assign_var_from_handle('ERROR_BOX', 'reg_header'); } - if ( $userdata['user_sig'] != '' ) - { - $template->assign_block_vars('signature_checkbox', array()); - } - $template->assign_vars(array( 'USERNAME' => $username, - 'S_SIGNATURE_CHECKED' => ( $attach_sig ) ? 'checked="checked"' : '', 'S_POST_ACTION' => append_sid("profile.$phpEx?&mode=email&" . POST_USERS_URL . "=$user_id"), 'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'], @@ -184,7 +167,6 @@ if ( $result = $db->sql_query($sql) ) 'L_EMPTY_MESSAGE_EMAIL' => $lang['Empty_message_email'], 'L_OPTIONS' => $lang['Options'], 'L_CC_EMAIL' => $lang['CC_email'], - 'L_NOTIFY_ON_REPLY' => $lang['Notify'], 'L_SPELLCHECK' => $lang['Spellcheck'], 'L_SEND_EMAIL' => $lang['Send_email']) ); @@ -203,4 +185,4 @@ else message_die(GENERAL_MESSAGE, $lang['User_not_exist']); } -?> +?>
\ No newline at end of file |