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

[ticket/10073] Replace board_contact mail with links to contact page

Browse source 
Error pages still contain the email address.

PHPBB3-10073
This commit is contained in:
Nils Adermann 2011-06-07 03:46:38 +02:00 • committed by Joas Schilling
parent d52f34f5ec
commit 389bc0b8dd
8 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_email.php
View file

@ -201,7 +201,7 @@ class acp_email
$messenger->set_mail_priority($priority); $messenger->set_mail_priority($priority);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'CONTACT_EMAIL' => $config['board_contact'], 'CONTACT_EMAIL' => generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin',
'MESSAGE' => htmlspecialchars_decode($message)) 'MESSAGE' => htmlspecialchars_decode($message))
); );

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

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

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

@ -150,7 +150,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
function get_template() function get_template()
{ {
global $config, $user, $template; global $config, $user, $template, $phpbb_root_path, $phpEx;
if ($this->is_solved()) if ($this->is_solved())
{ {
@ -158,7 +158,7 @@ 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>'); $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') . '">', '</a>');
$template->assign_vars(array( $template->assign_vars(array(
'RECAPTCHA_SERVER' => $this->recaptcha_server, 'RECAPTCHA_SERVER' => $this->recaptcha_server,

6
phpBB/includes/functions.php
View file

@ -2818,8 +2818,8 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
$user->lang[$result['error_msg']], $user->lang[$result['error_msg']],
($config['email_enable']) ? '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') . '">' : '', ($config['email_enable']) ? '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') . '">' : '',
($config['email_enable']) ? '</a>' : '', ($config['email_enable']) ? '</a>' : '',
($config['board_contact']) ? '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">' : '', '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') . '">',
($config['board_contact']) ? '</a>' : '' '</a>'
); );
break; break;
@ -2830,7 +2830,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
// Assign admin contact to some error messages // Assign admin contact to some error messages
if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD') if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD')
{ {
$err = (!$config['board_contact']) ? sprintf($user->lang[$result['error_msg']], '', '') : sprintf($user->lang[$result['error_msg']], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'); $err = sprintf($user->lang[$result['error_msg']], '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') . '">', '</a>');
} }
break; break;

2
phpBB/includes/message/form.php
View file

@ -39,7 +39,7 @@ abstract class phpbb_message_form
$this->errors = array(); $this->errors = array();
$this->message = new phpbb_message($config['board_contact'], $config['server_name']); $this->message = new phpbb_message($config['server_name']);
$this->message->set_sender_from_user($this->user); $this->message->set_sender_from_user($this->user);
} }

6
phpBB/includes/message/message.php
View file

@ -17,7 +17,6 @@ if (!defined('IN_PHPBB'))
class phpbb_message class phpbb_message
{ {
protected $board_contact;
protected $server_name; protected $server_name;
protected $subject = ''; protected $subject = '';
@ -36,9 +35,8 @@ class phpbb_message
protected $recipients; protected $recipients;
public function __construct($board_contact, $server_name) public function __construct($server_name)
{ {
$this->board_contact = $board_contact;
$this->server_name = $server_name; $this->server_name = $server_name;
} }
@ -171,7 +169,7 @@ class phpbb_message
$messenger->subject(htmlspecialchars_decode($this->subject)); $messenger->subject(htmlspecialchars_decode($this->subject));
$messenger->assign_vars(array( $messenger->assign_vars(array(
'BOARD_CONTACT' => $this->board_contact, 'BOARD_CONTACT' => generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin',
'TO_USERNAME' => htmlspecialchars_decode($recipient['to_name']), 'TO_USERNAME' => htmlspecialchars_decode($recipient['to_name']),
'FROM_USERNAME' => htmlspecialchars_decode($this->sender_name), 'FROM_USERNAME' => htmlspecialchars_decode($this->sender_name),
'MESSAGE' => htmlspecialchars_decode($this->body)) 'MESSAGE' => htmlspecialchars_decode($this->body))

2
phpBB/memberlist.php
View file

@ -393,7 +393,7 @@ switch ($mode)
$messenger->set_addresses($row); $messenger->set_addresses($row);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'BOARD_CONTACT' => $config['board_contact'], 'BOARD_CONTACT' => generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin',
'FROM_USERNAME' => htmlspecialchars_decode($user->data['username']), 'FROM_USERNAME' => htmlspecialchars_decode($user->data['username']),
'TO_USERNAME' => htmlspecialchars_decode($row['username']), 'TO_USERNAME' => htmlspecialchars_decode($row['username']),
'MESSAGE' => htmlspecialchars_decode($message)) 'MESSAGE' => htmlspecialchars_decode($message))

6
phpBB/phpbb/session.php
View file

@ -1189,7 +1189,7 @@ class session
if ($banned && !$return) if ($banned && !$return)
{ {
global $template; global $template, $phpbb_root_path, $phpEx;
// If the session is empty we need to create a valid one... // If the session is empty we need to create a valid one...
if (empty($this->session_id)) if (empty($this->session_id))
@ -1210,8 +1210,6 @@ class session
// We show a login box here to allow founders accessing the board if banned by IP // We show a login box here to allow founders accessing the board if banned by IP
if (defined('IN_LOGIN') && $this->data['user_id'] == ANONYMOUS) if (defined('IN_LOGIN') && $this->data['user_id'] == ANONYMOUS)
{ {
global $phpEx;
$this->setup('ucp'); $this->setup('ucp');
$this->data['is_registered'] = $this->data['is_bot'] = false; $this->data['is_registered'] = $this->data['is_bot'] = false;
@ -1235,7 +1233,7 @@ class session
$till_date = ($ban_row['ban_end']) ? $this->format_date($ban_row['ban_end']) : ''; $till_date = ($ban_row['ban_end']) ? $this->format_date($ban_row['ban_end']) : '';
$message = ($ban_row['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM'; $message = ($ban_row['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';
$message = sprintf($this->lang[$message], $till_date, '<a href="mailto:' . $config['board_contact'] . '">', '</a>'); $message = sprintf($this->lang[$message], $till_date, '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') . '">', '</a>');
$message .= ($ban_row['ban_give_reason']) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : ''; $message .= ($ban_row['ban_give_reason']) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : '';
$message .= '<br /><br /><em>' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . '</em>'; $message .= '<br /><br /><em>' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . '</em>';