From 6df101c217c0ef3bfc3be3b53f6ae2f50748e20c Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 16 Aug 2026 22:25:05 -0400 Subject: [PATCH] Css fixes --- admin/api_keys.php | 187 ++++---- admin/app_logs.php | 121 +++-- admin/audit_logs.php | 217 +++++---- admin/canned_responses.php | 165 ++++--- admin/categories.php | 2 +- admin/contract_templates.php | 169 ++++--- admin/custom_links.php | 2 +- admin/document_templates.php | 175 ++++---- admin/mail_queue.php | 241 +++++----- admin/modules.php | 129 +++--- admin/project_templates.php | 177 ++++---- admin/roles.php | 191 ++++---- admin/saved_payment_methods.php | 171 ++++---- admin/settings_custom_fields.php | 117 +++-- admin/software_templates.php | 163 ++++--- admin/tags.php | 2 +- admin/ticket_statuses.php | 2 +- admin/ticket_templates.php | 133 +++--- admin/users.php | 337 +++++++------- admin/vendor_templates.php | 233 +++++----- agent/accounts.php | 155 ++++--- agent/assets.php | 653 ++++++++++++++------------- agent/certificates.php | 293 ++++++------- agent/clients.php | 36 +- agent/contacts.php | 539 ++++++++++++----------- agent/credentials.php | 527 +++++++++++----------- agent/domains.php | 369 ++++++++-------- agent/expenses.php | 313 +++++++------ agent/files.php | 2 +- agent/income.php | 441 ++++++++++--------- agent/invoices.php | 429 +++++++++--------- agent/locations.php | 379 ++++++++-------- agent/networks.php | 307 +++++++------ agent/notifications.php | 2 +- agent/products.php | 315 +++++++------ agent/projects.php | 389 ++++++++-------- agent/quotes.php | 327 +++++++------- agent/recurring_expenses.php | 297 +++++++------ agent/recurring_invoices.php | 358 +++++++-------- agent/recurring_tickets.php | 301 +++++++------ agent/services.php | 215 +++++---- agent/software.php | 347 ++++++++------- agent/ticket_list.php | 732 +++++++++++++++---------------- agent/tickets.php | 30 +- agent/transactions.php | 369 ++++++++-------- agent/transfers.php | 263 ++++++----- agent/trips.php | 277 ++++++------ agent/vendors.php | 338 +++++++------- css/itflow_custom.css | 4 +- includes/filter_footer.php | 10 +- 50 files changed, 5955 insertions(+), 5996 deletions(-) diff --git a/admin/api_keys.php b/admin/api_keys.php index 47628608a..64ed610fe 100644 --- a/admin/api_keys.php +++ b/admin/api_keys.php @@ -18,21 +18,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

API Keys

-
+
-
+
-
+
@@ -57,111 +57,110 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
- + + - - "> +
+ "> + + + + + + + + + + + + None"; + + ?> - - - - - - - - - - None"; - - ?> - - - - - - - - + + + + + - + + + - + - -
+
+ +
+ 		+ + Name + + + + User + + + + Secret + + + + Created + + + + Expires + + Action
- +
- - Name - - - - User - - - - Secret - - - - Created - - - - Expires - - Action
-
- -
- 		-
- -
- - Edit +
+
+ +
+ + Edit + + date("Y-m-d H:i:s")) { ?> + + Revoke - date("Y-m-d H:i:s")) { ?> - - Revoke - - - - - Delete - - -
+ + + + Delete + +
-
+ + -
+ -
-
+
diff --git a/admin/app_logs.php b/admin/app_logs.php index b6cfab71c..32f43e2fb 100644 --- a/admin/app_logs.php +++ b/admin/app_logs.php @@ -40,15 +40,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

App Logs

-
+
-
+
-
+
@@ -58,7 +58,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -96,10 +96,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
" id="advancedFilter"> -
+
-
- +
+ @@ -109,62 +109,61 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> - - - - - - - - - +
+
- - Timestamp - - - - Type - - - - Category - - - - Details - -
+ "> + + + + + + + + + - - - - - - - - - - -
+ + Timestamp + + + + Type + + + + Category + + + + Details + +
-
- + + + + + + + + + + +
+
-
-
+
+

Audit Logs

-
-
-
+
+ +
-
+
@@ -81,7 +81,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -121,7 +121,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -158,11 +158,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" id="advancedFilter"> -
+
" id="advancedFilter"> +
-
- +
+ @@ -172,109 +172,108 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - text-nowrap"> - + +
+
+ text-nowrap"> + + + + - - - - - - - - - - - - - + + + + + + + + + $client_name"; - } - $log_entity_id = intval($row['log_entity_id']); - - ?> - - - - - - - - - - - - - - - $client_name"; + } + $log_entity_id = intval($row['log_entity_id']); + ?> - -
+ + Timestamp + + + + User + + - - Timestamp + + Client - - User - - - - Client - - - - Type - - - - Action - - - - Description - - - - IP Address - - - - User Agent - -
+ + Type + + + + Action + + + + Description + + + + IP Address + + + + User Agent + +
$log_user_browser" ?>
-
- + + + + + + + + + + + $log_user_browser
" ?> + + + + + +
+
-
-
+
+

Canned Responses

-
+
-
+
-
+
@@ -50,85 +50,84 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> - - - - - - - - - - - - - - - - - -
- - Response - - - - Ticket Category - - Action
-
- -
-
- - - -
-
-
-
- 		- - - - All ticket categories - - -
- -
- - Edit - - - Delete - -
-
-
-
-
+
+ + "> + + + + + + + + + + + + + + + + + +
+ + Response + + + + Ticket Category + + Action
+
+ +
+
+ + + +
+
+
+
+ 		+ + + + All ticket categories + + +
+ +
+ + Edit + + + Delete + +
+
+
+
+
- +
"> + + + + + + + + + + + + + +
diff --git a/admin/contract_templates.php b/admin/contract_templates.php index 033677500..087b88790 100644 --- a/admin/contract_templates.php +++ b/admin/contract_templates.php @@ -18,8 +18,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Contract Templates

-
+
@@ -35,89 +35,88 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- -
- - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Template NameTypeUpdate FrequencySLA (L/M/H Response)SLA (L/M/H Resolution)Hourly RateAfter Hours RateSupport HoursNet TermsCreatedUpdatedAction
- - - -
- 		-
- -
- - Edit - -
- - Delete - -
-
-
-
-
-
+ +
+ + "> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Template NameTypeUpdate FrequencySLA (L/M/H Response)SLA (L/M/H Resolution)Hourly RateAfter Hours RateSupport HoursNet TermsCreatedUpdatedAction
+ + + +
+ 		+
+ +
+ + Edit + +
+ + Delete + +
+
+
+
+
+
diff --git a/admin/custom_links.php b/admin/custom_links.php index 5fd136d49..4f6e8d5d2 100644 --- a/admin/custom_links.php +++ b/admin/custom_links.php @@ -42,7 +42,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
">
diff --git a/admin/document_templates.php b/admin/document_templates.php index 3f13a6f92..2cb4438ed 100644 --- a/admin/document_templates.php +++ b/admin/document_templates.php @@ -19,8 +19,8 @@ ?> -
-
+
+

Document Templates

-
+
- +
-
+
-
- - "> - - - - - - - - - +
- - Template Name - - - - Created - - - - Updated - - - Action -
+ "> + + + + + + + + + + ?> - - - - - + - + + + + + + - + ?> - -
+ + Template Name + + + + Created + + + + Updated + + + Action +
- -
- -
-
-
-
-
- - 		- -
- 		-
- -
- - View - -
- - Edit - -
- - Delete - +
+ +
+ +
+
+
-
+ +
+ 		+
+ +
+ + View + +
+ + Edit + +
+ + Delete + +
+
+
-
-
- + +
+
+
-
-
+
+

Email Queue

