Simplify SignMe/Remember me code

This commit is contained in:
the-djmaze 2024-02-28 20:42:31 +01:00
parent 490465cbbf
commit 5b3b362012
4 changed files with 16 additions and 16 deletions

View file

@ -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);

View file

@ -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)];
}
}

View file

@ -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.

View file

@ -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';
}