aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-06-07 03:46:38 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-29 02:14:28 +0200
commit389bc0b8dd5594a9f66c1026df408dfe73eb65b0 (patch)
tree5bf933be6fc4d6455a60005a7e1070b7e1b19979 /phpBB/phpbb
parentd52f34f5ec5d006ec7e610e1c72266df21e70ac7 (diff)
downloadforums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.tar
forums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.tar.gz
forums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.tar.bz2
forums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.tar.xz
forums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.zip
[ticket/10073] Replace board_contact mail with links to contact page
Error pages still contain the email address. PHPBB3-10073
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/session.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index cfcb8e10a2..c35caf5047 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1189,7 +1189,7 @@ class session
if ($banned && !$return)
{
- global $template;
+ global $template, $phpbb_root_path, $phpEx;
// If the session is empty we need to create a valid one...
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
if (defined('IN_LOGIN') && $this->data['user_id'] == ANONYMOUS)
{
- global $phpEx;
-
$this->setup('ucp');
$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']) : '';
$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 .= '<br /><br /><em>' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . '</em>';