From 9e02a7f7f7b16fc7f3626f0c696a86ee6a86e0b4 Mon Sep 17 00:00:00 2001 From: Pinga <121483313+getpinga@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:32:52 +0200 Subject: [PATCH] Further domain update... updates --- cp/app/Controllers/DomainsController.php | 41 ++- .../views/admin/domains/createDomain.twig | 4 +- .../views/admin/domains/editDomain.twig | 291 ------------------ .../views/admin/domains/updateDomain.twig | 30 +- 4 files changed, 49 insertions(+), 317 deletions(-) delete mode 100644 cp/resources/views/admin/domains/editDomain.twig diff --git a/cp/app/Controllers/DomainsController.php b/cp/app/Controllers/DomainsController.php index eb181f9..a0f6591 100644 --- a/cp/app/Controllers/DomainsController.php +++ b/cp/app/Controllers/DomainsController.php @@ -961,6 +961,9 @@ class DomainsController extends Controller $this->container->get('flash')->addMessage('error', 'The contact requested in the command does NOT belong to the current registrar'); return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); } + } else { + $this->container->get('flash')->addMessage('error', 'Please provide registrant identifier'); + return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); } if ($contactAdmin) { @@ -976,6 +979,9 @@ class DomainsController extends Controller $this->container->get('flash')->addMessage('error', 'The contact requested in the command does NOT belong to the current registrar'); return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); } + } else { + $this->container->get('flash')->addMessage('error', 'Please provide admin contact identifier'); + return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); } if ($contactTech) { @@ -991,6 +997,9 @@ class DomainsController extends Controller $this->container->get('flash')->addMessage('error', 'The contact requested in the command does NOT belong to the current registrar'); return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); } + } else { + $this->container->get('flash')->addMessage('error', 'Please provide tech contact identifier'); + return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); } if ($contactBilling) { @@ -1006,6 +1015,9 @@ class DomainsController extends Controller $this->container->get('flash')->addMessage('error', 'The contact requested in the command does NOT belong to the current registrar'); return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); } + } else { + $this->container->get('flash')->addMessage('error', 'Please provide billing contact identifier'); + return $response->withHeader('Location', '/domain/update/'.$domainName)->withStatus(302); } if (!$authInfo) { @@ -1164,14 +1176,19 @@ class DomainsController extends Controller ] ); } else { - $currentDateTime = new \DateTime(); - $logdate = $currentDateTime->format('Y-m-d H:i:s.v'); - $db->insert( - 'error_log', + $host_map_id = $db->selectValue( + 'SELECT id FROM domain_host_map WHERE domain_id = ? AND host_id = ? LIMIT 1', + [$domain_id, $hostName_already_exist] + ); + + $db->update( + 'domain_host_map', [ - 'registrar_id' => $clid, - 'log' => "Domain : $domainName ; hostName : $nameserver - is duplicated", - 'date' => $logdate + 'host_id' => $hostName_already_exist + ], + [ + 'domain_id' => $domain_id, + 'id' => $host_map_id ] ); } @@ -1225,7 +1242,7 @@ class DomainsController extends Controller } } - + $contacts = [ 'admin' => $data['contactAdmin'] ?? null, 'tech' => $data['contactTech'] ?? null, @@ -1239,6 +1256,11 @@ class DomainsController extends Controller [$contact] ); + $contact_map_id = $db->selectRow( + 'SELECT * FROM domain_contact_map WHERE domain_id = ? AND type = ?', + [$domain_id, $type] + ); + // Check if $contact_id is not null before update if ($contact_id !== null) { $db->update( @@ -1247,8 +1269,7 @@ class DomainsController extends Controller 'contact_id' => $contact_id, ], [ - 'domain_id' => $domain_id, - 'type' => $type + 'id' => $contact_map_id['id'] ] ); } diff --git a/cp/resources/views/admin/domains/createDomain.twig b/cp/resources/views/admin/domains/createDomain.twig index 8aedc82..04da63b 100644 --- a/cp/resources/views/admin/domains/createDomain.twig +++ b/cp/resources/views/admin/domains/createDomain.twig @@ -162,8 +162,8 @@
- - + +
diff --git a/cp/resources/views/admin/domains/editDomain.twig b/cp/resources/views/admin/domains/editDomain.twig deleted file mode 100644 index 9ef89ce..0000000 --- a/cp/resources/views/admin/domains/editDomain.twig +++ /dev/null @@ -1,291 +0,0 @@ -{% extends "layouts/app.twig" %} - -{% block title %}{{ __('Editing Domain') }} {{ domain.name }}{% endblock %} - -{% block content %} -
- -
-
-
-
- -
- Overview -
-

- {{ __('Editing Domain') }} {{ domain.name }} -

-
-
-
-
- -
-
-
- {{ csrf.field | raw }} -
- {% if domainName is defined and crdate is defined %} - - {% elseif error is defined %} - - {% endif %} -
-
-

- Domain {{ domain.name }}  - {% if domainStatus.status %} - {{ domainStatus.status }}  - {% endif %} - {{ domain.rgpstatus }} -

-
-
-
-
-
Registered On
-
{{ domain.crdate }}
-
-
-
Last Updated
-
{{ domain.update }}
-
-
-
Expiration Date
-
{{ domain.exdate }}
-
-
-
Registrar
-
{{ registrar.name }}
-
-
-
-
-
-
-
-
-
- -
-
- - - - {% set contactAdmin = '' %} - {% set contactTech = '' %} - {% set contactBilling = '' %} - - {% for contact in domainContacts %} - {% if contact.type == 'admin' %} - {% set contactAdmin = contact.identifier %} - {% elseif contact.type == 'tech' %} - {% set contactTech = contact.identifier %} - {% elseif contact.type == 'billing' %} - {% set contactBilling = contact.identifier %} - {% endif %} - {% endfor %} - - - - -
- -
- - -
-
- - -
-
- - {% for host in domainHosts %} -
- -
- -
-
- {% endfor %} -
- - -
-
- - {% if domainSecdns|length > 0 %} - -
- -
- - {% for row in domainSecdns %} - - {% for key, value in row %} - {% if key not in ['id', 'domain_id', 'maxsiglife'] %} - - {% endif %} - {% endfor %} - - - {% for key, value in row %} - {% if key not in ['id', 'domain_id', 'maxsiglife'] %} - - {% endif %} - {% endfor %} - - {% endfor %} -
{{ key }}
{{ value }}
-
-
- {% else %} - -
- - -
- - {% endif %} -
-
-
-
- -
-
-
- -
-
-
-
-
- -
- -{% endblock %} \ No newline at end of file diff --git a/cp/resources/views/admin/domains/updateDomain.twig b/cp/resources/views/admin/domains/updateDomain.twig index 8647610..424a864 100644 --- a/cp/resources/views/admin/domains/updateDomain.twig +++ b/cp/resources/views/admin/domains/updateDomain.twig @@ -66,8 +66,8 @@
- - + + {% set contactAdmin = '' %} {% set contactTech = '' %} @@ -82,22 +82,20 @@ {% set contactBilling = contact.identifier %} {% endif %} {% endfor %} - - - - -
- -
- - + + + + + + +
- + {% for host in domainHosts %}
@@ -107,8 +105,12 @@
{% endfor %}
- - + + +
+ + +