diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-07-07 13:33:53 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-07-07 13:33:53 +0000 |
| commit | fd667f9932f5420815396291c2b13238dc2944a1 (patch) | |
| tree | 568139b80faaed993853913ed3e6b25c6e90ffef /phpBB/includes/acp/acp_ban.php | |
| parent | eb4eee77ac5b870966a00b4e23ff14f204e18c68 (diff) | |
| download | forums-fd667f9932f5420815396291c2b13238dc2944a1.tar forums-fd667f9932f5420815396291c2b13238dc2944a1.tar.gz forums-fd667f9932f5420815396291c2b13238dc2944a1.tar.bz2 forums-fd667f9932f5420815396291c2b13238dc2944a1.tar.xz forums-fd667f9932f5420815396291c2b13238dc2944a1.zip | |
Fix bug #47815 - View end of ban in MCP and ACP when user is banned by duration - Patch by Pyramide
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9727 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_ban.php')
| -rw-r--r-- | phpBB/includes/acp/acp_ban.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php index 77fb44dda9..542ed47f3b 100644 --- a/phpBB/includes/acp/acp_ban.php +++ b/phpBB/includes/acp/acp_ban.php @@ -181,7 +181,22 @@ class acp_ban $banned_options .= '<option' . (($row['ban_exclude']) ? ' class="sep"' : '') . ' value="' . $row['ban_id'] . '">' . $row[$field] . '</option>'; $time_length = ($row['ban_end']) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0; - $ban_length[$row['ban_id']] = (isset($ban_end_text[$time_length])) ? $ban_end_text[$time_length] : $user->lang['UNTIL'] . ' -> ' . $user->format_date($row['ban_end']); + + if ($time_length == 0) + { + // Banned permanently + $ban_length[$row['ban_id']] = $user->lang['PERMANENT']; + } + else if (isset($ban_end_text[$time_length])) + { + // Banned for a given duration + $ban_length[$row['ban_id']] = sprintf($user->lang['BANNED_UNTIL_DURATION'], $ban_end_text[$time_length], $user->format_date($row['ban_end'], false, true)); + } + else + { + // Banned until given date + $ban_length[$row['ban_id']] = sprintf($user->lang['BANNED_UNTIL_DATE'], $user->format_date($row['ban_end'], false, true)); + } $ban_reasons[$row['ban_id']] = $row['ban_reason']; $ban_give_reasons[$row['ban_id']] = $row['ban_give_reason']; |