zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-06-26 14:14:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed #19

Browse source
This commit is contained in:
Pinga 2023-12-13 09:44:39 +02:00
parent 44e7427136
commit 7c403eede4
2 changed files with 99 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cp/app/Controllers/DomainsController.php
View file

@ -93,7 +93,7 @@ class DomainsController extends Controller
$contactTech = $data['contactTech'] ?? null; $contactTech = $data['contactTech'] ?? null;
$contactBilling = $data['contactBilling'] ?? null; $contactBilling = $data['contactBilling'] ?? null;
$nameservers = $data['nameserver'] ?? []; $nameservers = !empty($data['nameserver']) ? $data['nameserver'] : null;
$dsKeyTag = $data['dsKeyTag'] ?? null; $dsKeyTag = $data['dsKeyTag'] ?? null;
$dsAlg = $data['dsAlg'] ?? null; $dsAlg = $data['dsAlg'] ?? null;
@ -218,6 +218,11 @@ class DomainsController extends Controller
]); ]);
} }
$nameservers = array_filter($data['nameserver'] ?? [], function($value) {
return !empty($value) && $value !== null;
});
if (!empty($nameservers)) {
if (count($nameservers) !== count(array_unique($nameservers))) { if (count($nameservers) !== count(array_unique($nameservers))) {
return view($response, 'admin/domains/createDomain.twig', [ return view($response, 'admin/domains/createDomain.twig', [
'domainName' => $domainName, 'domainName' => $domainName,
@ -246,6 +251,7 @@ class DomainsController extends Controller
]); ]);
} }
} }
}
if ($contactRegistrant) { if ($contactRegistrant) {
$validRegistrant = validate_identifier($contactRegistrant); $validRegistrant = validate_identifier($contactRegistrant);
@ -568,6 +574,7 @@ class DomainsController extends Controller
] ]
); );
if (!empty($nameservers)) {
foreach ($nameservers as $index => $nameserver) { foreach ($nameservers as $index => $nameserver) {
$hostName_already_exist = $db->selectValue( $hostName_already_exist = $db->selectValue(
'SELECT id FROM host WHERE name = ? LIMIT 1', 'SELECT id FROM host WHERE name = ? LIMIT 1',
@ -650,6 +657,7 @@ class DomainsController extends Controller
} }
} }
}
$contacts = [ $contacts = [
'admin' => $data['contactAdmin'] ?? null, 'admin' => $data['contactAdmin'] ?? null,
@ -715,12 +723,8 @@ class DomainsController extends Controller
[$domain_id] [$domain_id]
); );
return view($response, 'admin/domains/createDomain.twig', [ $this->container->get('flash')->addMessage('success', 'Domain ' . $domainName . ' has been created successfully on ' . $crdate);
'domainName' => $domainName, return $response->withHeader('Location', '/domains')->withStatus(302);
'crdate' => $crdate,
'registrars' => $registrars,
'registrar' => $registrar,
]);
} }
$db = $this->container->get('db'); $db = $this->container->get('db');

4
cp/resources/views/admin/domains/createDomain.twig
View file

@ -96,7 +96,7 @@
<div class="nameserver-group mb-1 row"> <div class="nameserver-group mb-1 row">
<div class="col-md-4"> <div class="col-md-4">
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 1" name="nameserver[]" required autocapitalize="none"> <input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 1" name="nameserver[]" autocapitalize="none">
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 1 - IPv4" name="nameserver_ipv4[]"> <input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 1 - IPv4" name="nameserver_ipv4[]">
@ -108,7 +108,7 @@
<div class="nameserver-group mb-1 row"> <div class="nameserver-group mb-1 row">
<div class="col-md-4"> <div class="col-md-4">
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 2" name="nameserver[]" required autocapitalize="none"> <input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 2" name="nameserver[]" autocapitalize="none">
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 2 - IPv4" name="nameserver_ipv4[]"> <input type="text" class="form-control mb-1" placeholder="{{ __('Nameserver') }} 2 - IPv4" name="nameserver_ipv4[]">