From eabfef22be32175db787b96d3076845dc0fa63cc Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 14 Mar 2025 12:31:18 -0400 Subject: [PATCH] Turned caching back on for Ajax Modals Function Fix some PHP Error, update credential vars in assets and contacts --- ajax/ajax_asset_details.php | 9 +++++--- ajax/ajax_contact_details.php | 2 +- asset_details.php | 5 +++-- contact_details.php | 2 +- js/ajax_modal.js | 1 - post/user/asset.php | 40 +++++++++++++++++------------------ post/user/contact.php | 40 +++++++++++++++++------------------ software.php | 1 + 8 files changed, 52 insertions(+), 48 deletions(-) diff --git a/ajax/ajax_asset_details.php b/ajax/ajax_asset_details.php index c6125f65..3da03bf9 100644 --- a/ajax/ajax_asset_details.php +++ b/ajax/ajax_asset_details.php @@ -50,6 +50,7 @@ $device_icon = getAssetIcon($asset_type); $contact_name = nullable_htmlentities($row['contact_name']); $contact_email = nullable_htmlentities($row['contact_email']); $contact_phone = nullable_htmlentities($row['contact_phone']); +$contact_extension = nullable_htmlentities($row['contact_extension']); $contact_mobile = nullable_htmlentities($row['contact_mobile']); $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); if ($contact_archived_at) { @@ -155,8 +156,9 @@ $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_ $recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets); // Related Documents -$sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents +$sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents LEFT JOIN documents ON asset_documents.document_id = documents.document_id + LEFT JOIN users ON user_id = document_created_by WHERE asset_documents.asset_id = $asset_id AND document_archived_at IS NULL ORDER BY document_name DESC" @@ -553,12 +555,13 @@ ob_start(); $ticket_number = intval($row['ticket_number']); $ticket_subject = nullable_htmlentities($row['ticket_subject']); $ticket_priority = nullable_htmlentities($row['ticket_priority']); + $ticket_status_id = intval($row['ticket_status_id']); $ticket_status_name = nullable_htmlentities($row['ticket_status_name']); $ticket_status_color = nullable_htmlentities($row['ticket_status_color']); $ticket_created_at = nullable_htmlentities($row['ticket_created_at']); $ticket_updated_at = nullable_htmlentities($row['ticket_updated_at']); if (empty($ticket_updated_at)) { - if ($ticket_status == "Closed") { + if ($ticket_status_name == "Closed") { $ticket_updated_at_display = "

Never

"; } else { $ticket_updated_at_display = "

Never

"; @@ -579,7 +582,7 @@ ob_start(); } $ticket_assigned_to = intval($row['ticket_assigned_to']); if (empty($ticket_assigned_to)) { - if ($ticket_status == 5) { + if ($ticket_status_id == 5) { $ticket_assigned_to_display = "

Not Assigned

"; } else { $ticket_assigned_to_display = "

Not Assigned

"; diff --git a/ajax/ajax_contact_details.php b/ajax/ajax_contact_details.php index 8b503352..0c64cf07 100644 --- a/ajax/ajax_contact_details.php +++ b/ajax/ajax_contact_details.php @@ -414,7 +414,7 @@ ob_start(); Never

"; } else { $ticket_updated_at_display = "

Never

"; @@ -1033,7 +1034,7 @@ if (isset($_GET['asset_id'])) { } $ticket_assigned_to = intval($row['ticket_assigned_to']); if (empty($ticket_assigned_to)) { - if ($ticket_status == 5) { + if ($ticket_status_id == 5) { $ticket_assigned_to_display = "

Not Assigned

"; } else { $ticket_assigned_to_display = "

Not Assigned

