mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Use dynamic includes, fix some style bugs, make the old default captcha family backwards compatible to 3.0.5 styles

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9609 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2009-06-17 13:29:26 +00:00
parent 2a079ecb52
commit c6c6841cfb
17 changed files with 47 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/captcha/captcha_gd.php
View File

@@ -35,8 +35,7 @@ class captcha
{
global $config;
srand($seed);
//mt_srand($seed);
mt_srand($seed);
// Create image
$img = imagecreatetruecolor($this->width, $this->height);
@@ -109,7 +108,7 @@ class captcha
if ($config['captcha_gd_3d_noise'])
{
$xoffset = rand(0,9);
$xoffset = mt_rand(0,9);
$noise_bitmaps = $this->captcha_noise_bg_bitmaps();
for ($i = 0; $i < $code_len; ++$i)
{

26
phpBB/includes/captcha/plugins/captcha_abstract.php
View File

@@ -85,29 +85,27 @@ class phpbb_default_captcha
function get_template()
{
global $config, $user, $template, $phpEx, $phpbb_root_path;
$template->set_filenames(array(
'captcha' => 'captcha_default.html')
);
$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
$template->assign_vars(array(
'CONFIRM_IMAGE' => append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type),
'CONFIRM_IMAGE_LINK' => $link,
'CONFIRM_IMAGE' => '<img src="'. $link . '" />',
'CONFIRM_IMG' => '<img src="'. $link . '" />',
'CONFIRM_ID' => $this->confirm_id,
'S_REFRESH' => (bool) $config['confirm_refresh'],
'S_CONFIRM_CODE' => true,
'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh'] && $this->type == CONFIRM_REG) ? true : false,
'L_CONFIRM_EXPLAIN' => $explain,
));
return $template->assign_display('captcha');
return 'captcha_default.html';
}
function get_demo_template($id)
{
global $config, $user, $template, $phpbb_admin_path, $phpEx;
$template->set_filenames(array(
'captcha_demo' => 'captcha_default_acp_demo.html')
);
$variables = '';
if (is_array($this->captcha_vars))
@@ -124,7 +122,7 @@ class phpbb_default_captcha
'CONFIRM_ID' => $this->confirm_id,
));
return $template->assign_display('captcha_demo');
return 'captcha_default_acp_demo.html';
}
function get_hidden_fields()

2
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
View File

@@ -34,7 +34,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
'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' => 'CAPTCHA_GD_PREVIEWED',
'captcha_gd_wave' => 'CAPTCHA_GD_WAVE',
'captcha_gd_3d_noise' => 'CAPTCHA_GD_3D_NOISE',
'captcha_gd_fonts' => 'CAPTCHA_GD_FONTS',

6
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View File

@@ -128,10 +128,6 @@ class phpbb_recaptcha extends phpbb_default_captcha
{
global $config, $user, $template;
$template->set_filenames(array(
'captcha' => 'captcha_recaptcha.html')
);
$template->assign_vars(array(
'RECAPTCHA_SERVER' => $this->recaptcha_server,
'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
@@ -139,7 +135,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
'S_RECAPTCHA_AVAILABLE' => $this->is_available(),
));
return $template->assign_display('captcha');
return 'captcha_recaptcha.html';
}
function get_demo_template($id)

2
phpBB/includes/functions.php
View File

@@ -2702,7 +2702,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
$template->assign_vars(array(
'S_CONFIRM_CODE' => true,
'CONFIRM' => $captcha->get_template(''),
'CAPTCHA_TEMPLATE' => $captcha->get_template(),
));
$err = $user->lang[$result['error_msg']];

5
phpBB/includes/ucp/ucp_register.php
View File

@@ -42,7 +42,6 @@ class ucp_register
$submit = (isset($_POST['submit'])) ? true : false;
$change_lang = request_var('change_lang', '');
$user_lang = request_var('lang', $user->lang_name);
$confirm_refresh= (isset($_POST['confirm_refresh']) && $config['confirm_refresh']) ? ((!empty($_POST['confirm_refresh'])) ? 1 : 0) : false;
if ($agreed)
{
@@ -437,7 +436,7 @@ class ucp_register
// Visual Confirmation - Show images
if ($config['enable_confirm'] && !$captcha_solved)
{
if ($change_lang || $confirm_refresh)
if ($change_lang)
{
$str = '&amp;change_lang=' . $change_lang;
}
@@ -448,7 +447,7 @@ class ucp_register
$template->assign_vars(array(
'L_CONFIRM_EXPLAIN' => sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'),
'S_CAPTCHA' => $captcha->get_template(),
'CAPTCHA_TEMPLATE' => $captcha->get_template(),
));
}