diff --git a/client_certificate_add_modal.php b/client_certificate_add_modal.php index 228f154a..99def7f7 100644 --- a/client_certificate_add_modal.php +++ b/client_certificate_add_modal.php @@ -64,6 +64,11 @@ +
+ + +
+
@@ -92,4 +97,4 @@
- \ No newline at end of file + diff --git a/client_certificate_edit_modal.php b/client_certificate_edit_modal.php index 31c5fd9c..13e55c14 100644 --- a/client_certificate_edit_modal.php +++ b/client_certificate_edit_modal.php @@ -2,7 +2,7 @@
-
Editing certificate:
+
Editing certificate:
@@ -28,7 +28,7 @@
 https://
- +
@@ -41,7 +41,7 @@
- +
@@ -51,7 +51,7 @@
- +
@@ -61,10 +61,15 @@
- + +
+ + +
+
@@ -75,7 +80,9 @@
+ +
@@ -83,4 +90,4 @@
- \ No newline at end of file + diff --git a/client_certificates.php b/client_certificates.php index 51adf31d..e3bdec79 100644 --- a/client_certificates.php +++ b/client_certificates.php @@ -78,7 +78,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
Name @@ -104,6 +104,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
diff --git a/client_domain_add_modal.php b/client_domain_add_modal.php index ab69e055..41caf7e4 100644 --- a/client_domain_add_modal.php +++ b/client_domain_add_modal.php @@ -73,7 +73,13 @@ +
+ + +
+ +
diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php index 4e6abd09..07e90b79 100644 --- a/client_domain_edit_modal.php +++ b/client_domain_edit_modal.php @@ -2,7 +2,7 @@
-
Editing domain:
+
Editing domain:
@@ -33,7 +33,7 @@
- +
@@ -43,7 +43,7 @@
-
@@ -54,7 +54,7 @@
- @@ -65,10 +65,15 @@
- + +
+ + +
+
@@ -89,7 +94,7 @@
- +
@@ -99,7 +104,7 @@
- + @@ -109,7 +114,7 @@
- + @@ -119,7 +124,7 @@
- + diff --git a/client_domains.php b/client_domains.php index c6a027cf..c86f16c4 100644 --- a/client_domains.php +++ b/client_domains.php @@ -52,88 +52,116 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+
- - "> - - - - - - - - - - + - $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']); - } - - ?> +
DomainRegistrarWeb HostExpiresAction
+ "> - - - - - + + + + + - + + - -
)" data-target="#editDomainModal"> -
- -
- )" data-target="#editDomainModal"> - Edit - - -
- - Archive - - - -
- - Delete - - -
+
+
+
DomainRegistrarWeb HostExpiresAction
+ while ($row = mysqli_fetch_array($sql)) { + $domain_id = intval($row['domain_id']); + $domain_name = nullable_htmlentities($row['domain_name']); + $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_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']); + } + + ?> + + +
+ + +
+ + )" data-target="#editDomainModal"> + + + + +
+ +
+ )" data-target="#editDomainModal"> + Edit + + +
+ + Archive + + + +
+ + Delete + + +
+
+ + + + + + + + +
+ ?> - -require_once "footer.php"; + + + +
-
- +
+
@@ -30,7 +30,7 @@
- +
@@ -40,14 +40,14 @@
- +
- +
@@ -61,6 +61,11 @@
+
+ + +
+
@@ -69,15 +74,15 @@
-
- +
+
@@ -31,7 +31,7 @@
- +
@@ -41,7 +41,7 @@
- +
@@ -62,6 +62,11 @@
+
+ + +
+
@@ -73,7 +78,7 @@
- +
diff --git a/client_networks.php b/client_networks.php index b15a7a6d..0b7f0cf7 100644 --- a/client_networks.php +++ b/client_networks.php @@ -24,132 +24,159 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
-

Networks

-
-
- - -
- - Export - +
+
+

Networks

