diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-01 15:08:04 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-01 15:08:04 +0000 |
| commit | 604696f9a8abd2c743336e3d20ab85746f094637 (patch) | |
| tree | 3b453fe2a9c0f4beac61b53c8442362d9122b43b /phpBB/includes | |
| parent | 254dee274c0e2753edb171fcb71c71c8ed47222e (diff) | |
| download | forums-604696f9a8abd2c743336e3d20ab85746f094637.tar forums-604696f9a8abd2c743336e3d20ab85746f094637.tar.gz forums-604696f9a8abd2c743336e3d20ab85746f094637.tar.bz2 forums-604696f9a8abd2c743336e3d20ab85746f094637.tar.xz forums-604696f9a8abd2c743336e3d20ab85746f094637.zip | |
Correctly assign board administrator email for L_CONFIRM_EXPLAIN in captcha plugins.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10085 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/captcha/plugins/captcha_abstract.php | 24 | ||||
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 5 |
2 files changed, 16 insertions, 13 deletions
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php index e5a4e299bd..db4b7649c7 100644 --- a/phpBB/includes/captcha/plugins/captcha_abstract.php +++ b/phpBB/includes/captcha/plugins/captcha_abstract.php @@ -88,7 +88,7 @@ class phpbb_default_captcha function get_template() { global $config, $user, $template, $phpEx, $phpbb_root_path; - + if ($this->is_solved()) { return false; @@ -96,8 +96,8 @@ class phpbb_default_captcha else { $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( 'CONFIRM_IMAGE_LINK' => $link, 'CONFIRM_IMAGE' => '<img src="' . $link . '" />', @@ -118,7 +118,7 @@ class phpbb_default_captcha global $config, $user, $template, $phpbb_admin_path, $phpEx; $variables = ''; - + if (is_array($this->captcha_vars)) { foreach ($this->captcha_vars as $captcha_var => $template_var) @@ -192,7 +192,7 @@ class phpbb_default_captcha function validate() { global $config, $db, $user; - + $error = ''; if (!$this->confirm_id) { @@ -264,7 +264,7 @@ class phpbb_default_captcha 'code' => (string) $this->code, 'seed' => (int) $this->seed)) . ' WHERE - confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' + confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND session_id = \'' . $db->sql_escape($user->session_id) . '\''; $db->sql_query($sql); } @@ -285,13 +285,13 @@ class phpbb_default_captcha $sql = 'UPDATE ' . CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array( 'code' => (string) $this->code, 'seed' => (int) $this->seed)) . ' - , attempts = attempts + 1 + , attempts = attempts + 1 WHERE - confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' + confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND session_id = \'' . $db->sql_escape($user->session_id) . '\''; $db->sql_query($sql); } - + /** * Look up everything we need for painting&checking. */ @@ -352,7 +352,7 @@ class phpbb_default_captcha // we leave the class usable by generating a new question $this->generate_code(); } - + function is_solved() { if (request_var('confirm_code', false) && $this->solved === 0) @@ -361,7 +361,7 @@ class phpbb_default_captcha } return (bool) $this->solved; } - + /** * API function */ @@ -369,7 +369,7 @@ class phpbb_default_captcha { return false; } - + } ?>
\ No newline at end of file diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php index 89d44826d8..2d37b13a4f 100644 --- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php @@ -54,7 +54,7 @@ class phpbb_recaptcha extends phpbb_default_captcha $user->add_lang('captcha_recaptcha'); return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey'])); } - + /** * API function */ @@ -143,6 +143,8 @@ class phpbb_recaptcha extends phpbb_default_captcha } 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( 'RECAPTCHA_SERVER' => $this->recaptcha_server, '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_CONFIRM_CODE' => true, 'S_TYPE' => $this->type, + 'L_CONFIRM_EXPLAIN' => $explain, )); return 'captcha_recaptcha.html'; |