From 98ef473a9af966198fe59b0ea96d5ac152805bc1 Mon Sep 17 00:00:00 2001
From: Zankaria
Date: Tue, 26 Mar 2024 15:00:15 +0100
Subject: [PATCH 1/3] functions.php: trim
---
inc/functions.php | 130 +++++++++++++++++++++++-----------------------
1 file changed, 65 insertions(+), 65 deletions(-)
diff --git a/inc/functions.php b/inc/functions.php
index 0c45591e..2ac3b3c8 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -57,7 +57,7 @@ function loadConfig() {
require_once('tmp/cache/cache_config.php');
}
- if (isset($config['cache_config']) &&
+ if (isset($config['cache_config']) &&
$config['cache_config'] &&
$config = Cache::get('config_' . $boardsuffix ) ) {
$events = Cache::get('events_' . $boardsuffix );
@@ -76,7 +76,7 @@ function loadConfig() {
else {
$config = array();
- reset_events();
+ reset_events();
$arrays = array(
'db',
@@ -309,7 +309,7 @@ function loadConfig() {
else if (is_callable($config['anonymous'])){
$config['anonymous'] = $config['anonymous']($boardsuffix);
}
-
+
if ($config['debug']) {
if (!isset($debug)) {
$debug = array(
@@ -350,7 +350,7 @@ function define_groups() {
define($group_name, $group_value);
}
}
-
+
ksort($config['mod']['groups']);
}
@@ -388,7 +388,7 @@ function rebuildThemes($action, $boardname = false) {
$config = $_config;
$board = $_board;
- // Reload the locale
+ // Reload the locale
if ($config['locale'] != $current_locale) {
$current_locale = $config['locale'];
init_locale($config['locale']);
@@ -409,7 +409,7 @@ function rebuildThemes($action, $boardname = false) {
$config = $_config;
$board = $_board;
- // Reload the locale
+ // Reload the locale
if ($config['locale'] != $current_locale) {
$current_locale = $config['locale'];
init_locale($config['locale']);
@@ -561,7 +561,7 @@ function purge($uri) {
global $config, $debug;
// Fix for Unicode
- $uri = rawurlencode($uri);
+ $uri = rawurlencode($uri);
$noescape = "/!~*()+:";
$noescape = preg_split('//', $noescape);
@@ -757,7 +757,7 @@ function listBoards($just_uri = false) {
$boards[] = $board;
}
}
-
+
if ($config['cache']['enabled'])
cache::set($cache_name, $boards);
@@ -823,10 +823,10 @@ function displayBan($ban) {
$post = new Thread($ban['post'], null, false, false);
}
}
-
+
$denied_appeals = array();
$pending_appeal = false;
-
+
if ($config['ban_appeals']) {
$query = query("SELECT `time`, `denied` FROM ``ban_appeals`` WHERE `ban_id` = " . (int)$ban['id']) or error(db_error());
while ($ban_appeal = $query->fetch(PDO::FETCH_ASSOC)) {
@@ -837,7 +837,7 @@ function displayBan($ban) {
}
}
}
-
+
// Show banned page and exit
die(
Element('page.html', array(
@@ -862,7 +862,7 @@ function checkBan($board = false) {
if (!isset($_SERVER['REMOTE_ADDR'])) {
// Server misconfiguration
return;
- }
+ }
if (event('check-ban', $board))
return true;
@@ -877,7 +877,7 @@ function checkBan($board = false) {
foreach ($ips as $ip) {
$bans = Bans::find($_SERVER['REMOTE_ADDR'], $board, $config['show_modname']);
-
+
foreach ($bans as &$ban) {
if ($ban['expires'] && $ban['expires'] < time()) {
Bans::delete($ban['id']);
@@ -906,9 +906,9 @@ function checkBan($board = false) {
if (time() - $last_time_purged < $config['purge_bans'] )
return;
}
-
+
Bans::purge();
-
+
if ($config['cache']['enabled'])
cache::set('purged_bans_last', time());
}
@@ -965,7 +965,7 @@ function threadExists($id) {
function insertFloodPost(array $post) {
global $board;
-
+
$query = prepare("INSERT INTO ``flood`` VALUES (NULL, :ip, :board, :time, :posthash, :filehash, :isreply)");
$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
$query->bindValue(':board', $board['uri']);
@@ -1006,7 +1006,7 @@ function post(array $post) {
$query->bindValue(':body', $post['body']);
$query->bindValue(':body_nomarkup', $post['body_nomarkup']);
$query->bindValue(':time', isset($post['time']) ? $post['time'] : time(), PDO::PARAM_INT);
- $query->bindValue(':password', $post['password']);
+ $query->bindValue(':password', $post['password']);
$query->bindValue(':ip', isset($post['ip']) ? $post['ip'] : $_SERVER['REMOTE_ADDR']);
if ($post['op'] && $post['mod'] && isset($post['sticky']) && $post['sticky']) {
@@ -1186,7 +1186,7 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
// Delete posts and maybe replies
while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
event('delete', $post);
-
+
$thread_id = $post['thread'];
if (!$post['thread']) {
// Delete thread HTML page
@@ -1287,7 +1287,7 @@ function clean($pid = false) {
$query = prepare(sprintf("SELECT `id` AS `thread_id`, (SELECT COUNT(`id`) FROM ``posts_%s`` WHERE `thread` = `thread_id`) AS `reply_count` FROM ``posts_%s`` WHERE `thread` IS NULL ORDER BY `sticky` DESC, `bump` DESC LIMIT :offset, 9001", $board['uri'], $board['uri']));
$query->bindValue(':offset', $offset, PDO::PARAM_INT);
$query->execute() or error(db_error($query));
-
+
while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
if ($post['reply_count'] < $config['early_404_replies']) {
deletePost($post['thread_id'], false, false);
@@ -1326,7 +1326,7 @@ function index($page, $mod=false, $brief = false) {
return false;
$threads = array();
-
+
while ($th = $query->fetch(PDO::FETCH_ASSOC)) {
$thread = new Thread($th, $mod ? '?/' : $config['root'], $mod);
@@ -1377,7 +1377,7 @@ function index($page, $mod=false, $brief = false) {
$thread->omitted = $omitted['post_count'] - ($th['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']);
$thread->omitted_images = $omitted['image_count'] - $num_images;
}
-
+
$threads[] = $thread;
if (!$brief) {
@@ -1594,7 +1594,7 @@ function checkMute() {
// Not expired yet
error(sprintf($config['error']['youaremuted'], $mute['time'] + $mutetime - time()));
} else {
- // Already expired
+ // Already expired
return;
}
}
@@ -1883,8 +1883,8 @@ function wordfilters(&$body) {
foreach ($config['wordfilters'] as $filter) {
if (isset($filter[3]) && $filter[3]) {
- $refilter = $filter[0];
- if (strncmp($filter[0], "/", 1) !== 0)
+ $refilter = $filter[0];
+ if (strncmp($filter[0], "/", 1) !== 0)
{
$refilter = "/.*" . $filter[0] . "/";
}
@@ -1895,8 +1895,8 @@ function wordfilters(&$body) {
return $match;
} else {
if (isset($filter[2]) && $filter[2]) {
- $refilter = $filter[0];
- if (strncmp($filter[0], "/", 1) !== 0)
+ $refilter = $filter[0];
+ if (strncmp($filter[0], "/", 1) !== 0)
{
$refilter = "/.*" . $filter[0] . "/";
}
@@ -1912,7 +1912,7 @@ function wordfilters(&$body) {
}
}
, $body);
- } else {
+ } else {
if (isset($filter[2]) && $filter[2]) {
if (is_callable($filter[1]))
$body = preg_replace_callback($filter[0], $filter[1], $body);
@@ -1958,7 +1958,7 @@ function markup_url($matches) {
'rel' => 'nofollow',
'target' => '_blank',
);
-
+
event('markup-url', $link);
$link = (array)$link;
@@ -1993,7 +1993,7 @@ function newline_to_full_stop($body) {
function extract_modifiers($body) {
$modifiers = array();
-
+
if (preg_match_all('@(.*?)@us', $body, $matches, PREG_SET_ORDER)) {
foreach ($matches as $match) {
if (preg_match('/^escape /', $match[1]))
@@ -2001,7 +2001,7 @@ function extract_modifiers($body) {
$modifiers[$match[1]] = html_entity_decode($match[2]);
}
}
-
+
return $modifiers;
}
@@ -2024,10 +2024,10 @@ function markup(&$body, $track_cites = false, $op = false) {
global $board, $config, $markup_urls;
$modifiers = extract_modifiers($body);
-
+
$body = preg_replace('@(.+?)@us', '', $body);
$body = preg_replace('@<(tinyboard) escape ([\w\s]+)>@i', '<$1 $2>', $body);
-
+
if (isset($modifiers['raw html']) && $modifiers['raw html'] == '1') {
return array();
}
@@ -2069,7 +2069,7 @@ function markup(&$body, $track_cites = false, $op = false) {
error($config['error']['toomanylinks']);
}
}
-
+
if ($config['markup_repair_tidy'])
$body = str_replace(' ', ' ', $body);
@@ -2093,21 +2093,21 @@ function markup(&$body, $track_cites = false, $op = false) {
$skip_chars = 0;
$body_tmp = $body;
-
+
$search_cites = array();
foreach ($cites as $matches) {
$search_cites[] = '`id` = ' . $matches[2][0];
}
$search_cites = array_unique($search_cites);
-
+
$query = query(sprintf('SELECT `thread`, `id` FROM ``posts_%s`` WHERE ' .
implode(' OR ', $search_cites), $board['uri'])) or error(db_error());
-
+
$cited_posts = array();
while ($cited = $query->fetch(PDO::FETCH_ASSOC)) {
$cited_posts[$cited['id']] = $cited['thread'] ? $cited['thread'] : false;
}
-
+
foreach ($cites as $matches) {
$cite = $matches[2][0];
@@ -2140,34 +2140,34 @@ function markup(&$body, $track_cites = false, $op = false) {
$skip_chars = 0;
$body_tmp = $body;
-
+
if (isset($cited_posts)) {
// Carry found posts from local board >>X links
foreach ($cited_posts as $cite => $thread) {
$cited_posts[$cite] = $config['root'] . $board['dir'] . $config['dir']['res'] .
($thread ? $thread : $cite) . '.html#' . $cite;
}
-
+
$cited_posts = array(
$board['uri'] => $cited_posts
);
} else
$cited_posts = array();
-
+
$crossboard_indexes = array();
$search_cites_boards = array();
-
+
foreach ($cites as $matches) {
$_board = $matches[2][0];
$cite = @$matches[3][0];
-
+
if (!isset($search_cites_boards[$_board]))
$search_cites_boards[$_board] = array();
$search_cites_boards[$_board][] = $cite;
}
-
+
$tmp_board = $board['uri'];
-
+
foreach ($search_cites_boards as $_board => $search_cites) {
$clauses = array();
foreach ($search_cites as $cite) {
@@ -2176,7 +2176,7 @@ function markup(&$body, $track_cites = false, $op = false) {
$clauses[] = '`id` = ' . $cite;
}
$clauses = array_unique($clauses);
-
+
if ($board['uri'] != $_board) {
if (!openBoard($_board)){
if (in_array($_board,array_keys($config['boards_alias']))){
@@ -2191,25 +2191,25 @@ function markup(&$body, $track_cites = false, $op = false) {
else {
continue; // Unknown board
}
-
+
}
}
-
+
if (!empty($clauses)) {
$cited_posts[$_board] = array();
-
+
$query = query(sprintf('SELECT `thread`, `id`, `slug` FROM ``posts_%s`` WHERE ' .
implode(' OR ', $clauses), $board['uri'])) or error(db_error());
-
+
while ($cite = $query->fetch(PDO::FETCH_ASSOC)) {
$cited_posts[$_board][$cite['id']] = $config['root'] . $board['dir'] . $config['dir']['res'] .
link_for($cite) . '#' . $cite['id'];
}
}
-
+
$crossboard_indexes[$_board] = $config['root'] . $board['dir'] . $config['file_index'];
}
-
+
// Restore old board
if ($board['uri'] != $tmp_board)
openBoard($tmp_board);
@@ -2285,7 +2285,7 @@ function markup(&$body, $track_cites = false, $op = false) {
$code = rtrim(ltrim($code, "\r\n"));
$code = "".str_replace(array("\n","\t"), array("
"," "), htmlspecialchars($code, ENT_COMPAT, "UTF-8", false))."
";
-
+
$body = str_replace("", $code, $body);
}
}
@@ -2323,7 +2323,7 @@ function utf8tohtml($utf8) {
}
function ordutf8($string, &$offset) {
- $code = ord(substr($string, $offset,1));
+ $code = ord(substr($string, $offset,1));
if ($code >= 128) { // otherwise 0xxxxxxx
if ($code < 224)
$bytesnumber = 2; // 110xxxxx
@@ -2387,7 +2387,7 @@ function buildThread($id, $return = false, $mod = false) {
// Check if any posts were found
if (!isset($thread))
error($config['error']['nonexistant']);
-
+
$hasnoko50 = $thread->postCount() >= $config['noko50_min'];
$antibot = $mod || $return ? false : create_antibot($board['uri'], $id);
@@ -2438,16 +2438,16 @@ function buildThread($id, $return = false, $mod = false) {
function buildThread50($id, $return = false, $mod = false, $thread = null, $antibot = false) {
global $board, $config, $build_pages;
$id = round($id);
-
+
if ($antibot)
$antibot->reset();
-
+
if (!$thread) {
$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id` DESC LIMIT :limit", $board['uri']));
$query->bindValue(':id', $id, PDO::PARAM_INT);
$query->bindValue(':limit', $config['noko50_count']+1, PDO::PARAM_INT);
$query->execute() or error(db_error($query));
-
+
$num_images = 0;
while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
if (!isset($thread)) {
@@ -2455,7 +2455,7 @@ function buildThread50($id, $return = false, $mod = false, $thread = null, $anti
} else {
if ($post['files'])
$num_images += $post['num_files'];
-
+
$thread->add(new Post($post, $mod ? '?/' : $config['root'], $mod));
}
}
@@ -2470,10 +2470,10 @@ function buildThread50($id, $return = false, $mod = false, $thread = null, $anti
SELECT SUM(`num_files`) FROM ``posts_%s`` WHERE `files` IS NOT NULL AND `thread` = :thread", $board['uri'], $board['uri']));
$count->bindValue(':thread', $id, PDO::PARAM_INT);
$count->execute() or error(db_error($count));
-
+
$c = $count->fetch();
$thread->omitted = $c['num'] - $config['noko50_count'];
-
+
$c = $count->fetch();
$thread->omitted_images = $c['num'] - $num_images;
}
@@ -2486,13 +2486,13 @@ function buildThread50($id, $return = false, $mod = false, $thread = null, $anti
$thread->omitted += count($allPosts) - count($thread->posts);
foreach ($allPosts as $index => $post) {
if ($index == count($allPosts)-count($thread->posts))
- break;
+ break;
if ($post->files)
$thread->omitted_images += $post->num_files;
}
}
- $hasnoko50 = $thread->postCount() >= $config['noko50_min'];
+ $hasnoko50 = $thread->postCount() >= $config['noko50_min'];
$body = Element('thread.html', array(
'board' => $board,
@@ -2506,7 +2506,7 @@ function buildThread50($id, $return = false, $mod = false, $thread = null, $anti
'antibot' => $mod ? false : ($antibot ? $antibot : create_antibot($board['uri'], $id)),
'boardlist' => createBoardlist($mod),
'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
- ));
+ ));
if ($return) {
return $body;
@@ -2585,7 +2585,7 @@ function hcf($a, $b){
$b = $a-$b;
$a = $a-$b;
}
- if ($b==(round($b/$a))*$a)
+ if ($b==(round($b/$a))*$a)
$gcd=$a;
else {
for ($i=round($a/2);$i;$i--) {
@@ -2880,7 +2880,7 @@ function process_filenames($file, $board_dir, $multiple, $i){
if ($multiple)
$file['file_id'] .= "-$i";
-
+
$file['file'] = $board_dir . $config['dir']['img'] . $file['file_id'] . '.' . $file['extension'];
$file['thumb'] = $board_dir . $config['dir']['thumb'] . $file['file_id'] . '.' . ($config['thumb_ext'] ? $config['thumb_ext'] : $file['extension']);
return $file;
From 48347ae1cd8f21c30e500c03438eb36612f62930 Mon Sep 17 00:00:00 2001
From: Zankaria
Date: Tue, 26 Mar 2024 15:05:26 +0100
Subject: [PATCH 2/3] banned.html: trim
---
templates/banned.html | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/templates/banned.html b/templates/banned.html
index 3d0b333f..4fef9bd8 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -30,8 +30,8 @@
{% endif %}
- {% trans %}Your ban was filed on{% endtrans %}
- {{ ban.created|date(config.ban_date) }}
+ {% trans %}Your ban was filed on{% endtrans %}
+ {{ ban.created|date(config.ban_date) }}
{% if config.show_modname %}
{% if ban.username %}
{% trans %}by{% endtrans %} {{ ban.username }}
@@ -39,11 +39,11 @@
{% trans %}by{% endtrans %} 'system'
{% endif %}
{% endif %}
- {% trans %}and{% endtrans %}
+ {% trans %}and{% endtrans %}
{% if ban.expires and time() >= ban.expires %}
{% trans %} has since expired. Refresh the page to continue.{% endtrans %}
{% elseif ban.expires %}
- {% trans %}expires{% endtrans %} {{ ban.expires|until }} {% trans %}from now, which is on{% endtrans %}
+ {% trans %}expires{% endtrans %} {{ ban.expires|until }} {% trans %}from now, which is on{% endtrans %}
{{ ban.expires|date(config.ban_date) }}
@@ -75,7 +75,7 @@
}
}
var countdown = document.getElementById("countdown");
-
+
updateExpiresTime();
var int = setInterval(updateExpiresTime, 1000);
@@ -89,26 +89,26 @@
{% if config.ban_page_extra %}
{{ config.ban_page_extra }}
{% endif %}
-
+
{% if post and config.ban_show_post %}
{% trans %}You were banned for the following post on{% endtrans %} {{ board.url }}:
{{ post }}
{% endif %}
-
+
{% if config.ban_appeals and (not ban.expires or ban.expires - ban.created > config.ban_appeals_min_length )%}
{% if pending_appeal %}
- {% trans %}You submitted an appeal for this ban on{% endtrans %}
+ {% trans %}You submitted an appeal for this ban on{% endtrans %}
{{ pending_appeal|date(config.ban_date) }}. {% trans %}It is still pending{% endtrans %}.
{% elseif denied_appeals|length >= config.ban_appeals_max %}
{% if denied_appeals|length == 1 %}
- {% trans %}You appealed this ban on{% endtrans %}
- {{ denied_appeals[0]|date(config.ban_date) }}
+ {% trans %}You appealed this ban on{% endtrans %}
+ {{ denied_appeals[0]|date(config.ban_date) }}
{% trans %}and it was denied. You may not appeal this ban again.{% endtrans %}
{% else %}
@@ -118,15 +118,15 @@
{% if denied_appeals|length %}
{% if denied_appeals|length == 1 %}
- {% trans %}You appealed this ban on{% endtrans %}
- {{ denied_appeals[0]|date(config.ban_date) }}
+ {% trans %}You appealed this ban on{% endtrans %}
+ {{ denied_appeals[0]|date(config.ban_date) }}
{% trans %}and it was denied.{% endtrans %}
{% trans %}You may appeal this ban again. Please enter your reasoning below.{% endtrans %}
{% else %}
- {% trans %}You last appealed this ban on{% endtrans %}
- {{ denied_appeals[denied_appeals|length - 1]|date(config.ban_date) }}
+ {% trans %}You last appealed this ban on{% endtrans %}
+ {{ denied_appeals[denied_appeals|length - 1]|date(config.ban_date) }}
{% trans %}and it was denied.{% endtrans %}
{% trans %}You may appeal this ban again. Please enter your reasoning below.{% endtrans %}
From 1de62d4dddef6034fd18eb31b6fb35458d5393f4 Mon Sep 17 00:00:00 2001
From: Zankaria
Date: Tue, 26 Mar 2024 15:00:55 +0100
Subject: [PATCH 3/3] Add ban id to ban page. Fix #19
---
templates/banned.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/templates/banned.html b/templates/banned.html
index 4fef9bd8..973daf9c 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -85,6 +85,7 @@
{% trans %}Your IP address is{% endtrans %} {{ ban.ip }}.
+ {% trans %}Your ban ID is{% endtrans %} {{ ban.id }}.
{% if config.ban_page_extra %}
{{ config.ban_page_extra }}