From a05ca1c2a40336ddabcddd4446fccee2d5e100ed Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 3 Feb 2022 17:35:52 +1100
Subject: [PATCH] Misc bug fixes while testing

---
 app/Classes/FTN/Message.php               | 2 +-
 app/Classes/File/Receive.php              | 2 +-
 app/Http/Controllers/DomainController.php | 4 ++--
 app/Http/Controllers/SystemController.php | 2 +-
 app/Models/Echomail.php                   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php
index c843f5b..a1d4fa5 100644
--- a/app/Classes/FTN/Message.php
+++ b/app/Classes/FTN/Message.php
@@ -515,7 +515,7 @@ class Message extends FTNBase
 		} else {
 			// Seenby & PATH - FSC-0068
 			$return .= sprintf("SEEN-BY: %s\r",wordwrap(optimize_path($this->seenby)->join(' '),70,"\rSEEN-BY: "));
-			$return .= sprintf("\01PATH: %s\r",wordwrap(optimize_path($this->path)->join(' '),70,"\rPATH: "));
+			$return .= sprintf("\01PATH: %s\r",wordwrap(optimize_path($this->path)->join(' '),73,"\rPATH: "));
 		}
 
 		$return .= "\00";
diff --git a/app/Classes/File/Receive.php b/app/Classes/File/Receive.php
index 4f57963..376d42a 100644
--- a/app/Classes/File/Receive.php
+++ b/app/Classes/File/Receive.php
@@ -127,7 +127,7 @@ final class Receive extends Item
 					}
 
 					// Check the packet password
-					if ($this->ao->session('pktpass') !== $po->password) {
+					if ($this->ao->session('pktpass') != $po->password) {
 						Log::error(sprintf('%s: ! Packet from [%s] with password [%s] is invalid.',self::LOGKEY,$this->ao->ftn,$po->password));
 						// @todo Generate message to system advising invalid password - that message should be sent without a packet password!
 						break;
diff --git a/app/Http/Controllers/DomainController.php b/app/Http/Controllers/DomainController.php
index c9350dd..14d1440 100644
--- a/app/Http/Controllers/DomainController.php
+++ b/app/Http/Controllers/DomainController.php
@@ -56,7 +56,7 @@ class DomainController extends Controller
 	{
 		$oo = Address::where('role',Address::NODE_NC)
 			->where('zone_id',$o->id)
-			->when($region,function($query,$region) { return $query->where('region_id',$region)->where('node_id',0); })
+			->when($region,function($query,$region) { return $query->where('region_id',$region); })
 			->when((! $region),function($query) use ($region) { return $query->where('region_id',0); })
 			->where('point_id',0)
 			->FTNorder()
@@ -77,7 +77,7 @@ class DomainController extends Controller
 	 */
 	public function api_hubs(Zone $o,int $host): Collection
 	{
-		$oo = Address::where('role',self::NODE_HC)
+		$oo = Address::where('role',Address::NODE_HC)
 			->where('zone_id',$o->id)
 			->when($host,function($query,$host) { return $query->where('host_id',$host)->where('node_id','<>',0); })
 			->with(['system'])
diff --git a/app/Http/Controllers/SystemController.php b/app/Http/Controllers/SystemController.php
index ae9a560..29669c3 100644
--- a/app/Http/Controllers/SystemController.php
+++ b/app/Http/Controllers/SystemController.php
@@ -283,7 +283,7 @@ class SystemController extends Controller
 			->where('zones.domain_id',$request->domain_id)
 			->FTNorder()
 			->get()
-			->map(function($item) { return ['id'=>$item->id,'value'=>$item->ftn3d]; });
+			->map(function($item) { return ['id'=>(string)$item->id,'value'=>$item->ftn3d]; });
 	}
 
 	/**
diff --git a/app/Models/Echomail.php b/app/Models/Echomail.php
index ff5beac..f0f96ed 100644
--- a/app/Models/Echomail.php
+++ b/app/Models/Echomail.php
@@ -200,7 +200,7 @@ final class Echomail extends Model implements Packet
 			$o->origin = $this->origin;
 
 		$o->seenby = $this->seenby->pluck('ftn2d');
-		$o->path = $this->path->pluck('ftn2d');
+		$o->path = $this->pathorder();
 
 		$o->packed = TRUE;