From 9fc4d8f9537b7454aaebe4b87a6dbca91520d573 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 8 Mar 2024 02:49:41 +0100
Subject: [PATCH] Merge Actions::getAdditionalLogParamsByUserLogin() into
 Actions::LoggerAuthHelper()

---
 .../0.0.0/app/libraries/RainLoop/Actions.php  | 30 +++++++++----------
 .../libraries/RainLoop/Actions/UserAuth.php   |  2 +-
 .../app/libraries/RainLoop/ActionsAdmin.php   |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 52863cf61..e64e787cf 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -532,8 +532,22 @@ class Actions
 		return $this->oPlugins;
 	}
 
-	protected function LoggerAuthHelper(?Model\Account $oAccount = null, array $aAdditionalParams = array(), bool $admin = false): void
+	protected function LoggerAuthHelper(?Model\Account $oAccount = null, string $sLogin, bool $admin = false): void
 	{
+		if ($sLogin) {
+			$sHost = $admin ? $this->Http()->GetHost(true, true) : \MailSo\Base\Utils::GetDomainFromEmail($sLogin);
+			$aAdditionalParams = array(
+				'{imap:login}' => $sLogin,
+				'{imap:host}' => $sHost,
+				'{smtp:login}' => $sLogin,
+				'{smtp:host}' => $sHost,
+				'{user:email}' => $sLogin,
+				'{user:login}' => $admin ? $sLogin : \MailSo\Base\Utils::GetAccountNameFromEmail($sLogin),
+				'{user:domain}' => $sHost,
+			);
+		} else {
+			$aAdditionalParams = array();
+		}
 		$sLine = $this->oConfig->Get('logs', 'auth_logging_format', '');
 		if (!empty($sLine)) {
 			if (!$this->oLoggerAuth) {
@@ -808,20 +822,6 @@ class Actions
 		}
 	}
 
-	protected function getAdditionalLogParamsByUserLogin(string $sLogin, bool $bAdmin = false): array
-	{
-		$sHost = $bAdmin ? $this->Http()->GetHost(true, true) : \MailSo\Base\Utils::GetDomainFromEmail($sLogin);
-		return array(
-			'{imap:login}' => $sLogin,
-			'{imap:host}' => $sHost,
-			'{smtp:login}' => $sLogin,
-			'{smtp:host}' => $sHost,
-			'{user:email}' => $sLogin,
-			'{user:login}' => $bAdmin ? $sLogin : \MailSo\Base\Utils::GetAccountNameFromEmail($sLogin),
-			'{user:domain}' => $sHost,
-		);
-	}
-
 	public function DoPing(): array
 	{
 		return $this->DefaultResponse('Pong');
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index 89b72d1a8..35c56297b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -136,7 +136,7 @@ trait UserAuth
 				throw new ClientException(Notifications::AuthError);
 			}
 		} catch (\Throwable $oException) {
-			$this->LoggerAuthHelper($oAccount, $this->getAdditionalLogParamsByUserLogin($sInputEmail));
+			$this->LoggerAuthHelper($oAccount, $sInputEmail);
 			throw $oException;
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index 90ea394b7..267ff0c11 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -124,7 +124,7 @@ class ActionsAdmin extends Actions
 			!$this->Config()->ValidatePassword($oPassword)
 			|| ($totp && !\SnappyMail\TOTP::Verify($totp, $this->GetActionParam('TOTP', ''))))
 		{
-			$this->LoggerAuthHelper(null, $this->getAdditionalLogParamsByUserLogin($sLogin, true), true);
+			$this->LoggerAuthHelper(null, $sLogin, true);
 			$this->loginErrorDelay();
 			throw new ClientException(Notifications::AuthError);
 		}