From 33a97ce5b394d80a6062f375adc66c40cf82a418 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sat, 30 Nov 2024 14:28:28 +1100
Subject: [PATCH] Fix showing 'View Packet' when the to zone is not in the same
 domain as the from domain

---
 app/Classes/FTN/Packet.php    | 2 +-
 resources/views/pkt.blade.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Classes/FTN/Packet.php b/app/Classes/FTN/Packet.php
index eea9254..a730208 100644
--- a/app/Classes/FTN/Packet.php
+++ b/app/Classes/FTN/Packet.php
@@ -462,7 +462,7 @@ abstract class Packet extends FTNBase implements \Iterator, \Countable
 		}
 
 		// @todo If the message from domain (eg: $msg->fftn->zone->domain) is different to the packet address domain ($pkt->fftn->zone->domain), we'll skip this message
-		Log::debug(sprintf('%s:^ Message [%s] - Packet from domain [%d], Message domain [%d]',self::LOGKEY,$msg->msgid,$this->fftn->zone->domain_id,$msg->fftn->zone->domain_id));
+		//Log::debug(sprintf('%s:^ Message [%s] - Packet from domain [%d], Message domain [%d]',self::LOGKEY,$msg->msgid,$this->fftn->zone->domain_id,$msg->fftn->zone->domain_id));
 
 		$this->messages->push($msg);
 	}
diff --git a/resources/views/pkt.blade.php b/resources/views/pkt.blade.php
index 5f2087c..a89a101 100644
--- a/resources/views/pkt.blade.php
+++ b/resources/views/pkt.blade.php
@@ -71,7 +71,7 @@
 
 						<div id="collapse_item_{{ $loop->parent->index }}_{{ $loop->index }}" class="accordion-collapse collapse @if($loop->parent->first)show @endif" aria-labelledby="packet" data-bs-parent="#accordion_packet">
 							<div class="accordion-body">
-								<p>Packet <strong class="highlight">{{ $file }}</strong> (type <strong class="highlight">{{ $result->type }}</strong>) is from <strong class="highlight">{{ $result->fftn->ftn }}</strong> to <strong class="highlight">{{ $result->tftn->ftn }}</strong>, dated <strong class="highlight">{{ $result->date }}</strong>.</p>
+								<p>Packet <strong class="highlight">{{ $file }}</strong> (type <strong class="highlight">{{ $result->type }}</strong>) is from <strong class="highlight">{{ $result->fftn ? $result->fftn->ftn : $result->fftn_t }}</strong> to <strong class="highlight">{{ $result->tftn ? $result->tftn->ftn : $result->tftn_t }}</strong>, dated <strong class="highlight">{{ $result->date }}</strong>.</p>
 								<p>This packet has <strong class="highlight">{{ $result->messages->count() }}</strong> messages and <strong class="highlight">{{ $result->password ? 'DOES' : 'does NOT' }}</strong> have a password.</p>
 								<p>Tosser: <strong class="highlight">{{ $result->software->code }}</strong> (<strong class="highlight">{{ $result->software->name }}</strong>), version <strong class="highlight">{{ $result->software_ver }}</strong>. Capabilities: <strong class="highlight">{{ $result->capability }}</strong>.</p>
 								@if ($result->messages->count() > 1)
@@ -112,10 +112,10 @@
 
 														<div class="row pb-2">
 															<div class="col-4">
-																FROM: <strong class="highlight">{!! Message::tr($msg->from) !!}</strong> (<strong class="highlight">{{ $msg->fftn->ftn }}</strong>)
+																FROM: <strong class="highlight">{!! Message::tr($msg->from) !!}</strong> (<strong class="highlight">{{ $msg->fftn ? $msg->fftn->ftn : $msg->fftn_t}}</strong>)
 															</div>
 															<div class="col-4">
-																TO: <strong class="highlight">{!! Message::tr($msg->to) !!}</strong>@if($msg instanceof Netmail) (<strong class="highlight">{{ $msg->tftn->ftn }}</strong>) @endif
+																TO: <strong class="highlight">{!! Message::tr($msg->to) !!}</strong>@if($msg instanceof Netmail) (<strong class="highlight">{{ $msg->tftn ? $msg->tftn->ftn : $msg->tftn_t }}</strong>) @endif
 															</div>
 														</div>