aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-12-25 15:17:09 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-12-25 15:17:09 +0100
commit7e3724c3e1befd0dc2853dd00b30d55ca65bdb93 (patch)
tree5dc670c6eec73e3431d4baf1e0b73ac72bf6c424 /phpBB/includes
parentdac5be16783548bb3659d1972fac8e0c47b57893 (diff)
parenta45f03a5af4f25fb5e8477af3d37a9089555a719 (diff)
downloadforums-7e3724c3e1befd0dc2853dd00b30d55ca65bdb93.tar
forums-7e3724c3e1befd0dc2853dd00b30d55ca65bdb93.tar.gz
forums-7e3724c3e1befd0dc2853dd00b30d55ca65bdb93.tar.bz2
forums-7e3724c3e1befd0dc2853dd00b30d55ca65bdb93.tar.xz
forums-7e3724c3e1befd0dc2853dd00b30d55ca65bdb93.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9681] Add password length to security settings
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_board.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index c99541ea7a..87fd46bc79 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -387,6 +387,8 @@ class acp_board
'referer_validation' => array('lang' => 'REFERER_VALID', 'validate' => 'int:0:3','type' => 'custom', 'method' => 'select_ref_check', 'explain' => true),
'check_dnsbl' => array('lang' => 'CHECK_DNSBL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'email_check_mx' => array('lang' => 'EMAIL_CHECK_MX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+ 'max_pass_chars' => array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
+ 'min_pass_chars' => array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:1', 'type' => 'custom', 'method' => 'password_length', 'explain' => true),
'pass_complex' => array('lang' => 'PASSWORD_TYPE', 'validate' => 'string', 'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
'chg_passforce' => array('lang' => 'FORCE_PASS_CHANGE', 'validate' => 'int:0', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
'max_login_attempts' => array('lang' => 'MAX_LOGIN_ATTEMPTS', 'validate' => 'int:0', 'type' => 'text:3:3', 'explain' => true),