From b460cd0196b1877ae17221937ec00d323f399baa Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 28 May 2024 09:35:22 +1000 Subject: [PATCH] Fix display of addresses in pkt dump --- app/Console/Commands/PacketInfo.php | 2 +- resources/views/pkt.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/PacketInfo.php b/app/Console/Commands/PacketInfo.php index 3dc885d..83cb83b 100644 --- a/app/Console/Commands/PacketInfo.php +++ b/app/Console/Commands/PacketInfo.php @@ -55,7 +55,7 @@ class PacketInfo extends Command $this->alert(sprintf('File Name: %s',$x)); $this->info(sprintf('Packet Type : %s (%s)',$pkt->type,get_class($pkt))); - $this->info(sprintf('From : %s to %s',$pkt->fftn->ftn,$pkt->tftn->ftn)); + $this->info(sprintf('From : %s to %s',$pkt->fftn->ftn,$pkt->tftn ? $pkt->tftn->ftn : $pkt->tftn_t)); $this->info(sprintf('Dated : %s (%s) [%s]',$pkt->date,$pkt->date->timestamp,$pkt->date->tz->toOffsetName())); $this->info(sprintf('Password : %s (%s)',$pkt->password ?: '-',$pkt->password ? 'SET' : 'NOT set')); $this->info(sprintf('Messages : %d',$pkt->count())); diff --git a/resources/views/pkt.blade.php b/resources/views/pkt.blade.php index 58858f8..5f2087c 100644 --- a/resources/views/pkt.blade.php +++ b/resources/views/pkt.blade.php @@ -71,7 +71,7 @@
-

Packet {{ $file }} (type {{ $result->type }}) is from {{ $result->fftn }} to {{ $result->tftn }}, dated {{ $result->date }}.

+

Packet {{ $file }} (type {{ $result->type }}) is from {{ $result->fftn->ftn }} to {{ $result->tftn->ftn }}, dated {{ $result->date }}.

This packet has {{ $result->messages->count() }} messages and {{ $result->password ? 'DOES' : 'does NOT' }} have a password.

Tosser: {{ $result->software->code }} ({{ $result->software->name }}), version {{ $result->software_ver }}. Capabilities: {{ $result->capability }}.

@if ($result->messages->count() > 1)