From 17fc37975c440f41da7984b765bab32a11654b7a Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 23 Apr 2024 17:38:28 +0200 Subject: [PATCH] Rename application.ini `[labs]login_fault_delay` to `[login]fault_delay` --- snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 2 +- .../0.0.0/app/libraries/RainLoop/Config/Application.php | 9 +++++++-- 2 files changed, 8 insertions(+), 3 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 6ff13d3c1..4fab2dcfc 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -772,7 +772,7 @@ class Actions protected function loginErrorDelay(): void { - $iDelay = (int) $this->oConfig->Get('labs', 'login_fault_delay', 0); + $iDelay = (int) $this->oConfig->Get('login', 'fault_delay', 0); if (0 < $iDelay) { $seconds = $iDelay - (\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']); if (0 < $seconds) { 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 fdb41183e..94fcd7ada 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 @@ -128,6 +128,10 @@ class Application extends \RainLoop\Config\AbstractConfig $sSectionKey = 'imap'; $sParamKey = 'fetch_new_messages'; } + if ('login_fault_delay' === $sParamKey) { + $sSectionKey = 'login'; + $sParamKey = 'fault_delay'; + } } parent::Set($sSectionKey, $sParamKey, $mParamValue); } @@ -289,7 +293,9 @@ once they closed the browser window. Values: "DefaultOff" - can be used, disabled by default; "DefaultOn" - can be used, enabled by default; - "Unused" - cannot be used') + "Unused" - cannot be used'), + + 'fault_delay' => array(5, 'When login fails, wait N seconds before responding'), ), 'plugins' => array( @@ -416,7 +422,6 @@ Enables caching in the system'), 'labs' => array( 'allow_message_append' => array(false, 'Allow drag & drop .eml files from system into messages list'), - 'login_fault_delay' => array(5, 'When login fails, wait N seconds before responding'), 'log_ajax_response_write_limit' => array(300), 'smtp_show_server_errors' => array(false), 'mail_func_clear_headers' => array(true, 'PHP mail() remove To and Subject headers'),