-
-
-
+
+ +
@@ -52,11 +52,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" id="advancedFilter"> -
+
" id="advancedFilter"> +
-
- +
+ @@ -66,124 +66,123 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- +
+ + -
- - "> - - - - - - - - - - - - - +
-
- -
- 		- - Queued - - - - From - - - - To - - - - Subject - - - - Status - - - - Attempts - - Action
+ "> + + + + + + + + + + + + + Queued"; - } elseif($email_status == 1) { - $email_status_display = "
Sending
"; - } elseif($email_status == 2) { - $email_status_display = "
Failed
$email_failed_at"; - } else { - $email_status_display = "
Sent
$email_sent_at"; - } - - ?> - - - - - - - - - - - - - Queued"; + } elseif($email_status == 1) { + $email_status_display = "
Sending
"; + } elseif($email_status == 2) { + $email_status_display = "
Failed
$email_failed_at"; + } else { + $email_status_display = "
Sent
$email_sent_at"; } + ?> - -
+
+ +
+ 		+ + Queued + + + + From + + + + To + + + + Subject + + + + Status + + + + Attempts + + Action
- -
- -
- - 		$email_from_name" ?>$email_recipient_name" ?> - - - - - - 3) { ?> - - - - - - - - -
-
- +
+ +
+ +
+ + 		$email_from_name" ?>$email_recipient_name" ?> + + + - - + + 3) { ?> + + + + + + + + +
+
+ + +
diff --git a/admin/modules.php b/admin/modules.php index 5368cabdc..e0500b9d4 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -17,8 +17,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Access Modules

@@ -28,9 +28,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
-
+
+ +
@@ -39,71 +39,70 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - text-nowrap"> - - - - - - - +
+
- - Module - - Action
+ text-nowrap"> + + + + + + + - - - - - - + + + -
+ + Module + + Action
- 6) { ?> class="ajax-modal" data-modal-url="modals/modules/module_edit.php?id=" > - - -
- 		- 6) { ?> -
- -
- - - Edit - - -
- - Delete - - -
-
- N/A Predefined

"; } ?> -
+ 6) { ?> class="ajax-modal" data-modal-url="modals/modules/module_edit.php?id=" > + + +
+ 		+ 6) { ?> +
+ +
-
-
- + + Edit + + +
+ + Delete + + +
+
+ N/A Predefined

"; } ?> + + + + + + +
+
-
-
+
+

Project Templates

-
+
-
+
-
+
@@ -42,97 +42,96 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> - - - - - - - - - +
+
- - Template - - TicketsTasksAction
+ "> + + + + + + + + + - - - - - - - - + + + + + + - -
+ + Template + + TicketsTasksAction
- -
- -
-
- -
-
- -
-
-
- - 		-
- -
- - Edit - - -
- - Delete - - -
-
-
+ +
+ +
+
+ +
+
+ +
+
+
+ + 		+
+ +
+ + Edit + + +
+ + Delete + + +
+
+
-
- + + + +
+
-
-
+
+

Roles

@@ -29,9 +29,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
-
+
+ +
@@ -40,108 +40,107 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - text-nowrap"> - - - - - - - - - +
+
- - Role - - Members - - Admin - - Action
+ text-nowrap"> + + + + + + + + + - - - - - - - - + + + + + -
+ + Role + + Members + + Admin + + Action
- href="#"> -
- -
-
-
-
-
- - 		- -
- -
- - - Edit - - - -
- - Archive - - - -
-
- -
+ href="#"> +
+ +
+
+
+
+
+ + 		+ +
+ +
-
-
- + + Edit + + + +
+ + Archive + + + +
+
+ + + + + + + +
+
Saved Payment Methods (Stripe) -
-
+
+

Saved Payment Methods

-
-
-
+
+ +
@@ -60,94 +60,93 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> - - - - - + +
+
- - Client - - - - Provider - - - - Description - - - - Provider Client ID - -
+ "> + + + + + - - - - - - - + + Provider Payment Method ID + + + + + + + + - - - - - - - - - - - + + + + + + + + + - -
+ + Client + + + + Provider + + + + Description + + + + Provider Client ID + + - - Provider Payment Method ID - - - - Created - - Action
+ + Created + + Action
- -
- ID: - 		- -
- ID: - 		- - Delete - -
+ +
+ ID: + 		+ +
+ ID: + 		+ + Delete + +
+ + + + -
-
+
-
-
+
+

Fields

-
+
-
-
+
+
@@ -51,65 +51,64 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> - - - - - - - - +
+
LabelTypeAction
+ "> + + + + + + + + - - - - - - - + + + + + - -
LabelTypeAction
-
- -
- - Edit - -
- - Delete - -
-
-
+
+ +
+ + Edit + +
+ + Delete + +
+
+
-
- + + + +
+
-
-
+
+

License Templates

-
+
-
+
-
+
@@ -42,88 +42,87 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> - - - - - - - - - +
+
- - Template - - - - Type - - - - License Type - - Action
+ "> + + + + + + + + + - - - - - - - - + + + + + + - -
+ + Template + + + + Type + + + + License Type + + Action
- -
- -
-
$software_template_version" ?>
-
-
-
- - 		-
- -
- - Edit - - -
- - Delete - - -
-
-
+ +
+ +
+
$software_template_version" ?>
+
+
+
+ + 		+
+ +
+ + Edit + + +
+ + Delete + + +
+
+
-
- + + + +
+
- +
"> + + + + + + + + + + + + +
diff --git a/admin/ticket_statuses.php b/admin/ticket_statuses.php index c8755fc2f..4044cf239 100644 --- a/admin/ticket_statuses.php +++ b/admin/ticket_statuses.php @@ -42,7 +42,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
">
diff --git a/admin/ticket_templates.php b/admin/ticket_templates.php index bf26e897f..c981e9aff 100644 --- a/admin/ticket_templates.php +++ b/admin/ticket_templates.php @@ -23,19 +23,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Ticket Templates

-
+
-
+
-
+
@@ -46,75 +46,74 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> + +
+
+ "> + + + + + + + + - - - - - - - - - - - - + + + + + - + - -
+ + Template + + + + Tasks + + Action
- - Template - - - - Tasks - - Action
- -
- -
- -
+
+ +
+ +
+ -
- -
-
- -
- - Delete - +
-
+
+ +
+ + Delete + +
+
+
-
- + +
+ -
-
+
+

Users

@@ -49,9 +49,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
-
+
+ +
@@ -61,183 +61,182 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
"> + class="btn btn-"> Archived
-
-
- - "> - - - - - - - - - - - - +
+
- - Name - - - - Email - - - - Role - - - - Status - - MFA - Last Login - Action
+ "> + + + + + + + + + + + + Invited"; - } elseif ($user_status == 1) { - $user_status_display = "Active"; - } else{ - $user_status_display = "Disabled"; - } - $user_avatar = escapeHtml($row['user_avatar']); - $user_token = escapeHtml($row['user_token']); - if(empty($user_token)) { - $mfa_status_display = ""; - } else { - $mfa_status_display = ""; - } - $user_config_force_mfa = intval($row['user_config_force_mfa']); - $user_role = intval($row['user_role_id']); - $user_role_display = escapeHtml($row['role_name']); - $user_archived_at = escapeHtml($row['user_archived_at']); - $user_initials = escapeHtml(initials($user_name)); + while ($row = mysqli_fetch_assoc($sql)) { + $user_id = intval($row['user_id']); + $user_name = escapeHtml($row['user_name']); + $user_email = escapeHtml($row['user_email']); + $user_status = intval($row['user_status']); + if ($user_status == 2) { + $user_status_display = "Invited"; + } elseif ($user_status == 1) { + $user_status_display = "Active"; + } else{ + $user_status_display = "Disabled"; + } + $user_avatar = escapeHtml($row['user_avatar']); + $user_token = escapeHtml($row['user_token']); + if(empty($user_token)) { + $mfa_status_display = ""; + } else { + $mfa_status_display = ""; + } + $user_config_force_mfa = intval($row['user_config_force_mfa']); + $user_role = intval($row['user_role_id']); + $user_role_display = escapeHtml($row['role_name']); + $user_archived_at = escapeHtml($row['user_archived_at']); + $user_initials = escapeHtml(initials($user_name)); - $sql_last_login = mysqli_query( - $mysqli, - "SELECT log_created_at, log_ip, log_user_agent FROM logs - WHERE log_user_id = $user_id AND log_type = 'Login' - ORDER BY log_id DESC LIMIT 1" - ); - if (mysqli_num_rows($sql_last_login) == 0) { - $last_login = "Never logged in"; - } else { - $row = mysqli_fetch_assoc($sql_last_login); - $log_created_at = escapeHtml($row['log_created_at']); - $log_ip = escapeHtml($row['log_ip']); - $log_user_agent = escapeHtml($row['log_user_agent']); - $log_user_os = getOS($log_user_agent); - $log_user_browser = getWebBrowser($log_user_agent); - $last_login = "$log_created_at
$log_user_os
$log_user_browser
$log_ip
"; - } - - // Get User Client Access Permissions - $user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_client_permissions WHERE user_id = $user_id"); - $client_access_array = []; - while ($row = mysqli_fetch_assoc($user_client_access_sql)) { - $client_access_array[] = intval($row['client_id']); - } - - $sql_remember_tokens = mysqli_query($mysqli, "SELECT 1 FROM remember_tokens WHERE remember_token_user_id = $user_id"); - $remember_token_count = mysqli_num_rows($sql_remember_tokens); - - - - ?> - - - - - - - - - - - Never logged in"; + } else { + $row = mysqli_fetch_assoc($sql_last_login); + $log_created_at = escapeHtml($row['log_created_at']); + $log_ip = escapeHtml($row['log_ip']); + $log_user_agent = escapeHtml($row['log_user_agent']); + $log_user_os = getOS($log_user_agent); + $log_user_browser = getWebBrowser($log_user_agent); + $last_login = "$log_created_at
$log_user_os
$log_user_browser
$log_ip
"; } - ?> + // Get User Client Access Permissions + $user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_client_permissions WHERE user_id = $user_id"); + $client_access_array = []; + while ($row = mysqli_fetch_assoc($user_client_access_sql)) { + $client_access_array[] = intval($row['client_id']); + } - -
+ + Name + + + + Email + + + + Role + + + + Status + + MFA + Last Login + Action
- - class="ajax-modal" - data-modal-url="modals/user/user_edit.php?id=" - - > - - "> - - - - - -
- - -
- - 		- -
- -
- - Edit - - 0) { ?> - Revoke Remember Tokens - - - - - Activate - - - - Disable - - - -
- - Restore - - -
- - Archive - - -
-
- -
-
- + $sql_remember_tokens = mysqli_query($mysqli, "SELECT 1 FROM remember_tokens WHERE remember_token_user_id = $user_id"); + $remember_token_count = mysqli_num_rows($sql_remember_tokens); + + + + ?> +
+ + class="ajax-modal" + data-modal-url="modals/user/user_edit.php?id=" + + > + + "> + + + + + +
+ + +
+ + 		+ +
+ +
+ + Edit + + 0) { ?> + Revoke Remember Tokens + + + + + Activate + + + + Disable + + + +
+ + Restore + + +
+ + Archive + + +
+
+ +
+
-
-
+
+

Vendor Templates

@@ -30,12 +30,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
@@ -43,124 +43,123 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> - - - - - - - - - - - - - - - - - +
+
- - Vendor - - - - Description - - ContactAction
- - - - -
- - - 		- - -
- - -
- - -
- - - 		-
- -
- - Edit - - -
- - Delete - - -
-
-
+ "> + + + + + + + + + + + + +
+ + Vendor + + + + Description + + ContactAction
+ + + + +
+ + + 		+ + +
+ -
-
- + if (!empty($vendor_template_phone)) { ?> + +
+ + +
+ + + + +
+ +
+ + Edit + + +
+ + Delete + + +
+
+ + + + + + +
+
-
-
+
+

Accounts

-
+
-
-
- - "> - - - - - - - - - +
+
- - Name - - - - Currency - - BalanceAction
+ "> + + + + + + + + + - - - - - - - - - - -
+ + Name + + + + Currency + + BalanceAction
- - - - -
- -
- - Edit - - -
- - Archive - - -
-
-
-
- + + + + + + + + + +
+ +
+ + Edit + + +
+ + Archive + + +
+
+ + + + + + +
+
-
-
+
+

Assets

= 2) { ?> @@ -241,23 +241,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
s">
-
+
@@ -310,7 +310,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -348,7 +348,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
+
+ + -
- - text-nowrap"> +
+
+ text-nowrap"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $asset_serial"; + } else { + $asset_serial_display = "-"; + } + $asset_os = escapeHtml($row['asset_os']); + $asset_ip = escapeHtml($row['interface_ip']) ?: '-'; + $asset_ipv6 = escapeHtml($row['interface_ipv6']); + $asset_nat_ip = escapeHtml($row['interface_nat_ip']); + $asset_mac = escapeHtml($row['interface_mac']) ?: '-'; + $asset_uri = escapeUrl($row['asset_uri']); + $asset_uri_2 = escapeUrl($row['asset_uri_2']); + $asset_uri_client = escapeUrl($row['asset_uri_client']); + $asset_status = escapeHtml($row['asset_status']); + $asset_purchase_reference = escapeHtml($row['asset_purchase_reference']); + $asset_purchase_date = escapeHtml($row['asset_purchase_date']); + if ($asset_purchase_date) { + $asset_purchase_date_display = $asset_purchase_date; + } else { + $asset_purchase_date_display = "-"; + } + $asset_warranty_expire = escapeHtml($row['asset_warranty_expire']); + if ($asset_warranty_expire) { + $asset_warranty_expire_display = $asset_warranty_expire; + } else { + $asset_warranty_expire_display = "-"; + } + $asset_install_date = escapeHtml($row['asset_install_date']); + if ($asset_install_date) { + $asset_install_date_display = $asset_install_date; + } else { + $asset_install_date_display = "-"; + } + $asset_photo = escapeHtml($row['asset_photo']); + $asset_physical_location = escapeHtml($row['asset_physical_location']); + if ($asset_physical_location) { + $asset_physical_location_display = "
$asset_physical_location
"; + } else { + $asset_physical_location_display = ""; + } + $asset_notes = escapeHtml($row['asset_notes']); + $asset_favorite = intval($row['asset_favorite']); + $asset_created_at = escapeHtml($row['asset_created_at']); + $asset_archived_at = escapeHtml($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']); + $asset_network_id = intval($row['interface_network_id']); + + $device_icon = getAssetIcon($asset_type); + + $contact_archived_at = escapeHtml($row['contact_archived_at']); + if ($contact_archived_at) { + $contact_archive_display = "(Archived)"; + } else { + $contact_archive_display = ''; + } + $contact_name = escapeHtml($row['contact_name']); + if ($contact_name) { + $contact_name_display = "$contact_name $contact_archive_display"; + } else { + $contact_name_display = "-"; + } + + $location_name = escapeHtml($row['location_name']); + if (empty($location_name)) { + $location_name = "-"; + } + $location_archived_at = escapeHtml($row['location_archived_at']); + if ($location_archived_at) { + $location_name_display = "
$location_name
"; + } else { + $location_name_display = $location_name; + } + + $sql_credentials = mysqli_query($mysqli, "SELECT 1 FROM credentials WHERE credential_asset_id = $asset_id"); + $credential_count = mysqli_num_rows($sql_credentials); + + // Tags + $asset_tag_name_display_array = array(); + $asset_tag_id_array = array(); + $sql_asset_tags = mysqli_query($mysqli, "SELECT tag_color, tag_icon, tag_id, tag_name FROM asset_tags LEFT JOIN tags ON asset_tag_tag_id = tag_id WHERE asset_tag_asset_id = $asset_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_assoc($sql_asset_tags)) { + + $asset_tag_id = intval($row['tag_id']); + $asset_tag_name = escapeHtml($row['tag_name']); + $asset_tag_color = escapeHtml($row['tag_color']); + if (empty($asset_tag_color)) { + $asset_tag_color = "dark"; + } + $asset_tag_icon = escapeHtml($row['tag_icon']); + if (empty($asset_tag_icon)) { + $asset_tag_icon = "tag"; + } + + $asset_tag_id_array[] = $asset_tag_id; + $asset_tag_name_display_array[] = "$asset_tag_name"; + } + $asset_tags_display = implode('', $asset_tag_name_display_array); + + ?> - + + + + - + - + - + - + - + - + - - + + - - + + - + - + - - $asset_serial"; - } else { - $asset_serial_display = "-"; - } - $asset_os = escapeHtml($row['asset_os']); - $asset_ip = escapeHtml($row['interface_ip']) ?: '-'; - $asset_ipv6 = escapeHtml($row['interface_ipv6']); - $asset_nat_ip = escapeHtml($row['interface_nat_ip']); - $asset_mac = escapeHtml($row['interface_mac']) ?: '-'; - $asset_uri = escapeUrl($row['asset_uri']); - $asset_uri_2 = escapeUrl($row['asset_uri_2']); - $asset_uri_client = escapeUrl($row['asset_uri_client']); - $asset_status = escapeHtml($row['asset_status']); - $asset_purchase_reference = escapeHtml($row['asset_purchase_reference']); - $asset_purchase_date = escapeHtml($row['asset_purchase_date']); - if ($asset_purchase_date) { - $asset_purchase_date_display = $asset_purchase_date; - } else { - $asset_purchase_date_display = "-"; - } - $asset_warranty_expire = escapeHtml($row['asset_warranty_expire']); - if ($asset_warranty_expire) { - $asset_warranty_expire_display = $asset_warranty_expire; - } else { - $asset_warranty_expire_display = "-"; - } - $asset_install_date = escapeHtml($row['asset_install_date']); - if ($asset_install_date) { - $asset_install_date_display = $asset_install_date; - } else { - $asset_install_date_display = "-"; - } - $asset_photo = escapeHtml($row['asset_photo']); - $asset_physical_location = escapeHtml($row['asset_physical_location']); - if ($asset_physical_location) { - $asset_physical_location_display = "
$asset_physical_location
"; - } else { - $asset_physical_location_display = ""; - } - $asset_notes = escapeHtml($row['asset_notes']); - $asset_favorite = intval($row['asset_favorite']); - $asset_created_at = escapeHtml($row['asset_created_at']); - $asset_archived_at = escapeHtml($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']); - $asset_network_id = intval($row['interface_network_id']); + } - $device_icon = getAssetIcon($asset_type); + ?> - $contact_archived_at = escapeHtml($row['contact_archived_at']); - if ($contact_archived_at) { - $contact_archive_display = "(Archived)"; - } else { - $contact_archive_display = ''; - } - $contact_name = escapeHtml($row['contact_name']); - if ($contact_name) { - $contact_name_display = "$contact_name $contact_archive_display"; - } else { - $contact_name_display = "-"; - } - - $location_name = escapeHtml($row['location_name']); - if (empty($location_name)) { - $location_name = "-"; - } - $location_archived_at = escapeHtml($row['location_archived_at']); - if ($location_archived_at) { - $location_name_display = "
$location_name
"; - } else { - $location_name_display = $location_name; - } - - $sql_credentials = mysqli_query($mysqli, "SELECT 1 FROM credentials WHERE credential_asset_id = $asset_id"); - $credential_count = mysqli_num_rows($sql_credentials); - - // Tags - $asset_tag_name_display_array = array(); - $asset_tag_id_array = array(); - $sql_asset_tags = mysqli_query($mysqli, "SELECT tag_color, tag_icon, tag_id, tag_name FROM asset_tags LEFT JOIN tags ON asset_tag_tag_id = tag_id WHERE asset_tag_asset_id = $asset_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_assoc($sql_asset_tags)) { - - $asset_tag_id = intval($row['tag_id']); - $asset_tag_name = escapeHtml($row['tag_name']); - $asset_tag_color = escapeHtml($row['tag_color']); - if (empty($asset_tag_color)) { - $asset_tag_color = "dark"; - } - $asset_tag_icon = escapeHtml($row['tag_icon']); - if (empty($asset_tag_icon)) { - $asset_tag_icon = "tag"; - } - - $asset_tag_id_array[] = $asset_tag_id; - $asset_tag_name_display_array[] = "$asset_tag_name"; - } - $asset_tags_display = implode('', $asset_tag_name_display_array); - - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ +
+ 		+ + Name + + + + Type + + + + Model + + + + IP + + + + MAC Address + + + + Purchase Date + + + + Install Date + + + + Warranty Expire + + + + Assigned To + + + + Location + + + + Status + + + + Client + + Action
- +
- - Name + + +
+ +
+
+ + + "; } ?>
+
+ +
+
- - 		- - Type - - +
+ + +
+ +
+ + + + + + +
+ + + + + +
+ + Client URI: + + +
+
+ +
+
+ 		- - Model - - +
+
+ 		- - IP - - + +
+ 		- - MAC Address - - - - Purchase Date - - - - Install Date - - - - Warranty Expire - - - - Assigned To - - - - Location - - - - Status - - +
+
+ 		- - Client - - Action +
+
+ +
+ + Edit + + + Copy + + 2) { ?> + + + Restore + + + Delete + + + + Archive + + + + +
+
+
+
-
- -
- 		- -
- -
-
- - - "; } ?>
-
- -
-
- - 		-
- - -
- -
- - - - - - -
- - - - - -
- - Client URI: - - -
-
- -
-
- 		-
-
- 		- -
- 		-
-
- 		-
-
- -
- - Edit - - - Copy - - 2) { ?> - - - Restore - - - Delete - - - - Archive - - - - -
-
-
-
-
- - -
+ + +
+ +
diff --git a/agent/certificates.php b/agent/certificates.php index 7eed499df..767495ba3 100644 --- a/agent/certificates.php +++ b/agent/certificates.php @@ -77,8 +77,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Certificates

@@ -95,16 +95,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
@@ -140,7 +140,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
+ + - - "> - +
+ "> + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + - + - - - + + + + + - + + + - + - -
+
+ +
+ 		+ + Name + + + + Domain + + + + Issued By + + + + Expire + + + + Client + + Action
- + +
- - Name - - - - Domain - - - - Issued By - - - - Expire - - - - Client - - Action
-
- - -
- 		- -
- -
-
-
-
+
+ +
+ +
+
+
- -
-
- -
- - 		+
+ +
- 		-
- -
- - Edit +
+
+ +
+ + Edit + +
+ + Refresh Certificate + + + +
+ + Restore
- - Refresh Certificate + + Delete + + +
+ + Archive - - -
- - Restore - -
- - Delete - - -
- - Archive - - - -
+ +
-
+ + - -
- +
+
diff --git a/agent/clients.php b/agent/clients.php index af94422be..ef2201977 100644 --- a/agent/clients.php +++ b/agent/clients.php @@ -106,22 +106,20 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
-
- " autofocus> - - -
+
+ " autofocus> + +
-
+
" title="Clients">Clients ">Leads @@ -200,7 +198,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
- +
+ @@ -223,8 +221,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- +
+ @@ -265,8 +263,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- +
+ -
+
-
+
-
+
@@ -181,7 +181,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
+
+ + -
- - "> +
+
+ "> + + + + + + + + + + + + + + + $contact_title"; + } + $contact_department = escapeHtml($row['contact_department']) ?: '-'; + $contact_extension = escapeHtml($row['contact_extension']); + if (empty($contact_extension)) { + $contact_extension_display = ""; + } else { + $contact_extension_display = "x$contact_extension"; + } + $contact_phone_country_code = escapeHtml($row['contact_phone_country_code']); + $contact_phone = escapeHtml(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); + if (empty($contact_phone)) { + $contact_phone_display = ""; + } else { + $contact_phone_display = ""; + } + $contact_mobile_country_code = escapeHtml($row['contact_mobile_country_code']); + $contact_mobile = escapeHtml(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); + if (empty($contact_mobile)) { + $contact_mobile_display = ""; + } else { + $contact_mobile_display = "
$contact_mobile
"; + } + $contact_email = escapeHtml($row['contact_email']); + if (empty($contact_email)) { + $contact_email_display = ""; + } else { + $contact_email_display = "
$contact_email
"; + } + $contact_info_display = "$contact_phone_display $contact_mobile_display $contact_email_display"; + if (empty($contact_info_display)) { + $contact_info_display = "-"; + } + $contact_pin = escapeHtml($row['contact_pin']); + $contact_photo = escapeHtml($row['contact_photo']); + $contact_initials = initials($contact_name); + $contact_notes = escapeHtml($row['contact_notes']); + $contact_primary = intval($row['contact_primary']); + $contact_important = intval($row['contact_important']); + $contact_billing = intval($row['contact_billing']); + $contact_technical = intval($row['contact_technical']); + $contact_created_at = escapeHtml($row['contact_created_at']); + $contact_archived_at = escapeHtml($row['contact_archived_at']); + if ($contact_primary == 1) { + $contact_primary_display = "Primary Contact"; + } else { + $contact_primary_display = false; + } + $contact_location_id = intval($row['contact_location_id']); + $location_name = escapeHtml($row['location_name']); + if (empty($location_name)) { + $location_name = "N/A"; + } + $location_archived_at = escapeHtml($row['location_archived_at']); + if ($location_archived_at) { + $location_name_display = "
$location_name
"; + } else { + $location_name_display = $location_name; + } + $auth_method = escapeHtml($row['user_auth_method']); + $contact_user_id = intval($row['contact_user_id']); + if ($contact_user_id) { + $user_exists_display = ""; + } else { + $user_exists_display = ""; + } + + // Counts + + // Asset Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_contact_id = $contact_id AND asset_archived_at IS NULL")); + $asset_count = $row['num']; + if ($asset_count) { + $asset_count_display = "$asset_count"; + } else { + $asset_count_display = ''; + } + + // Credential Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_contact_id = $contact_id AND credential_archived_at IS NULL")); + $credential_count = $row['num']; + if ($credential_count) { + $credential_count_display = "$credential_count"; + } else { + $credential_count_display = ''; + } + + // Software Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id AND software_archived_at IS NULL")); + $software_count = $row['num']; + if ($software_count) { + $software_count_display = "$software_count"; + } else { + $software_count_display = ''; + } + + // Ticket Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_contact_id = $contact_id AND ticket_archived_at IS NULL")); + $ticket_count = $row['num']; + if ($ticket_count) { + $ticket_count_display = "$ticket_count"; + } else { + $ticket_count_display = ''; + } + + // Tags + $contact_tag_name_display_array = array(); + $contact_tag_id_array = array(); + $sql_contact_tags = mysqli_query($mysqli, "SELECT tag_color, tag_icon, contact_tags.tag_id, tag_name FROM contact_tags LEFT JOIN tags ON contact_tags.tag_id = tags.tag_id WHERE contact_id = $contact_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_assoc($sql_contact_tags)) { + + $contact_tag_id = intval($row['tag_id']); + $contact_tag_name = escapeHtml($row['tag_name']); + $contact_tag_color = escapeHtml($row['tag_color']); + if (empty($contact_tag_color)) { + $contact_tag_color = "dark"; + } + $contact_tag_icon = escapeHtml($row['tag_icon']); + if (empty($contact_tag_icon)) { + $contact_tag_icon = "tag"; + } + + $contact_tag_id_array[] = $contact_tag_id; + $contact_tag_name_display_array[] = "$contact_tag_name"; + } + $contact_tags_display = implode('', $contact_tag_name_display_array); + + ?> - - - - + + + + + + - + - - - - - $contact_title"; - } - $contact_department = escapeHtml($row['contact_department']) ?: '-'; - $contact_extension = escapeHtml($row['contact_extension']); - if (empty($contact_extension)) { - $contact_extension_display = ""; - } else { - $contact_extension_display = "x$contact_extension"; - } - $contact_phone_country_code = escapeHtml($row['contact_phone_country_code']); - $contact_phone = escapeHtml(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); - if (empty($contact_phone)) { - $contact_phone_display = ""; - } else { - $contact_phone_display = ""; - } - $contact_mobile_country_code = escapeHtml($row['contact_mobile_country_code']); - $contact_mobile = escapeHtml(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); - if (empty($contact_mobile)) { - $contact_mobile_display = ""; - } else { - $contact_mobile_display = "
$contact_mobile
"; - } - $contact_email = escapeHtml($row['contact_email']); - if (empty($contact_email)) { - $contact_email_display = ""; - } else { - $contact_email_display = "
$contact_email
"; - } - $contact_info_display = "$contact_phone_display $contact_mobile_display $contact_email_display"; - if (empty($contact_info_display)) { - $contact_info_display = "-"; - } - $contact_pin = escapeHtml($row['contact_pin']); - $contact_photo = escapeHtml($row['contact_photo']); - $contact_initials = initials($contact_name); - $contact_notes = escapeHtml($row['contact_notes']); - $contact_primary = intval($row['contact_primary']); - $contact_important = intval($row['contact_important']); - $contact_billing = intval($row['contact_billing']); - $contact_technical = intval($row['contact_technical']); - $contact_created_at = escapeHtml($row['contact_created_at']); - $contact_archived_at = escapeHtml($row['contact_archived_at']); - if ($contact_primary == 1) { - $contact_primary_display = "Primary Contact"; - } else { - $contact_primary_display = false; - } - $contact_location_id = intval($row['contact_location_id']); - $location_name = escapeHtml($row['location_name']); - if (empty($location_name)) { - $location_name = "N/A"; - } - $location_archived_at = escapeHtml($row['location_archived_at']); - if ($location_archived_at) { - $location_name_display = "
$location_name
"; - } else { - $location_name_display = $location_name; - } - $auth_method = escapeHtml($row['user_auth_method']); - $contact_user_id = intval($row['contact_user_id']); - if ($contact_user_id) { - $user_exists_display = ""; - } else { - $user_exists_display = ""; - } - - // Counts - - // Asset Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_contact_id = $contact_id AND asset_archived_at IS NULL")); - $asset_count = $row['num']; - if ($asset_count) { - $asset_count_display = "$asset_count"; - } else { - $asset_count_display = ''; - } - - // Credential Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_contact_id = $contact_id AND credential_archived_at IS NULL")); - $credential_count = $row['num']; - if ($credential_count) { - $credential_count_display = "$credential_count"; - } else { - $credential_count_display = ''; - } - - // Software Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id AND software_archived_at IS NULL")); - $software_count = $row['num']; - if ($software_count) { - $software_count_display = "$software_count"; - } else { - $software_count_display = ''; - } - - // Ticket Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_contact_id = $contact_id AND ticket_archived_at IS NULL")); - $ticket_count = $row['num']; - if ($ticket_count) { - $ticket_count_display = "$ticket_count"; - } else { - $ticket_count_display = ''; - } - - // Tags - $contact_tag_name_display_array = array(); - $contact_tag_id_array = array(); - $sql_contact_tags = mysqli_query($mysqli, "SELECT tag_color, tag_icon, contact_tags.tag_id, tag_name FROM contact_tags LEFT JOIN tags ON contact_tags.tag_id = tags.tag_id WHERE contact_id = $contact_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_assoc($sql_contact_tags)) { - - $contact_tag_id = intval($row['tag_id']); - $contact_tag_name = escapeHtml($row['tag_name']); - $contact_tag_color = escapeHtml($row['tag_color']); - if (empty($contact_tag_color)) { - $contact_tag_color = "dark"; - } - $contact_tag_icon = escapeHtml($row['tag_icon']); - if (empty($contact_tag_icon)) { - $contact_tag_icon = "tag"; - } - - $contact_tag_id_array[] = $contact_tag_id; - $contact_tag_name_display_array[] = "$contact_tag_name"; - } - $contact_tags_display = implode('', $contact_tag_name_display_array); - - ?> - - - - - - - - - - - - + + + - + ?> - -
+
+ +
+ 		+ + Name + + + + Department + + Contact + + Location + + + + Client + + Action
- +
- - Name + + +
+ + + "> + + + + + + + + +
+
">
+ +
+ +
+ +
+ +
+
- - 		- - Department - - Contact - - Location - - + + - - Client - - Action
-
- -
- 		- -
- - - "> - +
+
+ +
+ + Details + + + Make Note + + + Edit + + + +
+ + Restore + - - - - +
+ + Archive + +
+ + Anonymize & Archive + -
-
">
- -
- -
- -
- -
-
- - -
- - -
- -
- - Details + +
+ + Delete - - Make Note - - - Edit - - - -
- - Restore - - -
- - Archive - -
- - Anonymize & Archive - - - - -
- - Delete - - -
+
-
-
- - -
+ + +
+ +
diff --git a/agent/credentials.php b/agent/credentials.php index a18cdbcba..fef71071a 100644 --- a/agent/credentials.php +++ b/agent/credentials.php @@ -100,8 +100,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Credentials

