From 28e30a05e65bb811fc8ade5b745210870eced319 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Wed, 4 Oct 2023 16:05:46 +1100
Subject: [PATCH] Make passwords mandatory

---
 app/Http/Controllers/SystemController.php     | 4 ++--
 resources/views/system/form-session.blade.php | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/SystemController.php b/app/Http/Controllers/SystemController.php
index 6c55a55..91728bb 100644
--- a/app/Http/Controllers/SystemController.php
+++ b/app/Http/Controllers/SystemController.php
@@ -262,8 +262,8 @@ class SystemController extends Controller
 		$validate = $request->validate([
 			'zone_id' => 'required|exists:zones,id',
 			'sespass' => 'required|string|min:4',
-			'pktpass' => 'nullable|string|min:4|max:8',
-			'ticpass' => 'nullable|string|min:4',
+			'pktpass' => 'required|string|min:4|max:8',
+			'ticpass' => 'required|string|min:4',
 			'fixpass' => 'required|string|min:4',
 		]);
 
diff --git a/resources/views/system/form-session.blade.php b/resources/views/system/form-session.blade.php
index 98f60f9..ce9c038 100644
--- a/resources/views/system/form-session.blade.php
+++ b/resources/views/system/form-session.blade.php
@@ -59,10 +59,12 @@
 									<label for="pktpass" class="form-label">Packet Password</label>
 									<div class="input-group has-validation">
 										<span class="input-group-text"><i class="bi bi-box"></i></span>
-										<input type="text" style="width: 35%;" class="form-control @error('pktpass') is-invalid @enderror" id="pktpass" placeholder="Packet" name="pktpass" value="{{ old('pktpass') }}" @cannot('update',$o)disabled @endcannot>
+										<input type="text" style="width: 35%;" class="form-control @error('pktpass') is-invalid @enderror" id="pktpass" placeholder="Packet" name="pktpass" value="{{ old('pktpass') }}" @cannot('update',$o)disabled @endcannot required>
 										<span class="invalid-feedback" role="alert">
 											@error('pktpass')
 												{{ $message }}
+											@else
+												Packet password required.
 											@enderror
 										</span>
 									</div>
@@ -91,10 +93,12 @@
 									<label for="ticpass" class="form-label">TIC Password</label>
 									<div class="input-group has-validation">
 										<span class="input-group-text"><i class="bi bi-archive"></i></span>
-										<input type="text" style="width: 35%;" class="form-control @error('ticpass') is-invalid @enderror" id="ticpass" placeholder="TIC" name="ticpass" value="{{ old('ticpass') }}" @cannot('update',$o)disabled @endcannot>
+										<input type="text" style="width: 35%;" class="form-control @error('ticpass') is-invalid @enderror" id="ticpass" placeholder="TIC" name="ticpass" value="{{ old('ticpass') }}" @cannot('update',$o)disabled @endcannot required>
 										<span class="invalid-feedback" role="alert">
 											@error('ticpass')
 												{{ $message }}
+											@else
+												TIC password required.
 											@enderror
 										</span>
 									</div>