| Line 427 | Line 427 |
|---|
$user->session_begin();
}
|
$user->session_begin();
}
|
$calling_page = html_entity_decode($request->server('PHP_SELF'), ENT_COMPAT);
| $calling_page = html_entity_decode($request->server('REQUEST_URI'), ENT_COMPAT);
|
switch ($type)
{
|
switch ($type)
{
|
| Line 581 | Line 581 |
|---|
'msg',
);
extract($phpbb_dispatcher->trigger_event('core.notification_message_email', compact($vars)));
|
'msg',
);
extract($phpbb_dispatcher->trigger_event('core.notification_message_email', compact($vars)));
|
| |
$this->addresses = $addresses;
$this->subject = $subject;
$this->msg = $msg;
unset($addresses, $subject, $msg);
|
if ($break)
{
|
if ($break)
{
|
| Line 597 | Line 602 |
|---|
$this->from = $board_contact;
}
|
$this->from = $board_contact;
}
|
$encode_eol = ($config['smtp_delivery']) ? "\r\n" : PHP_EOL;
| $encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL;
|
// Build to, cc and bcc strings
$to = $cc = $bcc = '';
|
// Build to, cc and bcc strings
$to = $cc = $bcc = '';
|
| Line 629 | Line 634 |
|---|
}
else
{
|
}
else
{
|
$result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, PHP_EOL, $err_msg);
| $result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, $encode_eol, $err_msg);
|
}
if (!$result)
| }
if (!$result)
|
| Line 952 | Line 957 |
|---|
}
else
{
|
}
else
{
|
$result = phpbb_mail($to, $subject, $msg, $headers, PHP_EOL, $err_msg);
| $encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL;
$result = phpbb_mail($to, $subject, $msg, $headers, $encode_eol, $err_msg);
|
}
if (!$result)
| }
if (!$result)
|
| Line 1882 | Line 1888 |
|---|
{
$encoded_char = $is_quoted_printable
? $char = preg_replace_callback(
|
{
$encoded_char = $is_quoted_printable
? $char = preg_replace_callback(
|
'/[=_\?\x20\x00-\x1F\x80-\xFF]/',
| '/[()<>@,;:\\\\".\[\]=_?\x20\x00-\x1F\x80-\xFF]/',
|
function ($matches)
{
$hex = dechex(ord($matches[0]));
| function ($matches)
{
$hex = dechex(ord($matches[0]));
|