= 2) { ?> @@ -129,23 +129,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
-
+
@@ -192,7 +192,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
+
+ + -
- - text-nowrap"> - - - - - - - - - - - - - - - - +
-
- -
- 		- - Name - - Username / IDPassword / KeyOTP - - URI - - - - Client - - Action
+ text-nowrap"> + + + + + + + + + + + + + + + + " . truncate($credential_uri,40) . ""; + while ($row = mysqli_fetch_assoc($sql)) { + $client_id = intval($row['client_id']); + $client_name = escapeHtml($row['client_name']); + $credential_id = intval($row['c_credential_id']); + $credential_name = escapeHtml($row['credential_name']); + $credential_description = escapeHtml($row['credential_description']); + $credential_uri = escapeUrl($row['credential_uri']); + if (empty($credential_uri)) { + $credential_uri_display = "-"; + } else { + $credential_uri_display = "" . truncate($credential_uri,40) . ""; + } + $credential_uri_2 = escapeUrl($row['credential_uri_2']); + $credential_username = escapeHtml(decryptCredentialEntry($row['credential_username'])); + if (empty($credential_username)) { + $credential_username_display = "-"; + } else { + $credential_username_display = "$credential_username"; + } + $credential_otp_secret = escapeHtml($row['credential_otp_secret']); + if (empty($credential_otp_secret)) { + $otp_display = "-"; + } else { + $otp_display = " Hover.."; + } + $credential_note = escapeHtml($row['credential_note']); + $credential_created_at = escapeHtml($row['credential_created_at']); + $credential_archived_at = escapeHtml($row['credential_archived_at']); + $credential_favorite = intval($row['credential_favorite']); + $credential_contact_id = intval($row['credential_contact_id']); + $contact_name = escapeHtml($row['contact_name']); + $credential_asset_id = intval($row['credential_asset_id']); + $asset_name = escapeHtml($row['asset_name']); + + // Tags + $credential_tag_name_display_array = array(); + $credential_tag_id_array = array(); + $sql_credential_tags = mysqli_query($mysqli, "SELECT tag_color, tag_icon, credential_tags.tag_id, tag_name FROM credential_tags LEFT JOIN tags ON credential_tags.tag_id = tags.tag_id WHERE credential_id = $credential_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_assoc($sql_credential_tags)) { + + $credential_tag_id = intval($row['tag_id']); + $credential_tag_name = escapeHtml($row['tag_name']); + $credential_tag_color = escapeHtml($row['tag_color']); + if (empty($credential_tag_color)) { + $credential_tag_color = "dark"; } - $credential_uri_2 = escapeUrl($row['credential_uri_2']); - $credential_username = escapeHtml(decryptCredentialEntry($row['credential_username'])); - if (empty($credential_username)) { - $credential_username_display = "-"; - } else { - $credential_username_display = "$credential_username"; - } - $credential_otp_secret = escapeHtml($row['credential_otp_secret']); - if (empty($credential_otp_secret)) { - $otp_display = "-"; - } else { - $otp_display = " Hover.."; - } - $credential_note = escapeHtml($row['credential_note']); - $credential_created_at = escapeHtml($row['credential_created_at']); - $credential_archived_at = escapeHtml($row['credential_archived_at']); - $credential_favorite = intval($row['credential_favorite']); - $credential_contact_id = intval($row['credential_contact_id']); - $contact_name = escapeHtml($row['contact_name']); - $credential_asset_id = intval($row['credential_asset_id']); - $asset_name = escapeHtml($row['asset_name']); - - // Tags - $credential_tag_name_display_array = array(); - $credential_tag_id_array = array(); - $sql_credential_tags = mysqli_query($mysqli, "SELECT tag_color, tag_icon, credential_tags.tag_id, tag_name FROM credential_tags LEFT JOIN tags ON credential_tags.tag_id = tags.tag_id WHERE credential_id = $credential_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_assoc($sql_credential_tags)) { - - $credential_tag_id = intval($row['tag_id']); - $credential_tag_name = escapeHtml($row['tag_name']); - $credential_tag_color = escapeHtml($row['tag_color']); - if (empty($credential_tag_color)) { - $credential_tag_color = "dark"; - } - $credential_tag_icon = escapeHtml($row['tag_icon']); - if (empty($credential_tag_icon)) { - $credential_tag_icon = "tag"; - } - - $credential_tag_id_array[] = $credential_tag_id; - $credential_tag_name_display_array[] = "$credential_tag_name"; - } - $credential_tags_display = implode('', $credential_tag_name_display_array); - - if ($credential_contact_id) { - $credential_contact_display = " - "; - } else { - $credential_contact_display = ''; + $credential_tag_icon = escapeHtml($row['tag_icon']); + if (empty($credential_tag_icon)) { + $credential_tag_icon = "tag"; } - if ($credential_asset_id) { - $credential_asset_display = " - "; - } else { - $credential_asset_display = ''; - } - - // Check if shared - $sql_shared = mysqli_query( - $mysqli, - "SELECT item_active, item_created_at, item_expire_at, item_id, item_key, item_note, item_recipient, - item_related_id, item_type, item_view_limit, item_views FROM shared_items - WHERE item_client_id = $client_id - AND item_active = 1 - AND (COALESCE(item_view_limit, 0) = 0 OR item_views < item_view_limit) - AND item_expire_at > NOW() - AND item_type = 'Credential' - AND item_related_id = $credential_id - LIMIT 1" - ); - if (mysqli_num_rows($sql_shared) > 0) { - $row = mysqli_fetch_assoc($sql_shared); - $item_id = intval($row['item_id']); - $item_active = escapeHtml($row['item_active']); - $item_key = escapeHtml($row['item_key']); - $item_type = escapeHtml($row['item_type']); - $item_related_id = intval($row['item_related_id']); - $item_note = escapeHtml($row['item_note']); - $item_recipient = escapeHtml($row['item_recipient']); - $item_views = escapeHtml($row['item_views']); - $item_view_limit = escapeHtml($row['item_view_limit']); - $item_created_at = escapeHtml($row['item_created_at']); - $item_expire_at = escapeHtml($row['item_expire_at']); - $item_expire_at_human = timeAgo($row['item_expire_at']); - } - - - ?> - "> - - - - - - - - - - - - - - $credential_tag_name"; + } + $credential_tags_display = implode('', $credential_tag_name_display_array); + if ($credential_contact_id) { + $credential_contact_display = " + "; + } else { + $credential_contact_display = ''; } - ?> + if ($credential_asset_id) { + $credential_asset_display = " + "; + } else { + $credential_asset_display = ''; + } - -
+
+ +
+ 		+ + Name + + Username / IDPassword / KeyOTP + + URI + + + + Client + + Action
-
- -
- 		- -
- -
-
"; } ?>
-
- -
- -
- -
-
- - 		- - - - 0) { ?> -
- -
Shared -
- -
-
- - 		-
- -
- -
- - - - - - -
- - - - -
-
- -
- -
- - Edit - -
- - )"> - Share - - - = 2) { ?> - -
- - Restore - - = 3) { ?> -
- - Delete - - - -
- - Archive - - - -
-
-
-
-
- - -
+ // Check if shared + $sql_shared = mysqli_query( + $mysqli, + "SELECT item_active, item_created_at, item_expire_at, item_id, item_key, item_note, item_recipient, + item_related_id, item_type, item_view_limit, item_views FROM shared_items + WHERE item_client_id = $client_id + AND item_active = 1 + AND (COALESCE(item_view_limit, 0) = 0 OR item_views < item_view_limit) + AND item_expire_at > NOW() + AND item_type = 'Credential' + AND item_related_id = $credential_id + LIMIT 1" + ); + if (mysqli_num_rows($sql_shared) > 0) { + $row = mysqli_fetch_assoc($sql_shared); + $item_id = intval($row['item_id']); + $item_active = escapeHtml($row['item_active']); + $item_key = escapeHtml($row['item_key']); + $item_type = escapeHtml($row['item_type']); + $item_related_id = intval($row['item_related_id']); + $item_note = escapeHtml($row['item_note']); + $item_recipient = escapeHtml($row['item_recipient']); + $item_views = escapeHtml($row['item_views']); + $item_view_limit = escapeHtml($row['item_view_limit']); + $item_created_at = escapeHtml($row['item_created_at']); + $item_expire_at = escapeHtml($row['item_expire_at']); + $item_expire_at_human = timeAgo($row['item_expire_at']); + } + + + ?> + "> + +
+ +
+ + + +
+ +
+
"; } ?>
+
+ +
+ +
+ +
+
+ + + + + + + + + + + 0) { ?> +
+ +
Shared +
+ +
+
+ + + + + + +
+ +
+ +
+ + + + + + +
+ + + + +
+
+ +
+ +
+ + Edit + +
+ + )"> + Share + + + = 2) { ?> + +
+ + Restore + + = 3) { ?> +
+ + Delete + + + +
+ + Archive + + + +
+
+
+ + + + + + + +
+ +
diff --git a/agent/domains.php b/agent/domains.php index 82dc7dede..c4d2270de 100644 --- a/agent/domains.php +++ b/agent/domains.php @@ -87,8 +87,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Domains

@@ -106,15 +106,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
@@ -122,7 +122,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -170,7 +170,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
"> + class="btn btn-"> Archived -
-
+
+
-
- - - - - - text-nowrap"> - + + + + + +
+ text-nowrap"> + + + + + + + + + + + + + + + + + $domain_registrar_name + " : "-"; + $domain_webhost_name_display = $domain_webhost_name ? " + + $domain_webhost_name + " : "-"; + $domain_dnshost_name_display = $domain_dnshost_name ? " + + $domain_dnshost_name + " : "-"; + $domain_mailhost_name_display = $domain_mailhost_name ? " + + $domain_mailhost_name + " : "-"; + + ?> + - - - - - - - - - - - - - - - $domain_registrar_name - " : "-"; - $domain_webhost_name_display = $domain_webhost_name ? " - - $domain_webhost_name - " : "-"; - $domain_dnshost_name_display = $domain_dnshost_name ? " - - $domain_dnshost_name - " : "-"; - $domain_mailhost_name_display = $domain_mailhost_name ? " - - $domain_mailhost_name - " : "-"; - - ?> - - - - - - - - - - + + + + + + + + + + + + - + + + - + - -
+
+ +
+ 		+ + Domain + + + + Registrar + + + + Web Host + + + + DNS Host + + + + Mail Host + + + + Expires + + + + Client + + Action
- +
- - Domain - - - - Registrar - - - - Web Host - - - - DNS Host - - - - Mail Host - - - - Expires - - - - Client - - Action
-
- -
- 		- -
- -
-
-
-
+
+ +
+ +
+
+
- -
-
- -
- - 		+
+ +
- 		-
- -
- - Edit +
+
+ +
+ + Edit + +
+ + Refresh Records + + + +
+ + Restore
- - Refresh Records + + Delete + + +
+ + Archive - - -
- - Restore - -
- - Delete - - -
- - Archive - - -
+
-
+ + -
-
- +
+
diff --git a/agent/expenses.php b/agent/expenses.php index d79e391e4..71fa98d2a 100644 --- a/agent/expenses.php +++ b/agent/expenses.php @@ -63,8 +63,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Expenses

@@ -80,9 +80,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
-
+
+ +
@@ -127,11 +127,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" id="advancedFilter"> -
+
" id="advancedFilter"> +
-
- +
+ @@ -139,8 +139,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- +
+ @@ -180,8 +180,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- +
+ +
+ + + + Date + + + + + Category + + / + + Description + + + + + Vendor + + + + + Amount + + + + + Account + + + + + Client + + + Action + + + + "; + } + + ?> -
- - "> - - - - - - + + + + + + + - - + - while ($row = mysqli_fetch_assoc($sql)) { - $expense_id = intval($row['expense_id']); - $expense_date = escapeHtml($row['expense_date']); - $expense_amount = floatval($row['expense_amount']); - $expense_currency_code = escapeHtml($row['expense_currency_code']); - $expense_description = escapeHtml($row['expense_description']); - $expense_receipt = escapeHtml($row['expense_receipt']); - $expense_reference = escapeHtml($row['expense_reference']); - $expense_created_at = escapeHtml($row['expense_created_at']); - $expense_vendor_id = intval($row['expense_vendor_id']); - $vendor_name = escapeHtml($row['vendor_name']); - $expense_category_id = intval($row['expense_category_id']); - $category_name = escapeHtml($row['category_name']); - $account_name = escapeHtml($row['account_name']); - $expense_account_id = intval($row['expense_account_id']); - $client_name = escapeHtml($row['client_name']); - if(empty($client_name)) { - $client_name_display = "-"; - } else { - $client_name_display = $client_name; - } - $expense_client_id = intval($row['expense_client_id']); - - if (empty($expense_receipt)) { - $receipt_attached = ""; - } else { - $path_info = pathinfo($expense_receipt); - $ext = $path_info['extension']; - $receipt_attached = ""; - } - - ?> - - - - - - - - - - - - - - - -
- +
- - Date + + + + - - - - Category - - / - - Description - - - - Vendor - - - - Amount - - - - Account - - - - Client - - Action + +
+ 		+
+ +
+ + " download=""> + Download + +
+ + + Edit + + + Copy + +
+ + Refund + +
+ + Delete + +
+
+
-
- -
- 		- - - - - - -
- 		-
- -
- - " download=""> - Download - -
- - - Edit - - - Copy - -
- - Refund - -
- - Delete - -
-
-
-
- + +
+
diff --git a/agent/files.php b/agent/files.php index 6cc9c014a..7265c98d5 100644 --- a/agent/files.php +++ b/agent/files.php @@ -676,7 +676,7 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
- +
"> + = 3 && lookupUserPermission("module_financial") >= 3) { ?> + + + + + + + + + + + + + + + + + + + +
diff --git a/agent/income.php b/agent/income.php index 9ae2a61d2..118019a10 100644 --- a/agent/income.php +++ b/agent/income.php @@ -161,8 +161,8 @@ $summary_total_income = floatval($row['total_income']); ?> -
-
+
+

Income

= 2) { ?> @@ -187,21 +187,21 @@ $summary_total_income = floatval($row['total_income']);
-
- +
+ -
+
-
+
-
+
@@ -234,7 +234,7 @@ $summary_total_income = floatval($row['total_income']);
-
+
@@ -323,227 +323,226 @@ $summary_total_income = floatval($row['total_income']);
-
+
-
-
- -
-
-

-

Invoice Payments

-
-
- -
+
+
+ +
+
+

+

Invoice Payments

+
+
+
- - -
- -
-
-

-

Other Revenue

-
-
- -
-
-
- - -
- -
-
-

-

Total Income

-
-
- -
-
-
-
+ -
- - text-nowrap"> - - = 3 && lookupUserPermission("module_financial") >= 3) { ?> - - - - - - - - - - - - - - - - - - + +
+
+

+

Other Revenue

+
+
+ +
+
+ + - while ($row = mysqli_fetch_assoc($sql)) { - $income_type = escapeHtml($row['income_type']); - $income_id = intval($row['income_id']); - $income_date = escapeHtml($row['income_date']); - $income_invoice_id = intval($row['income_invoice_id']); - $income_source = escapeHtml($row['income_source']); - $income_category = escapeHtml($row['income_category']); - $income_client_id = intval($row['income_client_id']); - $income_client = escapeHtml($row['income_client']); - $income_amount = floatval($row['income_amount']); - $income_currency_code = escapeHtml($row['income_currency_code']); - $income_method = escapeHtml($row['income_method']); - $income_reference = escapeHtml($row['income_reference']); - if (empty($income_reference)) { - $income_reference_display = "-"; - } else { - $income_reference_display = $income_reference; - } - $income_account = escapeHtml($row['income_account']); - $income_account_archived = escapeHtml($row['income_account_archived']); - if (empty($income_account_archived)) { - $income_account_archived_display = ""; - } else { - $income_account_archived_display = "Archived - "; - } +
+ +
+
+

+

Total Income

+
+
+ +
+
+
+ + - // Each type keeps its own edit modal and delete handler - if ($income_type == 'Payment') { - $income_edit_modal = "modals/payment/payment_edit.php?id=$income_id"; - $income_delete_action = "delete_payment=$income_id"; - $income_type_badge = "bg-primary"; - } else { - $income_edit_modal = "modals/revenue/revenue_edit.php?id=$income_id"; - $income_delete_action = "delete_revenue=$income_id"; - $income_type_badge = "bg-info"; - } +
+
-
- -
- 		- - Date - - - - Type - - - - Source - - - - Category - - - - Client - - - - Amount - - - - Method - - - - Reference - - - - Account - - Action
+ text-nowrap"> + + = 3 && lookupUserPermission("module_financial") >= 3) { ?> + + + + + + + + + + + + + + + + + + - - - = 3 && lookupUserPermission("module_financial") >= 3) { ?> - - - - - - - - - - - - - - - - - - -
+
+ +
+ 		+ + Date + + + + Type + + + + Source + + + + Category + + + + Client + + + + Amount + + + + Method + + + + Reference + + + + Account + + Action
-
- -
- 		- - - - - - - - - - - - - - - - - - - - = 3) { ?> -
- -
- - Edit - -
- - Delete - -
-
- -
-
- +
+
+ +
+ 		+ + + + + + + + + + + + + + + + - + + + = 3) { ?> +
+ +
+ + Edit + +
+ + Delete + +
+
+ +
+
diff --git a/agent/invoices.php b/agent/invoices.php index 7c39b75e4..a38c77d33 100644 --- a/agent/invoices.php +++ b/agent/invoices.php @@ -161,8 +161,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
+
+

Invoices

@@ -183,15 +183,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
+
+ -
+
-
+
@@ -200,7 +200,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -256,215 +256,214 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- -
- - text-nowrap"> - - - - - - - - - - - - - - - - - - $recurring_invoice_prefix$recurring_invoice_number"; - } else { - $recurring_invoice_display = "-"; - } - - $now = time(); - - if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now) { - $overdue_color = "text-danger fw-bold"; - } else { - $overdue_color = ""; - } - - $invoice_badge_color = getInvoiceBadgeColor($invoice_status); - - // Saved Payment Methods - $sql_saved_payment_methods = mysqli_query($mysqli, " - SELECT 1 FROM client_saved_payment_methods - LEFT JOIN payment_providers - ON client_saved_payment_methods.saved_payment_provider_id = payment_providers.payment_provider_id - WHERE saved_payment_client_id = $client_id - AND payment_provider_active = 1; - "); - - ?> - - - - - - - - - - - - - - - - - - + + +
+
-
- -
- 		- - Number - - - - Scope - - - - Client - - - - Amount - - - - Date - - - - Due - - - - Category - - - - Status - - RecurringAction
-
- -
- 		- - - - - - - - - - - - - - - - -
- -
- - - Add Payment - -
- 0 && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?> - Pay with Saved Card -
- - - - Edit - - - Copy - -
- - - Send Email - -
- - - - Mark Sent - -
- - - Delete - -
-
-
+ text-nowrap"> + + + + + + + + + + + + + + + + + + $recurring_invoice_prefix$recurring_invoice_number"; + } else { + $recurring_invoice_display = "-"; + } + + $now = time(); + + if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now) { + $overdue_color = "text-danger fw-bold"; + } else { + $overdue_color = ""; + } + + $invoice_badge_color = getInvoiceBadgeColor($invoice_status); + + // Saved Payment Methods + $sql_saved_payment_methods = mysqli_query($mysqli, " + SELECT 1 FROM client_saved_payment_methods + LEFT JOIN payment_providers + ON client_saved_payment_methods.saved_payment_provider_id = payment_providers.payment_provider_id + WHERE saved_payment_client_id = $client_id + AND payment_provider_active = 1; + "); ?> - -
+
+ +
+ 		+ + Number + + + + Scope + + + + Client + + + + Amount + + + + Date + + + + Due + + + + Category + + + + Status + + RecurringAction
-
-
- -
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + Add Payment + +
+ 0 && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?> + Pay with Saved Card +
+ + + + Edit + + + Copy + +
+ + + Send Email + +
+ + + + Mark Sent + +
+ + + Delete + +
+
+ + + + + + + +
+ +
diff --git a/agent/locations.php b/agent/locations.php index 767c25abf..803c737cc 100644 --- a/agent/locations.php +++ b/agent/locations.php @@ -74,8 +74,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Locations

