bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fix messages to points, and fix netmail coming from systems which dont include an Origin line

Browse Source
This commit is contained in:
Deon George
2023-07-20 20:04:41 +10:00
parent db37cc7aa4
commit 8d9bde9692
7 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Jobs/MessageProcess.php
View File

@@ -33,7 +33,8 @@ class MessageProcess implements ShouldQueue
}
/**
* When calling MessageProcess - we assume that the packet is from a valid source
* When calling MessageProcess - we assume that the packet is from a valid source, and
* the destination (netmail/echomail) is also valid
*/
public function handle()
{
@@ -86,8 +87,8 @@ class MessageProcess implements ShouldQueue
$o->set_pkt = $this->packet;
$o->set_sender = $this->sender;
$o->set_path = $this->msg->pathaddress;
// Strip any local flag
$o->flags &= ~Message::FLAG_LOCAL;
// Strip any local/transit flags
$o->flags &= ~(Message::FLAG_LOCAL|Message::FLAG_INTRANSIT);
// Determine if the message is to this system, or in transit
if ($ftns->search(function($item) { return $this->msg->tftn === $item->ftn; }) !== FALSE) {
@@ -145,10 +146,10 @@ class MessageProcess implements ShouldQueue
$reply .= "\r";
$reply .= "\r";
$reply .= "This is your original message:\r";
$reply .= "------------------------------ BEING MESSAGE ------------------------------\r";
$reply .= "------------------------------ BEGIN MESSAGE ------------------------------\r";
$reply .= sprintf("TO: %s\r",$this->msg->user_to);
$reply .= sprintf("SUBJECT: %s\r",$this->msg->subject);
$reply .= $this->msg->message;
$reply .= str_replace("\r---","\r#--",$this->msg->message)."\r";
$reply .= "------------------------------ CONTROL LINES ------------------------------\r";
$reply .= sprintf("DATE: %s\r",$this->msg->date->format('Y-m-d H:i:s'));
$reply .= sprintf("MSGID: %s\r",$this->msg->msgid);