Menu
▾
▴
[Phpbb-checkins] r9809 - in /branches/phpBB-3_0_0/phpBB: adm/style/acp_captcha.html includes/acp/acp_captcha.php language/en/acp/board.php language/en/acp/common.php
|
From: Henry S. <kel...@ph...> - 2009-07-21 10:27:06
|
Author: Kellanved
Date: Tue Jul 21 10:26:18 2009
New Revision: 9809
Log:
copy regiustration attempt setting to acp_captcha - although the setting is pointless
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_captcha.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php
branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_captcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_captcha.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_captcha.html Tue Jul 21 10:26:18 2009
***************
*** 18,23 ****
--- 18,27 ----
<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
</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>
<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>
<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php Tue Jul 21 10:26:18 2009
***************
*** 52,60 ****
$captchas = phpbb_captcha_factory::get_captcha_types();
$config_vars = array(
! 'enable_confirm' => 'REG_ENABLE',
! 'enable_post_confirm' => 'POST_ENABLE',
! 'confirm_refresh' => 'CONFIRM_REFRESH',
);
$this->tpl_name = 'acp_captcha';
--- 52,61 ----
$captchas = phpbb_captcha_factory::get_captcha_types();
$config_vars = array(
! 'enable_confirm' => array('tpl' => 'REG_ENABLE', 'default' => false),
! 'enable_post_confirm' => array('tpl' => 'POST_ENABLE', 'default' => false),
! 'confirm_refresh' => array('tpl' => 'CONFIRM_REFRESH', 'default' => false),
! 'max_reg_attempts' => array('tpl' => 'REG_LIMIT', 'default' => 0),
);
$this->tpl_name = 'acp_captcha';
***************
*** 67,76 ****
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, false));
}
if ($selected !== $config['captcha_plugin'])
--- 68,76 ----
if ($submit && check_form_key($form_key))
{
$config_vars = array_keys($config_vars);
! foreach ($config_vars as $config_var => $options)
{
! set_config($config_var, request_var($config_var, $options['default']));
}
if ($selected !== $config['captcha_plugin'])
***************
*** 115,123 ****
$demo_captcha =& phpbb_captcha_factory::get_instance($selected);
! foreach ($config_vars as $config_var => $template_var)
{
! $template->assign_var($template_var, (isset($_REQUEST[$config_var])) ? request_var($config_var, '') : $config[$config_var]) ;
}
$template->assign_vars(array(
--- 115,123 ----
$demo_captcha =& phpbb_captcha_factory::get_instance($selected);
! foreach ($config_vars as $config_var => $options)
{
! $template->assign_var($options['tpl'], (isset($_POST[$config_var])) ? request_var($config_var, $options['default']) : $config[$config_var]) ;
}
$template->assign_vars(array(
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Tue Jul 21 10:26:18 2009
***************
*** 274,280 ****
// Visual Confirmation Settings
$lang = array_merge($lang, array(
! 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you are able to define visual confirmation defaults and CAPTCHA settings.',
'AVAILABLE_CAPTCHAS' => 'Available plugins',
'CAPTCHA_UNAVAILABLE' => 'The CAPTCHA cannot be selected as its requirements are not met.',
'CAPTCHA_GD' => 'GD CAPTCHA',
--- 274,280 ----
// Visual Confirmation Settings
$lang = array_merge($lang, array(
! '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',
'CAPTCHA_UNAVAILABLE' => 'The CAPTCHA cannot be selected as its requirements are not met.',
'CAPTCHA_GD' => 'GD CAPTCHA',
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Tue Jul 21 10:26:18 2009
***************
*** 188,194 ****
'ACP_USER_SIG' => 'Signature',
'ACP_USER_WARNINGS' => 'Warnings',
! 'ACP_VC_SETTINGS' => 'Visual confirmation settings',
'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA image preview',
'ACP_VERSION_CHECK' => 'Check for updates',
'ACP_VIEW_ADMIN_PERMISSIONS' => 'View administrative permissions',
--- 188,194 ----
'ACP_USER_SIG' => 'Signature',
'ACP_USER_WARNINGS' => 'Warnings',
! 'ACP_VC_SETTINGS' => 'CAPTCHA module settings',
'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA image preview',
'ACP_VERSION_CHECK' => 'Check for updates',
'ACP_VIEW_ADMIN_PERMISSIONS' => 'View administrative permissions',
***************
*** 493,499 ****
'LOG_CONFIG_SERVER' => '<strong>Altered server settings</strong>',
'LOG_CONFIG_SETTINGS' => '<strong>Altered board settings</strong>',
'LOG_CONFIG_SIGNATURE' => '<strong>Altered signature settings</strong>',
! 'LOG_CONFIG_VISUAL' => '<strong>Altered visual confirmation settings</strong>',
'LOG_APPROVE_TOPIC' => '<strong>Approved topic</strong><br />» %s',
'LOG_BUMP_TOPIC' => '<strong>User bumped topic</strong><br />» %s',
--- 493,499 ----
'LOG_CONFIG_SERVER' => '<strong>Altered server settings</strong>',
'LOG_CONFIG_SETTINGS' => '<strong>Altered board settings</strong>',
'LOG_CONFIG_SIGNATURE' => '<strong>Altered signature settings</strong>',
! 'LOG_CONFIG_VISUAL' => '<strong>Altered antibot settings</strong>',
'LOG_APPROVE_TOPIC' => '<strong>Approved topic</strong><br />» %s',
'LOG_BUMP_TOPIC' => '<strong>User bumped topic</strong><br />» %s',
|
