From 04c43828363873f337e4d74f640f822261eee5a0 Mon Sep 17 00:00:00 2001
From: Pinga <121483313+getpinga@users.noreply.github.com>
Date: Sun, 18 Feb 2024 15:06:04 +0200
Subject: [PATCH] UI improvements for contact verification

Moved to registry settings instead of individual contact settings.
---
 cp/app/Controllers/SystemController.php       | 38 ++++++++++++++++++-
 .../views/admin/contacts/createContact.twig   | 15 --------
 .../views/admin/contacts/updateContact.twig   | 15 --------
 cp/resources/views/admin/system/registry.twig | 35 +++++++++++++++++
 database/registry.mariadb.sql                 |  3 ++
 database/registry.postgres.sql                |  3 ++
 6 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/cp/app/Controllers/SystemController.php b/cp/app/Controllers/SystemController.php
index ef1e2e7..7c07ce6 100644
--- a/cp/app/Controllers/SystemController.php
+++ b/cp/app/Controllers/SystemController.php
@@ -124,6 +124,36 @@ class SystemController extends Controller
                     ]
                 );
                 
+                $db->update(
+                    'settings',
+                    [
+                        'value' => $data['verifyPhone']
+                    ],
+                    [
+                        'name' => "verifyPhone"
+                    ]
+                );
+                
+                $db->update(
+                    'settings',
+                    [
+                        'value' => $data['verifyEmail']
+                    ],
+                    [
+                        'name' => "verifyEmail"
+                    ]
+                );
+                
+                $db->update(
+                    'settings',
+                    [
+                        'value' => $data['verifyPostal']
+                    ],
+                    [
+                        'name' => "verifyPostal"
+                    ]
+                );
+                
                 $db->update(
                     'settings',
                     [
@@ -181,6 +211,9 @@ class SystemController extends Controller
         $whois_server = $db->selectValue("SELECT value FROM settings WHERE name = 'whois_server'");
         $rdap_server = $db->selectValue("SELECT value FROM settings WHERE name = 'rdap_server'");
         $currency = $db->selectValue("SELECT value FROM settings WHERE name = 'currency'");
+        $verifyPhone = $db->selectValue("SELECT value FROM settings WHERE name = 'verifyPhone'");
+        $verifyEmail = $db->selectValue("SELECT value FROM settings WHERE name = 'verifyEmail'");
+        $verifyPostal = $db->selectValue("SELECT value FROM settings WHERE name = 'verifyPostal'");
         
         $uniqueCurrencies = [];
         foreach ($countries as $country) {
@@ -204,7 +237,10 @@ class SystemController extends Controller
             'whois_server' => $whois_server,
             'rdap_server' => $rdap_server,
             'uniqueCurrencies' => $uniqueCurrencies,
-            'currency' => $currency
+            'currency' => $currency,
+            'verifyPhone' => $verifyPhone,
+            'verifyEmail' => $verifyEmail,
+            'verifyPostal' => $verifyPostal
         ]);
     }
     
diff --git a/cp/resources/views/admin/contacts/createContact.twig b/cp/resources/views/admin/contacts/createContact.twig
index e148332..1996bd3 100644
--- a/cp/resources/views/admin/contacts/createContact.twig
+++ b/cp/resources/views/admin/contacts/createContact.twig
@@ -167,21 +167,6 @@
                                         </div>
                                         <!-- You can invert the logic if you prefer the default to be 'Personal' instead of 'Business' -->
                                     </div>
-                                    
-                                    <div class="mb-3">
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" id="verifyPhone" name="verifyPhone">
-                                            <label class="form-check-label" for="verifyPhone">{{ __('Verify by Phone') }}</label>
-                                        </div>
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" id="verifyEmail" name="verifyEmail">
-                                            <label class="form-check-label" for="verifyEmail">{{ __('Verify by Email') }}</label>
-                                        </div>
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" id="verifyPostal" name="verifyPostal">
-                                            <label class="form-check-label" for="verifyPostal">{{ __('Verify by Postal Mail') }}</label>
-                                        </div>
-                                    </div>
 
                                 </div>
                             </div>
