From 7150b1545a1f126b371fdb10f9ae85e5f248dbf1 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 13 Mar 2025 17:55:31 -0400 Subject: [PATCH] Moved files check_login.php, get_settings.php, settings_localization_array.php, inc_set_timezone.php into the includes folder, we also moved /client/check_login.php into client/includes/ --- ajax/ajax_contact_details.php | 5 ---- client/{ => includes}/check_login.php | 2 +- client/includes/inc_all.php | 2 +- client/login.php | 4 +-- client/login_microsoft.php | 2 +- client/login_reset.php | 4 +-- client/post.php | 4 +-- client/ticket.php | 12 ++++---- guest/guest_download_file.php | 2 +- guest/guest_header.php | 2 +- guest/guest_post.php | 2 +- includes/ajax_header.php | 2 +- check_login.php => includes/check_login.php | 6 ++-- includes/client_side_nav.php | 4 +-- get_settings.php => includes/get_settings.php | 0 includes/inc_all_client.php | 4 +-- .../inc_set_timezone.php | 0 .../settings_localization_array.php | 0 login.php | 2 +- post.php | 2 +- scripts/cron.php | 2 +- scripts/cron_certificate_refresher.php | 2 +- scripts/cron_domain_refresher.php | 2 +- scripts/cron_mail_queue.php | 2 +- scripts/cron_ticket_email_parser.php | 4 +-- setup.php | 2 +- temp_bulk_close_bugfix.php | 28 ------------------- 27 files changed, 36 insertions(+), 67 deletions(-) rename client/{ => includes}/check_login.php (98%) rename check_login.php => includes/check_login.php (95%) rename get_settings.php => includes/get_settings.php (100%) rename inc_set_timezone.php => includes/inc_set_timezone.php (100%) rename settings_localization_array.php => includes/settings_localization_array.php (100%) delete mode 100644 temp_bulk_close_bugfix.php diff --git a/ajax/ajax_contact_details.php b/ajax/ajax_contact_details.php index 5dbd80d7..8b503352 100644 --- a/ajax/ajax_contact_details.php +++ b/ajax/ajax_contact_details.php @@ -189,11 +189,6 @@ ob_start();
Rcr Tickets () - -
  • -
    Services ()     -
    • -

  • Documents ()     diff --git a/client/check_login.php b/client/includes/check_login.php similarity index 98% rename from client/check_login.php rename to client/includes/check_login.php index 8936b148..33972c98 100644 --- a/client/check_login.php +++ b/client/includes/check_login.php @@ -27,7 +27,7 @@ if ($_SESSION['user_type'] !== 2) { } // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; // User IP & UA $session_ip = sanitizeInput(getIP()); diff --git a/client/includes/inc_all.php b/client/includes/inc_all.php index d0ea5d15..1528a448 100644 --- a/client/includes/inc_all.php +++ b/client/includes/inc_all.php @@ -5,7 +5,7 @@ */ require_once '../config.php'; -require_once '../get_settings.php'; +require_once '../includes/get_settings.php'; require_once '../functions.php'; require_once 'check_login.php'; require_once 'functions.php'; diff --git a/client/login.php b/client/login.php index b2e05e92..e69c6234 100644 --- a/client/login.php +++ b/client/login.php @@ -10,7 +10,7 @@ require_once '../config.php'; require_once '../functions.php'; -require_once '../get_settings.php'; +require_once '../includes/get_settings.php'; if (!isset($_SESSION)) { // HTTP Only cookies @@ -23,7 +23,7 @@ if (!isset($_SESSION)) { } // Set Timezone after session_start -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; // Check to see if client portal is enabled if($config_client_portal_enable == 0) { diff --git a/client/login_microsoft.php b/client/login_microsoft.php index 80e77a23..4c8eae65 100644 --- a/client/login_microsoft.php +++ b/client/login_microsoft.php @@ -18,7 +18,7 @@ if (!isset($_SESSION)) { } // Set Timezone after session starts -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; $session_ip = sanitizeInput(getIP()); $session_user_agent = sanitizeInput($_SERVER['HTTP_USER_AGENT']); diff --git a/client/login_reset.php b/client/login_reset.php index 43f17c7b..9992f052 100644 --- a/client/login_reset.php +++ b/client/login_reset.php @@ -8,7 +8,7 @@ header("Content-Security-Policy: default-src 'self'"); require_once '../config.php'; require_once '../functions.php'; -require_once '../get_settings.php'; +require_once '../includes/get_settings.php'; if (empty($config_smtp_host)) { @@ -33,7 +33,7 @@ if (!isset($_SESSION)) { } // Set Timezone after session -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; $ip = sanitizeInput(getIP()); $user_agent = sanitizeInput($_SERVER['HTTP_USER_AGENT']); diff --git a/client/post.php b/client/post.php index 4dff9ee9..53c6a6df 100644 --- a/client/post.php +++ b/client/post.php @@ -5,9 +5,9 @@ */ require_once '../config.php'; -require_once '../get_settings.php'; +require_once '../includes/get_settings.php'; require_once '../functions.php'; -require_once 'check_login.php'; +require_once 'includes/check_login.php'; require_once 'functions.php'; if (isset($_POST['add_ticket'])) { diff --git a/client/ticket.php b/client/ticket.php index 58955d0e..c651694f 100644 --- a/client/ticket.php +++ b/client/ticket.php @@ -83,14 +83,16 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
    -
    -

    +
    +

    Ticket +

    +
    Resolve ticket -

    +
    @@ -122,7 +124,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) { while ($ticket_attachment = mysqli_fetch_array($sql_ticket_attachments)) { $name = nullable_htmlentities($ticket_attachment['ticket_attachment_name']); $ref_name = nullable_htmlentities($ticket_attachment['ticket_attachment_reference_name']); - echo "
    $name | View"; + echo "
    $name | Download | View"; } ?>
    @@ -259,7 +261,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) { while ($ticket_attachment = mysqli_fetch_array($sql_ticket_reply_attachments)) { $name = nullable_htmlentities($ticket_attachment['ticket_attachment_name']); $ref_name = nullable_htmlentities($ticket_attachment['ticket_attachment_reference_name']); - echo "
    $name | View"; + echo "
    $name | Download | View"; } ?> diff --git a/guest/guest_download_file.php b/guest/guest_download_file.php index f083d429..dc63ce44 100644 --- a/guest/guest_download_file.php +++ b/guest/guest_download_file.php @@ -3,7 +3,7 @@ require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; diff --git a/guest/guest_header.php b/guest/guest_header.php index d82f5eac..615a6766 100644 --- a/guest/guest_header.php +++ b/guest/guest_header.php @@ -6,7 +6,7 @@ require_once "../functions.php"; session_start(); // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; $ip = sanitizeInput(getIP()); $user_agent = sanitizeInput($_SERVER['HTTP_USER_AGENT']); diff --git a/guest/guest_post.php b/guest/guest_post.php index cfc8af51..bead301c 100644 --- a/guest/guest_post.php +++ b/guest/guest_post.php @@ -5,7 +5,7 @@ require_once "../functions.php"; session_start(); -require_once "../inc_set_timezone.php"; // Must be included after session_start to work +require_once "../includes/inc_set_timezone.php"; // Must be included after session_start to work if (isset($_GET['accept_quote'], $_GET['url_key'])) { $quote_id = intval($_GET['accept_quote']); diff --git a/includes/ajax_header.php b/includes/ajax_header.php index 5e768ec7..f8e291ee 100644 --- a/includes/ajax_header.php +++ b/includes/ajax_header.php @@ -2,7 +2,7 @@ require_once "../config.php"; require_once "../functions.php"; -require_once "../check_login.php"; +require_once "check_login.php"; header('Content-Type: application/json'); diff --git a/check_login.php b/includes/check_login.php similarity index 95% rename from check_login.php rename to includes/check_login.php index 2db055a1..e501f0bb 100644 --- a/check_login.php +++ b/includes/check_login.php @@ -13,16 +13,16 @@ if (!isset($_SESSION)) { // Check to see if setup is enabled if (!isset($config_enable_setup) || $config_enable_setup == 1) { - header("Location: setup.php"); + header("Location: ../setup.php"); exit; } // Check user is logged in with a valid session if (!isset($_SESSION['logged']) || !$_SESSION['logged']) { if ($_SERVER["REQUEST_URI"] == "/") { - header("Location: login.php"); + header("Location: ../login.php"); } else { - header("Location: login.php?last_visited=" . base64_encode($_SERVER["REQUEST_URI"]) ); + header("Location: ../login.php?last_visited=" . base64_encode($_SERVER["REQUEST_URI"]) ); } exit; } diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index 566d31ef..8f5113aa 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -103,8 +103,8 @@

    Calendar 0) { ?> - + if ($num_calendar_events > 0) { ?> +

    diff --git a/get_settings.php b/includes/get_settings.php similarity index 100% rename from get_settings.php rename to includes/get_settings.php diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php index f4867bf4..49a589d7 100644 --- a/includes/inc_all_client.php +++ b/includes/inc_all_client.php @@ -208,8 +208,8 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id")); $num_documents = $row['num']; - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM events WHERE event_client_id = $client_id")); - $num_events = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM calendar_events WHERE event_client_id = $client_id")); + $num_calendar_events = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id")); $num_trips = $row['num']; diff --git a/inc_set_timezone.php b/includes/inc_set_timezone.php similarity index 100% rename from inc_set_timezone.php rename to includes/inc_set_timezone.php diff --git a/settings_localization_array.php b/includes/settings_localization_array.php similarity index 100% rename from settings_localization_array.php rename to includes/settings_localization_array.php diff --git a/login.php b/login.php index 25eb1584..845665ed 100644 --- a/login.php +++ b/login.php @@ -11,7 +11,7 @@ if (!file_exists('config.php')) { require_once "config.php"; // Set Timezone -require_once "inc_set_timezone.php"; +require_once "includes/inc_set_timezone.php"; // 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')) { diff --git a/post.php b/post.php index 228b53e6..00a58329 100644 --- a/post.php +++ b/post.php @@ -8,7 +8,7 @@ require_once "config.php"; require_once "functions.php"; -require_once "check_login.php"; +require_once "includes/check_login.php"; // Define a variable that we can use to only allow running post files via inclusion (prevents people/bots poking them) define('FROM_POST_HANDLER', true); diff --git a/scripts/cron.php b/scripts/cron.php index 6185024a..e9ffc3b0 100644 --- a/scripts/cron.php +++ b/scripts/cron.php @@ -11,7 +11,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; $sql_companies = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); diff --git a/scripts/cron_certificate_refresher.php b/scripts/cron_certificate_refresher.php index 9cb2feb6..70149aba 100644 --- a/scripts/cron_certificate_refresher.php +++ b/scripts/cron_certificate_refresher.php @@ -11,7 +11,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; diff --git a/scripts/cron_domain_refresher.php b/scripts/cron_domain_refresher.php index 5132e0f0..2bb04656 100644 --- a/scripts/cron_domain_refresher.php +++ b/scripts/cron_domain_refresher.php @@ -11,7 +11,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE settings.company_id = 1"); diff --git a/scripts/cron_mail_queue.php b/scripts/cron_mail_queue.php index f536a57a..87e52447 100644 --- a/scripts/cron_mail_queue.php +++ b/scripts/cron_mail_queue.php @@ -10,7 +10,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1"); diff --git a/scripts/cron_ticket_email_parser.php b/scripts/cron_ticket_email_parser.php index 04de4b31..f0569f2b 100644 --- a/scripts/cron_ticket_email_parser.php +++ b/scripts/cron_ticket_email_parser.php @@ -19,11 +19,11 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; // Get settings for the "default" company -require_once "../get_settings.php"; +require_once "../includes/get_settings.php"; $config_ticket_prefix = sanitizeInput($config_ticket_prefix); $config_ticket_from_name = sanitizeInput($config_ticket_from_name); diff --git a/setup.php b/setup.php index 96cb5d67..12393a13 100644 --- a/setup.php +++ b/setup.php @@ -19,7 +19,7 @@ if ($config_enable_setup == 0) { exit; } -include_once "settings_localization_array.php"; +include_once "includes/settings_localization_array.php"; $errorLog = ini_get('error_log') ?: "Debian/Ubuntu default is usually /var/log/apache2/error.log"; // Get a list of all available timezones diff --git a/temp_bulk_close_bugfix.php b/temp_bulk_close_bugfix.php deleted file mode 100644 index f277099f..00000000 --- a/temp_bulk_close_bugfix.php +++ /dev/null @@ -1,28 +0,0 @@ - - - -
      -
    1. - Dashboard -
      2. -
    2. Temp bugfix page
      3. -
    - - -

    Temporary page to fix bulk ticket close/resolution bug

    -
    -

    Navigate back to tickets - all bulk closed tickets should be fixed now and no longer appear as open.

    - - - -