From ab8ddb8d8e3b5e33217929a0ee7bb23eb845bdce Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 27 Oct 2023 02:20:49 +0000 Subject: [PATCH] update settings/registration --- Admin/Install/settings.php | 2 +- Controller/ApiController.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Admin/Install/settings.php b/Admin/Install/settings.php index 0517500..a910de1 100755 --- a/Admin/Install/settings.php +++ b/Admin/Install/settings.php @@ -19,7 +19,7 @@ return [ [ 'type' => 'setting', 'name' => SettingsEnum::PASSWORD_PATTERN, - 'content' => '/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[.,\/\(\)\{\}\[\]#?!@$%^&*+=\':-]).{8,}$/', + 'content' => '/(?=[A-Za-z0-9\.@#$\(\)\-{}\[\]%^&+!=]+$)^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[\.@#$\(\)\-{}\[\]%^&+!=])(?=.{8,}).*$/', 'module' => 'Admin', ], [ diff --git a/Controller/ApiController.php b/Controller/ApiController.php index f39ec9d..9bf250c 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -235,8 +235,8 @@ final class ApiController extends Controller $handler->hostname = $emailSettings[SettingsEnum::MAIL_SERVER_OUT]->content ?? ''; $handler->username = $emailSettings[SettingsEnum::MAIL_SERVER_USER]->content ?? ''; $handler->password = $emailSettings[SettingsEnum::MAIL_SERVER_PASS]->isEncrypted && !empty($_SERVER['OMS_PRIVATE_KEY_I'] ?? '') - ? EncryptionHelper::decryptShared($emailSettings[SettingsEnum::MAIL_SERVER_PASS]->content ?? '', $_SERVER['OMS_PRIVATE_KEY_I']) - : $emailSettings[SettingsEnum::MAIL_SERVER_PASS]->content ?? ''; + ? (EncryptionHelper::decryptShared($emailSettings[SettingsEnum::MAIL_SERVER_PASS]->content ?? '', $_SERVER['OMS_PRIVATE_KEY_I'])) + : ($emailSettings[SettingsEnum::MAIL_SERVER_PASS]->content ?? ''); return $handler; } @@ -1966,7 +1966,7 @@ final class ApiController extends Controller || ($val['unit'] = !$request->hasData('unit')) || ($val['app'] = !$request->hasData('app')) || ($val['password'] = !$request->hasData('password')) - || ($val['terms'] = (($request->getDataBool('terms_required') ?? false) && ($request->getDataBool('terms') ?? false))) + || ($val['terms'] = (($request->getDataBool('terms_required') ?? false) && !($request->getDataBool('terms') ?? false))) ) { return $val; }