diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-10 16:20:40 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-10 16:20:40 +0000 |
| commit | 08cb824e37a4ef523cce6d394868e87f80fefd38 (patch) | |
| tree | e9616edf99b6546f3907c8b3bfa14b2a95e6d3a4 /phpBB | |
| parent | 73f10b93b39b2424c1eca9b9b52ea9e28b04987b (diff) | |
| download | forums-08cb824e37a4ef523cce6d394868e87f80fefd38.tar forums-08cb824e37a4ef523cce6d394868e87f80fefd38.tar.gz forums-08cb824e37a4ef523cce6d394868e87f80fefd38.tar.bz2 forums-08cb824e37a4ef523cce6d394868e87f80fefd38.tar.xz forums-08cb824e37a4ef523cce6d394868e87f80fefd38.zip | |
Missed a couple of config name changes
git-svn-id: file:///svn/phpbb/trunk@1024 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/posting.php | 6 | ||||
| -rw-r--r-- | phpBB/profile.php | 36 |
2 files changed, 21 insertions, 21 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 6cd576fc36..459af3b3a3 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -751,10 +751,10 @@ if( ( $submit || $confirm ) && !$error ) { if( $email_set[$i]['user_email'] != "") { - $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; + $email_headers = "From: " . $board_config['email_from'] . "\nReturn-Path: " . $board_config['email_from'] . "\r\n"; $emailer->use_template("topic_notify"); - $emailer->email_address($email_set[$i]['user_email']); + $emailer->email_address($email_set[$i]['email_from']); $emailer->set_subject($lang['Topic_reply_notification']); $emailer->extra_headers($email_headers); @@ -766,7 +766,7 @@ if( ( $submit || $confirm ) && !$error ) "TOPIC_TITLE" => $email_set[$i]['topic_title'], "TOPIC_URL" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id", "UN_WATCH_URL" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/viewtopic.$phpEx?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic", - "EMAIL_SIG" => $board_config['email_sig']) + "EMAIL_SIG" => $board_config['board_email']) ); $emailer->send(); diff --git a/phpBB/profile.php b/phpBB/profile.php index a870fc76a5..c243627e56 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -757,7 +757,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) // // The users account has been deactivated, send them an email with a new activation key // - $email_headers = "From: " . $board_config['board_email'] . "\r\n"; + $email_headers = "From: " . $board_config['email_from'] . "\r\n"; $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); @@ -771,7 +771,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "USERNAME" => $username, "EMAIL_SIG" => $board_config['board_email'], - "U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey") + "U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$act_key") ); $emailer->send(); $emailer->reset(); @@ -800,8 +800,8 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) if($board_config['require_activation'] || $coppa == 1) { - $act_key = generate_activation_key(); - $sql .= "0, '$act_key')"; + $user_actkey = generate_activation_key(); + $sql .= "0, '$user_actkey')"; } else { @@ -836,7 +836,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) if(!$coppa) { - $email_headers = "From: " . $board_config['board_email'] . "\r\n"; + $email_headers = "From: " . $board_config['email_from'] . "\r\n"; $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); @@ -980,17 +980,17 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $template->assign_var_from_handle("JUMPBOX", "jumpbox"); $template->assign_vars(array( - "USERNAME" => stripslashes($username), - "EMAIL" => stripslashes($email), - "YIM" => stripslashes($yim), - "ICQ" => stripslashes($icq), - "MSN" => stripslashes($msn), - "AIM" => stripslashes($aim), - "OCCUPATION" => stripslashes($occupation), - "INTERESTS" => stripslashes($interests), - "LOCATION" => stripslashes($location), - "WEBSITE" => stripslashes($website), - "SIGNATURE" => stripslashes(str_replace("<br />", "\n", $signature)), + "USERNAME" => $username, + "EMAIL" => $email, + "YIM" => $yim, + "ICQ" => $icq, + "MSN" => $msn, + "AIM" => $aim, + "OCCUPATION" => $occupation, + "INTERESTS" => $interests, + "LOCATION" => $location, + "WEBSITE" => $website, + "SIGNATURE" => str_replace("<br />", "\n", $signature), "VIEW_EMAIL_YES" => ($viewemail) ? "checked=\"checked\"" : "", "VIEW_EMAIL_NO" => (!$viewemail) ? "checked=\"checked\"" : "", "HIDE_USER_YES" => (!$allowviewonline) ? "checked=\"checked\"" : "", @@ -1010,10 +1010,10 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "ALLOW_AVATAR" => $board_config['allow_avatar_upload'], "AVATAR" => $avatar_img, "AVATAR_SIZE" => $board_config['avatar_filesize'], - "LANGUAGE_SELECT" => language_select(stripslashes($user_lang), 'language'), + "LANGUAGE_SELECT" => language_select($user_lang, 'language'), "STYLE_SELECT" => style_select($user_template, $user_theme, 'style'), "TIMEZONE_SELECT" => tz_select($user_timezone, 'timezone'), - "DATE_FORMAT" => stripslashes($user_dateformat), + "DATE_FORMAT" => $user_dateformat, "HTML_STATUS" => $html_status, "BBCODE_STATUS" => $bbcode_status, "SMILIES_STATUS" => $smilies_status, |