Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-10 09:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update settings/registration

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-10-27 02:20:49 +00:00
parent 991bbb032f
commit ab8ddb8d8e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Install/settings.php
View File

@ -19,7 +19,7 @@ return [
[ [
'type' => 'setting', 'type' => 'setting',
'name' => SettingsEnum::PASSWORD_PATTERN, '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', 'module' => 'Admin',
], ],
[ [

6
Controller/ApiController.php
View File

@ -235,8 +235,8 @@ final class ApiController extends Controller
$handler->hostname = $emailSettings[SettingsEnum::MAIL_SERVER_OUT]->content ?? ''; $handler->hostname = $emailSettings[SettingsEnum::MAIL_SERVER_OUT]->content ?? '';
$handler->username = $emailSettings[SettingsEnum::MAIL_SERVER_USER]->content ?? ''; $handler->username = $emailSettings[SettingsEnum::MAIL_SERVER_USER]->content ?? '';
$handler->password = $emailSettings[SettingsEnum::MAIL_SERVER_PASS]->isEncrypted && !empty($_SERVER['OMS_PRIVATE_KEY_I'] ?? '') $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']) ? (EncryptionHelper::decryptShared($emailSettings[SettingsEnum::MAIL_SERVER_PASS]->content ?? '', $_SERVER['OMS_PRIVATE_KEY_I']))
: $emailSettings[SettingsEnum::MAIL_SERVER_PASS]->content ?? ''; : ($emailSettings[SettingsEnum::MAIL_SERVER_PASS]->content ?? '');
return $handler; return $handler;
} }
@ -1966,7 +1966,7 @@ final class ApiController extends Controller
|| ($val['unit'] = !$request->hasData('unit')) || ($val['unit'] = !$request->hasData('unit'))
|| ($val['app'] = !$request->hasData('app')) || ($val['app'] = !$request->hasData('app'))
|| ($val['password'] = !$request->hasData('password')) || ($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; return $val;
} }