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

Compare commits

base: bbs:37adb14b9e92d23cfe3090de30ec287e4a65ee17
Branches Tags
bbs:master
bbs:bbs
..
compare: bbs:d53ca09c0cf1a3bba2a197c30808d78a402bb5a4
Branches Tags
bbs:master
bbs:bbs

2 Commits
37adb14b9e ... d53ca09c0c

Author SHA1 Message Date
Deon George
d53ca09c0c Remove deprecated Domain::managed()
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 1m49s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 11s
Details
2024-05-29 19:35:51 +10:00
Deon George
195d88b84d Fix for when no zones have been created yet in a domain 2024-05-29 19:35:51 +10:00
1 changed files with 19 additions and 2 deletions
Show Stats Expand all files Collapse all files

21
app/Http/Requests/DomainRequest.php
View File

@ -24,8 +24,25 @@ class DomainRequest extends FormRequest
$o = $this->route('o');
return [
'name' => 'required|max:8|regex:/^[a-z-_~]{1,8}$/|unique:domains,name,'.($o->exists ? $o->id : 0),
'dnsdomain' => 'nullable|regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i|unique:domains,dnsdomain,'.($o->exists ? $o->id : NULL),
'name' => [
'required',
'max:8',
'regex:/^[a-z-_~]{1,8}$/',
Rule::unique('domains')
->where(fn($query)=>$query
->where('name',$request->post('name'))
->when($o?->exists,fn($query)=>$query->where('id','<>',$o->id))
)
],
'dnsdomain' => [
'nullable',
'regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i',
Rule::unique('domains')
->where(fn($query)=>$query
->where('dnsdomain',$request->post('dnsdomain'))
->when($o?->exists,fn($query)=>$query->where('id','<>',$o->id))
)
],
'active' => 'required|boolean',
'public' => 'required|boolean',
'accept_app' => 'required|boolean',