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

some small bugs fixed...

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@4092 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2003-06-06 18:02:15 +00:00
parent 9b1f0ed388
commit 722529044d
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/emailer.php
View file

@ -207,7 +207,7 @@ class emailer
// Build header // Build header
$this->extra_headers = (($this->replyto != '') ? "Reply-to: <$this->replyto>\n" : '') . (($this->from != '') ? "From: <$this->from>\n" : "From: <" . $board_config['board_email'] . ">\n") . "Return-Path: <" . $board_config['board_email'] . ">\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . gmdate('D, d M Y H:i:s Z', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By phpBB2\n" . (($cc != '') ? "Cc:$cc\n" : '') . (($bcc != '') ? "Bcc:$bcc\n" : '') . trim($this->extra_headers); $this->extra_headers = (($this->replyto != '') ? "Reply-to: <$this->replyto>\n" : '') . (($this->from != '') ? "From: <$this->from>\n" : "From: <" . $board_config['board_email'] . ">\n") . "Return-Path: <" . $board_config['board_email'] . ">\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . gmdate('D, d M Y H:i:s Z', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By phpBB2\n" . (($cc != '') ? "Cc:$cc\n" : '') . (($bcc != '') ? "Bcc:$bcc\n" : '') . trim($this->extra_headers);
$to = ($to == '') ? "<Undisclosed-recipients:;>" : $to; $to = ($to == '') ? "undisclosed-recipients:;" : $to;
// Send message ... removed $this->encode() from subject for time being // Send message ... removed $this->encode() from subject for time being
if ( $this->use_smtp ) if ( $this->use_smtp )

4
phpBB/includes/functions_post.php
View file

@ -601,9 +601,9 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
$user_id_sql = ''; $user_id_sql = '';
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
if (isset($row['ban_userid'])) if (isset($row['ban_userid']) && !empty($row['ban_userid']))
{ {
$user_id_sql = ', ' . $row['ban_userid']; $user_id_sql .= ', ' . $row['ban_userid'];
} }
} }

2
phpBB/includes/usercp_email.php
View file

@ -178,7 +178,7 @@ if ( $result = $db->sql_query($sql) )
'USERNAME' => $username, 'USERNAME' => $username,
'S_HIDDEN_FIELDS' => '', 'S_HIDDEN_FIELDS' => '',
'S_POST_ACTION' => append_sid("profile.$phpEx?&amp;mode=email&amp;" . POST_USERS_URL . "=$user_id"), 'S_POST_ACTION' => append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL . "=$user_id"),
'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'], 'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'],
'L_RECIPIENT' => $lang['Recipient'], 'L_RECIPIENT' => $lang['Recipient'],

4
phpBB/includes/usercp_register.php
View file

@ -49,8 +49,8 @@ function show_coppa()
"AGREE_UNDER_13" => $lang['Agree_under_13'], "AGREE_UNDER_13" => $lang['Agree_under_13'],
'DO_NOT_AGREE' => $lang['Agree_not'], 'DO_NOT_AGREE' => $lang['Agree_not'],
"U_AGREE_OVER13" => "profile.$phpEx?mode=register&amp;agreed=true", "U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&amp;agreed=true"),
"U_AGREE_UNDER13" => "profile.$phpEx?mode=register&amp;agreed=true&amp;coppa=true") "U_AGREE_UNDER13" => append_sid("profile.$phpEx?mode=register&amp;agreed=true&amp;coppa=true"))
); );
$template->pparse('body'); $template->pparse('body');