+
+
+ + +
+ + Export + +
-
- -
-
-
- - -
-
-
- -
- +
+
+
+ + +
+ +
+
+ +
+ +
-
-
-
- -
-
- -
- -
-
- - "> - - - - - - - - - - - - - - - - - - - - - + + - + + +
+
-
-
NamevLANNetworkGatewayDHCP RangeLocationAction
- - )" - data-target="#editNetworkModal"> - - -
-
- )" data-target="#editNetworkModal"> - Edit - - -
- - Archive - -
- - Delete - - +
-
+
+ + + + "> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ 		NamevLANNetworkGatewayDHCP RangeLocationAction
+
+ + +
+ 		+ + )" + data-target="#editNetworkModal"> + + +
+ +
+ )" data-target="#editNetworkModal"> + Edit + + +
+ + Archive + +
+ + Delete + + +
+
+
+ +
+
+
-
-
- + + CURRENT_DATABASE_VERSION) { // // Then, update the database to the next sequential version mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.9'"); - } + } if (CURRENT_DATABASE_VERSION == '0.8.9') { @@ -1452,7 +1452,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Modify', log_description = 'Updated item_order to item_id: $item_order'"); } } - + // // Then, update the database to the next sequential version @@ -1495,7 +1495,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '0.9.4') { // Insert queries here required to update to DB version 0.9.5 - mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_stripe_client_pays_fees` TINYINT(1) NOT NULL DEFAULT 0 AFTER `config_stripe_account`"); + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_stripe_client_pays_fees` TINYINT(1) NOT NULL DEFAULT 0 AFTER `config_stripe_account`"); // Then, update the database to the next sequential version mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.5'"); } @@ -1524,14 +1524,22 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.8'"); } + if (CURRENT_DATABASE_VERSION == '0.9.8') { + //Insert queries here required to update to DB version 0.9.9 + mysqli_query($mysqli, "ALTER TABLE `domains` ADD `domain_notes` TEXT NULL DEFAULT NULL AFTER `domain_raw_whois`"); + + //Then, update the database to the next sequential version + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.9'"); + } + // Be sure to change database_version.php to reflect the version you are updating to here // Please add this same comment block to the bottom of this file, and update the version number. // Uncomment Below Lines, to add additional database updates // - // if (CURRENT_DATABASE_VERSION == '0.9.8') { - // // Insert queries here required to update to DB version 0.9.9 + // if (CURRENT_DATABASE_VERSION == '0.9.9') { + // // Insert queries here required to update to DB version 0.10.0 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.9'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.10.0'"); // } } else { diff --git a/database_version.php b/database_version.php index 55f0278b..0e02bd3d 100644 --- a/database_version.php +++ b/database_version.php @@ -5,5 +5,5 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "0.9.8"); +DEFINE("LATEST_DATABASE_VERSION", "0.9.9"); diff --git a/db.sql b/db.sql index b7590423..3f8f6da8 100644 --- a/db.sql +++ b/db.sql @@ -505,6 +505,7 @@ CREATE TABLE `domains` ( `domain_mail_servers` varchar(255) DEFAULT NULL, `domain_txt` text DEFAULT NULL, `domain_raw_whois` text DEFAULT NULL, + `domain_notes` text DEFAULT NULL, `domain_created_at` datetime NOT NULL DEFAULT current_timestamp(), `domain_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `domain_archived_at` datetime DEFAULT NULL, diff --git a/js/certificate_edit_modal.js b/js/certificate_edit_modal.js index 77e891cc..6ac93561 100644 --- a/js/certificate_edit_modal.js +++ b/js/certificate_edit_modal.js @@ -14,13 +14,14 @@ function populateCertificateEditModal(client_id, certificate_id) { const domains = response.domains; // Populate the cert modal fields - document.getElementById("editHeader").innerText = certificate.certificate_name; + document.getElementById("editCertificateHeader").innerText = certificate.certificate_name; document.getElementById("editCertificateId").value = certificate_id; document.getElementById("editCertificateName").value = certificate.certificate_name; - document.getElementById("editDomain").value = certificate.certificate_domain; - document.getElementById("editIssuedBy").value = certificate.certificate_issued_by; - document.getElementById("editExpire").value = certificate.certificate_expire; - document.getElementById("editPublicKey").value = certificate.certificate_public_key; + document.getElementById("editCertificateDomain").value = certificate.certificate_domain; + document.getElementById("editCertificateIssuedBy").value = certificate.certificate_issued_by; + document.getElementById("editCertificateExpire").value = certificate.certificate_expire; + document.getElementById("editCertificatePublicKey").value = certificate.certificate_public_key; + document.getElementById("editCertificateNotes").value = certificate.certificate_notes; // Select the domain dropdown var domainDropdown = document.getElementById("editDomainId"); diff --git a/js/domain_edit_modal.js b/js/domain_edit_modal.js index 41977a03..c045869c 100644 --- a/js/domain_edit_modal.js +++ b/js/domain_edit_modal.js @@ -14,20 +14,21 @@ function populateDomainEditModal(client_id, domain_id) { const vendors = response.vendors; // Populate the domain modal fields - document.getElementById("editHeader").innerText = domain.domain_name; + document.getElementById("editDomainHeader").innerText = domain.domain_name; document.getElementById("editDomainId").value = domain_id; document.getElementById("editDomainName").value = domain.domain_name; - document.getElementById("editExpire").value = domain.domain_expire; + document.getElementById("editDomainExpire").value = domain.domain_expire; + document.getElementById("editDomainNotes").value = domain.domain_notes; document.getElementById("editDomainIP").value = domain.domain_ip; - document.getElementById("editNameServers").value = domain.domain_name_servers; - document.getElementById("editMailServers").value = domain.domain_mail_servers; - document.getElementById("editTxtRecords").value = domain.domain_txt; - document.getElementById("editRawWhois").value = domain.domain_raw_whois; + document.getElementById("editDomainNameServers").value = domain.domain_name_servers; + document.getElementById("editDomainMailServers").value = domain.domain_mail_servers; + document.getElementById("editDomainTxtRecords").value = domain.domain_txt; + document.getElementById("editDomainRawWhois").value = domain.domain_raw_whois; /* DROPDOWNS */ // Registrar dropdown - var registrarDropdown = document.getElementById("editRegistrarId"); + var registrarDropdown = document.getElementById("editDomainRegistrarId"); // Clear registrar dropdown var i, L = registrarDropdown.options.length -1; @@ -48,7 +49,7 @@ function populateDomainEditModal(client_id, domain_id) { }); // Webhost dropdown - var webhostDropdown = document.getElementById("editWebhostId"); + var webhostDropdown = document.getElementById("editDomainWebhostId"); // Clear registrar dropdown var i, L = webhostDropdown.options.length -1; diff --git a/js/multi_actions.js b/js/multi_actions.js index 51c73de3..db45e613 100644 --- a/js/multi_actions.js +++ b/js/multi_actions.js @@ -1,6 +1,10 @@ -var checkboxes = document.querySelectorAll('form input[type="checkbox"]'); +// Allow selecting and editing multiple records at once + +var form = document.getElementById("multi_actions"); // Get the form element by its id +var checkboxes = form.querySelectorAll('input[type="checkbox"]'); var selectedCount = document.getElementById("selectedCount"); + for (var i = 0; i < checkboxes.length; i++) { checkboxes[i].addEventListener("click", updateSelectedCount); } @@ -9,7 +13,9 @@ function updateSelectedCount() { var count = 0; for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { - count++; + if (checkboxes[i] !== document.getElementById("selectAllCheckbox") && checkboxes[i].checked) { + count++; + } } } selectedCount.textContent = count; diff --git a/js/network_edit_modal.js b/js/network_edit_modal.js new file mode 100644 index 00000000..f3716fb6 --- /dev/null +++ b/js/network_edit_modal.js @@ -0,0 +1,47 @@ +function populateNetworkEditModal(client_id, network_id) { + + // Send a GET request to post.php as post.php?network_get_json_details=true&client_id=NUM&network_id=NUM + jQuery.get( + "ajax.php", + {network_get_json_details: 'true', client_id: client_id, network_id: network_id}, + function(data) { + + // If we get a response from post.php, parse it as JSON + const response = JSON.parse(data); + + // Access the network (only one!) and locations (possibly multiple) + const network = response.network[0]; + const locations = response.locations; + + // Populate the network modal fields + document.getElementById("editNetworkHeader").innerText = network.network_name; + document.getElementById("editNetworkId").value = network_id; + document.getElementById("editNetworkName").value = network.network_name; + document.getElementById("editNetworkVlan").value = network.network_vlan; + document.getElementById("editNetworkCidr").value = network.network; + document.getElementById("editNetworkGw").value = network.network_gateway; + document.getElementById("editNetworkDhcp").value = network.network_dhcp_range; + document.getElementById("editNetworkNotes").value = network.network_notes; + + // Select the location dropdown + var locationDropdown = document.getElementById("editNetworkLocation"); + + // Clear location dropdown + var i, L = locationDropdown.options.length -1; + for(i = L; i >= 0; i--) { + locationDropdown.remove(i); + } + locationDropdown[locationDropdown.length] = new Option('- Location -', '0'); + + // Populate location dropdown + locations.forEach(location => { + if (parseInt(location.location_id) == parseInt(network.network_location_id)) { + locationDropdown[locationDropdown.length] = new Option(location.location_name, location.location_id, true, true); + } + else{ + locationDropdown[locationDropdown.length] = new Option(location.location_name, location.location_id); + } + }); + } + ); +} diff --git a/post/certificate.php b/post/certificate.php index 8efdbcc1..ec933db0 100644 --- a/post/certificate.php +++ b/post/certificate.php @@ -14,6 +14,7 @@ if (isset($_POST['add_certificate'])) { $issued_by = sanitizeInput($_POST['issued_by']); $expire = sanitizeInput($_POST['expire']); $public_key = sanitizeInput($_POST['public_key']); + $notes = sanitizeInput($_POST['notes']); $domain_id = intval($_POST['domain_id']); // Parse public key data for a manually provided public key @@ -32,7 +33,7 @@ if (isset($_POST['add_certificate'])) { $expire = "'" . $expire . "'"; } - mysqli_query($mysqli,"INSERT INTO certificates SET certificate_name = '$name', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = $expire, certificate_public_key = '$public_key', certificate_domain_id = $domain_id, certificate_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO certificates SET certificate_name = '$name', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = $expire, certificate_public_key = '$public_key', certificate_notes = '$notes', certificate_domain_id = $domain_id, certificate_client_id = $client_id"); $certificate_id = mysqli_insert_id($mysqli); @@ -55,6 +56,7 @@ if (isset($_POST['edit_certificate'])) { $issued_by = sanitizeInput($_POST['issued_by']); $expire = sanitizeInput($_POST['expire']); $public_key = sanitizeInput($_POST['public_key']); + $notes = sanitizeInput($_POST['notes']); $domain_id = intval($_POST['domain_id']); $client_id = intval($_POST['client_id']); @@ -74,7 +76,7 @@ if (isset($_POST['edit_certificate'])) { $expire = "'" . $expire . "'"; } - mysqli_query($mysqli,"UPDATE certificates SET certificate_name = '$name', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = $expire, certificate_public_key = '$public_key', certificate_domain_id = '$domain_id' WHERE certificate_id = $certificate_id"); + mysqli_query($mysqli,"UPDATE certificates SET certificate_name = '$name', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = $expire, certificate_public_key = '$public_key', certificate_notes = '$notes', certificate_domain_id = '$domain_id' WHERE certificate_id = $certificate_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Certificate', log_action = 'Modify', log_description = '$session_name modified certificate $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 = $certificate_id"); @@ -138,22 +140,23 @@ if (isset($_POST['bulk_delete_certificates'])) { validateCSRFToken($_POST['csrf_token']); $count = 0; // Default 0 - $certificate_ids = $_POST['certificate_ids']; // Get array of scheduled tickets IDs to be deleted + $certificate_ids = $_POST['certificate_ids']; // Get array of cert IDs to be deleted + $client_id = intval($_POST['client_id']); if (!empty($certificate_ids)) { - // Cycle through array and delete each scheduled ticket + // Cycle through array and delete each certificate foreach ($certificate_ids as $certificate_id) { $certificate_id = intval($certificate_id); - mysqli_query($mysqli, "DELETE FROM certificates WHERE certificate_id = $certificate_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Certificate', log_action = 'Delete', log_description = '$session_name deleted certificate (bulk)', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $certificate_id"); + mysqli_query($mysqli, "DELETE FROM certificates WHERE certificate_id = $certificate_id AND certificate_client_id = $client_id"); + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Certificate', log_action = 'Delete', log_description = '$session_name deleted a certificate (bulk)', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $certificate_id"); $count++; } // Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Certificate', log_action = 'Delete', log_description = '$session_name bulk deleted $count certificates', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Certificate', log_action = 'Delete', log_description = '$session_name bulk deleted $count certificates', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); $_SESSION['alert_message'] = "Deleted $count certificate(s)"; diff --git a/post/domain.php b/post/domain.php index 6fcd249a..8646f184 100644 --- a/post/domain.php +++ b/post/domain.php @@ -14,6 +14,8 @@ if (isset($_POST['add_domain'])) { $webhost = intval($_POST['webhost']); $extended_log_description = ''; $expire = sanitizeInput($_POST['expire']); + $notes = sanitizeInput($_POST['notes']); + if (empty($expire)) { $expire = "NULL"; } else { @@ -35,7 +37,7 @@ if (isset($_POST['add_domain'])) { $whois = sanitizeInput($records['whois']); // Add domain record - mysqli_query($mysqli,"INSERT INTO domains SET domain_name = '$name', 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_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO domains SET domain_name = '$name', 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"); // Get inserted ID (for linking certificate, if exists) @@ -70,6 +72,7 @@ if (isset($_POST['edit_domain'])) { $registrar = intval($_POST['registrar']); $webhost = intval($_POST['webhost']); $expire = sanitizeInput($_POST['expire']); + $notes = sanitizeInput($_POST['notes']); if (empty($expire) || (new DateTime($expire)) < (new DateTime())) { // Update domain expiry date @@ -86,7 +89,7 @@ if (isset($_POST['edit_domain'])) { $txt = sanitizeInput($records['txt']); $whois = sanitizeInput($records['whois']); - mysqli_query($mysqli,"UPDATE domains SET domain_name = '$name', 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' WHERE domain_id = $domain_id"); + mysqli_query($mysqli,"UPDATE domains SET domain_name = '$name', 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"); //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"); @@ -121,6 +124,36 @@ if (isset($_GET['delete_domain'])) { } +if (isset($_POST['bulk_delete_domains'])) { + validateAdminRole(); + validateCSRFToken($_POST['csrf_token']); + + $count = 0; // Default 0 + $domain_ids = $_POST['domain_ids']; // Get array of domain IDs to be deleted + $client_id = intval($_POST['client_id']); + + if (!empty($domain_ids)) { + + // Cycle through array and delete each domain + foreach ($domain_ids as $domain_id) { + + $domain_id = intval($domain_id); + mysqli_query($mysqli, "DELETE FROM domains WHERE domain_id = $domain_id AND domain_client_id = $client_id"); + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Domain', log_action = 'Delete', log_description = '$session_name deleted a domain (bulk)', 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"); + + $count++; + } + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Domain', log_action = 'Delete', log_description = '$session_name bulk deleted $count domains', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); + + $_SESSION['alert_message'] = "Deleted $count certificate(s)"; + + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_POST['export_client_domains_csv'])) { validateTechRole(); diff --git a/post/network.php b/post/network.php index 80729a09..ca1e35ba 100644 --- a/post/network.php +++ b/post/network.php @@ -14,9 +14,10 @@ if (isset($_POST['add_network'])) { $network = sanitizeInput($_POST['network']); $gateway = sanitizeInput($_POST['gateway']); $dhcp_range = sanitizeInput($_POST['dhcp_range']); + $notes = sanitizeInput($_POST['notes']); $location_id = intval($_POST['location']); - mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_location_id = $location_id, network_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id, network_client_id = $client_id"); $network_id = mysqli_insert_id($mysqli); @@ -39,10 +40,11 @@ if (isset($_POST['edit_network'])) { $network = sanitizeInput($_POST['network']); $gateway = sanitizeInput($_POST['gateway']); $dhcp_range = sanitizeInput($_POST['dhcp_range']); + $notes = sanitizeInput($_POST['notes']); $location_id = intval($_POST['location']); $client_id = intval($_POST['client_id']); - mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_location_id = $location_id WHERE network_id = $network_id"); + mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id WHERE network_id = $network_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Network', log_action = 'Modify', log_description = '$session_name modified network $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 = $network_id"); @@ -100,6 +102,36 @@ if (isset($_GET['delete_network'])) { } +if (isset($_POST['bulk_delete_networks'])) { + validateAdminRole(); + validateCSRFToken($_POST['csrf_token']); + + $count = 0; // Default 0 + $network_ids = $_POST['network_ids']; // Get array of network IDs to be deleted + $client_id = intval($_POST['client_id']); + + if (!empty($network_ids)) { + + // Cycle through array and delete each network + foreach ($network_ids as $network_id) { + + $network_id = intval($network_id); + mysqli_query($mysqli, "DELETE FROM networks WHERE network_id = $network_id AND network_client_id = $client_id"); + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Network', log_action = 'Delete', log_description = '$session_name deleted a network (bulk)', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $network_id"); + + $count++; + } + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Certificate', log_action = 'Network', log_description = '$session_name bulk deleted $count networks', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); + + $_SESSION['alert_message'] = "Deleted $count network(s)"; + + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_POST['export_client_networks_csv'])) { validateTechRole(); diff --git a/scheduled_tickets.php b/scheduled_tickets.php index dbd496fc..4e1753cc 100644 --- a/scheduled_tickets.php +++ b/scheduled_tickets.php @@ -55,13 +55,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Selected (0)
-
- +
@@ -79,7 +79,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
Client