bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fix System registration form presentation and validation processing
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 37s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m42s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George
2024-04-26 12:23:55 +10:00
parent 1a5c1eff7b
commit 6e376100a5
4 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/Http/Requests/SystemRegister.php
View File

@@ -53,39 +53,32 @@ class SystemRegister extends FormRequest
*/
public function rules(Request $request)
{
if ((! $request->isMethod('post')) || ($request->action === 'register'))
// When the user first select register/link (get)
if (! $request->isMethod('post'))
return [];
$so = $this->route('o');
if ((! $so) && ($request->action === 'register'))
return [];
if (((! $so) || (! $so->exists)) && ($request->action === 'create'))
return [
'name' => 'required|min:3',
];
return array_filter(array_merge(
[
'name' => 'required|min:3',
],
($so->exists || ($request->action !== 'create')) ? [
'location' => 'required|min:3',
'sysop' => 'required|min:3',
'phone' => 'nullable|regex:/^([0-9-]+)$/',
'address' => 'nullable|regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i',
'port' => 'nullable|digits_between:2,5',
'method' => 'nullable|numeric',
'mailer_details.*' => 'nullable|array',
'mailer_details.*.port' => 'nullable|digits_between:2,5',
'zt_id' => 'nullable|size:10|regex:/^([A-Fa-f0-9]){10}$/|unique:systems,zt_id,'.($so->exists ? $so->id : 0),
'pkt_type' => ['required',Rule::in(array_keys(Packet::PACKET_TYPES))],
'users' => 'nullable|array|min:1|max:2',
] : [],
$so->exists ? [
'active' => 'required|boolean',
'hold' => 'required|boolean',
'pollmode' => 'required|integer|min:0|max:2',
'heartbeat' => 'nullable|integer|min:0|max:48',
] : [],
));
return array_filter(array_merge([
'name' => 'required|min:3',
'location' => 'required|min:3',
'sysop' => 'required|min:3',
'phone' => 'nullable|regex:/^([0-9-]+)$/',
'address' => 'nullable|regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i',
'port' => 'nullable|digits_between:2,5',
'method' => 'nullable|numeric',
'mailer_details.*' => 'nullable|array',
'mailer_details.*.port' => 'nullable|digits_between:2,5',
'zt_id' => 'nullable|size:10|regex:/^([A-Fa-f0-9]){10}$/|unique:systems,zt_id,'.($so ? $so->id : 0),
'pkt_type' => ['required',Rule::in(array_keys(Packet::PACKET_TYPES))],
],($so && $so->exists) ? [
'users' => 'nullable|array|min:1|max:2',
'active' => 'required|boolean',
'hold' => 'required|boolean',
'pollmode' => 'required|integer|min:0|max:2',
'heartbeat' => 'nullable|integer|min:0|max:48',
] : []));
}
}