diff --git a/client_assets.php b/client_assets.php
index 4ecc5d68..522ede9d 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -283,6 +283,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
}
$asset_notes = nullable_htmlentities($row['asset_notes']);
$asset_created_at = nullable_htmlentities($row['asset_created_at']);
+ $asset_archived_at = nullable_htmlentities($row['asset_archived_at']);
$asset_vendor_id = intval($row['asset_vendor_id']);
$asset_location_id = intval($row['asset_location_id']);
$asset_contact_id = intval($row['asset_contact_id']);
@@ -427,9 +428,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
Copy
2) { ?>
+
+
+ Unarchive
+
+
Archive
+
Delete
diff --git a/client_contacts.php b/client_contacts.php
index a75d73f9..6546d0ba 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -202,6 +202,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$contact_billing = intval($row['contact_billing']);
$contact_technical = intval($row['contact_technical']);
$contact_created_at = nullable_htmlentities($row['contact_created_at']);
+ $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
if ($contact_primary == 1) {
$contact_primary_display = "Primary Contact";
} else {
@@ -312,14 +313,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
Edit
+
-
- Anonymize & Archive
+
+ Unarchive
+
Archive
+
+
+ Anonymize & Archive
+
+
+
diff --git a/post/asset.php b/post/asset.php
index acd7efd4..f8c25723 100644
--- a/post/asset.php
+++ b/post/asset.php
@@ -160,6 +160,29 @@ if (isset($_GET['archive_asset'])) {
}
+if (isset($_GET['unarchive_asset'])) {
+
+ validateTechRole();
+
+ $asset_id = intval($_GET['unarchive_asset']);
+
+ // Get Asset Name and Client ID for logging and alert message
+ $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id");
+ $row = mysqli_fetch_array($sql);
+ $asset_name = sanitizeInput($row['asset_name']);
+ $client_id = intval($row['asset_client_id']);
+
+ mysqli_query($mysqli,"UPDATE assets SET asset_archived_at = NULL WHERE asset_id = $asset_id");
+
+ //logging
+ mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Unarchive', log_description = '$session_name Unarchived asset $asset_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 = $asset_id");
+
+ $_SESSION['alert_message'] = "Asset $asset_name Unarchived";
+
+ header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
if (isset($_GET['delete_asset'])) {
validateAdminRole();
diff --git a/post/contact.php b/post/contact.php
index 32f65525..8131ebb9 100644
--- a/post/contact.php
+++ b/post/contact.php
@@ -453,6 +453,28 @@ if (isset($_GET['archive_contact'])) {
}
+if (isset($_GET['unarchive_contact'])) {
+
+ validateAdminRole();
+
+ $contact_id = intval($_GET['unarchive_contact']);
+
+ // Get Contact Name and Client ID for logging and alert message
+ $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id FROM contacts WHERE contact_id = $contact_id");
+ $row = mysqli_fetch_array($sql);
+ $contact_name = sanitizeInput($row['contact_name']);
+ $client_id = intval($row['contact_client_id']);
+
+ mysqli_query($mysqli,"UPDATE contacts SET contact_archived_at = NULL WHERE contact_id = $contact_id");
+
+ //logging
+ mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Contact', log_action = 'Unarchive', log_description = '$session_name unarchived contact $contact_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 = $contact_id");
+
+ $_SESSION['alert_message'] = "Contact $contact_name Unarchived";
+
+ header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
if (isset($_GET['delete_contact'])) {
validateAdminRole();