diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php index bd42286b..16c267a3 100644 --- a/client_asset_edit_modal.php +++ b/client_asset_edit_modal.php @@ -131,12 +131,18 @@ '$asset_created_at' OR location_archived_at IS NULL) AND location_client_id = $client_id ORDER BY location_archived_at ASC, location_name ASC"); while ($row = mysqli_fetch_array($sql_locations)) { $location_id_select = intval($row['location_id']); $location_name_select = nullable_htmlentities($row['location_name']); + $location_archived_at = nullable_htmlentities($row['location_archived_at']); + if (empty($location_archived_at)) { + $location_archived_display = ""; + } else { + $location_archived_display = "Archived - "; + } ?> - + @@ -153,13 +159,19 @@ '$asset_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_name ASC"); + $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE (contact_archived_at > '$asset_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_archived_at ASC, contact_name ASC"); while ($row = mysqli_fetch_array($sql_contacts)) { $contact_id_select = intval($row['contact_id']); $contact_name_select = nullable_htmlentities($row['contact_name']); + $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); + if (empty($contact_archived_at)) { + $contact_archived_display = ""; + } else { + $contact_archived_display = "Archived - "; + } ?> @@ -191,14 +203,20 @@ '$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_name ASC"); + $sql_networks = mysqli_query($mysqli, "SELECT * FROM networks WHERE (network_archived_at > '$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_archived_at ASC, network_name ASC"); while ($row = mysqli_fetch_array($sql_networks)) { $network_id_select = intval($row['network_id']); $network_name_select = nullable_htmlentities($row['network_name']); $network_select = nullable_htmlentities($row['network']); + $network_archived_at = nullable_htmlentities($row['network_archived_at']); + if (empty($network_archived_at)) { + $network_archived_display = ""; + } else { + $network_archived_display = "Archived - "; + } ?> - + @@ -239,12 +257,18 @@ '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id ORDER BY vendor_name ASC"); + $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE (vendor_archived_at > '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id ORDER BY vendor_archived_at ASC, vendor_name ASC"); while ($row = mysqli_fetch_array($sql_vendors)) { $vendor_id_select = intval($row['vendor_id']); $vendor_name_select = nullable_htmlentities($row['vendor_name']); + $vendor_archived_at = nullable_htmlentities($row['vendor_archived_at']); + if (empty($vendor_archived_at)) { + $vendor_archived_display = ""; + } else { + $vendor_archived_display = "Archived - "; + } ?> - + diff --git a/client_assets.php b/client_assets.php index dcdec50c..ec69ac82 100644 --- a/client_assets.php +++ b/client_assets.php @@ -214,11 +214,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); if (empty($contact_name)) { $contact_name = "-"; } + $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); + if (empty($contact_archived_at)) { + $contact_archived_display = ""; + } else { + $contact_archived_display = "Archived - "; + } $location_name = nullable_htmlentities($row['location_name']); if (empty($location_name)) { $location_name = "-"; } + $location_archived_at = nullable_htmlentities($row['location_archived_at']); + if (empty($location_archived_at)) { + $location_archived_display = ""; + } else { + $location_archived_display = "Archived - "; + } $login_id = intval($row['login_id']); $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); @@ -303,9 +315,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + - +
diff --git a/client_certificate_add_modal.php b/client_certificate_add_modal.php index 01261bd4..228f154a 100644 --- a/client_certificate_add_modal.php +++ b/client_certificate_add_modal.php @@ -73,7 +73,7 @@ diff --git a/client_networks.php b/client_networks.php index 492f0a55..da2f0da7 100644 --- a/client_networks.php +++ b/client_networks.php @@ -14,6 +14,7 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM networks LEFT JOIN locations ON location_id = network_location_id WHERE network_client_id = $client_id + AND network_archived_at IS NULL AND (network_name LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -116,6 +117,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Edit +
+ + Archive +
Delete diff --git a/client_software.php b/client_software.php index d67db4c4..ed45aead 100644 --- a/client_software.php +++ b/client_software.php @@ -15,6 +15,7 @@ $sql = mysqli_query( LEFT JOIN logins ON login_software_id = software_id WHERE software_client_id = $client_id AND software_template = 0 + AND software_archived_at IS NULL AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to"); @@ -86,6 +87,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $software_purchase = nullable_htmlentities($row['software_purchase']); $software_expire = nullable_htmlentities($row['software_expire']); $software_notes = nullable_htmlentities($row['software_notes']); + $software_created_at = nullable_htmlentities($row['software_created_at']); // Get Login $login_id = intval($row['login_id']); diff --git a/client_software_add_modal.php b/client_software_add_modal.php index c6512ce7..8dab4f9b 100644 --- a/client_software_add_modal.php +++ b/client_software_add_modal.php @@ -136,7 +136,7 @@