From 257ead7313f5a3248d07e9be89f84aa2ea984008 Mon Sep 17 00:00:00 2001 From: Benjamin Southall Date: Thu, 8 Jun 2017 07:44:27 +0900 Subject: Merge pull request from vichan-devel/vichan#200 from seisatsu/patch-2 Fix typo in max_images comment , Adding early 404 staged from https://github.com/vichan-devel/vichan/commit/40fe35fedce79557fdc8b7e5c208d7d279757803 --- inc/functions.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index ed00743c..9283c3ae 100755 --- a/inc/functions.php +++ b/inc/functions.php @@ -1279,11 +1279,28 @@ function clean($pid = false) { $query->bindValue(':offset', $offset, PDO::PARAM_INT); $query->execute() or error(db_error($query)); + if ($config['early_404_staged']) { + $page = $config['early_404_page']; + $iter = 0; + } + else { + $page = 1; + } + while ($post = $query->fetch(PDO::FETCH_ASSOC)) { - if ($post['reply_count'] < $config['early_404_replies']) { + if ($post['reply_count'] < $page*$config['early_404_replies']) { deletePost($post['thread_id'], false, false); if ($pid) modLog("Automatically deleting thread #{$post['thread_id']} due to new thread #{$pid} (early 404 is set, #{$post['thread_id']} had {$post['reply_count']} replies)"); } + + if ($config['early_404_staged']) { + $iter++; + + if ($iter == $config['threads_per_page']) { + $page++; + $iter = 0; + } + } } } } @@ -1310,6 +1327,7 @@ function index($page, $mod=false, $brief = false) { $query->bindValue(':threads_per_page', $config['threads_per_page'], PDO::PARAM_INT); $query->execute() or error(db_error($query)); + if ($page == 1 && $query->rowCount() < $config['threads_per_page']) $board['thread_count'] = $query->rowCount(); -- cgit v1.3