From 5b3b3620129bed838d3d5fe64a92ef4daacac90c Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 28 Feb 2024 20:42:31 +0100
Subject: [PATCH] Simplify SignMe/Remember me code

---
 dev/View/User/Login.js                          | 17 ++++++-----------
 .../v/0.0.0/app/libraries/RainLoop/Actions.php  |  7 ++++++-
 .../libraries/RainLoop/Config/Application.php   |  2 +-
 .../RainLoop/Enumerations/SignMeType.php        |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js
index 044813049..00e8eebe8 100644
--- a/dev/View/User/Login.js
+++ b/dev/View/User/Login.js
@@ -138,25 +138,20 @@ export class LoginUserView extends AbstractViewLogin {
 	onBuild(dom) {
 		super.onBuild(dom);
 
-		const signMe = (SettingsGet('signMe') || '').toLowerCase();
-
+		let signMe = (SettingsGet('signMe') || '').toLowerCase();
 		switch (signMe) {
-			case 'defaultoff':
-			case 'defaulton':
-				this.signMeType(
-					'defaulton' === signMe ? SignMeOn : SignMeOff
-				);
-
+			case SignMeOff:
+			case SignMeOn:
 				switch (Local.get(ClientSideKeyNameLastSignMe)) {
 					case '-1-':
-						this.signMeType(SignMeOn);
+						signMe = SignMeOn;
 						break;
 					case '-0-':
-						this.signMeType(SignMeOff);
+						signMe = SignMeOff;
 						break;
 					// no default
 				}
-
+				this.signMeType(signMe);
 				break;
 			default:
 				this.signMeType(SignMeUnused);
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 3dbb5a992..72ae3f07c 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -3,6 +3,7 @@
 namespace RainLoop;
 
 use RainLoop\Enumerations\Capa;
+use RainLoop\Enumerations\SignMeType;
 
 class Actions
 {
@@ -834,7 +835,11 @@ class Actions
 					$aResult['DevPassword'] = '';
 				}
 
-				$aResult['signMe'] = (string) $oConfig->Get('login', 'sign_me_auto', Enumerations\SignMeType::DEFAULT_OFF);
+				$aResult['signMe'] = [
+					SignMeType::DefaultOff => 0,
+					SignMeType::DefaultOn => 1,
+					SignMeType::Unused => 2
+				][(string) $oConfig->Get('login', 'sign_me_auto', SignMeType::DefaultOff)];
 			}
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index e27f7dd20..f097bd6dd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -272,7 +272,7 @@ When this value is gethostname, the gethostname() value is used.
 
 				'login_lowercase' => array(true),
 
-				'sign_me_auto' => array(\RainLoop\Enumerations\SignMeType::DEFAULT_OFF,
+				'sign_me_auto' => array(\RainLoop\Enumerations\SignMeType::DefaultOff,
 					'This option allows webmail to remember the logged in user
 once they closed the browser window.
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/SignMeType.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/SignMeType.php
index d762abfca..bb50c4345 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/SignMeType.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/SignMeType.php
@@ -4,7 +4,7 @@ namespace RainLoop\Enumerations;
 
 abstract class SignMeType
 {
-	const DEFAULT_OFF = 'DefaultOff';
-	const DEFAULT_ON = 'DefaultOn';
-	const UNUSED = 'Unused';
+	const DefaultOff = 'DefaultOff';
+	const DefaultOn = 'DefaultOn';
+	const Unused = 'Unused';
 }