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

Fix echoarea name is converted to UC, add netmail VIA lines for outgoing netmail

Browse Source
This commit is contained in:
Deon George
2022-02-16 23:01:55 +11:00
parent 12a40a79fb
commit daba4a78d3
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Jobs/MessageProcess.php
View File

@@ -94,9 +94,9 @@ class MessageProcess implements ShouldQueue
$reply .= sprintf("MSGID: %s\r",$this->msg->msgid);
foreach ($this->msg->kludge as $k=>$v)
$reply .= sprintf("@%s: %s\n",strtoupper($k),$v);
$reply .= sprintf("@%s: %s\r",strtoupper($k),$v);
foreach ($this->msg->via as $via)
$reply .= sprintf("VIA: %s\n",$via);
$reply .= sprintf("VIA: %s\r",$via);
$reply .= "------------------------------ END MESSAGE ------------------------------\r";
@@ -138,12 +138,12 @@ class MessageProcess implements ShouldQueue
// Else we are echomail
} else {
$ea = Echoarea::where('name',$this->msg->echoarea)
$ea = Echoarea::where('name',strtoupper($this->msg->echoarea))
->where('domain_id',$this->msg->fboss_o->zone->domain_id)
->single();
if (! $ea) {
Log::alert(sprintf('%s:! Echo area [%s] doesnt exist for zone [%s]',self::LOGKEY,$this->msg->echoarea,$this->msg->fboss_o->zone->domain_id));
Log::alert(sprintf('%s:! Echo area [%s] doesnt exist for zone [%d]',self::LOGKEY,$this->msg->echoarea,$this->msg->fboss_o->zone->zone_id));
return;
}
@@ -215,7 +215,7 @@ class MessageProcess implements ShouldQueue
$o->echoarea_id = $ea->id;
$o->msgid = $this->msg->msgid;
$o->msg = $this->msg->message_src;
$o->msg = $this->msg->message_src."\r";
$o->msg_crc = md5($this->msg->message);
$o->rogue_seenby = $this->msg->rogue_seenby;
$o->rogue_path = $this->msg->rogue_path;
@@ -260,7 +260,13 @@ class MessageProcess implements ShouldQueue
$o->msgid = $msg->msgid;
$o->subject = $msg->subject;
$o->msg = $msg->message_src;
$o->msg = $msg->message;
foreach ($msg->via as $v)
$o->msg .= sprintf("\01Via %s\r",$v);
$o->msg_src = $msg->message_src;
$o->msg_crc = md5($msg->message); // @todo DB schema needs to handle this
return $o;
}