mirror of https://github.com/itflow-org/itflow
rename get_settings.php to load_global_settings.php and update all requires
This commit is contained in:
parent
44fdb6c24f
commit
9caa42975d
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue