From 1b2acb10262581ad1cb94de9d5f2b20dd870e51e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 5 Sep 2024 10:18:56 -0600 Subject: [PATCH] Fix a bug where logo was overridden --- .../authentication/resources/classes/plugins/email.php | 10 ---------- core/authentication/resources/classes/plugins/totp.php | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/core/authentication/resources/classes/plugins/email.php b/core/authentication/resources/classes/plugins/email.php index 6ae6126a8c..f31ac1f118 100644 --- a/core/authentication/resources/classes/plugins/email.php +++ b/core/authentication/resources/classes/plugins/email.php @@ -58,11 +58,6 @@ class plugin_email { $settings['theme']['login_logo_height'] = !empty($_SESSION['theme']['login_logo_height']['text']) ? $_SESSION['theme']['login_logo_height']['text'] : 'auto; max-height: 300px'; $settings['theme']['message_delay'] = isset($_SESSION['theme']['message_delay']) ? 1000 * (float) $_SESSION['theme']['message_delay'] : 3000; - //set a default template - $_SESSION['domain']['template']['name'] = 'default'; - $_SESSION['theme']['menu_brand_image']['text'] = PROJECT_PATH.'/themes/default/images/logo.png'; - $_SESSION['theme']['menu_brand_type']['text'] = 'image'; - //get the domain $domain_array = explode(":", $_SERVER["HTTP_HOST"]); $domain_name = $domain_array[0]; @@ -309,11 +304,6 @@ class plugin_email { //echo $email_response."
\n"; //echo $email_error."
\n"; - //set a default template - $_SESSION['domain']['template']['name'] = 'default'; - $_SESSION['theme']['menu_brand_image']['text'] = PROJECT_PATH.'/themes/default/images/logo.png'; - $_SESSION['theme']['menu_brand_type']['text'] = 'image'; - //get the domain $domain_array = explode(":", $_SERVER["HTTP_HOST"]); $domain_name = $domain_array[0]; diff --git a/core/authentication/resources/classes/plugins/totp.php b/core/authentication/resources/classes/plugins/totp.php index 8bc9f46c0b..3994403e9d 100644 --- a/core/authentication/resources/classes/plugins/totp.php +++ b/core/authentication/resources/classes/plugins/totp.php @@ -70,11 +70,6 @@ class plugin_totp { //request the username if (!$this->username && !isset($_POST['authentication_code'])) { - //set a default template - $_SESSION['domain']['template']['name'] = 'default'; - $_SESSION['theme']['menu_brand_image']['text'] = PROJECT_PATH.'/themes/default/images/logo.png'; - $_SESSION['theme']['menu_brand_type']['text'] = 'image'; - //get the domain $domain_array = explode(":", $_SERVER["HTTP_HOST"]); $domain_name = $domain_array[0]; @@ -177,11 +172,6 @@ class plugin_totp { $_SESSION["user_email"] = $row['user_email']; $_SESSION["contact_uuid"] = $row["contact_uuid"]; - //set a default template - $_SESSION['domain']['template']['name'] = 'default'; - $_SESSION['theme']['menu_brand_image']['text'] = PROJECT_PATH.'/themes/default/images/logo.png'; - $_SESSION['theme']['menu_brand_type']['text'] = 'image'; - //get the domain $domain_array = explode(":", $_SERVER["HTTP_HOST"]); $domain_name = $domain_array[0];