Fix processing msgid with @domain

This commit is contained in:
Deon George 2021-08-22 16:44:41 +10:00
parent e0269c9718
commit 071b817194
1 changed files with 2 additions and 2 deletions

View File

@ -741,8 +741,8 @@ class Message extends FTNBase
// http://ftsc.org/docs/fsc-0068.001
// MSGID should be the basis of the source, we'll overrite our src from origin if we have it
$m = [];
if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?(@%s)?\ +#',$this->msgid,$m)) {
$this->src = Address::parseFTN($m[1].(isset($m[2]) ? '.'.$m[2] : ''));
if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?@?([A-Za-z-_~]+)?\ +#',$this->msgid,$m)) {
$this->src = Address::parseFTN($m[1].(isset($m[2]) ? '.'.$m[2] : '').(isset($m[3]) ? '@'.$m[3] : ''));
}
// Parse SEEN-BY