From 235eff84d17d0471d272f41dba9f02f0960ca34d Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Wed, 25 Jan 2023 22:37:02 +0000 Subject: [PATCH 01/34] Show the 'default' company logo (if configured) on the agent login page instead of the ITFlow text --- login.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/login.php b/login.php index c24cfdf2..15f3171e 100644 --- a/login.php +++ b/login.php @@ -28,9 +28,13 @@ if ($failed_login_count >= 15) { } // Query Settings for "default" company (as companies are being removed shortly) -$sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1"); +$sql_settings = mysqli_query($mysqli, "SELECT * FROM settings LEFT JOIN companies ON settings.company_id = companies.company_id WHERE settings.company_id = 1"); $row = mysqli_fetch_array($sql_settings); +// Company info +$company_name = $row['company_name']; +$company_logo = $row['company_logo']; + // Mail $config_smtp_host = $row['config_smtp_host']; $config_smtp_port = $row['config_smtp_port']; @@ -219,7 +223,11 @@ if (isset($_POST['login'])) {
From cf1e39748e14423ef9cc71f89708ddfed2e4a89e Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Wed, 25 Jan 2023 22:44:46 +0000 Subject: [PATCH 02/34] Show the 'default' company logo (if configured) on the client login page instead of the ITFlow/company name text --- login.php | 1 - portal/login.php | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/login.php b/login.php index 15f3171e..ec4f00b1 100644 --- a/login.php +++ b/login.php @@ -32,7 +32,6 @@ $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings LEFT JOIN companie $row = mysqli_fetch_array($sql_settings); // Company info -$company_name = $row['company_name']; $company_logo = $row['company_logo']; // Mail diff --git a/portal/login.php b/portal/login.php index 17eb9c80..e9e22886 100644 --- a/portal/login.php +++ b/portal/login.php @@ -26,9 +26,10 @@ $sql_settings = mysqli_query($mysqli, "SELECT config_azure_client_id FROM settin $settings = mysqli_fetch_array($sql_settings); $azure_client_id = $settings['config_azure_client_id']; -$company_sql = mysqli_query($mysqli, "SELECT company_name FROM companies WHERE company_id = '1'"); +$company_sql = mysqli_query($mysqli, "SELECT company_name, company_logo FROM companies WHERE company_id = '1'"); $company_results = mysqli_fetch_array($company_sql); $company_name = $company_results['company_name']; +$company_logo = $company_results['company_logo']; if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) { @@ -89,7 +90,13 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {