mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

[ticket/10073] Deduplicate the if statement

Browse Source 
PHPBB3-10073
This commit is contained in:
Joas Schilling
2014-05-03 16:57:04 +02:00
parent ed8c16bf0d
commit f01e0a2eef
7 changed files with 46 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/message/form.php
View File

@@ -149,16 +149,7 @@ abstract class form
$this->message->cc_sender();
}
if ($this->config['contact_admin_form_enable'])
{
$board_contact = generate_board_url() . '/memberlist.' . $this->phpEx . '?mode=contactadmin';
}
else
{
$board_contact = $this->config['board_contact'];
}
$this->message->send($messenger, $board_contact);
$this->message->send($messenger, phpbb_get_board_contact($this->config, $this->phpEx));
meta_refresh(3, append_sid($this->phpbb_root_path . 'index.' . $this->phpEx));
trigger_error($this->user->lang['EMAIL_SENT'] . '<br /><br />' . $this->get_return_message());

9
phpBB/phpbb/session.php
View File

@@ -1233,14 +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';
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']);
}
$contact_link = phpbb_get_board_contact_link($config, $phpbb_root_path, $phpEx);
$message = sprintf($this->lang[$message], $till_date, '<a href="' . $contact_link . '">', '</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>';