diff --git a/ajax/ajax_certificate_edit.php b/ajax/ajax_certificate_edit.php index 2c7ec75d..157675ec 100644 --- a/ajax/ajax_certificate_edit.php +++ b/ajax/ajax_certificate_edit.php @@ -12,6 +12,7 @@ $certificate_description = nullable_htmlentities($row['certificate_description'] $certificate_domain = nullable_htmlentities($row['certificate_domain']); $certificate_domain_id = intval($row['certificate_domain_id']); $certificate_issued_by = nullable_htmlentities($row['certificate_issued_by']); +$certificate_public_key = nullable_htmlentities($row['certificate_public_key']); $certificate_expire = nullable_htmlentities($row['certificate_expire']); $certificate_created_at = nullable_htmlentities($row['certificate_created_at']); $client_id = intval($row['certificate_client_id']); diff --git a/ajax/ajax_contact_details.php b/ajax/ajax_contact_details.php index e081abb3..07d9df15 100644 --- a/ajax/ajax_contact_details.php +++ b/ajax/ajax_contact_details.php @@ -402,7 +402,7 @@ ob_start(); -
+
@@ -499,7 +499,7 @@ ob_start(); -
+
diff --git a/asset_details.php b/asset_details.php index ad7f816b..f0ddb509 100644 --- a/asset_details.php +++ b/asset_details.php @@ -460,6 +460,7 @@ if (isset($_GET['asset_id'])) { // Show either "-" or "AssetName - Port" if ($connected_asset_name) { $connected_to_display = " diff --git a/client_overview.php b/client_overview.php index e90f8c6c..17feeda9 100644 --- a/client_overview.php +++ b/client_overview.php @@ -2,8 +2,6 @@ require_once "includes/inc_all_client.php"; -// Get expiration days from select box -$expiration_days = isset($_GET['expiration_days']) ? intval($_GET['expiration_days']) : 90; $sql_recent_activities = mysqli_query( $mysqli, @@ -61,7 +59,7 @@ $sql_stale_tickets = mysqli_query( $mysqli, "SELECT * FROM tickets WHERE ticket_client_id = $client_id - AND ticket_updated_at < CURRENT_DATE - INTERVAL 3 DAY + AND ticket_updated_at < CURRENT_DATE - INTERVAL 7 DAY AND ticket_resolved_At IS NULL AND ticket_closed_at IS NULL ORDER BY ticket_updated_at ASC @@ -76,7 +74,7 @@ $sql_domains_expiring = mysqli_query( AND domain_expire IS NOT NULL AND domain_archived_at IS NULL AND domain_expire > CURRENT_DATE - AND domain_expire < CURRENT_DATE + INTERVAL $expiration_days DAY + AND domain_expire < CURRENT_DATE + INTERVAL 45 DAY ORDER BY domain_expire ASC LIMIT 5" ); @@ -89,7 +87,7 @@ $sql_certificates_expiring = mysqli_query( AND certificate_expire IS NOT NULL AND certificate_archived_at IS NULL AND certificate_expire > CURRENT_DATE - AND certificate_expire < CURRENT_DATE + INTERVAL $expiration_days DAY + AND certificate_expire < CURRENT_DATE + INTERVAL 45 DAY ORDER BY certificate_expire ASC LIMIT 5" ); @@ -102,7 +100,7 @@ $sql_licenses_expiring = mysqli_query( AND software_expire IS NOT NULL AND software_archived_at IS NULL AND software_expire > CURRENT_DATE - AND software_expire < CURRENT_DATE + INTERVAL $expiration_days DAY + AND software_expire < CURRENT_DATE + INTERVAL 45 DAY ORDER BY software_expire ASC LIMIT 5" ); @@ -115,7 +113,7 @@ $sql_asset_warranties_expiring = mysqli_query( AND asset_warranty_expire IS NOT NULL AND asset_archived_at IS NULL AND asset_warranty_expire > CURRENT_DATE - AND asset_warranty_expire < CURRENT_DATE + INTERVAL $expiration_days DAY + AND asset_warranty_expire < CURRENT_DATE + INTERVAL 45 DAY ORDER BY asset_warranty_expire ASC LIMIT 5" ); @@ -127,8 +125,8 @@ $sql_asset_retire = mysqli_query( WHERE asset_client_id = $client_id AND asset_install_date IS NOT NULL AND asset_archived_at IS NULL - AND asset_install_date + INTERVAL 7 YEAR > CURRENT_DATE -- Not yet expired - AND asset_install_date + INTERVAL 7 YEAR <= CURRENT_DATE + INTERVAL $expiration_days DAY + AND asset_install_date + INTERVAL 7 YEAR > CURRENT_DATE + AND asset_install_date + INTERVAL 7 YEAR <= CURRENT_DATE + INTERVAL 45 DAY ORDER BY asset_install_date ASC LIMIT 5" ); @@ -353,17 +351,7 @@ $sql_asset_retired = mysqli_query(
-
Upcoming Expirations
-
-
- - - -
+
Expiring in the Next 45 Days
@@ -378,7 +366,7 @@ $sql_asset_retired = mysqli_query( ?>

- + --

- + --

- + --

@@ -496,7 +484,7 @@ $sql_asset_retired = mysqli_query( ?>

- + --

- + --

- + --

diff --git a/client_racks.php b/client_racks.php index 7e36c79a..acd1a575 100644 --- a/client_racks.php +++ b/client_racks.php @@ -261,7 +261,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $icon = $d['icon']; // already from getAssetIcon ?> - diff --git a/clients.php b/clients.php index bbd5293a..3940b11b 100644 --- a/clients.php +++ b/clients.php @@ -398,7 +398,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); if (!empty($contact_name)) { ?>
- + + + +
- +

New Contacts

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

Expiring Domains

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

Expiring Certificates

diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php index 2588e9fa..aa25a4d6 100644 --- a/includes/inc_all_client.php +++ b/includes/inc_all_client.php @@ -216,18 +216,18 @@ if (isset($_GET['client_id'])) { // Expiring Items - // Count Domains Expiring within 90 Days + // Count Domains Expiring within 45 Days $row = mysqli_fetch_assoc(mysqli_query( $mysqli, "SELECT COUNT('domain_id') AS num FROM domains WHERE domain_client_id = $client_id AND domain_expire IS NOT NULL - AND domain_expire < CURRENT_DATE + INTERVAL 90 DAY + AND domain_expire < CURRENT_DATE + INTERVAL 45 DAY AND domain_archived_at IS NULL" )); - $num_domains_expiring = intval($row['num']); + $num_domains_expiring_warning= intval($row['num']); - // Count Domains Expired or within 14 days + // Count Domains Expired or within 7 days $row = mysqli_fetch_assoc(mysqli_query( $mysqli, "SELECT COUNT('domain_id') AS num FROM domains @@ -235,24 +235,24 @@ if (isset($_GET['client_id'])) { AND domain_expire IS NOT NULL AND ( domain_expire < CURRENT_DATE - OR domain_expire < CURRENT_DATE + INTERVAL 14 DAY + OR domain_expire < CURRENT_DATE + INTERVAL 7 DAY ) AND domain_archived_at IS NULL" )); - $num_domains_expired = intval($row['num']); + $num_domains_urgent = intval($row['num']); - // Count Certificates Expiring within 90 Days + // Count Certificates Expiring within 45 Days $row = mysqli_fetch_assoc(mysqli_query( $mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates WHERE certificate_client_id = $client_id AND certificate_expire IS NOT NULL - AND certificate_expire < CURRENT_DATE + INTERVAL 90 DAY + AND certificate_expire < CURRENT_DATE + INTERVAL 45 DAY AND certificate_archived_at IS NULL" )); $num_certificates_expiring = intval($row['num']); - // Count Certificates Expired or within 14 days + // Count Certificates Expired or within 7 days $row = mysqli_fetch_assoc(mysqli_query( $mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates @@ -260,7 +260,7 @@ if (isset($_GET['client_id'])) { AND certificate_expire IS NOT NULL AND ( certificate_expire < CURRENT_DATE - OR certificate_expire < CURRENT_DATE + INTERVAL 14 DAY + OR certificate_expire < CURRENT_DATE + INTERVAL 7 DAY ) AND certificate_archived_at IS NULL" )); @@ -272,7 +272,7 @@ if (isset($_GET['client_id'])) { "SELECT COUNT('software_id') AS num FROM software WHERE software_client_id = $client_id AND software_expire IS NOT NULL - AND software_expire < CURRENT_DATE + INTERVAL 90 DAY + AND software_expire < CURRENT_DATE + INTERVAL 45 DAY AND software_archived_at IS NULL" )); $num_software_expiring = intval($row['num']); @@ -285,7 +285,7 @@ if (isset($_GET['client_id'])) { AND software_expire IS NOT NULL AND ( software_expire < CURRENT_DATE - OR software_expire < CURRENT_DATE + INTERVAL 14 DAY + OR software_expire < CURRENT_DATE + INTERVAL 7 DAY ) AND software_archived_at IS NULL" )); diff --git a/post/user/asset.php b/post/user/asset.php index 727d1040..46db87ad 100644 --- a/post/user/asset.php +++ b/post/user/asset.php @@ -295,10 +295,9 @@ if (isset($_POST['bulk_transfer_client_asset'])) { while ($row = mysqli_fetch_array($sql_interfaces)) { $interface_name = sanitizeInput($row['interface_name']); $interface_mac = sanitizeInput($row['interface_mac']); - $interface_port = sanitizeInput($row['interface_port']); $interface_primary = intval($row['interface_primary']); - mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '$interface_name', interface_mac = '$interface_mac', interface_port = '$interface_port', interface_primary = $interface_primary, interface_asset_id = $new_asset_id"); + mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '$interface_name', interface_mac = '$interface_mac', interface_primary = $interface_primary, interface_asset_id = $new_asset_id"); } @@ -331,7 +330,7 @@ if (isset($_POST['bulk_transfer_client_asset'])) { $_SESSION['alert_message'] = "Transferred $asset_count assets to $new_client_name."; } - header("Location: client_assets.php?client_id=$new_client_id&asset_id=$new_asset_id"); + header("Location: " . $_SERVER["HTTP_REFERER"]); } if (isset($_POST['bulk_assign_asset_contact'])) { diff --git a/post/user/ticket.php b/post/user/ticket.php index 720d6c97..f66db5f0 100644 --- a/post/user/ticket.php +++ b/post/user/ticket.php @@ -2338,7 +2338,7 @@ if (isset($_POST['edit_ticket_schedule'])) { 'recipient' => $user_email, 'recipient_name' => $user_name, 'subject' => "Ticket Scheduled - [$ticket_prefix$ticket_number] - $ticket_subject", - 'body' => "Hello, " . $user_name . "

The ticket regarding $ticket_subject has been scheduled for $email_datetime.

--------------------------------
$ticket_link
--------------------------------

Please do not reply to this email.

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$config_base_url/ticket.php?id=$ticket_id

~
$session_company_name
Support Department
$config_ticket_from_email", + 'body' => "Hello, " . $user_name . "

The ticket regarding $ticket_subject has been scheduled for $email_datetime.

--------------------------------
$ticket_link
--------------------------------

Please do not reply to this email.

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$config_base_url/ticket.php?ticket_id=$ticket_id

~
$session_company_name
Support Department
$config_ticket_from_email", 'cal_str' => $cal_str ]; @@ -2430,7 +2430,7 @@ if (isset($_POST['edit_ticket_schedule'])) { } else { $_SESSION['alert_type'] = "error"; $_SESSION['alert_message'] = "Ticket scheduled for $email_datetime. Yet there are conflicting tickets scheduled for the same time:
" . implode(",
", $conflicting_tickets); - header("Location: calendar_events.php"); + header("Location: calendar.php"); } } @@ -2491,7 +2491,7 @@ if (isset($_GET['cancel_ticket_schedule'])) { 'recipient' => $user_email, 'recipient_name' => $user_name, 'subject' => "Ticket Schedule Cancelled - [$ticket_prefix$ticket_number] - $ticket_subject", - 'body' => "Hello, " . $user_name . "

Scheduled work for the ticket regarding $ticket_subject has been cancelled.

--------------------------------
$ticket_link
--------------------------------

Please do not reply to this email.

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$config_base_url/ticket.php?id=$ticket_id

~
$session_company_name
Support Department
$config_ticket_from_email", + 'body' => "Hello, " . $user_name . "

Scheduled work for the ticket regarding $ticket_subject has been cancelled.

--------------------------------
$ticket_link
--------------------------------

Please do not reply to this email.

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$config_base_url/ticket.php?id=$ticket_id

~
$session_company_name
Support Department
$config_ticket_from_email", 'cal_str' => $cal_str ]; diff --git a/projects.php b/projects.php index 3f5965e9..d97f53d7 100644 --- a/projects.php +++ b/projects.php @@ -170,7 +170,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); if ($client_name) { - $client_name_display = "$client_name"; + $client_name_display = "$client_name"; } else { $client_name_display = "-"; }