makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

copy regiustration attempt setting to acp_captcha - although the setting is pointless

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9809 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2009-07-21 10:26:18 +00:00
parent 783da3064a
commit 3a38727661
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/adm/style/acp_captcha.html
View file

@ -17,6 +17,10 @@
<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label> <dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd> <label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
</dl> </dl>
<dl>
<dt><label for="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
</dl>
<dl> <dl>
<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt> <dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label> <dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>

16
phpBB/includes/acp/acp_captcha.php
View file

@ -52,9 +52,10 @@ class acp_captcha
$captchas = phpbb_captcha_factory::get_captcha_types(); $captchas = phpbb_captcha_factory::get_captcha_types();
$config_vars = array( $config_vars = array(
'enable_confirm' => 'REG_ENABLE', 'enable_confirm' => array('tpl' => 'REG_ENABLE', 'default' => false),
'enable_post_confirm' => 'POST_ENABLE', 'enable_post_confirm' => array('tpl' => 'POST_ENABLE', 'default' => false),
'confirm_refresh' => 'CONFIRM_REFRESH', 'confirm_refresh' => array('tpl' => 'CONFIRM_REFRESH', 'default' => false),
'max_reg_attempts' => array('tpl' => 'REG_LIMIT', 'default' => 0),
); );
$this->tpl_name = 'acp_captcha'; $this->tpl_name = 'acp_captcha';
@ -67,10 +68,9 @@ class acp_captcha
if ($submit && check_form_key($form_key)) if ($submit && check_form_key($form_key))
{ {
$config_vars = array_keys($config_vars); $config_vars = array_keys($config_vars);
foreach ($config_vars as $config_var => $options)
foreach ($config_vars as $config_var)
{ {
set_config($config_var, request_var($config_var, false)); set_config($config_var, request_var($config_var, $options['default']));
} }
if ($selected !== $config['captcha_plugin']) if ($selected !== $config['captcha_plugin'])
@ -115,9 +115,9 @@ class acp_captcha
$demo_captcha =& phpbb_captcha_factory::get_instance($selected); $demo_captcha =& phpbb_captcha_factory::get_instance($selected);
foreach ($config_vars as $config_var => $template_var) foreach ($config_vars as $config_var => $options)
{ {
$template->assign_var($template_var, (isset($_REQUEST[$config_var])) ? request_var($config_var, '') : $config[$config_var]) ; $template->assign_var($options['tpl'], (isset($_POST[$config_var])) ? request_var($config_var, $options['default']) : $config[$config_var]) ;
} }
$template->assign_vars(array( $template->assign_vars(array(

2
phpBB/language/en/acp/board.php
View file

@ -274,7 +274,7 @@ $lang = array_merge($lang, array(
// Visual Confirmation Settings // Visual Confirmation Settings
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'ACP_VC_SETTINGS_EXPLAIN' => 'Here you are able to define visual confirmation defaults and CAPTCHA settings.', 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure CAPTCHA plugins, which implement various ways to reject registration attempts from so-called spambots.',
'AVAILABLE_CAPTCHAS' => 'Available plugins', 'AVAILABLE_CAPTCHAS' => 'Available plugins',
'CAPTCHA_UNAVAILABLE' => 'The CAPTCHA cannot be selected as its requirements are not met.', 'CAPTCHA_UNAVAILABLE' => 'The CAPTCHA cannot be selected as its requirements are not met.',
'CAPTCHA_GD' => 'GD CAPTCHA', 'CAPTCHA_GD' => 'GD CAPTCHA',

4
phpBB/language/en/acp/common.php
View file

@ -188,7 +188,7 @@ $lang = array_merge($lang, array(
'ACP_USER_SIG' => 'Signature', 'ACP_USER_SIG' => 'Signature',
'ACP_USER_WARNINGS' => 'Warnings', 'ACP_USER_WARNINGS' => 'Warnings',
'ACP_VC_SETTINGS' => 'Visual confirmation settings', 'ACP_VC_SETTINGS' => 'CAPTCHA module settings',
'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA image preview', 'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA image preview',
'ACP_VERSION_CHECK' => 'Check for updates', 'ACP_VERSION_CHECK' => 'Check for updates',
'ACP_VIEW_ADMIN_PERMISSIONS' => 'View administrative permissions', 'ACP_VIEW_ADMIN_PERMISSIONS' => 'View administrative permissions',
@ -493,7 +493,7 @@ $lang = array_merge($lang, array(
'LOG_CONFIG_SERVER' => '<strong>Altered server settings</strong>', 'LOG_CONFIG_SERVER' => '<strong>Altered server settings</strong>',
'LOG_CONFIG_SETTINGS' => '<strong>Altered board settings</strong>', 'LOG_CONFIG_SETTINGS' => '<strong>Altered board settings</strong>',
'LOG_CONFIG_SIGNATURE' => '<strong>Altered signature settings</strong>', 'LOG_CONFIG_SIGNATURE' => '<strong>Altered signature settings</strong>',
'LOG_CONFIG_VISUAL' => '<strong>Altered visual confirmation settings</strong>', 'LOG_CONFIG_VISUAL' => '<strong>Altered antibot settings</strong>',
'LOG_APPROVE_TOPIC' => '<strong>Approved topic</strong><br />» %s', 'LOG_APPROVE_TOPIC' => '<strong>Approved topic</strong><br />» %s',
'LOG_BUMP_TOPIC' => '<strong>User bumped topic</strong><br />» %s', 'LOG_BUMP_TOPIC' => '<strong>User bumped topic</strong><br />» %s',