From 08e8bd8102b92ab8dd68fce7a3c3771b4def3a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D?= Date: Sat, 22 Dec 2018 13:00:05 +0100 Subject: [PATCH] * [MOD] Improved master password change by enforcing maintenance mode before running the process * [MOD] Added import events to fixed ones * [MOD] Minor code tweaks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rubén D --- .../Controllers/ConfigManagerController.php | 2 +- .../material-blue/views/config/encryption.inc | 55 +++++++++---- lib/SP/Providers/Log/LogInterface.php | 4 +- lib/SP/Services/Install/Installer.php | 2 +- public/js/app-actions.js | 59 ++++++++------ public/js/app-actions.min.js | 78 +++++++++---------- public/vendor/js/eventsource.js | 1 + public/vendor/js/eventsource.min.js | 4 +- 8 files changed, 120 insertions(+), 85 deletions(-) diff --git a/app/modules/web/Controllers/ConfigManagerController.php b/app/modules/web/Controllers/ConfigManagerController.php index d2f57621..14bc097a 100644 --- a/app/modules/web/Controllers/ConfigManagerController.php +++ b/app/modules/web/Controllers/ConfigManagerController.php @@ -278,7 +278,7 @@ final class ConfigManagerController extends ControllerBase $numAccounts = $this->dic->get(AccountService::class)->getTotalNumAccounts(); $template->assign('numAccounts', $numAccounts); - if ($numAccounts > 100) { + if ($numAccounts > 150) { $template->assign('taskId', Task::genTaskId('masterpass')); } diff --git a/app/modules/web/themes/material-blue/views/config/encryption.inc b/app/modules/web/themes/material-blue/views/config/encryption.inc index 9801c6c4..5c422ed1 100644 --- a/app/modules/web/themes/material-blue/views/config/encryption.inc +++ b/app/modules/web/themes/material-blue/views/config/encryption.inc @@ -5,6 +5,8 @@ * @var callable $_getvar * @var \SP\Mvc\View\Template $this */ + +$disabled = $configData->isMaintenance() ? '' : 'disabled'; ?>
- + maxlength="255" required />
@@ -50,9 +53,10 @@
- + maxlength="255" required />
@@ -64,9 +68,10 @@
- + maxlength="255" required />
@@ -75,6 +80,12 @@ + isMaintenance()): ?> +
getIconWarning()->getIcon(); ?>
+ . +
+
getIconWarning()->getIcon(); ?>
@@ -98,7 +109,8 @@
  • -
  • - 0): ?> + isMaintenance() && $_getvar('numAccounts') > 0): ?>