diff --git a/agent/assets.php b/agent/assets.php index 80bfcdb4..bdc23b8f 100644 --- a/agent/assets.php +++ b/agent/assets.php @@ -90,6 +90,21 @@ if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { $tag_query = ''; } +// Expiring In Filter +if (isset($_GET['expire_days']) && !empty($_GET['expire_days'])) { + if ($_GET['expire_days'] == "expired") { + $expire_days = "expired"; + $expire_query = "AND (asset_warranty_expire IS NOT NULL AND asset_warranty_expire != '0000-00-00' AND asset_warranty_expire < CURDATE())"; + } else { + $expire_days = intval($_GET['expire_days']); + $expire_query = "AND (asset_warranty_expire IS NOT NULL AND asset_warranty_expire != '0000-00-00' AND asset_warranty_expire BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL $expire_days DAY))"; + } +} else { + // Default - any + $expire_days = ''; + $expire_query = ''; +} + //Get Asset Counts $row = mysqli_fetch_assoc(mysqli_query($mysqli, " SELECT @@ -148,6 +163,7 @@ $sql = mysqli_query( AND ($type_query) $access_permission_query $location_query + $expire_query $client_query GROUP BY asset_id ORDER BY $sort $order LIMIT $record_from, $record_to" @@ -226,7 +242,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
s">
@@ -313,6 +329,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+
+ +
+
-
+
"> diff --git a/agent/certificates.php b/agent/certificates.php index 30151818..f5f02e38 100644 --- a/agent/certificates.php +++ b/agent/certificates.php @@ -34,6 +34,21 @@ if (isset($_GET['client_id'])) { // Perms enforceUserPermission('module_support'); +// Expiring In Filter +if (isset($_GET['expire_days']) && !empty($_GET['expire_days'])) { + if ($_GET['expire_days'] == "expired") { + $expire_days = "expired"; + $expire_query = "AND (certificate_expire IS NOT NULL AND certificate_expire != '0000-00-00' AND certificate_expire < CURDATE())"; + } else { + $expire_days = intval($_GET['expire_days']); + $expire_query = "AND (certificate_expire IS NOT NULL AND certificate_expire != '0000-00-00' AND certificate_expire BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL $expire_days DAY))"; + } +} else { + // Default - any + $expire_days = ''; + $expire_query = ''; +} + if (!$client_url) { // Client Filter if (isset($_GET['client']) & !empty($_GET['client'])) { @@ -52,6 +67,7 @@ $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM certificates AND (certificate_name LIKE '%$q%' OR certificate_domain LIKE '%$q%' OR certificate_description LIKE '%$q%' OR certificate_issued_by LIKE '%$q%' OR client_name LIKE '%$q%') $access_permission_query $client_query + $expire_query ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -94,9 +110,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- -
- +
+ + + + + + + + +
+
+ + +
+ + +
"> diff --git a/agent/dashboard.php b/agent/dashboard.php index 5dae174f..c020f993 100644 --- a/agent/dashboard.php +++ b/agent/dashboard.php @@ -666,7 +666,7 @@ if ($user_config_dashboard_technical_enable == 1) {
- +

Expiring Domains 30 Day

@@ -679,7 +679,7 @@ if ($user_config_dashboard_technical_enable == 1) {
- +

Expiring Certificates30 Day

@@ -692,7 +692,7 @@ if ($user_config_dashboard_technical_enable == 1) {
- +

Expiring Licenses30 Day

@@ -705,7 +705,7 @@ if ($user_config_dashboard_technical_enable == 1) {
- +

Expiring Asset Warranties30 Day

diff --git a/agent/domains.php b/agent/domains.php index 7ae71d1d..0a760f79 100644 --- a/agent/domains.php +++ b/agent/domains.php @@ -34,6 +34,21 @@ if (isset($_GET['client_id'])) { // Perms enforceUserPermission('module_support'); +// Expiring In Filter +if (isset($_GET['expire_days']) && !empty($_GET['expire_days'])) { + if ($_GET['expire_days'] == "expired") { + $expire_days = "expired"; + $expire_query = "AND (domain_expire IS NOT NULL AND domain_expire != '0000-00-00' AND domain_expire < CURDATE())"; + } else { + $expire_days = intval($_GET['expire_days']); + $expire_query = "AND (domain_expire IS NOT NULL AND domain_expire != '0000-00-00' AND domain_expire BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL $expire_days DAY))"; + } +} else { + // Default - any + $expire_days = ''; + $expire_query = ''; +} + if (!$client_url) { // Client Filter if (isset($_GET['client']) & !empty($_GET['client'])) { @@ -65,6 +80,7 @@ $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS domains.*, clients.*, AND $archive_query $access_permission_query $client_query + $expire_query ORDER BY $sort $order LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -106,9 +122,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- -
- +
+ + + + + + + + +
+
+ + +
+ + +
"> diff --git a/agent/software.php b/agent/software.php index b46793e8..f34e6e35 100644 --- a/agent/software.php +++ b/agent/software.php @@ -34,6 +34,21 @@ if (isset($_GET['client_id'])) { // Perms enforceUserPermission('module_support'); +// Expiring In Filter +if (isset($_GET['expire_days']) && !empty($_GET['expire_days'])) { + if ($_GET['expire_days'] == "expired") { + $expire_days = "expired"; + $expire_query = "AND (software_expire IS NOT NULL AND software_expire != '0000-00-00' AND software_expire < CURDATE())"; + } else { + $expire_days = intval($_GET['expire_days']); + $expire_query = "AND (software_expire IS NOT NULL AND software_expire != '0000-00-00' AND software_expire BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL $expire_days DAY))"; + } +} else { + // Default - any + $expire_days = ''; + $expire_query = ''; +} + if (!$client_url) { // Client Filter if (isset($_GET['client']) & !empty($_GET['client'])) { @@ -55,6 +70,7 @@ $sql = mysqli_query( AND $archive_query $access_permission_query $client_query + $expire_query ORDER BY $sort $order LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -103,9 +119,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- -
- +
+ + + + + + + + +
+
+ + +
+ + +
">