diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-05-17 08:54:51 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-05-17 08:54:51 +0200 |
| commit | af21e38c1d6f3fd738c97bd6cf0f96285c0b35aa (patch) | |
| tree | 4ae0eee1e9e0ddb5688fa661288f7baac60ba64a /phpBB/includes/ucp | |
| parent | 6d7e30ae995fe0791c2bced0974b0445fa769ee9 (diff) | |
| download | forums-af21e38c1d6f3fd738c97bd6cf0f96285c0b35aa.tar forums-af21e38c1d6f3fd738c97bd6cf0f96285c0b35aa.tar.gz forums-af21e38c1d6f3fd738c97bd6cf0f96285c0b35aa.tar.bz2 forums-af21e38c1d6f3fd738c97bd6cf0f96285c0b35aa.tar.xz forums-af21e38c1d6f3fd738c97bd6cf0f96285c0b35aa.zip | |
[ticket/9611] Make length of activation keys variable between 6 and 10.
PHPBB3-9611
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_remind.php | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index f4f4abad4a..6b255e81a0 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -141,10 +141,7 @@ class ucp_profile $server_url = generate_board_url(); - $user_actkey = gen_rand_string(10); - $key_len = 54 - (strlen($server_url)); - $key_len = ($key_len > 6) ? $key_len : 6; - $user_actkey = substr($user_actkey, 0, $key_len); + $user_actkey = gen_rand_string(mt_rand(6, 10)); $messenger = new messenger(false); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 9656a4a3af..7fd99da55a 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -286,11 +286,7 @@ class ucp_register $config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN) && $config['email_enable']) { - $user_actkey = gen_rand_string(10); - $key_len = 54 - (strlen($server_url)); - $key_len = ($key_len < 6) ? 6 : $key_len; - $user_actkey = substr($user_actkey, 0, $key_len); - + $user_actkey = gen_rand_string(mt_rand(6, 10)); $user_type = USER_INACTIVE; $user_inactive_reason = INACTIVE_REGISTER; $user_inactive_time = time(); diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php index f9b792de20..0042cd9df7 100644 --- a/phpBB/includes/ucp/ucp_remind.php +++ b/phpBB/includes/ucp/ucp_remind.php @@ -82,7 +82,7 @@ class ucp_remind $user_password = gen_rand_string(max(8, rand((int) $config['min_pass_chars'], (int) $config['max_pass_chars']))); // For the activation key a random length between 6 and 10 will do. - $user_actkey = gen_rand_string(rand(6, 10)); + $user_actkey = gen_rand_string(mt_rand(6, 10)); $sql = 'UPDATE ' . USERS_TABLE . " SET user_newpasswd = '" . $db->sql_escape(phpbb_hash($user_password)) . "', user_actkey = '" . $db->sql_escape($user_actkey) . "' |