From 88a96e30440d9e580d6309c3afca5ad4aca6164e Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 10 Apr 2024 13:21:45 -0400 Subject: [PATCH] Reworked Client Domains, added mail host and dns host, made all the host columns sortable by reworking the logic and optimized the code further --- client_domain_add_modal.php | 42 +++++++++++++++++++++++++++ client_domain_edit_modal.php | 22 +++++++++++++++ client_domains.php | 55 ++++++++++++++++++++++-------------- database_updates.php | 13 +++++++-- database_version.php | 2 +- db.sql | 4 ++- js/domain_edit_modal.js | 41 +++++++++++++++++++++++++++ post/domain.php | 8 ++++-- 8 files changed, 159 insertions(+), 28 deletions(-) diff --git a/client_domain_add_modal.php b/client_domain_add_modal.php index f705e50c..abe56508 100644 --- a/client_domain_add_modal.php +++ b/client_domain_add_modal.php @@ -89,6 +89,48 @@ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php index 57a4a3a1..e36f1c0e 100644 --- a/client_domain_edit_modal.php +++ b/client_domain_edit_modal.php @@ -72,6 +72,28 @@
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
diff --git a/client_domains.php b/client_domains.php index 215b8083..ecf1df7b 100644 --- a/client_domains.php +++ b/client_domains.php @@ -10,11 +10,19 @@ require_once "inc_all_client.php"; //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); -$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM domains - LEFT JOIN vendors ON domain_registrar = vendor_id - WHERE domain_client_id = $client_id +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS domains.*, + registrar.vendor_name AS registrar_name, + dnshost.vendor_name AS dnshost_name, + mailhost.vendor_name AS mailhost_name, + webhost.vendor_name AS webhost_name + FROM domains + LEFT JOIN vendors AS registrar ON domains.domain_registrar = registrar.vendor_id + LEFT JOIN vendors AS dnshost ON domains.domain_dnshost = dnshost.vendor_id + LEFT JOIN vendors AS mailhost ON domains.domain_mailhost = mailhost.vendor_id + LEFT JOIN vendors AS webhost ON domains.domain_webhost = webhost.vendor_id + WHERE domain_client_id = $client_id AND domain_archived_at IS NULL - AND (domain_name LIKE '%$q%' OR vendor_name LIKE '%$q%') + AND (domains.domain_name LIKE '%$q%' OR domains.domain_description LIKE '%$q%' OR registrar.vendor_name LIKE '%$q%' OR dnshost.vendor_name LIKE '%$q%' OR mailhost.vendor_name LIKE '%$q%' OR webhost.vendor_name LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -83,8 +91,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
Domain - Registrar - Web Host + Registrar + Web Host + DNS Host + Mail Host Expires Action @@ -96,21 +106,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $domain_id = intval($row['domain_id']); $domain_name = nullable_htmlentities($row['domain_name']); $domain_description = nullable_htmlentities($row['domain_description']); - $domain_registrar = intval($row['domain_registrar']); - $domain_webhost = intval($row['domain_webhost']); $domain_expire = nullable_htmlentities($row['domain_expire']); - $domain_registrar_name = nullable_htmlentities($row['vendor_name']); + $domain_registrar_name = nullable_htmlentities($row['registrar_name']); + if($domain_registrar_name) { + $domain_registrar_name_display = $domain_registrar_name; + } else { + $domain_registrar_name_display = "-"; + } + $domain_webhost_name = nullable_htmlentities($row['webhost_name']); + $domain_dnshost_name = nullable_htmlentities($row['dnshost_name']); + $domain_mailhost_name = nullable_htmlentities($row['mailhost_name']); $domain_created_at = nullable_htmlentities($row['domain_created_at']); - if (empty($domain_registrar_name)) { - $domain_registrar_name = "-"; - } - - $sql_domain_webhost = mysqli_query($mysqli, "SELECT vendor_name FROM vendors WHERE vendor_id = $domain_webhost"); - $row = mysqli_fetch_array($sql_domain_webhost); - $domain_webhost_name = "-"; - if ($row) { - $domain_webhost_name = nullable_htmlentities($row['vendor_name']); - } + // Add - if empty on the table + $domain_registrar_name_display = $domain_registrar_name ? $domain_registrar_name : "-"; + $domain_webhost_name_display = $domain_webhost_name ? $domain_webhost_name : "-"; + $domain_dnshost_name_display = $domain_dnshost_name ? $domain_dnshost_name : "-"; + $domain_mailhost_name_display = $domain_mailhost_name ? $domain_mailhost_name : "-"; ?> @@ -131,8 +142,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- - + + + +
diff --git a/database_updates.php b/database_updates.php index 066342fb..8fa75e8f 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1867,10 +1867,17 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.6'"); } - // if (CURRENT_DATABASE_VERSION == '1.2.6') { - // // Insert queries here required to update to DB version 1.2.7 + if (CURRENT_DATABASE_VERSION == '1.2.6') { + + mysqli_query($mysqli, "ALTER TABLE `domains` ADD `domain_dnshost` INT(11) NOT NULL DEFAULT 0 AFTER `domain_webhost`"); + mysqli_query($mysqli, "ALTER TABLE `domains` ADD `domain_mailhost` INT(11) NOT NULL DEFAULT 0 AFTER `domain_dnshost`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.7'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.2.7') { + // // Insert queries here required to update to DB version 1.2.8 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.7"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.8"); // } } else { diff --git a/database_version.php b/database_version.php index 03840a87..a829277e 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.2.6"); +DEFINE("LATEST_DATABASE_VERSION", "1.2.7"); diff --git a/db.sql b/db.sql index e04c503e..7fca1ea6 100644 --- a/db.sql +++ b/db.sql @@ -504,6 +504,8 @@ CREATE TABLE `domains` ( `domain_accessed_at` datetime DEFAULT NULL, `domain_registrar` int(11) NOT NULL DEFAULT 0, `domain_webhost` int(11) NOT NULL DEFAULT 0, + `domain_dnshost` int(11) NOT NULL DEFAULT 0, + `domain_mailhost` int(11) NOT NULL DEFAULT 0, `domain_client_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`domain_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; @@ -1899,4 +1901,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-04-08 16:47:46 +-- Dump completed on 2024-04-10 13:20:42 diff --git a/js/domain_edit_modal.js b/js/domain_edit_modal.js index e8a0b4d0..a0206b33 100644 --- a/js/domain_edit_modal.js +++ b/js/domain_edit_modal.js @@ -70,6 +70,47 @@ function populateDomainEditModal(client_id, domain_id) { } }); + // DNS Host dropdown + var dnshostDropdown = document.getElementById("editDomainDNShostId"); + + // Clear registrar dropdown + var i, L = dnshostDropdown.options.length -1; + for(i = L; i >= 0; i--) { + dnshostDropdown.remove(i); + } + dnshostDropdown[dnshostDropdown.length] = new Option('- Vendor -', '0'); + + // Populate dropdown + vendors.forEach(vendor => { + if (parseInt(vendor.vendor_id) == parseInt(domain.domain_dnshost)) { + // Selected domain + dnshostDropdown[dnshostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true); + } + else{ + dnshostDropdown[dnshostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id); + } + }); + + // Mail Host dropdown + var mailhostDropdown = document.getElementById("editDomainMailhostId"); + + // Clear mailhost dropdown + var i, L = mailhostDropdown.options.length -1; + for(i = L; i >= 0; i--) { + mailhostDropdown.remove(i); + } + mailhostDropdown[mailhostDropdown.length] = new Option('- Vendor -', '0'); + + // Populate dropdown + vendors.forEach(vendor => { + if (parseInt(vendor.vendor_id) == parseInt(domain.domain_mailhost)) { + // Selected domain + mailhostDropdown[mailhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true); + } + else{ + mailhostDropdown[mailhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id); + } + }); } ); diff --git a/post/domain.php b/post/domain.php index 1fd4c99c..18a89698 100644 --- a/post/domain.php +++ b/post/domain.php @@ -12,7 +12,9 @@ if (isset($_POST['add_domain'])) { $name = preg_replace("(^https?://)", "", sanitizeInput($_POST['name'])); $description = sanitizeInput($_POST['description']); $registrar = intval($_POST['registrar']); + $dnshost = intval($_POST['dnshost']); $webhost = intval($_POST['webhost']); + $mailhost = intval($_POST['mailhost']); $extended_log_description = ''; $expire = sanitizeInput($_POST['expire']); $notes = sanitizeInput($_POST['notes']); @@ -39,7 +41,7 @@ if (isset($_POST['add_domain'])) { $whois = sanitizeInput($records['whois']); // Add domain record - mysqli_query($mysqli,"INSERT INTO domains SET domain_name = '$name', domain_description = '$description', domain_registrar = $registrar, domain_webhost = $webhost, domain_expire = $expire, domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois', domain_notes = '$notes', domain_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO domains SET domain_name = '$name', domain_description = '$description', domain_registrar = $registrar, domain_webhost = $webhost, domain_dnshost = $dnshost, domain_mailhost = $mailhost, domain_expire = $expire, domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois', domain_notes = '$notes', domain_client_id = $client_id"); // Get inserted ID (for linking certificate, if exists) $domain_id = mysqli_insert_id($mysqli); @@ -72,7 +74,9 @@ if (isset($_POST['edit_domain'])) { $name = preg_replace("(^https?://)", "", sanitizeInput($_POST['name'])); $description = sanitizeInput($_POST['description']); $registrar = intval($_POST['registrar']); + $dnshost = intval($_POST['dnshost']); $webhost = intval($_POST['webhost']); + $mailhost = intval($_POST['mailhost']); $expire = sanitizeInput($_POST['expire']); $notes = sanitizeInput($_POST['notes']); @@ -104,7 +108,7 @@ if (isset($_POST['edit_domain'])) { $txt = sanitizeInput($records['txt']); $whois = sanitizeInput($records['whois']); - mysqli_query($mysqli,"UPDATE domains SET domain_name = '$name', domain_description = '$description', domain_registrar = $registrar, domain_webhost = $webhost, domain_expire = $expire, domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois', domain_notes = '$notes' WHERE domain_id = $domain_id"); + mysqli_query($mysqli,"UPDATE domains SET domain_name = '$name', domain_description = '$description', domain_registrar = $registrar, domain_webhost = $webhost, domain_dnshost = $dnshost, domain_mailhost = $mailhost, domain_expire = $expire, domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois', domain_notes = '$notes' WHERE domain_id = $domain_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Domain', log_action = 'Modify', log_description = '$session_name modified domain $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $domain_id");