From 72e56072648b3e2965879eec84b2a5d64ccd9a51 Mon Sep 17 00:00:00 2001 From: Pinga <121483313+getpinga@users.noreply.github.com> Date: Tue, 19 Dec 2023 12:18:43 +0200 Subject: [PATCH] Added Domain Status update/add --- cp/app/Controllers/DomainsController.php | 121 ++++++++++++++++-- .../views/admin/domains/createDomain.twig | 55 ++++++++ .../views/admin/domains/updateDomain.twig | 68 +++++++++- 3 files changed, 227 insertions(+), 17 deletions(-) diff --git a/cp/app/Controllers/DomainsController.php b/cp/app/Controllers/DomainsController.php index b7b22cc..c1e88a6 100644 --- a/cp/app/Controllers/DomainsController.php +++ b/cp/app/Controllers/DomainsController.php @@ -436,6 +436,53 @@ class DomainsController extends Controller ] ); + if ($_SESSION["auth_roles"] != 0) { + $clientStatuses = $data['clientStatuses'] ?? []; + + foreach ($clientStatuses as $status => $value) { + if ($value === 'on') { + // Insert or update the status in the database + $db->exec( + 'INSERT INTO domain_status (domain_id, status) VALUES (?, ?) ON DUPLICATE KEY UPDATE status = VALUES(status)', + [ + $domain_id, + $status + ] + ); + } + } + + } else { + $clientStatuses = $data['clientStatuses'] ?? []; + $serverStatuses = $data['serverStatuses'] ?? []; + + foreach ($clientStatuses as $status => $value) { + if ($value === 'on') { + // Insert or update the status in the database + $db->exec( + 'INSERT INTO domain_status (domain_id, status) VALUES (?, ?) ON DUPLICATE KEY UPDATE status = VALUES(status)', + [ + $domain_id, + $status + ] + ); + } + } + + foreach ($serverStatuses as $status => $value) { + if ($value === 'on') { + // Insert or update the status in the database + $db->exec( + 'INSERT INTO domain_status (domain_id, status) VALUES (?, ?) ON DUPLICATE KEY UPDATE status = VALUES(status)', + [ + $domain_id, + $status + ] + ); + } + } + } + // Data sanity checks // Validate keyTag if (!empty($dsKeyTag)) { @@ -483,14 +530,6 @@ class DomainsController extends Controller 2 => 64, // SHA-256 4 => 96 // SHA-384 ]; - if (empty($validDigests[$dsDigestType])) { - return view($response, 'admin/domains/createDomain.twig', [ - 'domainName' => $domainName, - 'error' => 'Unsupported digest type', - 'registrars' => $registrars, - 'registrar' => $registrar, - ]); - } if (!empty($dsDigest)) { if (strlen($dsDigest) != $validDigests[$dsDigestType] || !ctype_xdigit($dsDigest)) { return view($response, 'admin/domains/createDomain.twig', [ @@ -985,7 +1024,6 @@ class DomainsController extends Controller $csrfTokenName = $this->container->get('csrf')->getTokenName(); $csrfTokenValue = $this->container->get('csrf')->getTokenValue(); - return view($response,'admin/domains/updateDomain.twig', [ 'domain' => $domain, 'domainStatus' => $domainStatus, @@ -1185,6 +1223,67 @@ class DomainsController extends Controller ] ); + if ($_SESSION["auth_roles"] != 0) { + $clientStatuses = $data['clientStatuses'] ?? []; + + $db->delete( + 'domain_status', + [ + 'domain_id' => $domain_id + ] + ); + + foreach ($clientStatuses as $status => $value) { + if ($value === 'on') { + // Insert or update the status in the database + $db->exec( + 'INSERT INTO domain_status (domain_id, status) VALUES (?, ?) ON DUPLICATE KEY UPDATE status = VALUES(status)', + [ + $domain_id, + $status + ] + ); + } + } + + } else { + $clientStatuses = $data['clientStatuses'] ?? []; + $serverStatuses = $data['serverStatuses'] ?? []; + + $db->delete( + 'domain_status', + [ + 'domain_id' => $domain_id + ] + ); + + foreach ($clientStatuses as $status => $value) { + if ($value === 'on') { + // Insert or update the status in the database + $db->exec( + 'INSERT INTO domain_status (domain_id, status) VALUES (?, ?) ON DUPLICATE KEY UPDATE status = VALUES(status)', + [ + $domain_id, + $status + ] + ); + } + } + + foreach ($serverStatuses as $status => $value) { + if ($value === 'on') { + // Insert or update the status in the database + $db->exec( + 'INSERT INTO domain_status (domain_id, status) VALUES (?, ?) ON DUPLICATE KEY UPDATE status = VALUES(status)', + [ + $domain_id, + $status + ] + ); + } + } + } + // Data sanity checks // Validate keyTag if (!empty($dsKeyTag)) { @@ -1216,10 +1315,6 @@ class DomainsController extends Controller 2 => 64, // SHA-256 4 => 96 // SHA-384 ]; - if (empty($validDigests[$dsDigestType])) { - $this->container->get('flash')->addMessage('error', 'Unsupported digest type'); - return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); - } if (!empty($dsDigest)) { if (strlen($dsDigest) != $validDigests[$dsDigestType] || !ctype_xdigit($dsDigest)) { $this->container->get('flash')->addMessage('error', 'Invalid digest length or format'); diff --git a/cp/resources/views/admin/domains/createDomain.twig b/cp/resources/views/admin/domains/createDomain.twig index 2e9724b..5f5820f 100644 --- a/cp/resources/views/admin/domains/createDomain.twig +++ b/cp/resources/views/admin/domains/createDomain.twig @@ -177,6 +177,61 @@ + +
+
{{ __('Statuses') }}
+
+ + + + + +
+
+ + {% if roles == 0 %} +
+
{{ __('Server Statuses') }}
+
+ + + + + +
+
+ {% endif %} +
diff --git a/cp/resources/views/admin/domains/updateDomain.twig b/cp/resources/views/admin/domains/updateDomain.twig index 44b1a8b..3c98c39 100644 --- a/cp/resources/views/admin/domains/updateDomain.twig +++ b/cp/resources/views/admin/domains/updateDomain.twig @@ -102,6 +102,17 @@
+ +
+ {{ __('Domain Security') }} +
+ + +
+ + +
+
@@ -117,12 +128,61 @@ {% endfor %} - - + + {% set statuses = domainStatus|map(status => status.status) %} +
- - +
{{ __('Statuses') }}
+
+ + + + + +
+ +
+
{{ __('Server Statuses') }}
+
+ + + + + +
+
+