From d9cc3314d3261607aacadf44b777227315c1f183 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Sat, 6 May 2023 18:31:48 -0600
Subject: [PATCH] Add favicon (#6671)

* Add favicon

* Update totp_secret.htm

* Update totp.htm

* Update login.htm

* Update email.htm

* Update totp.php

* Update ldap.php

* Update email.php

* Update database.php
---
 core/authentication/resources/classes/plugins/database.php | 4 ++++
 core/authentication/resources/classes/plugins/email.php    | 5 +++++
 core/authentication/resources/classes/plugins/ldap.php     | 4 ++++
 core/authentication/resources/classes/plugins/totp.php     | 6 ++++++
 core/authentication/resources/views/email.htm              | 1 +
 core/authentication/resources/views/login.htm              | 1 +
 core/authentication/resources/views/totp.htm               | 1 +
 core/authentication/resources/views/totp_secret.htm        | 1 +
 core/authentication/resources/views/username.htm           | 1 +
 9 files changed, 24 insertions(+)

diff --git a/core/authentication/resources/classes/plugins/database.php b/core/authentication/resources/classes/plugins/database.php
index e3f927c652..6128c3e938 100644
--- a/core/authentication/resources/classes/plugins/database.php
+++ b/core/authentication/resources/classes/plugins/database.php
@@ -26,6 +26,9 @@ class plugin_database {
 	 */
 	function database() {
 
+		//pre-process some settings
+			$settings['theme']['favicon'] = !empty($settings['theme']['favicon']) ? $settings['theme']['favicon'] : PROJECT_PATH.'/themes/default/favicon.ico';
+
 		//already authorized
 			if (isset($_SESSION['authentication']['plugin']['database']) && $_SESSION['authentication']['plugin']['database']["authorized"]) {
 				return;
@@ -96,6 +99,7 @@ class plugin_database {
 					$view->assign("login_logo_width", $login_logo_width);
 					$view->assign("login_logo_height", $login_logo_height);
 					$view->assign("login_logo_source", $login_logo_source);
+					$view->assign("favicon", $settings['theme']['favicon']);
 
 				//add the token name and hash to the view
 					//$view->assign("token_name", $token['name']);
diff --git a/core/authentication/resources/classes/plugins/email.php b/core/authentication/resources/classes/plugins/email.php
index 548c29d780..653c03980a 100644
--- a/core/authentication/resources/classes/plugins/email.php
+++ b/core/authentication/resources/classes/plugins/email.php
@@ -25,6 +25,9 @@ class plugin_email {
 	 */
 	function email() {
 
+			//pre-process some settings
+			$settings['theme']['favicon'] = !empty($settings['theme']['favicon']) ? $settings['theme']['favicon'] : PROJECT_PATH.'/themes/default/favicon.ico';
+
 			//set a default template
 			$_SESSION['domain']['template']['name'] = 'default';
 			$_SESSION['theme']['menu_brand_image']['text'] = PROJECT_PATH.'/themes/default/images/logo.png';
@@ -89,6 +92,7 @@ class plugin_email {
 				$view->assign("login_logo_height", $login_logo_height);
 				$view->assign("login_logo_source", $login_logo_source);
 				$view->assign("button_login", $text['button-login']);
+				$view->assign("favicon", $settings['theme']['favicon']);
 
 				//show the views
 				$content = $view->render('username.htm');
@@ -266,6 +270,7 @@ class plugin_email {
 				$view->assign("login_logo_height", $login_logo_height);
 				$view->assign("login_logo_source", $login_logo_source);
 				$view->assign("button_verify", $text['label-verify']);
+				$view->assign("favicon", $settings['theme']['favicon']);
 
 				//debug information
 				//echo "<pre>\n";
diff --git a/core/authentication/resources/classes/plugins/ldap.php b/core/authentication/resources/classes/plugins/ldap.php
index 808466864b..4e93334a78 100644
--- a/core/authentication/resources/classes/plugins/ldap.php
+++ b/core/authentication/resources/classes/plugins/ldap.php
@@ -26,6 +26,9 @@ class plugin_ldap {
 		//show the authentication code view
 			if ($_REQUEST["username"]) {
 
+				//pre-process some settings
+					$settings['theme']['favicon'] = !empty($settings['theme']['favicon']) ? $settings['theme']['favicon'] : PROJECT_PATH.'/themes/default/favicon.ico';
+
 				//login logo source
 					if (isset($_SESSION['theme']['logo_login']['text']) && $_SESSION['theme']['logo_login']['text'] != '') {
 						$login_logo_source = $_SESSION['theme']['logo_login']['text'];
@@ -84,6 +87,7 @@ class plugin_ldap {
 					$view->assign("login_logo_width", $login_logo_width);
 					$view->assign("login_logo_height", $login_logo_height);
 					$view->assign("login_logo_source", $login_logo_source);
+					$view->assign("favicon", $settings['theme']['favicon']);
 
 				//add the token name and hash to the view
 					//$view->assign("token_name", $token['name']);
diff --git a/core/authentication/resources/classes/plugins/totp.php b/core/authentication/resources/classes/plugins/totp.php
index c72edcae15..8082db2435 100644
--- a/core/authentication/resources/classes/plugins/totp.php
+++ b/core/authentication/resources/classes/plugins/totp.php
@@ -25,6 +25,9 @@ class plugin_totp {
 	 */
 	function totp() {
 
+		//pre-process some settings
+			$settings['theme']['favicon'] = !empty($settings['theme']['favicon']) ? $settings['theme']['favicon'] : PROJECT_PATH.'/themes/default/favicon.ico';
+
 		//get the username
 			if (isset($_SESSION["username"])) {
 				$this->username = $_SESSION["username"];
@@ -70,6 +73,7 @@ class plugin_totp {
 				$view->assign("login_logo_height", $login_logo_height);
 				$view->assign("login_logo_source", $login_logo_source);
 				$view->assign("button_login", $text['button-login']);
+				$view->assign("favicon", $settings['theme']['favicon']);
 
 				//show the views
 				$content = $view->render('username.htm');
@@ -147,6 +151,7 @@ class plugin_totp {
 				$view->assign("login_logo_width", $login_logo_width);
 				$view->assign("login_logo_height", $login_logo_height);
 				$view->assign("login_logo_source", $login_logo_source);
+				$view->assign("favicon", $settings['theme']['favicon']);
 
 				//show the views
 				if ($_SESSION['authentication']['plugin']['database']['authorized'] && empty($this->user_totp_secret)) {
@@ -204,6 +209,7 @@ class plugin_totp {
 					$view->assign("totp_image", base64_encode($image));
 					$view->assign("totp_description", $text['description-totp']);
 					$view->assign("button_next", $text['button-next']);
+					$view->assign("favicon", $settings['theme']['favicon']);
 
 					//render the template
 					$content = $view->render('totp_secret.htm');
diff --git a/core/authentication/resources/views/email.htm b/core/authentication/resources/views/email.htm
index 87571c93e8..dd8be1cd94 100644
--- a/core/authentication/resources/views/email.htm
+++ b/core/authentication/resources/views/email.htm
@@ -6,6 +6,7 @@
 		<meta http-equiv='X-UA-Compatible' content='IE=edge' />
 		<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no' />
 		<link rel='stylesheet' type='text/css' href='{$project_path}/themes/default/css.php' />
+		<link rel='icon' href='{$favicon}'>
 		<title>{$login_title}</title>
 	</head>
 	<body>
diff --git a/core/authentication/resources/views/login.htm b/core/authentication/resources/views/login.htm
index cddbe648bb..0ad404dc29 100644
--- a/core/authentication/resources/views/login.htm
+++ b/core/authentication/resources/views/login.htm
@@ -6,6 +6,7 @@
 		<meta http-equiv='X-UA-Compatible' content='IE=edge' />
 		<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no' />
 		<link rel='stylesheet' type='text/css' href='{$project_path}/themes/default/css.php' />
+		<link rel='icon' href='{$favicon}'>
 		<title>{$login_title}</title>
 	</head>
 	<body>
diff --git a/core/authentication/resources/views/totp.htm b/core/authentication/resources/views/totp.htm
index c403ae1f7c..295298706c 100644
--- a/core/authentication/resources/views/totp.htm
+++ b/core/authentication/resources/views/totp.htm
@@ -6,6 +6,7 @@
 		<meta http-equiv='X-UA-Compatible' content='IE=edge' />
 		<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no' />
 		<link rel='stylesheet' type='text/css' href='{$project_path}/themes/default/css.php' />
+		<link rel='icon' href='{$favicon}'>
 		<title>{$login_title}</title>
 	</head>
 	<body>
diff --git a/core/authentication/resources/views/totp_secret.htm b/core/authentication/resources/views/totp_secret.htm
index a7a9e86315..77f123dbc5 100644
--- a/core/authentication/resources/views/totp_secret.htm
+++ b/core/authentication/resources/views/totp_secret.htm
@@ -6,6 +6,7 @@
 		<meta http-equiv='X-UA-Compatible' content='IE=edge' />
 		<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no' />
 		<link rel='stylesheet' type='text/css' href='{$project_path}/themes/default/css.php' />
+		<link rel='icon' href='{$favicon}'>
 		<title>{$login_title}</title>
 	</head>
 	<body>
diff --git a/core/authentication/resources/views/username.htm b/core/authentication/resources/views/username.htm
index 4ea58db288..561ed7d4e5 100644
--- a/core/authentication/resources/views/username.htm
+++ b/core/authentication/resources/views/username.htm
@@ -6,6 +6,7 @@
 		<meta http-equiv='X-UA-Compatible' content='IE=edge' />
 		<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no' />
 		<link rel='stylesheet' type='text/css' href='{$project_path}/themes/default/css.php' />
+		<link rel='icon' href='{$favicon}'>
 		<title>{$login_title}</title>
 	</head>
 	<body>