@@ -99,23 +99,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
-
+
@@ -172,7 +172,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
"> + class="btn btn-"> Archived -
-
- +
+ + -
- - "> +
+
+ "> + + + + + + + + + + + + + + ') ?: '-'; + $location_phone_country_code = escapeHtml($row['location_phone_country_code']); + $location_phone = escapeHtml(formatPhoneNumber($row['location_phone'], $location_phone_country_code)); + if (empty($location_phone)) { + $location_phone_display = "-"; + } else { + $location_phone_display = $location_phone; + } + $location_fax_country_code = escapeHtml($row['location_fax_country_code']); + $location_fax = escapeHtml(formatPhoneNumber($row['location_fax'], $location_fax_country_code)); + if ($location_fax) { + $location_fax_display = "
Fax: $location_fax
"; + } else { + $location_fax_display = ''; + } + $location_hours = escapeHtml($row['location_hours']); + if (empty($location_hours)) { + $location_hours_display = "-"; + } else { + $location_hours_display = $location_hours; + } + $location_photo = escapeHtml($row['location_photo']); + $location_notes = escapeHtml($row['location_notes']); + $location_created_at = escapeHtml($row['location_created_at']); + $location_archived_at = escapeHtml($row['location_archived_at']); + $location_contact_id = intval($row['location_contact_id']); + $location_primary = intval($row['location_primary']); + if ( $location_primary == 1 ) { + $location_primary_display = " Primary"; + } else { + $location_primary_display = ""; + } + + // Tags + + $location_tag_name_display_array = array(); + $location_tag_id_array = array(); + $sql_location_tags = mysqli_query($mysqli, "SELECT tag_color, tag_icon, location_tags.tag_id, tag_name FROM location_tags LEFT JOIN tags ON location_tags.tag_id = tags.tag_id WHERE location_tags.location_id = $location_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_assoc($sql_location_tags)) { + + $location_tag_id = intval($row['tag_id']); + $location_tag_name = escapeHtml($row['tag_name']); + $location_tag_color = escapeHtml($row['tag_color']); + if (empty($location_tag_color)) { + $location_tag_color = "dark"; + } + $location_tag_icon = escapeHtml($row['tag_icon']); + if (empty($location_tag_icon)) { + $location_tag_icon = "tag"; + } + + $location_tag_id_array[] = $location_tag_id; + $location_tag_name_display_array[] = "$location_tag_name"; + } + $location_tags_display = implode('', $location_tag_name_display_array); + + ?> - - - - - - - - - - - - ') ?: '-'; - $location_phone_country_code = escapeHtml($row['location_phone_country_code']); - $location_phone = escapeHtml(formatPhoneNumber($row['location_phone'], $location_phone_country_code)); - if (empty($location_phone)) { - $location_phone_display = "-"; - } else { - $location_phone_display = $location_phone; - } - $location_fax_country_code = escapeHtml($row['location_fax_country_code']); - $location_fax = escapeHtml(formatPhoneNumber($row['location_fax'], $location_fax_country_code)); - if ($location_fax) { - $location_fax_display = "
Fax: $location_fax
"; - } else { - $location_fax_display = ''; - } - $location_hours = escapeHtml($row['location_hours']); - if (empty($location_hours)) { - $location_hours_display = "-"; - } else { - $location_hours_display = $location_hours; - } - $location_photo = escapeHtml($row['location_photo']); - $location_notes = escapeHtml($row['location_notes']); - $location_created_at = escapeHtml($row['location_created_at']); - $location_archived_at = escapeHtml($row['location_archived_at']); - $location_contact_id = intval($row['location_contact_id']); - $location_primary = intval($row['location_primary']); - if ( $location_primary == 1 ) { - $location_primary_display = " Primary"; - } else { - $location_primary_display = ""; - } - - // Tags - - $location_tag_name_display_array = array(); - $location_tag_id_array = array(); - $sql_location_tags = mysqli_query($mysqli, "SELECT tag_color, tag_icon, location_tags.tag_id, tag_name FROM location_tags LEFT JOIN tags ON location_tags.tag_id = tags.tag_id WHERE location_tags.location_id = $location_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_assoc($sql_location_tags)) { - - $location_tag_id = intval($row['tag_id']); - $location_tag_name = escapeHtml($row['tag_name']); - $location_tag_color = escapeHtml($row['tag_color']); - if (empty($location_tag_color)) { - $location_tag_color = "dark"; - } - $location_tag_icon = escapeHtml($row['tag_icon']); - if (empty($location_tag_icon)) { - $location_tag_icon = "tag"; - } - - $location_tag_id_array[] = $location_tag_id; - $location_tag_name_display_array[] = "$location_tag_name"; - } - $location_tags_display = implode('', $location_tag_name_display_array); - - ?> - - - - - - - - - - - + + + + + + + + + + - -
+
+ +
+ 		+ + Name + + + + Address + + + + Phone + + + + Hours + + + + Client + + Action
- +
- - Name - - - - Address - - - - Phone - - - - Hours - - - - Client - - Action
-
- -
- 		- -
- -
-
>
-
-
- -
- -
- -
-
- - 		- " - target="_blank"> - - - - - -
- -
- - Edit - - - -
- - Restore - - -
- - Delete - - - -
- - Archive - - - +
+ +
+ +
+
>
+
+
+ +
+ +
-
+ " + target="_blank"> + + + + + +
+ +
+ + Edit + + + +
+ + Restore + + +
+ + Delete + + + +
+ + Archive + + - + +
+
+
-
- - -
+ + + + +
+ +
diff --git a/agent/networks.php b/agent/networks.php index b91b164f6..817e1c7f9 100644 --- a/agent/networks.php +++ b/agent/networks.php @@ -75,8 +75,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Networks

