makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10087] Organize bans in acp_baninto optgroups

Browse source 
PHPBB3-10087
This commit is contained in:
Igor Wiedler 2011-11-11 23:05:57 +01:00
parent 86f8851c40
commit edd5866a6e
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
phpBB/includes/acp/acp_ban.php
View file

@ -175,12 +175,21 @@ class acp_ban
} }
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$banned_options = ''; $banned_options = $excluded_options = array();
$ban_length = $ban_reasons = $ban_give_reasons = array(); $ban_length = $ban_reasons = $ban_give_reasons = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$banned_options .= '<option' . (($row['ban_exclude']) ? ' class="sep"' : '') . ' value="' . $row['ban_id'] . '">' . $row[$field] . '</option>'; $option = '<option value="' . $row['ban_id'] . '">' . $row[$field] . '</option>';
if ($row['ban_exclude'])
{
$excluded_options[] = $option;
}
else
{
$banned_options[] = $option;
}
$time_length = ($row['ban_end']) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0; $time_length = ($row['ban_end']) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0;
@ -241,11 +250,26 @@ class acp_ban
} }
} }
$options = '';
if ($excluded_options)
{
$options .= '<optgroup label="' . $user->lang['OPTIONS_EXCLUDED'] . '">';
$options .= implode('', $excluded_options);
$options .= '</optgroup>';
}
if ($banned_options)
{
$options .= '<optgroup label="' . $user->lang['OPTIONS_BANNED'] . '">';
$options .= implode('', $banned_options);
$options .= '</optgroup>';
}
$template->assign_vars(array( $template->assign_vars(array(
'S_BAN_END_OPTIONS' => $ban_end_options, 'S_BAN_END_OPTIONS' => $ban_end_options,
'S_BANNED_OPTIONS' => ($banned_options) ? true : false, 'S_BANNED_OPTIONS' => ($banned_options || $excluded_options) ? true : false,
'BANNED_OPTIONS' => $banned_options) 'BANNED_OPTIONS' => $options,
); ));
} }
} }

3
phpBB/language/en/acp/ban.php
View file

@ -68,6 +68,9 @@ $lang = array_merge($lang, array(
'LENGTH_BAN_INVALID' => 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.', 'LENGTH_BAN_INVALID' => 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.',
'OPTIONS_BANNED' => 'Banned',
'OPTIONS_EXCLUDED' => 'Excluded',
'PERMANENT' => 'Permanent', 'PERMANENT' => 'Permanent',
'UNTIL' => 'Until', 'UNTIL' => 'Until',