Skip to content

fix #4363 【ユーザー管理】ログインパスワードの複雑度のチェックを行う・行わないでヘルプの表示を変更 #4389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaburk wants to merge 1 commit into
base: 5.2.x
Choose a base branch
from
+69 −1
Open

fix #4363 【ユーザー管理】ログインパスワードの複雑度のチェックを行う・行わないでヘルプの表示を変更 #4389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions plugins/baser-core/resources/locales/baser_core.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4566,6 +4566,16 @@ msgstr ""
msgid "半角英数字(英字は大文字小文字を区別)とスペース、記号(._-:/()#,@[]+=&;{}!$*)のみで入力してください"
msgstr ""

#: ./plugins/bc-admin-third/templates/Admin/Users/edit_password.php:56
#: ./plugins/bc-admin-third/templates/Admin/element/Users/form.php:149
msgid "{0}文字以上で入力してください。"
msgstr ""

#: ./plugins/bc-admin-third/templates/Admin/Users/edit_password.php:63
#: ./plugins/bc-admin-third/templates/Admin/element/Users/form.php:156
msgid "{0}を含む必要があります。"
msgstr ""

#: ./plugins/bc-admin-third/templates/Admin/Users/index.php:24
msgid "ユーザー一覧"
msgstr ""
Expand Down
10 changes: 10 additions & 0 deletions plugins/baser-core/resources/locales/en/baser_core.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5059,6 +5059,16 @@ msgstr ""
"Please enter only with half-size alphabets and numbers (alphabets are "
"distinct by large or small), spaces, symbols (._-:/()#,@[]+=&;{}!$*)."

#: plugins/bc-admin-third/templates/Admin/Users/edit_password.php:56
#: plugins/bc-admin-third/templates/Admin/element/Users/form.php:149
msgid "{0}文字以上で入力してください。"
msgstr "Please enter {0} or more characters."

#: plugins/bc-admin-third/templates/Admin/Users/edit_password.php:63
#: plugins/bc-admin-third/templates/Admin/element/Users/form.php:156
msgid "{0}を含む必要があります。"
msgstr "{0} is required."

#: plugins/bc-admin-third/templates/Admin/Users/index.php:24
msgid "ユーザー一覧"
msgstr "User List"
Expand Down
26 changes: 25 additions & 1 deletion plugins/bc-admin-third/templates/Admin/Users/edit_password.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
* @license https://basercms.net/license/index.html MIT License
*/

use BaserCore\View\BcAdminAppView;
use BaserCore\Model\Entity\User;
use BaserCore\Utility\BcSiteConfig;
use BaserCore\View\BcAdminAppView;
use Cake\Core\Configure;

/**
* Users Edit
Expand Down Expand Up @@ -51,6 +53,28 @@
<?php endif; ?>
<?php echo __d('baser_core', '確認のため２回入力してください。') ?></li>
<li><?php echo __d('baser_core', '半角英数字(英字は大文字小文字を区別)とスペース、記号(._-:/()#,@[]+=&;{}!$*)のみで入力してください') ?></li>
<li>
<?php if (BcSiteConfig::get('allow_simple_password')): ?>
<?php echo __d('baser_core', '{0}文字以上で入力してください。', 6) ?>
<?php else: ?>
<?php echo __d('baser_core', '{0}文字以上で入力してください。', Configure::read('BcApp.passwordRule.minLength') ?: 12) ?>
<?php endif ?>
Comment thread
kaburk marked this conversation as resolved.
</li>
<?php if (!BcSiteConfig::get('allow_simple_password')): ?>
<?php
$requiredCharacterTypeNames = [
'numeric' => __d('baser_core', '数字'),
'uppercase' => __d('baser_core', '大文字英字'),
'lowercase' => __d('baser_core', '小文字英字'),
'symbol' => __d('baser_core', '記号'),
];
$requiredTypes = Configure::read('BcApp.passwordRule.requiredCharacterTypes') ?: [];
$requiredNames = array_values(array_intersect_key($requiredCharacterTypeNames, array_flip($requiredTypes)));
?>
<?php if ($requiredNames): ?>
<li><?php echo __d('baser_core', '{0}を含む必要があります。', implode('・', $requiredNames)) ?></li>
<?php endif ?>
<?php endif ?>
</ul>
</div>
<?php echo $this->BcAdminForm->error('password') ?>
Expand Down
24 changes: 24 additions & 0 deletions plugins/bc-admin-third/templates/Admin/element/Users/form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
*/

use BaserCore\Model\Entity\User;
use BaserCore\Utility\BcSiteConfig;
use BaserCore\View\BcAdminAppView;
use Cake\Core\Configure;

/**
* Users Form
Expand Down Expand Up @@ -144,6 +146,28 @@ class="col-head bca-form-table__label"><?php echo $this->BcAdminForm->label('use
<?php endif; ?>
<?php echo __d('baser_core', '確認のため２回入力してください。') ?></li>
<li><?php echo __d('baser_core', '半角英数字(英字は大文字小文字を区別)とスペース、記号(._-:/()#,@[]+=&;{}!$*)のみで入力してください') ?></li>
<li>
<?php if (BcSiteConfig::get('allow_simple_password')): ?>
<?php echo __d('baser_core', '{0}文字以上で入力してください。', 6) ?>
<?php else: ?>
<?php echo __d('baser_core', '{0}文字以上で入力してください。', Configure::read('BcApp.passwordRule.minLength') ?: 12) ?>
<?php endif ?>
Comment thread
kaburk marked this conversation as resolved.
</li>
<?php if (!BcSiteConfig::get('allow_simple_password')): ?>
<?php
$requiredCharacterTypeNames = [
'numeric' => __d('baser_core', '数字'),
'uppercase' => __d('baser_core', '大文字英字'),
'lowercase' => __d('baser_core', '小文字英字'),
'symbol' => __d('baser_core', '記号'),
];
$requiredTypes = Configure::read('BcApp.passwordRule.requiredCharacterTypes') ?: [];
$requiredNames = array_values(array_intersect_key($requiredCharacterTypeNames, array_flip($requiredTypes)));
?>
<?php if ($requiredNames): ?>
<li><?php echo __d('baser_core', '{0}を含む必要があります。', implode('・', $requiredNames)) ?></li>
<?php endif ?>
<?php endif ?>
</ul>
</div>
<?php echo $this->BcAdminForm->error('password') ?>
Expand Down
Loading