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

fix preview in ACP

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9576 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2009-06-12 15:24:30 +00:00
parent 863d7a7614
commit 8c246032cc
2 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/includes/captcha/plugins/captcha_abstract.php
View file

@ -30,6 +30,7 @@ class phpbb_default_captcha
var $seed; var $seed;
var $type; var $type;
var $solved = false; var $solved = false;
var $captcha_vars = false;
function init($type) function init($type)
{ {
@ -107,9 +108,19 @@ class phpbb_default_captcha
'captcha_demo' => 'captcha_default_acp_demo.html') 'captcha_demo' => 'captcha_default_acp_demo.html')
); );
$variables = '';
if (is_array($this->captcha_vars))
{
foreach ($this->captcha_vars as $captcha_var => $template_var)
{
$variables .= '&' . rawurlencode($captcha_var) . '=' . request_var($captcha_var, (int) $config[$captcha_var]);
}
}
// acp_captcha has a delivery function; let's use it // acp_captcha has a delivery function; let's use it
$template->assign_vars(array( $template->assign_vars(array(
'CONFIRM_IMAGE' => append_sid($phpbb_admin_path . 'index.' . $phpEx . '?captcha_demo=1&mode=visual&i=' . $id . '&select_captcha=' . $this->get_class_name()), 'CONFIRM_IMAGE' => append_sid($phpbb_admin_path . 'index.' . $phpEx . '?captcha_demo=1&mode=visual&i=' . $id . '&select_captcha=' . $this->get_class_name()) . $variables,
'CONFIRM_ID' => $this->confirm_id, 'CONFIRM_ID' => $this->confirm_id,
)); ));

39
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
View file

@ -29,6 +29,18 @@ if (!class_exists('phpbb_default_captcha'))
*/ */
class phpbb_captcha_gd extends phpbb_default_captcha class phpbb_captcha_gd extends phpbb_default_captcha
{ {
var $captcha_vars = array(
'captcha_gd_x_grid' => 'CAPTCHA_GD_X_GRID',
'captcha_gd_y_grid' => 'CAPTCHA_GD_Y_GRID',
'captcha_gd_foreground_noise' => 'CAPTCHA_GD_FOREGROUND_NOISE',
'captcha_gd' => 'CAPTCHA_GD_PREVIEWED',
'captcha_gd_wave' => 'CAPTCHA_GD_WAVE',
'captcha_gd_3d_noise' => 'CAPTCHA_GD_3D_NOISE',
'captcha_gd_fonts' => 'CAPTCHA_GD_FONTS',
);
function phpbb_captcha_gd() function phpbb_captcha_gd()
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
@ -65,16 +77,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
$user->add_lang('acp/board'); $user->add_lang('acp/board');
$captcha_vars = array(
'captcha_gd_x_grid' => 'CAPTCHA_GD_X_GRID',
'captcha_gd_y_grid' => 'CAPTCHA_GD_Y_GRID',
'captcha_gd_foreground_noise' => 'CAPTCHA_GD_FOREGROUND_NOISE',
'captcha_gd' => 'CAPTCHA_GD_PREVIEWED',
'captcha_gd_wave' => 'CAPTCHA_GD_WAVE',
'captcha_gd_3d_noise' => 'CAPTCHA_GD_3D_NOISE',
'captcha_gd_fonts' => 'CAPTCHA_GD_FONTS',
);
$config_vars = array( $config_vars = array(
'enable_confirm' => 'REG_ENABLE', 'enable_confirm' => 'REG_ENABLE',
@ -92,7 +95,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
if ($submit && check_form_key($form_key)) if ($submit && check_form_key($form_key))
{ {
$captcha_vars = array_keys($captcha_vars); $captcha_vars = array_keys($this->captcha_vars);
foreach ($captcha_vars as $captcha_var) foreach ($captcha_vars as $captcha_var)
{ {
$value = request_var($captcha_var, 0); $value = request_var($captcha_var, 0);
@ -109,7 +112,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
} }
else else
{ {
foreach ($captcha_vars as $captcha_var => $template_var) foreach ($this->captcha_vars as $captcha_var => $template_var)
{ {
$var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var]; $var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var];
$template->assign_var($template_var, $var); $template->assign_var($template_var, $var);
@ -121,6 +124,20 @@ class phpbb_captcha_gd extends phpbb_default_captcha
)); ));
} }
} }
function execute_demo()
{
global $config;
$config_old = $config;
foreach ($this->captcha_vars as $captcha_var => $template_var)
{
$config[$captcha_var] = request_var($captcha_var, (int) $config[$captcha_var]);
}
parent::execute_demo();
$config = $config_old;
}
} }
?> ?>