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

Triggering Error messages in the ban function is not pretty. We'll continue to do it for now, though.

Browse source 
#10966


git-svn-id: file:///svn/phpbb/trunk@7591 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-05-15 17:03:50 +00:00
parent 0b94cfb702
commit 88f476be53
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/functions_user.php
View file

@ -657,7 +657,15 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
else else
{ {
$ban_other = explode('-', $ban_len_other); $ban_other = explode('-', $ban_len_other);
$ban_end = max($current_time, gmmktime(0, 0, 0, $ban_other[1], $ban_other[2], $ban_other[0])); if (sizeof($ban_other) == 3 && ((int)$ban_other[0] < 9999) &&
(strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2))
{
$ban_end = max($current_time, gmmktime(0, 0, 0, (int)$ban_other[1], (int)$ban_other[2], (int)$ban_other[0]));
}
else
{
trigger_error($user->lang['LENGTH_BAN_INVALID']);
}
} }
} }
else else

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

@ -59,6 +59,8 @@ $lang = array_merge($lang, array(
'IP_UNBAN' => 'Un-ban or un-exclude IPs', 'IP_UNBAN' => 'Un-ban or un-exclude IPs',
'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs are emphasised.', 'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs are emphasised.',
'LENGTH_BAN_INVALID' => 'The date has to be formated YYYY-MM-DD',
'PERMANENT' => 'Permanent', 'PERMANENT' => 'Permanent',
'UNTIL' => 'Until', 'UNTIL' => 'Until',
@ -68,6 +70,8 @@ $lang = array_merge($lang, array(
'USER_NO_BANNED' => 'No banned usernames', 'USER_NO_BANNED' => 'No banned usernames',
'USER_UNBAN' => 'Un-ban or un-exclude usernames', 'USER_UNBAN' => 'Un-ban or un-exclude usernames',
'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.', 'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.',
)); ));
?> ?>