From a79ce23ae50174b965127051191bddb35ea24846 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 18 Dec 2025 14:24:53 -0500 Subject: [PATCH 001/120] Fix randomString() to generate cryptographically secure URL-safe tokens, reduced url keys to 32 Characters for performance and easy copy and paste and compatibility while still mainitaining ubreakable cryptographic keys --- agent/ajax.php | 14 +++---- agent/blank.php | 72 -------------------------------- agent/post/client.php | 2 +- agent/post/invoice.php | 4 +- agent/post/quote.php | 6 +-- agent/post/recurring_invoice.php | 2 +- agent/post/recurring_ticket.php | 4 +- agent/post/ticket.php | 6 +-- agent/user/post/profile.php | 14 +++---- api/v1/tickets/create.php | 2 +- client/login_reset.php | 2 +- client/post.php | 2 +- cron/cron.php | 2 +- cron/ticket_email_parser.php | 2 +- functions.php | 21 ++++------ login.php | 2 +- 16 files changed, 39 insertions(+), 118 deletions(-) diff --git a/agent/ajax.php b/agent/ajax.php index 0b27f9b8..1fae441c 100644 --- a/agent/ajax.php +++ b/agent/ajax.php @@ -49,7 +49,7 @@ if (isset($_GET['merge_ticket_get_json_details'])) { $merge_into_ticket_number = intval(preg_replace('/[^0-9]/', '', $_GET['merge_into_ticket_number'])); $sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_number, ticket_prefix, ticket_subject, ticket_priority, ticket_status, ticket_status_name, client_name, contact_name FROM tickets - LEFT JOIN clients ON ticket_client_id = client_id + 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_number = $merge_into_ticket_number"); @@ -86,7 +86,7 @@ if (isset($_POST['contact_set_notes'])) { $notes = sanitizeInput($_POST['notes']); // Get Contact Details and Client ID for Logging - $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id + $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id FROM contacts WHERE contact_id = $contact_id" ); $row = mysqli_fetch_array($sql); @@ -108,7 +108,7 @@ if (isset($_POST['asset_set_notes'])) { $notes = sanitizeInput($_POST['notes']); // Get Asset Details and Client ID for Logging - $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id + $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id" ); $row = mysqli_fetch_array($sql); @@ -195,7 +195,7 @@ if (isset($_GET['share_generate_link'])) { $item_expires_friendly = "1 month"; } - $item_key = randomString(156); + $item_key = randomString(32); 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")); @@ -496,8 +496,8 @@ if (isset($_POST['update_kanban_ticket'])) { 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 + $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 @@ -905,7 +905,7 @@ if (isset($_GET['ai_ticket_summary'])) { } $prompt = " - Summarize the following IT support ticket and its responses in a concise, clear, and professional manner. + Summarize the following IT support ticket and its responses in a concise, clear, and professional manner. The summary should include: 1. Main Issue: What was the problem reported by the user? diff --git a/agent/blank.php b/agent/blank.php index 30e47834..e69de29b 100644 --- a/agent/blank.php +++ b/agent/blank.php @@ -1,72 +0,0 @@ - - - -
    -
  1. - Dashboard -
    2. -
  2. Blank Page
    3. -
- - -

Blank Page

-
-

This is a great starting point for new custom pages.

-

- - -$start_date"; - -echo "

User Agent

"; -echo getUserAgent(); - - -?> -
- - - -
- - -
- -
-
Requester
-
Sam Adams
- -
Created
-
- -
Last activity
-
-
- - -
- - - - - -$date_time"; -?> - - - - 0) { @@ -228,7 +228,7 @@ if (isset($_GET['force_recurring_ticket'])) { $client_id = intval($row['recurring_ticket_client_id']); $asset_id = intval($row['recurring_ticket_asset_id']); $category = intval($row['recurring_ticket_category']); - $url_key = randomString(156); + $url_key = randomString(32); $ticket_status = 1; // Default if ($assigned_id > 0) { diff --git a/agent/post/ticket.php b/agent/post/ticket.php index 287a1055..48d6b0d7 100644 --- a/agent/post/ticket.php +++ b/agent/post/ticket.php @@ -68,7 +68,7 @@ if (isset($_POST['add_ticket'])) { $config_base_url = sanitizeInput($config_base_url); //Generate a unique URL key for clients to access - $url_key = randomString(156); + $url_key = randomString(32); mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Agent', ticket_category = $category_id, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = '$billable', ticket_status = '$ticket_status', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_url_key = '$url_key', ticket_due_at = $due, ticket_client_id = $client_id, ticket_invoice_id = 0, ticket_project_id = $project_id"); @@ -1521,7 +1521,7 @@ if (isset($_POST['bulk_add_asset_ticket'])) { $config_base_url = sanitizeInput($config_base_url); //Generate a unique URL key for clients to access - $url_key = randomString(156); + $url_key = randomString(32); mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_category = $category_id, ticket_subject = '$subject_asset_prepended', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = $billable, ticket_status = $ticket_status, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_url_key = '$url_key', ticket_client_id = $client_id, ticket_project_id = $project_id"); @@ -2167,7 +2167,7 @@ if (isset($_POST['add_invoice_from_ticket'])) { $invoice_number = mysqli_insert_id($mysqli); //Generate a unique URL key for clients to access - $url_key = randomString(156); + $url_key = randomString(32); mysqli_query($mysqli, "INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $invoice_number, invoice_scope = '$scope', invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), invoice_currency_code = '$session_company_currency', invoice_category_id = $category, invoice_status = 'Draft', invoice_url_key = '$url_key', invoice_client_id = $client_id"); $invoice_id = mysqli_insert_id($mysqli); diff --git a/agent/user/post/profile.php b/agent/user/post/profile.php index ab781f7b..73827cd0 100644 --- a/agent/user/post/profile.php +++ b/agent/user/post/profile.php @@ -88,7 +88,7 @@ if (isset($_POST['edit_your_user_details'])) { } if (isset($_GET['clear_your_user_avatar'])) { - + validateCSRFToken($_GET['csrf_token']); mysqli_query($mysqli,"UPDATE users SET user_avatar = NULL WHERE user_id = $session_user_id"); @@ -96,7 +96,7 @@ if (isset($_GET['clear_your_user_avatar'])) { logAction("User Account", "Edit", "$session_name cleared their avatar"); flash_alert("Avatar cleared", 'error'); - + redirect(); } @@ -167,7 +167,7 @@ if (isset($_POST['edit_your_user_preferences'])) { // Enable extension access, only if it isn't already setup (user doesn't have cookie) if (isset($_POST['extension']) && $_POST['extension'] == 'Yes') { if (!isset($_COOKIE['user_extension_key'])) { - $extension_key = randomString(156); + $extension_key = randomString(32); mysqli_query($mysqli, "UPDATE users SET user_extension_key = '$extension_key' WHERE user_id = $session_user_id"); $extended_log_description .= "enabled browser extension access"; @@ -196,7 +196,7 @@ if (isset($_POST['enable_mfa'])) { require_once "../../plugins/totp/totp.php"; // Grab the code from the user - $verify_code = trim($_POST['verify_code']); + $verify_code = trim($_POST['verify_code']); // Ensure it's numeric if (!ctype_digit($verify_code)) { $verify_code = ''; @@ -227,9 +227,9 @@ if (isset($_POST['enable_mfa'])) { if ($previousPage === 'mfa_enforcement.php') { // Redirect back to mfa_enforcement.php redirect("../$config_start_page"); - + } - } + } } else { // FAILURE @@ -245,7 +245,7 @@ if (isset($_POST['enable_mfa'])) { // Redirect back to mfa_enforcement.php redirect(); } - } + } } redirect("user_security.php"); diff --git a/api/v1/tickets/create.php b/api/v1/tickets/create.php index 41ad29c8..9339003b 100644 --- a/api/v1/tickets/create.php +++ b/api/v1/tickets/create.php @@ -44,7 +44,7 @@ if (!empty($subject)) { $ticket_number = mysqli_insert_id($mysqli); // Insert ticket - $url_key = randomString(156); + $url_key = randomString(32); $insert_sql = mysqli_query($mysqli,"INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'API', ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 1, ticket_billable = $billable, ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_created_by = 0, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_asset_id = $asset, ticket_url_key = '$url_key', ticket_client_id = $client_id"); // Check insert & get insert ID diff --git a/client/login_reset.php b/client/login_reset.php index 826cb040..e6133456 100644 --- a/client/login_reset.php +++ b/client/login_reset.php @@ -72,7 +72,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $name = sanitizeInput($row['contact_name']); $client = intval($row['contact_client_id']); - $token = randomString(156); + $token = randomString(32); $url = "https://$config_base_url/client/login_reset.php?email=$email&token=$token&client=$client"; mysqli_query($mysqli, "UPDATE users SET user_password_reset_token = '$token' WHERE user_id = $user_id LIMIT 1"); mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Modify', log_description = 'Sent a portal password reset e-mail for $email.', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client"); diff --git a/client/post.php b/client/post.php index 7c7f25fc..39a6a7d2 100644 --- a/client/post.php +++ b/client/post.php @@ -25,7 +25,7 @@ if (isset($_POST['add_ticket'])) { $config_ticket_new_ticket_notification_email = filter_var($config_ticket_new_ticket_notification_email, FILTER_VALIDATE_EMAIL); //Generate a unique URL key for clients to access - $url_key = randomString(156); + $url_key = randomString(32); // Ensure priority is low/med/high (as can be user defined) if ($_POST['priority'] !== "Low" && $_POST['priority'] !== "Medium" && $_POST['priority'] !== "High") { diff --git a/cron/cron.php b/cron/cron.php index b3835c75..f21b180d 100644 --- a/cron/cron.php +++ b/cron/cron.php @@ -615,7 +615,7 @@ while ($row = mysqli_fetch_array($sql_recurring_invoices)) { $new_invoice_number = mysqli_insert_id($mysqli); //Generate a unique URL key for clients to access - $url_key = randomString(156); + $url_key = randomString(32); mysqli_query($mysqli, "INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_invoice_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_discount_amount = $recurring_invoice_discount_amount, invoice_amount = $recurring_invoice_amount, invoice_currency_code = '$recurring_invoice_currency_code', invoice_note = '$recurring_invoice_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_recurring_invoice_id = $recurring_invoice_id, invoice_client_id = $client_id"); diff --git a/cron/ticket_email_parser.php b/cron/ticket_email_parser.php index 163e703b..00047104 100644 --- a/cron/ticket_email_parser.php +++ b/cron/ticket_email_parser.php @@ -106,7 +106,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date $contact_email_esc = mysqli_real_escape_string($mysqli, $contact_email); $client_id = intval($client_id); - $url_key = randomString(156); + $url_key = randomString(32); mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$ticket_prefix_esc', ticket_number = $ticket_number, ticket_source = 'Email', ticket_subject = '$subject', ticket_details = '$message_esc', ticket_priority = 'Low', ticket_status = 1, ticket_billable = $config_ticket_default_billable, ticket_created_by = 0, ticket_contact_id = $contact_id, ticket_url_key = '$url_key', ticket_client_id = $client_id"); $id = mysqli_insert_id($mysqli); diff --git a/functions.php b/functions.php index 94f35602..f6db0db6 100644 --- a/functions.php +++ b/functions.php @@ -4,20 +4,13 @@ DEFINE("WORDING_ROLECHECK_FAILED", "You are not permitted to do that!"); // Function to generate both crypto & URL safe random strings -function randomString($length = 16) { - // Generate some cryptographically safe random bytes - // Generate a little more than requested as we'll lose some later converting - $random_bytes = random_bytes($length + 5); - - // Convert the bytes to something somewhat human-readable - $random_base_64 = base64_encode($random_bytes); - - // Replace the nasty characters that come with base64 - $bad_chars = array("/", "+", "="); - $random_string = str_replace($bad_chars, random_int(0, 9), $random_base_64); - - // Truncate the string to the requested $length and return - return substr($random_string, 0, $length); +function randomString(int $length = 16): string { + $bytes = random_bytes((int) ceil($length * 3 / 4)); + return substr( + rtrim(strtr(base64_encode($bytes), '+/', '-_'), '='), + 0, + $length + ); } // Older keygen function - only used for TOTP currently diff --git a/login.php b/login.php index 7e69045a..a1d6a2bb 100644 --- a/login.php +++ b/login.php @@ -346,7 +346,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && (isset($_POST['login']) || isset($_ // Session info $_SESSION['user_id'] = $user_id; - $_SESSION['csrf_token'] = randomString(156); + $_SESSION['csrf_token'] = randomString(32); $_SESSION['logged'] = true; // Forcing MFA From 3e3531a6cefd914c6712854f16d72bd62e11a6a4 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 18 Dec 2025 14:28:24 -0500 Subject: [PATCH 002/120] Set API Key to 32 Chars --- admin/modals/api/api_key_add.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/modals/api/api_key_add.php b/admin/modals/api/api_key_add.php index b669a517..3714fe9d 100644 --- a/admin/modals/api/api_key_add.php +++ b/admin/modals/api/api_key_add.php @@ -2,8 +2,8 @@ require_once '../../../includes/modal_header.php'; -$key = randomString(156); -$decryptPW = randomString(160); +$key = randomString(32); +$decryptPW = randomString(32); ob_start(); ?> From ad5710b1d8846dfe2448c9820bd24b2a304ded5c Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 18 Dec 2025 20:00:56 -0500 Subject: [PATCH 003/120] Fix Invoice CSV Exporting --- admin/modals/api/api_key_add.php | 4 ++-- agent/post/invoice.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/modals/api/api_key_add.php b/admin/modals/api/api_key_add.php index 3714fe9d..3c341b9e 100644 --- a/admin/modals/api/api_key_add.php +++ b/admin/modals/api/api_key_add.php @@ -2,8 +2,8 @@ require_once '../../../includes/modal_header.php'; -$key = randomString(32); -$decryptPW = randomString(32); +$key = randomString(43); +$decryptPW = randomString(43); ob_start(); ?> diff --git a/agent/post/invoice.php b/agent/post/invoice.php index f6366d42..824da9c1 100644 --- a/agent/post/invoice.php +++ b/agent/post/invoice.php @@ -659,7 +659,7 @@ if (isset($_POST['export_invoices_csv'])) { $file_name_date = date('Y-m-d_H-i-s'); } - $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE $date_query $client_query ORDER BY invoice_number ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE $date_query AND $client_query ORDER BY invoice_number ASC"); $num_rows = mysqli_num_rows($sql); From a2773804415d390ccf098b6dd4acb2b3b110fc17 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 18 Dec 2025 20:03:33 -0500 Subject: [PATCH 004/120] Set API key back to 32 Chars --- admin/modals/api/api_key_add.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/modals/api/api_key_add.php b/admin/modals/api/api_key_add.php index 3c341b9e..3714fe9d 100644 --- a/admin/modals/api/api_key_add.php +++ b/admin/modals/api/api_key_add.php @@ -2,8 +2,8 @@ require_once '../../../includes/modal_header.php'; -$key = randomString(43); -$decryptPW = randomString(43); +$key = randomString(32); +$decryptPW = randomString(32); ob_start(); ?> From a82e2c7ea1dc1a9767d7be7cdc8288f07ee97025 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 18 Dec 2025 20:38:15 -0500 Subject: [PATCH 005/120] Billable and non billable status use icons check and minus --- agent/recurring_invoices.php | 2 +- agent/recurring_tickets.php | 18 +++++++++--------- agent/ticket_list.php | 18 +++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/agent/recurring_invoices.php b/agent/recurring_invoices.php index 8b12bef0..eb4bf61d 100644 --- a/agent/recurring_invoices.php +++ b/agent/recurring_invoices.php @@ -222,7 +222,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); No Cards on File - + diff --git a/agent/recurring_tickets.php b/agent/recurring_tickets.php index 3b20593f..fdd13208 100644 --- a/agent/recurring_tickets.php +++ b/agent/recurring_tickets.php @@ -65,7 +65,7 @@ $sql = mysqli_query( $billable_query $client_query ORDER BY - CASE + CASE WHEN '$sort' = 'recurring_ticket_priority' THEN CASE recurring_ticket_priority WHEN 'High' THEN 1 @@ -74,7 +74,7 @@ $sql = mysqli_query( ELSE 4 -- Optional: for unexpected priority values END ELSE NULL - END $order, + END $order, $sort $order -- Apply normal sorting by $sort and $order LIMIT $record_from, $record_to" ); @@ -152,7 +152,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
@@ -170,31 +170,31 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Force Reoccur
- Assign Agent
- Set Category
- Set Priority
- Set Billable
- Set Next Run Date @@ -260,7 +260,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Agent - + diff --git a/agent/ticket_list.php b/agent/ticket_list.php index fc0d39ab..48a27f40 100644 --- a/agent/ticket_list.php +++ b/agent/ticket_list.php @@ -7,7 +7,7 @@ text-nowrap"> - + = 2) { ?> @@ -186,7 +186,7 @@ if($task_count) { $tasks_completed_percent = round(($completed_task_count / $task_count) * 100); } - + ?> "> @@ -199,7 +199,7 @@ - + From e60a7a59f937c1a2917ab28463e330fa8556d870 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 20 Dec 2025 14:30:57 -0500 Subject: [PATCH 007/120] Fix Login flow where user agent and client exists and agent has MFA but will not let them continue, also update some wording and button colors. Also dont show email password fields again after success and login as agent and client is shown. --- login.php | 769 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 433 insertions(+), 336 deletions(-) diff --git a/login.php b/login.php index a1d6a2bb..618e66e0 100644 --- a/login.php +++ b/login.php @@ -2,13 +2,10 @@ // Unified login (Agent + Client) using one email & password -// Enforce a Content Security Policy for security against cross-site scripting header("Content-Security-Policy: default-src 'self'"); -// Check if the config.php file exists if (!file_exists('config.php')) { - // Redirect to the setup page if config.php doesn't exist - header("Location: /setup"); // Must use header as functions aren't included yet + header("Location: /setup"); exit(); } @@ -16,12 +13,9 @@ require_once "config.php"; require_once "functions.php"; require_once "plugins/totp/totp.php"; -// Sessions & cookies if (session_status() === PHP_SESSION_NONE) { - // HTTP-Only cookies ini_set("session.cookie_httponly", true); - // Tell client to only send cookie(s) over HTTPS if ($config_https_only || !isset($config_https_only)) { ini_set("session.cookie_secure", true); } @@ -29,28 +23,25 @@ if (session_status() === PHP_SESSION_NONE) { session_start(); } -// Check if setup mode is enabled or the variable is missing if (!isset($config_enable_setup) || $config_enable_setup == 1) { - // Redirect to the setup page header("Location: /setup"); exit(); } -// Check if the application is configured for HTTPS-only access -if ($config_https_only && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] !== 'on') && (!isset($_SERVER['HTTP_X_FORWARDED_PROTO']) || $_SERVER['HTTP_X_FORWARDED_PROTO'] !== 'https')) { +if ( + $config_https_only + && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] !== 'on') + && (!isset($_SERVER['HTTP_X_FORWARDED_PROTO']) || $_SERVER['HTTP_X_FORWARDED_PROTO'] !== 'https') +) { echo "Login is restricted as ITFlow defaults to HTTPS-only for enhanced security. To login using HTTP, modify the config.php file by setting config_https_only to false. However, this is strongly discouraged, especially when accessing from potentially unsafe networks like the internet."; exit; } -// Set Timezone after session_start require_once "includes/inc_set_timezone.php"; -// IP & User Agent for logging $session_ip = sanitizeInput(getIP()); $session_user_agent = sanitizeInput($_SERVER['HTTP_USER_AGENT'] ?? ''); -// Block brute force password attacks - check recent failed login attempts for this IP -// Block access if more than 15 failed login attempts have happened in the last 10 minutes $row = mysqli_fetch_assoc(mysqli_query( $mysqli, "SELECT COUNT(log_id) AS failed_login_count @@ -63,15 +54,12 @@ $row = mysqli_fetch_assoc(mysqli_query( $failed_login_count = intval($row['failed_login_count']); if ($failed_login_count >= 15) { - logAction("Login", "Blocked", "$session_ip was blocked access to login due to IP lockout"); - - // Inform user & quit processing page header("HTTP/1.1 429 Too Many Requests"); exit("

$config_app_name

Your IP address has been blocked due to repeated failed login attempts. Please try again later.

This action has been logged."); } -// Query Settings for company +// Settings $sql_settings = mysqli_query($mysqli, " SELECT settings.*, companies.company_name, companies.company_logo FROM settings @@ -80,13 +68,11 @@ $sql_settings = mysqli_query($mysqli, " "); $row = mysqli_fetch_array($sql_settings); -// Company info $company_name = $row['company_name']; $company_logo = $row['company_logo']; $config_start_page = nullable_htmlentities($row['config_start_page']); $config_login_message = nullable_htmlentities($row['config_login_message']); -// Mail $config_smtp_host = $row['config_smtp_host']; $config_smtp_port = intval($row['config_smtp_port']); $config_smtp_encryption = $row['config_smtp_encryption']; @@ -95,49 +81,96 @@ $config_smtp_password = $row['config_smtp_password']; $config_mail_from_email = sanitizeInput($row['config_mail_from_email']); $config_mail_from_name = sanitizeInput($row['config_mail_from_name']); -// Client Portal Enabled $config_client_portal_enable = intval($row['config_client_portal_enable']); $config_login_remember_me_expire = intval($row['config_login_remember_me_expire']); -// Login key (if setup) $config_login_key_required = $row['config_login_key_required']; -$config_login_key_secret = $row['config_login_key_secret']; +$config_login_key_secret = $row['config_login_key_secret']; -// Azure / Entra for client $azure_client_id = $row['config_azure_client_id'] ?? null; -$response = null; -$token_field = null; -$show_role_choice = false; -$email = ''; -$password = ''; +$response = null; +$token_field = null; +$show_role_choice = false; -// Handle POST login request (normal login or role choice) -if ($_SERVER['REQUEST_METHOD'] === 'POST' && (isset($_POST['login']) || isset($_POST['role_choice']))) { +$email = ''; +$password = ''; // only ever used in the initial POST request - $email = sanitizeInput($_POST['email'] ?? ''); - $password = $_POST['password'] ?? ''; - $role_choice = $_POST['role_choice'] ?? null; // 'agent' or 'client' +// Helpers +function pendingExpired($sess, $ttl_seconds = 120) { + return !$sess || empty($sess['created']) || (time() - intval($sess['created']) > $ttl_seconds); +} - // Basic validation - if (empty($email) || empty($password) || !filter_var($email, FILTER_VALIDATE_EMAIL)) { - header("HTTP/1.1 401 Unauthorized"); - $response = " -
- Incorrect username or password. - -
"; - } else { +// POST handling +if ($_SERVER['REQUEST_METHOD'] === 'POST' && (isset($_POST['login']) || isset($_POST['role_choice']) || isset($_POST['mfa_login']))) { - /* - * Unified lookup: - * - user_type = 1 → Agent - * - user_type = 2 → Client (must not be archived, client not archived) - * We fetch all possible matches for this email, then verify password per row. - * If both an agent and a client match with the same password: - * - First, show choice buttons (Agent / Client). - * - When user clicks a choice, we honor role_choice. - */ + $role_choice = $_POST['role_choice'] ?? null; + + $is_login_step = isset($_POST['login']); + $is_role_step = isset($_POST['role_choice']) && !$is_login_step && !isset($_POST['mfa_login']); + $is_mfa_step = isset($_POST['mfa_login']); + + // ----------------------------------- + // STEP 2: ROLE CHOICE (no email/pass) + // ----------------------------------- + if ($is_role_step) { + + $posted_token = $_POST['pending_login_token'] ?? ''; + $sess = $_SESSION['pending_dual_login'] ?? null; + + if (pendingExpired($sess) || empty($posted_token) || empty($sess['token']) || !hash_equals($sess['token'], $posted_token)) { + unset($_SESSION['pending_dual_login']); + header("HTTP/1.1 401 Unauthorized"); + $response = " +
+ Your login session expired. Please sign in again. +
"; + } else { + $email = sanitizeInput($sess['email'] ?? ''); + } + } + + // ----------------------------------- + // STEP 3: MFA SUBMIT (no email/pass) + // ----------------------------------- + if ($is_mfa_step && empty($response)) { + + $posted_token = $_POST['pending_mfa_token'] ?? ''; + $sess = $_SESSION['pending_mfa_login'] ?? null; + + if (pendingExpired($sess) || empty($posted_token) || empty($sess['token']) || !hash_equals($sess['token'], $posted_token)) { + unset($_SESSION['pending_mfa_login']); + header("HTTP/1.1 401 Unauthorized"); + $response = " +
+ Your MFA session expired. Please sign in again. +
"; + } else { + $email = sanitizeInput($sess['email'] ?? ''); + $role_choice = 'agent'; + } + } + + // ----------------------------------- + // STEP 1: INITIAL CREDENTIALS + // ----------------------------------- + if ($is_login_step && empty($response)) { + $email = sanitizeInput($_POST['email'] ?? ''); + $password = $_POST['password'] ?? ''; + + if (empty($email) || empty($password) || !filter_var($email, FILTER_VALIDATE_EMAIL)) { + header("HTTP/1.1 401 Unauthorized"); + $response = " +
+ Incorrect username or password. +
"; + } + } + + // Continue only if no response error + if (empty($response)) { + + // Query all possible matches for that email $sql = mysqli_query($mysqli, " SELECT users.*, user_settings.*, @@ -159,307 +192,372 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && (isset($_POST['login']) || isset($_ $agentRow = null; $clientRow = null; + // Step 1: verify password. Step 2/3: use stored allowed ids. + $allowed_agent_id = null; + $allowed_client_id = null; + + if ($is_role_step) { + $sess = $_SESSION['pending_dual_login'] ?? null; + $allowed_agent_id = isset($sess['agent_user_id']) ? intval($sess['agent_user_id']) : null; + $allowed_client_id = isset($sess['client_user_id']) ? intval($sess['client_user_id']) : null; + } + + if ($is_mfa_step) { + $sess = $_SESSION['pending_mfa_login'] ?? null; + $allowed_agent_id = isset($sess['agent_user_id']) ? intval($sess['agent_user_id']) : null; + } + while ($r = mysqli_fetch_assoc($sql)) { - if (!password_verify($password, $r['user_password'])) { - continue; + + $ut = intval($r['user_type']); + + if ($is_login_step) { + // Only Step 1 checks password + if (!password_verify($password, $r['user_password'])) { + continue; + } + } else { + // Step 2/3: restrict to ids we previously verified + if ($ut === 1 && $allowed_agent_id !== null && intval($r['user_id']) !== $allowed_agent_id) { + continue; + } + if ($ut === 2 && $allowed_client_id !== null && intval($r['user_id']) !== $allowed_client_id) { + continue; + } } - if (intval($r['user_type']) === 1 && $agentRow === null) { + + if ($ut === 1 && $agentRow === null) { $agentRow = $r; } - if (intval($r['user_type']) === 2 && $clientRow === null) { + if ($ut === 2 && $clientRow === null) { $clientRow = $r; } } - $selectedRow = null; - $selectedType = null; // 1 = agent, 2 = client - if ($agentRow === null && $clientRow === null) { - - // No matching user/password combo header("HTTP/1.1 401 Unauthorized"); logAction("Login", "Failed", "Failed login attempt using $email"); - $response = "
Incorrect username or password. -
"; - - } elseif ($agentRow !== null && $clientRow !== null) { - - // Both agent and client accounts share same email + password - if ($role_choice === 'agent') { - $selectedRow = $agentRow; - $selectedType = 1; - } elseif ($role_choice === 'client') { - $selectedRow = $clientRow; - $selectedType = 2; - } else { - // First time we realise this is a dual-role account: ask user to pick - $show_role_choice = true; - $response = " -
- This login can be used as either an Agent account or a Client Portal account. - Please choose how you want to continue. - -
"; - } - } else { - // Only one valid row (agent OR client) - if ($agentRow !== null) { - $selectedRow = $agentRow; - $selectedType = 1; - } else { - $selectedRow = $clientRow; - $selectedType = 2; - } - } - // If we have a specific user selected, proceed with actual login - if ($selectedRow !== null && $selectedType !== null) { + $selectedRow = null; + $selectedType = null; // 1 agent, 2 client - $user_id = intval($selectedRow['user_id']); - $user_email = sanitizeInput($selectedRow['user_email']); - $session_user_id = $user_id; // to pass the user_id to logAction function + // Dual role + if ($agentRow !== null && $clientRow !== null) { - // ========================= - // AGENT LOGIN FLOW - // ========================= - if ($selectedType === 1) { - // Login key verification - // If no/incorrect 'key' is supplied, send to client portal instead - if ($config_login_key_required) { - if (!isset($_GET['key']) || $_GET['key'] !== $config_login_key_secret) { - redirect(); + if ($role_choice === 'agent') { + $selectedRow = $agentRow; + $selectedType = 1; + } elseif ($role_choice === 'client') { + $selectedRow = $clientRow; + $selectedType = 2; + } else { + // Show role choice screen + $show_role_choice = true; + + // If this is the first time (Step 1), we need to stash allowed ids and (optional) decrypted agent encryption key + // WITHOUT storing password. + if ($is_login_step) { + + $pending_token = bin2hex(random_bytes(32)); + + // If agent has user-specific encryption ciphertext, decrypt it NOW while password is present. + $agent_master_key = null; + $agent_cipher = $agentRow['user_specific_encryption_ciphertext'] ?? null; + if (!empty($agent_cipher)) { + $agent_master_key = decryptUserSpecificKey($agent_cipher, $password); + } + + $_SESSION['pending_dual_login'] = [ + 'email' => $email, + 'agent_user_id' => intval($agentRow['user_id']), + 'client_user_id' => intval($clientRow['user_id']), + 'agent_master_key' => $agent_master_key, // may be null + 'token' => $pending_token, + 'created' => time() + ]; } + + $response = " +
+ This login can be used as either an Agent account or a Client Portal account. + Please choose how you want to continue. +
"; } - $user_name = sanitizeInput($selectedRow['user_name']); - $token = sanitizeInput($selectedRow['user_token']); - $force_mfa = intval($selectedRow['user_config_force_mfa']); - $user_role_id = intval($selectedRow['user_role_id']); - $user_encryption_ciphertext = $selectedRow['user_specific_encryption_ciphertext']; - $user_extension_key = $selectedRow['user_extension_key']; - - $current_code = 0; - if (isset($_POST['current_code'])) { - $current_code = intval($_POST['current_code']); + } else { + // Single role + if ($agentRow !== null) { + $selectedRow = $agentRow; + $selectedType = 1; + } else { + $selectedRow = $clientRow; + $selectedType = 2; } + } - $mfa_is_complete = false; - $extended_log = ''; + // Proceed if selected + if ($selectedRow !== null && $selectedType !== null) { - if (empty($token)) { - // MFA is not configured - $mfa_is_complete = true; - } + // Clear dual pending once we actually proceed + unset($_SESSION['pending_dual_login']); - // Validate MFA via a remember-me cookie - if (isset($_COOKIE['rememberme'])) { - $remember_tokens = mysqli_query($mysqli, " - SELECT remember_token_token - FROM remember_tokens - WHERE remember_token_user_id = $user_id - AND remember_token_created_at > (NOW() - INTERVAL $config_login_remember_me_expire DAY) - "); - while ($remember_row = mysqli_fetch_assoc($remember_tokens)) { - if (hash_equals($remember_row['remember_token_token'], $_COOKIE['rememberme'])) { - $mfa_is_complete = true; - $extended_log = 'with 2FA remember-me cookie'; - break; + $user_id = intval($selectedRow['user_id']); + $user_email = sanitizeInput($selectedRow['user_email']); + + // ========================= + // AGENT FLOW + // ========================= + if ($selectedType === 1) { + + if ($config_login_key_required) { + if (!isset($_GET['key']) || $_GET['key'] !== $config_login_key_secret) { + redirect(); } } - } - // Validate MFA code - if (!empty($current_code) && TokenAuth6238::verify($token, $current_code)) { - $mfa_is_complete = true; - $extended_log = 'with MFA'; - } + $user_name = sanitizeInput($selectedRow['user_name']); + $token = sanitizeInput($selectedRow['user_token']); + $force_mfa = intval($selectedRow['user_config_force_mfa']); + $user_encryption_ciphertext = $selectedRow['user_specific_encryption_ciphertext']; - if ($mfa_is_complete) { - // FULL AGENT LOGIN SUCCESS - - // Create a remember me token, if requested - if (isset($_POST['remember_me'])) { - $newRememberToken = bin2hex(random_bytes(64)); - setcookie( - 'rememberme', - $newRememberToken, - time() + 86400 * $config_login_remember_me_expire, - "/", - null, - true, - true - ); - mysqli_query($mysqli, " - INSERT INTO remember_tokens - SET remember_token_user_id = $user_id, - remember_token_token = '$newRememberToken' - "); - - $extended_log .= ", generated a new remember-me token"; + $current_code = 0; + if (isset($_POST['current_code'])) { + $current_code = intval($_POST['current_code']); } - // Check this login isn't suspicious - $sql_ip_prev_logins = mysqli_fetch_assoc(mysqli_query($mysqli, " - SELECT COUNT(log_id) AS ip_previous_logins - FROM logs - WHERE log_type = 'Login' - AND log_action = 'Success' - AND log_ip = '$session_ip' - AND log_user_id = $user_id - ")); - $ip_previous_logins = sanitizeInput($sql_ip_prev_logins['ip_previous_logins']); + $mfa_is_complete = false; + $extended_log = ''; - $sql_ua_prev_logins = mysqli_fetch_assoc(mysqli_query($mysqli, " - SELECT COUNT(log_id) AS ua_previous_logins - FROM logs - WHERE log_type = 'Login' - AND log_action = 'Success' - AND log_user_agent = '$session_user_agent' - AND log_user_id = $user_id - ")); - $ua_prev_logins = sanitizeInput($sql_ua_prev_logins['ua_previous_logins']); + if (empty($token)) { + $mfa_is_complete = true; // no MFA configured + } - // Notify if both the user agent and IP are different - if (!empty($config_smtp_host) && $ip_previous_logins == 0 && $ua_prev_logins == 0) { - $subject = "$config_app_name new login for $user_name"; - $body = "Hi $user_name,

A recent successful login to your $config_app_name account was considered a little unusual. If this was you, you can safely ignore this email!

IP Address: $session_ip
User Agent: $session_user_agent

If you did not perform this login, your credentials may be compromised.

Thanks,
ITFlow"; + // remember-me cookie allows bypass + if (isset($_COOKIE['rememberme'])) { + $remember_tokens = mysqli_query($mysqli, " + SELECT remember_token_token + FROM remember_tokens + WHERE remember_token_user_id = $user_id + AND remember_token_created_at > (NOW() - INTERVAL $config_login_remember_me_expire DAY) + "); + while ($remember_row = mysqli_fetch_assoc($remember_tokens)) { + if (hash_equals($remember_row['remember_token_token'], $_COOKIE['rememberme'])) { + $mfa_is_complete = true; + $extended_log = 'with 2FA remember-me cookie'; + break; + } + } + } - $data = [ - [ + // Validate MFA code + if (!empty($current_code) && TokenAuth6238::verify($token, $current_code)) { + $mfa_is_complete = true; + $extended_log = 'with MFA'; + } + + if ($mfa_is_complete) { + + // Clear pending MFA if exists + unset($_SESSION['pending_mfa_login']); + + // Remember me token creation + if (isset($_POST['remember_me'])) { + $newRememberToken = bin2hex(random_bytes(64)); + setcookie('rememberme', $newRememberToken, time() + 86400 * $config_login_remember_me_expire, "/", null, true, true); + + mysqli_query($mysqli, " + INSERT INTO remember_tokens + SET remember_token_user_id = $user_id, + remember_token_token = '$newRememberToken' + "); + $extended_log .= ", generated a new remember-me token"; + } + + // Suspicious login checks / email notify (kept from your code) + $sql_ip_prev_logins = mysqli_fetch_assoc(mysqli_query($mysqli, " + SELECT COUNT(log_id) AS ip_previous_logins + FROM logs + WHERE log_type = 'Login' + AND log_action = 'Success' + AND log_ip = '$session_ip' + AND log_user_id = $user_id + ")); + $ip_previous_logins = sanitizeInput($sql_ip_prev_logins['ip_previous_logins']); + + $sql_ua_prev_logins = mysqli_fetch_assoc(mysqli_query($mysqli, " + SELECT COUNT(log_id) AS ua_previous_logins + FROM logs + WHERE log_type = 'Login' + AND log_action = 'Success' + AND log_user_agent = '$session_user_agent' + AND log_user_id = $user_id + ")); + $ua_prev_logins = sanitizeInput($sql_ua_prev_logins['ua_previous_logins']); + + if (!empty($config_smtp_host) && $ip_previous_logins == 0 && $ua_prev_logins == 0) { + $subject = "$config_app_name new login for $user_name"; + $body = "Hi $user_name,

A recent successful login to your $config_app_name account was considered a little unusual. If this was you, you can safely ignore this email!

IP Address: $session_ip
User Agent: $session_user_agent

If you did not perform this login, your credentials may be compromised.

Thanks,
ITFlow"; + + $data = [[ 'from' => $config_mail_from_email, 'from_name' => $config_mail_from_name, 'recipient' => $user_email, 'recipient_name' => $user_name, 'subject' => $subject, 'body' => $body - ] - ]; - addToMailQueue($data); - } + ]]; + addToMailQueue($data); + } - logAction("Login", "Success", "$user_name successfully logged in $extended_log", 0, $user_id); + logAction("Login", "Success", "$user_name successfully logged in $extended_log", 0, $user_id); - // Session info - $_SESSION['user_id'] = $user_id; - $_SESSION['csrf_token'] = randomString(32); - $_SESSION['logged'] = true; + $_SESSION['user_id'] = $user_id; + $_SESSION['csrf_token'] = randomString(32); + $_SESSION['logged'] = true; - // Forcing MFA - if ($force_mfa == 1 && $token == NULL) { - $config_start_page = "user/mfa_enforcement.php"; - } + if ($force_mfa == 1 && $token == NULL) { + $config_start_page = "user/mfa_enforcement.php"; + } - // Setup encryption session key - if (!empty($user_encryption_ciphertext)) { - $site_encryption_master_key = decryptUserSpecificKey($user_encryption_ciphertext, $password); - generateUserSessionKey($site_encryption_master_key); - } + // ✅ Setup encryption session key WITHOUT PASSWORD IN SESSION + // If we are coming from MFA step, master key is in pending_mfa_login. + // If we are coming from login step with no MFA, decrypt now. + $site_encryption_master_key = null; - // Redirect to last visited or config home - if (isset($_GET['last_visited']) && (str_starts_with(base64_decode($_GET['last_visited']), '/agent') || str_starts_with(base64_decode($_GET['last_visited']), '/admin'))) { + if ($is_mfa_step) { + $sess = $_SESSION['pending_mfa_login'] ?? null; + if ($sess && isset($sess['agent_master_key'])) { + $site_encryption_master_key = $sess['agent_master_key']; + } + } else { + // No MFA step: password exists in this request (Step 1) + if (!empty($user_encryption_ciphertext)) { + $site_encryption_master_key = decryptUserSpecificKey($user_encryption_ciphertext, $password); + } + } - redirect($_SERVER["REQUEST_SCHEME"] . "://" . $config_base_url . base64_decode($_GET['last_visited'])); + if (!empty($site_encryption_master_key)) { + generateUserSessionKey($site_encryption_master_key); + } + + // Redirect + if (isset($_GET['last_visited']) && (str_starts_with(base64_decode($_GET['last_visited']), '/agent') || str_starts_with(base64_decode($_GET['last_visited']), '/admin'))) { + redirect($_SERVER["REQUEST_SCHEME"] . "://" . $config_base_url . base64_decode($_GET['last_visited'])); + } else { + redirect("agent/$config_start_page"); + } } else { - redirect("agent/$config_start_page"); - } - } else { + // MFA required — store *only what we need*, not password + $pending_mfa_token = bin2hex(random_bytes(32)); - // MFA is configured and needs to be confirmed, or was unsuccessful + // If we arrived here from role-choice step, the agent master key may be in pending_dual_login + // If we arrived from initial login step, decrypt now (password in memory) and store master key. + $agent_master_key = null; - // HTML code for the token input field - $token_field = " -
- -
-
- -
-
-
"; + if ($is_role_step) { + $sess = $_SESSION['pending_dual_login'] ?? null; + if ($sess && isset($sess['agent_master_key'])) { + $agent_master_key = $sess['agent_master_key']; + } + } else { + if (!empty($user_encryption_ciphertext)) { + $agent_master_key = decryptUserSpecificKey($user_encryption_ciphertext, $password); + } + } - if ($current_code !== 0) { - // Logging - logAction("Login", "MFA Failed", "$user_email failed MFA", 0, $user_id); + $_SESSION['pending_mfa_login'] = [ + 'email' => $user_email, + 'agent_user_id' => $user_id, + 'agent_master_key'=> $agent_master_key, // may be null + 'token' => $pending_mfa_token, + 'created' => time() + ]; - // Email the tech to advise their credentials may be compromised - if (!empty($config_smtp_host)) { - $subject = "Important: $config_app_name failed 2FA login attempt for $user_name"; - $body = "Hi $user_name,

A recent login to your $config_app_name account was unsuccessful due to an incorrect 2FA code. If you did not attempt this login, your credentials may be compromised.

Thanks,
ITFlow"; - $data = [ - [ + $token_field = " +
+ +
+
+ +
+
+
"; + + if ($current_code !== 0) { + logAction("Login", "MFA Failed", "$user_email failed MFA", 0, $user_id); + + if (!empty($config_smtp_host)) { + $subject = "Important: $config_app_name failed 2FA login attempt for $user_name"; + $body = "Hi $user_name,

A recent login to your $config_app_name account was unsuccessful due to an incorrect 2FA code. If you did not attempt this login, your credentials may be compromised.

Thanks,
ITFlow"; + $data = [[ 'from' => $config_mail_from_email, 'from_name' => $config_mail_from_name, 'recipient' => $user_email, 'recipient_name' => $user_name, 'subject' => $subject, 'body' => $body - ] - ]; - addToMailQueue($data); + ]]; + addToMailQueue($data); + } + + $response = " +
+ Please enter a valid 2FA code. +
"; } - - $response = " -
- Please Enter 2FA Code! - -
"; } - } - // ========================= - // CLIENT LOGIN FLOW - // ========================= - } elseif ($selectedType === 2) { - - if ($config_client_portal_enable != 1) { - // Client portal disabled - header("HTTP/1.1 401 Unauthorized"); - logAction("Client Login", "Failed", "Client portal disabled; login attempt using $email"); - $response = " -
- Incorrect username or password. - -
"; - } else { - - $client_id = intval($selectedRow['contact_client_id']); - $contact_id = intval($selectedRow['contact_id']); - $user_auth_method = sanitizeInput($selectedRow['user_auth_method']); - - if ($client_id && $contact_id && $user_auth_method === 'local') { - - $_SESSION['client_logged_in'] = true; - $_SESSION['client_id'] = $client_id; - $_SESSION['user_id'] = $user_id; - $_SESSION['user_type'] = 2; - $_SESSION['contact_id'] = $contact_id; - $_SESSION['login_method'] = "local"; - - logAction("Client Login", "Success", "Client contact $user_email successfully logged in locally", $client_id, $user_id); - - header("Location: client/index.php"); - exit(); - - } else { - - // Not allowed or invalid - logAction("Client Login", "Failed", "Failed client portal login attempt using $email (invalid auth method or missing contact/client)", $client_id ?? 0, $user_id); + // ========================= + // CLIENT FLOW + // ========================= + } elseif ($selectedType === 2) { + if ($config_client_portal_enable != 1) { header("HTTP/1.1 401 Unauthorized"); + logAction("Client Login", "Failed", "Client portal disabled; login attempt using $email"); $response = "
Incorrect username or password. -
"; + } else { + + $client_id = intval($selectedRow['contact_client_id']); + $contact_id = intval($selectedRow['contact_id']); + $user_auth_method = sanitizeInput($selectedRow['user_auth_method']); + + if ($client_id && $contact_id && $user_auth_method === 'local') { + + $_SESSION['client_logged_in'] = true; + $_SESSION['client_id'] = $client_id; + $_SESSION['user_id'] = $user_id; + $_SESSION['user_type'] = 2; + $_SESSION['contact_id'] = $contact_id; + $_SESSION['login_method'] = "local"; + + logAction("Client Login", "Success", "Client contact $user_email successfully logged in locally", $client_id, $user_id); + + header("Location: client/index.php"); + exit(); + + } else { + + logAction("Client Login", "Failed", "Failed client portal login attempt using $email (invalid auth method or missing contact/client)", $client_id ?? 0, $user_id); + + header("HTTP/1.1 401 Unauthorized"); + $response = " +
+ Incorrect username or password. +
"; + } } } } @@ -467,6 +565,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && (isset($_POST['login']) || isset($_ } } +// Form state +$show_mfa_form = (isset($token_field) && !empty($token_field)); +$show_login_form = (!$show_role_choice && !$show_mfa_form); + ?> @@ -474,21 +576,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && (isset($_POST['login']) || isset($_ <?php echo nullable_htmlentities($company_name); ?> | Login - - - - - @@ -505,66 +602,73 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && (isset($_POST['login']) || isset($_
@@ -26,7 +26,7 @@ Subject - +
@@ -39,8 +39,8 @@ - - Billable + + Billable
"> @@ -242,9 +242,9 @@ data-modal-url="modals/ticket/ticket_billable.php?id="> Yes"; + echo ""; } else { - echo "No"; + echo ""; } ?> @@ -303,7 +303,7 @@ From cab81ca170215517c75ea814bbbaafe013ed5bcb Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 18 Dec 2025 20:39:47 -0500 Subject: [PATCH 006/120] Fix Billable sort --- agent/ticket_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/ticket_list.php b/agent/ticket_list.php index 48a27f40..f12b554e 100644 --- a/agent/ticket_list.php +++ b/agent/ticket_list.php @@ -40,7 +40,7 @@ = 2) { ?> - Billable + Billable
bg-light"> From 30499123f193bbc50d240337783f48851636839b Mon Sep 17 00:00:00 2001 From: wrongecho Date: Fri, 9 Jan 2026 13:50:46 +0000 Subject: [PATCH 013/120] Bugfix: Portal not showing contact user id in session --- client/profile.php | 4 ++-- login.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/profile.php b/client/profile.php index 6209fed5..fae47819 100644 --- a/client/profile.php +++ b/client/profile.php @@ -20,9 +20,9 @@ require_once 'includes/inc_all.php';

Client Primary Contact:

Client Technical Contact:

Client Billing Contact:

- - +

Login via:

+

User ID:

diff --git a/login.php b/login.php index 50f6ea73..039faa0d 100644 --- a/login.php +++ b/login.php @@ -524,6 +524,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && (isset($_POST['login']) || isset($_ "; } else { + $user_id = intval($selectedRow['contact_user_id']); $client_id = intval($selectedRow['contact_client_id']); $contact_id = intval($selectedRow['contact_id']); $user_auth_method = sanitizeInput($selectedRow['user_auth_method']); From 64525750b621c8eaa781425651a3f1db3ef210d0 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Fri, 9 Jan 2026 13:56:29 +0000 Subject: [PATCH 014/120] Fix readme demo creds --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d5c52ebe..2985a484 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@
View demo
- Username: demo@demo | Password: demo + Username: demo@demo.com | Password: demo

About From 88a29b75998c26aed27989666386eb28798a8b72 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Fri, 9 Jan 2026 16:56:11 +0000 Subject: [PATCH 015/120] Bugfix: Mail queue loop not sending invoices to all billing contacts --- agent/post/invoice.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/agent/post/invoice.php b/agent/post/invoice.php index 824da9c1..b0283e32 100644 --- a/agent/post/invoice.php +++ b/agent/post/invoice.php @@ -570,15 +570,13 @@ if (isset($_GET['email_invoice'])) { } // Queue Mail - $data = [ - [ + $data[] = [ 'from' => $config_invoice_from_email, 'from_name' => $config_invoice_from_name, 'recipient' => $contact_email, 'recipient_name' => $contact_name, 'subject' => $subject, 'body' => $body - ] ]; addToMailQueue($data); @@ -613,15 +611,13 @@ if (isset($_GET['email_invoice'])) { $billing_contact_name = sanitizeInput($billing_contact['contact_name']); $billing_contact_email = sanitizeInput($billing_contact['contact_email']); - $data = [ - [ + $data[] = [ 'from' => $config_invoice_from_email, 'from_name' => $config_invoice_from_name, 'recipient' => $billing_contact_email, 'recipient_name' => $billing_contact_name, 'subject' => $subject, 'body' => $body - ] ]; logAction("Invoice", "Email", "$session_name Emailed $billing_contact_email Invoice $invoice_prefix$invoice_number Email queued Email ID: $email_id", $client_id, $invoice_id); From 77e4d2b5660f79ac7961a1ce6fb0ec2bef91fe06 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Fri, 9 Jan 2026 17:14:44 +0000 Subject: [PATCH 016/120] Add task approval system --- admin/database_updates.php | 26 +- agent/ajax.php | 20 ++ .../ticket/ticket_task_approver_add.php | 140 ++++++++++ agent/modals/ticket/ticket_task_edit.php | 58 ++++- agent/post/task.php | 241 ++++++++++++++++++ agent/ticket.php | 75 +++++- client/post.php | 37 +++ client/ticket.php | 60 +++++ db.sql | 19 ++ guest/guest_approve_ticket_task.php | 114 +++++++++ guest/guest_post.php | 33 +++ includes/database_version.php | 2 +- 12 files changed, 814 insertions(+), 11 deletions(-) create mode 100644 agent/modals/ticket/ticket_task_approver_add.php create mode 100644 guest/guest_approve_ticket_task.php diff --git a/admin/database_updates.php b/admin/database_updates.php index ee595709..0a173c30 100644 --- a/admin/database_updates.php +++ b/admin/database_updates.php @@ -4134,10 +4134,30 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.8'"); } - // if (CURRENT_DATABASE_VERSION == '2.3.8') { - // // Insert queries here required to update to DB version 2.3.9 + if (CURRENT_DATABASE_VERSION == '2.3.8') { + + mysqli_query($mysqli, " + CREATE TABLE `task_approvals` ( + `approval_id` int(11) NOT NULL AUTO_INCREMENT, + `approval_scope` enum('client','internal') NOT NULL, + `approval_type` enum('any','technical','billing','specific') NOT NULL, + `approval_required_user_id` int(11) DEFAULT NULL, + `approval_status` enum('pending','approved','declined') NOT NULL, + `approval_created_by` int(11) NOT NULL, + `approval_approved_by` varchar(255) DEFAULT NULL, + `approval_url_key` varchar(200) NOT NULL, + `approval_task_id` int(11) NOT NULL, + PRIMARY KEY (`approval_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.9'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.3.9') { + // // Insert queries here required to update to DB version 2.4.0 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.9'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.4.0'"); // } } else { diff --git a/agent/ajax.php b/agent/ajax.php index 1fae441c..e153c01f 100644 --- a/agent/ajax.php +++ b/agent/ajax.php @@ -992,3 +992,23 @@ if (isset($_GET['apex_domain_check'])) { echo json_encode($response); } + +// Get internal users/techs +if (isset($_GET['get_internal_users'])) { + enforceUserPermission('module_support'); + + $sql = mysqli_query( + $mysqli, + "SELECT user_id, user_name + FROM users + WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL + ORDER BY user_name" + ); + + while ($row = mysqli_fetch_assoc($sql)) { + $response['users'][] = $row; + } + + echo json_encode($response); + exit; +} diff --git a/agent/modals/ticket/ticket_task_approver_add.php b/agent/modals/ticket/ticket_task_approver_add.php new file mode 100644 index 00000000..03064481 --- /dev/null +++ b/agent/modals/ticket/ticket_task_approver_add.php @@ -0,0 +1,140 @@ + + +
+
New approver for task
+ +
+ + + + +
+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+ + +
+ + + + + + + +
- +
@@ -49,7 +57,53 @@ ob_start();
- + + 0) { ?> +
+
+ Task Approvals + +
+ + + + + + + + + + + + + + + + + + +
ScopeTypeStatusAction
+ + + Delete + + + +
+ +
+ +
diff --git a/agent/post/task.php b/agent/post/task.php index 044d9a00..2950222f 100644 --- a/agent/post/task.php +++ b/agent/post/task.php @@ -155,6 +155,247 @@ if (isset($_GET['undo_complete_task'])) { } +if (isset($_POST['add_ticket_task_approver'])) { + + validateCSRFToken($_POST['csrf_token']); + enforceUserPermission('module_support', 2); + + $task_id = intval($_POST['task_id']); + $scope = sanitizeInput($_POST['approval_scope']); + $type = sanitizeInput($_POST['approval_type']); + $approval_url_key = randomString(32); + + $required_user_id = "NULL"; + if ($type == 'specific') { + $required_user_id = intval($_POST['approval_required_user_id']); + } + + mysqli_query($mysqli, "INSERT INTO task_approvals SET approval_scope = '$scope', approval_type = '$type', approval_required_user_id = $required_user_id, approval_status = 'pending', approval_created_by = $session_user_id, approval_url_key = '$approval_url_key', approval_task_id = $task_id"); + + $approval_id = mysqli_insert_id($mysqli); + + // Task/Ticket Info + $tt_row = mysqli_fetch_array(mysqli_query($mysqli, " + SELECT * FROM tasks + LEFT JOIN tickets ON ticket_id = task_ticket_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + WHERE task_id = $task_id LIMIT 1 + ") + ); + $task_name = sanitizeInput($tt_row['task_name']); + $ticket_id = intval($tt_row['task_ticket_id']); + $ticket_prefix = sanitizeInput($tt_row['ticket_prefix']); + $ticket_number = intval($tt_row['ticket_number']); + $ticket_subject = sanitizeInput($tt_row['ticket_subject']); + $ticket_status = sanitizeInput($tt_row['ticket_status_name']); + $ticket_url_key = sanitizeInput($tt_row['ticket_url_key']); + $ticket_contact_id = intval($tt_row['ticket_contact_id']); + $client_id = intval($tt_row['ticket_client_id']); + + // --Notifications-- + + // 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 + $crow = mysqli_fetch_array(mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1")); + $company_name = sanitizeInput($crow['company_name']); + $company_phone = sanitizeInput(formatPhoneNumber($crow['company_phone'], $crow['company_phone_country_code'])); + + // Email contents + $subject = "Ticket task approval required - [$ticket_prefix$ticket_number] - $ticket_subject"; + $body = "##- Please type your reply above this line -##

Hello,

A ticket regarding $ticket_subject has a task requiring your approval:-
Task name: $task_name
Scope/Type: $scope - $type

To approve this task, please click here.
If you require further information, please reply to this e-mail.

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

--
$company_name - Support
$config_ticket_from_email
$company_phone"; + + if ($scope == 'internal' && $type == 'specific' && $session_user_id !== $required_user_id) { + mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Ticket', notification = '$session_name needs your approval for ticket $ticket_prefix$ticket_number task $task_name', notification_action = 'ticket.php?ticket_id=$ticket_id', notification_client_id = 0, notification_user_id = $required_user_id"); + + if (!empty($config_smtp_host)) { + $agent_contact = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT user_name, user_email FROM users WHERE user_id = $required_user_id AND user_archived_at IS NULL")); + $name = sanitizeInput($agent_contact['user_name']); + $email = sanitizeInput($agent_contact['user_email']); + + // Only add contact to email queue if email is valid + if (filter_var($email, FILTER_VALIDATE_EMAIL)) { + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $email, + 'recipient_name' => $name, + 'subject' => $subject, + 'body' => $body + ]; + + addToMailQueue($data); + } + + } + } + + if (!empty($config_smtp_host) && $scope == 'client' && $type == 'any') { + + $contact_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT contact_name, contact_email FROM contacts WHERE contact_id = $ticket_contact_id LIMIT 1")); + $contact_name = sanitizeInput($contact_row['contact_name']); + $contact_email = sanitizeInput($contact_row['contact_email']); + + $data = []; + + if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; + addToMailQueue($data); + } + + } + + if (!empty($config_smtp_host) && $scope == 'client' && $type == 'technical') { + + $sql_technical_contacts = mysqli_query( + $mysqli, + "SELECT contact_name, contact_email FROM contacts + WHERE contact_technical = 1 + AND contact_email != '' + AND contact_client_id = $client_id" + ); + + $data = []; + + while ($technical_contact = mysqli_fetch_array($sql_technical_contacts)) { + $technical_contact_name = sanitizeInput($technical_contact['contact_name']); + $technical_contact_email = sanitizeInput($technical_contact['contact_email']); + + if (filter_var($technical_contact_email, FILTER_VALIDATE_EMAIL)) { + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $technical_contact_email, + 'recipient_name' => $technical_contact_name, + 'subject' => $subject, + 'body' => $body + ]; + } + + } + + addToMailQueue($data); + + } + + if (!empty($config_smtp_host) && $scope == 'client' && $type == 'billing') { + + $sql_billing_contacts = mysqli_query( + $mysqli, + "SELECT contact_name, contact_email FROM contacts + WHERE contact_billing = 1 + AND contact_email != '' + AND contact_client_id = $client_id" + ); + + $data = []; + + while ($billing_contact = mysqli_fetch_array($sql_billing_contacts)) { + $billing_contact_name = sanitizeInput($billing_contact['contact_name']); + $billing_contact_email = sanitizeInput($billing_contact['contact_email']); + + if (filter_var($billing_contact_email, FILTER_VALIDATE_EMAIL)) { + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $billing_contact_email, + 'recipient_name' => $billing_contact_name, + 'subject' => $subject, + 'body' => $body + ]; + } + + } + + addToMailQueue($data); + + } + + // Logging + logAction("Task", "Edit", "$session_name added task approver for $task_name", $client_id, $task_id); + + flash_alert("Added approver"); + redirect(); +} + +if (isset($_GET['approve_ticket_task'])) { + + validateCSRFToken($_GET['csrf_token']); + enforceUserPermission('module_support', 2); + + $task_id = intval($_GET['approve_task']); + $approval_id = intval($_GET['approval_id']); + + $approval_row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM task_approvals LEFT JOIN tasks on task_id = approval_task_id WHERE approval_id = $approval_id AND approval_task_id = $task_id AND approval_scope = 'internal'")); + + $task_name = nullable_htmlentities($approval_row['task_name']); + $scope = nullable_htmlentities($approval_row['approval_scope']); + $type = nullable_htmlentities($approval_row['approval_type']); + $required_user = intval($approval_row['approval_required_user_id']); + $created_by = intval($approval_row['approval_created_by']); + $ticket_id = intval($approval_row['task_ticket_id']); + + if (!$approval_row) { + flash_alert("Cannot find/approve that task", 'error'); + redirect(); + exit; + } + + // Validate approver (deny) + if ($required_user > 0 && $required_user !== $session_user_id) { + flash_alert("You cannot approve that task", 'error'); + redirect(); + exit; + } + if ($required_user == 0 && $type = 'any' && $created_by == $session_user_id) { + flash_alert("You cannot approve your own task", 'error'); + redirect(); + exit; + } + + // Approve + mysqli_query($mysqli, "UPDATE task_approvals SET approval_status = 'approved', approval_approved_by = $session_user_id WHERE approval_id = $approval_id AND approval_task_id = $task_id AND approval_scope = 'internal'"); + + // Notify + mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Ticket', notification = '$session_name approved ticket task $task_name', notification_action = 'ticket.php?ticket_id=$ticket_id', notification_client_id = 0, notification_user_id = $created_by"); + // TODO: Email agent + + // Logging + logAction("Task", "Edit", "$session_name approved task $task_name (approval $approval_id)", 0, $task_id); + + flash_alert("Approved"); + redirect(); + +} + +if (isset($_GET['delete_ticket_task_approver'])) { + + validateCSRFToken($_GET['csrf_token']); + + enforceUserPermission('module_support', 3); + + $approval_id = intval($_GET['delete_ticket_task_approver']); + + mysqli_query($mysqli, "DELETE FROM task_approvals WHERE approval_id = $approval_id"); + + logAction("Task", "Delete", "$session_name deleted task approval request ($approval_id)", 0, 0); + + flash_alert("Approval request deleted", 'error'); + + redirect(); + +} + if (isset($_GET['complete_all_tasks'])) { enforceUserPermission('module_support', 2); diff --git a/agent/ticket.php b/agent/ticket.php index 266f01db..f1221ee7 100644 --- a/agent/ticket.php +++ b/agent/ticket.php @@ -961,23 +961,82 @@ if (isset($_GET['ticket_id'])) { 0; + + $approval_id = 0; + $user_can_approve = false; + $approval_rows = mysqli_query($mysqli, " + SELECT approval_id, approval_scope, approval_type, approval_required_user_id, approval_created_by + FROM task_approvals WHERE approval_task_id = $task_id AND approval_status = 'pending' + "); + + while ($approval = mysqli_fetch_array($approval_rows)) { + + $scope = nullable_htmlentities($approval['approval_scope']); + $type = nullable_htmlentities($approval['approval_type']); + $required_user = intval($approval['approval_required_user_id']); + $created_by = intval($approval['approval_created_by']); + + // Named, specific user? + if ($scope == 'internal' && $type == 'specific' && $required_user == $session_user_id) { + $user_can_approve = true; + $approval_id = intval($approval['approval_id']); + continue; + } + + // Any internal user, but the one who created the task + if ($scope == 'internal' && $type == 'any' && $created_by !== $session_user_id) { + $user_can_approve = true; + $approval_id = intval($approval['approval_id']); + continue; + } + + } + ?> Date: Sat, 10 Jan 2026 16:09:03 -0500 Subject: [PATCH 018/120] switched from mysqli_fetch_array to mysqli_fetch_assoc in client modals --- agent/modals/client/client_add.php | 4 ++-- agent/modals/client/client_bulk_add_ticket.php | 6 +++--- agent/modals/client/client_bulk_assign_tags.php | 2 +- agent/modals/client/client_bulk_edit_referral.php | 2 +- agent/modals/client/client_credit_add.php | 2 +- agent/modals/client/client_edit.php | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/agent/modals/client/client_add.php b/agent/modals/client/client_add.php index f38988a9..6a954b2f 100644 --- a/agent/modals/client/client_add.php +++ b/agent/modals/client/client_add.php @@ -97,7 +97,7 @@ ob_start(); @@ -131,7 +131,7 @@ ob_start(); +
@@ -439,28 +440,36 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
-
- "> - "> - - -
@@ -470,7 +479,7 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
= 2) { ?> - - - + + + + + + + + + + + + + + + + + + + -
@@ -997,6 +1056,12 @@ if (isset($_GET['ticket_id'])) { data-modal-url="modals/ticket/ticket_task_edit.php?id="> Edit + + + Add Approvers + + Mark incomplete diff --git a/client/post.php b/client/post.php index 39a6a7d2..1a315915 100644 --- a/client/post.php +++ b/client/post.php @@ -185,6 +185,43 @@ if (isset($_POST['add_ticket_comment'])) { } } +if (isset($_GET['approve_ticket_task'])) { + + $task_id = intval($_GET['approve_ticket_task']); + $approval_id = intval($_GET['approval_id']); + $url_key = sanitizeInput($_GET['approval_url_key']); + + $approval_row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM task_approvals LEFT JOIN tasks on task_id = approval_task_id WHERE approval_id = $approval_id AND approval_task_id = $task_id AND approval_url_key = '$url_key' AND approval_status = 'pending' AND approval_scope = 'client'")); + + $task_name = nullable_htmlentities($approval_row['task_name']); + $scope = nullable_htmlentities($approval_row['approval_scope']); + $type = nullable_htmlentities($approval_row['approval_type']); + $required_user = intval($approval_row['approval_required_user_id']); + $created_by = intval($approval_row['approval_created_by']); + $ticket_id = intval($approval_row['task_ticket_id']); + + if (!$approval_row) { + flash_alert("Cannot find/approve that task", 'warning'); + redirect(); + exit; + } + + // Approve + mysqli_query($mysqli, "UPDATE task_approvals SET approval_status = 'approved', approval_approved_by = $session_user_id WHERE approval_id = $approval_id AND approval_task_id = $task_id AND approval_url_key = '$url_key' AND approval_status = 'pending' AND approval_scope = 'client'"); + + + // Notify tech + mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Ticket', notification = '$session_contact_email approved ticket task $task_name', notification_action = 'ticket.php?ticket_id=$ticket_id', notification_client_id = $session_client_id, notification_user_id = $created_by"); + // TODO: Email agent + + // Logging + logAction("Task", "Edit", "Contact $session_contact_email approved task $task_name (approval $approval_id)", $session_client_id, $task_id); + + flash_alert("Task Approved"); + redirect(); + +} + if (isset($_POST['add_ticket_feedback'])) { $ticket_id = intval($_POST['ticket_id']); diff --git a/client/ticket.php b/client/ticket.php index c651694f..9051fef3 100644 --- a/client/ticket.php +++ b/client/ticket.php @@ -70,6 +70,13 @@ if (isset($_GET['id']) && intval($_GET['id'])) { ); $completed_task_count = mysqli_num_rows($sql_tasks_completed); + // Get pending task approvals + $sql_task_approvals = mysqli_query($mysqli," + SELECT task_id, task_name, approval_id, approval_scope, approval_type, approval_required_user_id, approval_status, approval_url_key + FROM tasks + LEFT JOIN task_approvals ON task_id = task_approvals.approval_task_id + WHERE task_ticket_id = $ticket_id AND task_completed_at IS NULL AND approval_scope = 'client' AND approval_status = 'pending' + "); ?>
    @@ -130,6 +137,59 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
+ + 0) { ?> +
+
+
Approvals
+ This ticket has tasks requiring approval: + + + + + +
+
+ +
diff --git a/db.sql b/db.sql index 42af2911..081bd541 100644 --- a/db.sql +++ b/db.sql @@ -2441,6 +2441,25 @@ CREATE TABLE `tasks` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `task_approvals` +-- + +DROP TABLE IF EXISTS `task_approvals`; +CREATE TABLE IF NOT EXISTS `task_approvals` ( + `approval_id` int(11) NOT NULL AUTO_INCREMENT, + `approval_scope` enum('client','internal') NOT NULL, + `approval_type` enum('any','technical','billing','specific') NOT NULL, + `approval_required_user_id` int(11) DEFAULT NULL, + `approval_status` enum('pending','approved','declined') NOT NULL, + `approval_created_by` int(11) NOT NULL, + `approval_approved_by` varchar(255) DEFAULT NULL, + `approval_url_key` varchar(200) NOT NULL, + `approval_task_id` int(11) NOT NULL, + PRIMARY KEY (`approval_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `taxes` -- diff --git a/guest/guest_approve_ticket_task.php b/guest/guest_approve_ticket_task.php new file mode 100644 index 00000000..952bcc8a --- /dev/null +++ b/guest/guest_approve_ticket_task.php @@ -0,0 +1,114 @@ +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['task_approval_id'], $_GET['url_key'])) { + echo "

Oops, something went wrong! Please raise a ticket if you believe this is an error.

"; + require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/footer.php'; + exit(); +} + +// Company info +$company_sql_row = mysqli_fetch_array(mysqli_query($mysqli, " + SELECT + company_phone, + company_phone_country_code, + company_website + FROM + companies, + settings + WHERE + companies.company_id = settings.company_id + AND companies.company_id = 1" +)); + +$company_phone_country_code = nullable_htmlentities($company_sql_row['company_phone_country_code']); +$company_phone = nullable_htmlentities(formatPhoneNumber($company_sql_row['company_phone'], $company_phone_country_code)); +$company_website = nullable_htmlentities($company_sql_row['company_website']); + +$approval_id = intval($_GET['task_approval_id']); +$url_key = sanitizeInput($_GET['url_key']); + +$task_row = mysqli_fetch_assoc(mysqli_query($mysqli, + "SELECT * FROM task_approvals + LEFT JOIN tasks ON approval_task_id = task_id + LEFT JOIN tickets on task_ticket_id = ticket_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + WHERE approval_id = $approval_id AND approval_url_key = '$url_key' + LIMIT 1" +)); + +if (!$task_row) { + // Invalid + echo "

Oops, something went wrong! Please raise a ticket if you believe this is an error.

"; + require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/footer.php'; + exit(); +} + + +$task_id = intval($task_row['task_id']); +$task_name = nullable_htmlentities($task_row['task_name']); +$approval_scope = nullable_htmlentities($task_row['approval_scope']); +$approval_type = nullable_htmlentities($task_row['approval_type']); +$approval_status = nullable_htmlentities($task_row['approval_status']); + +$ticket_prefix = nullable_htmlentities($task_row['ticket_prefix']); +$ticket_number = intval($task_row['ticket_number']); +$ticket_status = nullable_htmlentities($task_row['ticket_status_name']); +$ticket_priority = nullable_htmlentities($task_row['ticket_priority']); +$ticket_subject = nullable_htmlentities($task_row['ticket_subject']); +$ticket_details = $purifier->purify($task_row['ticket_details']); + +?> + +
+
+

+ Task Approval for Ticket +

+
+ +
+
Subject:
+

+ State: +
+ Priority: +
+

+ +
+
Task Approval
+

+ Task Name: +
+ Scope/Type: +
+ Status: +
+ + Action: Approve Task + +

+ +
+
+ +
+ +
+ $company_phone | $company_website"; ?> +
+ + Date: Sat, 10 Jan 2026 15:54:19 -0500 Subject: [PATCH 017/120] switched from mysqli_fetch_array to mysqli_fetch_assoc in clients listing page. This will have a major query speed and memory optimization impact --- agent/clients.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/agent/clients.php b/agent/clients.php index cb136ba8..04750196 100644 --- a/agent/clients.php +++ b/agent/clients.php @@ -231,7 +231,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); GROUP BY tags.tag_id HAVING COUNT(client_tags.client_id) > 0 OR tags.tag_id IN ($tag_filter) "); - while ($row = mysqli_fetch_array($sql_tags_filter)) { + while ($row = mysqli_fetch_assoc($sql_tags_filter)) { $tag_id = intval($row['tag_id']); $tag_name = nullable_htmlentities($row['tag_name']); ?> @@ -249,7 +249,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -268,7 +268,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -323,7 +323,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
"> From e5dab8b1ca22bc4d157ed133d601f850c557449a Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 10 Jan 2026 19:12:22 -0500 Subject: [PATCH 021/120] Update files to use mysqli_fetch_assoc for better performance and memory optimization. Add title for List View and Grid View --- agent/files.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/agent/files.php b/agent/files.php index 6205ca17..bbdf54cd 100644 --- a/agent/files.php +++ b/agent/files.php @@ -76,7 +76,7 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) { global $mysqli, $get_folder_id, $session_user_role, $archive_query, $archived; $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_client_id = $client_id ORDER BY folder_name ASC"); - while ($row = mysqli_fetch_array($sql_folders)) { + while ($row = mysqli_fetch_assoc($sql_folders)) { $folder_id = intval($row['folder_id']); $folder_name = nullable_htmlentities($row['folder_name']); @@ -442,8 +442,8 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
- "> - "> + " title="List View"> + " title="Grid View">
0); if ($file_shared) { - $row_shared = mysqli_fetch_array($sql_shared); + $row_shared = mysqli_fetch_assoc($sql_shared); $item_recipient = nullable_htmlentities($row_shared['item_recipient']); $item_expire_at_human = timeAgo($row_shared['item_expire_at']); } @@ -747,7 +747,7 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) ); $doc_shared = (mysqli_num_rows($sql_shared) > 0); if ($doc_shared) { - $row_shared = mysqli_fetch_array($sql_shared); + $row_shared = mysqli_fetch_assoc($sql_shared); $item_recipient = nullable_htmlentities($row_shared['item_recipient']); $item_expire_at_human = timeAgo($row_shared['item_expire_at']); } From 5815ef2f755934392fad5357fbd2ac248cd6e0b2 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 10 Jan 2026 20:38:04 -0500 Subject: [PATCH 022/120] Added bulk delete, archive and restore and invidual file/document restore functions to files --- agent/files.php | 85 +++++++++++++++++------ agent/post/document.php | 22 ++++++ agent/post/file.php | 148 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 229 insertions(+), 26 deletions(-) diff --git a/agent/files.php b/agent/files.php index bbdf54cd..469d4296 100644 --- a/agent/files.php +++ b/agent/files.php @@ -256,6 +256,7 @@ if ($view == 1) { $file_mime_type = nullable_htmlentities($row['file_mime_type']); $file_uploaded_by = nullable_htmlentities($row['user_name']); $file_created_at = nullable_htmlentities($row['file_created_at']); + $file_archived_at = $row['file_archived_at']; // determine icon if ($file_ext == 'pdf') { @@ -293,6 +294,7 @@ if ($view == 1) { 'size' => $file_size, 'created_at' => $file_created_at, 'created_by' => $file_uploaded_by, + 'archived_at' => $file_archived_at, ]; } @@ -303,6 +305,7 @@ if ($view == 1) { $document_description = nullable_htmlentities($row['document_description']); $document_created_by_name = nullable_htmlentities($row['user_name']); $document_created_at = $row['document_created_at']; + $document_archived_at = $row['document_archived_at']; $items[] = [ 'kind' => 'document', @@ -313,6 +316,7 @@ if ($view == 1) { 'size' => null, 'created_at' => $document_created_at, 'created_by' => $document_created_by_name, + 'archived_at' => $document_archived_at, ]; } @@ -462,11 +466,24 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) data-bulk="true"> Move Files + +
+
+ +
+ +
@@ -512,6 +529,7 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) $file_size_KB = number_format($file_size / 1024); $file_mime_type = nullable_htmlentities($row['file_mime_type']); $file_uploaded_by = nullable_htmlentities($row['user_name']); + $file_archived_at = nullable_htmlentities($row['file_archived_at']); $files[] = [ 'id' => $file_id, @@ -547,16 +565,23 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) Move - Asset + Link Asset -
- - Archive - - +
- )"> - Delete + + Restore + + +
+ )"> + Delete + + + +
+ + Archive @@ -629,6 +654,7 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) $file_mime_type = $item['mime']; $file_uploaded_by = $item['created_by']; $file_created_at = $item['created_at']; + $file_archived_at = $item['archived_at']; // Shared? $sql_shared = mysqli_query( @@ -707,16 +733,23 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) Move - Asset + Link Asset -
- - Archive - - +
- )"> - Delete + + Restore + + +
+ )"> + Delete + + + +
+ + Archive @@ -733,6 +766,7 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) $document_description = $item['description']; $document_created_by_name = $item['created_by']; $document_created_at = date("m/d/Y", strtotime($item['created_at'])); + $document_archived_at = $item['archived_at']; $sql_shared = mysqli_query( $mysqli, @@ -819,14 +853,21 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']) data-modal-url="modals/document/document_move.php?id="> Move - +
- - Archive + + Restore + +
+ + Delete + + +
- - Delete + + Archive diff --git a/agent/post/document.php b/agent/post/document.php index 39ef579e..de467358 100644 --- a/agent/post/document.php +++ b/agent/post/document.php @@ -700,6 +700,28 @@ if (isset($_GET['archive_document'])) { } +if (isset($_GET['restore_document'])) { + + enforceUserPermission('module_support', 2); + + $document_id = intval($_GET['restore_document']); + + // Get Document Name and Client ID for logging and alert message + $sql = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); + $row = mysqli_fetch_assoc($sql); + $document_name = sanitizeInput($row['document_name']); + $client_id = intval($row['document_client_id']); + + mysqli_query($mysqli,"UPDATE documents SET document_archived_at = NULL WHERE document_id = $document_id"); + + logAction("Document", "Restore", "$session_name restored document $document_name", $client_id, $document_id); + + flash_alert("Document $document_name Restored"); + + redirect(); + +} + if (isset($_GET['delete_document_version'])) { enforceUserPermission('module_support', 3); diff --git a/agent/post/file.php b/agent/post/file.php index 30b6da5b..59aafaa5 100644 --- a/agent/post/file.php +++ b/agent/post/file.php @@ -173,6 +173,28 @@ if (isset($_GET['archive_file'])) { } +if (isset($_GET['restore_file'])) { + + enforceUserPermission('module_support', 2); + + $file_id = intval($_GET['restore_file']); + + // Get Document Name and Client ID for logging and alert message + $sql = mysqli_query($mysqli,"SELECT file_name, file_client_id FROM files WHERE file_id = $file_id"); + $row = mysqli_fetch_assoc($sql); + $file_name = sanitizeInput($row['file_name']); + $client_id = intval($row['file_client_id']); + + mysqli_query($mysqli,"UPDATE files SET file_archived_at = NULL WHERE file_id = $file_id"); + + logAction("File", "Restore", "$session_name restored file $file_name", $client_id, $file_id); + + flash_alert("File $file_name Restored"); + + redirect(); + +} + if (isset($_POST['delete_file'])) { validateCSRFToken($_POST['csrf_token']); @@ -208,6 +230,65 @@ if (isset($_POST['delete_file'])) { } +if (isset($_POST['bulk_archive_files'])) { + + validateCSRFToken($_POST['csrf_token']); + + enforceUserPermission('module_support', 3); + + // Archive file loop + if (isset($_POST['file_ids'])) { + + // Get selected file Count + $file_count = count($_POST['file_ids']); + + foreach($_POST['file_ids'] as $file_id) { + + $file_id = intval($file_id); + + $sql_file = mysqli_query($mysqli,"SELECT * FROM files WHERE file_id = $file_id"); + $row = mysqli_fetch_array($sql_file); + $client_id = intval($row['file_client_id']); + $file_name = sanitizeInput($row['file_name']); + + mysqli_query($mysqli,"UPDATE files SET file_archived_at = NOW() WHERE file_id = $file_id"); + + logAction("File", "Archive", "$session_name archived file $file_name", $client_id, $file_id); + } + + } + + // Archive documents loop + if (isset($_POST['document_ids'])) { + + // Get selected document count + $document_count = count($_POST['document_ids']); + + // Delete document loop + foreach($_POST['document_ids'] as $document_id) { + $document_id = intval($document_id); + // Get document name for logging + $sql = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); + $row = mysqli_fetch_array($sql); + $document_name = sanitizeInput($row['document_name']); + $client_id = intval($row['document_client_id']); + + mysqli_query($mysqli,"UPDATE documents SET document_archived_at = NOW() WHERE document_id = $document_id"); + + logAction("Document", "Archive", "$session_name archived document $document_name", $client_id, $document_id); + + } + + } + + logAction("File", "Bulk Archive", "$session_name archived $document_count document(s) and $file_count file(s)", $client_id); + + flash_alert("Archived $document_count Documents and $file_count files", 'error'); + + redirect(); + +} + if (isset($_POST['bulk_delete_files'])) { validateCSRFToken($_POST['csrf_token']); @@ -257,11 +338,11 @@ if (isset($_POST['bulk_delete_files'])) { // Delete document loop foreach($_POST['document_ids'] as $document_id) { $document_id = intval($document_id); - // Get document name for logging + // Get Document Name and Client ID for logging $sql = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); $row = mysqli_fetch_array($sql); - $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); + $document_name = sanitizeInput($row['document_name']); mysqli_query($mysqli,"DELETE FROM documents WHERE document_id = $document_id"); @@ -277,9 +358,68 @@ if (isset($_POST['bulk_delete_files'])) { } - logAction("File", "Bulk Delete", "$session_name deleted $document_count document(s) and all versions and $file_count file(s)", $client_id); + logAction("File", "Bulk Delete", "$session_name deleted $document_count document(s) and $file_count file(s)", $client_id); - flash_alert("Deleted $document_count Documents and associated document versions and $file_count files", 'error'); + flash_alert("Deleted $document_count Documents and $file_count files", 'error'); + + redirect(); + +} + +if (isset($_POST['bulk_restore_files'])) { + + validateCSRFToken($_POST['csrf_token']); + + enforceUserPermission('module_support', 2); + + // Restore file loop + if (isset($_POST['file_ids'])) { + + // Get selected file Count + $file_count = count($_POST['file_ids']); + + foreach($_POST['file_ids'] as $file_id) { + + $file_id = intval($file_id); + + $sql_file = mysqli_query($mysqli,"SELECT * FROM files WHERE file_id = $file_id"); + $row = mysqli_fetch_array($sql_file); + $client_id = intval($row['file_client_id']); + $file_name = sanitizeInput($row['file_name']); + + mysqli_query($mysqli,"UPDATE files SET file_archived_at = NULL WHERE file_id = $file_id"); + + logAction("File", "Restore", "$session_name restored file $file_name", $client_id, $file_id); + } + + } + + // Restore documents loop + if (isset($_POST['document_ids'])) { + + // Get selected document count + $document_count = count($_POST['document_ids']); + + // Restore document loop + foreach($_POST['document_ids'] as $document_id) { + $document_id = intval($document_id); + // Get document name for logging + $sql = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); + $row = mysqli_fetch_array($sql); + $document_name = sanitizeInput($row['document_name']); + $client_id = intval($row['document_client_id']); + + mysqli_query($mysqli,"UPDATE documents SET document_archived_at = NULL WHERE document_id = $document_id"); + + logAction("Document", "Restore", "$session_name restored document $document_name", $client_id, $document_id); + + } + + } + + logAction("File", "Bulk Restore", "$session_name restored $document_count document(s) and $file_count file(s)", $client_id); + + flash_alert("Restored $document_count Documents and $file_count files"); redirect(); From 1de023f9df8cafa00a58c876e6b77cfdeda9fc03 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 11 Jan 2026 16:46:53 -0500 Subject: [PATCH 023/120] Fix Role Archiving, Roles can only be archived if no users are assigned to the role --- admin/post/roles.php | 10 +++++----- modals/notifications.php | 22 ++++++++++------------ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/admin/post/roles.php b/admin/post/roles.php index fb79c254..a0ec99d2 100644 --- a/admin/post/roles.php +++ b/admin/post/roles.php @@ -34,7 +34,7 @@ if (isset($_POST['edit_role'])) { $name = sanitizeInput($_POST['role_name']); $description = sanitizeInput($_POST['role_description']); $admin = intval($_POST['role_is_admin']); - + mysqli_query($mysqli, "UPDATE user_roles SET role_name = '$name', role_description = '$description', role_is_admin = $admin WHERE role_id = $role_id"); // Update role access levels @@ -70,18 +70,18 @@ if (isset($_GET['archive_role'])) { $role_user_count = mysqli_fetch_row($sql_role_user_count)[0]; if ($role_user_count != 0) { flash_alert("Role must not in use to archive it", 'error'); - + redirect(); } mysqli_query($mysqli, "UPDATE user_roles SET role_archived_at = NOW() WHERE role_id = $role_id"); - $role_name = sanitizeInput(getFieldById('roles', $role_id, 'role_name')); + $role_name = sanitizeInput(getFieldById('user_roles', $role_id, 'role_name')); logAction("User Role", "Archive", "$session_name archived user role $role_name", 0, $role_id); flash_alert("User Role $role_name archived", 'error'); - + redirect(); -} \ No newline at end of file +} diff --git a/modals/notifications.php b/modals/notifications.php index dd1a30df..a1e4c367 100644 --- a/modals/notifications.php +++ b/modals/notifications.php @@ -19,7 +19,7 @@ ob_start(); ?>
-
Notifications
+
Notifications
@@ -28,9 +28,9 @@ ob_start();
- - - + @@ -78,10 +78,8 @@ ob_start();
- - " class="btn btn-primary"> + + " class="btn btn-primary"> Dismiss all From 58bcb38617b63666321dbc7c97447245b97f9e7f Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 12 Jan 2026 12:21:10 +0000 Subject: [PATCH 024/120] Add task approval system (tidy) --- admin/database_updates.php | 2 +- agent/ajax.php | 4 ++-- agent/post/task.php | 2 +- agent/ticket.php | 6 +++--- client/ticket.php | 2 +- guest/guest_approve_ticket_task.php | 10 +++++----- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/admin/database_updates.php b/admin/database_updates.php index 0a173c30..b753cf0d 100644 --- a/admin/database_updates.php +++ b/admin/database_updates.php @@ -4147,7 +4147,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { `approval_approved_by` varchar(255) DEFAULT NULL, `approval_url_key` varchar(200) NOT NULL, `approval_task_id` int(11) NOT NULL, - PRIMARY KEY (`approval_id`) + PRIMARY KEY (`approval_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; "); diff --git a/agent/ajax.php b/agent/ajax.php index e153c01f..ea0f7064 100644 --- a/agent/ajax.php +++ b/agent/ajax.php @@ -999,8 +999,8 @@ if (isset($_GET['get_internal_users'])) { $sql = mysqli_query( $mysqli, - "SELECT user_id, user_name - FROM users + "SELECT user_id, user_name + FROM users WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name" ); diff --git a/agent/post/task.php b/agent/post/task.php index 2950222f..f59a955d 100644 --- a/agent/post/task.php +++ b/agent/post/task.php @@ -357,7 +357,7 @@ if (isset($_GET['approve_ticket_task'])) { redirect(); exit; } - if ($required_user == 0 && $type = 'any' && $created_by == $session_user_id) { + if ($required_user == 0 && $type == 'any' && $created_by == $session_user_id) { flash_alert("You cannot approve your own task", 'error'); redirect(); exit; diff --git a/agent/ticket.php b/agent/ticket.php index f1221ee7..92ee92f5 100644 --- a/agent/ticket.php +++ b/agent/ticket.php @@ -972,9 +972,9 @@ if (isset($_GET['ticket_id'])) { $task_needs_approval = false; $task_needs_approval = mysqli_num_rows(mysqli_query( $mysqli, - "SELECT 1 FROM task_approvals - WHERE approval_task_id = $task_id - AND approval_status IN ('pending','declined') + "SELECT 1 FROM task_approvals + WHERE approval_task_id = $task_id + AND approval_status IN ('pending','declined') LIMIT 1" )) > 0; diff --git a/client/ticket.php b/client/ticket.php index 9051fef3..6e85fe6e 100644 --- a/client/ticket.php +++ b/client/ticket.php @@ -75,7 +75,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) { SELECT task_id, task_name, approval_id, approval_scope, approval_type, approval_required_user_id, approval_status, approval_url_key FROM tasks LEFT JOIN task_approvals ON task_id = task_approvals.approval_task_id - WHERE task_ticket_id = $ticket_id AND task_completed_at IS NULL AND approval_scope = 'client' AND approval_status = 'pending' + WHERE task_ticket_id = $ticket_id AND task_completed_at IS NULL AND approval_scope = 'client' AND approval_status = 'pending' "); ?> diff --git a/guest/guest_approve_ticket_task.php b/guest/guest_approve_ticket_task.php index 952bcc8a..f5ded027 100644 --- a/guest/guest_approve_ticket_task.php +++ b/guest/guest_approve_ticket_task.php @@ -3,7 +3,7 @@ require_once "includes/inc_all_guest.php"; //Initialize the HTML Purifier to prevent XSS -require "../plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require_once "../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 @@ -18,14 +18,14 @@ if (!isset($_GET['task_approval_id'], $_GET['url_key'])) { // Company info $company_sql_row = mysqli_fetch_array(mysqli_query($mysqli, " - SELECT + SELECT company_phone, company_phone_country_code, - company_website - FROM + company_website + FROM companies, settings - WHERE + WHERE companies.company_id = settings.company_id AND companies.company_id = 1" )); From b48168ffec5975fd5210b33f6255f62d954a0a30 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 12 Jan 2026 15:36:06 +0000 Subject: [PATCH 025/120] Rewrite kanban in more procedural code to match existing codebase (as a v2, delete old and rename once we're happy) --- admin/settings_ticket.php | 2 +- agent/ticket_kanban_v2.php | 176 +++++++++++++++++++++++++++++++++++++ agent/tickets.php | 7 +- 3 files changed, 182 insertions(+), 3 deletions(-) create mode 100644 agent/ticket_kanban_v2.php diff --git a/admin/settings_ticket.php b/admin/settings_ticket.php index 05e7fbba..f9736c1f 100644 --- a/admin/settings_ticket.php +++ b/admin/settings_ticket.php @@ -97,7 +97,7 @@ require_once "includes/inc_all_admin.php";
value="1" id="ticketOrderingSwitch"> - +
value="1" id="ticketMovingColumnsSwitch"> diff --git a/agent/ticket_kanban_v2.php b/agent/ticket_kanban_v2.php new file mode 100644 index 00000000..464ebec4 --- /dev/null +++ b/agent/ticket_kanban_v2.php @@ -0,0 +1,176 @@ + + + $status_id, + 'name' => $status_name, + 'order' => $kanban_order, + 'tickets' => array() + ); +} + +$ordering_snippet = "ORDER BY + CASE + WHEN ticket_priority = 'High' THEN 1 + WHEN ticket_priority = 'Medium' THEN 2 + WHEN ticket_priority = 'Low' THEN 3 + ELSE 4 + END, + ticket_id DESC"; + +if ($config_ticket_ordering == 1) { + $ordering_snippet = "ORDER BY ticket_order ASC"; +} + +// Fetch tickets +$sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM tickets + LEFT JOIN clients ON ticket_client_id = client_id + LEFT JOIN contacts ON ticket_contact_id = contact_id + LEFT JOIN users ON ticket_assigned_to = user_id + LEFT JOIN assets ON ticket_asset_id = asset_id + 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_query + $client_query + 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 + $ordering_snippet" +); + +while ($row = mysqli_fetch_assoc($sql)) { + + $status_id = $row['ticket_status_id']; + + foreach ($row as $key => $value) { + if (is_string($value)) { + $row[$key] = nullable_htmlentities($value); + } + } + + if (isset($statuses[$status_id])) { + $statuses[$status_id]['tickets'][] = $row; + } +} + +// Convert associative array to indexed array +$kanban = array_values($statuses); +?> + +
+ + + +
+
+ +
+ + + +
+ + + + + + + + + + + +
+ + + + + +
+ + +
+ + +
+ +
+ + + + + + +
+ + + +
+
+ + + +
+ +"; +echo "const CONFIG_TICKET_MOVING_COLUMNS = " . json_encode($config_ticket_moving_columns) . ";"; +echo "const CONFIG_TICKET_ORDERING = " . json_encode($config_ticket_ordering) . ";"; +echo ""; +?> + + + \ No newline at end of file diff --git a/agent/tickets.php b/agent/tickets.php index e4f4d28f..89fac035 100644 --- a/agent/tickets.php +++ b/agent/tickets.php @@ -235,8 +235,9 @@ $sql_categories_filter = mysqli_query(
List -
- Kanban +
+ Kanban + Kanban (v2)
@@ -391,6 +392,8 @@ if (isset($_GET["view"])) { require_once "ticket_list.php"; } elseif ($_GET["view"] == "kanban") { require_once "ticket_kanban.php"; + } elseif ($_GET["view"] == "kanbanv2") { + require_once "ticket_kanban_v2.php"; } } else { // here we have to get default view setting From 661f8db10bdb2908084bd1f7685cf66d1470cb70 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 12 Jan 2026 16:04:02 +0000 Subject: [PATCH 026/120] Tickets Kanban - Keep the selected view (kanban/list) when applying other filters - Allow filtering tickets by project (main and kanban v2) --- agent/ticket_kanban_v2.php | 1 + agent/tickets.php | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/agent/ticket_kanban_v2.php b/agent/ticket_kanban_v2.php index 464ebec4..93fba9be 100644 --- a/agent/ticket_kanban_v2.php +++ b/agent/ticket_kanban_v2.php @@ -63,6 +63,7 @@ $sql = mysqli_query( vendor_name LIKE '%$q%' OR ticket_vendor_ticket_number LIKE '%$q%' ) + $ticket_project_snippet $ticket_permission_snippet $ordering_snippet" ); diff --git a/agent/tickets.php b/agent/tickets.php index 89fac035..6667aac2 100644 --- a/agent/tickets.php +++ b/agent/tickets.php @@ -79,6 +79,16 @@ if (isset($_GET['assigned']) & !empty($_GET['assigned'])) { } } +// Project filter +// Default - any (including tickets without a project) +$ticket_project_snippet = ''; +$ticket_project_filter_id = ''; +if (isset($_GET['project']) & !empty($_GET['project']) && $_GET['project'] > '0') { + $ticket_project_snippet = 'AND ticket_project_id = ' . intval($_GET['project']); + $ticket_project_filter_id = intval($_GET['project']); + echo "got here"; +} + // Ticket client access snippet $ticket_permission_snippet = ''; if (!empty($client_access_string)) { @@ -102,6 +112,7 @@ $sql = mysqli_query( 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_billable_snippet + $ticket_project_snippet $ticket_permission_snippet $client_query ORDER BY @@ -190,6 +201,7 @@ $sql_categories_filter = mysqli_query( +
@@ -379,6 +391,28 @@ $sql_categories_filter = mysqli_query(
+
+
+ + +
+
From 208f7ac8f0138b90acc06ca1d214e1ba5c018d77 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 12 Jan 2026 16:11:36 +0000 Subject: [PATCH 027/120] Tickets Kanban - Keep the selected view (kanban/list) when applying other filters - Allow filtering tickets by project (main and kanban v2) --- agent/tickets.php | 1 - 1 file changed, 1 deletion(-) diff --git a/agent/tickets.php b/agent/tickets.php index 6667aac2..d77acb30 100644 --- a/agent/tickets.php +++ b/agent/tickets.php @@ -86,7 +86,6 @@ $ticket_project_filter_id = ''; if (isset($_GET['project']) & !empty($_GET['project']) && $_GET['project'] > '0') { $ticket_project_snippet = 'AND ticket_project_id = ' . intval($_GET['project']); $ticket_project_filter_id = intval($_GET['project']); - echo "got here"; } // Ticket client access snippet From 981f9ace047713434bf97198734a006b0a7317b8 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Mon, 12 Jan 2026 16:12:06 +0000 Subject: [PATCH 028/120] TinyMCE - add all options to mobile (we may regret this) --- js/app.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/js/app.js b/js/app.js index edae3f18..96fc95f4 100644 --- a/js/app.js +++ b/js/app.js @@ -201,7 +201,16 @@ $(document).ready(function() { ], mobile: { menubar: false, - toolbar: 'bold italic styles' + toolbar: [ + { name: 'styles', items: ['styles'] }, + { name: 'formatting', items: ['bold', 'italic', 'forecolor'] }, + { name: 'link', items: ['link'] }, + { name: 'lists', items: ['bullist', 'numlist'] }, + { name: 'indentation', items: ['outdent', 'indent'] }, + { name: 'ai', items: ['reword', 'undo', 'redo'] }, + { name: 'custom', items: ['redactButton'] }, + { name: 'code', items: ['code'] }, + ], }, convert_urls: false, plugins: 'link image lists table code codesample fullscreen autoresize code', From 78040573d1599b512f094c71eb2ee5e34233d9d0 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 12 Jan 2026 12:27:44 -0500 Subject: [PATCH 029/120] Fix Remove Powered by ITFlow on Login Screen when WhiteLabel is enabled --- login.php | 1 + 1 file changed, 1 insertion(+) diff --git a/login.php b/login.php index 039faa0d..53bee525 100644 --- a/login.php +++ b/login.php @@ -83,6 +83,7 @@ $config_mail_from_name = sanitizeInput($row['config_mail_from_name']); $config_client_portal_enable = intval($row['config_client_portal_enable']); $config_login_remember_me_expire = intval($row['config_login_remember_me_expire']); +$config_whitelabel_enabled = intval($row['config_whitelabel_enabled']); $config_login_key_required = $row['config_login_key_required']; $config_login_key_secret = $row['config_login_key_secret']; From e02a6fc5e6572c725d6bfeb2cb0566f37cee6fda Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 12 Jan 2026 12:30:12 -0500 Subject: [PATCH 030/120] Use mysqli_fetch_assoc in login --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index 53bee525..125fd491 100644 --- a/login.php +++ b/login.php @@ -66,7 +66,7 @@ $sql_settings = mysqli_query($mysqli, " LEFT JOIN companies ON settings.company_id = companies.company_id WHERE settings.company_id = 1 "); -$row = mysqli_fetch_array($sql_settings); +$row = mysqli_fetch_assoc($sql_settings); $company_name = $row['company_name']; $company_logo = $row['company_logo']; From c154113474f5c328a940939a4991834dd8b96d34 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 12 Jan 2026 15:18:22 -0500 Subject: [PATCH 031/120] Do not add Signature on ticket comment if Public only when reply is emailed --- agent/post/ticket.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/post/ticket.php b/agent/post/ticket.php index 48d6b0d7..f0b63526 100644 --- a/agent/post/ticket.php +++ b/agent/post/ticket.php @@ -1591,7 +1591,7 @@ if (isset($_POST['add_ticket_reply'])) { $ticket_reply_type = 'Internal'; } // Add Signature to the end of the ticket reply if not Internal and if there is reply - if ($ticket_reply !== '' && $ticket_reply_type !== 'Internal') { + if ($ticket_reply !== '' && $ticket_reply_type !== 'Internal' && $send_email == 1) { $ticket_reply .= getFieldById('user_settings',$session_user_id,'user_config_signature', 'raw'); } From 1d3f29d3854db46be251da6b5ad0c8acaf021fd9 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 12 Jan 2026 18:11:41 -0500 Subject: [PATCH 032/120] added edit Payment --- agent/modals/payment/payment_edit.php | 146 ++++++++++++++++++++++++++ agent/payments.php | 25 +++-- agent/post/payment.php | 22 ++++ 3 files changed, 184 insertions(+), 9 deletions(-) create mode 100644 agent/modals/payment/payment_edit.php diff --git a/agent/modals/payment/payment_edit.php b/agent/modals/payment/payment_edit.php new file mode 100644 index 00000000..d5a64e82 --- /dev/null +++ b/agent/modals/payment/payment_edit.php @@ -0,0 +1,146 @@ + + +
+
Edit Payment
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ + + diff --git a/agent/post/payment.php b/agent/post/payment.php index 5ed3573a..ed12bf19 100644 --- a/agent/post/payment.php +++ b/agent/post/payment.php @@ -171,6 +171,28 @@ if (isset($_POST['add_payment'])) { } +if (isset($_POST['edit_payment'])) { + + enforceUserPermission('module_sales', 2); + enforceUserPermission('module_financial', 2); + + $payment_id = intval($_POST['payment_id']); + $date = sanitizeInput($_POST['date']); + $amount = floatval($_POST['amount']); + $account = intval($_POST['account']); + $payment_method = sanitizeInput($_POST['payment_method']); + $reference = sanitizeInput($_POST['reference']); + + mysqli_query($mysqli,"UPDATE payments SET payment_date = '$date', payment_amount = $amount, payment_account_id = $account, payment_method = '$payment_method', payment_reference = '$reference' WHERE payment_id = $payment_id"); + + logAction("Payment", "Edit", "Payment edited amount of " . numfmt_format_currency($currency_format, $amount, $session_company_currency)); + + flash_alert("Payment edited to amount " . numfmt_format_currency($currency_format, $amount, $session_company_currency) . " added"); + + redirect(); + +} + /* Apply Credit Not ready for use 2025-08-27 - JQ From cb8b99d6ae5515f0311e2902202eafb573cc1d04 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 12 Jan 2026 18:12:20 -0500 Subject: [PATCH 033/120] up the permissions to added edit Payment --- agent/post/payment.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/post/payment.php b/agent/post/payment.php index ed12bf19..c20e99ee 100644 --- a/agent/post/payment.php +++ b/agent/post/payment.php @@ -173,8 +173,8 @@ if (isset($_POST['add_payment'])) { if (isset($_POST['edit_payment'])) { - enforceUserPermission('module_sales', 2); - enforceUserPermission('module_financial', 2); + enforceUserPermission('module_sales', 3); + enforceUserPermission('module_financial', 3); $payment_id = intval($_POST['payment_id']); $date = sanitizeInput($_POST['date']); From 0a30300bde226a39818998b8ddba5dd28c4f0fc3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 14 Jan 2026 17:30:23 -0500 Subject: [PATCH 034/120] replace all instances of mysqli_fetch_array with mysqli_fetch_assoc for better performance and memory usage --- admin/ai_model.php | 2 +- admin/ai_provider.php | 2 +- admin/api_keys.php | 3 +- admin/app_log.php | 6 +- admin/audit_log.php | 13 +- admin/category.php | 2 +- admin/contract_template.php | 2 +- admin/custom_link.php | 2 +- admin/database_updates.php | 42 +++--- admin/document_template.php | 2 +- admin/document_template_details.php | 2 +- admin/includes/side_nav.php | 2 +- admin/mail_queue.php | 2 +- admin/modals/ai/ai_model_add.php | 2 +- admin/modals/ai/ai_model_edit.php | 4 +- admin/modals/ai/ai_provider_edit.php | 2 +- admin/modals/api/api_key_add.php | 2 +- admin/modals/category/category_edit.php | 2 +- .../contract_template_edit.php | 2 +- admin/modals/custom_link/custom_link_edit.php | 6 +- .../document_template_edit.php | 2 +- .../mail_queue/mail_queue_message_view.php | 2 +- .../payment_method/payment_method_edit.php | 2 +- .../payment_provider/payment_provider_add.php | 6 +- .../payment_provider_edit.php | 8 +- .../project_template_edit.php | 4 +- .../project_template_ticket_template_add.php | 2 +- admin/modals/role/role_edit.php | 6 +- .../software_template_edit.php | 2 +- admin/modals/tag/tag_edit.php | 2 +- admin/modals/tax/tax_edit.php | 2 +- .../ticket_status/ticket_status_edit.php | 2 +- .../ticket_template/ticket_template_add.php | 2 +- .../ticket_template_task_edit.php | 6 +- admin/modals/user/user_add.php | 4 +- admin/modals/user/user_archive.php | 4 +- admin/modals/user/user_edit.php | 8 +- admin/modals/user/user_restore.php | 4 +- .../vendor_template/vendor_template_edit.php | 4 +- admin/modules.php | 2 +- admin/payment_method.php | 2 +- admin/payment_provider.php | 2 +- admin/post/api_keys.php | 6 +- admin/post/backup.php | 9 +- admin/post/category.php | 12 +- admin/post/custom_link.php | 4 +- admin/post/saved_payment_method.php | 10 +- admin/post/settings_company.php | 4 +- .../post/settings_online_payment_clients.php | 14 +- admin/post/software_template.php | 2 +- admin/post/update.php | 2 +- admin/post/users.php | 12 +- admin/project_template.php | 4 +- admin/project_template_details.php | 6 +- admin/roles.php | 2 +- admin/saved_payment_method.php | 2 +- admin/settings_company.php | 2 +- admin/settings_custom_fields.php | 5 +- admin/settings_default.php | 14 +- admin/settings_localization.php | 3 +- admin/software_template.php | 4 +- admin/tag.php | 2 +- admin/tax.php | 2 +- admin/ticket_status.php | 4 +- admin/ticket_template.php | 6 +- admin/ticket_template_details.php | 4 +- admin/users.php | 4 +- admin/vendor_template.php | 2 +- agent/accounts.php | 8 +- agent/ajax.php | 42 +++--- agent/asset_details.php | 26 ++-- agent/assets.php | 10 +- agent/calendar.php | 30 ++--- agent/certificates.php | 4 +- agent/client_autopay.php | 4 +- agent/client_overview.php | 36 +++--- agent/contact_details.php | 30 ++--- agent/contacts.php | 10 +- agent/credentials.php | 12 +- agent/dashboard.php | 84 ++++++------ agent/document_details.php | 16 +-- agent/domains.php | 4 +- agent/expenses.php | 8 +- agent/files_legacy.php | 8 +- agent/global_search.php | 30 ++--- agent/includes/inc_all_client.php | 14 +- agent/includes/side_nav.php | 6 +- agent/invoice.php | 20 +-- agent/invoices.php | 18 +-- agent/locations.php | 8 +- agent/modals/account/account_edit.php | 6 +- agent/modals/asset/asset_add.php | 18 +-- agent/modals/asset/asset_bulk_add_ticket.php | 6 +- .../asset/asset_bulk_assign_contact.php | 2 +- .../asset/asset_bulk_assign_location.php | 2 +- agent/modals/asset/asset_bulk_assign_tags.php | 2 +- .../asset/asset_bulk_transfer_client.php | 2 +- agent/modals/asset/asset_copy.php | 14 +- agent/modals/asset/asset_details.php | 58 ++++----- agent/modals/asset/asset_documents.php | 2 +- agent/modals/asset/asset_edit.php | 22 ++-- agent/modals/asset/asset_interface_add.php | 4 +- .../asset_interface_bulk_edit_network.php | 2 +- agent/modals/asset/asset_interface_edit.php | 70 +++++----- .../asset/asset_interface_multiple_add.php | 2 +- agent/modals/asset/asset_link_credential.php | 4 +- agent/modals/asset/asset_link_document.php | 4 +- agent/modals/asset/asset_link_file.php | 4 +- agent/modals/asset/asset_link_service.php | 4 +- agent/modals/asset/asset_link_software.php | 6 +- agent/modals/calendar/calendar_edit.php | 4 +- agent/modals/calendar/calendar_event_add.php | 4 +- agent/modals/calendar/calendar_event_edit.php | 8 +- agent/modals/certificate/certificate_add.php | 8 +- agent/modals/certificate/certificate_edit.php | 6 +- agent/modals/contact/contact_add.php | 12 +- .../contact/contact_bulk_assign_location.php | 2 +- .../contact/contact_bulk_assign_tags.php | 2 +- agent/modals/contact/contact_details.php | 50 +++---- agent/modals/contact/contact_edit.php | 11 +- agent/modals/contact/contact_link_asset.php | 4 +- .../contact/contact_link_credential.php | 4 +- .../modals/contact/contact_link_document.php | 4 +- agent/modals/contact/contact_link_file.php | 4 +- agent/modals/contact/contact_link_service.php | 4 +- .../modals/contact/contact_link_software.php | 4 +- agent/modals/contact/contact_note_add.php | 2 +- agent/modals/credential/credential_add.php | 10 +- .../credential_bulk_assign_tags.php | 2 +- agent/modals/credential/credential_edit.php | 10 +- agent/modals/credential/credential_view.php | 4 +- .../document/document_add_file_relation.php | 4 +- .../document/document_add_from_template.php | 4 +- agent/modals/document/document_edit.php | 4 +- .../document/document_edit_visibility.php | 2 +- agent/modals/document/document_link_asset.php | 4 +- .../modals/document/document_link_contact.php | 4 +- agent/modals/document/document_link_file.php | 4 +- .../document/document_link_software.php | 4 +- .../modals/document/document_link_vendor.php | 4 +- agent/modals/document/document_move.php | 4 +- agent/modals/document/document_rename.php | 4 +- .../modals/document/document_version_view.php | 4 +- agent/modals/document/document_view.php | 4 +- agent/modals/domain/domain_add.php | 14 +- agent/modals/domain/domain_edit.php | 24 ++-- agent/modals/expense/expense_add.php | 14 +- .../expense/expense_bulk_edit_account.php | 8 +- .../expense/expense_bulk_edit_category.php | 2 +- .../expense/expense_bulk_edit_client.php | 2 +- agent/modals/expense/expense_copy.php | 16 +-- agent/modals/expense/expense_edit.php | 16 +-- agent/modals/expense/expense_export.php | 6 +- agent/modals/expense/expense_refund.php | 2 +- agent/modals/file/file_link_asset.php | 6 +- agent/modals/file/file_move.php | 4 +- agent/modals/file/file_rename.php | 2 +- agent/modals/folder/folder_rename.php | 4 +- agent/modals/invoice/invoice_add.php | 4 +- agent/modals/invoice/invoice_add_ticket.php | 5 +- .../invoice/invoice_bulk_edit_category.php | 2 +- agent/modals/invoice/invoice_copy.php | 6 +- agent/modals/invoice/invoice_edit.php | 4 +- .../modals/invoice/invoice_recurring_add.php | 2 +- agent/modals/invoice/item_edit.php | 4 +- agent/modals/location/location_add.php | 14 +- .../location/location_bulk_assign_tags.php | 2 +- agent/modals/location/location_edit.php | 10 +- agent/modals/network/network_add.php | 6 +- agent/modals/network/network_edit.php | 8 +- agent/modals/payment/invoice_apply_credit.php | 4 +- agent/modals/payment/payment_add.php | 14 +- agent/modals/payment/payment_bulk_add.php | 16 +-- agent/modals/payment/payment_edit.php | 8 +- .../payment/payment_saved_method_add.php | 4 +- agent/modals/product/product_add.php | 4 +- .../product/product_bulk_edit_category.php | 2 +- agent/modals/product/product_edit.php | 6 +- agent/modals/product/product_stock_add.php | 8 +- agent/modals/project/project_add.php | 6 +- agent/modals/project/project_edit.php | 6 +- .../project/project_link_closed_ticket.php | 4 +- agent/modals/project/project_link_ticket.php | 4 +- agent/modals/quote/quote_add.php | 4 +- agent/modals/quote/quote_copy.php | 4 +- agent/modals/quote/quote_edit.php | 4 +- agent/modals/quote/quote_to_invoice.php | 2 +- agent/modals/rack/rack_add.php | 2 +- agent/modals/rack/rack_device_add.php | 4 +- agent/modals/rack/rack_edit.php | 4 +- .../recurring_expense_add.php | 14 +- .../recurring_expense_edit.php | 16 +-- .../recurring_invoice_add.php | 4 +- .../recurring_invoice_edit.php | 4 +- .../recurring_ticket/recurring_ticket_add.php | 46 +++---- .../recurring_ticket_bulk_agent_edit.php | 2 +- .../recurring_ticket_bulk_category_edit.php | 2 +- .../recurring_ticket_edit.php | 20 +-- agent/modals/revenue/revenue_add.php | 12 +- agent/modals/revenue/revenue_edit.php | 14 +- agent/modals/service/service_add.php | 22 ++-- agent/modals/service/service_details.php | 27 ++-- agent/modals/service/service_edit.php | 16 +-- agent/modals/share_modal.php | 5 +- agent/modals/software/software_add.php | 8 +- .../software/software_add_from_template.php | 4 +- agent/modals/software/software_edit.php | 14 +- agent/modals/ticket/ticket_add.php | 22 ++-- agent/modals/ticket/ticket_add_v2.php | 8 +- agent/modals/ticket/ticket_add_watcher.php | 2 +- agent/modals/ticket/ticket_assign.php | 4 +- agent/modals/ticket/ticket_billable.php | 2 +- .../modals/ticket/ticket_bulk_add_project.php | 2 +- agent/modals/ticket/ticket_bulk_assign.php | 2 +- .../ticket/ticket_bulk_edit_category.php | 2 +- agent/modals/ticket/ticket_bulk_reply.php | 2 +- agent/modals/ticket/ticket_change_client.php | 4 +- agent/modals/ticket/ticket_contact.php | 6 +- agent/modals/ticket/ticket_edit.php | 28 ++-- agent/modals/ticket/ticket_edit_asset.php | 10 +- agent/modals/ticket/ticket_edit_project.php | 6 +- agent/modals/ticket/ticket_edit_schedule.php | 2 +- agent/modals/ticket/ticket_edit_vendor.php | 4 +- agent/modals/ticket/ticket_invoice_add.php | 10 +- agent/modals/ticket/ticket_merge.php | 2 +- agent/modals/ticket/ticket_priority.php | 4 +- agent/modals/ticket/ticket_reply_edit.php | 2 +- agent/modals/ticket/ticket_reply_redact.php | 2 +- .../ticket/ticket_task_approver_add.php | 2 +- agent/modals/ticket/ticket_task_edit.php | 4 +- agent/modals/transfer/transfer_add.php | 20 +-- agent/modals/transfer/transfer_edit.php | 20 +-- agent/modals/trip/trip_add.php | 6 +- agent/modals/trip/trip_copy.php | 8 +- agent/modals/trip/trip_edit.php | 8 +- .../vendor/vendor_add_from_template.php | 2 +- agent/modals/vendor/vendor_details.php | 4 +- agent/modals/vendor/vendor_edit.php | 4 +- agent/networks.php | 6 +- agent/notifications.php | 10 +- agent/payments.php | 6 +- agent/post/asset.php | 76 +++++------ agent/post/certificate.php | 8 +- agent/post/client.php | 64 ++++----- agent/post/contact.php | 66 +++++----- agent/post/credential.php | 14 +- agent/post/document.php | 42 +++--- agent/post/domain.php | 12 +- agent/post/event.php | 12 +- agent/post/expense.php | 16 +-- agent/post/file.php | 26 ++-- agent/post/folder.php | 6 +- agent/post/invoice.php | 70 +++++----- agent/post/location.php | 16 +-- agent/post/network.php | 8 +- agent/post/payment.php | 40 +++--- agent/post/project.php | 20 +-- agent/post/quote.php | 48 +++---- agent/post/rack.php | 12 +- agent/post/recurring_expense.php | 2 +- agent/post/recurring_invoice.php | 46 +++---- agent/post/recurring_ticket.php | 22 ++-- agent/post/service.php | 16 +-- agent/post/software.php | 10 +- agent/post/task.php | 22 ++-- agent/post/ticket.php | 122 +++++++++--------- agent/post/transfer.php | 6 +- agent/post/vendor.php | 14 +- agent/post/vendor_contact.php | 28 ++-- agent/products.php | 4 +- agent/project_details.php | 26 ++-- agent/projects.php | 2 +- agent/quote.php | 16 +-- agent/quotes.php | 2 +- agent/racks.php | 36 +++--- agent/recurring_expenses.php | 2 +- agent/recurring_invoice.php | 16 +-- agent/recurring_invoices.php | 4 +- agent/recurring_tickets.php | 6 +- agent/reports/budget.php | 6 +- agent/reports/clients_with_balance.php | 27 ++-- agent/reports/credential_rotation.php | 3 +- agent/reports/expense_by_vendor.php | 22 ++-- agent/reports/expense_summary.php | 10 +- agent/reports/includes/reports_side_nav.php | 4 +- agent/reports/income_by_client.php | 11 +- agent/reports/income_summary.php | 18 +-- agent/reports/profit_loss.php | 55 ++++---- agent/reports/recurring_by_client.php | 2 +- agent/reports/tax_summary.php | 7 +- agent/reports/ticket_by_client.php | 39 +++--- agent/reports/ticket_summary.php | 6 +- agent/reports/tickets_unbilled.php | 11 +- agent/reports/time_by_tech.php | 33 +++-- agent/revenues.php | 2 +- agent/services.php | 10 +- agent/software.php | 8 +- agent/ticket.php | 44 +++---- agent/ticket_kanban.php | 20 +-- agent/ticket_list.php | 4 +- agent/tickets.php | 16 +-- agent/transfers.php | 12 +- agent/trips.php | 2 +- agent/user/mfa_enforcement.php | 14 +- agent/user/user_activity.php | 4 +- agent/user/user_preferences.php | 2 +- agent/user/user_security.php | 4 +- agent/vendor_details.php | 8 +- agent/vendors.php | 2 +- api/v1/clients/archive.php | 4 +- api/v1/credentials/read.php | 2 +- api/v1/read_output.php | 2 +- api/v1/tickets/create.php | 4 +- api/v1/validate_api_key.php | 2 +- client/assets.php | 2 +- client/certificates.php | 2 +- client/contact_edit.php | 2 +- client/contacts.php | 2 +- client/document.php | 10 +- client/documents.php | 4 +- client/domains.php | 2 +- client/functions.php | 8 +- client/includes/check_login.php | 6 +- client/includes/header.php | 2 +- client/index.php | 12 +- client/invoices.php | 3 +- client/login_microsoft.php | 4 +- client/login_reset.php | 6 +- client/post.php | 44 +++---- client/quotes.php | 2 +- client/recurring_invoices.php | 10 +- client/saved_payment_methods.php | 10 +- client/ticket.php | 12 +- client/ticket_add.php | 5 +- client/ticket_view_all.php | 3 +- client/tickets.php | 8 +- client/unpaid_invoices.php | 25 ++-- cron/certificate_refresher.php | 4 +- cron/cron.php | 40 +++--- cron/domain_refresher.php | 4 +- cron/mail_queue.php | 6 +- cron/ticket_email_parser.php | 16 +-- functions.php | 8 +- guest/guest_ajax.php | 6 +- guest/guest_approve_ticket_task.php | 3 +- guest/guest_download_file.php | 4 +- guest/guest_pay_invoice_stripe.php | 18 +-- guest/guest_post.php | 88 ++++++------- guest/guest_view_invoice.php | 28 ++-- guest/guest_view_item.php | 10 +- guest/guest_view_quote.php | 6 +- guest/guest_view_ticket.php | 14 +- guest/includes/inc_all_guest.php | 2 +- includes/inc_set_timezone.php | 2 +- includes/load_company_settings.php | 2 +- includes/load_global_settings.php | 2 +- includes/load_user_session.php | 2 +- includes/top_nav.php | 2 +- post/misc.php | 4 +- scripts/setup_cli.php | 2 +- setup/index.php | 4 +- 361 files changed, 1880 insertions(+), 1904 deletions(-) diff --git a/admin/ai_model.php b/admin/ai_model.php index 88c3b78b..2eab6bda 100644 --- a/admin/ai_model.php +++ b/admin/ai_model.php @@ -58,7 +58,7 @@ $num_rows = mysqli_num_rows($sql); @@ -85,7 +85,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -141,7 +141,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - +
CURRENT_DATABASE_VERSION) { // Copy primary_location and primary_contact to their new vars in their own respecting tables $sql = mysqli_query($mysqli, "SELECT * FROM clients"); - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $primary_contact = $row['primary_contact']; $primary_location = $row['primary_location']; @@ -1666,7 +1666,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '1.3.9') { // Migrate all Network Info from Assets to Interface Table and make it primary interface $sql = mysqli_query($mysqli, "SELECT * FROM assets"); - while ($row = mysqli_fetch_array($sql)) { + while ($row = mysqli_fetch_assoc($sql)) { $asset_id = intval($row['asset_id']); $mac = sanitizeInput($row['asset_mac']); $ip = sanitizeInput($row['asset_ip']); @@ -1945,7 +1945,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '1.5.7') { // Create Users for contacts that have logins enabled and that are not archived $contacts_sql = mysqli_query($mysqli, "SELECT * FROM `contacts` WHERE contact_archived_at IS NULL AND (contact_auth_method = 'local' OR contact_auth_method = 'azure')"); - while($row = mysqli_fetch_array($contacts_sql)) { + while($row = mysqli_fetch_assoc($contacts_sql)) { $contact_id = intval($row['contact_id']); $contact_name = mysqli_real_escape_string($mysqli, $row['contact_name']); $contact_email = mysqli_real_escape_string($mysqli, $row['contact_email']); @@ -2325,7 +2325,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { `interface_link_status` VARCHAR(50) NULL, `interface_link_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, `interface_link_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, - + CONSTRAINT `fk_interface_a` FOREIGN KEY (`interface_a_id`) REFERENCES `asset_interfaces` (`interface_id`) @@ -3701,8 +3701,8 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { `ai_model_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, `ai_model_ai_provider_id` INT(11) NOT NULL, PRIMARY KEY (`ai_model_id`), - FOREIGN KEY (`ai_model_ai_provider_id`) - REFERENCES `ai_providers`(`ai_provider_id`) + FOREIGN KEY (`ai_model_ai_provider_id`) + REFERENCES `ai_providers`(`ai_provider_id`) ON DELETE CASCADE ) "); @@ -3769,7 +3769,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { } if (CURRENT_DATABASE_VERSION == '2.2.3') { - + mysqli_query($mysqli, "CREATE TABLE `credits` ( `credit_id` INT(11) NOT NULL AUTO_INCREMENT, `credit_amount` DECIMAL(15,2) NOT NULL, @@ -3817,19 +3817,19 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "ALTER TABLE `credits` ADD INDEX (`credit_client_id`)"); mysqli_query($mysqli, "ALTER TABLE `credits` ADD INDEX (`credit_invoice_id`)"); mysqli_query($mysqli, "ALTER TABLE `credits` ADD INDEX (`credit_created_at`)"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.7'"); } if (CURRENT_DATABASE_VERSION == '2.2.7') { mysqli_query($mysqli, "ALTER TABLE `user_settings` ADD `user_config_theme_dark` TINYINT(1) NOT NULL DEFAULT 0 AFTER `user_config_signature`"); mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_theme_dark`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.8'"); } if (CURRENT_DATABASE_VERSION == '2.2.8') { - + mysqli_query($mysqli, "ALTER TABLE `products` ADD `product_type` ENUM('service', 'product') NOT NULL DEFAULT 'service' AFTER `product_name`"); mysqli_query($mysqli, "ALTER TABLE `products` ADD `product_code` VARCHAR(200) DEFAULT NULL AFTER `product_description`"); mysqli_query($mysqli, "ALTER TABLE `products` ADD `product_location` VARCHAR(250) DEFAULT NULL AFTER `product_code`"); @@ -3844,7 +3844,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { `stock_product_id` INT(11) NOT NULL, PRIMARY KEY (`stock_id`) )"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.9'"); } @@ -3853,7 +3853,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { // Get Current Stripe Settings $sql_stripe_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1"); - $row = mysqli_fetch_array($sql_stripe_settings); + $row = mysqli_fetch_assoc($sql_stripe_settings); $config_stripe_enable = intval($row['config_stripe_enable']); if ($config_stripe_enable === 1) { $config_stripe_publishable = mysqli_real_escape_string($mysqli, $row['config_stripe_publishable']); @@ -3879,7 +3879,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { // Migrate Clients and Payment Method over $sql_stripe_clients = mysqli_query($mysqli, "SELECT * FROM client_stripe WHERE stripe_pm IS NOT NULL AND stripe_pm != ''"); - while ($row = mysqli_fetch_array($sql_stripe_clients)) { + while ($row = mysqli_fetch_assoc($sql_stripe_clients)) { $client_id = intval($row['client_id']); $stripe_id = mysqli_real_escape_string($mysqli, $row['stripe_id']); $stripe_pm = mysqli_real_escape_string($mysqli, $row['stripe_pm']); @@ -3931,13 +3931,13 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '2.3.0') { // Migrate Payment Methods from Categories Table to new payment_methods table $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_name != 'Stripe' AND category_archived_at IS NULL"); - - while ($row = mysqli_fetch_array($sql_categories)) { + + while ($row = mysqli_fetch_assoc($sql_categories)) { $category_name = sanitizeInput($row['category_name']); mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = '$category_name'"); } - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.1'"); } @@ -3971,7 +3971,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '2.3.2') { - mysqli_query($mysqli, "ALTER TABLE settings + mysqli_query($mysqli, "ALTER TABLE settings ADD `config_imap_provider` ENUM('standard_imap','google_oauth','microsoft_oauth') NULL DEFAULT NULL AFTER `config_mail_from_name`, ADD `config_mail_oauth_client_id` VARCHAR(255) NULL AFTER `config_imap_provider`, ADD `config_mail_oauth_client_secret` VARCHAR(255) NULL AFTER `config_mail_oauth_client_id`, @@ -3986,7 +3986,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '2.3.3') { - mysqli_query($mysqli, "ALTER TABLE settings + mysqli_query($mysqli, "ALTER TABLE settings ADD `config_smtp_provider` ENUM('standard_smtp','google_oauth','microsoft_oauth') NULL DEFAULT NULL AFTER `config_start_page` "); @@ -4026,7 +4026,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.5'"); } - + if (CURRENT_DATABASE_VERSION == '2.3.5') { mysqli_query($mysqli, "ALTER TABLE `settings` CHANGE `config_smtp_provider` `config_smtp_provider` VARCHAR(200) DEFAULT NULL"); mysqli_query($mysqli, "ALTER TABLE `settings` CHANGE `config_imap_provider` `config_imap_provider` VARCHAR(200) DEFAULT NULL"); @@ -4109,7 +4109,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { FOREIGN KEY (`contract_client_id`) REFERENCES `clients`(`client_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.7'"); } @@ -4130,7 +4130,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; "); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.8'"); } diff --git a/admin/document_template.php b/admin/document_template.php index afb6c811..4e867642 100644 --- a/admin/document_template.php +++ b/admin/document_template.php @@ -66,7 +66,7 @@ - Select an AI Provider -- Select an AI Provider - ALL CLIENTS diff --git a/admin/modals/category/category_edit.php b/admin/modals/category/category_edit.php index 334af48a..6d7ebdb6 100644 --- a/admin/modals/category/category_edit.php +++ b/admin/modals/category/category_edit.php @@ -6,7 +6,7 @@ $category_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_id = $category_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $category_name = nullable_htmlentities($row['category_name']); $category_color = nullable_htmlentities($row['category_color']); $category_type = nullable_htmlentities($row['category_type']); diff --git a/admin/modals/contract_template/contract_template_edit.php b/admin/modals/contract_template/contract_template_edit.php index 2ce93048..fdc10ca5 100644 --- a/admin/modals/contract_template/contract_template_edit.php +++ b/admin/modals/contract_template/contract_template_edit.php @@ -8,7 +8,7 @@ $update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', ' // Fetch existing template $sql = mysqli_query($mysqli, "SELECT * FROM contract_templates WHERE contract_template_id = $contract_template_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); // Assign locals $name = nullable_htmlentities($row['contract_template_name']); diff --git a/admin/modals/custom_link/custom_link_edit.php b/admin/modals/custom_link/custom_link_edit.php index fdca1141..6810797f 100644 --- a/admin/modals/custom_link/custom_link_edit.php +++ b/admin/modals/custom_link/custom_link_edit.php @@ -5,7 +5,7 @@ require_once '../../../includes/modal_header.php'; $custom_link_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM custom_links WHERE custom_link_id = $custom_link_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $custom_link_name = nullable_htmlentities($row['custom_link_name']); $custom_link_uri = nullable_htmlentities($row['custom_link_uri']); $custom_link_icon = nullable_htmlentities($row['custom_link_icon']); @@ -24,9 +24,9 @@ ob_start(); - + - +
diff --git a/admin/modals/document_template/document_template_edit.php b/admin/modals/document_template/document_template_edit.php index e5533b17..33083804 100644 --- a/admin/modals/document_template/document_template_edit.php +++ b/admin/modals/document_template/document_template_edit.php @@ -5,7 +5,7 @@ require_once '../../../includes/modal_header.php'; $document_template_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM document_templates WHERE document_template_id = $document_template_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $document_template_name = nullable_htmlentities($row['document_template_name']); $document_template_description = nullable_htmlentities($row['document_template_description']); $document_template_content = nullable_htmlentities($row['document_template_content']); diff --git a/admin/modals/mail_queue/mail_queue_message_view.php b/admin/modals/mail_queue/mail_queue_message_view.php index e30bf116..5a5ce9a0 100644 --- a/admin/modals/mail_queue/mail_queue_message_view.php +++ b/admin/modals/mail_queue/mail_queue_message_view.php @@ -17,7 +17,7 @@ $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'htt $purifier = new HTMLPurifier($purifier_config); $sql = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_id = $email_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $email_from = nullable_htmlentities($row['email_from']); $email_from_name = nullable_htmlentities($row['email_from_name']); diff --git a/admin/modals/payment_method/payment_method_edit.php b/admin/modals/payment_method/payment_method_edit.php index c063640a..5c9a82fe 100644 --- a/admin/modals/payment_method/payment_method_edit.php +++ b/admin/modals/payment_method/payment_method_edit.php @@ -6,7 +6,7 @@ $payment_method_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM payment_methods WHERE payment_method_id = $payment_method_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $payment_method_id = intval($row['payment_method_id']); $payment_method_name = nullable_htmlentities($row['payment_method_name']); $payment_method_description = nullable_htmlentities($row['payment_method_description']); diff --git a/admin/modals/payment_provider/payment_provider_add.php b/admin/modals/payment_provider/payment_provider_add.php index 7bf1f028..d8d48786 100644 --- a/admin/modals/payment_provider/payment_provider_add.php +++ b/admin/modals/payment_provider/payment_provider_add.php @@ -79,7 +79,7 @@ ob_start(); @@ -125,7 +125,7 @@ ob_start(); @@ -149,7 +149,7 @@ ob_start(); diff --git a/admin/modals/payment_provider/payment_provider_edit.php b/admin/modals/payment_provider/payment_provider_edit.php index 4c55b3bb..d3667b08 100644 --- a/admin/modals/payment_provider/payment_provider_edit.php +++ b/admin/modals/payment_provider/payment_provider_edit.php @@ -6,7 +6,7 @@ $provider_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM payment_providers WHERE payment_provider_id = $provider_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $provider_name = nullable_htmlentities($row['payment_provider_name']); $public_key = nullable_htmlentities($row['payment_provider_public_key']); $private_key = nullable_htmlentities($row['payment_provider_private_key']); @@ -78,7 +78,7 @@ ob_start(); @@ -117,7 +117,7 @@ ob_start(); @@ -143,7 +143,7 @@ ob_start(); diff --git a/admin/modals/project_template/project_template_edit.php b/admin/modals/project_template/project_template_edit.php index 725494c5..37b03df7 100644 --- a/admin/modals/project_template/project_template_edit.php +++ b/admin/modals/project_template/project_template_edit.php @@ -5,7 +5,7 @@ require_once '../../../includes/modal_header.php'; $project_template_id = intval($_GET['project_template_id']); $sql = mysqli_query($mysqli, "SELECT * FROM project_templates WHERE project_template_id = $project_template_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $project_template_name = nullable_htmlentities($row['project_template_name']); $project_template_description = nullable_htmlentities($row['project_template_description']); @@ -44,7 +44,7 @@ ob_start();
- +
diff --git a/admin/modals/project_template/project_template_ticket_template_add.php b/admin/modals/project_template/project_template_ticket_template_add.php index a67997dd..e1a251ed 100644 --- a/admin/modals/project_template/project_template_ticket_template_add.php +++ b/admin/modals/project_template/project_template_ticket_template_add.php @@ -36,7 +36,7 @@ ob_start(); AND ticket_template_archived_at IS NULL ORDER BY ticket_template_name ASC" ); - while ($row = mysqli_fetch_array($sql_ticket_templates_select)) { + while ($row = mysqli_fetch_assoc($sql_ticket_templates_select)) { $ticket_template_id_select = intval($row['ticket_template_id']); $ticket_template_name_select = nullable_htmlentities($row['ticket_template_name']); ?> diff --git a/admin/modals/role/role_edit.php b/admin/modals/role/role_edit.php index 60272256..5b114f00 100644 --- a/admin/modals/role/role_edit.php +++ b/admin/modals/role/role_edit.php @@ -6,7 +6,7 @@ $role_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE role_id = $role_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $role_name = nullable_htmlentities($row['role_name']); $role_description = nullable_htmlentities($row['role_description']); $role_admin = intval($row['role_is_admin']); @@ -108,14 +108,14 @@ ob_start(); // Enumerate modules $sql_modules = mysqli_query($mysqli, "SELECT * FROM modules"); - while ($row_modules = mysqli_fetch_array($sql_modules)) { + while ($row_modules = mysqli_fetch_assoc($sql_modules)) { $module_id = intval($row_modules['module_id']); $module_name = nullable_htmlentities($row_modules['module_name']); $module_name_display = ucfirst(str_replace("module_","",$module_name)); $module_description = nullable_htmlentities($row_modules['module_description']); // Get permission level for module - $module_permission_row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT user_role_permission_level FROM user_role_permissions WHERE module_id = $module_id AND user_role_id = $role_id LIMIT 1")); + $module_permission_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT user_role_permission_level FROM user_role_permissions WHERE module_id = $module_id AND user_role_id = $role_id LIMIT 1")); $module_permission = 0; if ($module_permission_row) { $module_permission = $module_permission_row['user_role_permission_level']; diff --git a/admin/modals/software_template/software_template_edit.php b/admin/modals/software_template/software_template_edit.php index ca7ff07a..5d4ff75d 100644 --- a/admin/modals/software_template/software_template_edit.php +++ b/admin/modals/software_template/software_template_edit.php @@ -5,7 +5,7 @@ require_once '../../../includes/modal_header.php'; $software_template_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM software_templates WHERE software_template_id = $software_template_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $software_name = nullable_htmlentities($row['software_template_name']); $software_version = nullable_htmlentities($row['software_template_version']); $software_description = nullable_htmlentities($row['software_template_description']); diff --git a/admin/modals/tag/tag_edit.php b/admin/modals/tag/tag_edit.php index 312244b4..60c1e7f3 100644 --- a/admin/modals/tag/tag_edit.php +++ b/admin/modals/tag/tag_edit.php @@ -6,7 +6,7 @@ $tag_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_id = $tag_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $tag_name = nullable_htmlentities($row['tag_name']); $tag_type = intval($row['tag_type']); $tag_color = nullable_htmlentities($row['tag_color']); diff --git a/admin/modals/tax/tax_edit.php b/admin/modals/tax/tax_edit.php index b3803a20..56f0fda3 100644 --- a/admin/modals/tax/tax_edit.php +++ b/admin/modals/tax/tax_edit.php @@ -5,7 +5,7 @@ require_once '../../../includes/modal_header.php'; $tax_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE tax_id = $tax_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $tax_name = nullable_htmlentities($row['tax_name']); $tax_percent = floatval($row['tax_percent']); diff --git a/admin/modals/ticket_status/ticket_status_edit.php b/admin/modals/ticket_status/ticket_status_edit.php index 2c98baba..8a9e04b2 100644 --- a/admin/modals/ticket_status/ticket_status_edit.php +++ b/admin/modals/ticket_status/ticket_status_edit.php @@ -5,7 +5,7 @@ require_once '../../../includes/modal_header.php'; $ticket_status_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM ticket_statuses WHERE ticket_status_id = $ticket_status_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $ticket_status_name = nullable_htmlentities($row['ticket_status_name']); $ticket_status_color = nullable_htmlentities($row['ticket_status_color']); $ticket_status_order = intval($row['ticket_status_order']); diff --git a/admin/modals/ticket_template/ticket_template_add.php b/admin/modals/ticket_template/ticket_template_add.php index cfccd8d1..944251b4 100644 --- a/admin/modals/ticket_template/ticket_template_add.php +++ b/admin/modals/ticket_template/ticket_template_add.php @@ -59,7 +59,7 @@ ob_start(); diff --git a/admin/modals/ticket_template/ticket_template_task_edit.php b/admin/modals/ticket_template/ticket_template_task_edit.php index 11be1d22..2926f087 100644 --- a/admin/modals/ticket_template/ticket_template_task_edit.php +++ b/admin/modals/ticket_template/ticket_template_task_edit.php @@ -6,7 +6,7 @@ $task_template_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_id = $task_template_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $task_template_name = nullable_htmlentities($row['task_template_name']); $task_template_order = intval($row['task_template_order']); $task_template_completion_estimate = intval($row['task_template_completion_estimate']); @@ -25,7 +25,7 @@ ob_start();
- +
@@ -47,7 +47,7 @@ ob_start();
- +
diff --git a/admin/modals/user/user_add.php b/admin/modals/user/user_add.php index 02a35998..de079867 100644 --- a/admin/modals/user/user_add.php +++ b/admin/modals/user/user_add.php @@ -76,7 +76,7 @@ ob_start(); No one
- +
diff --git a/admin/modules.php b/admin/modules.php index 9a7c0165..9993602f 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -57,7 +57,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
Master encryption key:
"; echo "$site_encryption_master_key"; echo "
=============================="; - + } else { logAction("Master Key", "Download", "$session_name attempted to retrieve the master encryption key but failed"); flash_alert("Incorrect password.", 'error'); - + redirect(); } } - diff --git a/admin/post/category.php b/admin/post/category.php index 070744dc..569c8552 100644 --- a/admin/post/category.php +++ b/admin/post/category.php @@ -39,12 +39,12 @@ if (isset($_POST['edit_category'])) { } if (isset($_GET['archive_category'])) { - + $category_id = intval($_GET['archive_category']); // Get Category Name and Type for logging $sql = mysqli_query($mysqli,"SELECT category_name, category_type FROM categories WHERE category_id = $category_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $category_name = sanitizeInput($row['category_name']); $category_type = sanitizeInput($row['category_type']); @@ -59,12 +59,12 @@ if (isset($_GET['archive_category'])) { } if (isset($_GET['unarchive_category'])) { - + $category_id = intval($_GET['unarchive_category']); // Get Category Name and Type for logging $sql = mysqli_query($mysqli,"SELECT category_name, category_type FROM categories WHERE category_id = $category_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $category_name = sanitizeInput($row['category_name']); $category_type = sanitizeInput($row['category_type']); @@ -79,12 +79,12 @@ if (isset($_GET['unarchive_category'])) { } if (isset($_GET['delete_category'])) { - + $category_id = intval($_GET['delete_category']); // Get Category Name and Type for logging $sql = mysqli_query($mysqli,"SELECT category_name, category_type FROM categories WHERE category_id = $category_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $category_name = sanitizeInput($row['category_name']); $category_type = sanitizeInput($row['category_type']); diff --git a/admin/post/custom_link.php b/admin/post/custom_link.php index 5ecf4710..0a3c6e66 100644 --- a/admin/post/custom_link.php +++ b/admin/post/custom_link.php @@ -48,12 +48,12 @@ if (isset($_POST['edit_custom_link'])) { } if (isset($_GET['delete_custom_link'])) { - + $custom_link_id = intval($_GET['delete_custom_link']); // Get Custom Link name and uri for logging $sql = mysqli_query($mysqli,"SELECT custom_link_name, custom_link_uri FROM custom_links WHERE custom_link_id = $custom_link_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $custom_link_name = sanitizeInput($row['custom_link_name']); $custom_link_uri = sanitizeInput($row['custom_link_uri']); diff --git a/admin/post/saved_payment_method.php b/admin/post/saved_payment_method.php index c4d0bfd6..7f2b7896 100644 --- a/admin/post/saved_payment_method.php +++ b/admin/post/saved_payment_method.php @@ -3,13 +3,13 @@ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); if (isset($_GET['delete_saved_payment'])) { - + validateCSRFToken($_GET['csrf_token']); $saved_payment_id = intval($_GET['delete_saved_payment']); $sql = mysqli_query($mysqli, " - SELECT + SELECT client_saved_payment_methods.saved_payment_id, client_saved_payment_methods.saved_payment_client_id, client_saved_payment_methods.saved_payment_provider_id, @@ -27,7 +27,7 @@ if (isset($_GET['delete_saved_payment'])) { WHERE client_saved_payment_methods.saved_payment_id = $saved_payment_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['saved_payment_client_id']); $provider_id = intval($row['saved_payment_provider_id']); $payment_provider_name = nullable_htmlentities($row['payment_provider_name']); @@ -62,9 +62,9 @@ if (isset($_GET['delete_saved_payment'])) { // SQL Cascade delete will Remove All Associated Auto Payment Methods on recurring invoices in the recurring payments table. logAction("Payment Provider", "Update", "$session_name deleted saved payment method $saved_payment_description (PM: $payment_method)", $client_id); - + flash_alert("Payment method $saved_payment_description removed", 'error'); - + redirect(); } diff --git a/admin/post/settings_company.php b/admin/post/settings_company.php index 160055a9..72fd531a 100644 --- a/admin/post/settings_company.php +++ b/admin/post/settings_company.php @@ -19,7 +19,7 @@ if (isset($_POST['edit_company'])) { $tax_id = sanitizeInput($_POST['tax_id']); $sql = mysqli_query($mysqli,"SELECT company_logo FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $existing_file_name = sanitizeInput($row['company_logo']); // Company logo @@ -55,7 +55,7 @@ if (isset($_POST['edit_company'])) { if (isset($_GET['remove_company_logo'])) { $sql = mysqli_query($mysqli,"SELECT company_logo FROM companies"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_logo = $row['company_logo']; // FileSystem Operation Logo is already sanitized unlink("../uploads/settings/$company_logo"); diff --git a/admin/post/settings_online_payment_clients.php b/admin/post/settings_online_payment_clients.php index a77a3b61..4350b07a 100644 --- a/admin/post/settings_online_payment_clients.php +++ b/admin/post/settings_online_payment_clients.php @@ -3,7 +3,7 @@ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); if (isset($_GET['stripe_remove_pm'])) { - + validateCSRFToken($_GET['csrf_token']); if (!$config_stripe_enable) { @@ -34,21 +34,21 @@ if (isset($_GET['stripe_remove_pm'])) { // Remove Auto Pay on recurring invoices that are stripe $sql_recurring_invoices = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id"); - while ($row = mysqli_fetch_array($sql_recurring_invoices)) { + while ($row = mysqli_fetch_assoc($sql_recurring_invoices)) { $recurring_invoice_id = intval($row['recurring_invoice_id']); mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe' AND recurring_payment_recurring_invoice_id = $recurring_invoice_id"); } logAction("Stripe", "Update", "$session_name deleted saved Stripe payment method (PM: $payment_method)", $client_id); - + flash_alert("Payment method removed", 'error'); - + redirect(); } if (isset($_GET['stripe_reset_customer'])) { - + validateCSRFToken($_GET['csrf_token']); $client_id = intval($_GET['client_id']); @@ -59,7 +59,7 @@ if (isset($_GET['stripe_reset_customer'])) { // Remove Auto Pay on recurring invoices that are stripe $sql_recurring_invoices = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id"); - while ($row = mysqli_fetch_array($sql_recurring_invoices)) { + while ($row = mysqli_fetch_assoc($sql_recurring_invoices)) { $recurring_invoice_id = intval($row['recurring_invoice_id']); mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe' AND recurring_payment_recurring_invoice_id = $recurring_invoice_id"); } @@ -67,7 +67,7 @@ if (isset($_GET['stripe_reset_customer'])) { logAction("Stripe", "Delete", "$session_name reset Stripe settings for client", $client_id); flash_alert("Reset client Stripe settings", 'error'); - + redirect(); } diff --git a/admin/post/software_template.php b/admin/post/software_template.php index 9cc86371..1ef95894 100644 --- a/admin/post/software_template.php +++ b/admin/post/software_template.php @@ -51,7 +51,7 @@ if (isset($_GET['delete_software_template'])) { // Get Software Template Name for logging and alert message $sql = mysqli_query($mysqli,"SELECT software_template_name FROM software_templates WHERE software_template_id = $software_template_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $software_template_name = sanitizeInput($row['software_template_name']); mysqli_query($mysqli,"DELETE FROM software_templates WHERE software_template_id = $software_template_id"); diff --git a/admin/post/update.php b/admin/post/update.php index b618bc4a..37ef8021 100644 --- a/admin/post/update.php +++ b/admin/post/update.php @@ -21,7 +21,7 @@ if (isset($_GET['update'])) { if ($config_telemetry > 0 OR $config_telemetry = 2) { $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $website = sanitizeInput($row['company_website']); diff --git a/admin/post/users.php b/admin/post/users.php index 2217a22b..3c77c1ff 100644 --- a/admin/post/users.php +++ b/admin/post/users.php @@ -53,7 +53,7 @@ if (isset($_POST['add_user'])) { mysqli_query($mysqli, "INSERT INTO user_settings SET user_id = $user_id, user_config_force_mfa = $force_mfa"); $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); // Sanitize Config vars from load_global_settings.php @@ -118,7 +118,7 @@ if (isset($_POST['edit_user'])) { // Get current Avatar $sql = mysqli_query($mysqli, "SELECT user_avatar FROM users WHERE user_id = $user_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $existing_file_name = sanitizeInput($row['user_avatar']); $extended_log_description = ''; @@ -148,7 +148,7 @@ if (isset($_POST['edit_user'])) { // Set Avatar mysqli_query($mysqli, "UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $user_id"); $extended_alert_description = '. File successfully uploaded.'; - + } } @@ -353,8 +353,8 @@ if (isset($_POST['ir_reset_user_password'])) { // Confirm logged-in user password, for security $admin_password = $_POST['admin_password']; $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $session_user_id"); - $userRow = mysqli_fetch_array($sql); - + $userRow = mysqli_fetch_assoc($sql); + if (!password_verify($admin_password, $userRow['user_password'])) { flash_alert("Incorrect password.", 'error'); redirect(); @@ -364,7 +364,7 @@ if (isset($_POST['ir_reset_user_password'])) { $sql_users = mysqli_query($mysqli, "SELECT * FROM users WHERE (user_archived_at IS NULL AND user_id != $session_user_id)"); // Reset passwords - while ($row = mysqli_fetch_array($sql_users)) { + while ($row = mysqli_fetch_assoc($sql_users)) { $user_id = intval($row['user_id']); $user_email = sanitizeInput($row['user_email']); $new_password = randomString(); diff --git a/admin/project_template.php b/admin/project_template.php index 999a7075..f0131d27 100644 --- a/admin/project_template.php +++ b/admin/project_template.php @@ -61,7 +61,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/admin/project_template_details.php b/admin/project_template_details.php index 57cf2c20..6039d8f4 100644 --- a/admin/project_template_details.php +++ b/admin/project_template_details.php @@ -19,7 +19,7 @@ if (isset($_GET['project_template_id'])) { exit; } - $row = mysqli_fetch_array($sql_project_templates); + $row = mysqli_fetch_assoc($sql_project_templates); $project_template_name = nullable_htmlentities($row['project_template_name']); $project_template_description = nullable_htmlentities($row['project_template_description']); @@ -143,7 +143,7 @@ if (isset($_GET['project_template_id'])) { Project Task Templates
- - + + - +
- +
-
- -
- - Delete - + = 3) { ?> +
+ +
+ + Edit + +
+ + Delete + +
-
+
diff --git a/admin/roles.php b/admin/roles.php index 2d937240..7661a7d5 100644 --- a/admin/roles.php +++ b/admin/roles.php @@ -65,7 +65,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -118,4 +118,3 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); require_once "custom_field_create_modal.php"; require_once "../includes/footer.php"; - diff --git a/admin/settings_default.php b/admin/settings_default.php index 9348925f..4b7b942c 100644 --- a/admin/settings_default.php +++ b/admin/settings_default.php @@ -42,7 +42,7 @@ require_once "includes/inc_all_admin.php";
- 5 ) { ?> class="ajax-modal" data-modal-url="modals/ticket_status/ticket_status_edit.php?id=" diff --git a/admin/ticket_template.php b/admin/ticket_template.php index b1b214e9..44ba4c9d 100644 --- a/admin/ticket_template.php +++ b/admin/ticket_template.php @@ -8,14 +8,14 @@ require_once "includes/inc_all_admin.php"; $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS *, + "SELECT SQL_CALC_FOUND_ROWS *, COUNT(task_template_id) AS task_count FROM ticket_templates LEFT JOIN task_templates ON task_template_ticket_template_id = ticket_template_id WHERE (ticket_template_name LIKE '%$q%' OR ticket_template_description LIKE '%$q%') AND ticket_template_archived_at IS NULL GROUP BY ticket_template_id - ORDER BY $sort $order + ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -69,7 +69,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
Never logged in"; } else { - $row = mysqli_fetch_array($sql_last_login); + $row = mysqli_fetch_assoc($sql_last_login); $log_created_at = nullable_htmlentities($row['log_created_at']); $log_ip = nullable_htmlentities($row['log_ip']); $log_user_agent = nullable_htmlentities($row['log_user_agent']); diff --git a/admin/vendor_template.php b/admin/vendor_template.php index b201d0df..168b3b12 100644 --- a/admin/vendor_template.php +++ b/admin/vendor_template.php @@ -64,7 +64,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); DATE_SUB(NOW(), INTERVAL 2 MINUTE)"); - while ($row = mysqli_fetch_array($query)) { + while ($row = mysqli_fetch_assoc($query)) { $users[] = $row['user_name']; } @@ -198,18 +198,18 @@ if (isset($_GET['share_generate_link'])) { $item_key = randomString(32); 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")); + $row = mysqli_fetch_assoc(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")); + $row = mysqli_fetch_assoc(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); + $row = mysqli_fetch_assoc($credential); $item_name = sanitizeInput($row['credential_name']); @@ -240,7 +240,7 @@ if (isset($_GET['share_generate_link'])) { } $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -298,7 +298,7 @@ if (isset($_GET['get_active_clients'])) { ORDER BY client_accessed_at DESC" ); - while ($row = mysqli_fetch_array($client_sql)) { + while ($row = mysqli_fetch_assoc($client_sql)) { $response['clients'][] = $row; } @@ -322,7 +322,7 @@ if (isset($_GET['get_client_contacts'])) { ORDER BY contact_primary DESC, contact_technical DESC, contact_important DESC, contact_name" ); - while ($row = mysqli_fetch_array($contact_sql)) { + while ($row = mysqli_fetch_assoc($contact_sql)) { $response['contacts'][] = $row; } @@ -347,7 +347,7 @@ if (isset($_GET['get_client_assets'])) { ORDER BY asset_important DESC, asset_name" ); - while ($row = mysqli_fetch_array($asset_sql)) { + while ($row = mysqli_fetch_assoc($asset_sql)) { $response['assets'][] = $row; } @@ -371,7 +371,7 @@ if (isset($_GET['get_client_locations'])) { ORDER BY location_primary DESC, location_name ASC" ); - while ($row = mysqli_fetch_array($locations_sql)) { + while ($row = mysqli_fetch_assoc($locations_sql)) { $response['locations'][] = $row; } @@ -395,7 +395,7 @@ if (isset($_GET['get_client_vendors'])) { ORDER BY vendor_name ASC" ); - while ($row = mysqli_fetch_array($vendors_sql)) { + while ($row = mysqli_fetch_assoc($vendors_sql)) { $response['vendors'][] = $row; } @@ -502,7 +502,7 @@ if (isset($_POST['update_kanban_ticket'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_id = $ticket_id "); - $row = mysqli_fetch_array($ticket_sql); + $row = mysqli_fetch_assoc($ticket_sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -521,7 +521,7 @@ if (isset($_POST['update_kanban_ticket'])) { // 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); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -550,7 +550,7 @@ if (isset($_POST['update_kanban_ticket'])) { // 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)) { + while ($row = mysqli_fetch_assoc($sql_watchers)) { $watcher_email = sanitizeInput($row['watcher_email']); // Queue Mail @@ -691,7 +691,7 @@ if (isset($_GET['client_duplicate_check'])) { ); if (mysqli_num_rows($sql_clients) > 0) { - while ($row = mysqli_fetch_array($sql_clients)) { + while ($row = mysqli_fetch_assoc($sql_clients)) { $response['message'] = " Potential duplicate: " . nullable_htmlentities($row['client_name']) . " already exists."; } } @@ -713,7 +713,7 @@ if (isset($_GET['contact_email_check'])) { // 1. Duplicate check $sql_contacts = mysqli_query($mysqli, "SELECT contact_email FROM contacts WHERE contact_email = '$email' LIMIT 1"); if (mysqli_num_rows($sql_contacts) > 0) { - while ($row = mysqli_fetch_array($sql_contacts)) { + while ($row = mysqli_fetch_assoc($sql_contacts)) { $response['message'] = " Potential duplicate: " . nullable_htmlentities($row['contact_email']) . " already exists."; } } @@ -734,7 +734,7 @@ if (isset($_GET['ai_reword'])) { $sql = mysqli_query($mysqli, "SELECT * FROM ai_models LEFT JOIN ai_providers ON ai_model_ai_provider_id = ai_provider_id WHERE ai_model_use_case = 'General' LIMIT 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $model_name = $row['ai_model_name']; $promptText = $row['ai_model_prompt']; $url = $row['ai_provider_api_url']; @@ -805,7 +805,7 @@ if (isset($_GET['ai_create_document_template'])) { $sql = mysqli_query($mysqli, "SELECT * FROM ai_models LEFT JOIN ai_providers ON ai_model_ai_provider_id = ai_provider_id WHERE ai_model_use_case = 'General' LIMIT 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $model_name = $row['ai_model_name']; $url = $row['ai_provider_api_url']; $key = $row['ai_provider_api_key']; @@ -861,7 +861,7 @@ if (isset($_GET['ai_ticket_summary'])) { $sql = mysqli_query($mysqli, "SELECT * FROM ai_models LEFT JOIN ai_providers ON ai_model_ai_provider_id = ai_provider_id WHERE ai_model_use_case = 'General' LIMIT 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $model_name = $row['ai_model_name']; $url = $row['ai_provider_api_url']; $key = $row['ai_provider_api_key']; diff --git a/agent/asset_details.php b/agent/asset_details.php index f5d8deeb..14085ed4 100644 --- a/agent/asset_details.php +++ b/agent/asset_details.php @@ -29,7 +29,7 @@ if (isset($_GET['asset_id'])) { } else { - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); $asset_id = intval($row['asset_id']); @@ -122,7 +122,7 @@ if (isset($_GET['asset_id'])) { $asset_tag_name_display_array = array(); $asset_tag_id_array = array(); $sql_asset_tags = mysqli_query($mysqli, "SELECT * FROM asset_tags LEFT JOIN tags ON asset_tag_tag_id = tag_id WHERE asset_tag_asset_id = $asset_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_asset_tags)) { + while ($row = mysqli_fetch_assoc($sql_asset_tags)) { $asset_tag_id = intval($row['tag_id']); $asset_tag_name = nullable_htmlentities($row['tag_name']); @@ -517,7 +517,7 @@ if (isset($_GET['asset_id'])) { - + @@ -275,7 +275,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $access_permission_query ORDER BY client_name ASC "); - while ($row = mysqli_fetch_array($sql_clients_filter)) { + while ($row = mysqli_fetch_assoc($sql_clients_filter)) { $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); ?> @@ -303,7 +303,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); GROUP BY tag_id HAVING COUNT(asset_tag_asset_id) > 0 OR tag_id IN ($tag_filter) "); - while ($row = mysqli_fetch_array($sql_tags_filter)) { + while ($row = mysqli_fetch_assoc($sql_tags_filter)) { $tag_id = intval($row['tag_id']); $tag_name = nullable_htmlentities($row['tag_name']); ?> @@ -524,7 +524,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
@@ -37,11 +37,11 @@ if (isset($_GET['calendar_id'])) {
- +
- +
@@ -85,7 +85,7 @@ require_once "modals/calendar/calendar_event_add.php"; //loop through IDs and create a modal for each $sql = mysqli_query($mysqli, "SELECT * FROM calendar_events LEFT JOIN calendars ON event_calendar_id = calendar_id $client_event_query"); -while ($row = mysqli_fetch_array($sql)) { +while ($row = mysqli_fetch_assoc($sql)) { $event_id = intval($row['event_id']); $event_title = nullable_htmlentities($row['event_title']); $event_description = nullable_htmlentities($row['event_description']); @@ -166,7 +166,7 @@ while ($row = mysqli_fetch_array($sql)) { events: [ firstDay: , diff --git a/agent/certificates.php b/agent/certificates.php index dbf25a4d..408ad3c0 100644 --- a/agent/certificates.php +++ b/agent/certificates.php @@ -111,7 +111,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $access_permission_query ORDER BY client_name ASC "); - while ($row = mysqli_fetch_array($sql_clients_filter)) { + while ($row = mysqli_fetch_assoc($sql_clients_filter)) { $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); ?> @@ -194,7 +194,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
0 OR tags.tag_id IN ($tag_filter) "); - while ($row = mysqli_fetch_array($sql_tags_filter)) { + while ($row = mysqli_fetch_assoc($sql_tags_filter)) { $tag_id = intval($row['tag_id']); $tag_name = nullable_htmlentities($row['tag_name']); ?> @@ -169,7 +169,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); AND ( EXISTS (SELECT 1 FROM contacts WHERE contact_location_id = location_id AND $archive_query) OR location_id = $location_filter) ORDER BY location_name ASC "); - while ($row = mysqli_fetch_array($sql_locations_filter)) { + while ($row = mysqli_fetch_assoc($sql_locations_filter)) { $location_id = intval($row['location_id']); $location_name = nullable_htmlentities($row['location_name']); ?> @@ -196,7 +196,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $access_permission_query ORDER BY client_name ASC "); - while ($row = mysqli_fetch_array($sql_clients_filter)) { + while ($row = mysqli_fetch_assoc($sql_clients_filter)) { $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); ?> @@ -327,7 +327,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); 0 OR tags.tag_id IN ($tag_filter) "); - while ($row = mysqli_fetch_array($sql_tags_filter)) { + while ($row = mysqli_fetch_assoc($sql_tags_filter)) { $tag_id = intval($row['tag_id']); $tag_name = nullable_htmlentities($row['tag_name']); ?> @@ -180,7 +180,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -207,7 +207,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $access_permission_query ORDER BY client_name ASC "); - while ($row = mysqli_fetch_array($sql_clients_filter)) { + while ($row = mysqli_fetch_assoc($sql_clients_filter)) { $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); ?> @@ -301,7 +301,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); 0) { - $row = mysqli_fetch_array($sql_shared); + $row = mysqli_fetch_assoc($sql_shared); $item_id = intval($row['item_id']); $item_active = nullable_htmlentities($row['item_active']); $item_key = nullable_htmlentities($row['item_key']); diff --git a/agent/dashboard.php b/agent/dashboard.php index 9a8da89c..49f317cd 100644 --- a/agent/dashboard.php +++ b/agent/dashboard.php @@ -17,7 +17,7 @@ if (isset($_GET['enable_technical'])) { // Fetch User Dashboard Settings $sql_user_dashboard_settings = mysqli_query($mysqli, "SELECT * FROM user_settings WHERE user_id = $session_user_id"); -$row = mysqli_fetch_array($sql_user_dashboard_settings); +$row = mysqli_fetch_assoc($sql_user_dashboard_settings); $user_config_dashboard_financial_enable = intval($row['user_config_dashboard_financial_enable']); $user_config_dashboard_technical_enable = intval($row['user_config_dashboard_technical_enable']); @@ -52,7 +52,7 @@ $sql_years_select = mysqli_query($mysqli, "
- - - - @@ -795,11 +795,11 @@ if ($user_config_dashboard_technical_enable == 1) { 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month"); - $row = mysqli_fetch_array($sql_revenues); + $row = mysqli_fetch_assoc($sql_revenues); $revenues_for_month = floatval($row['revenue_amount_for_month']); $income_for_month = $payments_for_month + $revenues_for_month; @@ -825,11 +825,11 @@ if ($user_config_dashboard_technical_enable == 1) { 0 AND YEAR(revenue_date) = $year-1 AND MONTH(revenue_date) = $month"); - $row = mysqli_fetch_array($sql_revenues); + $row = mysqli_fetch_assoc($sql_revenues); $revenues_for_month = floatval($row['revenue_amount_for_month']); $income_for_month = $payments_for_month + $revenues_for_month; @@ -856,7 +856,7 @@ if ($user_config_dashboard_technical_enable == 1) { $largest_invoice_month = 0; for ($month = 1; $month <= 12; $month++) { $sql_projected = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amount_for_month FROM invoices WHERE YEAR(invoice_due) = $year AND MONTH(invoice_due) = $month AND invoice_status != 'Cancelled' AND invoice_status != 'Draft' AND invoice_status != 'Non-Billable'"); - $row = mysqli_fetch_array($sql_projected); + $row = mysqli_fetch_assoc($sql_projected); $invoice_for_month = floatval($row['invoice_amount_for_month']); if ($invoice_for_month > 0 && $invoice_for_month > $largest_invoice_month) { @@ -882,7 +882,7 @@ if ($user_config_dashboard_technical_enable == 1) { $largest_expense_month = 0; for ($month = 1; $month <= 12; $month++) { $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0"); - $row = mysqli_fetch_array($sql_expenses); + $row = mysqli_fetch_assoc($sql_expenses); $expenses_for_month = floatval($row['expense_amount_for_month']); if ($expenses_for_month > 0 && $expenses_for_month > $largest_expense_month) { @@ -944,7 +944,7 @@ if ($user_config_dashboard_technical_enable == 1) { $largest_trip_miles_month = 0; for ($month = 1; $month <= 12; $month++) { $sql_trips = mysqli_query($mysqli, "SELECT SUM(trip_miles) AS trip_miles_for_month FROM trips WHERE YEAR(trip_date) = $year AND MONTH(trip_date) = $month"); - $row = mysqli_fetch_array($sql_trips); + $row = mysqli_fetch_assoc($sql_trips); $trip_miles_for_month = floatval($row['trip_miles_for_month']); if ($trip_miles_for_month > 0 && $trip_miles_for_month > $largest_trip_miles_month) { @@ -991,13 +991,13 @@ if ($user_config_dashboard_technical_enable == 1) { 0) { echo "'Others',"; @@ -1008,7 +1008,7 @@ if ($user_config_dashboard_technical_enable == 1) { data: [ 0 AND YEAR(expense_date) = $year GROUP BY category_name, category_id ORDER BY total_expense DESC LIMIT 5"); $sql_categories = mysqli_query($mysqli, "SELECT category_name FROM TopExpenseCategories"); - while ($row = mysqli_fetch_array($sql_categories)) { + while ($row = mysqli_fetch_assoc($sql_categories)) { $category_name = json_encode($row['category_name']); echo "$category_name,"; } $sql_other_categories = mysqli_query($mysqli, "SELECT SUM(expenses.expense_amount) AS other_expense FROM categories LEFT JOIN TopExpenseCategories ON categories.category_id = TopExpenseCategories.category_id INNER JOIN expenses ON categories.category_id = expenses.expense_category_id WHERE TopExpenseCategories.category_id IS NULL AND expense_vendor_id > 0 AND YEAR(expense_date) = $year"); - $row = mysqli_fetch_array($sql_other_categories); + $row = mysqli_fetch_assoc($sql_other_categories); $other_expense = floatval($row['other_expense']); if ($other_expense > 0) { echo "'Others',"; @@ -1073,7 +1073,7 @@ if ($user_config_dashboard_technical_enable == 1) { data: [ 0) { echo "'Others',"; @@ -1138,7 +1138,7 @@ if ($user_config_dashboard_technical_enable == 1) { data: [ @@ -230,7 +230,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -165,7 +165,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -185,7 +185,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -251,7 +251,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); 0) { global $mysqli, $get_folder_id, $session_user_role; $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC"); - while ($row = mysqli_fetch_array($sql_folders)) { + while ($row = mysqli_fetch_assoc($sql_folders)) { $folder_id = intval($row['folder_id']); $folder_name = nullable_htmlentities($row['folder_name']); @@ -309,7 +309,7 @@ while ($folder_id > 0) { 0) { 0) { ); $file_shared = (mysqli_num_rows($sql_shared) > 0) ? true : false; if ($file_shared) { - $row = mysqli_fetch_array($sql_shared); + $row = mysqli_fetch_assoc($sql_shared); $item_id = intval($row['item_id']); $item_active = nullable_htmlentities($row['item_active']); $item_key = nullable_htmlentities($row['item_key']); diff --git a/agent/global_search.php b/agent/global_search.php index 8a3f0f42..08ef0bb7 100644 --- a/agent/global_search.php +++ b/agent/global_search.php @@ -28,7 +28,7 @@ if (isset($_GET['query'])) { ORDER BY client_id DESC LIMIT 5" ); - $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts + $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts LEFT JOIN clients ON client_id = contact_client_id WHERE contact_archived_at IS NULL AND (contact_name LIKE '%$query%' @@ -179,7 +179,7 @@ if (isset($_GET['query'])) { @@ -411,7 +411,7 @@ if (isset($_GET['query'])) { - +

@@ -195,13 +195,13 @@ - + 0) { - while ($row = mysqli_fetch_array($products_sql)) { + while ($row = mysqli_fetch_assoc($products_sql)) { $products[] = $row; } $json_products = json_encode($products); @@ -394,7 +394,7 @@ if (isset($_GET['invoice_id'])) { $total_tax = 0.00; $sub_total = 0.00; - while ($row = mysqli_fetch_array($sql_invoice_items)) { + while ($row = mysqli_fetch_assoc($sql_invoice_items)) { $item_id = intval($row['item_id']); $item_name = nullable_htmlentities($row['item_name']); $item_description = nullable_htmlentities($row['item_description']); @@ -467,7 +467,7 @@ if (isset($_GET['invoice_id'])) { @@ -313,7 +313,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); 0 OR tags.tag_id IN ($tag_filter) "); - while ($row = mysqli_fetch_array($sql_tags_filter)) { + while ($row = mysqli_fetch_assoc($sql_tags_filter)) { $tag_id = intval($row['tag_id']); $tag_name = nullable_htmlentities($row['tag_name']); ?> @@ -157,7 +157,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $access_permission_query ORDER BY client_name ASC "); - while ($row = mysqli_fetch_array($sql_clients_filter)) { + while ($row = mysqli_fetch_assoc($sql_clients_filter)) { $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); ?> @@ -258,7 +258,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); " required> - +
- +
diff --git a/agent/modals/asset/asset_add.php b/agent/modals/asset/asset_add.php index cda60a46..d94ee135 100644 --- a/agent/modals/asset/asset_add.php +++ b/agent/modals/asset/asset_add.php @@ -13,7 +13,7 @@ if ($client_id) { $sql_contact_select = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC"); } else { $sql_client_select = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC"); -} +} // OS typeahead suggestions $os_sql = mysqli_query($mysqli, "SELECT DISTINCT asset_os AS label FROM assets WHERE asset_archived_at IS NULL"); @@ -85,7 +85,7 @@ ob_start(); @@ -191,7 +191,7 @@ ob_start(); - Select Location - @@ -326,12 +326,12 @@ ob_start(); - @@ -476,7 +476,7 @@ ob_start(); +
@@ -406,7 +406,7 @@ ob_start(); - + $network_name" + $network_name_display = $network_name + ? "$network_name" : '-'; // Connected interface details @@ -482,7 +482,7 @@ ob_start(); - + diff --git a/agent/modals/asset/asset_documents.php b/agent/modals/asset/asset_documents.php index 42303534..8ec33df9 100644 --- a/agent/modals/asset/asset_documents.php +++ b/agent/modals/asset/asset_documents.php @@ -10,7 +10,7 @@
diff --git a/agent/modals/asset/asset_edit.php b/agent/modals/asset/asset_edit.php index b154981d..5aab22d2 100644 --- a/agent/modals/asset/asset_edit.php +++ b/agent/modals/asset/asset_edit.php @@ -4,12 +4,12 @@ require_once '../../../includes/modal_header.php'; $asset_id = intval($_GET['id']); -$sql = mysqli_query($mysqli, "SELECT * FROM assets +$sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 WHERE asset_id = $asset_id LIMIT 1" ); - -$row = mysqli_fetch_array($sql); + +$row = mysqli_fetch_assoc($sql); $client_id = intval($row['asset_client_id']); $asset_id = intval($row['asset_id']); $asset_type = nullable_htmlentities($row['asset_type']); @@ -44,7 +44,7 @@ $asset_network_id = intval($row['interface_network_id']); $device_icon = getAssetIcon($asset_type); // Asset History Query -$sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history +$sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history WHERE asset_history_asset_id = $asset_id ORDER BY asset_history_id DESC LIMIT 10" @@ -53,7 +53,7 @@ $sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history // Tags $asset_tag_id_array = array(); $sql_asset_tags = mysqli_query($mysqli, "SELECT asset_tag_tag_id FROM asset_tags WHERE asset_tag_asset_id = $asset_id"); -while ($row = mysqli_fetch_array($sql_asset_tags)) { +while ($row = mysqli_fetch_assoc($sql_asset_tags)) { $asset_tag_tag_id = intval($row['asset_tag_tag_id']); $asset_tag_id_array[] = $asset_tag_tag_id; } @@ -195,7 +195,7 @@ ob_start(); @@ -507,7 +507,7 @@ ob_start();
    $asset_history_created_at
    $asset_history_description"; diff --git a/agent/modals/asset/asset_interface_add.php b/agent/modals/asset/asset_interface_add.php index 00fc9929..dab07030 100644 --- a/agent/modals/asset/asset_interface_add.php +++ b/agent/modals/asset/asset_interface_add.php @@ -160,7 +160,7 @@ ob_start(); "> -
    > +
    >
    • @@ -76,7 +76,7 @@ ob_start();
      -
      +
      @@ -85,11 +85,11 @@ ob_start();
      -
      - @@ -131,7 +131,7 @@ ob_start(); @@ -150,11 +150,11 @@ ob_start();
      -
      -
      - @@ -201,11 +201,11 @@ ob_start();
      -
      - @@ -249,7 +249,7 @@ ob_start(); AND network_client_id = $client_id ORDER BY network_name ASC "); - while ($net_row = mysqli_fetch_array($sql_network_select)) { + while ($net_row = mysqli_fetch_assoc($sql_network_select)) { $network_id_select = intval($net_row['network_id']); $network_name_select = nullable_htmlentities($net_row['network_name']); $network_select = nullable_htmlentities($net_row['network']); @@ -289,7 +289,7 @@ ob_start(); ) ORDER BY a.asset_name ASC, i.interface_name ASC "); - while ($row_if = mysqli_fetch_array($sql_interfaces_select)) { + while ($row_if = mysqli_fetch_assoc($sql_interfaces_select)) { $iface_id_select = intval($row_if['interface_id']); $iface_name_select = nullable_htmlentities($row_if['interface_name']); $iface_asset_name_select = nullable_htmlentities($row_if['asset_name']); diff --git a/agent/modals/asset/asset_interface_multiple_add.php b/agent/modals/asset/asset_interface_multiple_add.php index 7862c750..328ac5af 100644 --- a/agent/modals/asset/asset_interface_multiple_add.php +++ b/agent/modals/asset/asset_interface_multiple_add.php @@ -74,7 +74,7 @@ diff --git a/agent/modals/asset/asset_link_document.php b/agent/modals/asset/asset_link_document.php index 7344d20f..9f36bfbb 100644 --- a/agent/modals/asset/asset_link_document.php +++ b/agent/modals/asset/asset_link_document.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM assets LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $asset_name = nullable_htmlentities($row['asset_name']); $client_id = intval($row['asset_client_id']); @@ -47,7 +47,7 @@ ob_start(); AND asset_documents.asset_id IS NULL ORDER BY document_name ASC "); - while ($row = mysqli_fetch_array($sql_documents_select)) { + while ($row = mysqli_fetch_assoc($sql_documents_select)) { $document_id = intval($row['document_id']); $document_name = nullable_htmlentities($row['document_name']); ?> diff --git a/agent/modals/asset/asset_link_file.php b/agent/modals/asset/asset_link_file.php index e2ade4b6..945057c0 100644 --- a/agent/modals/asset/asset_link_file.php +++ b/agent/modals/asset/asset_link_file.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM assets LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $asset_name = nullable_htmlentities($row['asset_name']); $client_id = intval($row['asset_client_id']); @@ -49,7 +49,7 @@ ob_start(); ORDER BY folders.folder_name ASC, files.file_name ASC "); - while ($row = mysqli_fetch_array($sql_files_select)) { + while ($row = mysqli_fetch_assoc($sql_files_select)) { $file_id = intval($row['file_id']); $file_name = nullable_htmlentities($row['file_name']); $folder_name = nullable_htmlentities($row['folder_name']); diff --git a/agent/modals/asset/asset_link_service.php b/agent/modals/asset/asset_link_service.php index f569b458..f100feab 100644 --- a/agent/modals/asset/asset_link_service.php +++ b/agent/modals/asset/asset_link_service.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM assets LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $asset_name = nullable_htmlentities($row['asset_name']); $client_id = intval($row['asset_client_id']); @@ -46,7 +46,7 @@ ob_start(); AND service_assets.asset_id IS NULL ORDER BY services.service_name ASC "); - while ($row = mysqli_fetch_array($sql_services_select)) { + while ($row = mysqli_fetch_assoc($sql_services_select)) { $service_id = intval($row['service_id']); $service_name = nullable_htmlentities($row['service_name']); ?> diff --git a/agent/modals/asset/asset_link_software.php b/agent/modals/asset/asset_link_software.php index 8c79e517..402afc6d 100644 --- a/agent/modals/asset/asset_link_software.php +++ b/agent/modals/asset/asset_link_software.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM assets LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $asset_name = nullable_htmlentities($row['asset_name']); $client_id = intval($row['asset_client_id']); @@ -49,7 +49,7 @@ ob_start(); AND software_assets.asset_id IS NULL ORDER BY software.software_name ASC "); - while ($row = mysqli_fetch_array($sql_software_select)) { + while ($row = mysqli_fetch_assoc($sql_software_select)) { $software_id = intval($row['software_id']); $software_name = nullable_htmlentities($row['software_name']); @@ -70,4 +70,4 @@ ob_start(); @@ -92,7 +92,7 @@ ob_start(); $domain_name"; @@ -102,7 +102,7 @@ ob_start();
      - +
      @@ -172,4 +172,4 @@ ob_start(); - Select Domain - @@ -165,7 +165,7 @@ ob_start();
- Select Client - @@ -127,7 +127,7 @@ ob_start(); - +
@@ -166,7 +166,7 @@ ob_start(); @@ -235,7 +235,7 @@ ob_start();
- +
@@ -286,7 +286,7 @@ ob_start();
- + @@ -896,7 +896,7 @@ ob_start(); More Details - Edit diff --git a/agent/modals/contact/contact_edit.php b/agent/modals/contact/contact_edit.php index d258ace5..18ad5e0a 100644 --- a/agent/modals/contact/contact_edit.php +++ b/agent/modals/contact/contact_edit.php @@ -10,7 +10,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts LIMIT 1" ); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $client_id = intval($row['contact_client_id']); $contact_name = nullable_htmlentities($row['contact_name']); $contact_title = nullable_htmlentities($row['contact_title']); @@ -38,7 +38,7 @@ $contact_user_id = intval($row['contact_user_id']); // Tags $contact_tag_id_array = array(); $sql_contact_tags = mysqli_query($mysqli, "SELECT tag_id FROM contact_tags WHERE contact_id = $contact_id"); -while ($row = mysqli_fetch_array($sql_contact_tags)) { +while ($row = mysqli_fetch_assoc($sql_contact_tags)) { $contact_tag_id = intval($row['tag_id']); $contact_tag_id_array[] = $contact_tag_id; } @@ -133,7 +133,7 @@ ob_start(); - +
@@ -169,7 +169,7 @@ ob_start(); @@ -377,4 +377,3 @@ $(document).ready(function() { require_once '../../../includes/modal_footer.php'; ?> - diff --git a/agent/modals/contact/contact_link_asset.php b/agent/modals/contact/contact_link_asset.php index 1db6dbe8..0443126e 100644 --- a/agent/modals/contact/contact_link_asset.php +++ b/agent/modals/contact/contact_link_asset.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $contact_name = nullable_htmlentities($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -44,7 +44,7 @@ ob_start(); AND asset_archived_at IS NULL ORDER BY asset_name ASC "); - while ($row = mysqli_fetch_array($sql_assets_select)) { + while ($row = mysqli_fetch_assoc($sql_assets_select)) { $asset_id = intval($row['asset_id']); $asset_name = nullable_htmlentities($row['asset_name']); ?> diff --git a/agent/modals/contact/contact_link_credential.php b/agent/modals/contact/contact_link_credential.php index a4a8a4d4..5fffa77c 100644 --- a/agent/modals/contact/contact_link_credential.php +++ b/agent/modals/contact/contact_link_credential.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $contact_name = nullable_htmlentities($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -44,7 +44,7 @@ ob_start(); AND credential_archived_at IS NULL ORDER BY credential_name ASC "); - while ($row = mysqli_fetch_array($sql_credentials_select)) { + while ($row = mysqli_fetch_assoc($sql_credentials_select)) { $credential_id = intval($row['credential_id']); $credential_name = nullable_htmlentities($row['credential_name']); ?> diff --git a/agent/modals/contact/contact_link_document.php b/agent/modals/contact/contact_link_document.php index ac5f54c7..946f8ecb 100644 --- a/agent/modals/contact/contact_link_document.php +++ b/agent/modals/contact/contact_link_document.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $contact_name = nullable_htmlentities($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -47,7 +47,7 @@ ob_start(); AND contact_documents.contact_id IS NULL ORDER BY documents.document_name ASC "); - while ($row = mysqli_fetch_array($sql_documents_select)) { + while ($row = mysqli_fetch_assoc($sql_documents_select)) { $document_id = intval($row['document_id']); $document_name = nullable_htmlentities($row['document_name']); ?> diff --git a/agent/modals/contact/contact_link_file.php b/agent/modals/contact/contact_link_file.php index 2cb882c2..a12d2e3a 100644 --- a/agent/modals/contact/contact_link_file.php +++ b/agent/modals/contact/contact_link_file.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $contact_name = nullable_htmlentities($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -49,7 +49,7 @@ ob_start(); ORDER BY folders.folder_name ASC, files.file_name ASC "); - while ($row = mysqli_fetch_array($sql_files_select)) { + while ($row = mysqli_fetch_assoc($sql_files_select)) { $file_id = intval($row['file_id']); $file_name = nullable_htmlentities($row['file_name']); $folder_name = nullable_htmlentities($row['folder_name']); diff --git a/agent/modals/contact/contact_link_service.php b/agent/modals/contact/contact_link_service.php index 124dd53e..e8d8e447 100644 --- a/agent/modals/contact/contact_link_service.php +++ b/agent/modals/contact/contact_link_service.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $contact_name = nullable_htmlentities($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -46,7 +46,7 @@ ob_start(); AND service_contacts.contact_id IS NULL ORDER BY services.service_name ASC "); - while ($row = mysqli_fetch_array($sql_services_select)) { + while ($row = mysqli_fetch_assoc($sql_services_select)) { $service_id = intval($row['service_id']); $service_name = nullable_htmlentities($row['service_name']); ?> diff --git a/agent/modals/contact/contact_link_software.php b/agent/modals/contact/contact_link_software.php index c08ef77e..f53cac9f 100644 --- a/agent/modals/contact/contact_link_software.php +++ b/agent/modals/contact/contact_link_software.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts LIMIT 1 "); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $contact_name = nullable_htmlentities($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -48,7 +48,7 @@ ob_start(); AND software_contacts.contact_id IS NULL ORDER BY software.software_name ASC "); - while ($row = mysqli_fetch_array($sql_software_select)) { + while ($row = mysqli_fetch_assoc($sql_software_select)) { $software_id = intval($row['software_id']); $software_name = nullable_htmlentities($row['software_name']); ?> diff --git a/agent/modals/contact/contact_note_add.php b/agent/modals/contact/contact_note_add.php index 1b38d210..fefaf7df 100644 --- a/agent/modals/contact/contact_note_add.php +++ b/agent/modals/contact/contact_note_add.php @@ -5,7 +5,7 @@ require_once '../../../includes/modal_header.php'; $contact_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT contact_name FROM contacts WHERE contact_id = $contact_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $contact_name = nullable_htmlentities($row['contact_name']); // Generate the HTML form content using output buffering. diff --git a/agent/modals/credential/credential_add.php b/agent/modals/credential/credential_add.php index 3392bdf5..9815ba0f 100644 --- a/agent/modals/credential/credential_add.php +++ b/agent/modals/credential/credential_add.php @@ -16,7 +16,7 @@ ob_start();
- +
    @@ -54,7 +54,7 @@ ob_start(); @@ -165,7 +165,7 @@ ob_start(); @@ -192,7 +192,7 @@ ob_start(); diff --git a/agent/modals/credential/credential_bulk_assign_tags.php b/agent/modals/credential/credential_bulk_assign_tags.php index c0ed149f..abe06b92 100644 --- a/agent/modals/credential/credential_bulk_assign_tags.php +++ b/agent/modals/credential/credential_bulk_assign_tags.php @@ -37,7 +37,7 @@ ob_start(); diff --git a/agent/modals/credential/credential_edit.php b/agent/modals/credential/credential_edit.php index 6ddef00e..1388034a 100644 --- a/agent/modals/credential/credential_edit.php +++ b/agent/modals/credential/credential_edit.php @@ -6,7 +6,7 @@ $credential_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_id = $credential_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $client_id = intval($row['credential_client_id']); $credential_name = nullable_htmlentities($row['credential_name']); $credential_description = nullable_htmlentities($row['credential_description']); @@ -27,7 +27,7 @@ $credential_asset_id = intval($row['credential_asset_id']); // Tags $credential_tag_id_array = array(); $sql_credential_tags = mysqli_query($mysqli, "SELECT tag_id FROM credential_tags WHERE credential_id = $credential_id"); -while ($row = mysqli_fetch_array($sql_credential_tags)) { +while ($row = mysqli_fetch_assoc($sql_credential_tags)) { $credential_tag_id = intval($row['tag_id']); $credential_tag_id_array[] = $credential_tag_id; } @@ -178,7 +178,7 @@ ob_start(); @@ -199,7 +199,7 @@ ob_start(); diff --git a/agent/modals/credential/credential_view.php b/agent/modals/credential/credential_view.php index 474564fa..33dd3509 100644 --- a/agent/modals/credential/credential_view.php +++ b/agent/modals/credential/credential_view.php @@ -5,8 +5,8 @@ require_once '../../../includes/modal_header.php'; $credential_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_id = $credential_id LIMIT 1"); - -$row = mysqli_fetch_array($sql); + +$row = mysqli_fetch_assoc($sql); $credential_name = nullable_htmlentities($row['credential_name']); $credential_description = nullable_htmlentities($row['credential_description']); $credential_uri = nullable_htmlentities($row['credential_uri']); diff --git a/agent/modals/document/document_add_file_relation.php b/agent/modals/document/document_add_file_relation.php index 8a986ead..32816119 100644 --- a/agent/modals/document/document_add_file_relation.php +++ b/agent/modals/document/document_add_file_relation.php @@ -20,10 +20,10 @@ @@ -114,12 +114,12 @@ ob_start(); - @@ -136,12 +136,12 @@ ob_start(); - @@ -158,12 +158,12 @@ ob_start(); - @@ -254,8 +254,8 @@ ob_start();
- @@ -135,7 +135,7 @@ ob_start(); @@ -169,7 +169,7 @@ ob_start(); diff --git a/agent/modals/expense/expense_bulk_edit_account.php b/agent/modals/expense/expense_bulk_edit_account.php index ca85880c..642ccaba 100644 --- a/agent/modals/expense/expense_bulk_edit_account.php +++ b/agent/modals/expense/expense_bulk_edit_account.php @@ -32,21 +32,21 @@ ob_start(); diff --git a/agent/modals/expense/expense_bulk_edit_client.php b/agent/modals/expense/expense_bulk_edit_client.php index 53578782..b65ff79d 100644 --- a/agent/modals/expense/expense_bulk_edit_client.php +++ b/agent/modals/expense/expense_bulk_edit_client.php @@ -37,7 +37,7 @@ ob_start(); diff --git a/agent/modals/expense/expense_copy.php b/agent/modals/expense/expense_copy.php index 099251df..cff64d16 100644 --- a/agent/modals/expense/expense_copy.php +++ b/agent/modals/expense/expense_copy.php @@ -6,7 +6,7 @@ $expense_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM expenses WHERE expense_id = $expense_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $expense_date = nullable_htmlentities($row['expense_date']); $expense_amount = floatval($row['expense_amount']); $expense_currency_code = nullable_htmlentities($row['expense_currency_code']); @@ -68,21 +68,21 @@ ob_start(); @@ -148,7 +148,7 @@ ob_start(); @@ -176,7 +176,7 @@ ob_start(); diff --git a/agent/modals/expense/expense_edit.php b/agent/modals/expense/expense_edit.php index 1fb3aeac..7d980cae 100644 --- a/agent/modals/expense/expense_edit.php +++ b/agent/modals/expense/expense_edit.php @@ -10,7 +10,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM expenses WHERE expense_id = $expense_id LIMIT 1" ); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $expense_date = nullable_htmlentities($row['expense_date']); $expense_amount = floatval($row['expense_amount']); $expense_currency_code = nullable_htmlentities($row['expense_currency_code']); @@ -76,7 +76,7 @@ ob_start(); '$expense_created_at' OR account_archived_at IS NULL) ORDER BY account_archived_at ASC, account_name ASC"); - while ($row = mysqli_fetch_array($sql_accounts)) { + while ($row = mysqli_fetch_assoc($sql_accounts)) { $account_id_select = intval($row['account_id']); $account_name_select = nullable_htmlentities($row['account_name']); $opening_balance = floatval($row['opening_balance']); @@ -88,15 +88,15 @@ ob_start(); } $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select"); - $row = mysqli_fetch_array($sql_payments); + $row = mysqli_fetch_assoc($sql_payments); $total_payments = floatval($row['total_payments']); $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select"); - $row = mysqli_fetch_array($sql_revenues); + $row = mysqli_fetch_assoc($sql_revenues); $total_revenues = floatval($row['total_revenues']); $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select"); - $row = mysqli_fetch_array($sql_expenses); + $row = mysqli_fetch_assoc($sql_expenses); $total_expenses = floatval($row['total_expenses']); $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses; @@ -121,7 +121,7 @@ ob_start(); '$expense_created_at' OR vendor_archived_at IS NULL) ORDER BY vendor_name ASC"); - while ($row = mysqli_fetch_array($sql_select)) { + while ($row = mysqli_fetch_assoc($sql_select)) { $vendor_id_select = intval($row['vendor_id']); $vendor_name_select = nullable_htmlentities($row['vendor_name']); ?> @@ -166,7 +166,7 @@ ob_start(); '$expense_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC"); - while ($row = mysqli_fetch_array($sql_select)) { + while ($row = mysqli_fetch_assoc($sql_select)) { $category_id_select = intval($row['category_id']); $category_name_select = nullable_htmlentities($row['category_name']); ?> @@ -200,7 +200,7 @@ ob_start(); diff --git a/agent/modals/expense/expense_export.php b/agent/modals/expense/expense_export.php index ce9bb705..e932f517 100644 --- a/agent/modals/expense/expense_export.php +++ b/agent/modals/expense/expense_export.php @@ -27,7 +27,7 @@ ob_start(); @@ -51,7 +51,7 @@ ob_start(); @@ -75,7 +75,7 @@ ob_start(); diff --git a/agent/modals/expense/expense_refund.php b/agent/modals/expense/expense_refund.php index ee8677d0..f1c4e6b5 100644 --- a/agent/modals/expense/expense_refund.php +++ b/agent/modals/expense/expense_refund.php @@ -6,7 +6,7 @@ $expense_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM expenses WHERE expense_id = $expense_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $expense_date = nullable_htmlentities($row['expense_date']); $expense_amount = floatval($row['expense_amount']); $expense_currency_code = nullable_htmlentities($row['expense_currency_code']); diff --git a/agent/modals/file/file_link_asset.php b/agent/modals/file/file_link_asset.php index 2483a207..75d825b9 100644 --- a/agent/modals/file/file_link_asset.php +++ b/agent/modals/file/file_link_asset.php @@ -21,11 +21,11 @@ @@ -68,7 +68,7 @@ ob_start(); diff --git a/agent/modals/invoice/invoice_add_ticket.php b/agent/modals/invoice/invoice_add_ticket.php index 44516543..5d4f93fb 100644 --- a/agent/modals/invoice/invoice_add_ticket.php +++ b/agent/modals/invoice/invoice_add_ticket.php @@ -18,7 +18,7 @@ - "> - + @@ -56,4 +56,3 @@ - diff --git a/agent/modals/invoice/invoice_bulk_edit_category.php b/agent/modals/invoice/invoice_bulk_edit_category.php index 93ab1d5d..edc05142 100644 --- a/agent/modals/invoice/invoice_bulk_edit_category.php +++ b/agent/modals/invoice/invoice_bulk_edit_category.php @@ -33,7 +33,7 @@ ob_start(); diff --git a/agent/modals/invoice/invoice_copy.php b/agent/modals/invoice/invoice_copy.php index 76e938fb..0b286df3 100644 --- a/agent/modals/invoice/invoice_copy.php +++ b/agent/modals/invoice/invoice_copy.php @@ -6,7 +6,7 @@ $invoice_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE invoice_id = $invoice_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_name = nullable_htmlentities($row['client_name']); @@ -23,7 +23,7 @@ ob_start(); - +
@@ -35,7 +35,7 @@ ob_start(); " required>
- +
diff --git a/agent/modals/invoice/invoice_edit.php b/agent/modals/invoice/invoice_edit.php index e009e817..dc1a4494 100644 --- a/agent/modals/invoice/invoice_edit.php +++ b/agent/modals/invoice/invoice_edit.php @@ -6,7 +6,7 @@ $invoice_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE invoice_id = $invoice_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $invoice_scope = nullable_htmlentities($row['invoice_scope']); @@ -64,7 +64,7 @@ ob_start(); '$invoice_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC"); - while ($row = mysqli_fetch_array($sql_income_category)) { + while ($row = mysqli_fetch_assoc($sql_income_category)) { $category_id_select = intval($row['category_id']); $category_name_select = nullable_htmlentities($row['category_name']); ?> diff --git a/agent/modals/invoice/invoice_recurring_add.php b/agent/modals/invoice/invoice_recurring_add.php index 2f49d5ba..d2a07e5a 100644 --- a/agent/modals/invoice/invoice_recurring_add.php +++ b/agent/modals/invoice/invoice_recurring_add.php @@ -6,7 +6,7 @@ $invoice_id = intval($_GET['invoice_id']); $sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_id = $invoice_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); diff --git a/agent/modals/invoice/item_edit.php b/agent/modals/invoice/item_edit.php index c690b4ee..71e9a309 100644 --- a/agent/modals/invoice/item_edit.php +++ b/agent/modals/invoice/item_edit.php @@ -5,7 +5,7 @@ require_once '../../../includes/modal_header.php'; $item_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_id = $item_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $item_name = nullable_htmlentities($row['item_name']); $item_description = nullable_htmlentities($row['item_description']); $item_quantity = floatval($row['item_quantity']); @@ -82,7 +82,7 @@ ob_start(); '$item_created_at' OR tax_archived_at IS NULL) ORDER BY tax_name ASC"); - while ($row = mysqli_fetch_array($taxes_sql)) { + while ($row = mysqli_fetch_assoc($taxes_sql)) { $tax_id_select = intval($row['tax_id']); $tax_name = nullable_htmlentities($row['tax_name']); $tax_percent = floatval($row['tax_percent']); diff --git a/agent/modals/location/location_add.php b/agent/modals/location/location_add.php index b8182d26..f69b35a5 100644 --- a/agent/modals/location/location_add.php +++ b/agent/modals/location/location_add.php @@ -7,7 +7,7 @@ $client_id = intval($_GET['client_id'] ?? 0); ob_start(); ?> - +
Creating location
- +
    @@ -31,7 +31,7 @@ ob_start();
  • Notes
    • - +
@@ -39,7 +39,7 @@ ob_start();
- + @@ -55,7 +55,7 @@ ob_start(); @@ -171,7 +171,7 @@ ob_start(); @@ -246,7 +246,7 @@ ob_start(); diff --git a/agent/modals/location/location_bulk_assign_tags.php b/agent/modals/location/location_bulk_assign_tags.php index ec172105..a49cb557 100644 --- a/agent/modals/location/location_bulk_assign_tags.php +++ b/agent/modals/location/location_bulk_assign_tags.php @@ -37,7 +37,7 @@ ob_start(); diff --git a/agent/modals/location/location_edit.php b/agent/modals/location/location_edit.php index dd030f47..aa0b50cb 100644 --- a/agent/modals/location/location_edit.php +++ b/agent/modals/location/location_edit.php @@ -6,7 +6,7 @@ $location_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_id = $location_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $location_name = nullable_htmlentities($row['location_name']); $location_description = nullable_htmlentities($row['location_description']); $location_country = nullable_htmlentities($row['location_country']); @@ -31,7 +31,7 @@ $location_primary = intval($row['location_primary']); // Tags $location_tag_id_array = array(); $sql_location_tags = mysqli_query($mysqli, "SELECT * FROM location_tags WHERE location_id = $location_id"); -while ($row = mysqli_fetch_array($sql_location_tags)) { +while ($row = mysqli_fetch_assoc($sql_location_tags)) { $location_tag_id = intval($row['tag_id']); $location_tag_id_array[] = $location_tag_id; } @@ -49,7 +49,7 @@ ob_start(); - +
    @@ -183,7 +183,7 @@ ob_start(); '$location_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_archived_at ASC, contact_name ASC"); - while ($row = mysqli_fetch_array($sql_contacts)) { + while ($row = mysqli_fetch_assoc($sql_contacts)) { $contact_id_select = intval($row['contact_id']); $contact_name_select = nullable_htmlentities($row['contact_name']); $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); @@ -264,7 +264,7 @@ ob_start(); diff --git a/agent/modals/network/network_add.php b/agent/modals/network/network_add.php index 2c020908..7e4ff615 100644 --- a/agent/modals/network/network_add.php +++ b/agent/modals/network/network_add.php @@ -53,7 +53,7 @@ ob_start(); @@ -97,7 +97,7 @@ ob_start(); @@ -165,7 +165,7 @@ ob_start();
- +
diff --git a/agent/modals/network/network_edit.php b/agent/modals/network/network_edit.php index 18e12958..7d45ec45 100644 --- a/agent/modals/network/network_edit.php +++ b/agent/modals/network/network_edit.php @@ -5,8 +5,8 @@ require_once '../../../includes/modal_header.php'; $network_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_id = $network_id LIMIT 1"); - -$row = mysqli_fetch_array($sql); + +$row = mysqli_fetch_assoc($sql); $network_name = nullable_htmlentities($row['network_name']); $network_description = nullable_htmlentities($row['network_description']); $network_vlan = intval($row['network_vlan']); @@ -84,9 +84,9 @@ ob_start();
- +
@@ -42,11 +42,11 @@ ob_start(); - No Client - @@ -61,7 +61,7 @@ ob_start(); @@ -107,7 +107,7 @@ ob_start(); "SELECT user_id, user_name FROM users WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); - while ($row = mysqli_fetch_array($sql)) { + while ($row = mysqli_fetch_assoc($sql)) { $user_id = intval($row['user_id']); $user_name = nullable_htmlentities($row['user_name']); ?> diff --git a/agent/modals/project/project_edit.php b/agent/modals/project/project_edit.php index 1885b4df..435c8fc4 100644 --- a/agent/modals/project/project_edit.php +++ b/agent/modals/project/project_edit.php @@ -6,7 +6,7 @@ $project_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_id = $project_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $project_prefix = nullable_htmlentities($row['project_prefix']); $project_number = intval($row['project_number']); $project_name = nullable_htmlentities($row['project_name']); @@ -77,7 +77,7 @@ ob_start(); "SELECT user_id, user_name FROM users WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); - while ($row = mysqli_fetch_array($sql_project_managers_select)) { + while ($row = mysqli_fetch_assoc($sql_project_managers_select)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); ?> @@ -95,7 +95,7 @@ ob_start(); diff --git a/agent/modals/project/project_link_closed_ticket.php b/agent/modals/project/project_link_closed_ticket.php index 59b452f1..d0f6757d 100644 --- a/agent/modals/project/project_link_closed_ticket.php +++ b/agent/modals/project/project_link_closed_ticket.php @@ -13,7 +13,7 @@ if ($client_id) { $sql = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_id = $project_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $project_name = nullable_htmlentities($row['project_name']); ob_start(); @@ -35,7 +35,7 @@ ob_start();
"; diff --git a/agent/modals/project/project_link_ticket.php b/agent/modals/project/project_link_ticket.php index 83402523..f11a4675 100644 --- a/agent/modals/project/project_link_ticket.php +++ b/agent/modals/project/project_link_ticket.php @@ -13,7 +13,7 @@ if ($client_id) { $sql = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_id = $project_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $project_name = nullable_htmlentities($row['project_name']); // Generate the HTML form content using output buffering. @@ -40,7 +40,7 @@ ob_start(); @@ -67,7 +67,7 @@ ob_start(); diff --git a/agent/modals/quote/quote_copy.php b/agent/modals/quote/quote_copy.php index 6c8d2054..2fe90eac 100644 --- a/agent/modals/quote/quote_copy.php +++ b/agent/modals/quote/quote_copy.php @@ -6,7 +6,7 @@ $quote_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM quotes LEFT JOIN clients ON quote_client_id = client_id WHERE quote_id = $quote_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $quote_prefix = nullable_htmlentities($row['quote_prefix']); $quote_number = intval($row['quote_number']); $client_id = intval($row['client_id']); @@ -37,7 +37,7 @@ ob_start();
@@ -294,17 +294,17 @@ ob_start(); - "; + if ($current_type !== null) echo ""; ?>
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 495cdfc7..5fd9160a 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php @@ -37,7 +37,7 @@ ob_start(); AND user_archived_at IS NULL ORDER BY user_name DESC" ); - while ($row = mysqli_fetch_array($sql_users_select)) { + while ($row = mysqli_fetch_assoc($sql_users_select)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); 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 a27a6146..fb9a7b6f 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php +++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php @@ -33,7 +33,7 @@ ob_start(); - Uncategorized - ">
- value="1" > @@ -172,7 +172,7 @@ ob_start();
-
+
$contact_name"; @@ -152,7 +152,7 @@ ob_start(); $document_name"; @@ -186,21 +186,21 @@ ob_start(); -
+
$domain_name"; @@ -228,7 +228,7 @@ ob_start();
- +
@@ -90,4 +90,3 @@
- diff --git a/agent/modals/software/software_add.php b/agent/modals/software/software_add.php index 23026366..6199fbb0 100644 --- a/agent/modals/software/software_add.php +++ b/agent/modals/software/software_add.php @@ -57,7 +57,7 @@ ob_start(); @@ -111,7 +111,7 @@ ob_start(); @@ -225,7 +225,7 @@ ob_start(); @@ -54,7 +54,7 @@ ob_start(); - Select Vendor - - @@ -233,7 +233,7 @@ ob_start(); '$software_created_at' OR asset_archived_at IS NULL) AND asset_client_id = $client_id ORDER BY asset_archived_at ASC, asset_name ASC"); - while ($row = mysqli_fetch_array($sql_assets_select)) { + while ($row = mysqli_fetch_assoc($sql_assets_select)) { $asset_id_select = intval($row['asset_id']); $asset_name_select = nullable_htmlentities($row['asset_name']); $asset_type_select = nullable_htmlentities($row['asset_type']); @@ -273,7 +273,7 @@ ob_start(); '$software_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_archived_at ASC, contact_name ASC"); - while ($row = mysqli_fetch_array($sql_contacts_select)) { + while ($row = mysqli_fetch_assoc($sql_contacts_select)) { $contact_id_select = intval($row['contact_id']); $contact_name_select = nullable_htmlentities($row['contact_name']); $contact_email_select = nullable_htmlentities($row['contact_email']); diff --git a/agent/modals/ticket/ticket_add.php b/agent/modals/ticket/ticket_add.php index 3986be59..8e7cebf0 100644 --- a/agent/modals/ticket/ticket_add.php +++ b/agent/modals/ticket/ticket_add.php @@ -60,7 +60,7 @@ ob_start(); @@ -100,7 +100,7 @@ ob_start(); ORDER BY tt.ticket_template_name ASC "); - while ($row = mysqli_fetch_array($sql_ticket_templates)) { + while ($row = mysqli_fetch_assoc($sql_ticket_templates)) { $ticket_template_id_select = intval($row['ticket_template_id']); $ticket_template_name_select = nullable_htmlentities($row['ticket_template_name']); $ticket_template_subject_select = nullable_htmlentities($row['ticket_template_subject']); @@ -160,7 +160,7 @@ ob_start(); @@ -250,7 +250,7 @@ ob_start(); @@ -325,7 +325,7 @@ ob_start(); @@ -401,7 +401,7 @@ ob_start(); @@ -440,7 +440,7 @@ ob_start(); diff --git a/agent/modals/ticket/ticket_add_v2.php b/agent/modals/ticket/ticket_add_v2.php index a7d3961f..6ee2e843 100644 --- a/agent/modals/ticket/ticket_add_v2.php +++ b/agent/modals/ticket/ticket_add_v2.php @@ -71,7 +71,7 @@ ob_start(); ORDER BY tt.ticket_template_name ASC "); - while ($row = mysqli_fetch_array($sql_ticket_templates)) { + while ($row = mysqli_fetch_assoc($sql_ticket_templates)) { $ticket_template_id_select = intval($row['ticket_template_id']); $ticket_template_name_select = nullable_htmlentities($row['ticket_template_name']); $ticket_template_subject_select = nullable_htmlentities($row['ticket_template_subject']); @@ -131,7 +131,7 @@ ob_start(); @@ -166,7 +166,7 @@ ob_start(); "SELECT user_id, user_name FROM users WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); - while ($row = mysqli_fetch_array($sql)) { + while ($row = mysqli_fetch_assoc($sql)) { $user_id = intval($row['user_id']); $user_name = nullable_htmlentities($row['user_name']); ?> @@ -203,7 +203,7 @@ ob_start(); diff --git a/agent/modals/ticket/ticket_add_watcher.php b/agent/modals/ticket/ticket_add_watcher.php index 29b32491..ecfc783b 100644 --- a/agent/modals/ticket/ticket_add_watcher.php +++ b/agent/modals/ticket/ticket_add_watcher.php @@ -29,7 +29,7 @@ ob_start(); '' ORDER BY contact_name ASC"); - while ($row = mysqli_fetch_array($sql_client_contacts_select)) { + while ($row = mysqli_fetch_assoc($sql_client_contacts_select)) { $contact_id_select = intval($row['contact_id']); $contact_name_select = nullable_htmlentities($row['contact_name']); $contact_email_select = nullable_htmlentities($row['contact_email']); diff --git a/agent/modals/ticket/ticket_assign.php b/agent/modals/ticket/ticket_assign.php index 40492fa0..e5663c4e 100644 --- a/agent/modals/ticket/ticket_assign.php +++ b/agent/modals/ticket/ticket_assign.php @@ -10,7 +10,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM tickets LIMIT 1" ); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $ticket_prefix = nullable_htmlentities($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $ticket_assigned_to = intval($row['ticket_assigned_to']); @@ -49,7 +49,7 @@ ob_start(); AND user_archived_at IS NULL ORDER BY user_name ASC" ); - while ($row = mysqli_fetch_array($sql_users_select)) { + while ($row = mysqli_fetch_assoc($sql_users_select)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); diff --git a/agent/modals/ticket/ticket_billable.php b/agent/modals/ticket/ticket_billable.php index 2a259aa6..5dd70063 100644 --- a/agent/modals/ticket/ticket_billable.php +++ b/agent/modals/ticket/ticket_billable.php @@ -6,7 +6,7 @@ $ticket_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $ticket_prefix = nullable_htmlentities($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $ticket_billable = intval($row['ticket_billable']); diff --git a/agent/modals/ticket/ticket_bulk_add_project.php b/agent/modals/ticket/ticket_bulk_add_project.php index e2b0c69f..ab4f40fb 100644 --- a/agent/modals/ticket/ticket_bulk_add_project.php +++ b/agent/modals/ticket/ticket_bulk_add_project.php @@ -37,7 +37,7 @@ ob_start(); AND project_completed_at IS NULL ORDER BY project_name DESC" ); - while ($row = mysqli_fetch_array($sql_projects_select)) { + while ($row = mysqli_fetch_assoc($sql_projects_select)) { $project_id_select = intval($row['project_id']); $project_prefix_select = nullable_htmlentities($row['project_prefix']); $project_number_select = intval($row['project_number']); diff --git a/agent/modals/ticket/ticket_bulk_assign.php b/agent/modals/ticket/ticket_bulk_assign.php index 081e29a5..72d0fbe3 100644 --- a/agent/modals/ticket/ticket_bulk_assign.php +++ b/agent/modals/ticket/ticket_bulk_assign.php @@ -38,7 +38,7 @@ ob_start(); AND user_archived_at IS NULL ORDER BY user_name ASC" ); - while ($row = mysqli_fetch_array($sql_users_select)) { + while ($row = mysqli_fetch_assoc($sql_users_select)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); diff --git a/agent/modals/ticket/ticket_bulk_edit_category.php b/agent/modals/ticket/ticket_bulk_edit_category.php index 70a2cb8d..9c03d66b 100644 --- a/agent/modals/ticket/ticket_bulk_edit_category.php +++ b/agent/modals/ticket/ticket_bulk_edit_category.php @@ -35,7 +35,7 @@ ob_start(); diff --git a/agent/modals/ticket/ticket_change_client.php b/agent/modals/ticket/ticket_change_client.php index 1d013525..09c12653 100644 --- a/agent/modals/ticket/ticket_change_client.php +++ b/agent/modals/ticket/ticket_change_client.php @@ -5,7 +5,7 @@ $ticket_id = intval($_GET['ticket_id']); $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $ticket_prefix = nullable_htmlentities($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $client_id = intval($row['ticket_client_id']); @@ -36,7 +36,7 @@ ob_start(); - diff --git a/agent/modals/ticket/ticket_edit_schedule.php b/agent/modals/ticket/ticket_edit_schedule.php index 877ac3e9..1a2148bc 100644 --- a/agent/modals/ticket/ticket_edit_schedule.php +++ b/agent/modals/ticket/ticket_edit_schedule.php @@ -10,7 +10,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM tickets LIMIT 1" ); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $ticket_prefix = nullable_htmlentities($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $ticket_scheduled_for = nullable_htmlentities($row['ticket_schedule']); diff --git a/agent/modals/ticket/ticket_edit_vendor.php b/agent/modals/ticket/ticket_edit_vendor.php index ada9836c..85b048fa 100644 --- a/agent/modals/ticket/ticket_edit_vendor.php +++ b/agent/modals/ticket/ticket_edit_vendor.php @@ -5,7 +5,7 @@ $ticket_id = intval($_GET['ticket_id']); $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $ticket_prefix = nullable_htmlentities($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $vendor_id = intval($row['ticket_vendor_id']); @@ -37,7 +37,7 @@ ob_start(); diff --git a/agent/modals/ticket/ticket_invoice_add.php b/agent/modals/ticket/ticket_invoice_add.php index 4cba203b..f5af09d8 100644 --- a/agent/modals/ticket/ticket_invoice_add.php +++ b/agent/modals/ticket/ticket_invoice_add.php @@ -19,7 +19,7 @@ $ticket_sql = mysqli_query( LIMIT 1" ); -$row = mysqli_fetch_array($ticket_sql); +$row = mysqli_fetch_assoc($ticket_sql); $client_id = intval($row['client_id']); $client_rate = floatval($row['client_rate']); $ticket_prefix = nullable_htmlentities($row['ticket_prefix']); @@ -71,7 +71,7 @@ $location_phone = formatPhoneNumber($row['location_phone']); //Get Total Ticket Time $ticket_total_reply_time = mysqli_query($mysqli, "SELECT SEC_TO_TIME(SUM(TIME_TO_SEC(ticket_reply_time_worked))) AS ticket_total_reply_time FROM ticket_replies WHERE ticket_reply_archived_at IS NULL AND ticket_reply_ticket_id = $ticket_id"); -$row = mysqli_fetch_array($ticket_total_reply_time); +$row = mysqli_fetch_assoc($ticket_total_reply_time); $ticket_total_reply_time = nullable_htmlentities($row['ticket_total_reply_time']); $sql_invoices = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_status LIKE 'Draft' AND invoice_client_id = $client_id ORDER BY invoice_number ASC"); @@ -122,7 +122,7 @@ ob_start(); @@ -299,7 +299,7 @@ ob_start(); - +
diff --git a/agent/modals/ticket/ticket_reply_edit.php b/agent/modals/ticket/ticket_reply_edit.php index 23216154..5ba56294 100644 --- a/agent/modals/ticket/ticket_reply_edit.php +++ b/agent/modals/ticket/ticket_reply_edit.php @@ -10,7 +10,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM ticket_replies LIMIT 1" ); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']); $ticket_reply_time_worked = date_create($row['ticket_reply_time_worked']); $ticket_reply_time_worked_formatted = date_format($ticket_reply_time_worked, 'H:i:s'); diff --git a/agent/modals/ticket/ticket_reply_redact.php b/agent/modals/ticket/ticket_reply_redact.php index 1df43505..f61ca57e 100644 --- a/agent/modals/ticket/ticket_reply_redact.php +++ b/agent/modals/ticket/ticket_reply_redact.php @@ -10,7 +10,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM ticket_replies LIMIT 1" ); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $ticket_reply = nullable_htmlentities($row['ticket_reply']); $client_id = intval($row['ticket_client_id']); diff --git a/agent/modals/ticket/ticket_task_approver_add.php b/agent/modals/ticket/ticket_task_approver_add.php index 03064481..1b04f348 100644 --- a/agent/modals/ticket/ticket_task_approver_add.php +++ b/agent/modals/ticket/ticket_task_approver_add.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM tasks LIMIT 1" ); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $task_name = nullable_htmlentities($row['task_name']); // Generate the HTML form content using output buffering. diff --git a/agent/modals/ticket/ticket_task_edit.php b/agent/modals/ticket/ticket_task_edit.php index 7dab0417..6243a8c7 100644 --- a/agent/modals/ticket/ticket_task_edit.php +++ b/agent/modals/ticket/ticket_task_edit.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM tasks LIMIT 1" ); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $task_name = nullable_htmlentities($row['task_name']); $task_completion_estimate = intval($row['task_completion_estimate']); $task_completed_at = nullable_htmlentities($row['task_completed_at']); @@ -73,7 +73,7 @@ ob_start();
- diff --git a/agent/modals/transfer/transfer_edit.php b/agent/modals/transfer/transfer_edit.php index 9d4689b7..4305496e 100644 --- a/agent/modals/transfer/transfer_edit.php +++ b/agent/modals/transfer/transfer_edit.php @@ -11,7 +11,7 @@ $sql = mysqli_query($mysqli, "SELECT transfer_created_at, expense_date AS transf LIMIT 1" ); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $transfer_date = nullable_htmlentities($row['transfer_date']); $transfer_account_from = intval($row['transfer_account_from']); $transfer_account_to = intval($row['transfer_account_to']); @@ -73,7 +73,7 @@ ob_start(); '$transfer_created_at' OR account_archived_at IS NULL) ORDER BY account_archived_at ASC, account_name ASC"); - while ($row = mysqli_fetch_array($sql_accounts)) { + while ($row = mysqli_fetch_assoc($sql_accounts)) { $account_id_select = intval($row['account_id']); $account_name_select = nullable_htmlentities($row['account_name']); $opening_balance = floatval($row['opening_balance']); @@ -85,15 +85,15 @@ ob_start(); } $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select"); - $row = mysqli_fetch_array($sql_payments); + $row = mysqli_fetch_assoc($sql_payments); $total_payments = floatval($row['total_payments']); $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select"); - $row = mysqli_fetch_array($sql_revenues); + $row = mysqli_fetch_assoc($sql_revenues); $total_revenues = floatval($row['total_revenues']); $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select"); - $row = mysqli_fetch_array($sql_expenses); + $row = mysqli_fetch_assoc($sql_expenses); $total_expenses = floatval($row['total_expenses']); $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses; @@ -117,7 +117,7 @@ ob_start(); '$transfer_created_at' OR account_archived_at IS NULL) ORDER BY account_archived_at ASC, account_name ASC"); - while ($row = mysqli_fetch_array($sql2)) { + while ($row = mysqli_fetch_assoc($sql2)) { $account_id2 = intval($row['account_id']); $account_name = nullable_htmlentities($row['account_name']); $opening_balance = floatval($row['opening_balance']); @@ -129,15 +129,15 @@ ob_start(); } $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id2"); - $row = mysqli_fetch_array($sql_payments); + $row = mysqli_fetch_assoc($sql_payments); $total_payments = floatval($row['total_payments']); $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id2"); - $row = mysqli_fetch_array($sql_revenues); + $row = mysqli_fetch_assoc($sql_revenues); $total_revenues = floatval($row['total_revenues']); $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id2"); - $row = mysqli_fetch_array($sql_expenses); + $row = mysqli_fetch_assoc($sql_expenses); $total_expenses = floatval($row['total_expenses']); $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses; @@ -167,7 +167,7 @@ ob_start(); diff --git a/agent/modals/trip/trip_add.php b/agent/modals/trip/trip_add.php index 8cd4e84a..4a57ed27 100644 --- a/agent/modals/trip/trip_add.php +++ b/agent/modals/trip/trip_add.php @@ -64,7 +64,7 @@ ob_start(); @@ -125,7 +125,7 @@ ob_start(); diff --git a/agent/modals/trip/trip_copy.php b/agent/modals/trip/trip_copy.php index d8791a1a..19373aa2 100644 --- a/agent/modals/trip/trip_copy.php +++ b/agent/modals/trip/trip_copy.php @@ -6,7 +6,7 @@ $trip_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM trips WHERE trip_id = $trip_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $trip_date = nullable_htmlentities($row['trip_date']); $trip_purpose = nullable_htmlentities($row['trip_purpose']); $trip_source = nullable_htmlentities($row['trip_source']); @@ -80,7 +80,7 @@ ob_start(); 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); - while ($row = mysqli_fetch_array($sql_users)) { + while ($row = mysqli_fetch_assoc($sql_users)) { $user_id_select = intval($row['user_id']); $user_name_select = nullable_htmlentities($row['user_name']); ?> @@ -143,7 +143,7 @@ ob_start(); diff --git a/agent/modals/trip/trip_edit.php b/agent/modals/trip/trip_edit.php index 549b47e7..34fbfd20 100644 --- a/agent/modals/trip/trip_edit.php +++ b/agent/modals/trip/trip_edit.php @@ -6,7 +6,7 @@ $trip_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM trips WHERE trip_id = $trip_id LIMIT 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $trip_date = nullable_htmlentities($row['trip_date']); $trip_purpose = nullable_htmlentities($row['trip_purpose']); $trip_source = nullable_htmlentities($row['trip_source']); @@ -81,7 +81,7 @@ ob_start(); @@ -145,7 +145,7 @@ ob_start(); '$trip_created_at' OR client_archived_at IS NULL ORDER BY client_archived_at ASC, client_name ASC"); - while ($row = mysqli_fetch_array($sql_clients)) { + while ($row = mysqli_fetch_assoc($sql_clients)) { $client_id_select = intval($row['client_id']); $client_name_select = nullable_htmlentities($row['client_name']); $client_archived_at = nullable_htmlentities($row['client_archived_at']); diff --git a/agent/modals/vendor/vendor_add_from_template.php b/agent/modals/vendor/vendor_add_from_template.php index 27af3dd7..69d51c34 100644 --- a/agent/modals/vendor/vendor_add_from_template.php +++ b/agent/modals/vendor/vendor_add_from_template.php @@ -30,7 +30,7 @@ ob_start(); diff --git a/agent/networks.php b/agent/networks.php index b4c344b5..143bd49e 100644 --- a/agent/networks.php +++ b/agent/networks.php @@ -123,7 +123,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); AND ( EXISTS (SELECT 1 FROM networks WHERE network_location_id = location_id AND $archive_query) OR location_id = $location_filter) ORDER BY location_name ASC "); - while ($row = mysqli_fetch_array($sql_locations_filter)) { + while ($row = mysqli_fetch_assoc($sql_locations_filter)) { $location_id = intval($row['location_id']); $location_name = nullable_htmlentities($row['location_name']); ?> @@ -150,7 +150,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $access_permission_query ORDER BY client_name ASC "); - while ($row = mysqli_fetch_array($sql_clients_filter)) { + while ($row = mysqli_fetch_assoc($sql_clients_filter)) { $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); ?> @@ -248,7 +248,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- - + +
" id="advancedFilter"> @@ -111,7 +111,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + diff --git a/agent/payments.php b/agent/payments.php index 8679ff90..551a3c3c 100644 --- a/agent/payments.php +++ b/agent/payments.php @@ -91,7 +91,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -111,7 +111,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -195,7 +195,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); 0) { - while ($row = mysqli_fetch_array($sql_task_templates)) { + while ($row = mysqli_fetch_assoc($sql_task_templates)) { $task_order = intval($row['task_template_order']); $task_name = sanitizeInput($row['task_template_name']); @@ -853,7 +853,7 @@ if (isset($_POST['bulk_edit_client_industry'])) { $client_id = intval($client_id); $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_name = sanitizeInput($row['client_name']); mysqli_query($mysqli,"UPDATE clients SET client_type = '$industry' WHERE client_id = $client_id"); @@ -887,7 +887,7 @@ if (isset($_POST['bulk_edit_client_referral'])) { $client_id = intval($client_id); $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_name = sanitizeInput($row['client_name']); mysqli_query($mysqli,"UPDATE clients SET client_referral = '$referral' WHERE client_id = $client_id"); @@ -921,7 +921,7 @@ if (isset($_POST['bulk_edit_client_hourly_rate'])) { $client_id = intval($client_id); $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_name = sanitizeInput($row['client_name']); mysqli_query($mysqli,"UPDATE clients SET client_rate = '$rate' WHERE client_id = $client_id"); @@ -953,7 +953,7 @@ if (isset($_POST['bulk_assign_client_tags'])) { $client_id = intval($client_id); $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_name = sanitizeInput($row['client_name']); if ($_POST['bulk_remove_tags']) { @@ -1030,7 +1030,7 @@ if (isset($_POST['bulk_send_client_email']) && isset($_POST['client_ids'])) { $data = []; $unique_contacts = []; - while ($row = mysqli_fetch_array($result)) { + while ($row = mysqli_fetch_assoc($result)) { $contact_email = sanitizeInput($row['contact_email']); // Skip if email is missing or invalid @@ -1084,7 +1084,7 @@ if (isset($_POST['bulk_archive_clients'])) { $client_id = intval($client_id); $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_name = sanitizeInput($row['client_name']); mysqli_query($mysqli,"UPDATE clients SET client_archived_at = NOW() WHERE client_id = $client_id"); @@ -1120,7 +1120,7 @@ if (isset($_POST['bulk_unarchive_clients'])) { $client_id = intval($client_id); $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_name = sanitizeInput($row['client_name']); mysqli_query($mysqli,"UPDATE clients SET client_archived_at = NULL WHERE client_id = $client_id"); @@ -1148,7 +1148,7 @@ if (isset($_POST["export_client_pdf"])) { enforceUserPermission("module_financial", 1); $sql = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = nullable_htmlentities($row['company_name']); $company_phone_country_code = nullable_htmlentities($row['company_phone_country_code']); $company_phone = nullable_htmlentities(formatPhoneNumber($row['company_phone'], $company_phone_country_code)); @@ -1186,7 +1186,7 @@ if (isset($_POST["export_client_pdf"])) { LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1 WHERE client_id = $client_id "); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); // Immediately sanitize retrieved values $client_name = nullable_htmlentities($row["client_name"]); @@ -1404,7 +1404,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_contacts)) { + while ($row = mysqli_fetch_assoc($sql_contacts)) { $contact_name = nullable_htmlentities(getFallBack($row["contact_name"])); $contact_title = nullable_htmlentities(getFallBack($row["contact_title"])); $contact_department = nullable_htmlentities($row["contact_department"]); @@ -1446,7 +1446,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_locations)) { + while ($row = mysqli_fetch_assoc($sql_locations)) { $location_name = nullable_htmlentities($row["location_name"]); $location_address = nullable_htmlentities($row["location_address"]); $location_city = nullable_htmlentities($row["location_city"]); @@ -1482,7 +1482,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_vendors)) { + while ($row = mysqli_fetch_assoc($sql_vendors)) { $vendor_name = nullable_htmlentities($row["vendor_name"]); $vendor_description = nullable_htmlentities($row["vendor_description"]); $vendor_account_number = nullable_htmlentities($row["vendor_account_number"]); @@ -1520,7 +1520,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_credentials)) { + while ($row = mysqli_fetch_assoc($sql_credentials)) { $credential_name = nullable_htmlentities($row["credential_name"]); $credential_description = getFallback(nullable_htmlentities($row["credential_description"])); $credential_username = nullable_htmlentities(decryptCredentialEntry($row["credential_username"])); @@ -1570,7 +1570,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_asset_workstations)) { + while ($row = mysqli_fetch_assoc($sql_asset_workstations)) { $asset_name = nullable_htmlentities($row["asset_name"]); $asset_type = nullable_htmlentities($row["asset_type"]); $asset_make = nullable_htmlentities($row["asset_make"]); @@ -1621,7 +1621,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_asset_servers)) { + while ($row = mysqli_fetch_assoc($sql_asset_servers)) { $asset_name = nullable_htmlentities($row["asset_name"]); $asset_make = nullable_htmlentities($row["asset_make"]); $asset_model = nullable_htmlentities($row["asset_model"]); @@ -1665,7 +1665,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_asset_vms)) { + while ($row = mysqli_fetch_assoc($sql_asset_vms)) { $asset_name = nullable_htmlentities($row["asset_name"]); $asset_os = nullable_htmlentities($row["asset_os"]); $asset_ip = nullable_htmlentities($row["interface_ip"]); @@ -1703,7 +1703,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_asset_network)) { + while ($row = mysqli_fetch_assoc($sql_asset_network)) { $asset_name = nullable_htmlentities($row["asset_name"]); $asset_type = nullable_htmlentities($row["asset_type"]); $asset_make = nullable_htmlentities($row["asset_make"]); @@ -1752,7 +1752,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_asset_other)) { + while ($row = mysqli_fetch_assoc($sql_asset_other)) { $asset_name = nullable_htmlentities($row["asset_name"]); $asset_type = nullable_htmlentities($row["asset_type"]); $asset_make = nullable_htmlentities($row["asset_make"]); @@ -1799,7 +1799,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_software)) { + while ($row = mysqli_fetch_assoc($sql_software)) { $software_name = nullable_htmlentities($row["software_name"]); $software_type = nullable_htmlentities($row["software_type"]); $software_license_type = nullable_htmlentities($row["software_license_type"]); @@ -1836,7 +1836,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_user_licenses)) { + while ($row = mysqli_fetch_assoc($sql_user_licenses)) { $contact_name = nullable_htmlentities($row["contact_name"]); $software_name = nullable_htmlentities($row["software_name"]); $html .= " @@ -1863,7 +1863,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_asset_licenses)) { + while ($row = mysqli_fetch_assoc($sql_asset_licenses)) { $asset_name = nullable_htmlentities($row["asset_name"]); $software_name = nullable_htmlentities($row["software_name"]); $html .= " @@ -1893,7 +1893,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_networks)) { + while ($row = mysqli_fetch_assoc($sql_networks)) { $network_name = nullable_htmlentities($row["network_name"]); $network_vlan = nullable_htmlentities($row["network_vlan"]); $network = nullable_htmlentities($row["network"]); @@ -1926,7 +1926,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_domains)) { + while ($row = mysqli_fetch_assoc($sql_domains)) { $domain_name = nullable_htmlentities($row["domain_name"]); $domain_expire = nullable_htmlentities($row["domain_expire"]); $html .= " @@ -1955,7 +1955,7 @@ if (isset($_POST["export_client_pdf"])) { "; - while ($row = mysqli_fetch_array($sql_certficates)) { + while ($row = mysqli_fetch_assoc($sql_certficates)) { $certificate_name = nullable_htmlentities($row["certificate_name"]); $certificate_domain = nullable_htmlentities($row["certificate_domain"]); $certificate_issued_by = nullable_htmlentities($row["certificate_issued_by"]); diff --git a/agent/post/contact.php b/agent/post/contact.php index fe85d44a..d1ad06c8 100644 --- a/agent/post/contact.php +++ b/agent/post/contact.php @@ -87,7 +87,7 @@ if (isset($_POST['edit_contact'])) { // Get Exisiting Contact Photo and contact_user_id $sql = mysqli_query($mysqli,"SELECT contact_photo, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $existing_file_name = sanitizeInput($row['contact_photo']); $contact_user_id = intval($row['contact_user_id']); @@ -172,7 +172,7 @@ if (isset($_POST['edit_contact'])) { // Get Company Phone Number $sql = mysqli_query($mysqli,"SELECT company_name, company_phone FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); @@ -226,7 +226,7 @@ if (isset($_POST['add_contact_note'])) { // Get Contact details for logging and alerting $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -251,7 +251,7 @@ if (isset($_GET['archive_contact_note'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_note_type, contact_id, contact_name, contact_client_id FROM contact_notes LEFT JOIN contacts ON contact_id = contact_note_contact_id WHERE contact_note_id = $contact_note_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_note_type = sanitizeInput($row['contact_note_type']); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -275,7 +275,7 @@ if (isset($_GET['unarchive_contact_note'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_note_type, contact_id, contact_name, contact_client_id FROM contact_notes LEFT JOIN contacts ON contact_id = contact_note_contact_id WHERE contact_note_id = $contact_note_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_note_type = sanitizeInput($row['contact_note_type']); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -299,7 +299,7 @@ if (isset($_GET['delete_contact_note'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_note_type, contact_id, contact_name, contact_client_id FROM contact_notes LEFT JOIN contacts ON contact_id = contact_note_contact_id WHERE contact_note_id = $contact_note_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_note_type = sanitizeInput($row['contact_note_type']); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -323,7 +323,7 @@ if (isset($_POST['bulk_assign_contact_location'])) { // Get Location name for logging and Notification $sql = mysqli_query($mysqli,"SELECT location_name, location_client_id FROM locations WHERE location_id = $location_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $location_name = sanitizeInput($row['location_name']); $client_id = intval($row['location_client_id']); @@ -338,7 +338,7 @@ if (isset($_POST['bulk_assign_contact_location'])) { // Get Contact Details for Logging $sql = mysqli_query($mysqli,"SELECT contact_name FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); mysqli_query($mysqli,"UPDATE contacts SET contact_location_id = $location_id WHERE contact_id = $contact_id"); @@ -373,7 +373,7 @@ if (isset($_POST['bulk_edit_contact_phone'])) { // Get Contact Details for Logging $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -409,7 +409,7 @@ if (isset($_POST['bulk_edit_contact_department'])) { // Get Contact Details for Logging $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -447,7 +447,7 @@ if (isset($_POST['bulk_edit_contact_role'])) { // Get Contact Details for Logging $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -483,7 +483,7 @@ if (isset($_POST['bulk_assign_contact_tags'])) { // Get Contact Details for Logging $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); @@ -534,7 +534,7 @@ if (isset($_POST['send_bulk_mail_now'])) { $contact_id = intval($contact_id); $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); $client_id = intval($row['contact_client_id']); @@ -579,7 +579,7 @@ if (isset($_POST['bulk_archive_contacts'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id, contact_primary, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $contact_primary = intval($row['contact_primary']); $client_id = intval($row['contact_client_id']); @@ -628,7 +628,7 @@ if (isset($_POST['bulk_unarchive_contacts'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -671,7 +671,7 @@ if (isset($_POST['bulk_delete_contacts'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -705,7 +705,7 @@ if (isset($_GET['anonymize_contact'])) { // Get contact & client info $sql = mysqli_query($mysqli,"SELECT contact_name, contact_email, contact_client_id, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $contact_first_name = explode(" ", $contact_name)[0]; @@ -745,7 +745,7 @@ if (isset($_GET['anonymize_contact'])) { // Redact audit logs $log_sql = mysqli_query($mysqli, "SELECT * FROM logs WHERE log_client_id = $client_id"); - while ($log = mysqli_fetch_array($log_sql)) { + while ($log = mysqli_fetch_assoc($log_sql)) { $log_id = intval($log['log_id']); $description = $log['log_description']; $description = str_ireplace($info_to_redact, "*****", $description); @@ -757,7 +757,7 @@ if (isset($_GET['anonymize_contact'])) { // Get all tickets this contact raised $contact_tickets_sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_client_id = $client_id AND ticket_contact_id = $contact_id"); - while ($ticket = mysqli_fetch_array($contact_tickets_sql)) { + while ($ticket = mysqli_fetch_assoc($contact_tickets_sql)) { $ticket_id = intval($ticket['ticket_id']); @@ -777,7 +777,7 @@ if (isset($_GET['anonymize_contact'])) { // Redact contact name or email in the replies of all tickets they raised $ticket_replies_sql = mysqli_query($mysqli, "SELECT * FROM ticket_replies WHERE ticket_reply_ticket_id = $ticket_id"); - while($ticket_reply = mysqli_fetch_array($ticket_replies_sql)) { + while($ticket_reply = mysqli_fetch_assoc($ticket_replies_sql)) { $ticket_reply_id = intval($ticket_reply['ticket_reply_id']); $ticket_reply_details = $ticket_reply['ticket_reply']; $ticket_reply_details = str_ireplace($info_to_redact, "*****", $ticket_reply_details); @@ -809,7 +809,7 @@ if (isset($_GET['archive_contact'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -837,7 +837,7 @@ if (isset($_GET['unarchive_contact'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -865,7 +865,7 @@ if (isset($_GET['delete_contact'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -894,7 +894,7 @@ if (isset($_POST['link_contact_to_asset'])) { // Get Asset Name and Client ID for logging $sql_asset = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id"); - $row = mysqli_fetch_array($sql_asset); + $row = mysqli_fetch_assoc($sql_asset); $asset_name = sanitizeInput($row['asset_name']); $client_id = intval($row['asset_client_id']); @@ -920,7 +920,7 @@ if (isset($_GET['unlink_asset_from_contact'])) { // Get asset Name and Client ID for logging $sql_asset = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id"); - $row = mysqli_fetch_array($sql_asset); + $row = mysqli_fetch_assoc($sql_asset); $asset_name = sanitizeInput($row['asset_name']); $client_id = intval($row['asset_client_id']); @@ -946,7 +946,7 @@ if (isset($_POST['link_software_to_contact'])) { // Get software Name and Client ID for logging $sql_software = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_array($sql_software); + $row = mysqli_fetch_assoc($sql_software); $software_name = sanitizeInput($row['software_name']); $client_id = intval($row['software_client_id']); @@ -972,7 +972,7 @@ if (isset($_GET['unlink_software_from_contact'])) { // Get software Name and Client ID for logging $sql_software = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_array($sql_software); + $row = mysqli_fetch_assoc($sql_software); $software_name = sanitizeInput($row['software_name']); $client_id = intval($row['software_client_id']); @@ -998,7 +998,7 @@ if (isset($_POST['link_contact_to_credential'])) { // Get credential Name and Client ID for logging $sql_credential = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); - $row = mysqli_fetch_array($sql_credential); + $row = mysqli_fetch_assoc($sql_credential); $credential_name = sanitizeInput($row['credential_name']); $client_id = intval($row['credential_client_id']); @@ -1024,7 +1024,7 @@ if (isset($_GET['unlink_credential_from_contact'])) { // Get credential Name and Client ID for logging $sql_credential = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); - $row = mysqli_fetch_array($sql_credential); + $row = mysqli_fetch_assoc($sql_credential); $credential_name = sanitizeInput($row['credential_name']); $client_id = intval($row['credential_client_id']); @@ -1050,7 +1050,7 @@ if (isset($_POST['link_service_to_contact'])) { // Get service Name and Client ID for logging $sql_service = mysqli_query($mysqli,"SELECT service_name, service_client_id FROM services WHERE service_id = $service_id"); - $row = mysqli_fetch_array($sql_service); + $row = mysqli_fetch_assoc($sql_service); $service_name = sanitizeInput($row['service_name']); $client_id = intval($row['service_client_id']); @@ -1076,7 +1076,7 @@ if (isset($_GET['unlink_service_from_contact'])) { // Get service Name and Client ID for logging $sql_service = mysqli_query($mysqli,"SELECT service_name, service_client_id FROM services WHERE service_id = $service_id"); - $row = mysqli_fetch_array($sql_service); + $row = mysqli_fetch_assoc($sql_service); $service_name = sanitizeInput($row['service_name']); $client_id = intval($row['service_client_id']); @@ -1102,7 +1102,7 @@ if (isset($_POST['link_contact_to_file'])) { // Get file Name and Client ID for logging $sql_file = mysqli_query($mysqli,"SELECT file_name, file_client_id FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql_file); + $row = mysqli_fetch_assoc($sql_file); $file_name = sanitizeInput($row['file_name']); $client_id = intval($row['file_client_id']); @@ -1129,7 +1129,7 @@ if (isset($_GET['unlink_contact_from_file'])) { // Get file Name and Client ID for logging $sql_file = mysqli_query($mysqli,"SELECT file_name, file_client_id FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql_file); + $row = mysqli_fetch_assoc($sql_file); $file_name = sanitizeInput($row['file_name']); $client_id = intval($row['file_client_id']); diff --git a/agent/post/credential.php b/agent/post/credential.php index 0ee96a44..723566f9 100644 --- a/agent/post/credential.php +++ b/agent/post/credential.php @@ -79,7 +79,7 @@ if(isset($_GET['archive_credential'])){ // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $credential_name = sanitizeInput($row['credential_name']); $client_id = intval($row['credential_client_id']); @@ -101,7 +101,7 @@ if(isset($_GET['unarchive_credential'])){ // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $credential_name = sanitizeInput($row['credential_name']); $client_id = intval($row['credential_client_id']); @@ -123,7 +123,7 @@ if (isset($_GET['delete_credential'])) { // Get Credential Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $credential_name = sanitizeInput($row['credential_name']); $client_id = intval($row['credential_client_id']); @@ -152,7 +152,7 @@ if (isset($_POST['bulk_assign_credential_tags'])) { // Get Contact Details for Logging $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $credential_name = sanitizeInput($row['credential_name']); $client_id = intval($row['credential_client_id']); @@ -205,7 +205,7 @@ if (isset($_POST['bulk_archive_credentials'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $credential_name = sanitizeInput($row['credential_name']); $client_id = intval($row['credential_client_id']); @@ -242,7 +242,7 @@ if (isset($_POST['bulk_unarchive_credentials'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $credential_name = sanitizeInput($row['credential_name']); $client_id = intval($row['credential_client_id']); @@ -280,7 +280,7 @@ if (isset($_POST['bulk_delete_credentials'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $credential_name = sanitizeInput($row['credential_name']); $client_id = intval($row['credential_client_id']); diff --git a/agent/post/document.php b/agent/post/document.php index de467358..fb7204d4 100644 --- a/agent/post/document.php +++ b/agent/post/document.php @@ -66,7 +66,7 @@ if (isset($_POST['add_document_from_template'])) { WHERE document_template_id = $document_template_id" ); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_template_name = sanitizeInput($row['document_template_name']); $template_content_html = $row['document_template_content']; // raw HTML from template @@ -145,7 +145,7 @@ if (isset($_POST['edit_document'])) { AND document_id = $document_id" ); - $row = mysqli_fetch_array($sql_original_document); + $row = mysqli_fetch_assoc($sql_original_document); $original_document_name = sanitizeInput($row['document_name']); $original_document_description = sanitizeInput($row['document_description']); @@ -238,13 +238,13 @@ if (isset($_POST['move_document'])) { // Get Document Name Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); // Get Folder Name for logging $sql_folder = mysqli_query($mysqli,"SELECT folder_name FROM folders WHERE folder_id = $folder_id"); - $row = mysqli_fetch_array($sql_folder); + $row = mysqli_fetch_assoc($sql_folder); $folder_name = sanitizeInput($row['folder_name']); // Document edit query @@ -268,7 +268,7 @@ if (isset($_POST['rename_document'])) { // Get Document Name before renaming for logging $sql_document = mysqli_query($mysqli,"SELECT document_name FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $old_document_name = sanitizeInput($row['document_name']); // Document edit query @@ -291,7 +291,7 @@ if (isset($_POST['bulk_move_document'])) { // 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); + $row = mysqli_fetch_assoc($sql); $folder_name = sanitizeInput($row['folder_name']); $client_id = intval($row['folder_client_id']); @@ -330,7 +330,7 @@ if (isset($_POST['link_file_to_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -357,7 +357,7 @@ if (isset($_GET['unlink_file_from_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -383,7 +383,7 @@ if (isset($_POST['link_vendor_to_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -410,7 +410,7 @@ if (isset($_GET['unlink_vendor_from_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -437,7 +437,7 @@ if (isset($_POST['link_contact_to_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -464,7 +464,7 @@ if (isset($_GET['unlink_contact_from_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -490,7 +490,7 @@ if (isset($_POST['link_asset_to_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -516,7 +516,7 @@ if (isset($_GET['unlink_asset_from_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -542,7 +542,7 @@ if (isset($_POST['link_software_to_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -569,7 +569,7 @@ if (isset($_GET['unlink_software_from_document'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -601,7 +601,7 @@ if (isset($_POST['toggle_document_visibility'])) { // Get Document Name and Client ID for logging $sql_document = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql_document); + $row = mysqli_fetch_assoc($sql_document); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -623,7 +623,7 @@ if (isset($_GET['export_document'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT document_name, document_content, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $document_name = sanitizeInput($row['document_name']); $document_content = $row['document_content']; $client_id = intval($row['document_client_id']); @@ -667,7 +667,7 @@ if (isset($_GET['archive_document'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -730,7 +730,7 @@ if (isset($_GET['delete_document_version'])) { // Get Document $sql = mysqli_query($mysqli,"SELECT document_version_name, document_client_id FROM documents, document_versions WHERE document_version_document_id = document_id AND document_version_id = $document_version_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['document_client_id']); $document_version_name = sanitizeInput($row['document_version_name']); @@ -752,7 +752,7 @@ if (isset($_GET['delete_document'])) { // Get Document Name and Client ID for logging $sql = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['document_client_id']); $document_name = sanitizeInput($row['document_name']); diff --git a/agent/post/domain.php b/agent/post/domain.php index 6bef18f3..9bfc6ebb 100644 --- a/agent/post/domain.php +++ b/agent/post/domain.php @@ -153,7 +153,7 @@ if (isset($_GET['archive_domain'])) { //Get domain Name $sql = mysqli_query($mysqli,"SELECT * FROM domains WHERE domain_id = $domain_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $domain_name = sanitizeInput($row['domain_name']); $client_id = intval($row['domain_client_id']); @@ -175,7 +175,7 @@ if(isset($_GET['unarchive_domain'])){ // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT domain_name, domain_client_id FROM domains WHERE domain_id = $domain_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $domain_name = sanitizeInput($row['domain_name']); $client_id = intval($row['domain_client_id']); @@ -197,7 +197,7 @@ if (isset($_GET['delete_domain'])) { // Get Domain Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT domain_name, domain_client_id FROM domains WHERE domain_id = $domain_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $domain_name = sanitizeInput($row['domain_name']); $client_id = intval($row['domain_client_id']); @@ -229,7 +229,7 @@ if (isset($_POST['bulk_archive_domains'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT domain_name, domain_client_id FROM domains WHERE domain_id = $domain_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $domain_name = sanitizeInput($row['domain_name']); $client_id = intval($row['domain_client_id']); @@ -266,7 +266,7 @@ if (isset($_POST['bulk_unarchive_domains'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT domain_name, domain_client_id FROM domains WHERE domain_id = $domain_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $domain_name = sanitizeInput($row['domain_name']); $client_id = intval($row['domain_client_id']); @@ -304,7 +304,7 @@ if (isset($_POST['bulk_delete_domains'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT domain_name, domain_client_id FROM domains WHERE domain_id = $domain_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $domain_name = sanitizeInput($row['domain_name']); $client_id = intval($row['domain_client_id']); diff --git a/agent/post/event.php b/agent/post/event.php index 0a1f8111..93cd4eae 100644 --- a/agent/post/event.php +++ b/agent/post/event.php @@ -54,13 +54,13 @@ if (isset($_POST['add_event'])) { if ($email_event == 1) { $sql_client = mysqli_query($mysqli,"SELECT * FROM clients JOIN contacts ON contact_client_id = client_id WHERE contact_primary = 1 AND client_id = $client"); - $row = mysqli_fetch_array($sql_client); + $row = mysqli_fetch_assoc($sql_client); $client_name = sanitizeInput($row['client_name']); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); $sql_company = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql_company); + $row = mysqli_fetch_assoc($sql_company); $company_name = sanitizeInput($row['company_name']); $company_country = sanitizeInput($row['company_country']); $company_address = sanitizeInput($row['company_address']); @@ -121,13 +121,13 @@ if (isset($_POST['edit_event'])) { if ($email_event == 1) { $sql_client = mysqli_query($mysqli,"SELECT * FROM clients JOIN contacts ON contact_client_id = client_id WHERE contact_primary = 1 AND client_id = $client"); - $row = mysqli_fetch_array($sql_client); + $row = mysqli_fetch_assoc($sql_client); $client_name = sanitizeInput($row['client_name']); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); $sql_company = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql_company); + $row = mysqli_fetch_assoc($sql_company); $company_name = sanitizeInput($row['company_name']); $company_country = sanitizeInput($row['company_country']); $company_address = sanitizeInput($row['company_address']); @@ -177,12 +177,12 @@ if (isset($_POST['edit_event'])) { } if (isset($_GET['delete_event'])) { - + $event_id = intval($_GET['delete_event']); // Get Event Title $sql = mysqli_query($mysqli,"SELECT * FROM calendar_events WHERE event_id = $event_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $event_title = sanitizeInput($row['event_title']); $client_id = intval($row['event_client_id']); diff --git a/agent/post/expense.php b/agent/post/expense.php index 5e6ad19a..99a4f648 100644 --- a/agent/post/expense.php +++ b/agent/post/expense.php @@ -16,7 +16,7 @@ if (isset($_POST['add_expense'])) { // Check for and process attachment $extended_alert_description = ''; - + if (isset($_FILES['file']['tmp_name'])) { if ($new_file_name = checkFileUpload($_FILES['file'], array('jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf'))) { @@ -81,11 +81,11 @@ if (isset($_POST['edit_expense'])) { } if (isset($_GET['delete_expense'])) { - + $expense_id = intval($_GET['delete_expense']); $sql = mysqli_query($mysqli,"SELECT * FROM expenses WHERE expense_id = $expense_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $expense_receipt = sanitizeInput($row['expense_receipt']); $expense_description = sanitizeInput($row['expense_description']); $client_id = intval($row['expense_client_id']); @@ -120,7 +120,7 @@ if (isset($_POST['bulk_edit_expense_category'])) { // Get Expense Details for Logging $sql = mysqli_query($mysqli,"SELECT expense_description, expense_client_id FROM expenses WHERE expense_id = $expense_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $expense_description = sanitizeInput($row['expense_description']); $client_id = intval($row['expense_client_id']); @@ -157,7 +157,7 @@ if (isset($_POST['bulk_edit_expense_account'])) { // Get Expense Details for Logging $sql = mysqli_query($mysqli,"SELECT expense_description, expense_client_id FROM expenses WHERE expense_id = $expense_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $expense_description = sanitizeInput($row['expense_description']); $client_id = intval($row['expense_client_id']); @@ -209,7 +209,7 @@ if (isset($_POST['bulk_edit_expense_client'])) { } if (isset($_POST['bulk_delete_expenses'])) { - + validateCSRFToken($_POST['csrf_token']); validateAdminRole(); @@ -225,7 +225,7 @@ if (isset($_POST['bulk_delete_expenses'])) { $expense_id = intval($expense_id); $sql = mysqli_query($mysqli,"SELECT * FROM expenses WHERE expense_id = $expense_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $expense_description = sanitizeInput($row['expense_description']); $expense_receipt = sanitizeInput($row['expense_receipt']); $client_id = intval($row['expense_client_id']); @@ -249,7 +249,7 @@ if (isset($_POST['bulk_delete_expenses'])) { } if (isset($_POST['export_expenses_csv'])) { - + $date_from = sanitizeInput($_POST['date_from']); $date_to = sanitizeInput($_POST['date_to']); $account = intval($_POST['account']); diff --git a/agent/post/file.php b/agent/post/file.php index 59aafaa5..5c098b78 100644 --- a/agent/post/file.php +++ b/agent/post/file.php @@ -110,7 +110,7 @@ if (isset($_POST['rename_file'])) { // Get File Details Client ID for Logging $sql = mysqli_query($mysqli,"SELECT file_name, file_client_id FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $old_file_name = sanitizeInput($row['file_name']); $client_id = intval($row['file_client_id']); @@ -134,7 +134,7 @@ if (isset($_POST['move_file'])) { // Get File Name and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT file_name, file_client_id FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $file_name = sanitizeInput($row['file_name']); $client_id = intval($row['file_client_id']); @@ -159,7 +159,7 @@ if (isset($_GET['archive_file'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT file_name, file_client_id FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $file_name = sanitizeInput($row['file_name']); $client_id = intval($row['file_client_id']); @@ -204,7 +204,7 @@ if (isset($_POST['delete_file'])) { $file_id = intval($_POST['file_id']); $sql_file = mysqli_query($mysqli,"SELECT * FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql_file); + $row = mysqli_fetch_assoc($sql_file); $client_id = intval($row['file_client_id']); $file_name = sanitizeInput($row['file_name']); $file_reference_name = sanitizeInput($row['file_reference_name']); @@ -247,7 +247,7 @@ if (isset($_POST['bulk_archive_files'])) { $file_id = intval($file_id); $sql_file = mysqli_query($mysqli,"SELECT * FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql_file); + $row = mysqli_fetch_assoc($sql_file); $client_id = intval($row['file_client_id']); $file_name = sanitizeInput($row['file_name']); @@ -269,7 +269,7 @@ if (isset($_POST['bulk_archive_files'])) { $document_id = intval($document_id); // Get document name for logging $sql = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -306,7 +306,7 @@ if (isset($_POST['bulk_delete_files'])) { $file_id = intval($file_id); $sql_file = mysqli_query($mysqli,"SELECT * FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql_file); + $row = mysqli_fetch_assoc($sql_file); $client_id = intval($row['file_client_id']); $file_name = sanitizeInput($row['file_name']); $file_reference_name = sanitizeInput($row['file_reference_name']); @@ -340,7 +340,7 @@ if (isset($_POST['bulk_delete_files'])) { $document_id = intval($document_id); // Get Document Name and Client ID for logging $sql = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['document_client_id']); $document_name = sanitizeInput($row['document_name']); @@ -383,7 +383,7 @@ if (isset($_POST['bulk_restore_files'])) { $file_id = intval($file_id); $sql_file = mysqli_query($mysqli,"SELECT * FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql_file); + $row = mysqli_fetch_assoc($sql_file); $client_id = intval($row['file_client_id']); $file_name = sanitizeInput($row['file_name']); @@ -405,7 +405,7 @@ if (isset($_POST['bulk_restore_files'])) { $document_id = intval($document_id); // Get document name for logging $sql = mysqli_query($mysqli,"SELECT document_name, document_client_id FROM documents WHERE document_id = $document_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $document_name = sanitizeInput($row['document_name']); $client_id = intval($row['document_client_id']); @@ -440,7 +440,7 @@ if (isset($_POST['bulk_move_files'])) { // 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)) { + if ($row = mysqli_fetch_assoc($sql)) { $folder_name = sanitizeInput($row['folder_name']); $log_client_id = intval($row['folder_client_id']); } @@ -545,7 +545,7 @@ if (isset($_POST['link_asset_to_file'])) { // Get File Name and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT file_name, file_client_id FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $file_name = sanitizeInput($row['file_name']); $client_id = intval($row['file_client_id']); @@ -572,7 +572,7 @@ if (isset($_GET['unlink_asset_from_file'])) { // Get File Name and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT file_name, file_client_id FROM files WHERE file_id = $file_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $file_name = sanitizeInput($row['file_name']); $client_id = intval($row['file_client_id']); diff --git a/agent/post/folder.php b/agent/post/folder.php index b0d25b91..08e7e531 100644 --- a/agent/post/folder.php +++ b/agent/post/folder.php @@ -36,7 +36,7 @@ if (isset($_POST['rename_folder'])) { // Get old Folder Name Client ID for Logging $sql = mysqli_query($mysqli,"SELECT folder_name, folder_client_id FROM folders WHERE folder_id = $folder_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $old_folder_name = sanitizeInput($row['folder_name']); $client_id = intval($row['folder_client_id']); @@ -59,7 +59,7 @@ if (isset($_GET['delete_folder'])) { // Get Folder Name Client ID for Logging $sql = mysqli_query($mysqli,"SELECT folder_name, folder_client_id FROM folders WHERE folder_id = $folder_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $folder_name = sanitizeInput($row['folder_name']); $client_id = intval($row['folder_client_id']); @@ -67,7 +67,7 @@ if (isset($_GET['delete_folder'])) { // Move files in deleted folder back to the root folder / $sql_documents = mysqli_query($mysqli,"SELECT * FROM documents WHERE document_folder_id = $folder_id"); - while($row = mysqli_fetch_array($sql_documents)) { + while($row = mysqli_fetch_assoc($sql_documents)) { $document_id = intval($row['document_id']); mysqli_query($mysqli,"UPDATE documents SET document_folder_id = 0 WHERE document_id = $document_id"); diff --git a/agent/post/invoice.php b/agent/post/invoice.php index b0283e32..cea45b0e 100644 --- a/agent/post/invoice.php +++ b/agent/post/invoice.php @@ -56,7 +56,7 @@ if (isset($_POST['edit_invoice'])) { // Get Invoice Number and Prefix and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT invoice_prefix, invoice_number, invoice_client_id FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); @@ -64,7 +64,7 @@ if (isset($_POST['edit_invoice'])) { // Calculate new total $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id"); $invoice_amount = 0; - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $item_total = floatval($row['item_total']); $invoice_amount = $invoice_amount + $item_total; } @@ -88,7 +88,7 @@ if (isset($_POST['add_invoice_copy'])) { //Get Net Terms $sql = mysqli_query($mysqli,"SELECT * FROM clients, invoices WHERE client_id = invoice_client_id AND invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_net_terms = intval($row['client_net_terms']); $invoice_scope = sanitizeInput($row['invoice_scope']); $invoice_discount_amount = floatval($row['invoice_discount_amount']); @@ -121,7 +121,7 @@ if (isset($_POST['add_invoice_copy'])) { mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Copied INVOICE!', history_invoice_id = $new_invoice_id"); $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id"); - while($row = mysqli_fetch_array($sql_items)) { + while($row = mysqli_fetch_assoc($sql_items)) { $item_id = intval($row['item_id']); $item_name = sanitizeInput($row['item_name']); $item_description = sanitizeInput($row['item_description']); @@ -152,7 +152,7 @@ if (isset($_GET['mark_invoice_sent'])) { // Get Invoice Number and Prefix and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT invoice_prefix, invoice_number, invoice_client_id FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); @@ -175,7 +175,7 @@ if (isset($_GET['mark_invoice_non-billable'])) { // Get Invoice Number and Prefix and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT invoice_prefix, invoice_number, invoice_client_id FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); @@ -198,7 +198,7 @@ if (isset($_GET['cancel_invoice'])) { // Get Invoice Number and Prefix and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT invoice_prefix, invoice_number, invoice_client_id FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); @@ -221,7 +221,7 @@ if (isset($_GET['delete_invoice'])) { // Get Invoice Number and Prefix and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT invoice_prefix, invoice_number, invoice_client_id FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); @@ -230,21 +230,21 @@ if (isset($_GET['delete_invoice'])) { //Delete Items Associated with the Invoice $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id"); - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $item_id = intval($row['item_id']); mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); } //Delete History Associated with the Invoice $sql = mysqli_query($mysqli,"SELECT * FROM history WHERE history_invoice_id = $invoice_id"); - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $history_id = intval($row['history_id']); mysqli_query($mysqli,"DELETE FROM history WHERE history_id = $history_id"); } //Delete Payments Associated with the Invoice $sql = mysqli_query($mysqli,"SELECT * FROM payments WHERE payment_invoice_id = $invoice_id"); - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $payment_id = intval($row['payment_id']); mysqli_query($mysqli,"DELETE FROM payments WHERE payment_id = $payment_id"); } @@ -288,7 +288,7 @@ if (isset($_POST['add_invoice_item'])) { FROM product_stock WHERE stock_product_id = $product_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $available_stock = floatval($row['available_stock']); // Enough in stock? @@ -305,7 +305,7 @@ if (isset($_POST['add_invoice_item'])) { // Tax if ($tax_id > 0) { $sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_id = $tax_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $tax_percent = floatval($row['tax_percent']); $tax_amount = $subtotal * $tax_percent / 100; } else { @@ -318,7 +318,7 @@ if (isset($_POST['add_invoice_item'])) { // Get Discount and Invoice Details $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); @@ -327,7 +327,7 @@ if (isset($_POST['add_invoice_item'])) { //add up all line items $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id"); $invoice_total = 0; - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $item_total = floatval($row['item_total']); $invoice_total = $invoice_total + $item_total; } @@ -352,7 +352,7 @@ if (isset($_POST['invoice_note'])) { // Get Invoice Details for logging $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); @@ -383,7 +383,7 @@ if (isset($_POST['edit_item'])) { if ($tax_id > 0) { $sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_id = $tax_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $tax_percent = floatval($row['tax_percent']); $tax_amount = $subtotal * $tax_percent / 100; } else { @@ -396,7 +396,7 @@ if (isset($_POST['edit_item'])) { // Determine what type of line item $sql = mysqli_query($mysqli,"SELECT item_invoice_id, item_quote_id, item_recurring_invoice_id FROM invoice_items WHERE item_id = $item_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_id = intval($row['item_invoice_id']); $quote_id = intval($row['item_quote_id']); $recurring_invoice_id = intval($row['item_recurring_invoice_id']); @@ -404,7 +404,7 @@ if (isset($_POST['edit_item'])) { if ($invoice_id > 0) { //Get Discount Amount $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); @@ -412,7 +412,7 @@ if (isset($_POST['edit_item'])) { //Update Invoice Balances by tallying up invoice items $sql_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS invoice_total FROM invoice_items WHERE item_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_invoice_total); + $row = mysqli_fetch_assoc($sql_invoice_total); $new_invoice_amount = floatval($row['invoice_total']) - $invoice_discount; @@ -425,7 +425,7 @@ if (isset($_POST['edit_item'])) { } elseif ($quote_id > 0) { //Get Discount Amount $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = intval($row['quote_number']); $client_id = intval($row['quote_client_id']); @@ -433,7 +433,7 @@ if (isset($_POST['edit_item'])) { //Update Quote Balances by tallying up items $sql_quote_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS quote_total FROM invoice_items WHERE item_quote_id = $quote_id"); - $row = mysqli_fetch_array($sql_quote_total); + $row = mysqli_fetch_assoc($sql_quote_total); $new_quote_amount = floatval($row['quote_total']) - $quote_discount; mysqli_query($mysqli,"UPDATE quotes SET quote_amount = $new_quote_amount WHERE quote_id = $quote_id"); @@ -443,7 +443,7 @@ if (isset($_POST['edit_item'])) { } else { //Get Discount Amount $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); $recurring_invoice_number = intval($row['recurring_invoice_number']); $client_id = intval($row['recurring_invoice_client_id']); @@ -451,7 +451,7 @@ if (isset($_POST['edit_item'])) { //Update Invoice Balances by tallying up invoice items $sql_recurring_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_invoice_total FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql_recurring_invoice_total); + $row = mysqli_fetch_assoc($sql_recurring_invoice_total); $new_recurring_invoice_amount = floatval($row['recurring_invoice_total']) - $recurring_invoice_discount; mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $new_recurring_invoice_amount WHERE recurring_invoice_id = $recurring_invoice_id"); @@ -474,7 +474,7 @@ if (isset($_GET['delete_invoice_item'])) { $item_id = intval($_GET['delete_invoice_item']); $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_id = $item_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_id = intval($row['item_invoice_id']); $item_name = sanitizeInput($row['item_name']); $item_quantity = floatval($row['item_quantity']); @@ -484,7 +484,7 @@ if (isset($_GET['delete_invoice_item'])) { $item_total = floatval($row['item_total']); $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); @@ -517,7 +517,7 @@ if (isset($_GET['email_invoice'])) { LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 WHERE invoice_id = $invoice_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_id = intval($row['invoice_id']); $invoice_prefix = sanitizeInput($row['invoice_prefix']); @@ -535,7 +535,7 @@ if (isset($_GET['email_invoice'])) { $contact_email = sanitizeInput($row['contact_email']); $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_country = sanitizeInput($row['company_country']); @@ -556,7 +556,7 @@ if (isset($_GET['email_invoice'])) { // Add up all the payments for the invoice and get the total amount paid to the invoice $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_amount_paid); + $row = mysqli_fetch_assoc($sql_amount_paid); $amount_paid = floatval($row['amount_paid']); $balance = $invoice_amount - $amount_paid; @@ -607,7 +607,7 @@ if (isset($_GET['email_invoice'])) { $data = []; - while ($billing_contact = mysqli_fetch_array($sql_billing_contacts)) { + while ($billing_contact = mysqli_fetch_assoc($sql_billing_contacts)) { $billing_contact_name = sanitizeInput($billing_contact['contact_name']); $billing_contact_email = sanitizeInput($billing_contact['contact_email']); @@ -736,7 +736,7 @@ if (isset($_GET['export_invoice_pdf'])) { LIMIT 1" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_id = intval($row['invoice_id']); $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); @@ -772,7 +772,7 @@ if (isset($_GET['export_invoice_pdf'])) { } $sql = mysqli_query($mysqli, "SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_id = intval($row['company_id']); $company_name = nullable_htmlentities($row['company_name']); $company_country = nullable_htmlentities($row['company_country']); @@ -796,7 +796,7 @@ if (isset($_GET['export_invoice_pdf'])) { //Add up all the payments for the invoice and get the total amount paid to the invoice $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_amount_paid); + $row = mysqli_fetch_assoc($sql_amount_paid); $amount_paid = floatval($row['amount_paid']); $balance = $invoice_amount - $amount_paid; @@ -882,7 +882,7 @@ if (isset($_GET['export_invoice_pdf'])) { $total_tax = 0; $sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_order ASC"); - while ($item = mysqli_fetch_array($sql_items)) { + while ($item = mysqli_fetch_assoc($sql_items)) { $name = $item['item_name']; $desc = $item['item_description']; $qty = $item['item_quantity']; @@ -962,7 +962,7 @@ if (isset($_POST['bulk_edit_invoice_category'])) { // Get Invoice Details for Logging $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $invoice_scope = sanitizeInput($row['invoice_scope']); diff --git a/agent/post/location.php b/agent/post/location.php index 0c3da171..4d23be57 100644 --- a/agent/post/location.php +++ b/agent/post/location.php @@ -68,7 +68,7 @@ if(isset($_POST['edit_location'])){ // Get old location photo $sql = mysqli_query($mysqli,"SELECT location_photo FROM locations WHERE location_id = $location_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $existing_file_name = sanitizeInput($row['location_photo']); if(!file_exists("../uploads/clients/$client_id")) { @@ -128,7 +128,7 @@ if(isset($_GET['archive_location'])){ // Get Location Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT location_name, location_client_id FROM locations WHERE location_id = $location_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $location_name = sanitizeInput($row['location_name']); $client_id = intval($row['location_client_id']); @@ -150,7 +150,7 @@ if(isset($_GET['unarchive_location'])){ // Get Location Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT location_name, location_client_id FROM locations WHERE location_id = $location_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $location_name = sanitizeInput($row['location_name']); $client_id = intval($row['location_client_id']); @@ -172,7 +172,7 @@ if(isset($_GET['delete_location'])){ // Get Location Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT location_name, location_client_id FROM locations WHERE location_id = $location_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $location_name = sanitizeInput($row['location_name']); $client_id = intval($row['location_client_id']); @@ -201,7 +201,7 @@ if (isset($_POST['bulk_assign_location_tags'])) { // Get Contact Details for Logging $sql = mysqli_query($mysqli,"SELECT location_name, location_client_id FROM locations WHERE location_id = $location_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $location_name = sanitizeInput($row['location_name']); $client_id = intval($row['location_client_id']); @@ -252,7 +252,7 @@ if (isset($_POST['bulk_archive_locations'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT location_name, location_client_id, location_primary FROM locations WHERE location_id = $location_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $location_name = sanitizeInput($row['location_name']); $location_primary = intval($row['location_primary']); $client_id = intval($row['location_client_id']); @@ -296,7 +296,7 @@ if (isset($_POST['bulk_unarchive_locations'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT location_name, location_client_id FROM locations WHERE location_id = $location_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $location_name = sanitizeInput($row['location_name']); $client_id = intval($row['location_client_id']); @@ -334,7 +334,7 @@ if (isset($_POST['bulk_delete_locations'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT location_name, location_client_id FROM locations WHERE location_id = $location_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $location_name = sanitizeInput($row['location_name']); $client_id = intval($row['location_client_id']); diff --git a/agent/post/network.php b/agent/post/network.php index 6791a633..f6b2b88c 100644 --- a/agent/post/network.php +++ b/agent/post/network.php @@ -49,7 +49,7 @@ if (isset($_GET['archive_network'])) { // Get Network Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT network_name, network_client_id FROM networks WHERE network_id = $network_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $network_name = sanitizeInput($row['network_name']); $client_id = intval($row['network_client_id']); @@ -71,7 +71,7 @@ if (isset($_GET['unarchive_network'])) { // Get Network Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT network_name, network_client_id FROM networks WHERE network_id = $network_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $network_name = sanitizeInput($row['network_name']); $client_id = intval($row['network_client_id']); @@ -93,7 +93,7 @@ if (isset($_GET['delete_network'])) { // Get Network Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT network_name, network_client_id FROM networks WHERE network_id = $network_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $network_name = sanitizeInput($row['network_name']); $client_id = intval($row['network_client_id']); @@ -125,7 +125,7 @@ if (isset($_POST['bulk_delete_networks'])) { // Get Network Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT network_name, network_client_id FROM networks WHERE network_id = $network_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $network_name = sanitizeInput($row['network_name']); $client_id = intval($row['network_client_id']); diff --git a/agent/post/payment.php b/agent/post/payment.php index c20e99ee..9060b9a5 100644 --- a/agent/post/payment.php +++ b/agent/post/payment.php @@ -33,7 +33,7 @@ if (isset($_POST['add_payment'])) { //Add up all the payments for the invoice and get the total amount paid to the invoice $sql_total_payments_amount = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payments_amount FROM payments WHERE payment_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_total_payments_amount); + $row = mysqli_fetch_assoc($sql_total_payments_amount); $total_payments_amount = floatval($row['payments_amount']); //Get the invoice total @@ -43,7 +43,7 @@ if (isset($_POST['add_payment'])) { WHERE invoice_id = $invoice_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_amount = floatval($row['invoice_amount']); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); @@ -58,7 +58,7 @@ if (isset($_POST['add_payment'])) { $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'], $row['contact_mobile_country_code'])); $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_country = sanitizeInput($row['company_country']); @@ -205,7 +205,7 @@ if (isset($_POST['apply_credit'])) { $credit_amount_applied = floatval($_POST['credit_amount_applied']); $sql = mysqli_query($mysqli, "SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); @@ -216,20 +216,20 @@ if (isset($_POST['apply_credit'])) { // Get Credit Balance $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id"); - $row = mysqli_fetch_array($sql_credit_balance); + $row = mysqli_fetch_assoc($sql_credit_balance); $credit_balance = floatval($row['credit_balance']); // Get Invoice Balance $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_amount_paid); + $row = mysqli_fetch_assoc($sql_amount_paid); $amount_paid = floatval($row['amount_paid']); $invoice_balance = $invoice_amount - $amount_paid; // Get Credit Tally applied to invoice $sql_credit_tally = mysqli_query($mysqli, "SELECT SUM(credit_tally) AS credit_balance FROM credits WHERE credit_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_credit_tally); + $row = mysqli_fetch_assoc($sql_credit_tally); $credit_tally = floatval($row['credit_tally']); @@ -318,7 +318,7 @@ if (isset($_POST['add_payment_stripe'])) { LEFT JOIN contacts ON client_id = contact_client_id AND contact_primary = 1 WHERE invoice_id = $invoice_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_number = intval($row['invoice_number']); $invoice_status = sanitizeInput($row['invoice_status']); $invoice_amount = floatval($row['invoice_amount']); @@ -336,7 +336,7 @@ if (isset($_POST['add_payment_stripe'])) { // Get ITFlow company details $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_country = sanitizeInput($row['company_country']); $company_address = sanitizeInput($row['company_address']); @@ -353,7 +353,7 @@ if (isset($_POST['add_payment_stripe'])) { // Get Client Payment Details $sql = mysqli_query($mysqli, "SELECT * FROM client_saved_payment_methods LEFT JOIN payment_providers ON saved_payment_provider_id = payment_provider_id LEFT JOIN client_payment_provider ON saved_payment_client_id = client_id WHERE saved_payment_id = $saved_payment_id LIMIT 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $public_key = sanitizeInput($row['payment_provider_public_key']); $private_key = sanitizeInput($row['payment_provider_private_key']); @@ -513,7 +513,7 @@ if (isset($_GET['add_payment_stripe'])) { LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 WHERE invoice_id = $invoice_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_number = intval($row['invoice_number']); $invoice_status = sanitizeInput($row['invoice_status']); $invoice_amount = floatval($row['invoice_amount']); @@ -531,7 +531,7 @@ if (isset($_GET['add_payment_stripe'])) { // Get ITFlow company details $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_country = sanitizeInput($row['company_country']); $company_address = sanitizeInput($row['company_address']); @@ -547,7 +547,7 @@ if (isset($_GET['add_payment_stripe'])) { $config_invoice_from_email = sanitizeInput($config_invoice_from_email); // Get Client Stripe details - $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM client_stripe WHERE client_id = $client_id LIMIT 1")); + $stripe_client_details = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM client_stripe WHERE client_id = $client_id LIMIT 1")); $stripe_id = sanitizeInput($stripe_client_details['stripe_id']); $stripe_pm = sanitizeInput($stripe_client_details['stripe_pm']); @@ -715,7 +715,7 @@ if (isset($_POST['add_bulk_payment'])) { $result_invoices = mysqli_query($mysqli, $sql_invoices); // Loop Through Each Invoice - while ($row = mysqli_fetch_array($result_invoices)) { + while ($row = mysqli_fetch_assoc($result_invoices)) { $invoice_id = intval($row['invoice_id']); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); @@ -723,7 +723,7 @@ if (isset($_POST['add_bulk_payment'])) { $invoice_url_key = sanitizeInput($row['invoice_url_key']); $invoice_balance_query = "SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id"; $result_amount_paid = mysqli_query($mysqli, $invoice_balance_query); - $row_amount_paid = mysqli_fetch_array($result_amount_paid); + $row_amount_paid = mysqli_fetch_assoc($result_amount_paid); $amount_paid = floatval($row_amount_paid['amount_paid']); $invoice_balance = $invoice_amount - $amount_paid; @@ -776,13 +776,13 @@ if (isset($_POST['add_bulk_payment'])) { WHERE client_id = $client_id" ); - $row = mysqli_fetch_array($sql_client); + $row = mysqli_fetch_assoc($sql_client); $client_name = sanitizeInput($row['client_name']); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); $sql_company = mysqli_query($mysqli,"SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql_company); + $row = mysqli_fetch_assoc($sql_company); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -823,18 +823,18 @@ if (isset($_GET['delete_payment'])) { $payment_id = intval($_GET['delete_payment']); $sql = mysqli_query($mysqli,"SELECT * FROM payments WHERE payment_id = $payment_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_id = intval($row['payment_invoice_id']); $deleted_payment_amount = floatval($row['payment_amount']); //Add up all the payments for the invoice and get the total amount paid to the invoice $sql_total_payments_amount = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments_amount FROM payments WHERE payment_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_total_payments_amount); + $row = mysqli_fetch_assoc($sql_total_payments_amount); $total_payments_amount = floatval($row['total_payments_amount']); // Get the invoice total and details $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $client_id = intval($row['invoice_client_id']); diff --git a/agent/post/project.php b/agent/post/project.php index 80ad0dbe..9ceecbc6 100644 --- a/agent/post/project.php +++ b/agent/post/project.php @@ -43,7 +43,7 @@ if (isset($_POST['add_project'])) { AND project_template_ticket_templates.project_template_id = $project_template_id"); $ticket_template_count = mysqli_num_rows($sql_ticket_templates); - while ($row = mysqli_fetch_array($sql_ticket_templates)) { + while ($row = mysqli_fetch_assoc($sql_ticket_templates)) { $ticket_template_id = intval($row['ticket_template_id']); $ticket_template_order = intval($row['ticket_template_order']); $ticket_template_subject = sanitizeInput($row['ticket_template_subject']); @@ -69,7 +69,7 @@ if (isset($_POST['add_project'])) { "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); $task_template_count = mysqli_num_rows($sql_task_templates); - while ($row = mysqli_fetch_array($sql_task_templates)) { + while ($row = mysqli_fetch_assoc($sql_task_templates)) { $task_template_id = intval($row['task_template_id']); $task_template_order = intval($row['task_template_order']); $task_template_name = sanitizeInput($row['task_template_name']); @@ -116,7 +116,7 @@ if (isset($_GET['close_project'])) { // Get Project Name and Client ID for logging $sql = mysqli_query($mysqli, "SELECT project_name, project_client_id FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $project_name = sanitizeInput($row['project_name']); $client_id = intval($row['project_client_id']); @@ -138,7 +138,7 @@ if (isset($_GET['archive_project'])) { // Get Project Name and Client ID for logging $sql = mysqli_query($mysqli, "SELECT project_name, project_client_id FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $project_name = sanitizeInput($row['project_name']); $client_id = intval($row['project_client_id']); @@ -160,7 +160,7 @@ if (isset($_GET['unarchive_project'])) { // Get Project Name and Client ID for logging $sql = mysqli_query($mysqli, "SELECT project_name, project_client_id FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $project_name = sanitizeInput($row['project_name']); $client_id = sanitizeInput($row['project_client_id']); @@ -184,7 +184,7 @@ if (isset($_GET['delete_project'])) { // Get Project Name and Client ID for logging $sql = mysqli_query($mysqli, "SELECT project_name, project_client_id FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $project_name = sanitizeInput($row['project_name']); $client_id = intval($row['project_client_id']); @@ -206,7 +206,7 @@ if (isset($_POST['link_ticket_to_project'])) { // Get Project Name and Client ID for logging $sql = mysqli_query($mysqli, "SELECT project_client_id, project_name FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['project_client_id']); $project_name = sanitizeInput($row['project_name']); @@ -221,7 +221,7 @@ if (isset($_POST['link_ticket_to_project'])) { // Get Ticket Info $sql = mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number, ticket_subject FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $ticket_subject = sanitizeInput($row['ticket_subject']); @@ -250,7 +250,7 @@ if (isset($_POST['link_closed_ticket_to_project'])) { // Get Project Name and Client ID for logging $sql = mysqli_query($mysqli, "SELECT project_client_id, project_name FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['project_client_id']); $project_name = sanitizeInput($row['project_name']); @@ -260,7 +260,7 @@ if (isset($_POST['link_closed_ticket_to_project'])) { flash_alert("Cannot merge into that ticket.", 'error'); redirect(); } - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_id = intval($row['ticket_id']); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); diff --git a/agent/post/quote.php b/agent/post/quote.php index ebbb1197..6a650d60 100644 --- a/agent/post/quote.php +++ b/agent/post/quote.php @@ -67,7 +67,7 @@ if (isset($_POST['add_quote_copy'])) { $quote_number = mysqli_insert_id($mysqli); $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $original_quote_prefix = sanitizeInput($row['quote_prefix']); $original_quote_number = sanitizeInput($row['quote_number']); $quote_discount_amount = floatval($row['quote_discount_amount']); @@ -87,7 +87,7 @@ if (isset($_POST['add_quote_copy'])) { mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Quote copied!', history_quote_id = $new_quote_id"); $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); - while($row = mysqli_fetch_array($sql_items)) { + while($row = mysqli_fetch_assoc($sql_items)) { $item_id = intval($row['item_id']); $item_name = sanitizeInput($row['item_name']); $item_description = sanitizeInput($row['item_description']); @@ -120,7 +120,7 @@ if (isset($_POST['add_quote_to_invoice'])) { $date = sanitizeInput($_POST['date']); $sql = mysqli_query($mysqli,"SELECT * FROM clients, quotes WHERE client_id = quote_client_id AND quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_net_terms = intval($row['client_net_terms']); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); @@ -156,7 +156,7 @@ if (isset($_POST['add_quote_to_invoice'])) { mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Invoice created from quote $quote_prefix$quote_number', history_invoice_id = $new_invoice_id"); $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); - while($row = mysqli_fetch_array($sql_items)) { + while($row = mysqli_fetch_assoc($sql_items)) { $item_id = intval($row['item_id']); $item_name = sanitizeInput($row['item_name']); $item_description = sanitizeInput($row['item_description']); @@ -201,7 +201,7 @@ if (isset($_POST['add_quote_item'])) { if ($tax_id > 0) { $sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_id = $tax_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $tax_percent = floatval($row['tax_percent']); $tax_amount = $subtotal * $tax_percent / 100; }else{ @@ -214,7 +214,7 @@ if (isset($_POST['add_quote_item'])) { // Get Quote Details $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); $quote_discount_amount = floatval($row['quote_discount_amount']); @@ -223,7 +223,7 @@ if (isset($_POST['add_quote_item'])) { //add up the total of all items $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); $quote_amount = 0; - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $item_total = floatval($row['item_total']); $quote_amount = $quote_amount + $item_total; } @@ -248,7 +248,7 @@ if (isset($_POST['quote_note'])) { // Get Quote Details $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); $client_id = intval($row['quote_client_id']); @@ -273,7 +273,7 @@ if (isset($_POST['edit_quote'])) { // Get Quote Details for logging $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); $client_id = intval($row['quote_client_id']); @@ -281,7 +281,7 @@ if (isset($_POST['edit_quote'])) { //Calculate the new quote amount $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); $quote_amount = 0; - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $item_total = floatval($row['item_total']); $quote_amount = $quote_amount + $item_total; } @@ -305,7 +305,7 @@ if (isset($_GET['delete_quote'])) { // Get Quote Details for logging $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); $client_id = intval($row['quote_client_id']); @@ -314,14 +314,14 @@ if (isset($_GET['delete_quote'])) { //Delete Items Associated with the Quote $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id"); - while($row = mysqli_fetch_array($sql)) {; + while($row = mysqli_fetch_assoc($sql)) {; $item_id = intval($row['item_id']); mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); } //Delete History Associated with the Quote $sql = mysqli_query($mysqli,"SELECT * FROM history WHERE history_quote_id = $quote_id"); - while($row = mysqli_fetch_array($sql)) {; + while($row = mysqli_fetch_assoc($sql)) {; $history_id = intval($row['history_id']); mysqli_query($mysqli,"DELETE FROM history WHERE history_id = $history_id"); } @@ -346,7 +346,7 @@ if (isset($_GET['delete_quote_item'])) { $item_id = intval($_GET['delete_quote_item']); $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_id = $item_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $item_name = sanitizeInput($row['item_name']); $quote_id = intval($row['item_quote_id']); $item_subtotal = floatval($row['item_subtotal']); @@ -354,7 +354,7 @@ if (isset($_GET['delete_quote_item'])) { $item_total = floatval($row['item_total']); $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); $client_id = intval($row['quote_client_id']); @@ -380,7 +380,7 @@ if (isset($_GET['mark_quote_sent'])) { $quote_id = intval($_GET['mark_quote_sent']); $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); $client_id = intval($row['quote_client_id']); @@ -404,7 +404,7 @@ if (isset($_GET['accept_quote'])) { $quote_id = intval($_GET['accept_quote']); $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); $client_id = intval($row['quote_client_id']); @@ -430,7 +430,7 @@ if (isset($_GET['decline_quote'])) { $quote_id = intval($_GET['decline_quote']); $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); $client_id = intval($row['quote_client_id']); @@ -461,7 +461,7 @@ if (isset($_GET['email_quote'])) { WHERE quote_id = $quote_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = intval($row['quote_number']); $quote_scope = sanitizeInput($row['quote_scope']); @@ -477,7 +477,7 @@ if (isset($_GET['email_quote'])) { $contact_email = sanitizeInput($row['contact_email']); $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_country = sanitizeInput($row['company_country']); @@ -534,7 +534,7 @@ if (isset($_GET['mark_quote_invoiced'])) { $quote_id = intval($_GET['mark_quote_invoiced']); $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_prefix = sanitizeInput($row['quote_prefix']); $quote_number = sanitizeInput($row['quote_number']); $client_id = intval($row['quote_client_id']); @@ -624,7 +624,7 @@ if (isset($_GET['export_quote_pdf'])) { LIMIT 1" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $quote_id = intval($row['quote_id']); $quote_prefix = nullable_htmlentities($row['quote_prefix']); $quote_number = intval($row['quote_number']); @@ -660,7 +660,7 @@ if (isset($_GET['export_quote_pdf'])) { } $sql = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_id = intval($row['company_id']); $company_name = nullable_htmlentities($row['company_name']); @@ -763,7 +763,7 @@ if (isset($_GET['export_quote_pdf'])) { $total_tax = 0; $sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); - while ($item = mysqli_fetch_array($sql_items)) { + while ($item = mysqli_fetch_assoc($sql_items)) { $name = $item['item_name']; $desc = $item['item_description']; $qty = $item['item_quantity']; diff --git a/agent/post/rack.php b/agent/post/rack.php index 524a32ce..65d28b2f 100644 --- a/agent/post/rack.php +++ b/agent/post/rack.php @@ -99,7 +99,7 @@ if (isset($_GET['archive_rack'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT rack_name, rack_client_id FROM racks WHERE rack_id = $rack_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $rack_name = sanitizeInput($row['rack_name']); $client_id = intval($row['rack_client_id']); @@ -121,7 +121,7 @@ if (isset($_GET['unarchive_rack'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT rack_name, rack_client_id FROM racks WHERE rack_id = $rack_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $rack_name = sanitizeInput($row['rack_name']); $client_id = intval($row['rack_client_id']); @@ -143,7 +143,7 @@ if (isset($_GET['delete_rack'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT rack_name, rack_client_id, rack_photo FROM racks WHERE rack_id = $rack_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $rack_name = sanitizeInput($row['rack_name']); $rack_photo = sanitizeInput($row['rack_photo']); $client_id = intval($row['rack_client_id']); @@ -176,7 +176,7 @@ if (isset($_POST['add_rack_unit'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT rack_name, rack_client_id FROM racks WHERE rack_id = $rack_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $rack_name = sanitizeInput($row['rack_name']); $client_id = intval($row['rack_client_id']); @@ -222,7 +222,7 @@ if (isset($_POST['edit_rack_unit'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT rack_name, rack_client_id FROM racks WHERE rack_id = $rack_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $rack_name = sanitizeInput($row['rack_name']); $client_id = intval($row['rack_client_id']); @@ -244,7 +244,7 @@ if (isset($_GET['remove_rack_unit'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT rack_name, rack_id, rack_client_id FROM racks LEFT JOIN rack_units ON unit_rack_id = rack_id WHERE unit_id = $unit_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $rack_name = sanitizeInput($row['rack_name']); $unit_device = sanitizeInput($row['unit_device']); $client_id = intval($row['rack_client_id']); diff --git a/agent/post/recurring_expense.php b/agent/post/recurring_expense.php index ac76b294..f1256de5 100644 --- a/agent/post/recurring_expense.php +++ b/agent/post/recurring_expense.php @@ -72,7 +72,7 @@ if (isset($_GET['delete_recurring_expense'])) { // Get Recurring Expense Details for Logging $sql = mysqli_query($mysqli,"SELECT recurring_expense_description, recurring_expense_client_id FROM recurring_expenses WHERE recurring_expense_id = $recurring_expense_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_expense_description = sanitizeInput($row['recurring_expense_description']); $client_id = intval($row['recurring_expense_client_id']); diff --git a/agent/post/recurring_invoice.php b/agent/post/recurring_invoice.php index 3cc25a82..01f18dee 100644 --- a/agent/post/recurring_invoice.php +++ b/agent/post/recurring_invoice.php @@ -12,7 +12,7 @@ if (isset($_POST['add_invoice_recurring'])) { $recurring_invoice_frequency = sanitizeInput($_POST['frequency']); $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $invoice_date = sanitizeInput($row['invoice_date']); @@ -41,7 +41,7 @@ if (isset($_POST['add_invoice_recurring'])) { mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Recurring Invoice Created from INVOICE!', history_recurring_invoice_id = $recurring_invoice_id"); $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id"); - while($row = mysqli_fetch_array($sql_items)) { + while($row = mysqli_fetch_assoc($sql_items)) { $item_id = intval($row['item_id']); $item_name = sanitizeInput($row['item_name']); $item_description = sanitizeInput($row['item_description']); @@ -109,7 +109,7 @@ if (isset($_POST['edit_recurring_invoice'])) { // Get Recurring Invoice Details and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT recurring_invoice_prefix, recurring_invoice_number, recurring_invoice_client_id FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); $recurring_invoice_number = intval($row['recurring_invoice_number']); $client_id = intval($row['recurring_invoice_client_id']); @@ -117,7 +117,7 @@ if (isset($_POST['edit_recurring_invoice'])) { //Calculate new total $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); $recurring_invoice_amount = 0; - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $item_total = floatval($row['item_total']); $recurring_invoice_amount = $recurring_invoice_amount + $item_total; } @@ -141,7 +141,7 @@ if (isset($_GET['delete_recurring_invoice'])) { // Get Recurring Invoice Details and Client ID for Logging $sql = mysqli_query($mysqli,"SELECT recurring_invoice_prefix, recurring_invoice_number, recurring_invoice_scope, recurring_invoice_client_id FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); $recurring_invoice_number = intval($row['recurring_invoice_number']); $recurring_invoice_scope = sanitizeInput($row['recurring_invoice_scope']); @@ -151,14 +151,14 @@ if (isset($_GET['delete_recurring_invoice'])) { //Delete Items Associated with the Recurring $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $item_id = intval($row['item_id']); mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); } //Delete History Associated with the Invoice $sql = mysqli_query($mysqli,"SELECT * FROM history WHERE history_recurring_invoice_id = $recurring_invoice_id"); - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $history_id = intval($row['history_id']); mysqli_query($mysqli,"DELETE FROM history WHERE history_id = $history_id"); } @@ -185,7 +185,7 @@ if (isset($_POST['add_recurring_invoice_item'])) { if ($tax_id > 0) { $sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_id = $tax_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $tax_percent = floatval($row['tax_percent']); $tax_amount = $subtotal * $tax_percent / 100; } else { @@ -198,7 +198,7 @@ if (isset($_POST['add_recurring_invoice_item'])) { $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_invoice_discount = floatval($row['recurring_invoice_discount_amount']); $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); $recurring_invoice_number = intval($row['recurring_invoice_number']); @@ -207,7 +207,7 @@ if (isset($_POST['add_recurring_invoice_item'])) { //add up all the items $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); $recurring_invoice_amount = 0; - while($row = mysqli_fetch_array($sql)) { + while($row = mysqli_fetch_assoc($sql)) { $item_total = floatval($row['item_total']); $recurring_invoice_amount = $recurring_invoice_amount + $item_total; } @@ -230,7 +230,7 @@ if (isset($_POST['recurring_invoice_note'])) { // Get Recurring details for logging $sql = mysqli_query($mysqli,"SELECT recurring_invoice_prefix, recurring_invoice_number, recurring_invoice_client_id FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); $recurring_invoice_number = intval($row['recurring_invoice_number']); $client_id = intval($row['recurring_invoice_client_id']); @@ -250,7 +250,7 @@ if (isset($_GET['delete_recurring_invoice_item'])) { $item_id = intval($_GET['delete_recurring_invoice_item']); $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_id = $item_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_invoice_id = intval($row['item_recurring_invoice_id']); $item_name = sanitizeInput($row['item_name']); $item_subtotal = floatval($row['item_subtotal']); @@ -258,7 +258,7 @@ if (isset($_GET['delete_recurring_invoice_item'])) { $item_total = floatval($row['item_total']); $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); $recurring_invoice_number = intval($row['recurring_invoice_number']); $client_id = intval($row['recurring_invoice_client_id']); @@ -283,7 +283,7 @@ if (isset($_GET['force_recurring'])) { $sql_recurring_invoices = mysqli_query($mysqli,"SELECT * FROM recurring_invoices, clients WHERE client_id = recurring_invoice_client_id AND recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql_recurring_invoices); + $row = mysqli_fetch_assoc($sql_recurring_invoices); $recurring_invoice_id = intval($row['recurring_invoice_id']); $recurring_invoice_scope = sanitizeInput($row['recurring_invoice_scope']); $recurring_invoice_frequency = sanitizeInput($row['recurring_invoice_frequency']); @@ -319,7 +319,7 @@ if (isset($_GET['force_recurring'])) { //Copy Items from original invoice to new invoice $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_id ASC"); - while($row = mysqli_fetch_array($sql_invoice_items)) { + while($row = mysqli_fetch_assoc($sql_invoice_items)) { $item_id = intval($row['item_id']); $item_name = sanitizeInput($row['item_name']); $item_description = sanitizeInput($row['item_description']); @@ -332,7 +332,7 @@ if (isset($_GET['force_recurring'])) { //Recalculate Item Tax since Tax percents can change. if ($tax_id > 0) { $sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_id = $tax_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $tax_percent = floatval($row['tax_percent']); $item_tax_amount = $item_subtotal * $tax_percent / 100; } else { @@ -351,7 +351,7 @@ if (isset($_GET['force_recurring'])) { //Update Recurring Balances by tallying up recurring items also update recurring dates $sql_recurring_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_invoice_total FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql_recurring_invoice_total); + $row = mysqli_fetch_assoc($sql_recurring_invoice_total); $new_recurring_invoice_amount = floatval($row['recurring_invoice_total']) - $recurring_invoice_discount_amount; mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $new_recurring_invoice_amount, recurring_invoice_last_sent = CURDATE(), recurring_invoice_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_invoice_frequency) WHERE recurring_invoice_id = $recurring_invoice_id"); @@ -365,7 +365,7 @@ if (isset($_GET['force_recurring'])) { LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 WHERE invoice_id = $new_invoice_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); @@ -383,7 +383,7 @@ if (isset($_GET['force_recurring'])) { $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'], $row['contact_mobile_country_code'])); $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); $company_email = sanitizeInput($row['company_email']); @@ -445,7 +445,7 @@ if (isset($_POST['set_recurring_payment'])) { // Get Recurring Invoice Info for logging and alerting $sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['recurring_invoice_client_id']); $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); $recurring_invoice_number = intval($row['recurring_invoice_number']); @@ -461,7 +461,7 @@ if (isset($_POST['set_recurring_payment'])) { WHERE saved_payment_id = $saved_payment_id "); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $provider_id = intval($row['payment_provider_id']); $provider_name = sanitizeInput($row['payment_provider_name']); @@ -495,7 +495,7 @@ if (isset($_POST['export_client_recurring_invoice_csv'])) { //get records from database $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_name = $row['client_name']; @@ -543,7 +543,7 @@ if (isset($_GET['recurring_invoice_email_notify'])) { $recurring_invoice_id = intval($_GET['recurring_invoice_id']); $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); $recurring_invoice_number = intval($row['recurring_invoice_number']); $client_id = intval($row['recurring_invoice_client_id']); diff --git a/agent/post/recurring_ticket.php b/agent/post/recurring_ticket.php index 46006a88..61748347 100644 --- a/agent/post/recurring_ticket.php +++ b/agent/post/recurring_ticket.php @@ -77,7 +77,7 @@ if (isset($_POST['bulk_force_recurring_tickets'])) { $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); if (mysqli_num_rows($sql) > 0) { - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $subject = sanitizeInput($row['recurring_ticket_subject']); $details = mysqli_real_escape_string($mysqli, $row['recurring_ticket_details']); $priority = sanitizeInput($row['recurring_ticket_priority']); @@ -136,7 +136,7 @@ if (isset($_POST['bulk_force_recurring_tickets'])) { LEFT JOIN contacts ON ticket_contact_id = contact_id WHERE ticket_id = $id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -215,7 +215,7 @@ if (isset($_GET['force_recurring_ticket'])) { $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); if (mysqli_num_rows($sql) > 0) { - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $subject = sanitizeInput($row['recurring_ticket_subject']); $details = mysqli_real_escape_string($mysqli, $row['recurring_ticket_details']); $priority = sanitizeInput($row['recurring_ticket_priority']); @@ -274,7 +274,7 @@ if (isset($_GET['force_recurring_ticket'])) { LEFT JOIN contacts ON ticket_contact_id = contact_id WHERE ticket_id = $id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -352,7 +352,7 @@ if (isset($_GET['delete_recurring_ticket'])) { // Get Scheduled Ticket Subject Ticket Prefix, Number and Client ID for logging and alert message $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $subject = sanitizeInput($row['recurring_ticket_subject']); $frequency = sanitizeInput($row['recurring_ticket_frequency']); @@ -414,7 +414,7 @@ if (isset($_POST['bulk_assign_recurring_ticket'])) { $recurring_ticket_id = intval($recurring_ticket_id); $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_ticket_name = sanitizeInput($row['recurring_ticket_name']); $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']); @@ -427,7 +427,7 @@ if (isset($_POST['bulk_assign_recurring_ticket'])) { } else { // Get & verify assigned agent details $agent_details_sql = mysqli_query($mysqli, "SELECT user_name, user_email FROM users LEFT JOIN user_settings ON users.user_id = user_settings.user_id WHERE users.user_id = $assign_to"); - $agent_details = mysqli_fetch_array($agent_details_sql); + $agent_details = mysqli_fetch_assoc($agent_details_sql); $agent_name = sanitizeInput($agent_details['user_name']); $agent_email = sanitizeInput($agent_details['user_email']); @@ -502,7 +502,7 @@ if (isset($_POST['bulk_edit_recurring_ticket_priority'])) { $recurring_ticket_id = intval($recurring_ticket_id); $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']); $original_recurring_ticket_priority = sanitizeInput($row['recurring_ticket_priority']); @@ -539,7 +539,7 @@ if (isset($_POST['bulk_edit_recurring_ticket_category'])) { $recurring_ticket_id = intval($recurring_ticket_id); $sql = mysqli_query($mysqli, "SELECT recurring_ticket_subject, category_name, recurring_ticket_client_id FROM recurring_tickets LEFT JOIN categories ON recurring_ticket_category = category_id WHERE recurring_ticket_id = $recurring_ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']); $previous_recurring_ticket_category_name = sanitizeInput($row['category_name']); @@ -583,7 +583,7 @@ if (isset($_POST['bulk_edit_recurring_ticket_billable'])) { $recurring_ticket_id = intval($recurring_ticket_id); $sql = mysqli_query($mysqli, "SELECT recurring_ticket_subject, recurring_ticket_client_id FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']); $previous_recurring_ticket_billable = intval($row['recurring_ticket_billable']); @@ -624,7 +624,7 @@ if (isset($_POST['bulk_edit_recurring_ticket_next_run_date'])) { $recurring_ticket_id = intval($recurring_ticket_id); $sql = mysqli_query($mysqli, "SELECT recurring_ticket_subject, recurring_ticket_client_id FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_ticket_subject = sanitizeInput($row['recurring_ticket_subject']); $previous_recurring_ticket_next_run_date = sanitizeInput($row['recurring_ticket_next_run']); diff --git a/agent/post/service.php b/agent/post/service.php index f9371df1..b3523286 100644 --- a/agent/post/service.php +++ b/agent/post/service.php @@ -22,12 +22,12 @@ if (isset($_POST['add_service'])) { mysqli_query($mysqli, "INSERT INTO services SET service_name = '$service_name', service_description = '$service_description', service_category = '$service_category', service_importance = '$service_importance', service_backup = '$service_backup', service_notes = '$service_notes', service_client_id = $client_id"); // Create links to assets - + $service_id = mysqli_insert_id($mysqli); if (isset($_POST['contacts'])) { foreach($_POST['contacts'] as $contact_id) { - $contact_id = intval($contact_id); + $contact_id = intval($contact_id); mysqli_query($mysqli, "INSERT INTO service_contacts SET service_id = $service_id, contact_id = $contact_id"); } } @@ -77,7 +77,7 @@ if (isset($_POST['add_service'])) { logAction("Service", "Create", "$session_name created service $service_name", $client_id, $service_id); flash_alert("Service $service_name created"); - + redirect(); } @@ -160,7 +160,7 @@ if (isset($_POST['edit_service'])) { logAction("Service", "Edit", "$session_name edited service $service_name", $client_id, $service_id); flash_alert("Service $service_name edited"); - + redirect(); } @@ -170,12 +170,12 @@ if (isset($_GET['delete_service'])) { validateCSRFToken($_GET['csrf_token']); enforceUserPermission('module_support', 3); - + $service_id = intval($_GET['delete_service']); // Get Service Details $sql = mysqli_query($mysqli,"SELECT service_name, service_client_id FROM services WHERE service_id = $service_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $service_name = sanitizeInput($row['service_name']); $client_id = intval($row['service_client_id']); @@ -183,9 +183,9 @@ if (isset($_GET['delete_service'])) { mysqli_query($mysqli, "DELETE FROM services WHERE service_id = $service_id"); logAction("Service", "Delete", "$session_name deleted service $service_name", $client_id); - + flash_alert("Service $service_name deleted", 'error'); - + redirect(); } diff --git a/agent/post/software.php b/agent/post/software.php index fdabb21e..7ea5a2ee 100644 --- a/agent/post/software.php +++ b/agent/post/software.php @@ -16,7 +16,7 @@ if (isset($_POST['add_software_from_template'])) { // GET Software Template Info $sql_software_templates = mysqli_query($mysqli,"SELECT * FROM software_templates WHERE software_template_id = $software_template_id"); - $row = mysqli_fetch_array($sql_software_templates); + $row = mysqli_fetch_assoc($sql_software_templates); $name = sanitizeInput($row['software_template_name']); $version = sanitizeInput($row['software_template_version']); $description = sanitizeInput($row['software_template_description']); @@ -164,7 +164,7 @@ if (isset($_GET['archive_software'])) { // Get Software Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $software_name = sanitizeInput($row['software_name']); $client_id = intval($row['software_client_id']); @@ -190,7 +190,7 @@ if (isset($_GET['delete_software'])) { // Get Software Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $software_name = sanitizeInput($row['software_name']); $client_id = intval($row['software_client_id']); @@ -249,7 +249,7 @@ if (isset($_POST['export_software_csv'])) { ON software_assets.asset_id = assets.asset_id WHERE software_id = $row[software_id]" ); - while($asset_row = mysqli_fetch_array($asset_licenses_sql)) { + while($asset_row = mysqli_fetch_assoc($asset_licenses_sql)) { $assigned_to_assets .= $asset_row['asset_name'] . ", "; } @@ -262,7 +262,7 @@ if (isset($_POST['export_software_csv'])) { WHERE software_id = $row[software_id]" ); - while($contact_row = mysqli_fetch_array($contact_licenses_sql)) { + while($contact_row = mysqli_fetch_assoc($contact_licenses_sql)) { $assigned_to_contacts .= $contact_row['contact_name'] . ", "; } diff --git a/agent/post/task.php b/agent/post/task.php index f59a955d..aac1b68a 100644 --- a/agent/post/task.php +++ b/agent/post/task.php @@ -15,7 +15,7 @@ if (isset($_POST['add_task'])) { // Get Client ID from tickets using the ticket_id $client_id = intval(getFieldById('tickets', $ticket_id, 'ticket_client_id')); - + mysqli_query($mysqli, "INSERT INTO tasks SET task_name = '$task_name', task_ticket_id = $ticket_id"); $task_id = mysqli_insert_id($mysqli); @@ -39,9 +39,9 @@ if (isset($_POST['edit_ticket_task'])) { // 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); + $row = mysqli_fetch_assoc($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"); logAction("Task", "Edit", "$session_name edited task $task_name", $client_id, $task_id); @@ -81,7 +81,7 @@ if (isset($_GET['delete_task'])) { // Get Client ID, task name from tasks and tickets using the task_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); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['ticket_client_id']); $task_name = sanitizeInput($row['task_name']); @@ -103,7 +103,7 @@ if (isset($_GET['complete_task'])) { // 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); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['ticket_client_id']); $task_name = sanitizeInput($row['task_name']); $task_completion_estimate = intval($row['task_completion_estimate']); @@ -135,7 +135,7 @@ if (isset($_GET['undo_complete_task'])) { // 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); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['ticket_client_id']); $task_name = sanitizeInput($row['task_name']); $ticket_id = intval($row['ticket_id']); @@ -175,7 +175,7 @@ if (isset($_POST['add_ticket_task_approver'])) { $approval_id = mysqli_insert_id($mysqli); // Task/Ticket Info - $tt_row = mysqli_fetch_array(mysqli_query($mysqli, " + $tt_row = mysqli_fetch_assoc(mysqli_query($mysqli, " SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id @@ -200,7 +200,7 @@ if (isset($_POST['add_ticket_task_approver'])) { $config_base_url = sanitizeInput($config_base_url); // Get Company Info - $crow = mysqli_fetch_array(mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1")); + $crow = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1")); $company_name = sanitizeInput($crow['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($crow['company_phone'], $crow['company_phone_country_code'])); @@ -267,7 +267,7 @@ if (isset($_POST['add_ticket_task_approver'])) { $data = []; - while ($technical_contact = mysqli_fetch_array($sql_technical_contacts)) { + while ($technical_contact = mysqli_fetch_assoc($sql_technical_contacts)) { $technical_contact_name = sanitizeInput($technical_contact['contact_name']); $technical_contact_email = sanitizeInput($technical_contact['contact_email']); @@ -300,7 +300,7 @@ if (isset($_POST['add_ticket_task_approver'])) { $data = []; - while ($billing_contact = mysqli_fetch_array($sql_billing_contacts)) { + while ($billing_contact = mysqli_fetch_assoc($sql_billing_contacts)) { $billing_contact_name = sanitizeInput($billing_contact['contact_name']); $billing_contact_email = sanitizeInput($billing_contact['contact_email']); @@ -336,7 +336,7 @@ if (isset($_GET['approve_ticket_task'])) { $task_id = intval($_GET['approve_task']); $approval_id = intval($_GET['approval_id']); - $approval_row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM task_approvals LEFT JOIN tasks on task_id = approval_task_id WHERE approval_id = $approval_id AND approval_task_id = $task_id AND approval_scope = 'internal'")); + $approval_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM task_approvals LEFT JOIN tasks on task_id = approval_task_id WHERE approval_id = $approval_id AND approval_task_id = $task_id AND approval_scope = 'internal'")); $task_name = nullable_htmlentities($approval_row['task_name']); $scope = nullable_htmlentities($approval_row['approval_scope']); diff --git a/agent/post/ticket.php b/agent/post/ticket.php index f0b63526..2f7749ed 100644 --- a/agent/post/ticket.php +++ b/agent/post/ticket.php @@ -46,7 +46,7 @@ if (isset($_POST['add_ticket'])) { // Add the primary contact as the ticket contact if "Use primary contact" is checked if ($use_primary_contact == 1) { $sql = mysqli_query($mysqli, "SELECT contact_id FROM contacts WHERE contact_client_id = $client_id AND contact_primary = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact = intval($row['contact_id']); } @@ -80,7 +80,7 @@ if (isset($_POST['add_ticket'])) { $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); if (mysqli_num_rows($sql_task_templates) > 0) { - while ($row = mysqli_fetch_array($sql_task_templates)) { + while ($row = mysqli_fetch_assoc($sql_task_templates)) { $task_order = intval($row['task_template_order']); $task_name = sanitizeInput($row['task_template_name']); $task_completion_estimate = intval($row['task_template_completion_estimate']); @@ -114,7 +114,7 @@ if (isset($_POST['add_ticket'])) { LEFT JOIN clients ON ticket_client_id = client_id LEFT JOIN contacts ON ticket_contact_id = contact_id WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -132,7 +132,7 @@ if (isset($_POST['add_ticket'])) { // Get Company Phone Number $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -162,7 +162,7 @@ if (isset($_POST['add_ticket'])) { // Also Email all the watchers $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); $body .= "

----------------------------------------
YOU HAVE BEEN ADDED AS A COLLABORATOR FOR THIS TICKET"; - while ($row = mysqli_fetch_array($sql_watchers)) { + while ($row = mysqli_fetch_assoc($sql_watchers)) { $watcher_email = sanitizeInput($row['watcher_email']); // Queue Mail @@ -244,7 +244,7 @@ if (isset($_POST['edit_ticket'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_id = $ticket_id AND ticket_closed_at IS NULL"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -263,7 +263,7 @@ if (isset($_POST['edit_ticket'])) { // Get Company Name Phone Number and Sanitize for Email Sending $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -315,7 +315,7 @@ if (isset($_POST['edit_ticket_priority'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_id = $ticket_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $original_priority = sanitizeInput($row['ticket_priority']); @@ -353,7 +353,7 @@ if (isset($_POST['edit_ticket_contact'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_id = $ticket_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); // Original contact $original_contact_name = !empty($row['contact_name']) ? sanitizeInput($row['contact_name']) : 'No one'; @@ -372,7 +372,7 @@ if (isset($_POST['edit_ticket_contact'])) { // Get New contact details $sql = mysqli_query($mysqli, "SELECT contact_name, contact_email FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = !empty($row['contact_name']) ? sanitizeInput($row['contact_name']) : 'No one'; $contact_email = sanitizeInput($row['contact_email']); @@ -382,7 +382,7 @@ if (isset($_POST['edit_ticket_contact'])) { // Get Company Phone Number $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -458,7 +458,7 @@ if (isset($_POST['add_ticket_watcher'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_id = $ticket_id AND ticket_closed_at IS NULL"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -474,7 +474,7 @@ if (isset($_POST['add_ticket_watcher'])) { // Get Company Phone Number $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -533,7 +533,7 @@ if (isset($_GET['delete_ticket_watcher'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE watcher_id = $watcher_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -568,7 +568,7 @@ if (isset($_GET['delete_ticket_additional_asset'])) { JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE asset_id = $asset_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -617,7 +617,7 @@ if (isset($_POST['edit_ticket_asset'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_id = $ticket_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -648,7 +648,7 @@ if (isset($_POST['edit_ticket_vendor'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_id = $ticket_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -685,7 +685,7 @@ if (isset($_POST['assign_ticket'])) { } else { // Get & verify assigned agent details $agent_details_sql = mysqli_query($mysqli, "SELECT user_name, user_email FROM users WHERE users.user_id = $assigned_to"); - $agent_details = mysqli_fetch_array($agent_details_sql); + $agent_details = mysqli_fetch_assoc($agent_details_sql); $agent_name = sanitizeInput($agent_details['user_name']); $agent_email = sanitizeInput($agent_details['user_email']); @@ -699,7 +699,7 @@ if (isset($_POST['assign_ticket'])) { // Get & verify ticket details $ticket_details_sql = mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number, ticket_subject, ticket_client_id, client_name FROM tickets LEFT JOIN clients ON ticket_client_id = client_id WHERE ticket_id = '$ticket_id' AND ticket_status != 5"); - $ticket_details = mysqli_fetch_array($ticket_details_sql); + $ticket_details = mysqli_fetch_assoc($ticket_details_sql); $ticket_prefix = sanitizeInput($ticket_details['ticket_prefix']); $ticket_number = intval($ticket_details['ticket_number']); @@ -771,7 +771,7 @@ if (isset($_GET['delete_ticket'])) { // Get Ticket and Client ID for logging and alert message $sql = mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number, ticket_subject, ticket_status, ticket_closed_at, ticket_client_id FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = sanitizeInput($row['ticket_number']); $ticket_subject = sanitizeInput($row['ticket_subject']); @@ -868,7 +868,7 @@ if (isset($_POST['bulk_assign_ticket'])) { $ticket_id = intval($ticket_id); $sql = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -888,7 +888,7 @@ if (isset($_POST['bulk_assign_ticket'])) { } else { // Get & verify assigned agent details $agent_details_sql = mysqli_query($mysqli, "SELECT user_name, user_email FROM users LEFT JOIN user_settings ON users.user_id = user_settings.user_id WHERE users.user_id = $assign_to"); - $agent_details = mysqli_fetch_array($agent_details_sql); + $agent_details = mysqli_fetch_assoc($agent_details_sql); $agent_name = sanitizeInput($agent_details['user_name']); $agent_email = sanitizeInput($agent_details['user_email']); @@ -969,7 +969,7 @@ if (isset($_POST['bulk_edit_ticket_priority'])) { $ticket_id = intval($ticket_id); $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -1013,7 +1013,7 @@ if (isset($_POST['bulk_edit_ticket_category'])) { $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); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -1056,7 +1056,7 @@ if (isset($_POST['bulk_merge_tickets'])) { flash_alert("Cannot merge into that ticket.", 'error'); redirect(); } - $merge_row = mysqli_fetch_array($sql); + $merge_row = mysqli_fetch_assoc($sql); $merge_into_ticket_id = intval($merge_row['ticket_id']); // Parent ticket ID // Update & Close the selected tickets @@ -1070,7 +1070,7 @@ if (isset($_POST['bulk_merge_tickets'])) { if ($ticket_id !== $merge_into_ticket_id) { $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -1141,7 +1141,7 @@ if (isset($_POST['bulk_resolve_tickets'])) { $ticket_count++; $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -1173,7 +1173,7 @@ if (isset($_POST['bulk_resolve_tickets'])) { LEFT JOIN contacts ON ticket_contact_id = contact_id WHERE ticket_id = $ticket_id "); - $row = mysqli_fetch_array($ticket_sql); + $row = mysqli_fetch_assoc($ticket_sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -1185,7 +1185,7 @@ if (isset($_POST['bulk_resolve_tickets'])) { // 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); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -1214,7 +1214,7 @@ if (isset($_POST['bulk_resolve_tickets'])) { // 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)) { + while ($row = mysqli_fetch_assoc($sql_watchers)) { $watcher_email = sanitizeInput($row['watcher_email']); // Queue Mail @@ -1270,7 +1270,7 @@ if (isset($_POST['bulk_ticket_reply'])) { $ticket_id = intval($ticket_id); $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -1321,7 +1321,7 @@ if (isset($_POST['bulk_ticket_reply'])) { WHERE ticket_id = $ticket_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -1334,7 +1334,7 @@ if (isset($_POST['bulk_ticket_reply'])) { $base_url = sanitizeInput($config_base_url); $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -1364,7 +1364,7 @@ if (isset($_POST['bulk_ticket_reply'])) { // 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)) { + while ($row = mysqli_fetch_assoc($sql_watchers)) { $watcher_email = sanitizeInput($row['watcher_email']); // Queue Mail @@ -1412,7 +1412,7 @@ if (isset($_POST['bulk_add_ticket_project'])) { // Get Project Name $sql = mysqli_query($mysqli, "SELECT project_name FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $project_name = sanitizeInput($row['project_name']); // Assign Project to Selected Tickets @@ -1425,7 +1425,7 @@ if (isset($_POST['bulk_add_ticket_project'])) { $ticket_id = intval($ticket_id); $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -1473,7 +1473,7 @@ if (isset($_POST['bulk_add_asset_ticket'])) { // Check to see if adding a ticket by template if($ticket_template_id) { $sql = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); // Override Template Subject if(empty($subject)) { @@ -1496,7 +1496,7 @@ if (isset($_POST['bulk_add_asset_ticket'])) { $asset_id = intval($asset_id); $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_id = $asset_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $asset_name = sanitizeInput($row['asset_name']); $client_id = intval($row['asset_client_id']); @@ -1541,7 +1541,7 @@ if (isset($_POST['bulk_add_asset_ticket'])) { // Add Tasks from Template if Template was selected if($ticket_template_id) { if (mysqli_num_rows($sql_task_templates) > 0) { - while ($row = mysqli_fetch_array($sql_task_templates)) { + while ($row = mysqli_fetch_assoc($sql_task_templates)) { $task_order = intval($row['task_template_order']); $task_name = sanitizeInput($row['task_template_name']); @@ -1624,7 +1624,7 @@ if (isset($_POST['add_ticket_reply'])) { WHERE ticket_id = $ticket_id "); - $row = mysqli_fetch_array($ticket_sql); + $row = mysqli_fetch_assoc($ticket_sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -1645,7 +1645,7 @@ if (isset($_POST['add_ticket_reply'])) { $config_base_url = sanitizeInput($config_base_url); $sql = mysqli_query($mysqli, "SELECT company_name, company_phone, company_phone_country_code FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -1683,7 +1683,7 @@ if (isset($_POST['add_ticket_reply'])) { // 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)) { + while ($row = mysqli_fetch_assoc($sql_watchers)) { $watcher_email = sanitizeInput($row['watcher_email']); // Queue Mail @@ -1808,7 +1808,7 @@ if (isset($_POST['merge_ticket'])) { redirect(); } // CURRENT ticket details - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $ticket_subject = sanitizeInput($row['ticket_subject']); @@ -1822,7 +1822,7 @@ if (isset($_POST['merge_ticket'])) { flash_alert("Cannot merge into that ticket.", 'error'); redirect(); } - $merge_row = mysqli_fetch_array($sql); + $merge_row = mysqli_fetch_assoc($sql); $merge_into_ticket_id = intval($merge_row['ticket_id']); $client_id = intval($merge_row['ticket_client_id']); if ($client_id) { @@ -1898,7 +1898,7 @@ if (isset($_GET['resolve_ticket'])) { $ticket_id = intval($_GET['resolve_ticket']); $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $ticket_first_response_at = sanitizeInput($row['ticket_first_response_at']); @@ -1925,7 +1925,7 @@ if (isset($_GET['resolve_ticket'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_id = $ticket_id "); - $row = mysqli_fetch_array($ticket_sql); + $row = mysqli_fetch_assoc($ticket_sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -1944,7 +1944,7 @@ if (isset($_GET['resolve_ticket'])) { // 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); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -1973,7 +1973,7 @@ if (isset($_GET['resolve_ticket'])) { // 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)) { + while ($row = mysqli_fetch_assoc($sql_watchers)) { $watcher_email = sanitizeInput($row['watcher_email']); // Queue Mail @@ -2021,7 +2021,7 @@ if (isset($_GET['close_ticket'])) { LEFT JOIN contacts ON ticket_contact_id = contact_id WHERE ticket_id = $ticket_id "); - $row = mysqli_fetch_array($ticket_sql); + $row = mysqli_fetch_assoc($ticket_sql); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); @@ -2037,7 +2037,7 @@ if (isset($_GET['close_ticket'])) { // 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); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -2066,7 +2066,7 @@ if (isset($_GET['close_ticket'])) { // 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)) { + while ($row = mysqli_fetch_assoc($sql_watchers)) { $watcher_email = sanitizeInput($row['watcher_email']); // Queue Mail @@ -2128,7 +2128,7 @@ if (isset($_POST['add_invoice_from_ticket'])) { WHERE ticket_id = $ticket_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['client_id']); $client_net_terms = intval($row['client_net_terms']); if ($client_net_terms == 0) { @@ -2173,7 +2173,7 @@ if (isset($_POST['add_invoice_from_ticket'])) { $invoice_id = mysqli_insert_id($mysqli); } else { $sql_invoice = mysqli_query($mysqli, "SELECT invoice_prefix, invoice_number FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_invoice); + $row = mysqli_fetch_assoc($sql_invoice); $invoice_prefix = sanitizeInput($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); } @@ -2189,7 +2189,7 @@ if (isset($_POST['add_invoice_from_ticket'])) { if ($tax_id > 0) { $sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE tax_id = $tax_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $tax_percent = floatval($row['tax_percent']); $tax_amount = $subtotal * $tax_percent / 100; } else { @@ -2203,7 +2203,7 @@ if (isset($_POST['add_invoice_from_ticket'])) { //Update Invoice Balances $sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $new_invoice_amount = floatval($row['invoice_amount']) + $total; @@ -2292,7 +2292,7 @@ if (isset($_POST['edit_ticket_billable_status'])) { // Get ticket details for logging $sql = mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number, ticket_client_id FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); $client_id = intval($row['ticket_client_id']); @@ -2331,7 +2331,7 @@ if (isset($_POST['edit_ticket_schedule'])) { $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_schedule BETWEEN '$start' AND '$end' AND ticket_id != $ticket_id"); if (mysqli_num_rows($sql) > 0) { $conflicting_tickets = []; - while ($row = mysqli_fetch_array($sql)) { + while ($row = mysqli_fetch_assoc($sql)) { $conflicting_tickets[] = $row['ticket_id'] . " - " . $row['ticket_subject'] . " @ " . $row['ticket_schedule']; } } @@ -2343,7 +2343,7 @@ if (isset($_POST['edit_ticket_schedule'])) { WHERE ticket_id = $ticket_id "); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['ticket_client_id']); $client_name = sanitizeInput($row['client_name']); @@ -2416,7 +2416,7 @@ if (isset($_POST['edit_ticket_schedule'])) { // Notify the watchers of the scheduled work $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); - while ($row = mysqli_fetch_array($sql_watchers)) { + while ($row = mysqli_fetch_assoc($sql_watchers)) { $watcher_email = sanitizeInput($row['watcher_email']); $data[] = [ 'from' => $config_ticket_from_email, @@ -2480,7 +2480,7 @@ if (isset($_GET['cancel_ticket_schedule'])) { $ticket_id = intval($_GET['cancel_ticket_schedule']); $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['ticket_client_id']); $ticket_prefix = sanitizeInput($row['ticket_prefix']); @@ -2508,7 +2508,7 @@ if (isset($_GET['cancel_ticket_schedule'])) { LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_id = $ticket_id "); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_id = intval($row['ticket_client_id']); $client_name = sanitizeInput($row['client_name']); diff --git a/agent/post/transfer.php b/agent/post/transfer.php index 21a27dcf..2915f543 100644 --- a/agent/post/transfer.php +++ b/agent/post/transfer.php @@ -14,13 +14,13 @@ if (isset($_POST['add_transfer'])) { // Get Source Account Name for logging $sql = mysqli_query($mysqli,"SELECT account_name, account_currency_code FROM accounts WHERE account_id = $account_from"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $source_account_name = sanitizeInput($row['account_name']); $account_currency_code = sanitizeInput($row['account_currency_code']); // Get Destination Account Name for logging $sql = mysqli_query($mysqli,"SELECT account_name FROM accounts WHERE account_id = $account_to"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $destination_account_name = sanitizeInput($row['account_name']); mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$date', expense_amount = $amount, expense_currency_code = '$session_company_currency', expense_vendor_id = 0, expense_category_id = 0, expense_account_id = $account_from"); @@ -72,7 +72,7 @@ if (isset($_GET['delete_transfer'])) { $transfer_id = intval($_GET['delete_transfer']); // Query the transfer ID to get the Payment and Expense IDs, so we can delete those as well - $row = mysqli_fetch_array(mysqli_query($mysqli,"SELECT * FROM transfers WHERE transfer_id = $transfer_id")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT * FROM transfers WHERE transfer_id = $transfer_id")); $expense_id = intval($row['transfer_expense_id']); $revenue_id = intval($row['transfer_revenue_id']); diff --git a/agent/post/vendor.php b/agent/post/vendor.php index fde7f224..4792cf84 100644 --- a/agent/post/vendor.php +++ b/agent/post/vendor.php @@ -15,7 +15,7 @@ if (isset($_POST['add_vendor_from_template'])) { //GET Vendor Info $sql_vendor_templates = mysqli_query($mysqli,"SELECT * FROM vendor_templates WHERE vendor_template_id = $vendor_template_id"); - $row = mysqli_fetch_array($sql_vendor_templates); + $row = mysqli_fetch_assoc($sql_vendor_templates); $name = sanitizeInput($row['vendor_template_name']); $description = sanitizeInput($row['vendor_template_description']); @@ -90,7 +90,7 @@ if (isset($_GET['archive_vendor'])) { //Get Vendor Name $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_id = $vendor_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $vendor_name = sanitizeInput($row['vendor_name']); $client_id = intval($row['vendor_client_id']); @@ -110,7 +110,7 @@ if(isset($_GET['unarchive_vendor'])){ // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT vendor_name, vendor_client_id FROM vendors WHERE vendor_id = $vendor_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $vendor_name = sanitizeInput($row['vendor_name']); $client_id = intval($row['vendor_client_id']); @@ -130,7 +130,7 @@ if (isset($_GET['delete_vendor'])) { //Get Vendor Name $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_id = $vendor_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $vendor_name = sanitizeInput($row['vendor_name']); $client_id = intval($row['vendor_client_id']); $vendor_template_id = intval($row['vendor_template_id']); @@ -168,7 +168,7 @@ if (isset($_POST['bulk_archive_vendors'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT vendor_name, vendor_client_id FROM vendors WHERE vendor_id = $vendor_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $vendor_name = sanitizeInput($row['vendor_name']); $client_id = intval($row['vendor_client_id']); @@ -205,7 +205,7 @@ if (isset($_POST['bulk_unarchive_vendors'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT vendor_name, vendor_client_id FROM vendors WHERE vendor_id = $vendor_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $vendor_name = sanitizeInput($row['vendor_name']); $client_id = intval($row['vendor_client_id']); @@ -243,7 +243,7 @@ if (isset($_POST['bulk_delete_vendors'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT vendor_name, vendor_client_id, vendor_template_id FROM vendors WHERE vendor_id = $vendor_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $vendor_name = sanitizeInput($row['vendor_name']); $client_id = intval($row['vendor_client_id']); $vendor_template_id = intval($row['vendor_template_id']); diff --git a/agent/post/vendor_contact.php b/agent/post/vendor_contact.php index 2d2b6d1a..c580c65f 100644 --- a/agent/post/vendor_contact.php +++ b/agent/post/vendor_contact.php @@ -50,7 +50,7 @@ if (isset($_POST['bulk_archive_vendor_contacts'])) { //validateCSRFToken($_POST['csrf_token']); - enforceUserPermission('module_client', 2); + enforceUserPermission('module_client', 2); if (isset($_POST['vendor_contact_ids'])) { @@ -63,7 +63,7 @@ if (isset($_POST['bulk_archive_vendor_contacts'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT vendor_contact_name, vendor_contact_client_id FROM vendor_contacts WHERE vendor_contact_id = $vendor_contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $vendor_contact_name = sanitizeInput($row['vendor_contact_name']); $client_id = intval($row['contact_client_id']); @@ -84,7 +84,7 @@ if (isset($_POST['bulk_unarchive_vendor_contacts'])) { //validateCSRFToken($_POST['csrf_token']); enforceUserPermission('module_client', 2); - + if (isset($_POST['contact_ids'])) { // Get Selected Contacts Count @@ -97,7 +97,7 @@ if (isset($_POST['bulk_unarchive_vendor_contacts'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -128,7 +128,7 @@ if (isset($_POST['bulk_delete_vendor_contacts'])) { validateCSRFToken($_POST['csrf_token']); enforceUserPermission('module_client', 3); - + if (isset($_POST['contact_ids'])) { // Get Selected Contacts Count @@ -141,7 +141,7 @@ if (isset($_POST['bulk_delete_vendor_contacts'])) { // Get Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -184,7 +184,7 @@ if (isset($_GET['archive_vendor_contact'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -195,7 +195,7 @@ if (isset($_GET['archive_vendor_contact'])) { } mysqli_query($mysqli,"UPDATE contacts SET contact_important = 0, contact_billing = 0, contact_technical = 0, contact_archived_at = NOW() WHERE contact_id = $contact_id"); - + logAction("Contact", "Archive", "$session_name archived contact $contact_name", $client_id, $contact_id); flash_alert("Contact $contact_name has been archived", 'alert'); @@ -212,7 +212,7 @@ if (isset($_GET['unarchive_vendor_contact'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id, contact_user_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -240,7 +240,7 @@ if (isset($_GET['delete_vendor_contact'])) { // Get Contact Name and Client ID for logging and alert message $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id FROM contacts WHERE contact_id = $contact_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_name = sanitizeInput($row['contact_name']); $client_id = intval($row['contact_client_id']); $contact_user_id = intval($row['contact_user_id']); @@ -276,7 +276,7 @@ if (isset($_POST['export_vendor_contacts_csv'])) { //get records from database $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_name = $row['client_name']; @@ -409,7 +409,7 @@ if (isset($_POST["import_vendor_contacts_csv"])) { logAction("Contact", "Import", "$session_name imported $row_count contact(s) via CSV file", $client_id); flash_alert("$row_count Contact(s) added, $duplicate_count duplicate(s) detected", 'warning'); - + redirect(); } //Check for any errors, if there are notify user and redirect @@ -420,12 +420,12 @@ if (isset($_POST["import_vendor_contacts_csv"])) { } if (isset($_GET['download_vendor_contacts_csv_template'])) { - + $client_id = intval($_GET['download_client_contacts_csv_template']); //get records from database $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $client_name = $row['client_name']; diff --git a/agent/products.php b/agent/products.php index f9dae1d8..eb131867 100644 --- a/agent/products.php +++ b/agent/products.php @@ -93,7 +93,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -220,7 +220,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Bulk Action (0)
- Assign Agent
- Set Category
- Set Priority
- Update/Reply
- Merge
- @@ -385,7 +385,7 @@ if (isset($_GET['project_id'])) {
- "> + "> ">
Add to Invoice
0) { ?> - " + " class="btn btn-sm btn-dark mb-2" title="Dismiss All"> @@ -123,7 +123,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
0) { - while ($row = mysqli_fetch_array($products_sql)) { + while ($row = mysqli_fetch_assoc($products_sql)) { $products[] = $row; } $json_products = json_encode($products); @@ -309,7 +309,7 @@ if (isset($_GET['quote_id'])) { $total_tax = 0.00; $sub_total = 0.00; - while ($row = mysqli_fetch_array($sql_items)) { + while ($row = mysqli_fetch_assoc($sql_items)) { $item_id = intval($row['item_id']); $item_name = nullable_htmlentities($row['item_name']); $item_description = nullable_htmlentities($row['item_description']); @@ -371,7 +371,7 @@ if (isset($_GET['quote_id'])) { "> @@ -394,7 +394,7 @@ if (isset($_GET['quote_id'])) {
- "> Archived @@ -61,9 +61,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +

U

- +
- = 1; $i--) { - + // Find all devices that occupy the current unit $i $unit_devices = []; foreach ($rack_units_data as $unit_data) { $start = (int) $unit_data['unit_start_number']; $end = (int) $unit_data['unit_end_number']; - + // If $i is between start and end, device occupies this unit if ($i >= $start && $i <= $end) { $unit_devices[] = [ @@ -246,13 +246,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> - + - + 0) { - while ($row = mysqli_fetch_array($products_sql)) { + while ($row = mysqli_fetch_assoc($products_sql)) { $products[] = $row; } $json_products = json_encode($products); @@ -158,7 +158,7 @@ if (isset($_GET['recurring_invoice_id'])) { "; echo ""; } - + // Displaying the monthly totals row echo ""; $grandTotal = 0; @@ -104,4 +104,4 @@ $monthlyTotals = array_fill(1, 12, 0); // Initialize monthly totals for each mo \ No newline at end of file + ?> diff --git a/agent/reports/clients_with_balance.php b/agent/reports/clients_with_balance.php index 29ac13f8..b605c126 100644 --- a/agent/reports/clients_with_balance.php +++ b/agent/reports/clients_with_balance.php @@ -17,38 +17,38 @@ enforceUserPermission('module_financial'); 0 ORDER BY balance DESC "); ?> - +
- - @@ -261,7 +261,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } ?>
@@ -269,7 +269,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- Remove @@ -284,7 +284,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } elseif (count($unit_devices) > 1) { // If your data might have multiple devices in the same row, - // you have to decide how to handle them. + // you have to decide how to handle them. // For now, we can fallback to older logic or display them all in one cell, etc. ?>
@@ -293,7 +293,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- Remove @@ -330,9 +330,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + - + diff --git a/agent/recurring_expenses.php b/agent/recurring_expenses.php index ef867adb..3568ccd5 100644 --- a/agent/recurring_expenses.php +++ b/agent/recurring_expenses.php @@ -117,7 +117,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
" . $categoryTotal . "
Total
@@ -59,7 +59,7 @@ enforceUserPermission('module_financial');
@@ -82,4 +82,3 @@ enforceUserPermission('module_financial'); 599 - ORDER BY + ORDER BY amount_paid DESC "); @@ -52,7 +52,7 @@ $sql_vendor_expenses = mysqli_query($mysqli, " @@ -74,7 +74,7 @@ $sql_vendor_expenses = mysqli_query($mysqli, " @@ -85,7 +85,7 @@ $sql_vendor_expenses = mysqli_query($mysqli, " diff --git a/agent/reports/expense_summary.php b/agent/reports/expense_summary.php index a127eb64..85adc08b 100644 --- a/agent/reports/expense_summary.php +++ b/agent/reports/expense_summary.php @@ -35,7 +35,7 @@ $largest_expense_month = 0;
- @@ -71,7 +71,7 @@ $largest_income_month = 0; - @@ -81,12 +81,12 @@ $largest_income_month = 0; for ($month = 1; $month <= 12; $month++) { // Payments to Invoices $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month"); - $row2 = mysqli_fetch_array($sql_payments); + $row2 = mysqli_fetch_assoc($sql_payments); $payment_amount_for_month = floatval($row2['payment_amount_for_month']); // Revenues $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month"); - $row3 = mysqli_fetch_array($sql_revenues); + $row3 = mysqli_fetch_assoc($sql_revenues); $revenues_amount_for_month = floatval($row3['revenue_amount_for_month']); $payment_amount_for_month = $payment_amount_for_month + $revenues_amount_for_month; @@ -104,11 +104,11 @@ $largest_income_month = 0; $grand_total_all_months = 0; for ($month = 1; $month <= 12; $month++) { $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month"); - $row4 = mysqli_fetch_array($sql_payments); + $row4 = mysqli_fetch_assoc($sql_payments); $payment_total_amount_for_month = floatval($row4['payment_total_amount_for_month']); $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month"); - $row5 = mysqli_fetch_array($sql_revenues); + $row5 = mysqli_fetch_assoc($sql_revenues); $revenues_total_amount_for_month = floatval($row5['revenue_amount_for_month']); $payment_total_amount_for_month += $revenues_total_amount_for_month; @@ -154,11 +154,11 @@ $largest_income_month = 0; // Build series and track the largest month for axis max for ($month = 1; $month <= 12; $month++) { $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month"); - $r1 = mysqli_fetch_array($sql_payments); + $r1 = mysqli_fetch_assoc($sql_payments); $payments_for_month = floatval($r1['payment_amount_for_month']); $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month"); - $r2 = mysqli_fetch_array($sql_revenues); + $r2 = mysqli_fetch_assoc($sql_revenues); $revenues_for_month = floatval($r2['revenue_amount_for_month']); $income_for_month = $payments_for_month + $revenues_for_month; diff --git a/agent/reports/profit_loss.php b/agent/reports/profit_loss.php index f250614f..f04817cf 100644 --- a/agent/reports/profit_loss.php +++ b/agent/reports/profit_loss.php @@ -36,7 +36,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE @@ -116,33 +116,33 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients 0 || $ticket_resolved_count > 0) { @@ -162,7 +162,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients $avg_time_to_respond = '-'; $count = 0; $total = 0; - while ($row = mysqli_fetch_array($sql_tickets_respond)) { + while ($row = mysqli_fetch_assoc($sql_tickets_respond)) { if (!empty($row['ticket_first_response_at'])) { $openedTime = new DateTime($row['ticket_created_at']); $respondTime = new DateTime($row['ticket_first_response_at']); @@ -179,7 +179,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients if ($ticket_resolved_count > 0) { $count = 0; $total = 0; - while ($row = mysqli_fetch_array($sql_tickets_resolved)) { + while ($row = mysqli_fetch_assoc($sql_tickets_resolved)) { $openedTime = new DateTime($row['ticket_created_at']); $resolvedTime = new DateTime($row['ticket_resolved_at']); @@ -238,33 +238,33 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients 0 || $ticket_resolved_count > 0) { @@ -284,7 +284,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients $avg_time_to_respond = '-'; $count = 0; $total = 0; - while ($row = mysqli_fetch_array($sql_tickets_respond)) { + while ($row = mysqli_fetch_assoc($sql_tickets_respond)) { if (!empty($row['ticket_first_response_at'])) { $openedTime = new DateTime($row['ticket_created_at']); $respondTime = new DateTime($row['ticket_first_response_at']); @@ -301,7 +301,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients if ($ticket_resolved_count > 0) { $count = 0; $total = 0; - while ($row = mysqli_fetch_array($sql_tickets_resolved)) { + while ($row = mysqli_fetch_assoc($sql_tickets_resolved)) { $openedTime = new DateTime($row['ticket_created_at']); $resolvedTime = new DateTime($row['ticket_resolved_at']); @@ -340,4 +340,3 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients @@ -87,7 +87,7 @@ $rows = 0; 0) { @@ -179,4 +179,3 @@ $rows = 0; @@ -378,7 +378,7 @@ $sql_categories_filter = mysqli_query( @@ -398,7 +398,7 @@ $sql_categories_filter = mysqli_query( @@ -104,7 +104,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -160,7 +160,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); MFA Enforcement | - - + @@ -66,14 +66,14 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
@@ -181,7 +181,7 @@ if (isset($_GET['vendor_id'])) { 0) { $return_arr['count'] = mysqli_num_rows($sql); $row = array(); - while ($row = mysqli_fetch_array($sql)) { + while ($row = mysqli_fetch_assoc($sql)) { $row['credential_username'] = apiDecryptCredentialEntry($row['credential_username'], $api_key_decrypt_hash, $api_key_decrypt_password); $row['credential_password'] = apiDecryptCredentialEntry($row['credential_password'], $api_key_decrypt_hash, $api_key_decrypt_password); $return_arr['data'][] = $row; diff --git a/api/v1/read_output.php b/api/v1/read_output.php index 97162ace..b3dcaa64 100644 --- a/api/v1/read_output.php +++ b/api/v1/read_output.php @@ -11,7 +11,7 @@ if ($sql && mysqli_num_rows($sql) > 0) { $return_arr['count'] = mysqli_num_rows($sql); $row = array(); - while ($row = mysqli_fetch_array($sql)) { + while ($row = mysqli_fetch_assoc($sql)) { $return_arr['data'][] = $row; } diff --git a/api/v1/tickets/create.php b/api/v1/tickets/create.php index 9339003b..a2e32a0e 100644 --- a/api/v1/tickets/create.php +++ b/api/v1/tickets/create.php @@ -8,7 +8,7 @@ require_once '../require_post_method.php'; require_once "../../../includes/load_global_settings.php"; $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $company_name = $row['company_name']; $company_phone = formatPhoneNumber($row['company_phone']); @@ -28,7 +28,7 @@ if (!empty($subject)) { // If no contact is selected automatically choose the primary contact for the client (if client set) if ($contact == 0 && $client_id != 0) { $sql = mysqli_query($mysqli,"SELECT contact_id FROM contacts WHERE contact_client_id = $client_id AND contact_primary = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact = intval($row['contact_id']); } diff --git a/api/v1/validate_api_key.php b/api/v1/validate_api_key.php index b37821ab..80b52e71 100644 --- a/api/v1/validate_api_key.php +++ b/api/v1/validate_api_key.php @@ -91,7 +91,7 @@ if (isset($api_key)) { // SUCCESS // Set client ID, company ID & key name - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $api_key_name = htmlentities($row['api_key_name']); $api_key_decrypt_hash = $row['api_key_decrypt_hash']; // No sanitization $client_id = intval($row['api_key_client_id']); diff --git a/client/assets.php b/client/assets.php index e67b09b2..5f38ec64 100644 --- a/client/assets.php +++ b/client/assets.php @@ -43,7 +43,7 @@ $assets_sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON 0) { - $file_row = mysqli_fetch_array($sql_files); + $file_row = mysqli_fetch_assoc($sql_files); $file_id = intval($file_row['file_id']); $file_name = nullable_htmlentities($file_row['file_name']); $file_reference_name = nullable_htmlentities($file_row['file_reference_name']); @@ -81,9 +81,9 @@ if (mysqli_num_rows($sql_files) > 0) { $file_size = intval($file_row['file_size']); $file_mime_type = nullable_htmlentities($file_row['file_mime_type']); $file_size_formatted = formatBytes($file_size); - + $file_path = "../uploads/clients/$session_client_id/$file_reference_name"; - + // For PDF files, display them inline if ($file_ext == 'pdf') { ?> @@ -185,7 +185,7 @@ if (mysqli_num_rows($sql_files) > 0) {
diff --git a/client/documents.php b/client/documents.php index e98ae29d..1ab42840 100644 --- a/client/documents.php +++ b/client/documents.php @@ -45,7 +45,7 @@ $documents_sql = mysqli_query($mysqli, "SELECT document_id, document_name, docum - Supported formats: PDF, Word documents, text files
diff --git a/client/domains.php b/client/domains.php index 3beac65f..15417732 100644 --- a/client/domains.php +++ b/client/domains.php @@ -31,7 +31,7 @@ $domains_sql = mysqli_query($mysqli, "SELECT domain_id, domain_name, domain_expi 1024 && $i < count($units) - 1; $i++) { $bytes /= 1024; } - + return round($bytes, $precision) . ' ' . $units[$i]; } diff --git a/client/includes/check_login.php b/client/includes/check_login.php index 3e5adb94..5d73e4e8 100644 --- a/client/includes/check_login.php +++ b/client/includes/check_login.php @@ -42,7 +42,7 @@ $session_user_id = intval($_SESSION['user_id']); // Get company info from database $sql = mysqli_query($mysqli, "SELECT * FROM companies WHERE company_id = 1"); -$row = mysqli_fetch_array($sql); +$row = mysqli_fetch_assoc($sql); $session_company_name = $row['company_name']; $session_company_country = $row['company_country']; @@ -53,7 +53,7 @@ $session_company_logo = $row['company_logo']; // Get contact info $contact_sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_id = $session_contact_id AND contact_client_id = $session_client_id"); -$contact = mysqli_fetch_array($contact_sql); +$contact = mysqli_fetch_assoc($contact_sql); $session_contact_name = sanitizeInput($contact['contact_name']); $session_contact_initials = initials($session_contact_name); @@ -74,6 +74,6 @@ if ($contact['contact_billing'] == 1) { // Get client info $client_sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_id = $session_client_id"); -$client = mysqli_fetch_array($client_sql); +$client = mysqli_fetch_assoc($client_sql); $session_client_name = $client['client_name']; diff --git a/client/includes/header.php b/client/includes/header.php index 6b8ff41c..05a841ce 100644 --- a/client/includes/header.php +++ b/client/includes/header.php @@ -84,7 +84,7 @@ header("X-Frame-Options: DENY"); // Legacy ORDER BY custom_link_order ASC, custom_link_name ASC" ); - while ($row = mysqli_fetch_array($sql_custom_links)) { + while ($row = mysqli_fetch_assoc($sql_custom_links)) { $custom_link_name = nullable_htmlentities($row['custom_link_name']); $custom_link_uri = nullable_htmlentities($row['custom_link_uri']); $custom_link_new_tab = intval($row['custom_link_new_tab']); diff --git a/client/index.php b/client/index.php index 36a27407..576d34e1 100644 --- a/client/index.php +++ b/client/index.php @@ -11,12 +11,12 @@ require_once "includes/inc_all.php"; // Billing Card Queries //Add up all the payments for the invoice and get the total amount paid to the invoice $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $session_client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'"); -$row = mysqli_fetch_array($sql_invoice_amounts); +$row = mysqli_fetch_assoc($sql_invoice_amounts); $invoice_amounts = floatval($row['invoice_amounts']); $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $session_client_id"); -$row = mysqli_fetch_array($sql_amount_paid); +$row = mysqli_fetch_assoc($sql_amount_paid); $amount_paid = floatval($row['amount_paid']); @@ -24,13 +24,13 @@ $balance = $invoice_amounts - $amount_paid; //Get Monthly Recurring Total $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $session_client_id"); -$row = mysqli_fetch_array($sql_recurring_monthly_total); +$row = mysqli_fetch_assoc($sql_recurring_monthly_total); $recurring_monthly_total = floatval($row['recurring_monthly_total']); //Get Yearly Recurring Total $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $session_client_id"); -$row = mysqli_fetch_array($sql_recurring_yearly_total); +$row = mysqli_fetch_assoc($sql_recurring_yearly_total); $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; @@ -226,7 +226,7 @@ if ($session_contact_primary == 1 || $session_contact_is_technical_contact) {
diff --git a/client/post.php b/client/post.php index 1a315915..23eb4723 100644 --- a/client/post.php +++ b/client/post.php @@ -104,7 +104,7 @@ if (isset($_POST['add_ticket_comment'])) { // Get ticket details & Notify the assigned tech (if any) - $ticket_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN clients ON ticket_client_id = client_id WHERE ticket_id = $ticket_id LIMIT 1")); + $ticket_details = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN clients ON ticket_client_id = client_id WHERE ticket_id = $ticket_id LIMIT 1")); $ticket_number = intval($ticket_details['ticket_number']); $ticket_assigned_to = intval($ticket_details['ticket_assigned_to']); @@ -114,7 +114,7 @@ if (isset($_POST['add_ticket_comment'])) { if ($ticket_details && $ticket_assigned_to !== 0) { // Get tech details - $tech_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT user_email, user_name FROM users WHERE user_id = $ticket_assigned_to LIMIT 1")); + $tech_details = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT user_email, user_name FROM users WHERE user_id = $ticket_assigned_to LIMIT 1")); $tech_email = sanitizeInput($tech_details['user_email']); $tech_name = sanitizeInput($tech_details['user_name']); @@ -191,7 +191,7 @@ if (isset($_GET['approve_ticket_task'])) { $approval_id = intval($_GET['approval_id']); $url_key = sanitizeInput($_GET['approval_url_key']); - $approval_row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM task_approvals LEFT JOIN tasks on task_id = approval_task_id WHERE approval_id = $approval_id AND approval_task_id = $task_id AND approval_url_key = '$url_key' AND approval_status = 'pending' AND approval_scope = 'client'")); + $approval_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM task_approvals LEFT JOIN tasks on task_id = approval_task_id WHERE approval_id = $approval_id AND approval_task_id = $task_id AND approval_url_key = '$url_key' AND approval_status = 'pending' AND approval_scope = 'client'")); $task_name = nullable_htmlentities($approval_row['task_name']); $scope = nullable_htmlentities($approval_row['approval_scope']); @@ -235,7 +235,7 @@ if (isset($_POST['add_ticket_feedback'])) { // Notify on bad feedback if ($feedback == "Bad") { - $ticket_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT ticket_number FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); + $ticket_details = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT ticket_number FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); $ticket_number = intval($ticket_details['ticket_number']); appNotify("Feedback", "$session_contact_name rated ticket $config_ticket_prefix$ticket_number as bad (ID: $ticket_id)", "/agent/ticket.php?ticket_id=$ticket_id", $session_client_id, $ticket_id); } @@ -257,7 +257,7 @@ if (isset($_GET['resolve_ticket'])) { $ticket_id = intval($_GET['resolve_ticket']); // Get ticket details for logging - $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -289,7 +289,7 @@ if (isset($_GET['reopen_ticket'])) { $ticket_id = intval($_GET['reopen_ticket']); // Get ticket details for logging - $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -322,7 +322,7 @@ if (isset($_GET['close_ticket'])) { $ticket_id = intval($_GET['close_ticket']); // Get ticket details for logging - $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); $ticket_prefix = sanitizeInput($row['ticket_prefix']); $ticket_number = intval($row['ticket_number']); @@ -439,7 +439,7 @@ if (isset($_POST['edit_contact'])) { // Get the existing contact_user_id - we look it up ourselves so the user can't just overwrite random users $sql = mysqli_query($mysqli,"SELECT contact_user_id FROM contacts WHERE contact_id = $contact_id AND contact_client_id = $session_client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $contact_user_id = intval($row['contact_user_id']); // Check the email isn't already in use @@ -485,7 +485,7 @@ if (isset($_GET['add_payment_by_provider'])) { LEFT JOIN contacts ON client_id = contact_client_id AND contact_primary = 1 WHERE invoice_id = $invoice_id AND client_id = $session_client_id" ); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $invoice_number = intval($row['invoice_number']); $invoice_status = sanitizeInput($row['invoice_status']); $invoice_amount = floatval($row['invoice_amount']); @@ -509,7 +509,7 @@ if (isset($_GET['add_payment_by_provider'])) { // Get ITFlow company details $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $company_name = sanitizeInput($row['company_name']); $company_country = sanitizeInput($row['company_country']); $company_address = sanitizeInput($row['company_address']); @@ -526,7 +526,7 @@ if (isset($_GET['add_payment_by_provider'])) { // Get Client Payment Details $sql = mysqli_query($mysqli, "SELECT * FROM client_saved_payment_methods LEFT JOIN payment_providers ON saved_payment_provider_id = payment_provider_id LEFT JOIN client_payment_provider ON saved_payment_client_id = client_id WHERE saved_payment_id = $saved_payment_id LIMIT 1"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $public_key = sanitizeInput($row['payment_provider_public_key']); $private_key = sanitizeInput($row['payment_provider_private_key']); @@ -684,7 +684,7 @@ if (isset($_POST['create_stripe_customer'])) { LIMIT 1 "); - $stripe_provider = mysqli_fetch_array($stripe_provider_result); + $stripe_provider = mysqli_fetch_assoc($stripe_provider_result); if (!$stripe_provider) { flash_alert("Stripe provider is not configured in the system.", 'danger'); redirect("saved_payment_methods.php"); @@ -699,7 +699,7 @@ if (isset($_POST['create_stripe_customer'])) { } // Check if client already has a Stripe customer - $existing_customer = mysqli_fetch_array(mysqli_query($mysqli, " + $existing_customer = mysqli_fetch_assoc(mysqli_query($mysqli, " SELECT payment_provider_client FROM client_payment_provider WHERE client_id = $session_client_id @@ -772,7 +772,7 @@ if (isset($_GET['create_stripe_checkout'])) { LIMIT 1 "); - $stripe_provider = mysqli_fetch_array($stripe_provider_result); + $stripe_provider = mysqli_fetch_assoc($stripe_provider_result); if (!$stripe_provider) { http_response_code(400); echo json_encode(['error' => 'Stripe provider not configured']); @@ -840,7 +840,7 @@ if (isset($_GET['stripe_save_card'])) { LIMIT 1 "); - $stripe_provider = mysqli_fetch_array($stripe_provider_result); + $stripe_provider = mysqli_fetch_assoc($stripe_provider_result); if (!$stripe_provider) { flash_alert("Stripe provider not configured.", 'danger'); redirect("saved_payment_methods.php"); @@ -862,7 +862,7 @@ if (isset($_GET['stripe_save_card'])) { AND payment_provider_id = $stripe_provider_id LIMIT 1 "); - $client_provider = mysqli_fetch_array($client_provider_query); + $client_provider = mysqli_fetch_assoc($client_provider_query); $stripe_customer_id = sanitizeInput($client_provider['payment_provider_client'] ?? ''); if (empty($stripe_customer_id)) { @@ -921,7 +921,7 @@ if (isset($_GET['stripe_save_card'])) { WHERE companies.company_id = settings.company_id AND companies.company_id = 1 "); - $row = mysqli_fetch_array($sql_settings); + $row = mysqli_fetch_assoc($sql_settings); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); @@ -970,7 +970,7 @@ if (isset($_GET['delete_saved_payment'])) { AND payment_provider_active = 1 LIMIT 1 "); - $stripe_provider = mysqli_fetch_array($stripe_provider_result); + $stripe_provider = mysqli_fetch_assoc($stripe_provider_result); if (!$stripe_provider) { flash_alert("Stripe provider is not configured.", 'danger'); @@ -994,7 +994,7 @@ if (isset($_GET['delete_saved_payment'])) { LIMIT 1 "); - $saved_payment = mysqli_fetch_array($saved_payment_result); + $saved_payment = mysqli_fetch_assoc($saved_payment_result); if (!$saved_payment) { flash_alert("Payment method not found or does not belong to you.", 'danger'); @@ -1040,7 +1040,7 @@ if (isset($_GET['delete_saved_payment'])) { WHERE recurring_invoice_client_id = $session_client_id "); - while ($row = mysqli_fetch_array($recurring_invoices)) { + while ($row = mysqli_fetch_assoc($recurring_invoices)) { $recurring_invoice_id = intval($row['recurring_invoice_id']); mysqli_query($mysqli, " @@ -1064,7 +1064,7 @@ if (isset($_POST['set_recurring_payment'])) { // Get Recurring Invoice Info for logging and alerting $sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id AND recurring_invoice_client_id = $session_client_id"); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); $recurring_invoice_number = intval($row['recurring_invoice_number']); $recurring_invoice_currency_code = sanitizeInput($row['recurring_invoice_currency_code']); @@ -1081,7 +1081,7 @@ if (isset($_POST['set_recurring_payment'])) { AND payment_provider_active = 1 "); - $row = mysqli_fetch_array($sql); + $row = mysqli_fetch_assoc($sql); $provider_id = intval($row['payment_provider_id']); $provider_name = sanitizeInput($row['payment_provider_name']); diff --git a/client/quotes.php b/client/quotes.php index 1c96c523..59a7bff5 100644 --- a/client/quotes.php +++ b/client/quotes.php @@ -34,7 +34,7 @@ $quotes_sql = mysqli_query($mysqli, "SELECT * FROM quotes WHERE quote_client_id
- +
- + Manage saved payment methods

diff --git a/client/ticket.php b/client/ticket.php index 6e85fe6e..35009da0 100644 --- a/client/ticket.php +++ b/client/ticket.php @@ -34,7 +34,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) { $ticket_contact_snippet" ); - $ticket_row = mysqli_fetch_array($ticket_sql); + $ticket_row = mysqli_fetch_assoc($ticket_sql); if ($ticket_row) { @@ -128,7 +128,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) { $name | Download | View"; @@ -147,7 +147,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {