diff --git a/agent/expenses.php b/agent/expenses.php index 52b30dc5..1bd2f3e4 100644 --- a/agent/expenses.php +++ b/agent/expenses.php @@ -94,26 +94,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Bulk Action (0)
- Set Category
- Set Account
- Set Client
- Delete @@ -143,7 +143,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
diff --git a/agent/files.php b/agent/files.php index cd41ea8c..5c3905d2 100644 --- a/agent/files.php +++ b/agent/files.php @@ -371,8 +371,8 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
- - + + Upload File @@ -447,24 +447,15 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
Move Files - - Move Documents -
-
diff --git a/agent/locations.php b/agent/locations.php index 1fd9a5d5..117924a7 100644 --- a/agent/locations.php +++ b/agent/locations.php @@ -119,8 +119,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - +
@@ -38,7 +38,7 @@ ob_start();
- +
diff --git a/agent/modals/asset/asset_bulk_assign_contact.php b/agent/modals/asset/asset_bulk_assign_contact.php index e292ae62..c9a82560 100644 --- a/agent/modals/asset/asset_bulk_assign_contact.php +++ b/agent/modals/asset/asset_bulk_assign_contact.php @@ -3,9 +3,9 @@ require_once '../../../includes/modal_header.php'; $client_id = intval($_GET['client_id']); -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -20,7 +20,7 @@ ob_start();
- +
diff --git a/agent/modals/asset/asset_bulk_assign_location.php b/agent/modals/asset/asset_bulk_assign_location.php index 114b462b..d7d96839 100644 --- a/agent/modals/asset/asset_bulk_assign_location.php +++ b/agent/modals/asset/asset_bulk_assign_location.php @@ -3,9 +3,9 @@ require_once '../../../includes/modal_header.php'; $client_id = intval($_GET['client_id']); -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -20,7 +20,7 @@ ob_start(); - +
diff --git a/agent/modals/asset/asset_bulk_assign_physical_location.php b/agent/modals/asset/asset_bulk_assign_physical_location.php index feb87400..42a649a4 100644 --- a/agent/modals/asset/asset_bulk_assign_physical_location.php +++ b/agent/modals/asset/asset_bulk_assign_physical_location.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
- +
diff --git a/agent/modals/asset/asset_bulk_assign_tags.php b/agent/modals/asset/asset_bulk_assign_tags.php index e5bd8341..8c81ef98 100644 --- a/agent/modals/asset/asset_bulk_assign_tags.php +++ b/agent/modals/asset/asset_bulk_assign_tags.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
- +
diff --git a/agent/modals/asset/asset_bulk_edit_status.php b/agent/modals/asset/asset_bulk_edit_status.php index c80ff202..2e6407f6 100644 --- a/agent/modals/asset/asset_bulk_edit_status.php +++ b/agent/modals/asset/asset_bulk_edit_status.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start(); - +
diff --git a/agent/modals/asset/asset_bulk_transfer_client.php b/agent/modals/asset/asset_bulk_transfer_client.php index 33c93a82..f22c9d41 100644 --- a/agent/modals/asset/asset_bulk_transfer_client.php +++ b/agent/modals/asset/asset_bulk_transfer_client.php @@ -2,8 +2,8 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); -$count = count($selected_ids); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); +$count = count($asset_ids); $client_id = intval($_GET['client_id'] ?? 0); if ($client_id) { @@ -25,7 +25,7 @@ ob_start(); - +
@@ -39,7 +39,7 @@ ob_start(); - +
@@ -34,7 +34,7 @@ ob_start();
- +
diff --git a/agent/modals/client/client_bulk_assign_tags.php b/agent/modals/client/client_bulk_assign_tags.php index 42691329..36c3d3dc 100644 --- a/agent/modals/client/client_bulk_assign_tags.php +++ b/agent/modals/client/client_bulk_assign_tags.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$client_ids = array_map('intval', $_GET['client_ids'] ?? []); -$count = count($selected_ids); +$count = count($client_ids); ob_start(); @@ -19,9 +19,9 @@ ob_start(); - + - +
diff --git a/agent/modals/client/client_bulk_edit_hourly_rate.php b/agent/modals/client/client_bulk_edit_hourly_rate.php index 2b07c8fe..dad5b36c 100644 --- a/agent/modals/client/client_bulk_edit_hourly_rate.php +++ b/agent/modals/client/client_bulk_edit_hourly_rate.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$client_ids = array_map('intval', $_GET['client_ids'] ?? []); -$count = count($selected_ids); +$count = count($client_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start(); - +
diff --git a/agent/modals/client/client_bulk_edit_industry.php b/agent/modals/client/client_bulk_edit_industry.php index 9ba8f304..f8ce3d10 100644 --- a/agent/modals/client/client_bulk_edit_industry.php +++ b/agent/modals/client/client_bulk_edit_industry.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$client_ids = array_map('intval', $_GET['client_ids'] ?? []); -$count = count($selected_ids); +$count = count($client_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start(); - +
diff --git a/agent/modals/client/client_bulk_edit_referral.php b/agent/modals/client/client_bulk_edit_referral.php index f22b7cfc..bfb88743 100644 --- a/agent/modals/client/client_bulk_edit_referral.php +++ b/agent/modals/client/client_bulk_edit_referral.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$client_ids = array_map('intval', $_GET['client_ids'] ?? []); -$count = count($selected_ids); +$count = count($client_ids); ob_start(); @@ -18,8 +18,8 @@ ob_start(); - - + +
diff --git a/agent/modals/client/client_bulk_email.php b/agent/modals/client/client_bulk_email.php index a0222df8..57e3a2f7 100644 --- a/agent/modals/client/client_bulk_email.php +++ b/agent/modals/client/client_bulk_email.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$client_ids = array_map('intval', $_GET['client_ids'] ?? []); -$count = count($selected_ids); +$count = count($client_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start(); - +
diff --git a/agent/modals/contact/contact_bulk_assign_location.php b/agent/modals/contact/contact_bulk_assign_location.php index 3600de5c..7b17ca9f 100644 --- a/agent/modals/contact/contact_bulk_assign_location.php +++ b/agent/modals/contact/contact_bulk_assign_location.php @@ -3,9 +3,9 @@ require_once '../../../includes/modal_header.php'; $client_id = intval($_GET['client_id']); -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []); -$count = count($selected_ids); +$count = count($contact_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start();
- +
diff --git a/agent/modals/contact/contact_bulk_assign_tags.php b/agent/modals/contact/contact_bulk_assign_tags.php index c56b9c7c..afab1816 100644 --- a/agent/modals/contact/contact_bulk_assign_tags.php +++ b/agent/modals/contact/contact_bulk_assign_tags.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []); -$count = count($selected_ids); +$count = count($contact_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
- +
diff --git a/agent/modals/contact/contact_bulk_edit_department.php b/agent/modals/contact/contact_bulk_edit_department.php index 553e06b2..19447add 100644 --- a/agent/modals/contact/contact_bulk_edit_department.php +++ b/agent/modals/contact/contact_bulk_edit_department.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []); -$count = count($selected_ids); +$count = count($contact_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
- +
diff --git a/agent/modals/contact/contact_bulk_edit_phone.php b/agent/modals/contact/contact_bulk_edit_phone.php index 91f52c32..b32f08fc 100644 --- a/agent/modals/contact/contact_bulk_edit_phone.php +++ b/agent/modals/contact/contact_bulk_edit_phone.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []); -$count = count($selected_ids); +$count = count($contact_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
- +
diff --git a/agent/modals/contact/contact_bulk_edit_role.php b/agent/modals/contact/contact_bulk_edit_role.php index 367696e9..2413c3fb 100644 --- a/agent/modals/contact/contact_bulk_edit_role.php +++ b/agent/modals/contact/contact_bulk_edit_role.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []); -$count = count($selected_ids); +$count = count($contact_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
- + diff --git a/agent/modals/contact/contact_bulk_email.php b/agent/modals/contact/contact_bulk_email.php index eb860c6d..db1c3c41 100644 --- a/agent/modals/contact/contact_bulk_email.php +++ b/agent/modals/contact/contact_bulk_email.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []); -$count = count($selected_ids); +$count = count($contact_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
- +
diff --git a/agent/modals/credential/credential_bulk_assign_tags.php b/agent/modals/credential/credential_bulk_assign_tags.php index c1503e0e..c0ed149f 100644 --- a/agent/modals/credential/credential_bulk_assign_tags.php +++ b/agent/modals/credential/credential_bulk_assign_tags.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$credential_ids = array_map('intval', $_GET['credential_ids'] ?? []); -$count = count($selected_ids); +$count = count($credential_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
- +
@@ -64,4 +64,4 @@ ob_start(); - +
diff --git a/agent/modals/expense/expense_bulk_edit_account.php b/agent/modals/expense/expense_bulk_edit_account.php index f932ec02..ca85880c 100644 --- a/agent/modals/expense/expense_bulk_edit_account.php +++ b/agent/modals/expense/expense_bulk_edit_account.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$expense_ids = array_map('intval', $_GET['expense_ids'] ?? []); -$count = count($selected_ids); +$count = count($expense_ids); // Generate the HTML form content using output buffering. ob_start(); @@ -19,7 +19,7 @@ ob_start();
- +
diff --git a/agent/modals/expense/expense_bulk_edit_category.php b/agent/modals/expense/expense_bulk_edit_category.php index 9c7ccd65..0bfc1146 100644 --- a/agent/modals/expense/expense_bulk_edit_category.php +++ b/agent/modals/expense/expense_bulk_edit_category.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$expense_ids = array_map('intval', $_GET['expense_ids'] ?? []); -$count = count($selected_ids); +$count = count($expense_ids); // Generate the HTML form content using output buffering. ob_start(); @@ -21,8 +21,8 @@ ob_start();
- + foreach ($expense_ids as $expense_id) { ?> + diff --git a/agent/modals/expense/expense_bulk_edit_client.php b/agent/modals/expense/expense_bulk_edit_client.php index 1cb2564b..53578782 100644 --- a/agent/modals/expense/expense_bulk_edit_client.php +++ b/agent/modals/expense/expense_bulk_edit_client.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$expense_ids = array_map('intval', $_GET['expense_ids'] ?? []); -$count = count($selected_ids); +$count = count($expense_ids); // Generate the HTML form content using output buffering. ob_start(); @@ -19,9 +19,9 @@ ob_start();
- + - +
diff --git a/agent/modals/file/file_bulk_move.php b/agent/modals/file/file_bulk_move.php index 57aa223e..8092ac00 100644 --- a/agent/modals/file/file_bulk_move.php +++ b/agent/modals/file/file_bulk_move.php @@ -2,17 +2,26 @@ require_once '../../../includes/modal_header.php'; -$client_id = intval($_GET['client_id']); -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$client_id = intval($_GET['client_id'] ?? 0); +$current_folder_id = intval($_GET['current_folder_id'] ?? 0); -$count = count($selected_ids); +// Selected IDs from JS (may be empty arrays) +$file_ids = array_map('intval', $_GET['file_ids'] ?? []); +$document_ids = array_map('intval', $_GET['document_ids'] ?? []); + +$count_files = count($file_ids); +$count_docs = count($document_ids); +$total = $count_files + $count_docs; ob_start(); ?>
-
Move Files
+
+ + Move Item +
@@ -20,10 +29,22 @@ ob_start(); - + + + + + + + +
+

+ Files:
+ Documents: +

+
@@ -32,75 +53,81 @@ ob_start();
+
- - + +
diff --git a/agent/modals/invoice/invoice_bulk_edit_category.php b/agent/modals/invoice/invoice_bulk_edit_category.php index 6cd9a20a..93ab1d5d 100644 --- a/agent/modals/invoice/invoice_bulk_edit_category.php +++ b/agent/modals/invoice/invoice_bulk_edit_category.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$invoice_ids = array_map('intval', $_GET['invoice_ids'] ?? []); -$count = count($selected_ids); +$count = count($invoice_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start();
- +
diff --git a/agent/modals/location/location_bulk_assign_tags.php b/agent/modals/location/location_bulk_assign_tags.php index 04891e08..ec172105 100644 --- a/agent/modals/location/location_bulk_assign_tags.php +++ b/agent/modals/location/location_bulk_assign_tags.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$location_ids = array_map('intval', $_GET['location_ids'] ?? []); -$count = count($selected_ids); +$count = count($location_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
- +
diff --git a/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php index f2be148d..495cdfc7 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$recurring_ticket_ids = array_map('intval', $_GET['recurring_ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($recurring_ticket_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start(); - +
@@ -34,7 +34,7 @@ ob_start(); $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users WHERE user_type = 1 AND user_status = 1 - AND user_archived_at IS NULL + AND user_archived_at IS NULL ORDER BY user_name DESC" ); while ($row = mysqli_fetch_array($sql_users_select)) { diff --git a/agent/modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php index b0402877..c47ef7fa 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$recurring_ticket_ids = array_map('intval', $_GET['recurring_ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($recurring_ticket_ids); ob_start(); @@ -19,8 +19,8 @@ ob_start(); - - + +
diff --git a/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php index f66d95be..a27a6146 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$recurring_ticket_ids = array_map('intval', $_GET['recurring_ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($recurring_ticket_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start(); - +
diff --git a/agent/modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php index d0cddbfe..cc7a178b 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$recurring_ticket_ids = array_map('intval', $_GET['recurring_ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($recurring_ticket_ids); ob_start(); @@ -19,8 +19,8 @@ ob_start(); - - + +
diff --git a/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php index b0ed17cc..692adc37 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$recurring_ticket_ids = array_map('intval', $_GET['recurring_ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($recurring_ticket_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start(); - +
diff --git a/agent/modals/ticket/ticket_bulk_add_project.php b/agent/modals/ticket/ticket_bulk_add_project.php index dbe78673..e2b0c69f 100644 --- a/agent/modals/ticket/ticket_bulk_add_project.php +++ b/agent/modals/ticket/ticket_bulk_add_project.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$ticket_ids = array_map('intval', $_GET['ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($ticket_ids); ob_start(); @@ -19,8 +19,8 @@ ob_start(); - - + +
@@ -32,7 +32,7 @@ ob_start(); - +
@@ -35,7 +35,7 @@ ob_start(); $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users WHERE user_type = 1 AND user_status = 1 - AND user_archived_at IS NULL + AND user_archived_at IS NULL ORDER BY user_name ASC" ); while ($row = mysqli_fetch_array($sql_users_select)) { diff --git a/agent/modals/ticket/ticket_bulk_edit_category.php b/agent/modals/ticket/ticket_bulk_edit_category.php index 9e4dbcc1..70a2cb8d 100644 --- a/agent/modals/ticket/ticket_bulk_edit_category.php +++ b/agent/modals/ticket/ticket_bulk_edit_category.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$ticket_ids = array_map('intval', $_GET['ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($ticket_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start(); - +
diff --git a/agent/modals/ticket/ticket_bulk_edit_priority.php b/agent/modals/ticket/ticket_bulk_edit_priority.php index 682232e4..6990c8b6 100644 --- a/agent/modals/ticket/ticket_bulk_edit_priority.php +++ b/agent/modals/ticket/ticket_bulk_edit_priority.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$ticket_ids = array_map('intval', $_GET['ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($ticket_ids); ob_start(); @@ -19,8 +19,8 @@ ob_start(); - - + +
@@ -46,4 +46,4 @@ ob_start(); - +
diff --git a/agent/modals/ticket/ticket_bulk_reply.php b/agent/modals/ticket/ticket_bulk_reply.php index e4659d95..77c31ab5 100644 --- a/agent/modals/ticket/ticket_bulk_reply.php +++ b/agent/modals/ticket/ticket_bulk_reply.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$ticket_ids = array_map('intval', $_GET['ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($ticket_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start();
- +
diff --git a/agent/modals/ticket/ticket_bulk_resolve.php b/agent/modals/ticket/ticket_bulk_resolve.php index 9ad983c3..c842e9e1 100644 --- a/agent/modals/ticket/ticket_bulk_resolve.php +++ b/agent/modals/ticket/ticket_bulk_resolve.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$ticket_ids = array_map('intval', $_GET['ticket_ids'] ?? []); -$count = count($selected_ids); +$count = count($ticket_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start(); - +
diff --git a/agent/post/file.php b/agent/post/file.php index 35d7a57a..52163a40 100644 --- a/agent/post/file.php +++ b/agent/post/file.php @@ -68,15 +68,15 @@ if (isset($_POST['upload_files'])) { $file_hash = strstr($file_reference_name, '.', true) ?: $file_reference_name; // Insert file metadata into the database - $query = "INSERT INTO files SET - file_reference_name = '$file_reference_name', - file_name = '$file_name', - file_description = '$description', + $query = "INSERT INTO files SET + file_reference_name = '$file_reference_name', + file_name = '$file_name', + file_description = '$description', file_ext = '$file_extension', - file_mime_type = '$file_mime_type', - file_size = $file_size, - file_created_by = $session_user_id, - file_folder_id = $folder_id, + file_mime_type = '$file_mime_type', + file_size = $file_size, + file_created_by = $session_user_id, + file_folder_id = $folder_id, file_client_id = $client_id"; mysqli_query($mysqli, $query); $file_id = mysqli_insert_id($mysqli); @@ -90,7 +90,7 @@ if (isset($_POST['upload_files'])) { } logAction("File", "Upload", "$session_name uploaded file $file_name", $client_id, $file_id); - + flash_alert("Uploaded file $file_name"); } } @@ -255,47 +255,117 @@ if (isset($_POST['bulk_delete_files'])) { } +// Unified bulk move for Files + Documents if (isset($_POST['bulk_move_files'])) { validateCSRFToken($_POST['csrf_token']); - enforceUserPermission('module_support', 2); - + $folder_id = intval($_POST['bulk_folder_id']); - // Get folder name for logging and Notification - $sql = mysqli_query($mysqli,"SELECT folder_name, folder_client_id FROM folders WHERE folder_id = $folder_id"); - $row = mysqli_fetch_array($sql); - $folder_name = sanitizeInput($row['folder_name']); - $client_id = intval($row['folder_client_id']); + // Default values (for root or missing folder) + $folder_name = "/"; + $log_client_id = 0; - // Check array for data - if (isset($_POST['file_ids'])) { - // Get Selected file Count - $file_count = count($_POST['file_ids']); + // If moving into a real folder, get folder name + client for logging + if ($folder_id > 0) { + $sql = mysqli_query($mysqli,"SELECT folder_name, folder_client_id FROM folders WHERE folder_id = $folder_id"); + if ($row = mysqli_fetch_array($sql)) { + $folder_name = sanitizeInput($row['folder_name']); + $log_client_id = intval($row['folder_client_id']); + } + } + + $file_count = 0; + $document_count = 0; + + // ------------------------- + // Move FILES (if any) + // ------------------------- + if (!empty($_POST['file_ids']) && is_array($_POST['file_ids'])) { + + $file_ids = array_map('intval', $_POST['file_ids']); + $file_count = count($file_ids); + + foreach ($file_ids as $file_id) { - // Move Documents to Folder Loop - foreach($_POST['file_ids'] as $file_id) { - $file_id = intval($file_id); - // Get file name for logging $file_name = sanitizeInput(getFieldById('files', $file_id, 'file_name')); - // file move query + // Move file mysqli_query($mysqli,"UPDATE files SET file_folder_id = $folder_id WHERE file_id = $file_id"); - logAction("File", "Move", "$session_name moved file $file_name to folder $folder_name", $client_id, $file_id); + // Per-file log + logAction( + "File", + "Move", + "$session_name moved file $file_name to folder $folder_name", + $log_client_id, + $file_id + ); } - logAction("File", "Bulk Move", "$session_name moved $file_count file(s) to folder $folder_name", $client_id); + // Bulk summary log for files + logAction( + "File", + "Bulk Move", + "$session_name moved $file_count file(s) to folder $folder_name", + $log_client_id + ); + } - flash_alert("Moved $file_count files to the folder $folder_name"); + // ------------------------- + // Move DOCUMENTS (if any) + // ------------------------- + if (!empty($_POST['document_ids']) && is_array($_POST['document_ids'])) { + + $document_ids = array_map('intval', $_POST['document_ids']); + $document_count = count($document_ids); + + foreach ($document_ids as $document_id) { + + // Get document name for logging + $document_name = sanitizeInput(getFieldById('documents', $document_id, 'document_name')); + + // Move document + mysqli_query($mysqli,"UPDATE documents SET document_folder_id = $folder_id WHERE document_id = $document_id"); + + // Per-document log + logAction( + "Document", + "Move", + "$session_name moved document $document_name to folder $folder_name", + $log_client_id, + $document_id + ); + } + + // Bulk summary log for documents + logAction( + "Document", + "Bulk Move", + "$session_name moved $document_count document(s) to folder $folder_name", + $log_client_id + ); + } + + // ------------------------- + // Flash message + // ------------------------- + if ($file_count && $document_count) { + flash_alert("Moved $file_count file(s) and $document_count document(s) to the folder $folder_name"); + } elseif ($file_count) { + flash_alert("Moved $file_count file(s) to the folder $folder_name"); + } elseif ($document_count) { + flash_alert("Moved $document_count document(s) to the folder $folder_name"); + } else { + flash_alert("No items were moved."); } redirect(); - } + if (isset($_POST['link_asset_to_file'])) { enforceUserPermission('module_support', 2); diff --git a/js/ajax_modal.js b/js/ajax_modal.js index 1d8b1ba0..81a9824f 100644 --- a/js/ajax_modal.js +++ b/js/ajax_modal.js @@ -2,31 +2,18 @@ $(document).on('click', '.ajax-modal', function (e) { e.preventDefault(); - const $trigger = $(this); - let modalUrl = $trigger.data('modal-url'); + const $trigger = $(this); + + // Prefer data-modal-url, fallback to href + let modalUrl = $trigger.data('modal-url') || $trigger.attr('href') || '#'; const modalSize = $trigger.data('modal-size') || 'md'; - const modalId = 'ajaxModal_' + new Date().getTime(); + const modalId = 'ajaxModal_' + Date.now(); - // -------- Optional bulk mode (activated via data-bulk="true") -------- - if ($trigger.data('bulk') === true || $trigger.data('bulk') === 'true') { - const selector = $trigger.data('bulk-selector') || '.bulk-select:checked'; - const param = $trigger.data('bulk-param') || 'selected_ids[]'; - - const ids = Array.from(document.querySelectorAll(selector)).map(cb => cb.value); - - if (!ids.length) { - alert('Please select at least one item.'); - return; // abort opening modal - } - - // Merge ids into existing query string safely - const urlObj = new URL(modalUrl, window.location.href); - ids.forEach(id => urlObj.searchParams.append(param, id)); - - // Preserve path + updated query (avoid absolute origin for relative AJAX) - modalUrl = urlObj.pathname + (urlObj.search ? '?' + urlObj.searchParams.toString() : ''); + // If no usable URL, bail + if (!modalUrl || modalUrl === '#') { + console.warn('ajax-modal: No modal URL found on trigger:', this); + return; } - // -------------------------------------------------------------------- // Show loading spinner while fetching content const loadingSpinner = ` diff --git a/js/bulk_actions.js b/js/bulk_actions.js index 05db1340..7b344950 100644 --- a/js/bulk_actions.js +++ b/js/bulk_actions.js @@ -1,20 +1,19 @@ // bulk_actions.js -// Allow selecting and editing multiple records at once (no dependency) +// Shared bulk helper: selection count + simple URL enrichment for bulk actions // --- Helpers --- -function getCheckboxes() { +function getBulkCheckboxes() { // Always query fresh in case rows are re-rendered return Array.from(document.querySelectorAll('input[type="checkbox"].bulk-select')); } -function getSelectedIds() { - return getCheckboxes() - .filter(cb => cb.checked) - .map(cb => cb.value); +function getSelectedCount() { + return getBulkCheckboxes().filter(cb => cb.checked).length; } function updateSelectedCount() { - const count = getSelectedIds().length; + const count = getSelectedCount(); + const selectedCountEl = document.getElementById('selectedCount'); if (selectedCountEl) { selectedCountEl.textContent = count; @@ -28,95 +27,96 @@ function updateSelectedCount() { // --- Select All Handling --- function checkAll(source) { - getCheckboxes().forEach(cb => { + getBulkCheckboxes().forEach(cb => { cb.checked = source.checked; }); updateSelectedCount(); } -// Wire select-all checkbox if present -const selectAllCheckbox = document.getElementById('selectAllCheckbox'); -if (selectAllCheckbox) { - selectAllCheckbox.addEventListener('click', function () { - checkAll(this); - }); -} +// --- Wire up once DOM is ready --- +document.addEventListener('DOMContentLoaded', function () { -// --- Per-row Checkbox Handling --- -document.addEventListener('click', function (e) { - const cb = e.target.closest('input[type="checkbox"].bulk-select'); - if (!cb) return; + // Initialize count updateSelectedCount(); + + // Wire select-all checkbox if present + const selectAllCheckbox = document.getElementById('selectAllCheckbox'); + if (selectAllCheckbox) { + selectAllCheckbox.addEventListener('click', function () { + checkAll(this); + }); + } + + // Per-row checkbox handling + document.addEventListener('click', function (e) { + const cb = e.target.closest('input[type="checkbox"].bulk-select'); + if (!cb) return; + updateSelectedCount(); + }); + + // ------------------------------------------------------ + // Generic bulk handler + // + // For ANY element with data-bulk="true": + // - Reads base URL from data-modal-url or href + // - Collects ALL checked .bulk-select checkboxes + // - Appends: + // = cb.value + // e.g. file_ids[]=12, document_ids[]=27, client_ids[]=3, etc. + // - Writes URL back to data-modal-url or href + // - DOES NOT prevent default, so ajax-modal / normal links still work + // ------------------------------------------------------ + document.addEventListener('click', function (e) { + const trigger = e.target.closest('[data-bulk="true"]'); + if (!trigger) return; + + const base = trigger.getAttribute('data-modal-url') || trigger.getAttribute('href'); + if (!base || base === '#') return; + + let url; + try { + url = new URL(base, window.location.href); + } catch (err) { + // Invalid URL, bail + return; + } + + const params = url.searchParams; + const checked = getBulkCheckboxes().filter(cb => cb.checked); + + if (!checked.length) { + // Nothing selected; do nothing (no ids appended) + return; + } + + // Collect all unique names (file_ids[], document_ids[], client_ids[], etc.) + const namesToClear = new Set(); + checked.forEach(cb => { + if (cb.name) { + namesToClear.add(cb.name); + } + }); + + // Clear any existing values for those names + namesToClear.forEach(name => params.delete(name)); + + // Append each checked checkbox as name=value + checked.forEach(cb => { + if (!cb.name) return; + params.append(cb.name, cb.value); + }); + + const finalUrl = url.pathname + '?' + params.toString(); + + if (trigger.hasAttribute('data-modal-url')) { + trigger.setAttribute('data-modal-url', finalUrl); + } else { + trigger.setAttribute('href', finalUrl); + } + + // IMPORTANT: + // We do NOT call preventDefault(). + // Your existing ajax-modal handler / normal link click will continue normally, + // now using the updated URL. + }, true); // capture so we run before other click handlers }); - -// --- Initialize count on page load --- -document.addEventListener('DOMContentLoaded', updateSelectedCount); - -// ------------------------------------------------------ -// Generic bulk handler driven by data-bulk / data-bulk-names -// ------------------------------------------------------ -// Behavior: -// -// 1) If NO data-bulk-names: -// - all checked .bulk-select => ?selected_ids[]=1&selected_ids[]=2... -// -// 2) If data-bulk-names="file_ids[],document_ids[]": -// - checked name="file_ids[]" => ?file_ids[]=1&file_ids[]=2... -// - checked name="document_ids[]" => ?document_ids[]=5... -// -// Works with either data-modal-url or href. -// Does NOT open modal or prevent default; it just rewrites the URL. -document.addEventListener('click', function (e) { - const trigger = e.target.closest('[data-bulk="true"]'); - if (!trigger) return; - - // Base URL: prefer data-modal-url (ajax-modal style), fallback to href - const baseUrl = trigger.getAttribute('data-modal-url') || trigger.getAttribute('href'); - if (!baseUrl || baseUrl === '#') { - return; - } - - const url = new URL(baseUrl, window.location.origin); - const params = url.searchParams; - - const bulkNamesAttr = trigger.getAttribute('data-bulk-names'); - const checkboxes = getCheckboxes().filter(cb => cb.checked); - - // Clear previous ids (in case link is reused) - params.delete('selected_ids[]'); - - if (bulkNamesAttr && bulkNamesAttr.trim() !== '') { - // New behavior: group by checkbox name - const bulkNames = bulkNamesAttr - .split(',') - .map(s => s.trim()) - .filter(Boolean); - - // Clear specific names first - bulkNames.forEach(name => params.delete(name)); - - // Append values by name - bulkNames.forEach(name => { - checkboxes.forEach(cb => { - if (cb.name === name) { - params.append(name, cb.value); - } - }); - }); - } else { - // Old behavior: everything as selected_ids[] - checkboxes.forEach(cb => { - params.append('selected_ids[]', cb.value); - }); - } - - const finalUrl = url.pathname + '?' + params.toString(); - - // Write back to data-modal-url if present, else to href - if (trigger.hasAttribute('data-modal-url')) { - trigger.setAttribute('data-modal-url', finalUrl); - } else { - trigger.setAttribute('href', finalUrl); - } - // NOTE: we do NOT call preventDefault(), we do NOT open modals here. -}, true); // use capture so this runs before other click handlers