diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 21cf847c..84329956 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -custom: ["https://donate.itflow.org"] +custom: ["https://services.itflow.org"] diff --git a/CHANGELOG.md b/CHANGELOG.md index b90e79ec..1ed35904 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ This file documents all notable changes made to ITFlow. +## [25.02] +### Fixed +- Changed several reports over to the new permissions/roles system +- Fixed empty task box showing for resolved/closed tickets + +### Added / Changed +- Client Portal now shows ticket categories + ## [25.01.3] ### Fixed - Fixed ticket assignment modal showing client contacts. diff --git a/admin_custom_link.php b/admin_custom_link.php index 13d705ee..6ade1314 100644 --- a/admin_custom_link.php +++ b/admin_custom_link.php @@ -96,8 +96,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $custom_link_location = intval($row['custom_link_location']); if ($custom_link_location == 1) { $custom_link_location_display = "Main Side Nav"; - } else { + } elseif ($custom_link_location == 2) { $custom_link_location_display = "Top Nav"; + } elseif ($custom_link_location == 3) { + $custom_link_location_display = "Client Portal Nav"; } ?> diff --git a/admin_mail_queue.php b/admin_mail_queue.php index 841695fc..5259ce96 100644 --- a/admin_mail_queue.php +++ b/admin_mail_queue.php @@ -177,7 +177,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php index 2a6d5c8c..be7b8b88 100644 --- a/admin_ticket_template_details.php +++ b/admin_ticket_template_details.php @@ -112,7 +112,11 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
- + Edit
@@ -125,7 +129,6 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE diff --git a/ajax.php b/ajax.php index 36b232db..35bc752b 100644 --- a/ajax.php +++ b/ajax.php @@ -15,6 +15,7 @@ require_once "plugins/totp/totp.php"; * Fetches SSL certificates from remote hosts & returns the relevant info (issuer, expiry, public key) */ if (isset($_GET['certificate_fetch_parse_json_details'])) { + enforceUserPermission('module_support'); // PHP doesn't appreciate attempting SSL sockets to non-existent domains if (empty($_GET['domain'])) { @@ -43,7 +44,7 @@ if (isset($_GET['certificate_fetch_parse_json_details'])) { * Looks up info for a given certificate ID from the database, used to dynamically populate modal fields */ if (isset($_GET['certificate_get_json_details'])) { - validateTechRole(); + enforceUserPermission('module_support'); $certificate_id = intval($_GET['certificate_id']); $client_id = intval($_GET['client_id']); @@ -109,7 +110,7 @@ if (isset($_GET['domain_get_json_details'])) { * Looks up info on the ticket number provided, used to populate the ticket merge modal */ if (isset($_GET['merge_ticket_get_json_details'])) { - validateTechRole(); + enforceUserPermission('module_support'); $merge_into_ticket_number = intval($_GET['merge_into_ticket_number']); @@ -134,7 +135,7 @@ if (isset($_GET['merge_ticket_get_json_details'])) { * Looks up info for a given network ID from the database, used to dynamically populate modal fields */ if (isset($_GET['network_get_json_details'])) { - validateTechRole(); + enforceUserPermission('module_support'); $network_id = intval($_GET['network_id']); $client_id = intval($_GET['client_id']); @@ -159,6 +160,8 @@ if (isset($_GET['network_get_json_details'])) { } if (isset($_POST['client_set_notes'])) { + enforceUserPermission('module_client', 2); + $client_id = intval($_POST['client_id']); $notes = sanitizeInput($_POST['notes']); @@ -171,6 +174,8 @@ if (isset($_POST['client_set_notes'])) { } if (isset($_POST['contact_set_notes'])) { + enforceUserPermission('module_client', 2); + $contact_id = intval($_POST['contact_id']); $notes = sanitizeInput($_POST['notes']); @@ -191,6 +196,8 @@ if (isset($_POST['contact_set_notes'])) { } if (isset($_POST['asset_set_notes'])) { + enforceUserPermission('module_support', 2); + $asset_id = intval($_POST['asset_id']); $notes = sanitizeInput($_POST['notes']); @@ -211,7 +218,7 @@ if (isset($_POST['asset_set_notes'])) { } /* - * Collision Detection/Avoidance + * Ticketing Collision Detection/Avoidance * Called upon loading a ticket, and every 2 mins thereafter * Is used in conjunction with ticket_query_views to show who is currently viewing a ticket */ @@ -222,7 +229,7 @@ if (isset($_GET['ticket_add_view'])) { } /* - * Collision Detection/Avoidance + * Ticketing Collision Detection/Avoidance * Returns formatted text of the agents currently viewing a ticket * Called upon loading a ticket, and every 2 mins thereafter */ @@ -255,7 +262,7 @@ if (isset($_GET['ticket_query_views'])) { * Generates public/guest links for sharing logins/docs */ if (isset($_GET['share_generate_link'])) { - validateTechRole(); + enforceUserPermission('module_support', 2); $item_encrypted_username = ''; // Default empty $item_encrypted_credential = ''; // Default empty @@ -375,7 +382,7 @@ if (isset($_GET['share_generate_link'])) { * Looks up info for a given recurring (was scheduled) ticket ID from the database, used to dynamically populate modal edit fields */ if (isset($_GET['recurring_ticket_get_json_details'])) { - validateTechRole(); + enforceUserPermission('module_support'); $client_id = intval($_GET['client_id']); $ticket_id = intval($_GET['ticket_id']); @@ -422,46 +429,11 @@ if (isset($_GET['recurring_ticket_get_json_details'])) { } -/* - * Looks up info for a given quote ID from the database, used to dynamically populate modal fields - */ -if (isset($_GET['quote_get_json_details'])) { - $quote_id = intval($_GET['quote_id']); - - // Get quote details - $quote_sql = mysqli_query( - $mysqli, - "SELECT * FROM quotes - LEFT JOIN clients ON quote_client_id = client_id - WHERE quote_id = $quote_id LIMIT 1" - ); - - while ($row = mysqli_fetch_array($quote_sql)) { - $response['quote'][] = $row; - } - - - // Get all income-related categories for quoting - $quote_created_at = $response['quote'][0]['quote_created_at']; - $category_sql = mysqli_query( - $mysqli, - "SELECT category_id, category_name FROM categories - WHERE category_type = 'Income' AND (category_archived_at > '$quote_created_at' OR category_archived_at IS NULL) - ORDER BY category_name" - ); - - while ($row = mysqli_fetch_array($category_sql)) { - $response['categories'][] = $row; - } - - echo json_encode($response); - -} - /* * Returns sorted list of active clients */ if (isset($_GET['get_active_clients'])) { + enforceUserPermission('module_client'); $client_sql = mysqli_query( $mysqli, @@ -481,6 +453,8 @@ if (isset($_GET['get_active_clients'])) { * Returns ordered list of active contacts for a specified client */ if (isset($_GET['get_client_contacts'])) { + enforceUserPermission('module_client'); + $client_id = intval($_GET['client_id']); $contact_sql = mysqli_query( @@ -502,7 +476,7 @@ if (isset($_GET['get_client_contacts'])) { * When provided with a login ID, checks permissions and returns the 6-digit code */ if (isset($_GET['get_totp_token_via_id'])) { - validateTechRole(); + enforceUserPermission('module_credential'); $login_id = intval($_GET['login_id']); @@ -529,3 +503,168 @@ if (isset($_GET['get_totp_token_via_id'])) { if (isset($_GET['get_readable_pass'])) { echo json_encode(GenerateReadablePassword(4)); } + +/* + * ITFlow - POST request handler for client tickets + */ +if (isset($_POST['update_kanban_status_position'])) { + // Update multiple ticket status kanban orders + enforceUserPermission('module_support', 2); + + $positions = $_POST['positions']; + + foreach ($positions as $position) { + $status_id = intval($position['status_id']); + $kanban = intval($position['status_kanban']); + + mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_order = $kanban WHERE ticket_status_id = $status_id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; +} + +if (isset($_POST['update_kanban_ticket'])) { + // Update ticket kanban order and status + enforceUserPermission('module_support', 2); + + // all tickets on the column + $positions = $_POST['positions']; + + foreach ($positions as $position) { + $ticket_id = intval($position['ticket_id']); + $kanban = intval($position['ticket_order']); // ticket kanban position + $status = intval($position['ticket_status']); // ticket statuses + $oldStatus = intval($position['ticket_oldStatus']); // ticket old status if moved + + $statuses['Closed'] = 5; + $statuses['Resolved'] = 4; + + // Continue if status is null / Closed + if ($status === null || $status === $statuses['Closed']) { + continue; + } + + + if ($oldStatus === false) { + // if ticket was not moved, just uptdate the order on kanban + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } else { + // If the ticket was moved from a resolved status to another status, we need to update ticket_resolved_at + if ($oldStatus === $statuses['Resolved']) { + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status, ticket_resolved_at = NULL WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } elseif ($status === $statuses['Resolved']) { + // If the ticket was moved to a resolved status, we need to update ticket_resolved_at + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status, ticket_resolved_at = NOW() WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + + // Client notification email + if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1) { + + // Get details + $ticket_sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_subject, ticket_status_name, ticket_assigned_to, ticket_url_key, ticket_client_id FROM tickets + LEFT JOIN clients ON ticket_client_id = client_id + LEFT JOIN contacts ON ticket_contact_id = contact_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + WHERE ticket_id = $ticket_id + "); + $row = mysqli_fetch_array($ticket_sql); + + $contact_name = sanitizeInput($row['contact_name']); + $contact_email = sanitizeInput($row['contact_email']); + $ticket_prefix = sanitizeInput($row['ticket_prefix']); + $ticket_number = intval($row['ticket_number']); + $ticket_subject = sanitizeInput($row['ticket_subject']); + $client_id = intval($row['ticket_client_id']); + $ticket_assigned_to = intval($row['ticket_assigned_to']); + $ticket_status = sanitizeInput($row['ticket_status_name']); + $url_key = sanitizeInput($row['ticket_url_key']); + + // Sanitize Config vars from get_settings.php + $config_ticket_from_name = sanitizeInput($config_ticket_from_name); + $config_ticket_from_email = sanitizeInput($config_ticket_from_email); + $config_base_url = sanitizeInput($config_base_url); + + // Get Company Info + $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1"); + $row = mysqli_fetch_array($sql); + $company_name = sanitizeInput($row['company_name']); + $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); + + // EMAIL + $subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)"; + $body = "##- Please type your reply above this line -##

Hello $contact_name,

Your ticket regarding $ticket_subject has been marked as solved and is pending closure.

If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Portal: View ticket

--
$company_name - Support
$config_ticket_from_email
$company_phone"; + + // Check email valid + if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { + + $data = []; + + // Email Ticket Contact + // Queue Mail + + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; + } + + // Also Email all the watchers + $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); + $body .= "

----------------------------------------
YOU ARE A COLLABORATOR ON THIS TICKET"; + while ($row = mysqli_fetch_array($sql_watchers)) { + $watcher_email = sanitizeInput($row['watcher_email']); + + // Queue Mail + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $watcher_email, + 'recipient_name' => $watcher_email, + 'subject' => $subject, + 'body' => $body + ]; + } + addToMailQueue($data); + } + //End Mail IF + + } else { + // If the ticket was moved from any status to another status + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } + } + + } + + // return a response + echo json_encode(['status' => 'success','payload' => $positions]); + exit; +} + +if (isset($_POST['update_ticket_tasks_order'])) { + // Update multiple ticket tasks order + enforceUserPermission('module_support', 2); + + $positions = $_POST['positions']; + $ticket_id = intval($_POST['ticket_id']); + + foreach ($positions as $position) { + $id = intval($position['id']); + $order = intval($position['order']); + + mysqli_query($mysqli, "UPDATE tasks SET task_order = $order WHERE task_ticket_id = $ticket_id AND task_id = $id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; +} \ No newline at end of file diff --git a/admin_mail_queue_message_view.php b/ajax/ajax_admin_mail_queue_message_view.php similarity index 55% rename from admin_mail_queue_message_view.php rename to ajax/ajax_admin_mail_queue_message_view.php index 2204a2d0..d3e4a0e5 100644 --- a/admin_mail_queue_message_view.php +++ b/ajax/ajax_admin_mail_queue_message_view.php @@ -1,24 +1,22 @@ Tell your admin: Your role does not have admin access."); +} + +$email_id = intval($_GET['id']); //Initialize the HTML Purifier to prevent XSS -require "plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require "../plugins/htmlpurifier/HTMLPurifier.standalone.php"; $purifier_config = HTMLPurifier_Config::createDefault(); $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); -if (isset($_GET['email_id'])) { - $email_id = intval($_GET['email_id']); -} else { - echo "You dont belong here"; - exit(); -} - -$sql = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_id = $email_id"); - +$sql = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_id = $email_id LIMIT 1"); $row = mysqli_fetch_array($sql); $email_from = nullable_htmlentities($row['email_from']); @@ -42,37 +40,40 @@ if ($email_status == 0) { $email_status_display = "
Sent
$email_sent_at"; } +// Generate the HTML form content using output buffering. +ob_start(); ?> - -
    -
  1. - Admin -
    2. -
  2. - Mail Queue -
    3. -
    4. -
- -
- -
-
-
-
From: ($email_from)"; ?>
-
To: ($email_recipient)"; ?>
-
Subject:
-
-
- -
+
+
+ +
+
+
+
+ From: +
+
+ $email_from_name ($email_from)"; ?> +
+
+
+
+
+ To: +
+
+ $email_recipient_name ($email_recipient)"; ?> +
+
+
+
+
-
-
- + + +
+
Copying asset:
+ +
+
+ + + +
+ + + +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + + +
+ +
+
+ +
+ +
+
+ + +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ > +
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+
+
+ + +
+
+ + +
+
Editing asset:
+ +
+
+ + + + +
+ + + +
+ +
> + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + + +
+ +
+
+ +
+ +
+
+ + +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ > +
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+ +
+ + asset_photo"> + +
+ +
+ + +
+ +
+ +
+ +

Asset ID:

+ +
+ + +
+ +
+ +
    + $asset_history_created_at
    $asset_history_description"; + } + ?> +
+ +
+ +
+ +
+
+
+ + +
+
+ + +
+
Editing Interface: -
+ +
+
+ + + +
> + + + +
+ +
+ +
+ + +
+ +
+
+ +
+ +
+
+ title="Mark Interface as primary"> +
+
+
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ +
+ + +
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ + > +
+
+
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ +
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+ + +
+
+ + +
+
Editing Client:
+ +
+ +
+ + +
+ + + +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ > +
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ + + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ + + +
+ +
+ +
+ +
+ +
+
+
+ + +
+
+ + +
+
Editing Contact:
+ +
+
+ + +
+ + + +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ > +
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
+
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ + + + + +
+ +
+
+
+ > + +

Pin Top

+
+
+
+
+
+
+ > + +

Receives Invoices

+
+
+
+
+
+
+ > + +
+
+
+ +
+ +
+ +
+ +
+ + contact_photo"> + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +

Contact ID:

+ +
+ +
+ +
+
+ + +
+
+ + + + + + diff --git a/ajax/ajax_contact_note_create.php b/ajax/ajax_contact_note_create.php new file mode 100644 index 00000000..f668e23a --- /dev/null +++ b/ajax/ajax_contact_note_create.php @@ -0,0 +1,54 @@ + + +
+
Creating note:
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+ + +
+
+ + + +
+
Editing credential:
+ +
+ +
+ + +
+ + + +
+ +
> + +
+ +
+ +
+
+ +
+ +
+
+ > +
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+ + +
+
+ + + +
+
Copying expense
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + + + + +
+ +
+
+ +
+ +
+
+ + + +
+ +
+ + +
+ +
+ +
+ + +
+
+ + + diff --git a/ajax/ajax_expense_edit.php b/ajax/ajax_expense_edit.php new file mode 100644 index 00000000..e1c70b9a --- /dev/null +++ b/ajax/ajax_expense_edit.php @@ -0,0 +1,235 @@ + + +
+
Editing expense
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ + + + + +
+ +
+
+ +
+ +
+
+ + + +
+ +
+ + +
+ + +
+ " + download=""> + + + + +
+
+ + +
+
+ + + diff --git a/ajax/ajax_expense_refund.php b/ajax/ajax_expense_refund.php new file mode 100644 index 00000000..cbf8d619 --- /dev/null +++ b/ajax/ajax_expense_refund.php @@ -0,0 +1,94 @@ + + +
+
Refunding expense
+ +
+ +
+
+ + + + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+ +
+
+ + +
+
+ + + diff --git a/ajax/ajax_notifications.php b/ajax/ajax_notifications.php new file mode 100644 index 00000000..048d7f0e --- /dev/null +++ b/ajax/ajax_notifications.php @@ -0,0 +1,79 @@ + + +
+
Notifications
+ +
+ +
+ + + + + + +
+ + + + + + +
+ + + + +
+ +

No Notifications

+
+ +
+
+ + + Dismiss all + + + + See Dismissed Notifications + + + +
+ + + +
+
+ Editing Project: +
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+
+ + +
+
+ + + +
+
Copying quote: -
+ +
+
+ +
+ + + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ " required> +
+
+ +
+ +
+
+ +
+ " max="2999-12-31" value="" required> +
+
+ +
+
+ + +
+
+ + + + +
+
Editing quote: -
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ + +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ + +
+
+ + + +
+
Editing recurring expense
+ +
+
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ + + + + +
+ +
+
+ +
+ +
+
+ + + +
+ +
+
+ + +
+
+ + + +
+
Assigning Ticket: -
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + + +
+
+ + Edit Billable Status for +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + + +
+
Changing contact: -
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
+
+ > + +
+
+ + +
+ +
+ + +
+ +
+ + + +
+
Editing ticket priority: -
+ +
+
+ + + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + + +
+
Editing Ticket Reply
+ +
+
+ + + +
+ +
+
+ + +
+
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
Editing task
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + + +
+
Editing task
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ + + +
+
Editing Transfer
+ +
+
+ + + + +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+
+ + + + +
  • + class="nav-link "> +
    • + + +
      diff --git a/client/post.php b/client/post.php index 01dc88b5..4dff9ee9 100644 --- a/client/post.php +++ b/client/post.php @@ -14,6 +14,7 @@ if (isset($_POST['add_ticket'])) { $subject = sanitizeInput($_POST['subject']); $details = mysqli_real_escape_string($mysqli, ($_POST['details'])); + $category = intval($_POST['category']); // Get settings from get_settings.php $config_ticket_prefix = sanitizeInput($config_ticket_prefix); @@ -37,7 +38,7 @@ if (isset($_POST['add_ticket'])) { $new_config_ticket_next_number = $config_ticket_next_number + 1; mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 1, ticket_billable = $config_ticket_default_billable, ticket_created_by = 0, ticket_contact_id = $session_contact_id, ticket_url_key = '$url_key', ticket_client_id = $session_client_id"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_category = $category, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 1, ticket_billable = $config_ticket_default_billable, ticket_created_by = 0, ticket_contact_id = $session_contact_id, ticket_url_key = '$url_key', ticket_client_id = $session_client_id"); $ticket_id = mysqli_insert_id($mysqli); // Notify agent DL of the new ticket, if populated with a valid email diff --git a/client/ticket.php b/client/ticket.php index 2373031c..58955d0e 100644 --- a/client/ticket.php +++ b/client/ticket.php @@ -19,25 +19,21 @@ $allowed_extensions = array('jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf', 'txt', ' if (isset($_GET['id']) && intval($_GET['id'])) { $ticket_id = intval($_GET['id']); + $ticket_contact_snippet = "AND ticket_contact_id = $session_contact_id"; + // Bypass ticket contact being session_id for a primary / technical contact viewing all tickets if ($session_contact_primary == 1 || $session_contact_is_technical_contact) { - // For a primary / technical contact viewing all tickets - $ticket_sql = mysqli_query($mysqli, - "SELECT * FROM tickets - LEFT JOIN users on ticket_assigned_to = user_id - LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id - WHERE ticket_id = $ticket_id AND ticket_client_id = $session_client_id" - ); - - } else { - // For a user viewing their own ticket - $ticket_sql = mysqli_query($mysqli, - "SELECT * FROM tickets - LEFT JOIN users on ticket_assigned_to = user_id - LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id - WHERE ticket_id = $ticket_id AND ticket_client_id = $session_client_id AND ticket_contact_id = $session_contact_id" - ); + $ticket_contact_snippet = ''; } + $ticket_sql = mysqli_query($mysqli, + "SELECT * FROM tickets + LEFT JOIN users on ticket_assigned_to = user_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + LEFT JOIN categories ON ticket_category = category_id + WHERE ticket_id = $ticket_id AND ticket_client_id = $session_client_id + $ticket_contact_snippet" + ); + $ticket_row = mysqli_fetch_array($ticket_sql); if ($ticket_row) { @@ -52,6 +48,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) { $ticket_resolved_at = nullable_htmlentities($ticket_row['ticket_resolved_at']); $ticket_closed_at = nullable_htmlentities($ticket_row['ticket_closed_at']); $ticket_feedback = nullable_htmlentities($ticket_row['ticket_feedback']); + $ticket_category = nullable_htmlentities($ticket_row['category_name']); // Get Ticket Attachments (not associated with a specific reply) $sql_ticket_attachments = mysqli_query( @@ -98,10 +95,12 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
      Subject:
      -

      State:
      Priority:
      + + Category:
      + @@ -116,6 +115,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {

      +
      -
      - -
      -
      - +
      +
      +
      + +
      +
      + +
      + +
      - +
      + +
      +
      + +
      +
      + +
      + +
      +
      + +
      diff --git a/client_asset_details.php b/client_asset_details.php index df8334f3..103a328f 100644 --- a/client_asset_details.php +++ b/client_asset_details.php @@ -99,17 +99,18 @@ if (isset($_GET['asset_id'])) { SELECT ai.interface_id, ai.interface_name, + ai.interface_description, + ai.interface_type, ai.interface_mac, ai.interface_ip, + ai.interface_nat_ip, ai.interface_ipv6, - ai.interface_port, ai.interface_primary, ai.interface_notes, n.network_name, n.network_id, connected_interfaces.interface_id AS connected_interface_id, connected_interfaces.interface_name AS connected_interface_name, - connected_interfaces.interface_port AS connected_interface_port, connected_assets.asset_name AS connected_asset_name FROM asset_interfaces AS ai LEFT JOIN networks AS n @@ -154,14 +155,29 @@ if (isset($_GET['asset_id'])) { // Related Logins Query - $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins - LEFT JOIN login_tags ON login_tags.login_id = logins.login_id + $sql_related_logins = mysqli_query($mysqli, " + SELECT + logins.login_id AS login_id, + logins.login_name, + logins.login_description, + logins.login_uri, + logins.login_username, + logins.login_password, + logins.login_otp_secret, + logins.login_note, + logins.login_important, + logins.login_contact_id, + logins.login_vendor_id, + logins.login_asset_id, + logins.login_software_id + FROM logins + LEFT JOIN login_tags ON login_tags.login_id = logins.login_id LEFT JOIN tags ON tags.tag_id = login_tags.tag_id WHERE login_asset_id = $asset_id - AND login_archived_at IS NULL + AND login_archived_at IS NULL GROUP BY logins.login_id - ORDER BY login_name DESC" - ); + ORDER BY login_name DESC + "); $login_count = mysqli_num_rows($sql_related_logins); // Related Software Query @@ -186,7 +202,10 @@ if (isset($_GET['asset_id'])) {
      -

      @@ -224,7 +243,7 @@ if (isset($_GET['asset_id'])) {
      -
      Network
      +
      Primary Network Interface
      @@ -272,13 +291,11 @@ if (isset($_GET['asset_id'])) {
      -
      Notes
      +
      Additional Notes
      - -
      @@ -350,9 +367,25 @@ if (isset($_GET['asset_id'])) {

      Network Interfaces

      - +
      + + +
      + + Add Multiple + +
      + + Import + +
      + + Export + +
      +
      @@ -360,10 +393,10 @@ if (isset($_GET['asset_id'])) { "> - + + - @@ -374,10 +407,12 @@ if (isset($_GET['asset_id'])) { $network_name $network_id" + ? "$network_name" : '-'; // Connected interface details $connected_asset_name = nullable_htmlentities($row['connected_asset_name']); - $connected_interface_port = nullable_htmlentities($row['connected_interface_port']); + $connected_interface_name = nullable_htmlentities($row['connected_interface_name']); // Show either "-" or "AssetName - Port" if ($connected_asset_name) { - $connected_to_display = "$connected_asset_name - $connected_interface_port"; + $connected_to_display = "$connected_asset_name - $connected_interface_name"; } else { $connected_to_display = "-"; } @@ -405,13 +440,16 @@ if (isset($_GET['asset_id'])) { + - - -
      NameName / PortType MAC IPPort Network Connected To Action
      - - + + (Primary)"; } ?> @@ -420,7 +458,10 @@ if (isset($_GET['asset_id'])) {
      - + Edit @@ -433,8 +474,6 @@ if (isset($_GET['asset_id'])) {
      @@ -471,7 +510,7 @@ if (isset($_GET['asset_id'])) { if (empty($login_uri)) { $login_uri_display = "-"; } else { - $login_uri_display = "$login_uri"; + $login_uri_display = "$login_uri"; } $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); if (empty($login_username)) { @@ -537,7 +576,10 @@ if (isset($_GET['asset_id'])) {
      - + Edit )"> @@ -556,8 +598,6 @@ if (isset($_GET['asset_id'])) { @@ -932,6 +972,9 @@ if (isset($_GET['asset_id'])) { 0) {

      Assets

      = 2) { ?> -
      +
      @@ -208,6 +208,10 @@ if (mysqli_num_rows($os_sql) > 0) { Assign Contact
      + + Transfer to Client + +
      Assign Location @@ -564,10 +568,16 @@ if (mysqli_num_rows($os_sql) > 0) {
      - + Edit - + Copy 2) { ?> @@ -579,9 +589,6 @@ if (mysqli_num_rows($os_sql) > 0) { Delete - - Transfer - Archive @@ -596,12 +603,6 @@ if (mysqli_num_rows($os_sql) > 0) { @@ -611,6 +612,7 @@ if (mysqli_num_rows($os_sql) > 0) {
      + @@ -622,11 +624,8 @@ if (mysqli_num_rows($os_sql) > 0) { diff --git a/client_contact_details.php b/client_contact_details.php index 5526e1a6..33ccf7ed 100644 --- a/client_contact_details.php +++ b/client_contact_details.php @@ -156,7 +156,10 @@ if (isset($_GET['contact_id'])) {
      -

      @@ -213,9 +216,6 @@ if (isset($_GET['contact_id'])) {
      - -
      @@ -252,8 +252,11 @@ if (isset($_GET['contact_id'])) { New Recurring Ticket
      - - New Note + + New Note
      @@ -389,10 +392,16 @@ if (isset($_GET['contact_id'])) {
      - + Edit - + Copy
      @@ -417,11 +426,6 @@ if (isset($_GET['contact_id'])) { @@ -462,7 +466,7 @@ if (isset($_GET['contact_id'])) { if (empty($login_uri)) { $login_uri_display = "-"; } else { - $login_uri_display = "$login_uri"; + $login_uri_display = "$login_uri"; } $login_uri_2 = nullable_htmlentities($row['login_uri_2']); $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); @@ -529,7 +533,10 @@ if (isset($_GET['contact_id'])) {
      - + Edit )"> @@ -554,8 +561,6 @@ if (isset($_GET['contact_id'])) { @@ -995,7 +1000,10 @@ if (isset($_GET['contact_id'])) {

      Notes

      -
      @@ -1134,7 +1142,6 @@ if (isset($_GET['contact_id'])) { &contact_id="> Details       - + Make Note - + Edit @@ -416,10 +422,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/client_logins.php b/client_logins.php index 56ff4800..f7eaa029 100644 --- a/client_logins.php +++ b/client_logins.php @@ -363,7 +363,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - + Edit
      @@ -396,7 +399,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/client_quotes.php b/client_quotes.php index 2108348c..da757342 100644 --- a/client_quotes.php +++ b/client_quotes.php @@ -164,10 +164,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - + Edit - + Copy
      @@ -187,8 +195,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -203,6 +209,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_contact.php" + data-ajax-id = "" + + > + + = 2) { ?> - + Yes"; @@ -279,12 +303,21 @@ $total_tickets_closed = intval($row['total_tickets_closed']); echo "No"; } ?> + - + = 2 && empty($ticket_closed_at)) { ?> + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_priority.php" + data-ajax-id = "" + + > + + @@ -294,7 +327,15 @@ $total_tickets_closed = intval($row['total_tickets_closed']); - + = 2 && empty($ticket_closed_at)) { ?> + data-toggle = "ajax-modal" + data-ajax-url = "ajax/ajax_ticket_assign.php" + data-ajax-id = "" + + > + + @@ -313,20 +354,6 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
      - + Edit @@ -470,10 +470,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/css/itflow_custom.css b/css/itflow_custom.css new file mode 100644 index 00000000..7bb00c94 --- /dev/null +++ b/css/itflow_custom.css @@ -0,0 +1,29 @@ +/* + For screens below 576px (xs): + - Make the button full-width, display:block +*/ +@media (max-width: 575.98px) { + .btn-responsive { + display: block; + width: 100%; + } +} + +/* + For screens 576px (sm) and above: + - Revert to an inline style +*/ +@media (min-width: 576px) { + .btn-responsive { + display: inline-block; + width: auto; + } +} + +.grab-cursor { + cursor: grab; +} + +.grab-cursor:active { + cursor: grabbing; +} diff --git a/css/tickets_kanban.css b/css/tickets_kanban.css new file mode 100644 index 00000000..eaa8172b --- /dev/null +++ b/css/tickets_kanban.css @@ -0,0 +1,35 @@ +.popover { + max-width: 600px; +} +#kanban-board { + display: flex; + box-sizing: border-box; + overflow-x: auto; + min-width: 400px; + height: calc(100vh - 210px); +} + +.kanban-column { + flex: 1; /* Allows columns to grow equally */ + margin: 0 10px; /* Space between columns */ + min-width: 300px; + max-width: 300px; + background: #f4f4f4; + padding: 10px; + border: 1px solid #ccc; + min-height: calc(100vh - 230px); + max-height: calc(100vh - 230px); + box-sizing: border-box; +} + +.kanban-column div { + max-height: calc(100vh - 280px); /* Set your desired max height */ + overflow-y: auto; /* Adds a scrollbar when content exceeds max height */ +} + +.task { + background: #fff; + margin: 5px 0; + padding: 10px; + border: 1px solid #ddd; +} diff --git a/expenses.php b/expenses.php index dffee9da..6b330e12 100644 --- a/expenses.php +++ b/expenses.php @@ -39,9 +39,6 @@ if (isset($_GET['category']) & !empty($_GET['category'])) { $category_filter = ''; } -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); - $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM expenses @@ -306,7 +303,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - + + + + + + @@ -326,14 +332,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - + Edit - + Copy
      - + Refund
      @@ -346,16 +364,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/functions.php b/functions.php index fd27e6a9..b5a10887 100644 --- a/functions.php +++ b/functions.php @@ -533,7 +533,7 @@ function validateCSRFToken($token) } /* - * Role validation + * LEGACY Role validation * Admin - 3 * Tech - 2 * Accountant - 1 @@ -549,6 +549,7 @@ function validateAdminRole() } } +// LEGACY // Validates a user is a tech (or admin). Stops page load and attempts to direct away from the page if not (i.e. user is an accountant) function validateTechRole() { @@ -560,6 +561,7 @@ function validateTechRole() } } +// LEGACY // Validates a user is an accountant (or admin). Stops page load and attempts to direct away from the page if not (i.e. user is a tech) function validateAccountantRole() { diff --git a/get_settings.php b/get_settings.php index 0ccf34ef..f14c2ee1 100644 --- a/get_settings.php +++ b/get_settings.php @@ -75,6 +75,9 @@ $config_ticket_client_general_notifications = intval($row['config_ticket_client_ $config_ticket_autoclose_hours = intval($row['config_ticket_autoclose_hours']); $config_ticket_new_ticket_notification_email = $row['config_ticket_new_ticket_notification_email']; $config_ticket_default_billable = intval($row['config_ticket_default_billable']); +$config_ticket_default_view = intval($row['config_ticket_default_view']); +$config_ticket_moving_columns = intval($row['config_ticket_moving_columns']); +$config_ticket_ordering = intval($row['config_ticket_ordering']); // Cron $config_enable_cron = intval($row['config_enable_cron']); @@ -306,3 +309,9 @@ $note_types_array = array ( 'In Person'=>'fa-people-arrows', 'Note'=>'fa-sticky-note' ); + +$interface_types_array = array ( + 'Ethernet', + 'SFP', + 'WiFi' +); diff --git a/includes/admin_side_nav.php b/includes/admin_side_nav.php index 9f587500..5abe20c8 100644 --- a/includes/admin_side_nav.php +++ b/includes/admin_side_nav.php @@ -115,7 +115,7 @@
    • MAINTENANCE
    • - +

      Mail Queue

       diff --git a/includes/ajax_footer.php b/includes/ajax_footer.php new file mode 100644 index 00000000..4bbe5766 --- /dev/null +++ b/includes/ajax_footer.php @@ -0,0 +1,9 @@ + + + + $content]); +?> \ No newline at end of file diff --git a/includes/ajax_header.php b/includes/ajax_header.php new file mode 100644 index 00000000..5e768ec7 --- /dev/null +++ b/includes/ajax_header.php @@ -0,0 +1,13 @@ + 'ID missing.']); +// exit; +//} diff --git a/includes/filter_footer.php b/includes/filter_footer.php index 5925d688..8ce64f3a 100644 --- a/includes/filter_footer.php +++ b/includes/filter_footer.php @@ -18,9 +18,9 @@ if ($total_found_rows > 5) {
      -
      +
      - @@ -29,10 +29,35 @@ if ($total_found_rows > 5) {
      -
      -

      + + $total_found_rows) { + $end = $total_found_rows; + } + + // Now output something like "Showing X to Y of Z records" + ?> + +
      +

      + Showing to of records +

      + + +
      -
      +
        diff --git a/includes/filter_header.php b/includes/filter_header.php index f8be8453..077fa95d 100644 --- a/includes/filter_header.php +++ b/includes/filter_header.php @@ -12,6 +12,8 @@ $get_copy = $_GET; // create a copy of the $_GET array //unset($get_copy['page']); unset($get_copy['sort']); unset($get_copy['order']); +//Rebuild URL +$url_query_strings_sort = http_build_query($get_copy); // Paging if (isset($_GET['page'])) { diff --git a/includes/footer.php b/includes/footer.php index 2d7a3247..e5cc1b36 100644 --- a/includes/footer.php +++ b/includes/footer.php @@ -38,7 +38,9 @@ if (str_contains(basename($_SERVER["PHP_SELF"]), "admin_")) { ?> + + diff --git a/includes/get_side_nav_counts.php b/includes/get_side_nav_counts.php new file mode 100644 index 00000000..a371a9c7 --- /dev/null +++ b/includes/get_side_nav_counts.php @@ -0,0 +1,34 @@ + - + diff --git a/includes/inc_all.php b/includes/inc_all.php index 9399ea56..088bff38 100644 --- a/includes/inc_all.php +++ b/includes/inc_all.php @@ -6,47 +6,8 @@ require_once "check_login.php"; require_once "page_title.php"; require_once "header.php"; require_once "top_nav.php"; - -// Get Main Side Bar Badge Counts - -// Active Clients Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('client_id') AS num FROM clients WHERE client_archived_at IS NULL")); -$num_active_clients = $row['num']; - -// Active Ticket Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NULL AND ticket_status != 4")); -$num_active_tickets = $row['num']; - -// Recurring Ticket Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('scheduled_ticket_id') AS num FROM scheduled_tickets")); -$num_recurring_tickets = $row['num']; - -// Active Project Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('project_id') AS num FROM projects WHERE project_archived_at IS NULL AND project_completed_at IS NULL")); -$num_active_projects = $row['num']; - -// Open Invoices Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') AND invoice_archived_at IS NULL")); -$num_open_invoices = $row['num']; - -// Recurring Invoice Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL")); -$num_recurring_invoices = $row['num']; - -// Open Quotes Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes WHERE (quote_status = 'Sent' OR quote_status = 'Viewed') AND quote_archived_at IS NULL")); -$num_open_quotes = $row['num']; - -// Recurring Expenses Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_expense_id') AS num FROM recurring_expenses WHERE recurring_expense_archived_at IS NULL")); -$num_recurring_expenses = $row['num']; - +require_once "get_side_nav_counts.php"; require_once "side_nav.php"; - require_once "inc_wrapper.php"; - require_once "inc_alert_feedback.php"; - require_once "filter_header.php"; - -?> diff --git a/includes/inc_client_top_head.php b/includes/inc_client_top_head.php index 4cf836f3..e82f7e8c 100644 --- a/includes/inc_client_top_head.php +++ b/includes/inc_client_top_head.php @@ -11,7 +11,10 @@
        - + Edit Client = 3) { ?> @@ -167,8 +170,5 @@ - -
      • FINANCIAL
        • +
      • FINANCIAL
        • + = 1) { ?> +
      • + "> + +

        Income

        +         +
        • +
      • + "> + +

        Income By Client

        +         +
        • +
      • + "> + +

        Recurring Income By Client

        +         +
        • +
      • + "> + +

        Clients with a Balance

        +         +
        • +
      • + "> + +

        Expense

        +         +
        • +
      • + "> + +

        Expense By Vendor

        +         +
        • +
      • + "> + +

        Budget

        +         +
        • +
      • + "> + +

        Tax Summary

        +         +
        • +
      • + "> + +

        Profit & Loss

        +         +
        • +
      • + "> + +

        Unbilled Tickets

        +         +
        • - = 1) { ?> - -
      • - "> - -

        Income

        -         -
        • -
      • - "> - -

        Income By Client

        -         -
        • -
      • - "> - -

        Recurring Income By Client

        -         -
        • -
      • - "> - -

        Clients with a Balance

        -         -
        • -
      • - "> - -

        Expense

        -         -
        • -
      • - "> - -

        Expense By Vendor

        -         -
        • -
      • - "> - -

        Budget

        -         -
        • -
      • - "> - -

        Tax Summary

        -         -
        • -
      • - "> - -

        Profit & Loss

        -         -
        • - - - - = 1) { ?> -
      • - "> - -

        Unbilled Tickets

        -         -
        • -
      • TECHNICAL
        • - + = 1) { ?>
      • "> @@ -106,27 +99,29 @@ = 1) { ?>
      • - "> - -

        Password rotation

        +         "> + +

        Credential rotation
      • OVERVIEWS
        • -
      • - "> - -

        All Assets

        -         -
        • -
      • - "> - -

        All Domains

        -         -
        • + = 1) { ?> +
      • + "> + +

        All Assets

        +         +
        • +
      • + "> + +

        All Domains

        +         +
        • +
      diff --git a/includes/side_nav.php b/includes/side_nav.php index a0f65354..691f6dad 100644 --- a/includes/side_nav.php +++ b/includes/side_nav.php @@ -186,7 +186,7 @@ = 1) { ?>
    • - "> +

      Reports

      diff --git a/includes/top_nav.php b/includes/top_nav.php index 1cc8cf17..24ac45e4 100644 --- a/includes/top_nav.php +++ b/includes/top_nav.php @@ -62,78 +62,25 @@ - 0) { ?> -
    • - +
    • + - - -
      - - - - Notifications - -
      - -
      - -

      - - -

      - -       -
      - + + + + - -
      - Dismiss all Notifications -
      -
      • - - -
    • - -
      - No Notifications -
      -
      - -
      -
      - See Dismissed - Notifications -
      • - - - -
    • diff --git a/js/ajax_modal.js b/js/ajax_modal.js new file mode 100644 index 00000000..1fd88fbb --- /dev/null +++ b/js/ajax_modal.js @@ -0,0 +1,67 @@ +// Ajax Modal Load Script +// +/* Example Triggering --> + + + +*/ +$(document).on('click', '[data-toggle="ajax-modal"]', function (e) { + e.preventDefault(); + + // Get the URL and ID from the element's data attributes. + var $trigger = $(this); + var ajaxUrl = $trigger.data('ajax-url'); + var ajaxId = $trigger.data('ajax-id'); + var modalSize = $trigger.data('modal-size') || 'md'; + + // Make the AJAX call to fetch modal content. + $.ajax({ + url: ajaxUrl, + method: 'GET', + data: { id: ajaxId }, + dataType: 'json', + cache: false, // Prevent caching if necessary + success: function (response) { + if (response.error) { + alert(response.error); + return; + } + + // Create a modal ID by appending the ajaxId. + var modalId = 'ajaxModal_' + ajaxId; + + // Remove any existing modal with this ID. + $('#' + modalId).remove(); + + // Build the modal HTML using the returned title and content. + var modalHtml = + '
      ' + + '
      ' + + '
      ' + + response.content + + '
      ' + + '
      ' + + '
      '; + + // Append the modal to the body and show it. + $('body').append(modalHtml); + var $modal = $('#' + modalId); + $modal.modal('show'); + + // Remove the modal from the DOM once it's hidden. + $modal.on('hidden.bs.modal', function () { + $(this).remove(); + }); + }, + error: function () { + alert('Error loading modal content.'); + } + }); +}); diff --git a/js/quote_edit_modal.js b/js/quote_edit_modal.js deleted file mode 100644 index 4c4898fd..00000000 --- a/js/quote_edit_modal.js +++ /dev/null @@ -1,49 +0,0 @@ -function populateQuoteEditModal(quote_id) { - - // Send a GET request to ajax.php as ajax.php?quote_get_json_details=true"e_id=NUM - jQuery.get( - "ajax.php", - {quote_get_json_details: 'true', quote_id: quote_id}, - function(data) { - - // If we get a response from ajax.php, parse it as JSON - const response = JSON.parse(data); - - // Access the quote info (one) and categories (multiple) - const quote = response.quote[0]; - const categories = response.categories; - - // Populate the quote modal fields - document.getElementById("editQuoteHeaderID").innerText = quote.quote_prefix + quote.quote_number; - document.getElementById("editQuoteHeaderClient").innerText = quote.client_name; - document.getElementById("editQuoteID").value = quote.quote_id; - document.getElementById("editQuoteDate").value = quote.quote_date; - document.getElementById("editQuoteExpire").value = quote.quote_expire; - document.getElementById("editQuoteScope").value = quote.quote_scope; - - /* DROPDOWNS */ - - // Category dropdown - var categoryDropdown = document.getElementById("editQuoteCategory"); - - // Clear Category dropdown - var i, L = categoryDropdown.options.length -1; - for (i = L; i >= 0; i--) { - categoryDropdown.remove(i); - } - categoryDropdown[categoryDropdown.length] = new Option('- Category -', '0'); - - // Populate dropdown - categories.forEach(category => { - if (parseInt(category.category_id) == parseInt(quote.quote_category_id)) { - // Selected quote - categoryDropdown[categoryDropdown.length] = new Option(category.category_name, category.category_id, true, true); - } - else{ - categoryDropdown[categoryDropdown.length] = new Option(category.category_name, category.category_id); - } - }); - - } - ); -} diff --git a/js/tickets_kanban.js b/js/tickets_kanban.js new file mode 100644 index 00000000..706ca9f9 --- /dev/null +++ b/js/tickets_kanban.js @@ -0,0 +1,118 @@ +$(document).ready(function() { + console.log('CONFIG_TICKET_MOVING_COLUMNS: ' + CONFIG_TICKET_MOVING_COLUMNS); + console.log('CONFIG_TICKET_ORDERING: ' + CONFIG_TICKET_ORDERING); + // Initialize Dragula for the Kanban board + let boardDrake = dragula([ + document.querySelector('#kanban-board') + ], { + moves: function(el, container, handle) { + return handle.classList.contains('panel-title'); + }, + accepts: function(el, target, source, sibling) { + return CONFIG_TICKET_MOVING_COLUMNS === 1; + } + }); + + // Log the event of moving the column panel-title + boardDrake.on('drag', function(el) { + //console.log('Dragging column:', el.querySelector('.panel-title').innerText); + }); + + boardDrake.on('drop', function(el, target, source, sibling) { + //console.log('Dropped column:', el.querySelector('.panel-title').innerText); + + // Get all columns and their positions + let columns = document.querySelectorAll('#kanban-board .kanban-column'); + let columnPositions = []; + + columns.forEach(function(column, index) { + let statusId = $(column).data('status-id'); // Assuming you have a data attribute for status ID + columnPositions.push({ + status_id: statusId, + status_kanban: index + }); + }); + + // Send AJAX request to update all column positions + $.ajax({ + url: 'ajax.php', + type: 'POST', + data: { + update_kanban_status_position: true, + positions: columnPositions + }, + success: function(response) { + console.log('Ticket status kanban orders updated successfully.'); + // Optionally, you can refresh the page or update the UI here + }, + error: function(xhr, status, error) { + console.error('Error updating ticket status kanban orders:', error); + } + }); + }); + + // Initialize Dragula for the Kanban Cards + let drake = dragula([ + ...document.querySelectorAll('#status') + ]); + + // Add event listener for the drop event + drake.on('drop', function (el, target, source, sibling) { + // Log the target ID to the console + //console.log('Dropped into:', target.getAttribute('data-column-name')); + + if (CONFIG_TICKET_ORDERING === 0 && source == target) { + drake.cancel(true); // Move the card back to its original position + return; + } + + // Get all cards in the target column and their positions + let cards = $(target).children('.task'); + let positions = []; + + //id of current status / column + let columnId = $(target).data('status-id'); + + let movedTicketId = $(el).data('ticket-id'); + let movedTicketStatusId = $(el).data('ticket-status-id'); + + cards.each(function(index, card) { + let ticketId = $(card).data('ticket-id'); + let statusId = $(card).data('ticket-status-id'); + + let oldStatus = false; + if (ticketId == movedTicketId) { + oldStatus = movedTicketStatusId; + } + + //update the status id of the card if needed + if (statusId != columnId) { + $(card).data('ticket-status-id', columnId); + statusId = columnId; + } + positions.push({ + ticket_id: ticketId, + ticket_order: index, + ticket_oldStatus: oldStatus, + ticket_status: statusId ?? null// Get the new status ID from the target column + }); + }); + + //console.log(positions); + // Send AJAX request to update all ticket kanban orders and statuses + $.ajax({ + url: 'ajax.php', + type: 'POST', + data: { + update_kanban_ticket: true, + positions: positions + }, + success: function(response) { + //console.log('Ticket kanban orders and statuses updated successfully.'); + }, + error: function(xhr, status, error) { + console.error('Error updating ticket kanban orders and statuses:', error); + } + }); + }); +}); \ No newline at end of file diff --git a/modals/admin_custom_link_add_modal.php b/modals/admin_custom_link_add_modal.php index 34aa7509..45b2c3a6 100644 --- a/modals/admin_custom_link_add_modal.php +++ b/modals/admin_custom_link_add_modal.php @@ -65,6 +65,7 @@
      • diff --git a/modals/admin_custom_link_edit_modal.php b/modals/admin_custom_link_edit_modal.php index 66f2a759..3404810b 100644 --- a/modals/admin_custom_link_edit_modal.php +++ b/modals/admin_custom_link_edit_modal.php @@ -67,6 +67,7 @@
      diff --git a/modals/client_asset_bulk_transfer_client_modal.php b/modals/client_asset_bulk_transfer_client_modal.php new file mode 100644 index 00000000..c469d395 --- /dev/null +++ b/modals/client_asset_bulk_transfer_client_modal.php @@ -0,0 +1,48 @@ + diff --git a/modals/client_asset_copy_modal.php b/modals/client_asset_copy_modal.php deleted file mode 100644 index 109b1e0b..00000000 --- a/modals/client_asset_copy_modal.php +++ /dev/null @@ -1,393 +0,0 @@ - diff --git a/modals/client_asset_edit_modal.php b/modals/client_asset_edit_modal.php deleted file mode 100644 index 1289c902..00000000 --- a/modals/client_asset_edit_modal.php +++ /dev/null @@ -1,429 +0,0 @@ - diff --git a/modals/client_asset_interface_add_modal.php b/modals/client_asset_interface_add_modal.php index b4c5ee1d..a5826367 100644 --- a/modals/client_asset_interface_add_modal.php +++ b/modals/client_asset_interface_add_modal.php @@ -14,135 +14,209 @@
      - -
      - -
      -
      - -
      - -
      -
      + - -
      - -
      -
      - -
      - -
      -
      +
      - -
      - -
      -
      - -
      - -
      -
      - +
      + +
      + + +
      + +
      +
      + +
      + +
      +
      + +
      +
      -
      -
      - -
      - -
      -
      - + +
      + +
      +
      + +
      + +
      - -
      -
      - -
      - -
      -
      - + +
      + +
      +
      + +
      + +
      - -
      -
      - -
      - -
      -
      - +
      + +
      + + +
      + +
      +
      + +
      + +
      - -
      -
      -
      - -
      -
      - + +
      + +
      +
      + +
      + +
      +
      + +
      +
      +
      +
      + + +
      + +
      +
      + +
      + +
      +
      + + +
      + +
      +
      + +
      + +
      +
      + + +
      + +
      +
      + +
      + +
      +
      + +
      + +
      +
      + +
      + +
      -
      -
      - -
      - +
      + +
      + +
      +
      +
      - - +
      diff --git a/modals/client_asset_interface_edit_modal.php b/modals/client_asset_interface_edit_modal.php deleted file mode 100644 index df6bba76..00000000 --- a/modals/client_asset_interface_edit_modal.php +++ /dev/null @@ -1,236 +0,0 @@ - - - diff --git a/modals/client_asset_interface_export_modal.php b/modals/client_asset_interface_export_modal.php new file mode 100644 index 00000000..f8b6f182 --- /dev/null +++ b/modals/client_asset_interface_export_modal.php @@ -0,0 +1,24 @@ + diff --git a/modals/client_asset_interface_import_modal.php b/modals/client_asset_interface_import_modal.php new file mode 100644 index 00000000..3df676e3 --- /dev/null +++ b/modals/client_asset_interface_import_modal.php @@ -0,0 +1,28 @@ + diff --git a/modals/client_asset_interface_multiple_add_modal.php b/modals/client_asset_interface_multiple_add_modal.php new file mode 100644 index 00000000..18958b52 --- /dev/null +++ b/modals/client_asset_interface_multiple_add_modal.php @@ -0,0 +1,107 @@ + diff --git a/modals/client_asset_transfer_modal.php b/modals/client_asset_transfer_modal.php deleted file mode 100644 index 76ecb451..00000000 --- a/modals/client_asset_transfer_modal.php +++ /dev/null @@ -1,48 +0,0 @@ - diff --git a/modals/client_contact_edit_modal.php b/modals/client_contact_edit_modal.php deleted file mode 100644 index c6d55465..00000000 --- a/modals/client_contact_edit_modal.php +++ /dev/null @@ -1,288 +0,0 @@ - \ No newline at end of file diff --git a/modals/client_login_edit_modal.php b/modals/client_login_edit_modal.php deleted file mode 100644 index 0c8cbc56..00000000 --- a/modals/client_login_edit_modal.php +++ /dev/null @@ -1,269 +0,0 @@ - diff --git a/modals/expense_edit_modal.php b/modals/expense_edit_modal.php deleted file mode 100644 index b4bc7424..00000000 --- a/modals/expense_edit_modal.php +++ /dev/null @@ -1,208 +0,0 @@ - diff --git a/modals/expense_refund_modal.php b/modals/expense_refund_modal.php deleted file mode 100644 index 1eef11ec..00000000 --- a/modals/expense_refund_modal.php +++ /dev/null @@ -1,67 +0,0 @@ - diff --git a/modals/project_edit_modal.php b/modals/project_edit_modal.php deleted file mode 100644 index 8c457d4d..00000000 --- a/modals/project_edit_modal.php +++ /dev/null @@ -1,77 +0,0 @@ - diff --git a/modals/quote_copy_modal.php b/modals/quote_copy_modal.php deleted file mode 100644 index 59ba19ae..00000000 --- a/modals/quote_copy_modal.php +++ /dev/null @@ -1,64 +0,0 @@ - \ No newline at end of file diff --git a/modals/quote_edit_modal.php b/modals/quote_edit_modal.php deleted file mode 100644 index f639f2e9..00000000 --- a/modals/quote_edit_modal.php +++ /dev/null @@ -1,79 +0,0 @@ - - diff --git a/modals/recurring_expense_edit_modal.php b/modals/recurring_expense_edit_modal.php deleted file mode 100644 index 3e8693b7..00000000 --- a/modals/recurring_expense_edit_modal.php +++ /dev/null @@ -1,234 +0,0 @@ - diff --git a/modals/task_edit_modal.php b/modals/task_edit_modal.php deleted file mode 100644 index 9a7fb22c..00000000 --- a/modals/task_edit_modal.php +++ /dev/null @@ -1,58 +0,0 @@ - diff --git a/modals/ticket_assign_modal.php b/modals/ticket_assign_modal.php deleted file mode 100644 index 9ab37025..00000000 --- a/modals/ticket_assign_modal.php +++ /dev/null @@ -1,52 +0,0 @@ - diff --git a/modals/ticket_bulk_edit_category_modal.php b/modals/ticket_bulk_edit_category_modal.php new file mode 100644 index 00000000..421e851d --- /dev/null +++ b/modals/ticket_bulk_edit_category_modal.php @@ -0,0 +1,42 @@ + diff --git a/modals/ticket_edit_billable_modal.php b/modals/ticket_edit_billable_modal.php deleted file mode 100644 index f938c99f..00000000 --- a/modals/ticket_edit_billable_modal.php +++ /dev/null @@ -1,40 +0,0 @@ - diff --git a/modals/ticket_edit_priority_modal.php b/modals/ticket_edit_priority_modal.php deleted file mode 100644 index b0778bca..00000000 --- a/modals/ticket_edit_priority_modal.php +++ /dev/null @@ -1,41 +0,0 @@ - diff --git a/modals/ticket_reply_edit_modal.php b/modals/ticket_reply_edit_modal.php index b1306b5c..8ea4ef73 100644 --- a/modals/ticket_reply_edit_modal.php +++ b/modals/ticket_reply_edit_modal.php @@ -25,7 +25,7 @@
      - +
      diff --git a/modals/transfer_edit_modal.php b/modals/transfer_edit_modal.php deleted file mode 100644 index a1988605..00000000 --- a/modals/transfer_edit_modal.php +++ /dev/null @@ -1,166 +0,0 @@ - diff --git a/plugins/dragula/dragula.min.css b/plugins/dragula/dragula.min.css new file mode 100644 index 00000000..a080100e --- /dev/null +++ b/plugins/dragula/dragula.min.css @@ -0,0 +1 @@ +.gu-mirror{position:fixed!important;margin:0!important;z-index:9999!important;opacity:.8}.gu-hide{display:none!important}.gu-unselectable{-webkit-user-select:none!important;-moz-user-select:none!important;-ms-user-select:none!important;user-select:none!important}.gu-transit{opacity:.2} \ No newline at end of file diff --git a/plugins/dragula/dragula.min.js b/plugins/dragula/dragula.min.js new file mode 100644 index 00000000..dd61cd87 --- /dev/null +++ b/plugins/dragula/dragula.min.js @@ -0,0 +1 @@ +!function(e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).dragula=e()}(function(){return function o(r,i,u){function c(t,e){if(!i[t]){if(!r[t]){var n="function"==typeof require&&require;if(!e&&n)return n(t,!0);if(a)return a(t,!0);throw(n=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",n}n=i[t]={exports:{}},r[t][0].call(n.exports,function(e){return c(r[t][1][e]||e)},n,n.exports,o,r,i,u)}return i[t].exports}for(var a="function"==typeof require&&require,e=0;ee.left+G(e)/2);return n(u>e.top+J(e)/2)}:function(){var e,t,n,o=r.children.length;for(e=0;ei)return t;if(!c&&n.top+n.height/2>u)return t}return null})();function n(e){return e?Z(t):t}}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./classes":1,"contra/emitter":5,crossvent:6}],3:[function(e,t,n){t.exports=function(e,t){return Array.prototype.slice.call(e,t)}},{}],4:[function(e,t,n){"use strict";var o=e("ticky");t.exports=function(e,t,n){e&&o(function(){e.apply(n||null,t||[])})}},{ticky:10}],5:[function(e,t,n){"use strict";var c=e("atoa"),a=e("./debounce");t.exports=function(r,e){var i=e||{},u={};return void 0===r&&(r={}),r.on=function(e,t){return u[e]?u[e].push(t):u[e]=[t],r},r.once=function(e,t){return t._once=!0,r.on(e,t),r},r.off=function(e,t){var n=arguments.length;if(1===n)delete u[e];else if(0===n)u={};else{e=u[e];if(!e)return r;e.splice(e.indexOf(t),1)}return r},r.emit=function(){var e=c(arguments);return r.emitterSnapshot(e.shift()).apply(this,e)},r.emitterSnapshot=function(o){var e=(u[o]||[]).slice(0);return function(){var t=c(arguments),n=this||r;if("error"===o&&!1!==i.throws&&!e.length)throw 1===t.length?t[0]:t;return e.forEach(function(e){i.async?a(e,t,n):e.apply(n,t),e._once&&r.off(o,e)}),r}},r}},{"./debounce":4,atoa:3}],6:[function(n,o,e){(function(r){"use strict";var i=n("custom-event"),u=n("./eventmap"),c=r.document,e=function(e,t,n,o){return e.addEventListener(t,n,o)},t=function(e,t,n,o){return e.removeEventListener(t,n,o)},a=[];function l(e,t,n){t=function(e,t,n){var o,r;for(o=0;o 0) { - echo $key . ' with id ' . $module_id . " : ". $access_level . "\n"; mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = $role_id, module_id = $module_id, user_role_permission_level = $access_level"); } } diff --git a/post/admin/admin_settings_ticket.php b/post/admin/admin_settings_ticket.php index 34561fd6..bc75e518 100644 --- a/post/admin/admin_settings_ticket.php +++ b/post/admin/admin_settings_ticket.php @@ -14,8 +14,11 @@ if (isset($_POST['edit_ticket_settings'])) { if (filter_var($_POST['config_ticket_new_ticket_notification_email'], FILTER_VALIDATE_EMAIL)) { $config_ticket_new_ticket_notification_email = sanitizeInput($_POST['config_ticket_new_ticket_notification_email']); } - - mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_email_parse = $config_ticket_email_parse, config_ticket_email_parse_unknown_senders = $config_ticket_email_parse_unknown_senders, config_ticket_autoclose_hours = $config_ticket_autoclose_hours, config_ticket_new_ticket_notification_email = '$config_ticket_new_ticket_notification_email', config_ticket_default_billable = $config_ticket_default_billable WHERE company_id = 1"); + $config_ticket_default_view = intval($_POST['config_ticket_default_view']); + $config_ticket_moving_columns = intval($_POST['config_ticket_moving_columns']); + $config_ticket_ordering = intval($_POST['config_ticket_ordering']); + + mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_email_parse = $config_ticket_email_parse, config_ticket_email_parse_unknown_senders = $config_ticket_email_parse_unknown_senders, config_ticket_autoclose_hours = $config_ticket_autoclose_hours, config_ticket_new_ticket_notification_email = '$config_ticket_new_ticket_notification_email', config_ticket_default_billable = $config_ticket_default_billable, config_ticket_default_view = $config_ticket_default_view, config_ticket_moving_columns = $config_ticket_moving_columns, config_ticket_ordering = $config_ticket_ordering WHERE company_id = 1"); // Logging logAction("Settings", "Edit", "$session_name edited ticket settings"); @@ -24,4 +27,4 @@ if (isset($_POST['edit_ticket_settings'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); -} +} \ No newline at end of file diff --git a/post/misc.php b/post/misc.php index 75ca7b16..17f7b73c 100644 --- a/post/misc.php +++ b/post/misc.php @@ -35,6 +35,8 @@ if (isset($_GET['dismiss_notification'])) { if (isset($_GET['dismiss_all_notifications'])) { + validateCSRFToken($_GET['csrf_token']); + $sql = mysqli_query($mysqli,"SELECT * FROM notifications WHERE notification_user_id = $session_user_id AND notification_dismissed_at IS NULL"); $num_notifications = mysqli_num_rows($sql); diff --git a/post/user/asset.php b/post/user/asset.php index 11e20411..87b78193 100644 --- a/post/user/asset.php +++ b/post/user/asset.php @@ -39,7 +39,7 @@ if (isset($_POST['add_asset'])) { } // Add Primary Interface - mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = 'Primary', interface_mac = '$mac', interface_ip = '$ip', interface_nat_ip = '$nat_ip', interface_ipv6 = '$ipv6', interface_port = 'eth0', interface_primary = 1, interface_network_id = $network, interface_asset_id = $asset_id"); + mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '1', interface_mac = '$mac', interface_ip = '$ip', interface_nat_ip = '$nat_ip', interface_ipv6 = '$ipv6', interface_primary = 1, interface_network_id = $network, interface_asset_id = $asset_id"); if (!empty($_POST['username'])) { @@ -89,7 +89,7 @@ if (isset($_POST['edit_asset'])) { if(mysqli_num_rows($sql_interfaces) == 0 ) { // Add Primary Interface - mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = 'Primary', interface_mac = '$mac', interface_ip = '$ip', interface_nat_ip = '$nat_ip', interface_ipv6 = '$ipv6', interface_port = 'eth0', interface_primary = 1, interface_network_id = $network, interface_asset_id = $asset_id"); + mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '1', interface_mac = '$mac', interface_ip = '$ip', interface_nat_ip = '$nat_ip', interface_ipv6 = '$ipv6', interface_primary = 1, interface_network_id = $network, interface_asset_id = $asset_id"); } else { // Update Primary Interface mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_mac = '$mac', interface_ip = '$ip', interface_nat_ip = '$nat_ip', interface_ipv6 = '$ipv6', interface_network_id = $network WHERE interface_asset_id = $asset_id AND interface_primary = 1"); @@ -120,61 +120,6 @@ if (isset($_POST['edit_asset'])) { } -if (isset($_POST['change_client_asset'])) { - - enforceUserPermission('module_support', 2); - - validateCSRFToken($_POST['csrf_token']); - - $current_asset_id = intval($_POST['current_asset_id']); - $new_client_id = intval($_POST['new_client_id']); - - // Get Asset details and current client ID/Name for logging - $row = mysqli_fetch_array(mysqli_query($mysqli,"SELECT asset_name, asset_notes, asset_client_id, client_name FROM assets LEFT JOIN clients ON client_id = asset_client_id WHERE asset_id = $current_asset_id")); - $asset_name = sanitizeInput($row['asset_name']); - $asset_notes = sanitizeInput($row['asset_notes']); - $current_client_id = intval($row['asset_client_id']); - $current_client_name = sanitizeInput($row['client_name']); - - // Get new client name for logging - $row = mysqli_fetch_array(mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $new_client_id")); - $new_client_name = sanitizeInput($row['client_name']); - - // Create new asset - mysqli_query($mysqli, " - INSERT INTO assets (asset_type, asset_name, asset_description, asset_make, asset_model, asset_serial, asset_os, asset_status, asset_purchase_date, asset_warranty_expire, asset_install_date, asset_notes, asset_important) - SELECT asset_type, asset_name, asset_description, asset_make, asset_model, asset_serial, asset_os, asset_status, asset_purchase_date, asset_warranty_expire, asset_install_date, asset_notes, asset_important - FROM assets - WHERE asset_id = $current_asset_id - "); - $new_asset_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli, "UPDATE assets SET asset_client_id = $new_client_id WHERE asset_id = $new_asset_id"); - - // Archive/log the current asset - $notes = $asset_notes . "\r\n\r\n---\r\n* " . date('Y-m-d H:i:s') . ": Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)"; - mysqli_query($mysqli,"UPDATE assets SET asset_archived_at = NOW() WHERE asset_id = $current_asset_id"); - - // Log Archive - logAction("Asset", "Archive", "$session_name archived asset $asset_name (via transfer)", $current_client_id, $current_asset_id); - - // Log Transfer - logAction("Asset", "Transfer", "$session_name Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)", $current_client_id, $current_asset_id); - mysqli_query($mysqli, "UPDATE assets SET asset_notes = '$notes' WHERE asset_id = $current_asset_id"); - - // Log the new asset - $notes = $asset_notes . "\r\n\r\n---\r\n* " . date('Y-m-d H:i:s') . ": Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)"; - logAction("Asset", "Create", "$session_name created asset $name (via transfer)", $new_client_id, $new_asset_id); - - logAction("Asset", "Transfer", "$session_name Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)", $new_client_id, $new_asset_id); - - mysqli_query($mysqli, "UPDATE assets SET asset_notes = '$notes' WHERE asset_id = $new_asset_id"); - - $_SESSION['alert_message'] = "Asset $name transferred"; - - header("Location: client_assets.php?client_id=$new_client_id&asset_id=$new_asset_id"); - -} - if (isset($_GET['archive_asset'])) { enforceUserPermission('module_support', 2); @@ -303,6 +248,92 @@ if (isset($_POST['bulk_assign_asset_location'])) { } +if (isset($_POST['bulk_transfer_client_asset'])) { + + enforceUserPermission('module_support', 2); + + validateCSRFToken($_POST['csrf_token']); + + $new_client_id = intval($_POST['bulk_client_id']); + + // Transfer selected asset to new client + if (isset($_POST['asset_ids'])) { + + // Get Count + $asset_count = count($_POST['asset_ids']); + + foreach($_POST['asset_ids'] as $current_asset_id) { + $current_asset_id = intval($current_asset_id); + + // Get Asset details and current client ID/Name for logging + $row = mysqli_fetch_array(mysqli_query($mysqli,"SELECT asset_name, asset_notes, asset_client_id, client_name + FROM assets + LEFT JOIN clients ON client_id = asset_client_id + WHERE asset_id = $current_asset_id") + ); + $asset_name = sanitizeInput($row['asset_name']); + $asset_notes = sanitizeInput($row['asset_notes']); + $current_client_id = intval($row['asset_client_id']); + $current_client_name = sanitizeInput($row['client_name']); + + // Get new client name for logging + $row = mysqli_fetch_array(mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $new_client_id")); + $new_client_name = sanitizeInput($row['client_name']); + + // Create new asset + mysqli_query($mysqli, " + INSERT INTO assets (asset_type, asset_name, asset_description, asset_make, asset_model, asset_serial, asset_os, asset_status, asset_purchase_date, asset_warranty_expire, asset_install_date, asset_notes, asset_important) + SELECT asset_type, asset_name, asset_description, asset_make, asset_model, asset_serial, asset_os, asset_status, asset_purchase_date, asset_warranty_expire, asset_install_date, asset_notes, asset_important + FROM assets + WHERE asset_id = $current_asset_id + "); + $new_asset_id = mysqli_insert_id($mysqli); + + // Transfer all Interfaces over too + $sql_interfaces = mysqli_query($mysqli, "SELECT * FROM asset_interfaces WHERE interface_asset_id = $current_asset_id"); + + while ($row = mysqli_fetch_array($sql_interfaces)) { + $interface_name = sanitizeInput($row['interface_name']); + $interface_mac = sanitizeInput($row['interface_mac']); + $interface_port = sanitizeInput($row['interface_port']); + $interface_primary = intval($row['interface_primary']); + + mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '$interface_name', interface_mac = '$interface_mac', interface_port = '$interface_port', interface_primary = $interface_primary, interface_asset_id = $new_asset_id"); + + } + + mysqli_query($mysqli, "UPDATE assets SET asset_client_id = $new_client_id WHERE asset_id = $new_asset_id"); + + // Archive/log the current asset + $notes = $asset_notes . "\r\n\r\n---\r\n* " . date('Y-m-d H:i:s') . ": Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)"; + mysqli_query($mysqli,"UPDATE assets SET asset_archived_at = NOW() WHERE asset_id = $current_asset_id"); + + // Log Archive + logAction("Asset", "Archive", "$session_name archived asset $asset_name (via transfer)", $current_client_id, $current_asset_id); + + // Log Transfer + logAction("Asset", "Transfer", "$session_name Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)", $current_client_id, $current_asset_id); + mysqli_query($mysqli, "UPDATE assets SET asset_notes = '$notes' WHERE asset_id = $current_asset_id"); + + // Log the new asset + $notes = $asset_notes . "\r\n\r\n---\r\n* " . date('Y-m-d H:i:s') . ": Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)"; + logAction("Asset", "Create", "$session_name created asset $name (via transfer)", $new_client_id, $new_asset_id); + + logAction("Asset", "Transfer", "$session_name Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)", $new_client_id, $new_asset_id); + + mysqli_query($mysqli, "UPDATE assets SET asset_notes = '$notes' WHERE asset_id = $new_asset_id"); + + } // End Transfer to Client Loop + + // Bulk Logging + logAction("Asset", "Bulk Transfer", "$session_name transferred $asset_count assets to $new_client_name", $new_client_id); + + $_SESSION['alert_message'] = "Transferred $asset_count assets to $new_client_name."; + } + + header("Location: client_assets.php?client_id=$new_client_id&asset_id=$new_asset_id"); +} + if (isset($_POST['bulk_assign_asset_contact'])) { enforceUserPermission('module_support', 2); @@ -569,7 +600,7 @@ if (isset($_POST["import_client_assets_csv"])) { $asset_id = mysqli_insert_id($mysqli); // Add Primary Interface - mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = 'Primary', interface_port = 'eth0', interface_primary = 1, interface_asset_id = $asset_id"); + mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '1', interface_primary = 1, interface_asset_id = $asset_id"); $row_count = $row_count + 1; } else { @@ -701,10 +732,12 @@ if (isset($_POST['add_asset_interface'])) { $sql_insert = " INSERT INTO asset_interfaces SET interface_name = '$name', + interface_description= '$description', + interface_type = '$type', interface_mac = '$mac', interface_ip = '$ip', + interface_nat_ip = '$nat_ip', interface_ipv6 = '$ipv6', - interface_port = '$port', interface_notes = '$notes', interface_network_id = $network, interface_asset_id = $asset_id @@ -713,6 +746,12 @@ if (isset($_POST['add_asset_interface'])) { $new_interface_id = mysqli_insert_id($mysqli); + // If Primary Interface Checked set all interfaces primary to 0 then set the new interface as primary with a 1 + if ($primary_interface) { + mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 0 WHERE interface_asset_id = $asset_id"); + mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 1 WHERE interface_id = $new_interface_id"); + } + // 5) If user selected a connected interface, insert row in asset_interface_links if (!empty($connected_to) && intval($connected_to) > 0) { $sql_link = " @@ -738,6 +777,48 @@ if (isset($_POST['add_asset_interface'])) { exit; } +if (isset($_POST['add_asset_multiple_interfaces'])) { + + enforceUserPermission('module_support', 2); + validateCSRFToken($_POST['csrf_token']); + + $asset_id = intval($_POST['asset_id']); + $interface_start = intval($_POST['interface_start']); + $interfaces = intval($_POST['interfaces']); + $type = sanitizeInput($_POST['type']); + $name_prefix = sanitizeInput($_POST['name_prefix']); + $network = intval($_POST['network']); + $notes = sanitizeInput($_POST['notes']); + + $sql = mysqli_query($mysqli, "SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id"); + $row = mysqli_fetch_array($sql); + $asset_name = sanitizeInput($row['asset_name']); + $client_id = intval($row['asset_client_id']); + + for ($interface_number = $interface_start; $interface_number < $interface_start + $interfaces; $interface_number++) { + + // Format $interface_number as a 2-digit number + $formatted_interface_number = str_pad($interface_number, 2, '0', STR_PAD_LEFT); + + $sql_insert = " + INSERT INTO asset_interfaces SET + interface_name = '$name_prefix$formatted_interface_number', + interface_type = '$type', + interface_notes = '$notes', + interface_network_id = $network, + interface_asset_id = $asset_id + "; + mysqli_query($mysqli, $sql_insert); + + logAction("Asset Interface", "Create", "$session_name created interface $name for asset $asset_name", $client_id, $asset_id); + } + + logAction("Asset Interface", "Bulk Create", "$session_name created $interfaces for asset $asset_name", $client_id, $asset_id); + $_SESSION['alert_message'] = "Created $interfaces Interface(s) for asset $asset_name"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit; +} + if (isset($_POST['edit_asset_interface'])) { enforceUserPermission('module_support', 2); @@ -764,16 +845,24 @@ if (isset($_POST['edit_asset_interface'])) { $sql_update = " UPDATE asset_interfaces SET interface_name = '$name', + interface_description= '$description', + interface_type = '$type', interface_mac = '$mac', interface_ip = '$ip', - interface_ipv6 = '$ipv6', - interface_port = '$port', + interface_nat_ip = '$nat_ip', + interface_ipv6 = '$ipv6', interface_notes = '$notes', interface_network_id = $network WHERE interface_id = $interface_id "; mysqli_query($mysqli, $sql_update); + // If Primary Interface Checked set all interfaces primary to 0 then set the new interface as primary with a 1 + if ($primary_interface) { + mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 0 WHERE interface_asset_id = $asset_id"); + mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 1 WHERE interface_id = $interface_id"); + } + // 3) Remove any existing link for this interface (one-to-one) $sql_delete_link = " DELETE FROM asset_interface_links @@ -849,3 +938,205 @@ if (isset($_GET['delete_asset_interface'])) { header("Location: " . $_SERVER['HTTP_REFERER']); exit; } + +if (isset($_POST["import_client_asset_interfaces_csv"])) { + + enforceUserPermission('module_support', 2); + + validateCSRFToken($_POST['csrf_token']); + + $asset_id = intval($_POST['asset_id']); + $file_name = $_FILES["file"]["tmp_name"]; + + // Get Asset Details for logging + $sql_asset = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_id = $asset_id"); + $row = mysqli_fetch_assoc($sql_asset); + $client_id = intval($row['asset_client_id']); + $asset_name = sanitizeInput($row['asset_name']); + + $error = false; + + if (!empty($_FILES["file"]["tmp_name"])) { + $file_name = $_FILES["file"]["tmp_name"]; + } else { + $_SESSION['alert_message'] = "Please select a file to upload."; + $_SESSION['alert_type'] = "error"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + + //Check file is CSV + $file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); + $allowed_file_extensions = array('csv'); + if (in_array($file_extension,$allowed_file_extensions) === false) { + $error = true; + $_SESSION['alert_message'] = "Bad file extension"; + } + + //Check file isn't empty + elseif ($_FILES["file"]["size"] < 1) { + $error = true; + $_SESSION['alert_message'] = "Bad file size (empty?)"; + } + + //(Else)Check column count (Name, Description, Type, MAC, IP, NAT IP, IPv6, Network) + $f = fopen($file_name, "r"); + $f_columns = fgetcsv($f, 1000, ","); + if (!$error & count($f_columns) != 8) { + $error = true; + $_SESSION['alert_message'] = "Bad column count."; + } + + //Else, parse the file + if (!$error) { + $file = fopen($file_name, "r"); + fgetcsv($file, 1000, ","); // Skip first line + $row_count = 0; + $duplicate_count = 0; + while(($column = fgetcsv($file, 1000, ",")) !== false) { + + // Default variables (if undefined) + $description = $type = $mac = $ip = $nat_ip = $ipv6 = $network = ''; + + $duplicate_detect = 0; + if (isset($column[0])) { + $name = sanitizeInput($column[0]); + if (mysqli_num_rows(mysqli_query($mysqli,"SELECT interface_name FROM asset_interfaces WHERE interface_asset_id = $asset_id AND interface_name = '$name'")) > 0) { + $duplicate_detect = 1; + } + } + if (!empty($column[1])) { + $description = sanitizeInput($column[1]); + } + if (!empty($column[2])) { + $type = sanitizeInput($column[2]); + } + if (!empty($column[3])) { + $mac = sanitizeInput($column[3]); + } + if (!empty($column[4])) { + $ip = sanitizeInput($column[4]); + } + if (!empty($column[5])) { + $nat_ip = sanitizeInput($column[5]); + } + if (!empty($column[6])) { + $ipv6 = sanitizeInput($column[6]); + } + if (!empty($column[7])) { + $network = sanitizeInput($column[7]); + if ($network) { + $sql_network = mysqli_query($mysqli,"SELECT * FROM networks WHERE network_name = '$network' AND network_archived_at IS NULL AND network_client_id = $client_id"); + $row = mysqli_fetch_assoc($sql_network); + $network_id = intval($row['network_id']); + } + } + + // Check if duplicate was detected + if ($duplicate_detect == 0) { + //Add + mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '$name', interface_description = '$description', interface_type = '$type', interface_mac = '$mac', interface_ip = '$ip', interface_nat_ip = '$nat_ip', interface_ipv6 = '$ipv6', interface_network_id = $network_id, interface_asset_id = $asset_id"); + + $row_count = $row_count + 1; + } else { + $duplicate_count = $duplicate_count + 1; + } + } + fclose($file); + + // Logging + logAction("Asset", "Import", "$session_name imported $row_count interfaces(s) to asset $asset_name via CSV file", $client_id); + + $_SESSION['alert_message'] = "$row_count Interfaces(s) added to asset $asset_name, $duplicate_count duplicate(s) detected"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + } + //Check for any errors, if there are notify user and redirect + if ($error) { + $_SESSION['alert_type'] = "warning"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + } +} + +if (isset($_GET['download_client_asset_interfaces_csv_template'])) { + $asset_id = intval($_GET['download_client_asset_interfaces_csv_template']); + + //get records from database + $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id"); + $row = mysqli_fetch_array($sql); + + $asset_name = $row['asset_name']; + + $delimiter = ","; + $filename = strtoAZaz09($asset_name) . "-Asset-Interfaces-Template.csv"; + + //create a file pointer + $f = fopen('php://memory', 'w'); + + //set column headers + $fields = array('Name', 'Description', 'Type', 'MAC', 'IP', 'NAT IP', 'IPv6', 'Network'); + fputcsv($f, $fields, $delimiter); + + //move back to beginning of file + fseek($f, 0); + + //set headers to download file rather than displayed + header('Content-Type: text/csv'); + header('Content-Disposition: attachment; filename="' . $filename . '";'); + + //output all remaining data on a file pointer + fpassthru($f); + exit; + +} + +if (isset($_POST['export_client_asset_interfaces_csv'])) { + + enforceUserPermission('module_support'); + + validateCSRFToken($_POST['csrf_token']); + + $asset_id = intval($_POST['asset_id']); + + //get records from database + $sql = mysqli_query($mysqli,"SELECT * FROM asset_interfaces LEFT JOIN assets ON asset_id = interface_asset_id LEFT JOIN networks ON interface_network_id = network_id LEFT JOIN clients ON asset_client_id = client_id WHERE asset_id = $asset_id AND interface_archived_at IS NULL ORDER BY interface_name ASC"); + $row = mysqli_fetch_array($sql); + + $asset_name = $row['asset_name']; + $client_id = $row['asset_client_id']; + + $num_rows = mysqli_num_rows($sql); + + if ($num_rows > 0) { + $delimiter = ","; + $filename = strtoAZaz09($asset_name) . "-Interfaces-" . date('Y-m-d') . ".csv"; + + //create a file pointer + $f = fopen('php://memory', 'w'); + + //set column headers + $fields = array('Name', 'Description', 'Type', 'MAC', 'IP', 'NAT IP', 'IPv6', 'Network'); + fputcsv($f, $fields, $delimiter); + + //output each row of the data, format line as csv and write to file pointer + while($row = mysqli_fetch_array($sql)) { + $lineData = array($row['interface_name'], $row['interface_description'], $row['interface_type'], $row['interface_mac'], $row['interface_ip'], $row['interface_nat_ip'], $row['interface_ipv6'], $row['network_name']); + fputcsv($f, $lineData, $delimiter); + } + + //move back to beginning of file + fseek($f, 0); + + //set headers to download file rather than displayed + header('Content-Type: text/csv'); + header('Content-Disposition: attachment; filename="' . $filename . '";'); + + //output all remaining data on a file pointer + fpassthru($f); + } + + // Logging + logAction("Asset Interface", "Export", "$session_name exported $num_rows interfaces(s) to a CSV file", $client_id); + + exit; + +} \ No newline at end of file diff --git a/post/user/asset_interface_model.php b/post/user/asset_interface_model.php index 140b6dc1..52ff3347 100644 --- a/post/user/asset_interface_model.php +++ b/post/user/asset_interface_model.php @@ -2,13 +2,16 @@ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); $name = sanitizeInput($_POST['name']); +$primary_interface = sanitizeInput($_POST['primary_interface']) ?? 0; +$description = sanitizeInput($_POST['description']); +$type = sanitizeInput($_POST['type']); $mac = sanitizeInput($_POST['mac']); $ip = sanitizeInput($_POST['ip']); if ($_POST['dhcp'] == 1){ $ip = 'DHCP'; } +$nat_ip = sanitizeInput($_POST['nat_ip']); $ipv6 = sanitizeInput($_POST['ipv6']); -$port = sanitizeInput($_POST['port']); $network = intval($_POST['network']); $notes = sanitizeInput($_POST['notes']); $connected_to = intval($_POST['connected_to']); diff --git a/post/user/task.php b/post/user/task.php index 3d74a51f..9add77fb 100644 --- a/post/user/task.php +++ b/post/user/task.php @@ -30,7 +30,7 @@ if (isset($_POST['add_task'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['edit_task'])) { +if (isset($_POST['edit_ticket_task'])) { enforceUserPermission('module_support', 2); @@ -38,18 +38,12 @@ if (isset($_POST['edit_task'])) { $task_name = sanitizeInput($_POST['name']); $task_order = intval($_POST['order']); $task_completion_estimate = intval($_POST['completion_estimate']); - $is_ticket = intval($_POST['is_ticket']); - if($is_ticket == 1) { - // Get Client ID - $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); - $row = mysqli_fetch_array($sql); - $client_id = intval($row['ticket_client_id']); - mysqli_query($mysqli, "UPDATE tasks SET task_name = '$task_name', task_order = $task_order, task_completion_estimate = $task_completion_estimate WHERE task_id = $task_id"); - } else { - $client_id = 0; - mysqli_query($mysqli, "UPDATE task_templates SET task_template_name = '$task_name', task_template_order = $task_order, task_template_completion_estimate = $task_completion_estimate WHERE task_template_id = $task_id"); - } + // Get Client ID + $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['ticket_client_id']); + mysqli_query($mysqli, "UPDATE tasks SET task_name = '$task_name', task_order = $task_order, task_completion_estimate = $task_completion_estimate WHERE task_id = $task_id"); // Logging logAction("Task", "Edit", "$session_name edited task $task_name", $client_id, $task_id); @@ -59,6 +53,25 @@ if (isset($_POST['edit_task'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } +if (isset($_POST['edit_ticket_template_task'])) { + + enforceUserPermission('module_support', 2); + + $task_template_id = intval($_POST['task_template_id']); + $task_name = sanitizeInput($_POST['name']); + $task_order = intval($_POST['order']); + $task_completion_estimate = intval($_POST['completion_estimate']); + + mysqli_query($mysqli, "UPDATE task_templates SET task_template_name = '$task_name', task_template_order = $task_order, task_template_completion_estimate = $task_completion_estimate WHERE task_template_id = $task_template_id"); + + // Logging + logAction("Task", "Edit", "$session_name edited task $task_name", 0, $task_template_id); + + $_SESSION['alert_message'] = "Task $task_name edited"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_GET['delete_task'])) { diff --git a/post/user/ticket.php b/post/user/ticket.php index 6580bf4f..a38720ab 100644 --- a/post/user/ticket.php +++ b/post/user/ticket.php @@ -293,7 +293,7 @@ if (isset($_POST['edit_ticket_contact'])) { $ticket_id = intval($_POST['ticket_id']); $contact_id = intval($_POST['contact']); - $notify = intval($_POST['contact_notify']); + $notify = intval($_POST['contact_notify']) ?? 0; // Get Original contact, and ticket details $sql = mysqli_query($mysqli, "SELECT @@ -827,6 +827,54 @@ if (isset($_POST['bulk_edit_ticket_priority'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } +if (isset($_POST['bulk_edit_ticket_category'])) { + + enforceUserPermission('module_support', 2); + + // POST variables + $category_id = intval($_POST['bulk_category']); + + // Assign Tech to Selected Tickets + if (isset($_POST['ticket_ids'])) { + + // Get a Ticket Count + $ticket_count = count($_POST['ticket_ids']); + + foreach ($_POST['ticket_ids'] as $ticket_id) { + $ticket_id = intval($ticket_id); + + $sql = mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number, ticket_subject, category_name, ticket_client_id FROM tickets LEFT JOIN categories ON ticket_category = category_id WHERE ticket_id = $ticket_id"); + $row = mysqli_fetch_array($sql); + + $ticket_prefix = sanitizeInput($row['ticket_prefix']); + $ticket_number = intval($row['ticket_number']); + $ticket_subject = sanitizeInput($row['ticket_subject']); + $previous_ticket_category_name = sanitizeInput($row['category_name']); + $client_id = intval($row['ticket_client_id']); + + // Get Category Name + $sql = mysqli_query($mysqli, "SELECT category_name FROM categories WHERE category_id = $category_id"); + $row = mysqli_fetch_array($sql); + $category_name = sanitizeInput($row['category_name']); + + // Update ticket + mysqli_query($mysqli, "UPDATE tickets SET ticket_category = '$category_id' WHERE ticket_id = $ticket_id"); + + // Logging + logAction("Ticket", "Edit", "$session_name updated the category on ticket $ticket_prefix$ticket_number - $ticket_subject from $previous_category_name to $category_name", $client_id, $ticket_id); + + customAction('ticket_update', $ticket_id); + } // End For Each Ticket ID Loop + + // Logging + logAction("Ticket", " Bulk Edit", "$session_name updated the category to $category_name on $ticket_count"); + + $_SESSION['alert_message'] = "Category set to $category_name for $ticket_count Tickets"; + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_POST['bulk_merge_tickets'])) { enforceUserPermission('module_support', 2); diff --git a/project_details.php b/project_details.php index fd2591d8..f3339171 100644 --- a/project_details.php +++ b/project_details.php @@ -197,7 +197,11 @@ if (isset($_GET['project_id'])) {
      - + Edit @@ -406,7 +410,6 @@ if (isset($_GET['project_id'])) {
      - + Edit @@ -295,8 +299,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/quote.php b/quote.php index dde50ef5..1fd62e64 100644 --- a/quote.php +++ b/quote.php @@ -181,11 +181,19 @@ if (isset($_GET['quote_id'])) {
      - + Edit = 2) { ?> - + Copy @@ -586,12 +594,8 @@ if (isset($_GET['quote_id'])) {
      - + Edit = 2) { ?> - + Copy @@ -226,9 +234,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -244,8 +249,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + + + + + @@ -197,7 +206,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - + Edit
      @@ -211,9 +225,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/recurring_tickets.php b/recurring_tickets.php index 655ef06e..87b07b00 100644 --- a/recurring_tickets.php +++ b/recurring_tickets.php @@ -25,7 +25,19 @@ $sql = mysqli_query( LEFT JOIN clients on scheduled_ticket_client_id = client_id WHERE scheduled_tickets.scheduled_ticket_subject LIKE '%$q%' $rec_ticket_permission_snippet - ORDER BY $sort $order LIMIT $record_from, $record_to" + ORDER BY + CASE + WHEN '$sort' = 'scheduled_ticket_priority' THEN + CASE scheduled_ticket_priority + WHEN 'High' THEN 1 + WHEN 'Medium' THEN 2 + WHEN 'Low' THEN 3 + ELSE 4 -- Optional: for unexpected priority values + END + ELSE NULL + END $order, + $sort $order -- Apply normal sorting by $sort and $order + LIMIT $record_from, $record_to" ); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/report_assets.php b/report_assets.php index 5d73a6b3..24c3bbeb 100644 --- a/report_assets.php +++ b/report_assets.php @@ -566,7 +566,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - + Edit 2) { ?> @@ -575,9 +578,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Unarchive - - Transfer - Archive @@ -597,10 +597,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/report_budget.php b/report_budget.php index 9e1b2b83..861d6494 100644 --- a/report_budget.php +++ b/report_budget.php @@ -2,7 +2,7 @@ require_once "includes/inc_all_reports.php"; -validateAccountantRole(); +enforceUserPermission('module_financial'); if (isset($_GET['year'])) { $year = intval($_GET['year']); diff --git a/report_clients_with_balance.php b/report_clients_with_balance.php index 5f75a4a4..f9fc7bad 100644 --- a/report_clients_with_balance.php +++ b/report_clients_with_balance.php @@ -2,7 +2,7 @@ require_once "includes/inc_all_reports.php"; -validateAccountantRole(); +enforceUserPermission('module_financial'); ?> diff --git a/report_password_rotation.php b/report_credential_rotation.php similarity index 87% rename from report_password_rotation.php rename to report_credential_rotation.php index c92abdd2..16022147 100644 --- a/report_password_rotation.php +++ b/report_credential_rotation.php @@ -2,7 +2,7 @@ require_once "includes/inc_all_reports.php"; -validateTechRole(); +enforceUserPermission('module_credential'); // TODO: Default to 90 but allow input field to change this if (isset($_GET['days'])) { @@ -23,7 +23,7 @@ $passwords_not_rotated_sql = mysqli_query($mysqli,
      -

      Login entry passwords not changed/rotated in the last 90 days

      +

      Client credentials not changed/rotated in the last 90 days

      @@ -35,9 +35,9 @@ $passwords_not_rotated_sql = mysqli_query($mysqli, Client - Login Name - Login Description - Login Password Last Changed + Credential Name + Credential Description + Credential Password Last Changed diff --git a/report_expense_by_vendor.php b/report_expense_by_vendor.php index 20038372..4d83d49b 100644 --- a/report_expense_by_vendor.php +++ b/report_expense_by_vendor.php @@ -2,7 +2,7 @@ require_once "includes/inc_all_reports.php"; -validateAccountantRole(); +enforceUserPermission('module_financial'); if (isset($_GET['year'])) { if ($_GET['year'] === 'all') { diff --git a/report_expense_summary.php b/report_expense_summary.php index 9abe15a9..09555e9f 100644 --- a/report_expense_summary.php +++ b/report_expense_summary.php @@ -2,7 +2,7 @@ require_once "includes/inc_all_reports.php"; -validateAccountantRole(); +enforceUserPermission('module_financial'); if (isset($_GET['year'])) { $year = intval($_GET['year']); diff --git a/report_income_by_client.php b/report_income_by_client.php index 16e0b42a..fffa8515 100644 --- a/report_income_by_client.php +++ b/report_income_by_client.php @@ -2,7 +2,7 @@ require_once "includes/inc_all_reports.php"; -validateAccountantRole(); +enforceUserPermission('module_financial'); if (isset($_GET['year'])) { if ($_GET['year'] === 'all') { diff --git a/report_income_summary.php b/report_income_summary.php index 2fc2a9b6..187fdf23 100644 --- a/report_income_summary.php +++ b/report_income_summary.php @@ -2,7 +2,7 @@ require_once "includes/inc_all_reports.php"; -validateAccountantRole(); +enforceUserPermission('module_financial'); if (isset($_GET['year'])) { $year = intval($_GET['year']); @@ -147,8 +147,7 @@ $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category
      - + + + + + + diff --git a/tickets.php b/tickets.php index b1d4f494..c82281b9 100644 --- a/tickets.php +++ b/tickets.php @@ -36,6 +36,20 @@ if (isset($_GET['status']) && is_array($_GET['status']) && !empty($_GET['status' } } +if (isset($_GET['category'])) { + $category = sanitizeInput($_GET['category']); + if ($category == 'empty') { + $category_snippet = "AND ticket_category = 0 "; + } elseif ($category == 'all') { + $category_snippet = ''; + } else { + $category_snippet = "AND ticket_category = " . $category; + } +} else { + $category_snippet = ''; +} + + // Ticket assignment status filter // Default - any $ticket_assigned_query = ''; @@ -48,7 +62,7 @@ if (isset($_GET['assigned']) & !empty($_GET['assigned'])) { $ticket_assigned_query = 'AND ticket_assigned_to = ' . intval($_GET['assigned']); $ticket_assigned_filter_id = intval($_GET['assigned']); } -} +} //Rebuild URL $url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order, 'status' => $status, 'assigned' => $ticket_assigned_filter_id))); @@ -70,11 +84,25 @@ $sql = mysqli_query( LEFT JOIN locations ON ticket_location_id = location_id LEFT JOIN vendors ON ticket_vendor_id = vendor_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + LEFT JOIN categories ON ticket_category = category_id WHERE $ticket_status_snippet " . $ticket_assigned_query . " + $category_snippet AND DATE(ticket_created_at) BETWEEN '$dtf' AND '$dtt' AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status_name LIKE '%$q%' OR ticket_priority LIKE '%$q%' OR user_name LIKE '%$q%' OR contact_name LIKE '%$q%' OR asset_name LIKE '%$q%' OR vendor_name LIKE '%$q%' OR ticket_vendor_ticket_number LIKE '%q%') $ticket_permission_snippet - ORDER BY $sort $order LIMIT $record_from, $record_to" + ORDER BY + CASE + WHEN '$sort' = 'ticket_priority' THEN + CASE ticket_priority + WHEN 'High' THEN 1 + WHEN 'Medium' THEN 2 + WHEN 'Low' THEN 3 + ELSE 4 -- Optional: for unexpected priority values + END + ELSE NULL + END $order, + $sort $order -- Apply normal sorting by $sort and $order + LIMIT $record_from, $record_to" ); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -99,6 +127,15 @@ $sql_total_tickets_assigned = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS $row = mysqli_fetch_array($sql_total_tickets_assigned); $user_active_assigned_tickets = intval($row['total_tickets_assigned']); +$sql_categories = mysqli_query( + $mysqli, + "SELECT * FROM categories + WHERE category_type = 'Ticket' + ORDER BY category_name" +); + + + ?>