diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 16:34:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 02:14:39 +0200 |
| commit | ed8c16bf0ddb8fc8723aa870607f255d80aab55b (patch) | |
| tree | 8230887fdbf074f0748c37e9c31ab1f53ef7c034 /phpBB/includes/captcha/plugins | |
| parent | d1fb8d3c9e9e154d356d4764b592369d0e8ea30f (diff) | |
| download | forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.tar forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.tar.gz forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.tar.bz2 forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.tar.xz forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.zip | |
[ticket/10073] Fallback to board_contact when contact page is disabled
PHPBB3-10073
Diffstat (limited to 'phpBB/includes/captcha/plugins')
| -rw-r--r-- | phpBB/includes/captcha/plugins/captcha_abstract.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php index cbf57cab9a..c75a4ffb83 100644 --- a/phpBB/includes/captcha/plugins/captcha_abstract.php +++ b/phpBB/includes/captcha/plugins/captcha_abstract.php @@ -96,7 +96,15 @@ class phpbb_captcha_plugins_captcha_abstract else { $link = append_sid($phpbb_root_path . 'ucp.' . $phpEx, 'mode=confirm&confirm_id=' . $this->confirm_id . '&type=' . $this->type); - $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') . '">', '</a>'); + if ($config['contact_admin_form_enable']) + { + $contact_link = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin'); + } + else + { + $contact_link = 'mailto:' . htmlspecialchars($config['board_contact']); + } + $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>'); $template->assign_vars(array( 'CONFIRM_IMAGE_LINK' => $link, diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php index f7078b49c0..69864a75ab 100644 --- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php @@ -158,7 +158,15 @@ class phpbb_recaptcha extends phpbb_default_captcha } else { - $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') . '">', '</a>'); + if ($config['contact_admin_form_enable']) + { + $contact_link = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin'); + } + else + { + $contact_link = 'mailto:' . htmlspecialchars($config['board_contact']); + } + $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>'); $template->assign_vars(array( 'RECAPTCHA_SERVER' => $this->recaptcha_server, |