Merge pull request #482 from openprovider/INTGRTNS-410-WHMCS-Domain-Module-Refactor-DNSSEC-Management-Storage-Using-WHMCS-Domain-Extra

Updated the logic for enabling/disabling DNSSEC

Author: YumeChaan

modules/registrars/openprovider/Controllers/Hooks/ClientAreaPrimarySidebarController.php

@@ -5,6 +5,7 @@
 use OpenProvider\API\ApiHelper;
 use OpenProvider\WhmcsRegistrar\helpers\DNS;
 use OpenProvider\WhmcsRegistrar\helpers\DomainFullNameToDomainObject;
+use OpenProvider\WhmcsRegistrar\helpers\DnssecManagement;
 use WHMCS\Database\Capsule;
 
 /**
@@ -82,10 +83,15 @@ private function addDNSSECMenuItem($primarySidebar)
             $domainId        = isset($_REQUEST['domainid']) ? $_REQUEST['domainid'] : $_REQUEST['id'];
             $isDomainEnabled = Capsule::table('tbldomains')
                 ->where('id', $domainId)
-                ->select('status', 'dnssecmanagement', 'domain')
+                ->select('status','domain')
                 ->first();
 
-            if ($isDomainEnabled->dnssecmanagement != 1){
+            if (!$isDomainEnabled) {
+                return;
+            }
+            
+            $dnssecMgmt = DnssecManagement::getFlag((int)$domainId); // 0/1
+            if ($dnssecMgmt !== 1) {
                 return;
             }
 

modules/registrars/openprovider/Controllers/Hooks/DnssecToggleController.php

@@ -4,6 +4,7 @@
 
 use OpenProvider\API\ApiHelper;
 use WHMCS\Database\Capsule;
+use OpenProvider\WhmcsRegistrar\helpers\DnssecManagement;
 
 /**
  * Class DnssecToggleController
@@ -35,10 +36,8 @@ public function output($vars)
             return [];
         }
 
-        $this->ensureDnssecColumn();
-
         $row = Capsule::table('tbldomains')
-            ->select('id','domain','dnssecmanagement')
+            ->select('id','domain')
             ->where('id', $domainId)
             ->first();
 
@@ -51,8 +50,7 @@ public function output($vars)
             $tld_enabled = false;
         }
 
-        $admin_enabled = $row && (int)($row->dnssecmanagement ?? 0) === 1;
-
+        $admin_enabled = DnssecManagement::getFlag((int)$row->id) === 1;
         $enabled = $tld_enabled && $admin_enabled;
 
         $html = '
@@ -78,18 +76,16 @@ public function save($vars)
 
         unset($_SESSION['op_dnssec_popup']);
 
-        $this->ensureDnssecColumn();
-
         $row = Capsule::table('tbldomains')
-            ->select('id','domain','dnssecmanagement')
+            ->select('id','domain')
             ->where('id', $domainId)
             ->first();
 
         if (!$row) {
             return;
         }
 
-        $current = (int)($row->dnssecmanagement ?? 0); 
+        $current = DnssecManagement::getFlag((int)$row->id);
         $checkEnable = isset($_REQUEST['op_dnssec_management']) && $_REQUEST['op_dnssec_management'] == '1';
         $wantsEnable = $checkEnable ? 1 : 0; 
         $tld = $this->extractTldFromFqdn((string)$row->domain);
@@ -102,7 +98,7 @@ public function save($vars)
 
         if ($wantsEnable === $current) {
             if ($wantsEnable === 1 && !$allowed) {
-                $this->updateDnssecFlag((int) $row->id, 0);
+                DnssecManagement::setFlag((int) $row->id, 0);
                 $this->setDnssecPopup(
                     (int) $row->id,
                     'warning',
@@ -116,12 +112,12 @@ public function save($vars)
         }
 
         if (!$allowed && $wantsEnable === 0 && $current === 1) {
-            $this->updateDnssecFlag((int) $row->id, 0);
+            DnssecManagement::setFlag((int) $row->id, 0);
             return;
         }
 
         if ($wantsEnable === 0) {
-            $this->updateDnssecFlag((int) $row->id, 0);
+            DnssecManagement::setFlag((int) $row->id, 0);
             $this->setDnssecPopup(
                 (int) $row->id,
                 'success',
@@ -132,15 +128,15 @@ public function save($vars)
         }
 
         if ($allowed) {
-            $this->updateDnssecFlag((int) $row->id, 1);
+            DnssecManagement::setFlag((int) $row->id, 1);
             $this->setDnssecPopup(
                 (int) $row->id,
                 'success',
                 'enabled',
                 'DNSSEC management has been successfully enabled for the domain. The client can now manage DNSSEC from the client area.'
             );
         } else {
-            $this->updateDnssecFlag((int) $row->id, 0);
+            DnssecManagement::setFlag((int) $row->id, 0);
             $this->setDnssecPopup(
                 (int) $row->id,
                 'warning',
@@ -261,30 +257,6 @@ private function jsonInline($str)
         return json_encode((string)$str, JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_AMP|JSON_HEX_QUOT);
     }
 
-    private function ensureDnssecColumn(): void
-    {
-        $table = 'tbldomains';
-        $col   = 'dnssecmanagement';
-
-        try {
-            if (!Capsule::schema()->hasTable($table) || Capsule::schema()->hasColumn($table, $col)) {
-                return;
-            }
-            Capsule::schema()->table($table, function ($t) use ($col) {
-                $t->tinyInteger($col)->unsigned()->default(1);
-            });
-        } catch (\Exception $e) {}
-    }
-
-    private function updateDnssecFlag(int $domainId, int $value): void
-    {
-        try {
-            Capsule::table('tbldomains')
-                ->where('id', $domainId)
-                ->update(['dnssecmanagement' => $value]);
-        } catch (\Exception $e) {}
-    }
-
     private function setDnssecPopup(
         int $domainId,
         string $type,

modules/registrars/openprovider/helpers/DnssecManagement.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace OpenProvider\WhmcsRegistrar\helpers;
+
+use WHMCS\Database\Capsule;
+
+class DnssecManagement
+{
+    public const EXTRA_KEY = 'openprovider_dnssecmanagement';
+    public const DEFAULT_DNSSEC_MGMT = 1;
+
+    public static function getFlag(int $domainId): int
+    {
+        try {
+            $val = Capsule::table('tbldomains_extra')
+                ->where('domain_id', $domainId)
+                ->where('name', self::EXTRA_KEY)
+                ->value('value');
+
+            // No row = default behavior
+            if ($val === null) {
+                return self::DEFAULT_DNSSEC_MGMT;
+            }
+
+            return ((string)$val === '1') ? 1 : 0;
+        } catch (\Exception $e) {
+            return self::DEFAULT_DNSSEC_MGMT;
+        }
+    }
+
+    public static function setFlag(int $domainId, int $value): void
+    {
+        $value = ($value === 1) ? '1' : '0';
+        $now   = date('Y-m-d H:i:s');
+
+        try {
+            $query = Capsule::table('tbldomains_extra')
+                ->where('domain_id', $domainId)
+                ->where('name', self::EXTRA_KEY);
+
+            if ($query->exists()) {
+                $query->update([
+                    'value'      => $value,
+                    'updated_at' => $now,
+                ]);
+            } else {
+                Capsule::table('tbldomains_extra')->insert([
+                    'domain_id'  => $domainId,
+                    'name'       => self::EXTRA_KEY,
+                    'value'      => $value,
+                    'created_at' => $now,
+                    'updated_at' => $now,
+                ]);
+            }
+        } catch (\Exception $e) {}
+    }
+}