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

Correctly assign board administrator email for L_CONFIRM_EXPLAIN in captcha plugins.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10085 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-09-01 15:08:04 +00:00
parent 254dee274c
commit 604696f9a8
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@ class phpbb_default_captcha
else else
{ {
$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx, 'mode=confirm&confirm_id=' . $this->confirm_id . '&type=' . $this->type); $link = append_sid($phpbb_root_path . 'ucp.' . $phpEx, 'mode=confirm&confirm_id=' . $this->confirm_id . '&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']; $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
$template->assign_vars(array( $template->assign_vars(array(
'CONFIRM_IMAGE_LINK' => $link, 'CONFIRM_IMAGE_LINK' => $link,

3
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View file

@ -143,6 +143,8 @@ class phpbb_recaptcha extends phpbb_default_captcha
} }
else else
{ {
$explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
$template->assign_vars(array( $template->assign_vars(array(
'RECAPTCHA_SERVER' => $this->recaptcha_server, 'RECAPTCHA_SERVER' => $this->recaptcha_server,
'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '', 'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
@ -150,6 +152,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
'S_RECAPTCHA_AVAILABLE' => $this->is_available(), 'S_RECAPTCHA_AVAILABLE' => $this->is_available(),
'S_CONFIRM_CODE' => true, 'S_CONFIRM_CODE' => true,
'S_TYPE' => $this->type, 'S_TYPE' => $this->type,
'L_CONFIRM_EXPLAIN' => $explain,
)); ));
return 'captcha_recaptcha.html'; return 'captcha_recaptcha.html';