aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_register.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2009-06-14 15:24:03 +0000
committerHenry Sudhof <kellanved@phpbb.com>2009-06-14 15:24:03 +0000
commitb60f96c4ec09a41f0ecd19f16caca7f88808cc23 (patch)
tree4d2bf961b5df3b541dbd4f336208239506d2d33d /phpBB/includes/ucp/ucp_register.php
parent6424647f653560e649573a04321c783e32f650f9 (diff)
downloadforums-b60f96c4ec09a41f0ecd19f16caca7f88808cc23.tar
forums-b60f96c4ec09a41f0ecd19f16caca7f88808cc23.tar.gz
forums-b60f96c4ec09a41f0ecd19f16caca7f88808cc23.tar.bz2
forums-b60f96c4ec09a41f0ecd19f16caca7f88808cc23.tar.xz
forums-b60f96c4ec09a41f0ecd19f16caca7f88808cc23.zip
See if this plays out: do not require people to re-enter the CAPTCHA
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9591 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_register.php')
-rw-r--r--phpBB/includes/ucp/ucp_register.php15
1 files changed, 11 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index fa8119949f..4671f21d5b 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -52,7 +52,8 @@ class ucp_register
{
add_form_key('ucp_register_terms');
}
-
+
+ $captcha_solved = false;
if ($config['enable_confirm'])
{
include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
@@ -216,7 +217,8 @@ class ucp_register
}
else
{
- $captcha->reset();
+ $captcha_solved = true;
+ // $captcha->reset();
}
if ($config['max_reg_attempts'] && $captcha->get_attempt_count() > $config['max_reg_attempts'])
@@ -423,12 +425,17 @@ class ucp_register
{
$s_hidden_fields['coppa'] = $coppa;
}
- $s_hidden_fields = build_hidden_fields($s_hidden_fields);
+
+ if ($config['enable_confirm'])
+ {
+ $s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields());
+ }
+ $s_hidden_fields = build_hidden_fields($s_hidden_fields);
$confirm_image = '';
// Visual Confirmation - Show images
- if ($config['enable_confirm'])
+ if ($config['enable_confirm'] && !$captcha_solved)
{
if ($change_lang || $confirm_refresh)
{