diff --git a/app/Http/Controllers/SystemController.php b/app/Http/Controllers/SystemController.php
index e2c7ead..5a893ba 100644
--- a/app/Http/Controllers/SystemController.php
+++ b/app/Http/Controllers/SystemController.php
@@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Notification;
use Illuminate\Support\ViewErrorBag;
use App\Classes\FTN\Message;
-use App\Http\Requests\{AddressMerge,AreafixRequest,SystemEchoareaRequest,SystemRegister,SystemSessionRequest};
+use App\Http\Requests\{AddressMerge,AreafixRequest,SystemEchoareaRequest,SystemRegisterRequest,SystemSessionRequest};
use App\Jobs\AddressPoll;
use App\Models\{Address,Echoarea,Echomail,Filearea,Netmail,Setup,System,Zone};
use App\Notifications\Netmails\AddressLink;
@@ -29,13 +29,18 @@ class SystemController extends Controller
/**
* Add or edit a node
*/
- public function add_edit(SystemRegister $request,System $o)
+ public function add_edit(SystemRegisterRequest $request, System $o)
{
- if ($request->post()) {
- foreach (['name','location','sysop','hold','phone','address','port','active','method','notes','zt_id','pkt_type','heartbeat'] as $key)
- $o->{$key} = $request->post($key);
+ if ($request->validated()) {
+ foreach (['name','location','phone','address','port','active','method','pkt_type'] as $key)
+ $o->{$key} = $request->validated($key);
- switch ($request->post('pollmode')) {
+ // Sometimes items
+ foreach (['sysop','hold','notes','zt_id','heartbeat'] as $key)
+ if ($request->validated($key))
+ $o->{$key} = $request->validated($key);
+
+ switch ($request->validated('pollmode')) {
case 1: $o->pollmode = FALSE; break;
case 2: $o->pollmode = TRUE; break;
default: $o->pollmode = NULL;
@@ -49,9 +54,9 @@ class SystemController extends Controller
->transform(function($item) { $item['active'] = Arr::get($item,'active',FALSE); return $item; });
$o->mailers()->sync($mailers);
- if ($request->post('users')) {
- if (array_filter($request->post('users'),function($item) { return $item; }))
- $o->users()->sync($request->post('users'));
+ if ($request->validated('users')) {
+ if (array_filter($request->validated('users'),function($item) { return $item; }))
+ $o->users()->sync($request->validated('users'));
else
$o->users()->detach();
}
@@ -62,7 +67,7 @@ class SystemController extends Controller
$o->load(['addresses.zone.domain','addresses.nodes_hub','addresses.system','sessions.domain','sessions.systems']);
return view('system.addedit')
- ->with('action',$o->exists ? 'update' : 'create')
+ ->with('action',$o->exists ? 'update_nn' : 'create')
->with('o',$o);
}
@@ -767,7 +772,7 @@ class SystemController extends Controller
/**
* Register a system, or link to an existing system
*/
- public function register(SystemRegister $request)
+ public function register(SystemRegisterRequest $request)
{
// Step 1, show the user a form to select an existing defined system
if ($request->isMethod('GET'))
diff --git a/app/Http/Requests/SystemRegister.php b/app/Http/Requests/SystemRegisterRequest.php
similarity index 95%
rename from app/Http/Requests/SystemRegister.php
rename to app/Http/Requests/SystemRegisterRequest.php
index 7dc97ad..6577f07 100644
--- a/app/Http/Requests/SystemRegister.php
+++ b/app/Http/Requests/SystemRegisterRequest.php
@@ -10,8 +10,7 @@ use Illuminate\Validation\Rule;
use App\Classes\FTN\Packet;
use App\Models\{Setup,System};
-// @todo rename to SystemRegisterRequest
-class SystemRegister extends FormRequest
+class SystemRegisterRequest extends FormRequest
{
private System $so;
@@ -73,7 +72,7 @@ class SystemRegister extends FormRequest
],($so && $so->exists) ? [
'users' => 'nullable|array|min:1|max:2',
'active' => 'required|boolean',
- 'hold' => 'required|boolean',
+ 'hold' => 'sometimes|boolean',
'pollmode' => 'required|integer|min:0|max:2',
'heartbeat' => 'nullable|integer|min:0|max:48',
] : []));
diff --git a/resources/views/system/addedit.blade.php b/resources/views/system/addedit.blade.php
index 2cade9f..4721f39 100644
--- a/resources/views/system/addedit.blade.php
+++ b/resources/views/system/addedit.blade.php
@@ -1,12 +1,12 @@
@php
- use App\Models\Address;
+use App\Models\Address;
@endphp
@extends('layouts.app')
@section('htmlheader_title')
- @can('admin',$o) @if($o->exists) Update @else Add @endif @endcan System
+ @can('update_nn',$o) @if($o->exists) Update @else Add @endif @endcan System
@endsection
@section('content')
@@ -21,6 +21,7 @@
This system is the ZC for the following zones: {!! $o->zcs->sortBy('zone_id')->map(function($item) { return sprintf('%d@%s',$item->zone_id,$item->domain->name); })->join(', ') !!}