From 51248ed84144e7c38f475ab2b651dafe6df92634 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 3 Mar 2024 13:23:52 -0500 Subject: [PATCH] You can now view all login / passwords for an asset under asset lists and under asset details now --- client_asset_details.php | 10 ++-------- client_asset_edit_modal.php | 28 -------------------------- client_assets.php | 16 ++++++++++----- post/asset.php | 39 +------------------------------------ 4 files changed, 14 insertions(+), 79 deletions(-) diff --git a/client_asset_details.php b/client_asset_details.php index 07718006..29c43e4f 100644 --- a/client_asset_details.php +++ b/client_asset_details.php @@ -9,7 +9,6 @@ if (isset($_GET['asset_id'])) { $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id LEFT JOIN locations ON asset_location_id = location_id - LEFT JOIN logins ON login_asset_id = asset_id WHERE asset_id = $asset_id AND asset_client_id = $client_id "); @@ -62,10 +61,6 @@ if (isset($_GET['asset_id'])) { $location_name_display = $location_name; } - $login_id = intval($row['login_id']); - $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); - $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); - // Related Tickets Query $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN users on ticket_assigned_to = user_id @@ -93,9 +88,8 @@ if (isset($_GET['asset_id'])) { $file_count = mysqli_num_rows($sql_related_files); // Related Logins Query - $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM asset_logins - LEFT JOIN logins ON asset_logins.login_id = logins.login_id - WHERE asset_logins.asset_id = $asset_id + $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins + WHERE login_asset_id = $asset_id AND login_archived_at IS NULL ORDER BY login_name DESC" ); diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php index 45a07833..ca561aad 100644 --- a/client_asset_edit_modal.php +++ b/client_asset_edit_modal.php @@ -9,7 +9,6 @@
-
@@ -27,9 +26,6 @@
  • Purchase
    • -
  • - Login -
  • Notes
    • @@ -351,30 +347,6 @@
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    diff --git a/client_assets.php b/client_assets.php index 53a7b291..fb963d7e 100644 --- a/client_assets.php +++ b/client_assets.php @@ -272,9 +272,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $location_name_display = $location_name; } - $login_id = intval($row['login_id']); - $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); - $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); + $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_asset_id = $asset_id"); + $login_count = mysqli_num_rows($sql_logins); ?> @@ -290,12 +289,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); 0) { + if ($login_count > 0) { ?>