diff --git a/cp/resources/views/admin/contacts/updateContact.twig b/cp/resources/views/admin/contacts/updateContact.twig
index 513dd2c..55a4bc3 100644
--- a/cp/resources/views/admin/contacts/updateContact.twig
+++ b/cp/resources/views/admin/contacts/updateContact.twig
@@ -160,21 +160,6 @@
                                         </div>
                                         <!-- You can invert the logic if you prefer the default to be 'Personal' instead of 'Business' -->
                                     </div>
-                                    
-                                    <div class="mb-3">
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" id="verifyPhone" name="verifyPhone">
-                                            <label class="form-check-label" for="verifyPhone">{{ __('Verify by Phone') }}</label>
-                                        </div>
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" id="verifyEmail" name="verifyEmail">
-                                            <label class="form-check-label" for="verifyEmail">{{ __('Verify by Email') }}</label>
-                                        </div>
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" id="verifyPostal" name="verifyPostal">
-                                            <label class="form-check-label" for="verifyPostal">{{ __('Verify by Postal Mail') }}</label>
-                                        </div>
-                                    </div>
 
                                 </div>
                             </div>
diff --git a/cp/resources/views/admin/system/registry.twig b/cp/resources/views/admin/system/registry.twig
index e224a57..5609970 100644
--- a/cp/resources/views/admin/system/registry.twig
+++ b/cp/resources/views/admin/system/registry.twig
@@ -82,6 +82,41 @@
                           </div>
                         </div>
                       </div>
+                      <div class="mb-3">
+                        <label class="form-label">{{ __('Contact Verification') }}</label>
+                        <div class="divide-y">
+                          <div>
+                            <label class="row">
+                              <span class="col">{{ __('Verify by Phone') }}</span>
+                              <span class="col-auto">
+                                <label class="form-check form-check-single form-switch">
+                                  <input class="form-check-input" type="checkbox" name="verifyPhone" {% if verifyPhone == 'on' %}checked{% endif %}>
+                                </label>
+                              </span>
+                            </label>
+                          </div>
+                          <div>
+                            <label class="row">
+                              <span class="col">{{ __('Verify by Email') }}</span>
+                              <span class="col-auto">
+                                <label class="form-check form-check-single form-switch">
+                                  <input class="form-check-input" type="checkbox" name="verifyEmail" {% if verifyEmail == 'on' %}checked{% endif %}>
+                                </label>
+                              </span>
+                            </label>
+                          </div>
+                          <div>
+                            <label class="row">
+                              <span class="col">{{ __('Verify by Postal Mail') }}</span>
+                              <span class="col-auto">
+                                <label class="form-check form-check-single form-switch">
+                                  <input class="form-check-input" type="checkbox" name="verifyPostal" {% if verifyPostal == 'on' %}checked{% endif %}>
+                                </label>
+                              </span>
+                            </label>
+                          </div>
+                        </div>
+                      </div>
 
                     </div>
                           
diff --git a/database/registry.mariadb.sql b/database/registry.mariadb.sql
index 3933d5b..1b5738d 100644
--- a/database/registry.mariadb.sql
+++ b/database/registry.mariadb.sql
@@ -884,6 +884,9 @@ INSERT INTO `registry`.`settings` (`name`, `value`) VALUES
 ('address2',    '48000'),
 ('cc',    'Ukraine'),
 ('vat_number',    '12345678'),
+('verifyEmail',	NULL),
+('verifyPhone',	NULL),
+('verifyPostal', NULL),
 ('phone',    '+123456789'),
 ('handle',    'RXX'),
 ('email',    'contact@example.com'),
diff --git a/database/registry.postgres.sql b/database/registry.postgres.sql
index 57d37b7..c3cb585 100644
--- a/database/registry.postgres.sql
+++ b/database/registry.postgres.sql
@@ -813,6 +813,9 @@ INSERT INTO settings (name, value) VALUES
 ('address2', '48000'),
 ('cc', 'Ukraine'),
 ('vat_number', '12345678'),
+('verifyEmail',	NULL),
+('verifyPhone',	NULL),
+('verifyPostal', NULL),
 ('phone', '+123456789'),
 ('handle', 'RXX'),
 ('email', 'contact@example.com'),