diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-11 09:11:08 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-11 09:11:08 +0000 |
| commit | cda9e5e9ec0dfe9c3e0a04809ffc5d0099020046 (patch) | |
| tree | 930f31bbe5c1fe8f0707a1b2059cefbac0c1d484 /phpBB/includes/acp/acp_captcha.php | |
| parent | a4c1de46b79c196dc7da2e5b9242deb6c55bdb6f (diff) | |
| download | forums-cda9e5e9ec0dfe9c3e0a04809ffc5d0099020046.tar forums-cda9e5e9ec0dfe9c3e0a04809ffc5d0099020046.tar.gz forums-cda9e5e9ec0dfe9c3e0a04809ffc5d0099020046.tar.bz2 forums-cda9e5e9ec0dfe9c3e0a04809ffc5d0099020046.tar.xz forums-cda9e5e9ec0dfe9c3e0a04809ffc5d0099020046.zip | |
a language alteration for captchas.
Added min/max captcha chars constants and changed the length from 5-8 to 4-7
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9437 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_captcha.php')
| -rw-r--r-- | phpBB/includes/acp/acp_captcha.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index ac791dc098..5f4f7ae89b 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -42,10 +42,12 @@ class acp_captcha if (isset($_GET['demo'])) { $captcha_vars = array_keys($captcha_vars); + foreach ($captcha_vars as $captcha_var) { $config[$captcha_var] = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var]; } + if ($config['captcha_gd']) { include($phpbb_root_path . 'includes/captcha/captcha_gd.' . $phpEx); @@ -54,8 +56,9 @@ class acp_captcha { include($phpbb_root_path . 'includes/captcha/captcha_non_gd.' . $phpEx); } + $captcha = new captcha(); - $captcha->execute(gen_rand_string(mt_rand(5, 8)), time()); + $captcha->execute(gen_rand_string(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS)), time()); exit; } @@ -76,11 +79,14 @@ class acp_captcha if ($submit && check_form_key($form_key)) { $config_vars = array_keys($config_vars); + foreach ($config_vars as $config_var) { set_config($config_var, request_var($config_var, '')); } + $captcha_vars = array_keys($captcha_vars); + foreach ($captcha_vars as $captcha_var) { $value = request_var($captcha_var, 0); @@ -89,35 +95,38 @@ class acp_captcha set_config($captcha_var, $value); } } + trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action)); } else if ($submit) { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action)); + trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action)); } else { - $preview_image_src = append_sid(append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&demo=demo")); + if (@extension_loaded('gd')) { $template->assign_var('GD', true); } + foreach ($config_vars as $config_var => $template_var) { $template->assign_var($template_var, (isset($_REQUEST[$config_var])) ? request_var($config_var, '') : $config[$config_var]) ; } + foreach ($captcha_vars as $captcha_var => $template_var) { $var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var]; $template->assign_var($template_var, $var); $preview_image_src .= "&$captcha_var=" . $var; } + $template->assign_vars(array( 'CAPTCHA_PREVIEW' => $preview_image_src, 'PREVIEW' => isset($_POST['preview']), )); - } } } |