"; diff --git a/contact_details.php b/contact_details.php index cc8bd9ea..e320c4da 100644 --- a/contact_details.php +++ b/contact_details.php @@ -468,7 +468,7 @@ if (isset($_GET['contact_id'])) { $asset_name linked with credential $login_name"; + $_SESSION['alert_message'] = "Asset $asset_name linked with credential $crdential_name"; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -622,26 +622,26 @@ if (isset($_GET['unlink_credential_from_asset'])) { enforceUserPermission('module_support', 2); $asset_id = intval($_GET['asset_id']); - $login_id = intval($_GET['login_id']); + $credential_id = intval($_GET['credential_id']); - // Get login Name and Client ID for logging - $sql_login = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); - $row = mysqli_fetch_array($sql_login); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + // Get credential Name and Client ID for logging + $sql_credential = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); + $row = mysqli_fetch_array($sql_credential); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); // Get Asset Name for logging $sql_asset = mysqli_query($mysqli,"SELECT asset_name FROM assets WHERE asset_id = $asset_id"); $row = mysqli_fetch_array($sql_asset); $asset_name = sanitizeInput($row['asset_name']); - mysqli_query($mysqli,"UPDATE logins SET login_asset_id = 0 WHERE login_id = $login_id"); + mysqli_query($mysqli,"UPDATE credentials SET credential_asset_id = 0 WHERE credential_id = $credential_id"); //Logging - logAction("Credential", "Unlink", "$session_name unlinked asset $asset_name from credential $login_name", $client_id, $login_id); + logAction("Credential", "Unlink", "$session_name unlinked asset $asset_name from credential $credential_name", $client_id, $credential_id); $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Credential $login_name unlinked from Asset $asset_name"; + $_SESSION['alert_message'] = "Credential $credential_name unlinked from Asset $asset_name"; header("Location: " . $_SERVER["HTTP_REFERER"]); diff --git a/post/user/contact.php b/post/user/contact.php index de63f95d..c1d60573 100644 --- a/post/user/contact.php +++ b/post/user/contact.php @@ -709,7 +709,7 @@ if (isset($_POST['bulk_delete_contacts'])) { mysqli_query($mysqli, "DELETE FROM contact_assets WHERE contact_id = $contact_id"); mysqli_query($mysqli, "DELETE FROM contact_documents WHERE contact_id = $contact_id"); mysqli_query($mysqli, "DELETE FROM contact_files WHERE contact_id = $contact_id"); - mysqli_query($mysqli, "DELETE FROM contact_logins WHERE contact_id = $contact_id"); + mysqli_query($mysqli, "DELETE FROM contact_credentials WHERE contact_id = $contact_id"); mysqli_query($mysqli, "DELETE FROM contact_notes WHERE contact_note_contact_id = $contact_id"); // Individual Logging @@ -914,7 +914,7 @@ if (isset($_GET['delete_contact'])) { mysqli_query($mysqli, "DELETE FROM contact_assets WHERE contact_id = $contact_id"); mysqli_query($mysqli, "DELETE FROM contact_documents WHERE contact_id = $contact_id"); mysqli_query($mysqli, "DELETE FROM contact_files WHERE contact_id = $contact_id"); - mysqli_query($mysqli, "DELETE FROM contact_logins WHERE contact_id = $contact_id"); + mysqli_query($mysqli, "DELETE FROM contact_credentials WHERE contact_id = $contact_id"); mysqli_query($mysqli, "DELETE FROM contact_notes WHERE contact_note_contact_id = $contact_id"); //Logging @@ -1049,26 +1049,26 @@ if (isset($_POST['link_contact_to_credential'])) { enforceUserPermission('module_support', 2); - $login_id = intval($_POST['login_id']); + $credential_id = intval($_POST['credential_id']); $contact_id = intval($_POST['contact_id']); - // Get login Name and Client ID for logging - $sql_login = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); - $row = mysqli_fetch_array($sql_login); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + // Get credential Name and Client ID for logging + $sql_credential = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); + $row = mysqli_fetch_array($sql_credential); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); // Get Contact Name for logging $sql_contact = mysqli_query($mysqli,"SELECT contact_name FROM contacts WHERE contact_id = $contact_id"); $row = mysqli_fetch_array($sql_contact); $contact_name = sanitizeInput($row['contact_name']); - mysqli_query($mysqli,"UPDATE logins SET login_contact_id = $contact_id WHERE login_id = $login_id"); + mysqli_query($mysqli,"UPDATE credentials SET credential_contact_id = $contact_id WHERE credential_id = $credential_id"); // Logging - logAction("Asset", "Link", "$session_name linked credential $login_name to contact $contact_name", $client_id, $login_id); + logAction("Asset", "Link", "$session_name linked credential $credential_name to contact $contact_name", $client_id, $credential_id); - $_SESSION['alert_message'] = "Contact $contact_name linked with credential $login_name"; + $_SESSION['alert_message'] = "Contact $contact_name linked with credential $credential_name"; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -1079,26 +1079,26 @@ if (isset($_GET['unlink_credential_from_contact'])) { enforceUserPermission('module_support', 2); $contact_id = intval($_GET['contact_id']); - $login_id = intval($_GET['login_id']); + $credential_id = intval($_GET['credential_id']); - // Get login Name and Client ID for logging - $sql_login = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); - $row = mysqli_fetch_array($sql_login); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + // Get credential Name and Client ID for logging + $sql_credential = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); + $row = mysqli_fetch_array($sql_credential); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); // Get Contact Name for logging $sql_contact = mysqli_query($mysqli,"SELECT contact_name FROM contacts WHERE contact_id = $contact_id"); $row = mysqli_fetch_array($sql_contact); $contact_name = sanitizeInput($row['contact_name']); - mysqli_query($mysqli,"UPDATE logins SET login_contact_id = 0 WHERE login_id = $login_id"); + mysqli_query($mysqli,"UPDATE credentials SET credential_contact_id = 0 WHERE credential_id = $credential_id"); //Logging - logAction("Credential", "Unlink", "$session_name unlinked contact $contact_name from credential $login_name", $client_id, $login_id); + logAction("Credential", "Unlink", "$session_name unlinked contact $contact_name from credential $credential_name", $client_id, $credential_id); $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Credential $login_name unlinked from Contact $contact_name"; + $_SESSION['alert_message'] = "Credential $credential_name unlinked from Contact $contact_name"; header("Location: " . $_SERVER["HTTP_REFERER"]); diff --git a/software.php b/software.php index 5afd3355..8e3f63b2 100644 --- a/software.php +++ b/software.php @@ -175,6 +175,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } else { $software_expire_display = "N/A"; + $tr_class = ''; } $software_created_at = nullable_htmlentities($row['software_created_at']);