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

Fix our echomail sender is not the message originator

Browse Source
This commit is contained in:
Deon George 2023-07-29 17:48:09 +10:00
parent 944ae41fba
commit fb2471a05b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Jobs/MessageProcess.php
View File

@ -196,7 +196,7 @@ class MessageProcess implements ShouldQueue
if (! $ea) { if (! $ea) {
Log::alert(sprintf('%s:! Echoarea [%s] doesnt exist for zone [%d]',self::LOGKEY,$this->msg->echoarea,$this->msg->fboss_o->zone->zone_id)); Log::alert(sprintf('%s:! Echoarea [%s] doesnt exist for zone [%d]',self::LOGKEY,$this->msg->echoarea,$this->msg->fboss_o->zone->zone_id));
Notification::route('netmail',$this->msg->fftn_o)->notify(new EchoareaNotExist($this->msg)); Notification::route('netmail',$this->sender)->notify(new EchoareaNotExist($this->msg));
return; return;
} }
@ -255,15 +255,14 @@ class MessageProcess implements ShouldQueue
// @todo Can the sender create it if it doesnt exist? // @todo Can the sender create it if it doesnt exist?
// Can the system send messages to this area? // Can the system send messages to this area?
if (! $ea->sec_write || ($this->msg->fftn_o->security < $ea->sec_write)) { if (! $ea->sec_write || ($this->sender->security < $ea->sec_write)) {
Notification::route('netmail',$this->msg->fftn_o)->notify(new EchoareaNoWrite($this->msg)); Notification::route('netmail',$this->sender)->notify(new EchoareaNoWrite($this->msg));
return; return;
} }
// If the node is not subsccribed // If the node is not subsccribed
if ($this->msg->fftn_o->echoareas->search(function($item) use ($ea) { return $item->id === $ea->id; }) === FALSE) { if ($this->sender->echoareas->search(function($item) use ($ea) { return $item->id === $ea->id; }) === FALSE)
Notification::route('netmail',$this->msg->fftn_o)->notify(new EchoareaNotSubscribed($this->msg)); Notification::route('netmail',$this->sender)->notify(new EchoareaNotSubscribed($this->msg));
}
// We know about this area, store it // We know about this area, store it
$o = new Echomail; $o = new Echomail;