aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_remind.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-07-10 16:41:23 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-07-10 16:41:23 +0000
commitd81f96877ffc873722e30298bbec96d5d26d9717 (patch)
treedf33a1427c7263e2fe56b8698371be444f5d48a7 /phpBB/includes/ucp/ucp_remind.php
parent49e78aa98c36c04737649d17c8ace1d80f6f2328 (diff)
downloadforums-d81f96877ffc873722e30298bbec96d5d26d9717.tar
forums-d81f96877ffc873722e30298bbec96d5d26d9717.tar.gz
forums-d81f96877ffc873722e30298bbec96d5d26d9717.tar.bz2
forums-d81f96877ffc873722e30298bbec96d5d26d9717.tar.xz
forums-d81f96877ffc873722e30298bbec96d5d26d9717.zip
#13181
git-svn-id: file:///svn/phpbb/trunk@7862 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_remind.php')
-rw-r--r--phpBB/includes/ucp/ucp_remind.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index cee36e4417..b761e772f6 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -61,7 +61,8 @@ class ucp_remind
$server_url = generate_board_url();
$key_len = 54 - strlen($server_url);
- $key_len = ($key_len < 6) ? 6 : $key_len;
+ $key_len = max(6, $key_len); // we want at least 6
+ $key_len = ($config['max_pass_chars']) ? min($key_len, $config['max_pass_chars']) : $key_len; // we want at most $config['max_pass_chars']
$user_actkey = substr(gen_rand_string(10), 0, $key_len);
$user_password = gen_rand_string(8);