From fd73f132bce28eb2d2d2bdac7acd01ac5fc689e6 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 28 Aug 2025 11:44:29 -0400 Subject: [PATCH] Fixed a few table names in Stripe Migration, Removed legacy stripe and AI settings --- REMOVEajax.php | 677 ---------------------- admin/database_updates.php | 16 +- admin/includes/side_nav.php | 20 - admin/settings_ai.php | 77 --- admin/settings_online_payment.php | 154 ----- admin/settings_online_payment_clients.php | 77 --- db.sql | 32 +- get_credential.php | 151 ----- includes/database_version.php | 2 +- includes/load_global_settings.php | 17 - scripts/cron.php | 9 - 11 files changed, 9 insertions(+), 1223 deletions(-) delete mode 100644 REMOVEajax.php delete mode 100644 admin/settings_ai.php delete mode 100644 admin/settings_online_payment.php delete mode 100644 admin/settings_online_payment_clients.php delete mode 100644 get_credential.php diff --git a/REMOVEajax.php b/REMOVEajax.php deleted file mode 100644 index 5004c68c..00000000 --- a/REMOVEajax.php +++ /dev/null @@ -1,677 +0,0 @@ - DATE_SUB(NOW(), INTERVAL 2 MINUTE)"); - while ($row = mysqli_fetch_array($query)) { - $users[] = $row['user_name']; - } - - if (!empty($users)) { - $users = array_unique($users); - if (count($users) > 1) { - // Multiple viewers - $response['message'] = "" . nullable_htmlentities(implode(", ", $users) . " are viewing this ticket."); - } else { - // Single viewer - $response['message'] = "" . nullable_htmlentities(implode("", $users) . " is viewing this ticket."); - } - } else { - // No viewers - $response['message'] = ""; - } - - echo json_encode($response); -} - -/* - * Generates public/guest links for sharing credentials/docs - */ -if (isset($_GET['share_generate_link'])) { - enforceUserPermission('module_support', 2); - - $item_encrypted_username = ''; // Default empty - $item_encrypted_credential = ''; // Default empty - - $client_id = intval($_GET['client_id']); - $item_type = sanitizeInput($_GET['type']); - $item_id = intval($_GET['id']); - $item_email = sanitizeInput($_GET['contact_email']); - $item_note = sanitizeInput($_GET['note']); - $item_view_limit = intval($_GET['views']); - $item_view_limit_wording = ""; - if ($item_view_limit == 1) { - $item_view_limit_wording = " and may only be viewed once, before the link is destroyed."; - } - $item_expires = sanitizeInput($_GET['expires']); - $item_expires_friendly = "never"; // default never - if ($item_expires == "1 HOUR") { - $item_expires_friendly = "1 hour"; - } elseif ($item_expires == "24 HOUR") { - $item_expires_friendly = "1 day"; - } elseif ($item_expires == "168 HOUR") { - $item_expires_friendly = "1 week"; - } elseif ($item_expires == "730 HOUR") { - $item_expires_friendly = "1 month"; - } - - $item_key = randomString(156); - - if ($item_type == "Document") { - $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT document_name FROM documents WHERE document_id = $item_id AND document_client_id = $client_id LIMIT 1")); - $item_name = sanitizeInput($row['document_name']); - } - - if ($item_type == "File") { - $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT file_name FROM files WHERE file_id = $item_id AND file_client_id = $client_id LIMIT 1")); - $item_name = sanitizeInput($row['file_name']); - } - - if ($item_type == "Credential") { - $credential = mysqli_query($mysqli, "SELECT credential_name, credential_username, credential_password FROM credentials WHERE credential_id = $item_id AND credential_client_id = $client_id LIMIT 1"); - $row = mysqli_fetch_array($credential); - - $item_name = sanitizeInput($row['credential_name']); - - // Decrypt & re-encrypt username/password for sharing - $credential_encryption_key = randomString(); - - $credential_username_cleartext = decryptCredentialEntry($row['credential_username']); - $iv = randomString(); - $username_ciphertext = openssl_encrypt($credential_username_cleartext, 'aes-128-cbc', $credential_encryption_key, 0, $iv); - $item_encrypted_username = $iv . $username_ciphertext; - - $credential_password_cleartext = decryptCredentialEntry($row['credential_password']); - $iv = randomString(); - $password_ciphertext = openssl_encrypt($credential_password_cleartext, 'aes-128-cbc', $credential_encryption_key, 0, $iv); - $item_encrypted_credential = $iv . $password_ciphertext; - } - - // Insert entry into DB - $sql = mysqli_query($mysqli, "INSERT INTO shared_items SET item_active = 1, item_key = '$item_key', item_type = '$item_type', item_related_id = $item_id, item_encrypted_username = '$item_encrypted_username', item_encrypted_credential = '$item_encrypted_credential', item_note = '$item_note', item_recipient = '$item_email', item_views = 0, item_view_limit = $item_view_limit, item_expire_at = NOW() + INTERVAL + $item_expires, item_client_id = $client_id"); - $share_id = $mysqli->insert_id; - - // Return URL - if ($item_type == "Credential") { - $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key&ek=$credential_encryption_key"; - } - else { - $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key"; - } - - $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); - $company_name = sanitizeInput($row['company_name']); - $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); - - // Sanitize Config vars from load_global_settings.php - $config_ticket_from_name = sanitizeInput($config_ticket_from_name); - $config_ticket_from_email = sanitizeInput($config_ticket_from_email); - $config_mail_from_name = sanitizeInput($config_mail_from_name); - $config_mail_from_email = sanitizeInput($config_mail_from_email); - - // Send user e-mail, if specified - if(!empty($config_smtp_host) && filter_var($item_email, FILTER_VALIDATE_EMAIL)){ - - $subject = "Time sensitive - $company_name secure link enclosed"; - if ($item_expires_friendly == "never") { - $subject = "$company_name secure link enclosed"; - } - $body = "Hello,

$session_name from $company_name sent you a time sensitive secure link regarding \"$item_name\".

The link will expire in $item_expires_friendly$item_view_limit_wording.

Click here to access your secure content

--
$company_name - Support
$config_ticket_from_email
$company_phone"; - - // Add the intended recipient disclosure - $body .= "

This email and any attachments are confidential and intended for the specified recipient(s) only. If you are not the intended recipient, please notify the sender and delete this email. Unauthorized use, disclosure, or distribution is prohibited."; - - $data = [ - [ - 'from' => $config_mail_from_email, - 'from_name' => $config_mail_from_name, - 'recipient' => $item_email, - 'recipient_name' => $item_email, - 'subject' => $subject, - 'body' => $body - ] - ]; - - addToMailQueue($data); - - } - - echo json_encode($url); - - // Logging - logAction("Share", "Create", "$session_name created shared link for $item_type - $item_name", $client_id, $item_id); - -} - -/* - * Returns sorted list of active clients - */ -if (isset($_GET['get_active_clients'])) { - enforceUserPermission('module_client'); - - $client_sql = mysqli_query( - $mysqli, - "SELECT client_id, client_name FROM clients - WHERE client_archived_at IS NULL - $access_permission_query - ORDER BY client_accessed_at DESC" - ); - - while ($row = mysqli_fetch_array($client_sql)) { - $response['clients'][] = $row; - } - - echo json_encode($response); -} - -/* - * 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( - $mysqli, - "SELECT contact_id, contact_name, contact_primary, contact_important, contact_technical FROM contacts - LEFT JOIN clients on contact_client_id = client_id - WHERE contacts.contact_archived_at IS NULL AND contact_client_id = $client_id - $access_permission_query - ORDER BY contact_primary DESC, contact_technical DESC, contact_important DESC, contact_name" - ); - - while ($row = mysqli_fetch_array($contact_sql)) { - $response['contacts'][] = $row; - } - - echo json_encode($response); -} - -/* - * Returns ordered list of active assets for a specified client - */ -if (isset($_GET['get_client_assets'])) { - enforceUserPermission('module_client'); - - $client_id = intval($_GET['client_id']); - - $asset_sql = mysqli_query( - $mysqli, - "SELECT asset_id, asset_name, contact_name FROM assets - LEFT JOIN clients on asset_client_id = client_id - LEFT JOIN contacts ON contact_id = asset_contact_id - WHERE assets.asset_archived_at IS NULL AND asset_client_id = $client_id - $access_permission_query - ORDER BY asset_important DESC, asset_name" - ); - - while ($row = mysqli_fetch_array($asset_sql)) { - $response['assets'][] = $row; - } - - echo json_encode($response); -} - -/* - * Returns locations for a specified client - */ -if (isset($_GET['get_client_locations'])) { - enforceUserPermission('module_client'); - - $client_id = intval($_GET['client_id']); - - $locations_sql = mysqli_query( - $mysqli, - "SELECT location_id, location_name FROM locations - LEFT JOIN clients on location_client_id = client_id - WHERE locations.location_archived_at IS NULL AND location_client_id = $client_id - $access_permission_query - ORDER BY location_primary DESC, location_name ASC" - ); - - while ($row = mysqli_fetch_array($locations_sql)) { - $response['locations'][] = $row; - } - - echo json_encode($response); -} - -/* - * Returns ordered list of vendors for a specified client - */ -if (isset($_GET['get_client_vendors'])) { - enforceUserPermission('module_client'); - - $client_id = intval($_GET['client_id']); - - $vendors_sql = mysqli_query( - $mysqli, - "SELECT vendor_id, vendor_name FROM vendors - LEFT JOIN clients on vendor_client_id = client_id - WHERE vendors.vendor_archived_at IS NULL AND vendor_client_id = $client_id - $access_permission_query - ORDER BY vendor_name ASC" - ); - - while ($row = mysqli_fetch_array($vendors_sql)) { - $response['vendors'][] = $row; - } - - echo json_encode($response); -} - -/* - * NEW TOTP getter for client login/passwords page - * When provided with a login ID, checks permissions and returns the 6-digit code - */ -if (isset($_GET['get_totp_token_via_id'])) { - enforceUserPermission('module_credential'); - - $credential_id = intval($_GET['credential_id']); - - $sql = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT credential_name, credential_otp_secret, credential_client_id FROM credentials WHERE credential_id = $credential_id")); - $name = sanitizeInput($sql['credential_name']); - $totp_secret = $sql['credential_otp_secret']; - $client_id = intval($sql['credential_client_id']); - - $otp = TokenAuth6238::getTokenCode(strtoupper($totp_secret)); - echo json_encode($otp); - - // Logging - // Only log the TOTP view if the user hasn't already viewed this specific login entry recently, this prevents logs filling if a user hovers across an entry a few times - $check_recent_totp_view_logged_sql = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(log_id) AS recent_totp_view FROM logs WHERE log_type = 'Credential' AND log_action = 'View TOTP' AND log_user_id = $session_user_id AND log_entity_id = $credential_id AND log_client_id = $client_id AND log_created_at > (NOW() - INTERVAL 5 MINUTE)")); - $recent_totp_view_logged_count = intval($check_recent_totp_view_logged_sql['recent_totp_view']); - - if ($recent_totp_view_logged_count == 0) { - // Logging - logAction("Credential", "View TOTP", "$session_name viewed credential TOTP code for $name", $client_id, $credential_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 load_global_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, company_phone_country_code FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); - $company_name = sanitizeInput($row['company_name']); - $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); - - // 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; -} - -if (isset($_POST['update_task_templates_order'])) { - // Update multiple task templates order - enforceUserPermission('module_support', 2); - - $positions = $_POST['positions']; - $ticket_template_id = intval($_POST['ticket_template_id']); - - foreach ($positions as $position) { - $id = intval($position['id']); - $order = intval($position['order']); - - mysqli_query($mysqli, "UPDATE task_templates SET task_template_order = $order WHERE task_template_ticket_template_id = $ticket_template_id AND task_template_id = $id"); - } - - // return a response - echo json_encode(['status' => 'success']); - exit; -} - -if (isset($_POST['update_quote_items_order'])) { - // Update multiple quote items order - enforceUserPermission('module_sales', 2); - - $positions = $_POST['positions']; - $quote_id = intval($_POST['quote_id']); - - foreach ($positions as $position) { - $id = intval($position['id']); - $order = intval($position['order']); - - mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_quote_id = $quote_id AND item_id = $id"); - } - - // return a response - echo json_encode(['status' => 'success']); - exit; -} - -if (isset($_POST['update_invoice_items_order'])) { - // Update multiple invoice items order - enforceUserPermission('module_sales', 2); - - $positions = $_POST['positions']; - $invoice_id = intval($_POST['invoice_id']); - - foreach ($positions as $position) { - $id = intval($position['id']); - $order = intval($position['order']); - - mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_invoice_id = $invoice_id AND item_id = $id"); - } - - // return a response - echo json_encode(['status' => 'success']); - exit; -} - -if (isset($_POST['update_recurring_invoice_items_order'])) { - // Update multiple recurring invoice items order - enforceUserPermission('module_sales', 2); - - $positions = $_POST['positions']; - $recurring_invoice_id = intval($_POST['recurring_invoice_id']); - - foreach ($positions as $position) { - $id = intval($position['id']); - $order = intval($position['order']); - - mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_recurring_invoice_id = $recurring_invoice_id AND item_id = $id"); - } - - // return a response - echo json_encode(['status' => 'success']); - exit; -} diff --git a/admin/database_updates.php b/admin/database_updates.php index 19d7bb9f..37e276db 100644 --- a/admin/database_updates.php +++ b/admin/database_updates.php @@ -3902,8 +3902,8 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { // Set Recurring payment method with Stripe to the new saved_payment_id and update the method to Credit Card $sql_recurring_payments = mysqli_query($mysqli, "SELECT * FROM recurring_payments - LEFT JOIN invoices ON recurring_payment_invoice_id = invoice_id - LEFT JOIN client_saved_payment_methods ON saved_payment_client = invoice_client_id + LEFT JOIN invoices ON recurring_payment_recurring_invoice_id = invoice_id + LEFT JOIN client_saved_payment_methods ON saved_payment_client_id = invoice_client_id WHERE recurring_payment_method = 'Stripe'" ); @@ -3935,8 +3935,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.1'"); } - /* 2025-07-21 - JQ For next release Pauyment Provider Switch Over - if (CURRENT_DATABASE_VERSION == '2.2.4') { + if (CURRENT_DATABASE_VERSION == '2.3.1') { // Delete all Recurring Payments that are Stripe mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe'"); @@ -3961,14 +3960,13 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { DROP `config_ai_api_key` "); - mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.5'"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.2'"); } - */ - // if (CURRENT_DATABASE_VERSION == '2.2.5') { - // // Insert queries here required to update to DB version 2.2.6 + // if (CURRENT_DATABASE_VERSION == '2.3.2') { + // // Insert queries here required to update to DB version 2.3.3 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.6'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.3'"); // } } else { diff --git a/admin/includes/side_nav.php b/admin/includes/side_nav.php index be4bcb1e..bd495349 100644 --- a/admin/includes/side_nav.php +++ b/admin/includes/side_nav.php @@ -238,20 +238,6 @@

Quote

- - - - -