Fix for invalid-zone validation comparing a string with an int

app/Classes/FTN/Message.php

@@ -307,10 +307,10 @@ class Message extends FTNBase
 
 		switch ($key) {
 			// From Addresses
-			case 'fz': return Arr::get($this->src,'z');
+			case 'fz': return (int)Arr::get($this->src,'z');
-			case 'fn': return ($x=$this->src) ? Arr::get($x,'n') : Arr::get($this->header,'onet');
+			case 'fn': return (int)($x=$this->src) ? Arr::get($x,'n') : Arr::get($this->header,'onet');
-			case 'ff': return ($x=$this->src) ? Arr::get($x,'f') : Arr::get($this->header,'onode');
+			case 'ff': return (int)($x=$this->src) ? Arr::get($x,'f') : Arr::get($this->header,'onode');
-			case 'fp': return $this->mo->kludges->get('FMPT:') ?: Arr::get($this->src,'p',Arr::get($this->header,'opoint',0));
+			case 'fp': return (int)$this->mo->kludges->get('FMPT:') ?: Arr::get($this->src,'p',Arr::get($this->header,'opoint',0));
 			case 'fd': return Arr::get($this->src,'d');
 
 			case 'fzone':
@@ -341,10 +341,10 @@ class Message extends FTNBase
 
 			// To Addresses
 			// Echomail doesnt have a zone, so we'll use the source zone
-			case 'tz': return Arr::get($this->isEchomail() ? $this->src : $this->dst,'z');
+			case 'tz': return (int)Arr::get($this->isEchomail() ? $this->src : $this->dst,'z');
-			case 'tn': return Arr::get($this->header,'dnet');
+			case 'tn': return (int)Arr::get($this->header,'dnet');
-			case 'tf': return Arr::get($this->header,'dnode');
+			case 'tf': return (int)Arr::get($this->header,'dnode');
-			case 'tp': return $this->mo->kludges->get('TOPT:') ?: Arr::get($this->header,'dpoint',0);
+			case 'tp': return (int)$this->mo->kludges->get('TOPT:') ?: Arr::get($this->header,'dpoint',0);
 
 			case 'tzone':
 				// Use the zone if this class was called with it.
@@ -360,6 +360,7 @@ class Message extends FTNBase
 				return Zone::where('zone_id',$this->tz)
 					->where('default',TRUE)
 					->single();
+
 			case 'tdomain':
 				// We'll use the zone's domain if this method class was called with a zone
 				if ($this->zone && (($this->zone->domain->name === Arr::get($this->dst,'d')) || ! Arr::get($this->dst,'d')))

app/Console/Commands/PacketProcess.php

@@ -3,9 +3,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Storage;
 
-use App\Classes\File;
 use App\Classes\FTN\Packet;
 use App\Jobs\PacketProcess as Job;
 use App\Models\Address;
@@ -60,16 +58,13 @@ class PacketProcess extends Command
 	/**
 	 * Execute the console command.
 	 *
-	 * @return void
+	 * @return int|void
-	 * @throws \App\Exceptions\InvalidPacketException
+	 * @throws \Exception
 	 */
 	public function handle()
 	{
-		//$fs = Storage::disk(config('fido.local_disk'));
 		$rel_name = sprintf('%s/%s',config('fido.dir'),$this->argument('file'));
 
-		//$f = new File($fs->path($rel_name));
-
 		$m = [];
 		if ($this->argument('ftn')) {
 			$ao = Address::findFTN($this->argument('ftn'));
@@ -84,6 +79,6 @@ class PacketProcess extends Command
 
 		Job::dispatchSync($rel_name,$ao->zone->domain,$this->option('dontqueue'));
 
-		return Command::SUCCESS;
+		return self::SUCCESS;
 	}
 }

app/Notifications/Netmails/EchomailBadAddress.php

@@ -5,9 +5,8 @@ namespace App\Notifications\Netmails;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
 
-use App\Classes\FTN\Message;
 use App\Notifications\Netmails;
-use App\Models\Netmail;
+use App\Models\{Echomail,Netmail};
 use App\Traits\{MessagePath,PageTemplate};
 
 class EchomailBadAddress extends Netmails
@@ -16,14 +15,14 @@ class EchomailBadAddress extends Netmails
 
 	private const LOGKEY = 'NBA';
 
-	private Message $mo;
+	private Echomail $mo;
 
 	/**
 	 * Send a sysop a message if they give us a message with a bad address in it.
 	 *
-	 * @param Message $mo
+	 * @param Echomail $mo
 	 */
-	public function __construct(Message $mo)
+	public function __construct(Echomail $mo)
 	{
 		parent::__construct();