@@ -100,16 +100,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
@@ -173,7 +173,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
"> + class="btn btn-"> Archived -
-
+
+
-
- + + - - "> +
+ "> + + + + + + + + + + + + + + + + + $network_secondary_dns"; + } else { + $network_dns_display = "-"; + } + $network_dhcp_range = escapeHtml($row['network_dhcp_range']); + if (empty($network_dhcp_range)) { + $network_dhcp_range_display = "-"; + } else { + $network_dhcp_range_display = $network_dhcp_range; + } + $network_location_id = intval($row['network_location_id']); + $location_name = escapeHtml($row['location_name']); + if (empty($location_name)) { + $location_name_display = "-"; + } else { + $location_name_display = $location_name; + } + $network_archived_at = escapeHtml($row['network_archived_at']); + + ?> - - - - - - + + + + + + + - + - - - - - $network_secondary_dns"; - } else { - $network_dns_display = "-"; - } - $network_dhcp_range = escapeHtml($row['network_dhcp_range']); - if (empty($network_dhcp_range)) { - $network_dhcp_range_display = "-"; - } else { - $network_dhcp_range_display = $network_dhcp_range; - } - $network_location_id = intval($row['network_location_id']); - $location_name = escapeHtml($row['location_name']); - if (empty($location_name)) { - $location_name_display = "-"; - } else { - $location_name_display = $location_name; - } - $network_archived_at = escapeHtml($row['network_archived_at']); - - ?> - - - - - - - - - - - - - - + + + - + - -
+
+ +
+ 		+ + Name + + + + Location + + + + VLAN + + + + Network (CIDR) + + + + Gateway + + + + IP Range + + + + DNS + + + + Client + + Action
- +
- - Name + + +
+ +
+
+
+
+
- - 		- - Location - - - - VLAN - - - - Network (CIDR) - - - - Gateway - - - - IP Range - - - - DNS - - - - Client - - Action
-
- -
- 		- -
- -
-
-
-
-
- - 		-
- -
- - Edit +
+
+ +
+ + Edit + + + +
+ + Restore + +
+ + Delete + + +
+ + Archive - - -
- - Restore - -
- - Delete - - -
- - Archive - - -
+
-
+ + -
-
- +
+
diff --git a/agent/notifications.php b/agent/notifications.php index e471a49f4..2fee78213 100644 --- a/agent/notifications.php +++ b/agent/notifications.php @@ -82,7 +82,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
">
diff --git a/agent/products.php b/agent/products.php index 65e31bfdf..e54a7b6c5 100644 --- a/agent/products.php +++ b/agent/products.php @@ -55,8 +55,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

