diff --git a/upload/admin_bans.php b/upload/admin_bans.php
index 9a1fdc8..2583d38 100644
--- a/upload/admin_bans.php
+++ b/upload/admin_bans.php
@@ -1,27 +1,10 @@
num_rows($result))
list($group_id, $ban_user, $ban_email) = $db->fetch_row($result);
else
- message('No user by that ID registered.');
+ message($lang_admin_bans['No user ID message']);
}
- else // Otherwise the username is in POST
+ else // Otherwise the username is in POST
{
- $ban_user = trim($_POST['new_ban_user']);
+ $ban_user = pun_trim($_POST['new_ban_user']);
if ($ban_user != '')
{
@@ -64,13 +50,13 @@ if (isset($_REQUEST['add_ban']) || isset($_GET['edit_ban']))
if ($db->num_rows($result))
list($user_id, $group_id, $ban_user, $ban_email) = $db->fetch_row($result);
else
- message('No user by that username registered. If you want to add a ban not tied to a specific username just leave the username blank.');
+ message($lang_admin_bans['No user message']);
}
}
// Make sure we're not banning an admin
if (isset($group_id) && $group_id == PUN_ADMIN)
- message('The user '.pun_htmlspecialchars($ban_user).' is an administrator and can\'t be banned. If you want to ban an administrator, you must first demote him/her to moderator or user.');
+ message(sprintf($lang_admin_bans['User is admin message'], pun_htmlspecialchars($ban_user)));
// If we have a $user_id, we can try to find the last known IP of that user
if (isset($user_id))
@@ -81,7 +67,7 @@ if (isset($_REQUEST['add_ban']) || isset($_GET['edit_ban']))
$mode = 'add';
}
- else // We are editing a ban
+ else // We are editing a ban
{
$ban_id = intval($_GET['edit_ban']);
if ($ban_id < 1)
@@ -98,75 +84,75 @@ if (isset($_REQUEST['add_ban']) || isset($_GET['edit_ban']))
$mode = 'edit';
}
- $page_title = pun_htmlspecialchars($pun_config['o_board_title']).' / Admin / Bans';
+ $page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans']);
$focus_element = array('bans2', 'ban_user');
+ define('PUN_ACTIVE_PAGE', 'admin');
require PUN_ROOT.'header.php';
generate_admin_menu('bans');
-
?>
-
Ban advanced settings
+
@@ -177,33 +163,32 @@ if (isset($_REQUEST['add_ban']) || isset($_GET['edit_ban']))
require PUN_ROOT.'footer.php';
}
-
// Add/edit a ban (stage 2)
else if (isset($_POST['add_edit_ban']))
{
confirm_referrer('admin_bans.php');
- $ban_user = trim($_POST['ban_user']);
+ $ban_user = pun_trim($_POST['ban_user']);
$ban_ip = trim($_POST['ban_ip']);
$ban_email = strtolower(trim($_POST['ban_email']));
- $ban_message = trim($_POST['ban_message']);
+ $ban_message = pun_trim($_POST['ban_message']);
$ban_expire = trim($_POST['ban_expire']);
if ($ban_user == '' && $ban_ip == '' && $ban_email == '')
- message('You must enter either a username, an IP address or an e-mail address (at least).');
+ message($lang_admin_bans['Must enter message']);
else if (strtolower($ban_user) == 'guest')
- message('The guest user cannot be banned.');
+ message($lang_admin_bans['Cannot ban guest message']);
// Validate IP/IP range (it's overkill, I know)
if ($ban_ip != '')
{
- $ban_ip = preg_replace('/[\s]{2,}/', ' ', $ban_ip);
+ $ban_ip = preg_replace('/\s{2,}/S', ' ', $ban_ip);
$addresses = explode(' ', $ban_ip);
- $addresses = array_map('trim', $addresses);
+ $addresses = array_map('pun_trim', $addresses);
for ($i = 0; $i < count($addresses); ++$i)
{
- if (strpos($addresses[$i], ':') !== false)
+ if (strpos($addresses[$i], ':') !== false)
{
$octets = explode(':', $addresses[$i]);
@@ -212,7 +197,7 @@ else if (isset($_POST['add_edit_ban']))
$octets[$c] = ltrim($octets[$c], "0");
if ($c > 7 || (!empty($octets[$c]) && !ctype_xdigit($octets[$c])) || intval($octets[$c], 16) > 65535)
- message('You entered an invalid IP/IP-range.');
+ message($lang_admin_bans['Invalid IP message']);
}
$cur_address = implode(':', $octets);
@@ -227,7 +212,7 @@ else if (isset($_POST['add_edit_ban']))
$octets[$c] = (strlen($octets[$c]) > 1) ? ltrim($octets[$c], "0") : $octets[$c];
if ($c > 3 || preg_match('/[^0-9]/', $octets[$c]) || intval($octets[$c]) > 255)
- message('You entered an invalid IP/IP-range.');
+ message($lang_admin_bans['Invalid IP message']);
}
$cur_address = implode('.', $octets);
@@ -242,7 +227,7 @@ else if (isset($_POST['add_edit_ban']))
if ($ban_email != '' && !is_valid_email($ban_email))
{
if (!preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/', $ban_email))
- message('The e-mail address (e.g. user@domain.com) or partial e-mail address domain (e.g. domain.com) you entered is invalid.');
+ message($lang_admin_bans['Invalid e-mail message']);
}
if ($ban_expire != '' && $ban_expire != 'Never')
@@ -250,7 +235,7 @@ else if (isset($_POST['add_edit_ban']))
$ban_expire = strtotime($ban_expire);
if ($ban_expire == -1 || $ban_expire <= time())
- message('You entered an invalid expire date. The format should be YYYY-MM-DD and the date must be at least one day in the future.');
+ message($lang_admin_bans['Invalid date message'].' '.$lang_admin_bans['Invalid date reasons']);
}
else
$ban_expire = 'NULL';
@@ -271,10 +256,12 @@ else if (isset($_POST['add_edit_ban']))
generate_bans_cache();
- redirect('admin_bans.php', 'Ban '.(($_POST['mode'] == 'edit') ? 'edited' : 'added').'. Redirecting …');
+ if ($_POST['mode'] == 'edit')
+ redirect('admin_bans.php', $lang_admin_bans['Ban edited redirect']);
+ else
+ redirect('admin_bans.php', $lang_admin_bans['Ban added redirect']);
}
-
// Remove a ban
else if (isset($_GET['del_ban']))
{
@@ -292,31 +279,179 @@ else if (isset($_GET['del_ban']))
generate_bans_cache();
- redirect('admin_bans.php', 'Ban removed. Redirecting …');
+ redirect('admin_bans.php', $lang_admin_bans['Ban removed redirect']);
}
+// Find bans
+else if (isset($_GET['find_ban']))
+{
+ $form = isset($_GET['form']) ? $_GET['form'] : array();
+
+ // trim() all elements in $form
+ $form = array_map('pun_trim', $form);
+ $conditions = $query_str = array();
+
+ $expire_after = isset($_GET['expire_after']) ? trim($_GET['expire_after']) : '';
+ $expire_before = isset($_GET['expire_before']) ? trim($_GET['expire_before']) : '';
+ $order_by = isset($_GET['order_by']) && in_array($_GET['order_by'], array('username', 'ip', 'email', 'expire')) ? $_GET['order_by'] : 'username';
+ $direction = isset($_GET['direction']) && $_GET['direction'] == 'DESC' ? 'DESC' : 'ASC';
+
+ $query_str[] = 'order_by='.$order_by;
+ $query_str[] = 'direction='.$direction;
+
+ // Try to convert date/time to timestamps
+ if ($expire_after != '')
+ {
+ $query_str[] = 'expire_after='.$expire_after;
+
+ $expire_after = strtotime($expire_after);
+ if ($expire_after === false || $expire_after == -1)
+ message($lang_admin_bans['Invalid date message']);
+
+ $conditions[] = 'expire>'.$expire_after;
+ }
+ if ($expire_before != '')
+ {
+ $query_str[] = 'expire_before='.$expire_before;
+
+ $expire_before = strtotime($expire_before);
+ if ($expire_before === false || $expire_before == -1)
+ message($lang_admin_bans['Invalid date message']);
+
+ $conditions[] = 'expire<'.$expire_before;
+ }
+
+ $like_command = ($db_type == 'pgsql') ? 'ILIKE' : 'LIKE';
+ while (list($key, $input) = @each($form))
+ {
+ if ($input != '' && in_array($key, array('username', 'ip', 'email', 'message')))
+ {
+ $conditions[] = 'b.'.$db->escape($key).' '.$like_command.' \''.$db->escape(str_replace('*', '%', $input)).'\'';
+ $query_str[] = 'form%5B'.$key.'%5D='.urlencode($input);
+ }
+ }
+
+ // Fetch ban count
+ $result = $db->query('SELECT COUNT(id) FROM '.$db->prefix.'bans as b WHERE b.id>0'.(!empty($conditions) ? ' AND '.implode(' AND ', $conditions) : '')) or error('Unable to fetch ban list', __FILE__, __LINE__, $db->error());
+ $num_bans = $db->result($result);
+
+ // Determine the ban offset (based on $_GET['p'])
+ $num_pages = ceil($num_bans / 50);
+
+ $p = (!isset($_GET['p']) || $_GET['p'] <= 1 || $_GET['p'] > $num_pages) ? 1 : intval($_GET['p']);
+ $start_from = 50 * ($p - 1);
+
+ // Generate paging links
+ $paging_links = ''.$lang_common['Pages'].' '.paginate($num_pages, $p, 'admin_bans.php?find_ban=&'.implode('&', $query_str));
+
+ $page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans'], $lang_admin_bans['Results head']);
+ define('PUN_ACTIVE_PAGE', 'admin');
+ require PUN_ROOT.'header.php';
+
+?>
+
+
+
+
+
»
+
»
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+query('SELECT b.id, b.username, b.ip, b.email, b.message, b.expire, b.ban_creator, u.username AS ban_creator_username FROM '.$db->prefix.'bans AS b LEFT JOIN '.$db->prefix.'users AS u ON b.ban_creator=u.id WHERE b.id>0'.(!empty($conditions) ? ' AND '.implode(' AND ', $conditions) : '').' ORDER BY '.$db->escape($order_by).' '.$db->escape($direction).' LIMIT '.$start_from.', 50') or error('Unable to fetch ban list', __FILE__, __LINE__, $db->error());
+ if ($db->num_rows($result))
+ {
+ while ($ban_data = $db->fetch_assoc($result))
+ {
+
+ $actions = ''.$lang_admin_common['Edit'].' | '.$lang_admin_common['Remove'].'';
+ $expire = format_time($ban_data['expire'], true);
-$page_title = pun_htmlspecialchars($pun_config['o_board_title']).' / Admin / Bans';
+?>
+