1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00

Altered layout of phpbb_config table

git-svn-id: file:///svn/phpbb/trunk@1010 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Bart van Bragt
2001-09-08 18:24:34 +00:00
parent 19ae53a5b1
commit 9b64a5d50c
29 changed files with 426 additions and 378 deletions

View File

@@ -751,7 +751,7 @@ if( ( $submit || $confirm ) && !$error )
{
if( $email_set[$i]['user_email'] != "")
{
$email_headers = "From: " . $board_config['board_email_from'] . "\nReturn-Path: " . $board_config['board_email_from'] . "\r\n";
$email_headers = "From: " . $board_config['email_sig'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template("topic_notify");
$emailer->email_address($email_set[$i]['user_email']);
@@ -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['board_email'])
"EMAIL_SIG" => $board_config['email_sig'])
);
$emailer->send();
@@ -1676,7 +1676,7 @@ else
{
$page_title = $lang['Post_a_reply'];
$msg_date = create_date($board_config['default_dateformat'], $postrow['post_time'], $board_config['default_timezone']);
$msg_date = create_date($board_config['default_dateformat'], $postrow['post_time'], $board_config['board_timezone']);
$post_message = $poster . " " . $lang['wrote'] . ":\n\n[quote]\n" . $post_message . "\n[/quote]";
@@ -1847,7 +1847,7 @@ if( $preview && !$error )
"TOPIC_TITLE" => $preview_subject,
"POST_SUBJECT" => $preview_subject,
"POSTER_NAME" => $username,
"POST_DATE" => create_date($board_config['default_dateformat'], time(), $board_config['default_timezone']),
"POST_DATE" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']),
"MESSAGE" => $preview_message,
"L_PREVIEW" => $lang['Preview'],
@@ -2099,4 +2099,4 @@ $template->pparse("body");
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
?>
?>