diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2009-06-17 13:29:26 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2009-06-17 13:29:26 +0000 |
| commit | c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9 (patch) | |
| tree | 6229f2126144dbfe99ea39239dfb5ba2bd1510ea /phpBB/includes/captcha/plugins/captcha_abstract.php | |
| parent | 2a079ecb52305cdeaac046a0f1298b18b9f7bcb3 (diff) | |
| download | forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.tar forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.tar.gz forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.tar.bz2 forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.tar.xz forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.zip | |
Use dynamic includes, fix some style bugs, make the old default captcha family backwards compatible to 3.0.5 styles
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9609 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/captcha/plugins/captcha_abstract.php')
| -rw-r--r-- | phpBB/includes/captcha/plugins/captcha_abstract.php | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php index 1446df9874..1682293c02 100644 --- a/phpBB/includes/captcha/plugins/captcha_abstract.php +++ b/phpBB/includes/captcha/plugins/captcha_abstract.php @@ -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&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']; + $template->assign_vars(array( - 'CONFIRM_IMAGE' => append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&confirm_id=' . $this->confirm_id . '&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() |