Fix addressing when forwarding netmail, as well as fix content being prefixed with forward notice.
This commit is contained in:
@@ -137,12 +137,19 @@ class MessageProcess implements ShouldQueue
|
||||
->single();
|
||||
|
||||
if ($uo && ($ao=$uo->system->match($this->mo->tftn->zone)?->pop())) {
|
||||
Log::info(sprintf('%s:- Forwarding Netmail [%s] to (%s) [%s] from (%s) [%s].',
|
||||
self::LOGKEY,
|
||||
$this->mo->msgid ?: '*NO MSGID*',
|
||||
$this->mo->to,$ao->ftn,
|
||||
$this->mo->from,$this->mo->fftn->ftn,
|
||||
));
|
||||
|
||||
$note = "+--[ FORWARDED MESSAGE ]----------------------------------+\r";
|
||||
$note .= "+ This message has been forwarded to you, it was originally sent to you\r";
|
||||
$note .= sprintf("+ at [%s]\r",$this->mo->tftn->ftn);
|
||||
$note .= "+---------------------------------------------------------+\r\r";
|
||||
|
||||
$this->mo->msg = $note.$this->mo->content;
|
||||
$this->mo->msg_src = $note.$this->mo->content;
|
||||
$this->mo->tftn_id = $ao->id;
|
||||
$this->mo->flags |= Message::FLAG_INTRANSIT;
|
||||
$this->mo->save();
|
||||
|
Reference in New Issue
Block a user