diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-02-27 15:21:23 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-02-27 15:21:23 +0000 |
| commit | 2a3eb724a84120e1d89e56536dcd1f1f5e20a408 (patch) | |
| tree | 5e7f0f5ef11d65daffe4e514ec5949ea59fa184a /phpBB/includes/ucp | |
| parent | 30b24d476c3e010d9b2fc282e89a6fd8d8bdd6fa (diff) | |
| download | forums-2a3eb724a84120e1d89e56536dcd1f1f5e20a408.tar forums-2a3eb724a84120e1d89e56536dcd1f1f5e20a408.tar.gz forums-2a3eb724a84120e1d89e56536dcd1f1f5e20a408.tar.bz2 forums-2a3eb724a84120e1d89e56536dcd1f1f5e20a408.tar.xz forums-2a3eb724a84120e1d89e56536dcd1f1f5e20a408.zip | |
cross-ci
git-svn-id: file:///svn/phpbb/trunk@8411 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index b56015efc0..4e94501d39 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -43,14 +43,6 @@ class ucp_register $submit = (isset($_POST['submit'])) ? true : false; $change_lang = request_var('change_lang', ''); $user_lang = request_var('lang', $user->lang_name); - - - // not so fast, buddy - if (!check_form_key('ucp_register', false, '', false, $config['min_time_reg']) - && !check_form_key('ucp_register_terms', false, '', false, $config['min_time_terms'])) - { - $agreed = false; - } if ($agreed) { @@ -92,7 +84,7 @@ class ucp_register $error = $cp_data = $cp_error = array(); - // + if (!$agreed || ($coppa === false && $config['coppa_enable']) || ($coppa && !$config['coppa_enable'])) { $add_lang = ($change_lang) ? '&change_lang=' . urlencode($change_lang) : ''; @@ -142,7 +134,6 @@ class ucp_register 'S_REGISTRATION' => true, 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang . $add_coppa), - 'S_TIME' => 1000 * ((int) $config['min_time_terms']), ) ); } @@ -201,7 +192,10 @@ class ucp_register 'tz' => array('num', false, -14, 14), 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), )); - + if (!check_form_key('ucp_register')) + { + $error[] = $user->lang['FORM_INVALID']; + } // Replace "error" strings with their real, localised form $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); @@ -544,7 +538,6 @@ class ucp_register 'S_COPPA' => $coppa, 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), - 'S_TIME' => 1000 * ((int) $config['min_time_reg']), ) ); |