diff --git a/app/Jobs/MessageProcess.php b/app/Jobs/MessageProcess.php index 077b20c..14c071f 100644 --- a/app/Jobs/MessageProcess.php +++ b/app/Jobs/MessageProcess.php @@ -287,11 +287,13 @@ class MessageProcess implements ShouldQueue $dummy = collect(); $path = $this->parseAddresses('path',$this->msg->path,$this->pktsrc->zone,$dummy); + /* // If our sender is not in the path, add it if (! $path->contains($this->sender->id)) { Log::alert(sprintf('%s:? Echomail adding sender to PATH [%s] for [%d].',self::LOGKEY,$x->ftn,$o->id)); $path->push($this->sender->id); } + */ $ppoid = NULL; foreach ($path as $aoid) { @@ -362,21 +364,25 @@ class MessageProcess implements ShouldQueue if ($x=$this->msg->fboss_o) { $o->fftn_id = $x->id; + /* // Make sure our sender and packet source are in the path if (! $this->msg->path->contains($x->ftn)) { Log::alert(sprintf('%s:? Echomail adding sender to PATH [%s].',self::LOGKEY,$x->ftn)); $this->msg->path->push($x->ftn); } + */ } else { $o->fftn_id = NULL; // @todo This should be the node that originated the message - but since that node is not in the DB it would be null } + /* if (! $this->msg->path->contains($this->pktsrc->id)) { Log::alert(sprintf('%s:? Echomail adding pktsrc to PATH [%s].',self::LOGKEY,$x->ftn)); $this->msg->path->push($this->pktsrc->id); } + */ $o->echoarea_id = $ea->id; $o->msgid = $this->msg->msgid;