From a7ecdf72f8386d63a33c240774a71f6f2e18021e Mon Sep 17 00:00:00 2001 From: fusionate Date: Sat, 24 Jun 2023 21:34:42 +0000 Subject: [PATCH] Authentication: Remove cancel link from username template (form is always displayed first, if needed). --- core/authentication/resources/classes/plugins/email.php | 4 ---- core/authentication/resources/classes/plugins/totp.php | 4 ---- core/authentication/resources/views/username.htm | 4 ---- 3 files changed, 12 deletions(-) diff --git a/core/authentication/resources/classes/plugins/email.php b/core/authentication/resources/classes/plugins/email.php index 266f64061c..8735f47e96 100644 --- a/core/authentication/resources/classes/plugins/email.php +++ b/core/authentication/resources/classes/plugins/email.php @@ -99,10 +99,6 @@ class plugin_email { $view->assign("login_logo_height", $settings['theme']['login_logo_height']); $view->assign("login_logo_source", $settings['theme']['logo']); $view->assign("button_login", $text['button-login']); - if (!empty($_SESSION['username'])) { - $view->assign("username", $_SESSION['username']); - $view->assign("button_cancel", $text['button-cancel']); - } //show the views $content = $view->render('username.htm'); diff --git a/core/authentication/resources/classes/plugins/totp.php b/core/authentication/resources/classes/plugins/totp.php index 97f510f061..b2c891970b 100644 --- a/core/authentication/resources/classes/plugins/totp.php +++ b/core/authentication/resources/classes/plugins/totp.php @@ -106,10 +106,6 @@ class plugin_totp { $view->assign("login_logo_source", $settings['theme']['logo']); $view->assign("button_login", $text['button-login']); $view->assign("favicon", $settings['theme']['favicon']); - if (!empty($_SESSION['username'])) { - $view->assign("username", $_SESSION['username']); - $view->assign("button_cancel", $text['button-cancel']); - } //show the views $content = $view->render('username.htm'); diff --git a/core/authentication/resources/views/username.htm b/core/authentication/resources/views/username.htm index 600ba3f324..ba2a339ec0 100644 --- a/core/authentication/resources/views/username.htm +++ b/core/authentication/resources/views/username.htm @@ -19,10 +19,6 @@
- {if !empty($username)} -

- - {/if}