kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Merge pull request from vichan-devel/vichan#200 from seisatsu/patch-2 Fix typo in max_images comment , Adding early 404 staged from 40fe35fedc

Browse Source
This commit is contained in:
Benjamin Southall 2017-06-08 07:44:27 +09:00
parent 894e8eadfd
commit 257ead7313
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/config.php
View File

@ -538,6 +538,7 @@
$config['early_404_page'] = 3; $config['early_404_page'] = 3;
$config['early_404_replies'] = 5; $config['early_404_replies'] = 5;
$config['early_404_staged'] = false;
// A wordfilter (sometimes referred to as just a "filter" or "censor") automatically scans users’ posts // A wordfilter (sometimes referred to as just a "filter" or "censor") automatically scans users’ posts
// as they are submitted and changes or censors particular words or phrases. // as they are submitted and changes or censors particular words or phrases.
@ -678,7 +679,7 @@
*/ */
// Maximum number of images allowed. Increasing this number enabled multi image. // Maximum number of images allowed. Increasing this number enabled multi image.
// If you make it more than 1, make sure to enable the below script for the post form to change. // If you make it more than 1, make sure to enable the below script for the post form to change.
// $config['additional_javascript'][] = 'js/multi_image.js'; // $config['additional_javascript'][] = 'js/multi-image.js';
$config['max_images'] = 1; $config['max_images'] = 1;
// Method to use for determing the max filesize. // Method to use for determing the max filesize.

20
inc/functions.php
View File

@ -1279,11 +1279,28 @@ function clean($pid = false) {
$query->bindValue(':offset', $offset, PDO::PARAM_INT); $query->bindValue(':offset', $offset, PDO::PARAM_INT);
$query->execute() or error(db_error($query)); $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)) { 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); 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 ($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->bindValue(':threads_per_page', $config['threads_per_page'], PDO::PARAM_INT);
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
if ($page == 1 && $query->rowCount() < $config['threads_per_page']) if ($page == 1 && $query->rowCount() < $config['threads_per_page'])
$board['thread_count'] = $query->rowCount(); $board['thread_count'] = $query->rowCount();