From 368198bc779210a82dbd9d34aa7248e227da973e Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Fri, 7 Jun 2024 13:27:10 +1000
Subject: [PATCH] Add link to netmail/echomail when showing packet contents

---
 resources/views/system/addedit.blade.php |  4 ++--
 resources/views/widgets/packet.blade.php | 14 ++++++++------
 routes/web.php                           |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/resources/views/system/addedit.blade.php b/resources/views/system/addedit.blade.php
index 99ec9d0..1ff1f8d 100644
--- a/resources/views/system/addedit.blade.php
+++ b/resources/views/system/addedit.blade.php
@@ -506,8 +506,8 @@ use App\Models\Address;
 											<tbody>
 											@foreach ($x as $oo)
 												<tr>
-													<td class="packet">{{ $oo->recv_pkt }}</td>
-													<td>{{ $oo->recv_at }}</td>
+													<td @class(['packet'=>$oo->recv_pkt])>{{ $oo->recv_pkt ?: '-' }}</td>
+													<td>{{ $oo->recv_at ?: '-' }}</td>
 													<td class="text-end">{{ $oo->count }}</td>
 												</tr>
 											@endforeach
diff --git a/resources/views/widgets/packet.blade.php b/resources/views/widgets/packet.blade.php
index 2c4e426..32be2b6 100644
--- a/resources/views/widgets/packet.blade.php
+++ b/resources/views/widgets/packet.blade.php
@@ -18,11 +18,13 @@
 				<td>{{ $oo->fftn->ftn }}</td>
 				<td>{{ $oo->tftn->ftn }}</td>
 				<td>
-					@if ($oo->msgid)
-						{{ $oo->msgid }}
-					@else
-						<small>[{{ $oo->id }}]</small>
-					@endif
+					<a href="{{ url('netmail/view',['id'=>$oo->id]) }}">
+						@if ($oo->msgid)
+							{{ $oo->msgid }}
+						@else
+							<small>[{{ $oo->id }}]</small>
+						@endif
+					</a>
 				</td>
 				<td>{{ $oo->datetime }}</td>
 			</tr>
@@ -49,7 +51,7 @@
 		@foreach ($em as $oo)
 			<tr>
 				<td>{{ $oo->fftn->ftn }}</td>
-				<td>{{ $oo->msgid }}</td>
+				<td><a href="{{ url('echomail/view',['id'=>$oo->id]) }}">{{ $oo->msgid }}</a></td>
 				<td>{{ $oo->echoarea->name }}</td>
 				<td>{{ $oo->datetime }}</td>
 			</tr>
diff --git a/routes/web.php b/routes/web.php
index 3eb3619..e8d8d74 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -131,7 +131,7 @@ Route::middleware(['auth','verified','activeuser'])->group(function () {
 	Route::match(['get','post'],'link',[UserController::class,'link']);
 	Route::post('packet/contents/{o}/{packet}',[HomeController::class,'packet_contents'])
 		->where('o','[0-9]+')
-		->where('packet','[[:xdigit:]]+');
+		->where('packet','[0-9a-zA-Z]+');
 
 	Route::match(['get','post'],'user/system/register',[SystemController::class,'register']);
 	Route::match(['post'],'user/system/link',[SystemController::class,'system_link']);