@@ -85,20 +85,20 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
+
+ -
+
-
+
-
+
+
+ + -
- - text-nowrap"> +
+
+ text-nowrap"> + + + + + + + + + + + + + + + + + $product_description"; + } + $product_qty = intval($row['product_qty']); + $product_code = escapeHtml($row['product_code']); + $product_location = escapeHtml($row['product_location']) ?: '-'; + $product_price = floatval($row['product_price']); + $product_currency_code = escapeHtml($row['product_currency_code']); + $product_created_at = escapeHtml($row['product_created_at']); + $product_archived_at = escapeHtml($row['product_archived_at']); + $category_id = intval($row['category_id']); + $category_name = escapeHtml($row['category_name']); + $product_tax_id = intval($row['product_tax_id']); + $tax_name = escapeHtml($row['tax_name']) ?: '-'; + $tax_percent = floatval($row['tax_percent']); + + + ?> - - + + + - - + + - - - - + + + + + - - + $product_description"; - } - $product_qty = intval($row['product_qty']); - $product_code = escapeHtml($row['product_code']); - $product_location = escapeHtml($row['product_location']) ?: '-'; - $product_price = floatval($row['product_price']); - $product_currency_code = escapeHtml($row['product_currency_code']); - $product_created_at = escapeHtml($row['product_created_at']); - $product_archived_at = escapeHtml($row['product_archived_at']); - $category_id = intval($row['category_id']); - $category_name = escapeHtml($row['category_name']); - $product_tax_id = intval($row['product_tax_id']); - $tax_name = escapeHtml($row['tax_name']) ?: '-'; - $tax_percent = floatval($row['tax_percent']); + } + ?> - ?> - - - - - - - - - - - - - - - - - - - -
+
+ +
+ 		+ + Name + + + + Category + + + + Description + + + + QTY + + + + Location + + + + Tax Name + + + + Tax Rate + + + + Price + + Action
- +
- - Name + + + + $product_code"; } ?> - - - - Category - - - - Description - - - - QTY - - - - Location - - - - Tax Name - - - - Tax Rate - - - - Price - - Action% +
+ +
+ + + Add Stock + +
+ + + Edit + + + +
+ + Restore + + +
+ + Delete + + + +
+ + Archive + + + +
+
+
-
- -
- 		- - - $product_code"; } ?> - - % -
- -
- - - Add Stock - -
- - - Edit - - - -
- - Restore - - -
- - Delete - - - -
- - Archive - - - -
-
-
-
- - -
+ +
+
+ +
diff --git a/agent/projects.php b/agent/projects.php index 4bd99a8b4..8bc737542 100644 --- a/agent/projects.php +++ b/agent/projects.php @@ -49,8 +49,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Projects

