diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index d5732ce58e..2182ea6a8c 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -207,7 +207,7 @@ class emailer // 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); - $to = ($to == '') ? "" : $to; + $to = ($to == '') ? "undisclosed-recipients:;" : $to; // Send message ... removed $this->encode() from subject for time being if ( $this->use_smtp ) diff --git a/phpBB/includes/functions_post.php b/phpBB/includes/functions_post.php index d1427c012d..3be9937015 100644 --- a/phpBB/includes/functions_post.php +++ b/phpBB/includes/functions_post.php @@ -601,9 +601,9 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi $user_id_sql = ''; 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']; } } diff --git a/phpBB/includes/usercp_email.php b/phpBB/includes/usercp_email.php index 6117e9ef06..afe21ef59d 100644 --- a/phpBB/includes/usercp_email.php +++ b/phpBB/includes/usercp_email.php @@ -178,7 +178,7 @@ if ( $result = $db->sql_query($sql) ) 'USERNAME' => $username, 'S_HIDDEN_FIELDS' => '', - 'S_POST_ACTION' => append_sid("profile.$phpEx?&mode=email&" . POST_USERS_URL . "=$user_id"), + 'S_POST_ACTION' => append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL . "=$user_id"), 'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'], 'L_RECIPIENT' => $lang['Recipient'], diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php index 9ad3df588b..31c303ed40 100644 --- a/phpBB/includes/usercp_register.php +++ b/phpBB/includes/usercp_register.php @@ -49,8 +49,8 @@ function show_coppa() "AGREE_UNDER_13" => $lang['Agree_under_13'], 'DO_NOT_AGREE' => $lang['Agree_not'], - "U_AGREE_OVER13" => "profile.$phpEx?mode=register&agreed=true", - "U_AGREE_UNDER13" => "profile.$phpEx?mode=register&agreed=true&coppa=true") + "U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&agreed=true"), + "U_AGREE_UNDER13" => append_sid("profile.$phpEx?mode=register&agreed=true&coppa=true")) ); $template->pparse('body');