From d6aafa43221177b4a4cd1b060c9ee56f6321792e Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Thu, 6 Jul 2023 09:35:15 +1000
Subject: [PATCH] Changes to phone, add Active/Archive to echomail list for
 nets

---
 .env.example                          |  2 +-
 app/Classes/Protocol/EMSI.php         |  4 +++-
 app/Models/System.php                 |  5 -----
 resources/views/domain/view.blade.php | 17 ++++++++++++++---
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.env.example b/.env.example
index 798c8a3..cacb795 100644
--- a/.env.example
+++ b/.env.example
@@ -1,7 +1,7 @@
 APP_NAME="Clearing Houz"
 APP_ENV=production
 APP_KEY=
-APP_DEBUG=true
+APP_DEBUG=false
 APP_URL=http://localhost
 
 LOG_CHANNEL=stack
diff --git a/app/Classes/Protocol/EMSI.php b/app/Classes/Protocol/EMSI.php
index 65434c3..e9c8798 100644
--- a/app/Classes/Protocol/EMSI.php
+++ b/app/Classes/Protocol/EMSI.php
@@ -215,10 +215,12 @@ final class EMSI extends BaseProtocol implements CRCInterface,ZmodemInterface
 		);
 
 		// System Details
-		$makedata .= sprintf('{IDENT}{[%s][%s][%s][-Unpublished-][38400][%s]}',
+		$makedata .= sprintf('{IDENT}{[%s][%s][%s][%s][%d][%s]}',
 			$this->setup->system->name,
 			$this->setup->system->location,
 			$this->setup->system->sysop,
+			$this->setup->system->phone ?: '-Unpublished-',
+			self::TCP_SPEED,
 			'XA'						// Nodelist Flags
 		);
 
diff --git a/app/Models/System.php b/app/Models/System.php
index 9184b4e..4f96ad3 100644
--- a/app/Models/System.php
+++ b/app/Models/System.php
@@ -127,11 +127,6 @@ class System extends Model
 		}
 	}
 
-	public function getPhoneAttribute(string $val): string
-	{
-		return $val ?: '-Unpublished-';
-	}
-
 	/* METHODS */
 
 	public function echoareas()
diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php
index 860c2b0..2ffb50f 100644
--- a/resources/views/domain/view.blade.php
+++ b/resources/views/domain/view.blade.php
@@ -32,13 +32,14 @@
 						<table class="table monotable w-100" id="echoarea">
 							<thead>
 							<tr>
-								<th class="w-75" colspan="3"></th>
+								<th class="w-75" colspan="4"></th>
 								<th colspan="3" class="text-center">Messages</th>
 							</tr>
 							<tr>
 								<th>Echoarea</th>
 								<th>Description</th>
 								<th>Last Message</th>
+								<th>Area Active</th>
 								<th class="text-end">Day</th>
 								<th class="text-end">Week</th>
 								<th class="text-end">Month</th>
@@ -51,6 +52,7 @@
 									<td style="width: 15%;"><a href="{{ url('ftn/echoarea/addedit',[$oo->id]) }}">{{ $oo->name }}</a></td>
 									<td>{{ $oo->description }}</td>
 									<td style="width: 15%;">{{ $oo->last_message ? $oo->last_message->format('Y-m-d H:i') : '-' }}</td>
+									<td>{{ $oo->active ? 'Active' : 'Archive' }}</td>
 									<td class="text-end">{{ number_format($oo->messages_count(1)) }}</td>
 									<td class="text-end">{{ number_format($oo->messages_count(7)) }}</td>
 									<td class="text-end">{{ number_format($oo->messages_count(30)) }}</td>
@@ -191,11 +193,20 @@
 				pageLength: 25,
 				searching: true,
 				ordering: true,
-				order: [1,'asc'],
+				order: [[3,'asc'],[1,'asc']],
 				conditionalPaging: {
 					style: 'fade',
 					speed: 500 // optional
-				}
+				},
+				rowGroup: {
+					dataSrc: [3],
+				},
+				columnDefs: [
+					{
+						targets: [3],
+						visible: false,
+					},
+				],
 			});
 
 			$('#filearea').DataTable({