aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-12-25 15:16:25 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-12-25 15:16:25 +0100
commita45f03a5af4f25fb5e8477af3d37a9089555a719 (patch)
tree29bff7b55c80032bafbfca0d835f2e9b1cee8443 /phpBB
parentb0fd3b2bf092658290db7eb062a3e25899fb5dec (diff)
parent7779dae2cc256eafb6fa9dc1bc882b52c4b1d8ca (diff)
downloadforums-a45f03a5af4f25fb5e8477af3d37a9089555a719.tar
forums-a45f03a5af4f25fb5e8477af3d37a9089555a719.tar.gz
forums-a45f03a5af4f25fb5e8477af3d37a9089555a719.tar.bz2
forums-a45f03a5af4f25fb5e8477af3d37a9089555a719.tar.xz
forums-a45f03a5af4f25fb5e8477af3d37a9089555a719.zip
Merge remote-tracking branch 'p/ticket/9681' into develop-olympus
* p/ticket/9681: [ticket/9681] Add password length to security settings
Diffstat (limited to 'phpBB')
-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 8c761e51fe..f437dca8f9 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -383,6 +383,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),