= 2) { ?>
@@ -59,31 +59,31 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
+
+ -
+
-
+
-
+
- ">Open - ">Closed + ">Open + ">Closed
"> + class="btn btn-"> Archived
@@ -91,11 +91,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" id="advancedFilter"> -
+
" id="advancedFilter"> +
-
- +
+ @@ -105,201 +105,200 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - text-nowrap"> - - - - - - - - - - - - - - - - - - +
+
- - Number - - - - Project - - Tickets / Tasks - - Due - - - - Completed - - - - Manager - - - - Created - - - - Client - - Action
+ text-nowrap"> + + + + + + + + + + + + + + + + + + $client_name"; - } else { - $client_name_display = "-"; - } + $client_id = intval($row['client_id']); + $client_name = escapeHtml($row['client_name']); + if ($client_name) { + $client_name_display = "$client_name"; + } else { + $client_name_display = "-"; + } - $project_manager = intval($row['user_id']); - if ($project_manager) { - $project_manager_display = escapeHtml($row['user_name']); - } else { - $project_manager_display = "-"; - } + $project_manager = intval($row['user_id']); + if ($project_manager) { + $project_manager_display = escapeHtml($row['user_name']); + } else { + $project_manager_display = "-"; + } - // Get Tasks and Tickets Stats - // Get Tickets - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS count FROM tickets WHERE ticket_project_id = $project_id")); - $ticket_count = $row['count']; + // Get Tasks and Tickets Stats + // Get Tickets + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS count FROM tickets WHERE ticket_project_id = $project_id")); + $ticket_count = $row['count']; - // Get Closed Ticket Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS count FROM tickets WHERE ticket_project_id = $project_id AND ticket_closed_at IS NOT NULL")); - $closed_ticket_count = $row['count']; + // Get Closed Ticket Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS count FROM tickets WHERE ticket_project_id = $project_id AND ticket_closed_at IS NOT NULL")); + $closed_ticket_count = $row['count']; - // Ticket Closed Percent - if($ticket_count) { - $tickets_closed_percent = round(($closed_ticket_count / $ticket_count) * 100); - } - // Get All Tasks - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('task_id') AS count FROM tickets, tasks WHERE ticket_id = task_ticket_id AND ticket_project_id = $project_id")); - $task_count = $row['count']; + // Ticket Closed Percent + if($ticket_count) { + $tickets_closed_percent = round(($closed_ticket_count / $ticket_count) * 100); + } + // Get All Tasks + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('task_id') AS count FROM tickets, tasks WHERE ticket_id = task_ticket_id AND ticket_project_id = $project_id")); + $task_count = $row['count']; - // Get Completed Task Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('task_id') AS count FROM tickets, tasks WHERE ticket_id = task_ticket_id AND ticket_project_id = $project_id AND task_completed_at IS NOT NULL")); - $completed_task_count = $row['count']; - - // Tasks Completed Percent - if($task_count) { - $tasks_completed_percent = round(($completed_task_count / $task_count) * 100); - } - - ?> - - - - - - - - - - - - - - - - - - - -
+ + Number + + + + Project + + Tickets / Tasks + + Due + + + + Completed + + + + Manager + + + + Created + + + + Client + + Action
- - - - - -
- -
-
-
-
-
- - 		- -
- -
/
-
- -"; } ?> - -
- -
/
-
- - 		-
- -
- - - Edit - - - = 2)) { ?> -
- - - Archive - - - - Restore - - = 3)) { ?> -
- - Delete - - - - -
-
-
-
- + + + + + + + + +
+ +
+
+
+
+
+ + + + +
+ +
/
+
+ -
"; } ?> + +
+ +
/
+
+ + + + + + + + + + + + +
+ +
+ + + Edit + + + = 2)) { ?> +
+ + + Archive + + + + Restore + + = 3)) { ?> +
+ + Delete + + + + +
+
+ + + + + + +
+
-
-
+
+

Quotes

= 2) { ?> @@ -57,12 +57,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
+
+ -
+
@@ -76,11 +76,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" id="advancedFilter"> -
+
" id="advancedFilter"> +
-
- +
+ @@ -90,168 +90,167 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - text-nowrap"> - - - - - - - - - - - - - - - - +
+
- - Number - - - - Scope - - - - Client - - - - Amount - - - - Date - - - - Expire - - - - Category - - - - Status - - Action
+ text-nowrap"> + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - -
+ + Number + + + + Scope + + + + Client + + + + Amount + + + + Date + + + + Expire + + + + Category + + + + Status + + Action
- - - - - - - - - - -
- -
- - Edit - - = 2) { ?> - - Copy - - -
- - Email - - - = 3) { ?> -
- - Delete - - - -
-
-
-
- + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + Edit + + = 2) { ?> + + Copy + + +
+ + Email + + + = 3) { ?> +
+ + Delete + + + +
+
+ + + + + + +
+
-
-
+
+

Recurring Expenses

-
-
-
+
+ +
@@ -53,11 +53,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" id="advancedFilter"> -
+
" id="advancedFilter"> +
-
- +
+ @@ -67,152 +67,151 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
- - Next Date - - - - Category - - / - - Description - - - - Vendor - - - - Amount - - - - Frequency - - - - Last Billed - - - - Account - - - - Client - - Action
- - - - - -
- 		-
- -
- - Edit - -
- - Delete - -
-
-
+ "> + + + + + + + + + + + + + + - -
+ + Next Date + + + + Category + + / + + Description + + + + Vendor + + + + Amount + + + + Frequency + + + + Last Billed + + + + Account + + + + Client + + Action
-
- + + + + + + + + +
+ + + + + + + + +
+ +
+ + Edit + +
+ + Delete + +
+
+ + + + + + +
+
-
-
+
+

Recurring Invoices

= 2) { ?>
@@ -72,15 +72,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
+
+ -
+
-
+
@@ -96,9 +96,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
" id="advancedFilter"> -
+
-
+
@@ -109,178 +109,178 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - text-nowrap"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - Number - - - - Next Date - - - - Scope - - - - Client - - - - Amount - - - - Frequency - - - - Last Sent - - - - Category - - - - Auto Pay - - - - Status - - Action
- - - - ly - 0) { ?> -
- - - - -
- - No Cards on File - - 		- - - - - -
- -
- - Edit - - -
- - Delete - - -
-
-
-
-
+ +
+ + text-nowrap"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Number + + + + Next Date + + + + Scope + + + + Client + + + + Amount + + + + Frequency + + + + Last Sent + + + + Category + + + + Auto Pay + + + + Status + + Action
+ + + + ly + 0) { ?> +
+ + + + +
+ + No Cards on File + + 		+ + + + + +
+ +
+ + Edit + + +
+ + Delete + + +
+
+
+
+
-
-
+
+

Recurring Tickets

= 2) { ?>
@@ -99,22 +99,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
-
+
@@ -152,7 +152,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
+ + + + + text-nowrap"> + + + + + + + + + + + + + + = 2) { ?> + + + + + + + + "; + } else { + $recurring_ticket_billable_display = "-"; + } + $recurring_ticket_category = escapeHtml($row['category_name']) ?: '-'; + $recurring_ticket_client_name = escapeHtml($row['client_name']); + $assigned_to = escapeHtml($row['user_name']) ?: '-'; + $recurring_ticket_template_name = escapeHtml($row['ticket_template_name']); + $recurring_ticket_task_count = intval($row['recurring_ticket_task_count']); + ?> -
+
+ +
+ 		+ + Next Run Date + + + + Subject + + + + Category + + + + Priority + + + + Frequency + + + + Billable + + + + Agent + + + + Client + + Action
- text-nowrap"> - + - - - - - - + + + + + + + + + + + + + + + - + = 2) { ?> - - - - - - - - "; - } else { - $recurring_ticket_billable_display = "-"; - } - $recurring_ticket_category = escapeHtml($row['category_name']) ?: '-'; - $recurring_ticket_client_name = escapeHtml($row['client_name']); - $assigned_to = escapeHtml($row['user_name']) ?: '-'; - $recurring_ticket_template_name = escapeHtml($row['ticket_template_name']); - $recurring_ticket_task_count = intval($row['recurring_ticket_task_count']); - ?> - - - - - - - - - - - - - + - = 2) { ?> - - + - + - + - +
- +
- - Next Run Date + + + - - - - Subject - - - - Category - - - - Priority - - - - Frequency - - - - Billable - - - - Agent - - - - Client - + Action
-
- +
+
+ +
+ + Edit + +
+ + Force Reoccur + + +
+ + Delete + + +
- - - - - - - - - - - - - - -
- -
- - Edit - -
- - Force Reoccur - - -
- - Delete - - -
-
-
- - - - -
- - +
+ + +
diff --git a/agent/services.php b/agent/services.php index 6056a2d56..685cee73d 100644 --- a/agent/services.php +++ b/agent/services.php @@ -47,8 +47,8 @@ $sql = mysqli_query( $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
+
+

Services

= 2) { ?> @@ -57,15 +57,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
@@ -108,115 +108,114 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
- - "> - - - - - - - - - - - - - +
- - Name - - - - Category - - - - Importance - - - - Updated - - - - Client - - Action
+ "> + + + + + + + + + + + + + - - - - - - - - - - - - - - - - -
+ + Name + + + + Category + + + + Importance + + + + Updated + + + + Client + + Action
- -
- -
-
-
-
-
- - - 		-
- -
- - Edit - - = 3) { ?> -
- - Delete - - -
-
-
-
- + + + + +
+ +
+
+
+
+
+ + + + + + + + + + + + +
+ +
+ + Edit + + = 3) { ?> +
+ + Delete + + +
+
+ + + + + +
+
-
-
+
+

Software & Licenses

@@ -104,16 +104,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
@@ -121,7 +121,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
@@ -169,7 +169,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
"> + class="btn btn-"> Archived
@@ -177,181 +177,180 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - text-nowrap"> - - - - - - - - - - - - - - - +
+
- - Software - - - - Type - - - - License Type - - - - Seats - - - - Expire - - - - Vendor - - - - Client - - Action
+ text-nowrap"> + + + + + + + + + + + + + + + $vendor_name"; + while ($row = mysqli_fetch_assoc($sql)) { + $client_id = intval($row['client_id']); + $client_name = escapeHtml($row['client_name']); + $software_id = intval($row['software_id']); + $software_name = escapeHtml($row['software_name']); + $software_description = escapeHtml($row['software_description']); + $software_version = escapeHtml($row['software_version']); + $software_type = escapeHtml($row['software_type']); + $software_license_type = escapeHtml($row['software_license_type']) ?: '-'; + $software_seats = escapeHtml($row['software_seats']); + $software_expire = escapeHtml($row['software_expire']); + $vendor_name = escapeHtml($row['vendor_name']); + $vendor_id = intval($row['vendor_id']); + if ($vendor_name) { + $vendor_display = "$vendor_name"; + } else { + $vendor_display = "N/A"; + } + if ($software_expire) { + $software_expire_ago = timeAgo($software_expire); + $software_expire_display = "
$software_expire
$software_expire_ago
"; + + // Convert the expiry date to a timestamp + $software_expire_timestamp = strtotime($row['software_expire']); + $current_timestamp = time(); // Get current timestamp + + // Calculate the difference in days + $days_until_expiry = ($software_expire_timestamp - $current_timestamp) / (60 * 60 * 24); + + // Determine the class based on the number of days until expiry + if ($days_until_expiry <= 0) { + $tr_class = "table-secondary"; + } elseif ($days_until_expiry <= 7) { + $tr_class = "table-danger"; + } elseif ($days_until_expiry <= 45) { + $tr_class = "table-warning"; } else { - $vendor_display = "N/A"; - } - if ($software_expire) { - $software_expire_ago = timeAgo($software_expire); - $software_expire_display = "
$software_expire
$software_expire_ago
"; - - // Convert the expiry date to a timestamp - $software_expire_timestamp = strtotime($row['software_expire']); - $current_timestamp = time(); // Get current timestamp - - // Calculate the difference in days - $days_until_expiry = ($software_expire_timestamp - $current_timestamp) / (60 * 60 * 24); - - // Determine the class based on the number of days until expiry - if ($days_until_expiry <= 0) { - $tr_class = "table-secondary"; - } elseif ($days_until_expiry <= 7) { - $tr_class = "table-danger"; - } elseif ($days_until_expiry <= 45) { - $tr_class = "table-warning"; - } else { - $tr_class = ''; - } - - } else { - $software_expire_display = "N/A"; $tr_class = ''; } - $software_created_at = escapeHtml($row['software_created_at']); - - $seat_count = 0; - - // Asset Licenses - $asset_licenses_sql = mysqli_query($mysqli, "SELECT asset_id FROM software_assets WHERE software_id = $software_id"); - $asset_licenses_array = array(); - while ($row = mysqli_fetch_assoc($asset_licenses_sql)) { - $asset_licenses_array[] = intval($row['asset_id']); - $seat_count = $seat_count + 1; - } - $asset_licenses = implode(',', $asset_licenses_array); - - // Contact Licenses - $contact_licenses_sql = mysqli_query($mysqli, "SELECT contact_id FROM software_contacts WHERE software_id = $software_id"); - $contact_licenses_array = array(); - while ($row = mysqli_fetch_assoc($contact_licenses_sql)) { - $contact_licenses_array[] = intval($row['contact_id']); - $seat_count = $seat_count + 1; - } - $contact_licenses = implode(',', $contact_licenses_array); - - - - ?> - - - - - - - - - - - - - - N/A"; + $tr_class = ''; } - ?> + $software_created_at = escapeHtml($row['software_created_at']); - -
+ + Software + + + + Type + + + + License Type + + + + Seats + + + + Expire + + + + Vendor + + + + Client + + Action
- -
- -
-
$software_version" ?>
-
-
-
- - 		-
- -
- - Edit - -
- - Archive and
Remove Licenses - - -
- - Delete and
Remove Licenses - - -
-
-
-
- + $seat_count = 0; + + // Asset Licenses + $asset_licenses_sql = mysqli_query($mysqli, "SELECT asset_id FROM software_assets WHERE software_id = $software_id"); + $asset_licenses_array = array(); + while ($row = mysqli_fetch_assoc($asset_licenses_sql)) { + $asset_licenses_array[] = intval($row['asset_id']); + $seat_count = $seat_count + 1; + } + $asset_licenses = implode(',', $asset_licenses_array); + + // Contact Licenses + $contact_licenses_sql = mysqli_query($mysqli, "SELECT contact_id FROM software_contacts WHERE software_id = $software_id"); + $contact_licenses_array = array(); + while ($row = mysqli_fetch_assoc($contact_licenses_sql)) { + $contact_licenses_array[] = intval($row['contact_id']); + $seat_count = $seat_count + 1; + } + $contact_licenses = implode(',', $contact_licenses_array); + + + + ?> + + + +
+ +
+
$software_version" ?>
+
+
+
+ + + + + + + + + + + +
+ +
+ + Edit + +
+ + Archive and
Remove Licenses + + +
+ + Delete and
Remove Licenses + + +
+
+ + + + + + +
+
-
-
+
- + -
- -

No tickets match these filters.

- - Clear the filters - -
+
+ +

No tickets match these filters.

+ + Clear the filters + +
- + -
- + + - = 2) { ?> - -
diff --git a/agent/tickets.php b/agent/tickets.php index 0c44ac481..200444875 100644 --- a/agent/tickets.php +++ b/agent/tickets.php @@ -323,8 +323,8 @@ if ($date_filter_active) { ?> -
-
+
+

Tickets Open | @@ -350,7 +350,7 @@ if ($date_filter_active) {

-
+
@@ -364,9 +364,9 @@ if ($date_filter_active) { -
+
-
+
-
" id="advancedFilter"> -
+
" id="advancedFilter"> +
-
+
@@ -437,7 +437,7 @@ if ($date_filter_active) {
-
+
@@ -471,7 +471,7 @@ if ($date_filter_active) {
-
+
@@ -506,7 +506,7 @@ if ($date_filter_active) {
-
+
diff --git a/agent/transactions.php b/agent/transactions.php index 9c9e31a11..f4804e8c8 100644 --- a/agent/transactions.php +++ b/agent/transactions.php @@ -217,8 +217,8 @@ if ($account_filter) { ?> -
-
+
+

Transactions

@@ -227,12 +227,12 @@ if ($account_filter) {
-
- -
+
+ +
-
- +
+
@@ -240,8 +240,8 @@ if ($account_filter) {
-
- +
+ @@ -283,8 +283,8 @@ if ($account_filter) {
-
- +
+ @@ -325,8 +325,8 @@ if ($account_filter) {
-
- +
+ @@ -353,8 +353,8 @@ if ($account_filter) {
-
- +
+ @@ -363,181 +363,181 @@ if ($account_filter) {
-
+
- + -
-
- -
-
-

-

Money In

-
-
- -
+
+
+ +
+
+

+

Money In

+
+
+
- - -
- -
-
-

-

Money Out

-
-
- -
-
-
- - -
- -
"> -
-

-

Net

-
-
- -
-
-
-
+ -
- - "> - - - - - - - - - - - - + +
+
+

+

Money Out

+
+
+ +
+
+ + - while ($row = mysqli_fetch_assoc($sql)) { - $transaction_id = intval($row['transaction_id']); - $transaction_transfer_id = intval($row['transaction_transfer_id']); - $transaction_invoice_id = intval($row['transaction_invoice_id']); - $transaction_type = escapeHtml($row['transaction_type']); - $transaction_date = escapeHtml($row['transaction_date']); - $transaction_description = escapeHtml($row['transaction_description']); - $transaction_category = escapeHtml($row['transaction_category']); - $transaction_other_account = escapeHtml($row['transaction_other_account']); - $transaction_amount = floatval($row['transaction_amount']); - $transaction_balance = floatval($row['transaction_balance']); - $transaction_currency_code = escapeHtml($row['transaction_currency_code']); +
+ +
"> +
+

+

Net

+
+
+ +
+
+
+ + - // Category cell display - transfers show the other account instead of a category - if ($transaction_type == 'Transfer In') { - $transaction_category_display = "From $transaction_other_account"; - } elseif ($transaction_type == 'Transfer Out') { - $transaction_category_display = "To $transaction_other_account"; - } else { - $transaction_category_display = $transaction_category; - } +
+
- - Date - - - - Type - - - - Category - - / - - Description - - - - Amount - - Balance
+ "> + + + + + + + + + + + + - - - - - - - - - - - - From $transaction_other_account"; + } elseif ($transaction_type == 'Transfer Out') { + $transaction_category_display = "To $transaction_other_account"; + } else { + $transaction_category_display = $transaction_category; } + + // Badge color based on type + if ($transaction_type == 'Revenue' || $transaction_type == 'Payment') { + $transaction_badge_color = "success"; + } elseif ($transaction_type == 'Expense') { + $transaction_badge_color = "danger"; + } else { + $transaction_badge_color = "secondary"; + } + + // Amount text color + if ($transaction_amount < 0) { + $transaction_amount_color = "text-danger"; + } else { + $transaction_amount_color = "text-success"; + } + + // Balance text color + if ($transaction_balance < 0) { + $transaction_balance_color = "text-danger"; + } else { + $transaction_balance_color = ""; + } + + // Route the date link to the right edit modal based on type + if ($transaction_type == 'Transfer In' || $transaction_type == 'Transfer Out') { + $transaction_modal_url = "modals/transfer/transfer_edit.php?id=$transaction_transfer_id"; + } elseif ($transaction_type == 'Expense') { + $transaction_modal_url = "modals/expense/expense_edit.php?id=$transaction_id"; + } elseif ($transaction_type == 'Revenue') { + $transaction_modal_url = "modals/revenue/revenue_edit.php?id=$transaction_id"; + } else { + $transaction_modal_url = ""; + } + ?> - -
+ + Date + + + + Type + + + + Category + + / + + Description + + + + Amount + + Balance
- - - - - - - - - - - -
-
-
- + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ @@ -545,7 +545,6 @@ if ($account_filter) { -
-
-
+
+

Transfers

-
-
-
+
+ +
@@ -63,11 +63,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" id="advancedFilter"> -
+
" id="advancedFilter"> +
-
- +
+ @@ -75,8 +75,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- +
+ @@ -117,133 +117,132 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - text-nowrap"> - - - - - - - - - - - - +
+
- - Date - - - - From Account - - - - To Account - - - - Method - - - - Notes - - - - Amount - - Action
+ text-nowrap"> + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - -
+ + Date + + + + From Account + + + + To Account + + + + Method + + + + Notes + + + + Amount + + Action
- - - - -
- -
- - Edit - -
- - Delete - -
-
-
+ + + + +
+ +
+ + Edit + +
+ + Delete + +
+
+
-
- + + + +
+
-
-
+
+

Trips

@@ -52,12 +52,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
+
+ -
+
@@ -70,11 +70,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" id="advancedFilter"> -
+
" id="advancedFilter"> +
-
- +
+ @@ -84,137 +84,136 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- - "> - - - - - - - - - - - - - - - $client_name"; - } - if ($round_trip == 1) { - $round_trip_display = ""; - } else { - $round_trip_display = ""; - } - $user_name = escapeHtml($row['user_name']); - if (empty($user_name)) { - $user_name_display = "-"; - } else { - $user_name_display = $user_name; - } - - ?> - - - - - - - - - - - - - - - - -
- - Date - - - - Driver - - - - Purpose - - - - Source - - - - Destination - - - - Miles - - - - Client - - Action
- - - - $trip_miles $round_trip_display" ?> -
- -
- - Map it - -
- - Edit - - - Copy - -
- - Delete - -
-
-
-
-
+
+ + "> + + + + + + + + + + + + + + + $client_name"; + } + if ($round_trip == 1) { + $round_trip_display = ""; + } else { + $round_trip_display = ""; + } + $user_name = escapeHtml($row['user_name']); + if (empty($user_name)) { + $user_name_display = "-"; + } else { + $user_name_display = $user_name; + } + + ?> + + + + + + + + + + + + + + + + +
+ + Date + + + + Driver + + + + Purpose + + + + Source + + + + Destination + + + + Miles + + + + Client + + Action
+ + + + $trip_miles $round_trip_display" ?> +
+ +
+ + Map it + +
+ + Edit + + + Copy + +
+ + Delete + +
+
+
+
+
-
-
+
+

Vendors

@@ -61,16 +61,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
+
-
+
-
+
@@ -110,178 +110,178 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
- +
-
- - text-nowrap"> - - - - - - - - - - - - + - while ($row = mysqli_fetch_assoc($sql)) { - $vendor_id = intval($row['vendor_id']); - $vendor_name = escapeHtml($row['vendor_name']); - $vendor_description = escapeHtml($row['vendor_description']); - if ($vendor_description) { - $vendor_description_display = $vendor_description; - } else { - $vendor_description_display = "-"; - } - $vendor_account_number = escapeHtml($row['vendor_account_number']); - if ($vendor_account_number) { - $vendor_account_number_display = "
Account #: $vendor_account_number
"; - } else { - $vendor_account_number_display = ''; - } - $vendor_contact_name = escapeHtml($row['vendor_contact_name']); - if ($vendor_contact_name) { - $vendor_contact_name_display = $vendor_contact_name; - } else { - $vendor_contact_name_display = "-"; - } - $vendor_phone_country_code = escapeHtml($row['vendor_phone_country_code']); - $vendor_phone = escapeHtml(formatPhoneNumber($row['vendor_phone'], $vendor_phone_country_code)); - $vendor_extension = escapeHtml($row['vendor_extension']); - $vendor_email = escapeHtml($row['vendor_email']); - $vendor_website = escapeHtml($row['vendor_website']); - if ($vendor_website) { - $vendor_website_display = "$vendor_website "; - } else { - $vendor_website_display = "-"; - } - $vendor_hours = escapeHtml($row['vendor_hours']); - $vendor_sla = escapeHtml($row['vendor_sla']); - $vendor_code = escapeHtml($row['vendor_code']); - $vendor_notes = escapeHtml($row['vendor_notes']); - $vendor_created_at = escapeHtml($row['vendor_created_at']); - $vendor_archived_at = escapeHtml($row['vendor_archived_at']); - $vendor_template_id = intval($row['vendor_template_id']); - $vendor_template_name = escapeHtml($row['vendor_template_name']); - if ($vendor_template_id) { - $vendor_template_display = "
$vendor_template_name
"; - } else { - $vendor_template_display = ""; - } +
+
-
- -
- 		- - Vendor - - - - Description - - - - Contact - - - - Website - - Action
+ text-nowrap"> + + + + + + + + + + + + - - - - - - - - - - - Account #: $vendor_account_number"; + } else { + $vendor_account_number_display = ''; + } + $vendor_contact_name = escapeHtml($row['vendor_contact_name']); + if ($vendor_contact_name) { + $vendor_contact_name_display = $vendor_contact_name; + } else { + $vendor_contact_name_display = "-"; + } + $vendor_phone_country_code = escapeHtml($row['vendor_phone_country_code']); + $vendor_phone = escapeHtml(formatPhoneNumber($row['vendor_phone'], $vendor_phone_country_code)); + $vendor_extension = escapeHtml($row['vendor_extension']); + $vendor_email = escapeHtml($row['vendor_email']); + $vendor_website = escapeHtml($row['vendor_website']); + if ($vendor_website) { + $vendor_website_display = "$vendor_website "; + } else { + $vendor_website_display = "-"; + } + $vendor_hours = escapeHtml($row['vendor_hours']); + $vendor_sla = escapeHtml($row['vendor_sla']); + $vendor_code = escapeHtml($row['vendor_code']); + $vendor_notes = escapeHtml($row['vendor_notes']); + $vendor_created_at = escapeHtml($row['vendor_created_at']); + $vendor_archived_at = escapeHtml($row['vendor_archived_at']); + $vendor_template_id = intval($row['vendor_template_id']); + $vendor_template_name = escapeHtml($row['vendor_template_name']); + if ($vendor_template_id) { + $vendor_template_display = "
$vendor_template_name
"; + } else { + $vendor_template_display = ""; } ?> + + + + +
+
+ +
+ 		+ + Vendor + + + + Description + + + + Contact + + + + Website + + Action
-
- -
- 		- -
- -
-
-
-
-
- - 		- - - - -
- - -
- - -
- - 		-
- -
- - Edit - - - -
- - Restore - - -
- - Delete - - - -
- - Archive - - - -
-
-
+
+ +
+ 		+ +
+ +
+
+
+
+
+ + 		+ + + + +
+ -
-
- - + +
+ + +
+ + + + + +
+ +
+ + Edit + + + +
+ + Restore + + +
+ + Delete + + + +
+ + Archive + + + +
+
+ + + + + + + +
+ + -
diff --git a/css/itflow_custom.css b/css/itflow_custom.css index 3e3cb13ec..8c1263560 100644 --- a/css/itflow_custom.css +++ b/css/itflow_custom.css @@ -550,8 +550,8 @@ a:not(.dropdown-item):not(.btn-app):not(.nav-link):not(.brand-link):not(.page-li .py-3 is a 16px jump that makes the bar noticeably chunky. Bootstrap has no step between the two, hence the named rule. */ .card-footer.itflow-filter-footer { - padding-top: .75rem; - padding-bottom: .75rem; + padding-top: .5rem; + padding-bottom: .5rem; } /* --- Primary button follows the theme ----------------------------------- diff --git a/includes/filter_footer.php b/includes/filter_footer.php index 88ce774dc..a97f84671 100644 --- a/includes/filter_footer.php +++ b/includes/filter_footer.php @@ -18,7 +18,7 @@ if ($total_found_rows > 5) {
-
+
- per page + per page
@@ -53,13 +53,13 @@ if ($total_found_rows > 5) { // Now output something like "Showing X to Y of Z records" ?> -
+

Showing to of records

-
-
    +
    +