diff --git a/inc/bans.php b/inc/bans.php index ed81c6e4..154094e5 100644 --- a/inc/bans.php +++ b/inc/bans.php @@ -148,49 +148,86 @@ class Bans { return $ban_list; } - - static public function list_all($offset = 0, $limit = 9001) { - $offset = (int)$offset; - $limit = (int)$limit; - + + static public function stream_json($out = false, $filter_ips = false, $filter_staff = false, $board_access = false) { $query = query("SELECT ``bans``.*, `username` FROM ``bans`` LEFT JOIN ``mods`` ON ``mods``.`id` = `creator` - ORDER BY `created` DESC LIMIT $offset, $limit") or error(db_error()); - $bans = $query->fetchAll(PDO::FETCH_ASSOC); - - foreach ($bans as &$ban) { - $ban['mask'] = self::range_to_string(array($ban['ipstart'], $ban['ipend'])); + ORDER BY `created` DESC") or error(db_error()); + $bans = $query->fetchAll(PDO::FETCH_ASSOC); + + if ($board_access && $board_access[0] == '*') $board_access = false; + + $out ? fputs($out, "[") : print("["); + + $end = end($bans); + + foreach ($bans as &$ban) { + $ban['mask'] = self::range_to_string(array($ban['ipstart'], $ban['ipend'])); + + if ($ban['post']) { + $post = json_decode($ban['post']); + $ban['message'] = $post->body; + } + unset($ban['ipstart'], $ban['ipend'], $ban['post'], $ban['creator']); + + if ($board_access === false || in_array ($ban['board'], $board_access)) { + $ban['access'] = true; + } + + if (filter_var($ban['mask'], FILTER_VALIDATE_IP) !== false) { + $ban['single_addr'] = true; + } + if ($filter_staff || ($board_access !== false && !in_array($ban['board'], $board_access))) { + $ban['username'] = '?'; + } + if ($filter_ips || ($board_access !== false && !in_array($ban['board'], $board_access))) { + list($ban['mask'], $subnet) = explode("/", $ban['mask']); + $ban['mask'] = preg_split("/[\.:]/", $ban['mask']); + $ban['mask'] = array_slice($ban['mask'], 0, 2); + $ban['mask'] = implode(".", $ban['mask']); + $ban['mask'] .= ".*"; + if (isset ($subnet)) { + $ban['mask'] .= "/$subnet"; + } + $ban['masked'] = true; + } + + $json = json_encode($ban); + $out ? fputs($out, $json) : print($json); + + if ($ban['id'] != $end['id']) { + $out ? fputs($out, ",") : print(","); + } } - - return $bans; - } - - static public function count($board = false) { - if (!$board) { - $query = prepare("SELECT COUNT(*) FROM ``bans``"); - } else { - $query = prepare("SELECT COUNT(*) FROM ``bans`` WHERE `board` = :board"); - } - $query->bindValue(':board', $board); - $query->execute() or error(db_error()); - return (int)$query->fetchColumn(); + + $out ? fputs($out, "]") : print("]"); + } static public function seen($ban_id) { $query = query("UPDATE ``bans`` SET `seen` = 1 WHERE `id` = " . (int)$ban_id) or error(db_error()); + rebuildThemes('bans'); } static public function purge() { $query = query("DELETE FROM ``bans`` WHERE `expires` IS NOT NULL AND `expires` < " . time() . " AND `seen` = 1") or error(db_error()); + rebuildThemes('bans'); } - static public function delete($ban_id, $modlog = false) { + static public function delete($ban_id, $modlog = false, $boards = false, $dont_rebuild = false) { + global $config; + + if ($boards && $boards[0] == '*') $boards = false; + if ($modlog) { $query = query("SELECT `ipstart`, `ipend` FROM ``bans`` WHERE `id` = " . (int)$ban_id) or error(db_error()); if (!$ban = $query->fetch(PDO::FETCH_ASSOC)) { // Ban doesn't exist return false; } + + if ($boards !== false && !in_array($ban['board'], $boards)) + error($config['error']['noaccess']); $mask = self::range_to_string(array($ban['ipstart'], $ban['ipend'])); @@ -199,6 +236,8 @@ class Bans { } query("DELETE FROM ``bans`` WHERE `id` = " . (int)$ban_id) or error(db_error()); + + if (!$dont_rebuild) rebuildThemes('bans'); return true; } @@ -265,6 +304,9 @@ class Bans { ' (#' . $pdo->lastInsertId() . ')' . ' with ' . ($reason ? 'reason: ' . utf8tohtml($reason) . '' : 'no reason')); } + + rebuildThemes('bans'); + return $pdo->lastInsertId(); } } diff --git a/inc/mod/pages.php b/inc/mod/pages.php index ab2fb2d3..c7722763 100644 --- a/inc/mod/pages.php +++ b/inc/mod/pages.php @@ -766,7 +766,7 @@ function mod_page_ip($ip) { if (!hasPermission($config['mod']['unban'])) error($config['error']['noaccess']); - Bans::delete($_POST['ban_id'], true); + Bans::delete($_POST['ban_id'], true, $mod['boards']); header('Location: ?/IP/' . $ip . '#bans', true, $config['redirect_http']); return; @@ -863,18 +863,16 @@ function mod_ban() { require_once 'inc/mod/ban.php'; Bans::new_ban($_POST['ip'], $_POST['reason'], $_POST['length'], $_POST['board'] == '*' ? false : $_POST['board']); - + if (isset($_POST['redirect'])) header('Location: ' . $_POST['redirect'], true, $config['redirect_http']); else header('Location: ?/', true, $config['redirect_http']); } -function mod_bans($page_no = 1) { +function mod_bans() { global $config; - - if ($page_no < 1) - error($config['error']['404']); + global $mod; if (!hasPermission($config['mod']['view_banlist'])) error($config['error']['noaccess']); @@ -892,29 +890,33 @@ function mod_bans($page_no = 1) { error(sprintf($config['error']['toomanyunban'], $config['mod']['unban_limit'], count($unban))); foreach ($unban as $id) { - Bans::delete($id, true); + Bans::delete($id, true, $mod['boards'], true); } + rebuildThemes('bans'); header('Location: ?/bans', true, $config['redirect_http']); return; } - $bans = Bans::list_all(($page_no - 1) * $config['mod']['banlist_page'], $config['mod']['banlist_page']); - - if (empty($bans) && $page_no > 1) - error($config['error']['404']); - - foreach ($bans as &$ban) { - if (filter_var($ban['mask'], FILTER_VALIDATE_IP) !== false) - $ban['single_addr'] = true; - } - mod_page(_('Ban list'), 'mod/ban_list.html', array( - 'bans' => $bans, - 'count' => Bans::count(), - 'token' => make_secure_link_token('bans') + 'mod' => $mod, + 'boards' => json_encode($mod['boards']), + 'token' => make_secure_link_token('bans'), + 'token_json' => make_secure_link_token('bans.json') )); } +function mod_bans_json() { + global $config, $mod; + + if (!hasPermission($config['mod']['ban'])) + error($config['error']['noaccess']); + + // Compress the json for faster loads + if (substr_count($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')) ob_start("ob_gzhandler"); + + Bans::stream_json(false, false, !hasPermission($config['mod']['view_banstaff']), $mod['boards']); +} + function mod_ban_appeals() { global $config, $board; diff --git a/js/local-time.js b/js/local-time.js index e6b3495d..a4e25d6d 100644 --- a/js/local-time.js +++ b/js/local-time.js @@ -25,16 +25,6 @@ onready(function(){ return [Math.pow(10, count - num.toString().length), num].join('').substr(1); }; - var datelocale = - { days: [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')] - , shortDays: [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat")] - , months: [_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July'), _('August'), _('September'), _('October'), _('November'), _('December')] - , shortMonths: [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')] - , AM: _('AM') - , PM: _('PM') - , am: _('am') - , pm: _('pm') - }; var dateformat = (typeof strftime === 'undefined') ? function(t) { return zeropad(t.getMonth() + 1, 2) + "/" + zeropad(t.getDate(), 2) + "/" + t.getFullYear().toString().substring(2) + " (" + [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun")][t.getDay()] + ") " + diff --git a/js/mod/ban-list.js b/js/mod/ban-list.js new file mode 100644 index 00000000..30529044 --- /dev/null +++ b/js/mod/ban-list.js @@ -0,0 +1,157 @@ +var banlist_init = function(token, my_boards, inMod) { + inMod = !inMod; + + var lt; + + var selected = {}; + + var time = function() { return Date.now()/1000|0; } + + $.getJSON(inMod ? ("?/bans.json/"+token) : token, function(t) { + $("#banlist").on("new-row", function(e, drow, el) { + var sel = selected[drow.id]; + if (sel) { + $(el).find('input.unban').prop("checked", true); + } + $(el).find('input.unban').on("click", function() { + selected[drow.id] = $(this).prop("checked"); + }); + + + if (drow.expires && drow.expires != 0 && drow.expires < time()) { + $(el).find("td").css("text-decoration", "line-through"); + } + }); + + var selall = ""; + + lt = $("#banlist").longtable({ + mask: {name: selall+_("IP address"), width: "220px", fmt: function(f) { + var pre = ""; + if (inMod && f.access) { + pre = ""; + } + + if (inMod && f.single_addr && !f.masked) { + return pre+""+f.mask+""; + } + return pre+f.mask; + } }, + reason: {name: _("Reason"), width: "calc(100% - 715px - 6 * 4px)", fmt: function(f) { + var add = "", suf = ''; + if (f.seen == 1) add += ""; + if (f.message) { + add += ""; + suf = "

"+_("Message:")+"
"+f.message; + } + + if (add) { add = "
"+add+"
"; } + + if (f.reason) return add + f.reason + suf; + else return add + "-" + suf; + } }, + board: {name: _("Board"), width: "60px", fmt: function(f) { + if (f.board) return "/"+f.board+"/"; + else return ""+_("all")+""; + } }, + created: {name: _("Set"), width: "100px", fmt: function(f) { + return ago(f.created) + _(" ago"); // in AGO form + } }, + // duration? + expires: {name: _("Expires"), width: "235px", fmt: function(f) { + if (!f.expires || f.expires == 0) return ""+_("never")+""; + return strftime(window.post_date, new Date((f.expires|0)*1000), datelocale) + + ((f.expires < time()) ? "" : " "+_("in ")+until(f.expires|0)+""); + } }, + username: {name: _("Staff"), width: "100px", fmt: function(f) { + var pre='',suf='',un=f.username; + if (inMod && f.username && f.username != '?') { + pre = ""; + suf = ""; + } + if (!f.username) { + un = ""+_("system")+""; + } + return pre + un + suf; + } } + }, {}, t); + + $("#select-all").click(function(e) { + var $this = $(this); + $("input.unban").prop("checked", $this.prop("checked")); + lt.get_data().forEach(function(v) { v.access && (selected[v.id] = $this.prop("checked")); }); + e.stopPropagation(); + }); + + var filter = function(e) { + if ($("#only_mine").prop("checked") && ($.inArray(e.board, my_boards) === -1)) return false; + if ($("#only_not_expired").prop("checked") && e.expires && e.expires != 0 && e.expires < time()) return false; + if ($("#search").val()) { + var terms = $("#search").val().split(" "); + + var fields = ["mask", "reason", "board", "staff", "message"]; + + var ret_false = false; + terms.forEach(function(t) { + var fs = fields; + + var re = /^(mask|reason|board|staff|message):/, ma; + if (ma = t.match(re)) { + fs = [ma[1]]; + t = t.replace(re, ""); + } + + var found = false + fs.forEach(function(f) { + if (e[f] && e[f].indexOf(t) !== -1) { + found = true; + } + }); + if (!found) ret_false = true; + }); + + if (ret_false) return false; + } + + return true; + }; + + $("#only_mine, #only_not_expired, #search").on("click input", function() { + lt.set_filter(filter); + }); + lt.set_filter(filter); + + $(".banform").on("submit", function() { return false; }); + + $("#unban").on("click", function() { + $(".banform .hiddens").remove(); + $("").appendTo(".banform"); + + $.each(selected, function(e) { + $("").appendTo(".banform"); + }); + + $(".banform").off("submit").submit(); + }); + + if (device_type == 'desktop') { + // Stick topbar + var stick_on = $(".banlist-opts").offset().top; + var state = true; + $(window).on("scroll resize", function() { + if ($(window).scrollTop() > stick_on && state == true) { + $("body").css("margin-top", $(".banlist-opts").height()); + $(".banlist-opts").addClass("boardlist top").detach().prependTo("body"); + $("#banlist tr:not(.row)").addClass("tblhead").detach().appendTo(".banlist-opts"); + state = !state; + } + else if ($(window).scrollTop() < stick_on && state == false) { + $("body").css("margin-top", "auto"); + $(".banlist-opts").removeClass("boardlist top").detach().prependTo(".banform"); + $(".tblhead").detach().prependTo("#banlist"); + state = !state; + } + }); + } + }); +} diff --git a/mod.php b/mod.php index 5428e84d..384eec88 100644 --- a/mod.php +++ b/mod.php @@ -62,7 +62,7 @@ $pages = array( '/ban' => 'secure_POST ban', // new ban '/bans' => 'secure_POST bans', // ban list - '/bans/(\d+)' => 'secure_POST bans', // ban list + '/bans.json' => 'secure bans_json', // ban list JSON '/ban-appeals' => 'secure_POST ban_appeals', // view ban appeals '/recent/(\d+)' => 'recent_posts', // view recent posts diff --git a/templates/main.js b/templates/main.js index 52f38e69..ed25f7d9 100644 --- a/templates/main.js +++ b/templates/main.js @@ -22,6 +22,53 @@ function fmt(s,a) { return s.replace(/\{([0-9]+)\}/g, function(x) { return a[x[1]]; }); } +function until($timestamp) { + var $difference = $timestamp - Date.now()/1000|0, $num; + switch(true){ + case ($difference < 60): + return "" + $difference + ' ' + _('second(s)'); + case ($difference < 3600): //60*60 = 3600 + return "" + ($num = Math.round($difference/(60))) + ' ' + _('minute(s)'); + case ($difference < 86400): //60*60*24 = 86400 + return "" + ($num = Math.round($difference/(3600))) + ' ' + _('hour(s)'); + case ($difference < 604800): //60*60*24*7 = 604800 + return "" + ($num = Math.round($difference/(86400))) + ' ' + _('day(s)'); + case ($difference < 31536000): //60*60*24*365 = 31536000 + return "" + ($num = Math.round($difference/(604800))) + ' ' + _('week(s)'); + default: + return "" + ($num = Math.round($difference/(31536000))) + ' ' + _('year(s)'); + } +} + +function ago($timestamp) { + var $difference = (Date.now()/1000|0) - $timestamp, $num; + switch(true){ + case ($difference < 60) : + return "" + $difference + ' ' + _('second(s)'); + case ($difference < 3600): //60*60 = 3600 + return "" + ($num = Math.round($difference/(60))) + ' ' + _('minute(s)'); + case ($difference < 86400): //60*60*24 = 86400 + return "" + ($num = Math.round($difference/(3600))) + ' ' + _('hour(s)'); + case ($difference < 604800): //60*60*24*7 = 604800 + return "" + ($num = Math.round($difference/(86400))) + ' ' + _('day(s)'); + case ($difference < 31536000): //60*60*24*365 = 31536000 + return "" + ($num = Math.round($difference/(604800))) + ' ' + _('week(s)'); + default: + return "" + ($num = Math.round($difference/(31536000))) + ' ' + _('year(s)'); + } +} + +var datelocale = + { days: [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')] + , shortDays: [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat")] + , months: [_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July'), _('August'), _('September'), _('October'), _('November'), _('December')] + , shortMonths: [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')] + , AM: _('AM') + , PM: _('PM') + , am: _('am') + , pm: _('pm') + }; + var saved = {}; diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html index 97c02029..0c67f269 100644 --- a/templates/mod/ban_list.html +++ b/templates/mod/ban_list.html @@ -1,104 +1,41 @@ -{% if bans|count == 0 %} -

({% trans 'There are no active bans.' %})

-{% else %} -
- - - - - - - - - - - - - {% for ban in bans %} - - - - - - - - - - - {% endfor %} + + + + + + + + + + + {% if token %} + + {% endif %} +
+
+ {% if mod and mod.boards[0] != '*' %} + + {% endif %} + +
+
+ + {% if mod %} + + {% endif %} +
+ +
+
+ +
{% trans 'IP address/mask' %}{% trans 'Reason' %}{% trans 'Board' %}{% trans 'Set' %}{% trans 'Duration' %}{% trans 'Expires' %}{% trans 'Seen' %}{% trans 'Staff' %}
- - {% if ban.single_addr %} - {{ ban.mask }} - {% else %} - {{ ban.mask }} - {% endif %} - - {% if ban.reason %} - {{ ban.reason }} - {% else %} - - - {% endif %} - - {% if ban.board %} - {{ config.board_abbreviation|sprintf(ban.board) }} - {% else %} - {% trans 'all boards' %} - {% endif %} - - - {{ ban.created|ago }} ago - - - {% if ban.expires == 0 %} - - - {% else %} - {{ (ban.expires - ban.created + time()) | until }} - {% endif %} - - {% if ban.expires == 0 %} - {% trans 'never' %} - {% else %} - {{ ban.expires|date(config.post_date) }} - {% if ban.expires > time() %} - (in {{ ban.expires|until }}) - {% endif %} - {% endif %} - - {% if ban.seen %} - {% trans 'Yes' %} - {% else %} - {% trans 'No' %} - {% endif %} - - {% if ban.username %} - {% if mod|hasPermission(config.mod.view_banstaff) %} - {{ ban.username|e }} - {% else %} - {% if mod|hasPermission(config.mod.view_banquestionmark) %} - ? - {% else %} - - {% endif %} - {% endif %} - {% elseif ban.creator == -1 %} - system - {% else %} - {% trans 'deleted?' %} - {% endif %} -
+ + -

- -

+{% if token_json %} + +{% else %} + {% endif %} - -{% if count > bans|count %} -

- {% for i in range(0, (count - 1) / config.mod.modlog_page) %} - [{{ i + 1 }}] - {% endfor %} -

-{% endif %} - diff --git a/templates/themes/public_banlist/info.php b/templates/themes/public_banlist/info.php new file mode 100644 index 00000000..006ac38e --- /dev/null +++ b/templates/themes/public_banlist/info.php @@ -0,0 +1,33 @@ + 'JSON feed file', + 'name' => 'file_json', + 'type' => 'text', + 'default' => 'bans.json', + 'comment' => '(eg. "bans.json")' + ); + + $theme['config'][] = Array( + 'title' => 'Main HTML file', + 'name' => 'file_bans', + 'type' => 'text', + 'default' => 'bans.html', + 'comment' => '(eg. "bans.html")' + ); + + // Unique function name for building everything + $theme['build_function'] = 'pbanlist_build'; +?> diff --git a/templates/themes/public_banlist/theme.php b/templates/themes/public_banlist/theme.php new file mode 100644 index 00000000..b64b8d9e --- /dev/null +++ b/templates/themes/public_banlist/theme.php @@ -0,0 +1,56 @@ + $config, + 'mod' => false, + 'hide_dashboard_link' => true, + 'title' => _("Ban list"), + 'subtitle' => "", + 'nojavascript' => true, + 'body' => Element('mod/ban_list.html', array( + 'mod' => false, + 'boards' => "[]", + 'token' => false, + 'token_json' => false, + 'uri_json' => $config['dir']['home'] . $settings['file_json'], + )) + )); + } + }; + +?> diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php index b2624ed7..058fc77b 100644 --- a/templates/themes/ukko/theme.php +++ b/templates/themes/ukko/theme.php @@ -4,7 +4,11 @@ function ukko_build($action, $settings) { $ukko = new ukko(); $ukko->settings = $settings; - + + if (! ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')) { + return; + } + file_write($settings['uri'] . '/index.html', $ukko->build()); file_write($settings['uri'] . '/ukko.js', Element('themes/ukko/ukko.js', array())); }