diff --git a/inc/functions.php b/inc/functions.php index 9ea6aa9a..afebd5d8 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1781,95 +1781,11 @@ function buildThread($id, $return = false, $mod = false) { if ($return) { return $body; } else { - $noko50fn = $board['dir'] . $config['dir']['res'] . sprintf($config['file_page50'], $id); - if ($hasnoko50 || file_exists($noko50fn)) { - buildThread50($id, $return, $mod, $thread); - } - file_write($board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $id), $body); } } -function buildThread50($id, $return = false, $mod = false, $thread = null) { - global $board, $config, $build_pages; - $id = round($id); - - if (event('build-thread', $id)) - return; - - 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)) { - $thread = new Thread($post, $mod ? '?/' : $config['root'], $mod); - } else { - if ($post['file']) - $num_images++; - - $thread->add(new Post($post, $mod ? '?/' : $config['root'], $mod)); - } - } - - // Check if any posts were found - if (!isset($thread)) - error($config['error']['nonexistant']); - - - if ($query->rowCount() == $config['noko50_count']+1) { - $count = prepare(sprintf("SELECT COUNT(`id`) as `num` FROM ``posts_%s`` WHERE `thread` = :thread UNION ALL SELECT COUNT(`id`) FROM ``posts_%s`` WHERE `file` 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; - } - - $thread->posts = array_reverse($thread->posts); - } else { - $allPosts = $thread->posts; - - $thread->posts = array_slice($allPosts, -$config['noko50_count']); - $thread->omitted += count($allPosts) - count($thread->posts); - foreach ($allPosts as $index => $post) { - if ($index == count($allPosts)-count($thread->posts)) - break; - if ($post->file) - $thread->omitted_images++; - } - } - - $hasnoko50 = $thread->postCount() >= $config['noko50_min']; - - $body = Element('thread.html', array( - 'board' => $board, - 'thread' => $thread, - 'body' => $thread->build(false, true), - 'config' => $config, - 'id' => $id, - 'mod' => $mod, - 'hasnoko50' => $hasnoko50, - 'isnoko50' => true, - 'antibot' => $mod ? false : 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; - } else { - file_write($board['dir'] . $config['dir']['res'] . sprintf($config['file_page50'], $id), $body); - } -} - - function rrmdir($dir) { +function rrmdir($dir) { if (is_dir($dir)) { $objects = scandir($dir); foreach ($objects as $object) {