beenull/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Core\Mail

Browse source 
Fix hostname() method.
This commit is contained in:
Visman 2021-02-26 23:24:19 +07:00
parent d486d09091
commit fdc213aea4
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/Core/Mail.php
View file

@ -643,9 +643,22 @@ class Mail
*/ */
protected function hostname(): string protected function hostname(): string
{ {
return empty($_SERVER['SERVER_NAME']) $name = $_SERVER['SERVER_NAME'] ?? null;
? (isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]') $ip = $_SERVER['SERVER_ADDR'] ?? '';
: $_SERVER['SERVER_NAME'];
if ($name) {
$name = \preg_replace('%[\x00-\x1F]%', '', \trim($name)); // ????
} else {
$name = '[127.0.0.1]';
if (\filter_var($ip, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4)) {
$name = "[{$ip}]";
} elseif (\filter_var($ip, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
$name = "[IPv6:{$ip}]";
}
}
return $name;
} }
/** /**