From 14f28c5263650ca28051673434db7ba7d815ecb2 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sat, 3 Dec 2022 16:00:38 +1100
Subject: [PATCH] Fix packet parsing for unknown zones, or zones that are not
 default

---
 app/Classes/FTN/Message.php             | 4 ++--
 app/Classes/FTN/Packet.php              | 4 ++--
 app/Http/Controllers/HomeController.php | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php
index 97b1a6d..95dc887 100644
--- a/app/Classes/FTN/Message.php
+++ b/app/Classes/FTN/Message.php
@@ -251,7 +251,7 @@ class Message extends FTNBase
 					return $this->zone;
 
 				// If we have a domain, we'll use the zone from the domain
-				if ($x=$this->fdomain) {
+				if ($this->fdomain) {
 					if (($x=$this->fdomain->zones->search(function($item) { return $item->zone_id == $this->fz; })) !== FALSE)
 						return $this->fdomain->zones->get($x);
 				}
@@ -267,7 +267,7 @@ class Message extends FTNBase
 					return $this->zone;
 
 				// If we have a domain, we'll use the zone from the domain
-				if ($x=$this->tdomain) {
+				if ($this->tdomain) {
 					if (($x=$this->tdomain->zones->search(function($item) { return $item->zone_id == $this->tz; })) !== FALSE)
 						return $this->tdomain->zones->get($x);
 				}
diff --git a/app/Classes/FTN/Packet.php b/app/Classes/FTN/Packet.php
index c55b004..68cd208 100644
--- a/app/Classes/FTN/Packet.php
+++ b/app/Classes/FTN/Packet.php
@@ -442,7 +442,7 @@ class Packet extends FTNBase implements \Iterator, \Countable
 			Log::info(sprintf('%s:- Message [%s] has errors',self::LOGKEY,$msg->msgid));
 
 			// If the from address doenst exist, we'll create a new entry
-			if ($msg->errors->messages()->has('to')) {
+			if ($msg->errors->messages()->has('to') && $msg->tzone) {
 				$e = NULL;
 
 				try {
@@ -484,7 +484,7 @@ class Packet extends FTNBase implements \Iterator, \Countable
 				Log::alert(sprintf('%s: - To FTN is not defined, creating new entry for [%s] (%d)',self::LOGKEY,$msg->tboss,$ao->id));
 			}
 
-			if ($msg->errors->messages()->has('from')) {
+			if ($msg->errors->messages()->has('from') && $msg->tzone) {
 				$e = NULL;
 
 				try {
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 543a598..00da20f 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -59,6 +59,7 @@ class HomeController extends Controller
 			foreach ($request->allFiles() as $key => $filegroup) {
 				if ($key !== 'file')
 					continue;
+
 				foreach ($filegroup as $file) {
 					try {
 						$f = new File($file);