diff --git a/inc/functions.php b/inc/functions.php index 515e3e55..18e4b06d 100755 --- a/inc/functions.php +++ b/inc/functions.php @@ -64,7 +64,7 @@ function loadConfig() { } - if (isset($config['cache_config']) && + if (isset($config['cache_config']) && $config['cache_config'] && $config = Cache::get('config_' . $boardsuffix ) ) { $events = Cache::get('events_' . $boardsuffix ); @@ -83,7 +83,7 @@ function loadConfig() { else { $config = array(); - reset_events(); + reset_events(); $arrays = array( 'db', @@ -283,7 +283,7 @@ function loadConfig() { if ($config['recaptcha']) require_once 'inc/lib/recaptcha/recaptchalib.php'; - + if ($config['cache']['enabled']) require_once 'inc/cache.php'; @@ -310,7 +310,7 @@ function loadConfig() { if (is_array($config['anonymous'])) $config['anonymous'] = $config['anonymous'][array_rand($config['anonymous'])]; - + if ($config['debug']) { if (!isset($debug)) { $debug = array( @@ -350,7 +350,7 @@ function basic_error_function_because_the_other_isnt_loaded_yet($message, $prior '

This alternative error page is being displayed because the other couldn\'t be found or hasn\'t loaded yet.

'); } -function fatal_error_handler() { +function fatal_error_handler() { if ($error = error_get_last()) { if ($error['type'] == E_ERROR) { if (function_exists('error')) { @@ -391,7 +391,7 @@ function define_groups() { define($group_name, $group_value, true); } } - + ksort($config['mod']['groups']); } @@ -429,7 +429,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']); @@ -450,7 +450,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']); @@ -596,7 +596,7 @@ function purge($uri) { global $config, $debug; // Fix for Unicode - $uri = rawurlencode($uri); + $uri = rawurlencode($uri); $noescape = "/!~*()+:"; $noescape = preg_split('//', $noescape); @@ -630,6 +630,16 @@ function purge($uri) { function file_write($path, $data, $simple = false, $skip_purge = false) { global $config, $debug; + //echo "file_write($path, ", strlen($data), ", $simple, $skip_purge)
\n"; + Cache::store('vichan_filecache_'.$path, $data, -1); + if ($config['gzip_static']) { + $bytes=strlen($data); + if ($bytes & ~0x3ff) { + Cache::store('vichan_filecache_'.$path.'.gz', gzencode($data), -1); + } else { + Cache::delete('vichan_filecache_'.$path.'.gz'); + } + } if (preg_match('/^remote:\/\/(.+)\:(.+)$/', $path, $m)) { if (isset($config['remote'][$m[1]])) { @@ -643,6 +653,7 @@ function file_write($path, $data, $simple = false, $skip_purge = false) { } } + /* if (!$fp = fopen($path, $simple ? 'w' : 'c')) error('Unable to open file for writing: ' . $path); @@ -666,7 +677,7 @@ function file_write($path, $data, $simple = false, $skip_purge = false) { // Close if (!fclose($fp)) error('Unable to close file: ' . $path); - + */ /** * Create gzipped file. * @@ -675,6 +686,7 @@ function file_write($path, $data, $simple = false, $skip_purge = false) { * * This is useful with nginx with gzip_static on. */ + /* if ($config['gzip_static']) { $gzpath = "$path.gz"; @@ -688,6 +700,7 @@ function file_write($path, $data, $simple = false, $skip_purge = false) { @unlink($gzpath); } } + */ if (!$skip_purge && isset($config['purge'])) { // Purge cache @@ -705,6 +718,7 @@ function file_write($path, $data, $simple = false, $skip_purge = false) { } if ($config['debug']) { + $bytes=strlen($data); $debug['write'][] = $path . ': ' . $bytes . ' bytes'; } @@ -713,6 +727,12 @@ function file_write($path, $data, $simple = false, $skip_purge = false) { function file_unlink($path) { global $config, $debug; + //echo "file_unlink($path)
\n"; + if ($config['gzip_static']) { + Cache::delete('vichan_filecache_'.$path); + } else { + Cache::delete('vichan_filecache_'.$path.'.gz'); + } if ($config['debug']) { if (!isset($debug['unlink'])) @@ -720,14 +740,14 @@ function file_unlink($path) { $debug['unlink'][] = $path; } + $ret=true; + /* $ret = @unlink($path); - - if ($config['gzip_static']) { - $gzpath = "$path.gz"; - + if ($config['gzip_static']) { + $gzpath = "$path.gz"; @unlink($gzpath); } - +*/ if (isset($config['purge']) && $path[0] != '/' && isset($_SERVER['HTTP_HOST'])) { // Purge cache if (basename($path) == $config['file_index']) { @@ -792,7 +812,7 @@ function listBoards($just_uri = false) { $boards[] = $board; } } - + if ($config['cache']['enabled']) cache::set($cache_name, $boards); @@ -858,10 +878,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)) { @@ -872,7 +892,7 @@ function displayBan($ban) { } } } - + // Show banned page and exit die( Element('page.html', array( @@ -897,7 +917,7 @@ function checkBan($board = false) { if (!isset($_SERVER['REMOTE_ADDR'])) { // Server misconfiguration return; - } + } if (event('check-ban', $board)) return true; @@ -912,7 +932,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']); @@ -941,9 +961,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()); } @@ -1000,7 +1020,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']); @@ -1041,7 +1061,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']) { @@ -1203,7 +1223,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); - + if (!$post['thread']) { // Delete thread HTML page file_unlink($board['dir'] . $config['dir']['res'] . link_for($post) ); @@ -1254,7 +1274,7 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) { $query = prepare("DELETE FROM ``cites`` WHERE (`target_board` = :board AND (`target` = " . implode(' OR `target` = ', $ids) . ")) OR (`board` = :board AND (`post` = " . implode(' OR `post` = ', $ids) . "))"); $query->bindValue(':board', $board['uri']); $query->execute() or error(db_error($query)); - + if (isset($rebuild) && $rebuild_after) { buildThread($rebuild); buildIndex(); @@ -1305,7 +1325,7 @@ function index($page, $mod=false) { return false; $threads = array(); - + while ($th = $query->fetch(PDO::FETCH_ASSOC)) { $thread = new Thread($th, $mod ? '?/' : $config['root'], $mod); @@ -1355,7 +1375,7 @@ function index($page, $mod=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; $body .= $thread->build(true); } @@ -1569,7 +1589,7 @@ function checkMute() { // Not expired yet error(sprintf($config['error']['youaremuted'], $mute['time'] + $mutetime - time())); } else { - // Already expired + // Already expired return; } } @@ -1696,7 +1716,7 @@ function buildJavascript() { } if ($config['minify_js']) { - require_once 'inc/lib/minify/JSMin.php'; + require_once 'inc/lib/minify/JSMin.php'; $script = JSMin::minify($script); } @@ -1802,7 +1822,7 @@ function markup_url($matches) { 'rel' => 'nofollow', 'target' => '_blank', ); - + event('markup-url', $link); $link = (array)$link; @@ -1833,7 +1853,7 @@ function unicodify($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])) @@ -1841,18 +1861,18 @@ function extract_modifiers($body) { $modifiers[$match[1]] = html_entity_decode($match[2]); } } - + return $modifiers; } function markup(&$body, $track_cites = 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(); } @@ -1893,7 +1913,7 @@ function markup(&$body, $track_cites = false) { if ($num_links > $config['max_links']) error($config['error']['toomanylinks']); } - + if ($config['markup_repair_tidy']) $body = str_replace(' ', '  ', $body); @@ -1917,21 +1937,21 @@ function markup(&$body, $track_cites = 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]; @@ -1964,34 +1984,34 @@ function markup(&$body, $track_cites = 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) { @@ -2000,27 +2020,27 @@ function markup(&$body, $track_cites = false) { $clauses[] = '`id` = ' . $cite; } $clauses = array_unique($clauses); - + if ($board['uri'] != $_board) { if (!openBoard($_board)) 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); @@ -2037,7 +2057,7 @@ function markup(&$body, $track_cites = false) { if ($cite) { if (isset($cited_posts[$_board][$cite])) { $link = $cited_posts[$_board][$cite]; - + $replacement = '$0', $body); @@ -2115,7 +2135,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 @@ -2193,7 +2213,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); @@ -2244,16 +2264,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)) { @@ -2261,7 +2281,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)); } } @@ -2276,10 +2296,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; } @@ -2292,13 +2312,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, @@ -2312,7 +2332,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; @@ -2391,7 +2411,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--) {