From 9caa42975dd61b43768edcfa8f132316cab1b0a0 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 6 Aug 2025 17:48:23 -0400 Subject: [PATCH] rename get_settings.php to load_global_settings.php and update all requires --- REMOVEajax.php | 4 ++-- admin/post/users.php | 2 +- api/v1/tickets/create.php | 2 +- client/includes/inc_all.php | 2 +- client/login.php | 2 +- client/login_reset.php | 4 ++-- client/post.php | 4 ++-- guest/guest_post.php | 2 +- guest/includes/guest_header.php | 2 +- includes/check_login.php | 2 +- includes/{get_settings.php => load_global_settings.php} | 0 includes/load_user_session.php | 2 +- includes/session_init.php | 3 +++ scripts/cron_ticket_email_parser.php | 2 +- 14 files changed, 18 insertions(+), 15 deletions(-) rename includes/{get_settings.php => load_global_settings.php} (100%) diff --git a/REMOVEajax.php b/REMOVEajax.php index d98812b7..5004c68c 100644 --- a/REMOVEajax.php +++ b/REMOVEajax.php @@ -244,7 +244,7 @@ if (isset($_GET['share_generate_link'])) { $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'], $row['company_phone_country_code'])); - // Sanitize Config vars from get_settings.php + // Sanitize Config vars from load_global_settings.php $config_ticket_from_name = sanitizeInput($config_ticket_from_name); $config_ticket_from_email = sanitizeInput($config_ticket_from_email); $config_mail_from_name = sanitizeInput($config_mail_from_name); @@ -514,7 +514,7 @@ if (isset($_POST['update_kanban_ticket'])) { $ticket_status = sanitizeInput($row['ticket_status_name']); $url_key = sanitizeInput($row['ticket_url_key']); - // Sanitize Config vars from get_settings.php + // Sanitize Config vars from load_global_settings.php $config_ticket_from_name = sanitizeInput($config_ticket_from_name); $config_ticket_from_email = sanitizeInput($config_ticket_from_email); $config_base_url = sanitizeInput($config_base_url); diff --git a/admin/post/users.php b/admin/post/users.php index caab7aed..1ca98279 100644 --- a/admin/post/users.php +++ b/admin/post/users.php @@ -56,7 +56,7 @@ if (isset($_POST['add_user'])) { $row = mysqli_fetch_array($sql); $company_name = sanitizeInput($row['company_name']); - // Sanitize Config vars from get_settings.php + // Sanitize Config vars from load_global_settings.php $config_mail_from_name = sanitizeInput($config_mail_from_name); $config_mail_from_email = sanitizeInput($config_mail_from_email); $config_ticket_from_email = sanitizeInput($config_ticket_from_email); diff --git a/api/v1/tickets/create.php b/api/v1/tickets/create.php index 6d059718..2a804225 100644 --- a/api/v1/tickets/create.php +++ b/api/v1/tickets/create.php @@ -5,7 +5,7 @@ require_once '../validate_api_key.php'; require_once '../require_post_method.php'; // Ticket-related settings -require_once "../../../includes/get_settings.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); diff --git a/client/includes/inc_all.php b/client/includes/inc_all.php index 1528a448..6c85263d 100644 --- a/client/includes/inc_all.php +++ b/client/includes/inc_all.php @@ -5,7 +5,7 @@ */ require_once '../config.php'; -require_once '../includes/get_settings.php'; +require_once '../includes/load_global_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 09f15a16..d0b6aff8 100644 --- a/client/login.php +++ b/client/login.php @@ -10,7 +10,7 @@ require_once '../config.php'; require_once '../functions.php'; -require_once '../includes/get_settings.php'; +require_once '../includes/load_global_settings.php'; if (!isset($_SESSION)) { // HTTP Only cookies diff --git a/client/login_reset.php b/client/login_reset.php index 9992f052..a90dda7e 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 '../includes/get_settings.php'; +require_once '../includes/load_global_settings.php'; if (empty($config_smtp_host)) { @@ -45,7 +45,7 @@ $company_name = sanitizeInput($company_results['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($company_results['company_phone'])); $company_name_display = $company_results['company_name']; -// Get settings from get_settings.php and sanitize them +// Get settings from load_global_settings.php and sanitize them $config_ticket_from_name = sanitizeInput($config_ticket_from_name); $config_ticket_from_email = sanitizeInput($config_ticket_from_email); $config_mail_from_name = sanitizeInput($config_mail_from_name); diff --git a/client/post.php b/client/post.php index aeef257f..43707b85 100644 --- a/client/post.php +++ b/client/post.php @@ -5,7 +5,7 @@ */ require_once '../config.php'; -require_once '../includes/get_settings.php'; +require_once '../includes/load_global_settings.php'; require_once '../functions.php'; require_once 'includes/check_login.php'; require_once 'functions.php'; @@ -17,7 +17,7 @@ if (isset($_POST['add_ticket'])) { $category = intval($_POST['category']); $asset = intval($_POST['asset']); - // Get settings from get_settings.php + // Get settings from load_global_settings.php $config_ticket_prefix = sanitizeInput($config_ticket_prefix); $config_ticket_from_name = sanitizeInput($config_ticket_from_name); $config_ticket_from_email = sanitizeInput($config_ticket_from_email); diff --git a/guest/guest_post.php b/guest/guest_post.php index 2ad7e08b..fffe3088 100644 --- a/guest/guest_post.php +++ b/guest/guest_post.php @@ -2,7 +2,7 @@ require_once "../config.php"; require_once "../functions.php"; -require_once "../includes/get_settings.php"; +require_once "../includes/load_global_settings.php"; session_start(); diff --git a/guest/includes/guest_header.php b/guest/includes/guest_header.php index 2dc20aa1..9efb5e7f 100644 --- a/guest/includes/guest_header.php +++ b/guest/includes/guest_header.php @@ -2,7 +2,7 @@ require_once "../config.php"; require_once "../functions.php"; -require_once "../includes/get_settings.php"; +require_once "../includes/load_global_settings.php"; session_start(); diff --git a/includes/check_login.php b/includes/check_login.php index a5a2f050..f320b4d2 100644 --- a/includes/check_login.php +++ b/includes/check_login.php @@ -6,5 +6,5 @@ require_once "auth_check.php"; require_once "inc_set_timezone.php"; require_once "load_user_session.php"; require_once "load_company_settings.php"; -require_once "get_settings.php"; +require_once "load_global_settings.php"; require_once "detect_device_type.php"; diff --git a/includes/get_settings.php b/includes/load_global_settings.php similarity index 100% rename from includes/get_settings.php rename to includes/load_global_settings.php diff --git a/includes/load_user_session.php b/includes/load_user_session.php index 5e4072fa..d1852160 100644 --- a/includes/load_user_session.php +++ b/includes/load_user_session.php @@ -29,7 +29,7 @@ $user_config_theme_dark = intval($row['user_config_theme_dark']); if ($session_user_type !== 1) { session_unset(); session_destroy(); - header("Location: login.php"); + header("Location: ../login.php"); exit; } diff --git a/includes/session_init.php b/includes/session_init.php index 591803eb..1a84275d 100644 --- a/includes/session_init.php +++ b/includes/session_init.php @@ -3,9 +3,12 @@ if (!isset($_SESSION)) { // HTTP Only cookies ini_set("session.cookie_httponly", true); + if ($config_https_only) { // Tell client to only send cookie(s) over HTTPS ini_set("session.cookie_secure", true); } + session_start(); + } diff --git a/scripts/cron_ticket_email_parser.php b/scripts/cron_ticket_email_parser.php index 46e73ec9..9af55ca2 100644 --- a/scripts/cron_ticket_email_parser.php +++ b/scripts/cron_ticket_email_parser.php @@ -23,7 +23,7 @@ require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; // Get settings for the "default" company -require_once "../includes/get_settings.php"; +require_once "../includes/load_global_settings.php"; $config_ticket_prefix = sanitizeInput($config_ticket_prefix); $config_ticket_from_name = sanitizeInput($config_ticket_from_name);