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

[ticket/10073] Fallback to board_contact when contact page is disabled

Browse Source 
PHPBB3-10073
This commit is contained in:
Joas Schilling
2014-05-03 16:34:25 +02:00
parent d1fb8d3c9e
commit ed8c16bf0d
8 changed files with 69 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/includes/acp/acp_email.php
View File

@@ -200,8 +200,17 @@ class acp_email
$messenger->subject(htmlspecialchars_decode($subject));
$messenger->set_mail_priority($priority);
if ($config['contact_admin_form_enable'])
{
$contact_link = generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin';
}
else
{
$contact_link = $config['board_contact'];
}
$messenger->assign_vars(array(
'CONTACT_EMAIL' => generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin',
'CONTACT_EMAIL' => $contact_link,
'MESSAGE' => htmlspecialchars_decode($message))
);

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

@@ -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,

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

@@ -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,

11
phpBB/includes/functions.php
View File

@@ -2814,11 +2814,20 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
break;
case LOGIN_ERROR_PASSWORD_CONVERT:
if ($config['contact_admin_form_enable'])
{
$contact_link = append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword');
}
else
{
$contact_link = 'mailto:' . htmlspecialchars($config['board_contact']);
}
$err = sprintf(
$user->lang[$result['error_msg']],
($config['email_enable']) ? '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') . '">' : '',
($config['email_enable']) ? '</a>' : '',
'<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') . '">',
'<a href="' . $contact_link . '">',
'</a>'
);
break;