hide 404.php when unneeded and unconfigured :^)

This reverts commit 3d5404d589df5b6c3ecb1e5b0bc90c3c13caa9e9.

contrib/files_in_cache.404.php.example

@@ -0,0 +1,21 @@
+<?php
+require_once 'inc/functions.php';
+
+$base=substr(dirname(str_replace($_SERVER['DOCUMENT_ROOT'], '', $_SERVER['SCRIPT_FILENAME'])), 1);
+//echo "base[$base]<br>\n";
+
+$path=trim($_SERVER['REQUEST_URI'], '/');
+$path=str_replace($base.'/', '', $path);
+if (file_exists($path) && !is_dir($path)) {
+	if (strpos($path, 'css')!==false) {
+		header('Content-type: text/css');
+	}
+	readfile($path);
+	exit();
+}
+if (is_dir($path)) {
+	$path.='/index.html';
+}
+$key='vichan_filecache_'.$path;
+echo Cache::get($key);
+?>

inc/cache.php

@@ -10,7 +10,7 @@ class Cache {
 	private static $cache;
 	public static function init() {
 		global $config;
-		
+
 		switch ($config['cache']['enabled']) {
 			case 'memcached':
 				self::$cache = new Memcached();
@@ -31,9 +31,9 @@ class Cache {
 	}
 	public static function get($key) {
 		global $config, $debug;
-		
+
 		$key = $config['cache']['prefix'] . $key;
-		
+
 		$data = false;
 		switch ($config['cache']['enabled']) {
 			case 'memcached':
@@ -67,20 +67,20 @@ class Cache {
 				$data = json_decode(self::$cache->get($key), true);
 				break;
 		}
-		
+
 		if ($config['debug'])
 			$debug['cached'][] = $key . ($data === false ? ' (miss)' : ' (hit)');
-		
+
 		return $data;
 	}
 	public static function set($key, $value, $expires = false) {
 		global $config, $debug;
-		
+
 		$key = $config['cache']['prefix'] . $key;
-		
+
 		if (!$expires)
 			$expires = $config['cache']['timeout'];
-		
+
 		switch ($config['cache']['enabled']) {
 			case 'memcached':
 				if (!self::$cache)
@@ -90,7 +90,14 @@ class Cache {
 			case 'redis':
 				if (!self::$cache)
 					self::init();
-				self::$cache->setex($key, $expires, json_encode($value));
+
+				if ($expires === FALSE) {
+	                                self::$cache->set($key, json_encode($value));
+				}
+				else {
+					self::$cache->setex($key, $expires, json_encode($value));
+				}
+
 				break;
 			case 'apc':
 				apc_store($key, $value, $expires);
@@ -107,15 +114,15 @@ class Cache {
 				self::$cache[$key] = $value;
 				break;
 		}
-		
+
 		if ($config['debug'])
 			$debug['cached'][] = $key . ' (set)';
 	}
 	public static function delete($key) {
 		global $config, $debug;
-		
+
 		$key = $config['cache']['prefix'] . $key;
-		
+
 		switch ($config['cache']['enabled']) {
 			case 'memcached':
 			case 'redis':
@@ -138,13 +145,13 @@ class Cache {
 				unset(self::$cache[$key]);
 				break;
 		}
-		
+
 		if ($config['debug'])
 			$debug['cached'][] = $key . ' (deleted)';
 	}
 	public static function flush() {
 		global $config;
-		
+
 		switch ($config['cache']['enabled']) {
 			case 'memcached':
 				if (!self::$cache)
@@ -166,7 +173,7 @@ class Cache {
 					self::init();
 				return self::$cache->flushDB();
 		}
-		
+
 		return false;
 	}
 }

inc/config.php

@@ -1192,10 +1192,22 @@
 
 	// Website favicon.
 	// $config['url_favicon'] = '/favicon.gif';
-	
+
 	// Try not to build pages when we shouldn't have to.
 	$config['try_smarter'] = true;
 
+	// A reduced disk-IO option that does not write the HTML or JSON files to disk. It writes them to a
+	// cache which then can be quickly retrieved by a webserver without hitting the disk at all.
+	// See nginx's HttpRedis2Module module for a hint about a possible deployment.
+
+	// If you don't have HttpRedis2Module, i've included a 404.php that you can use with an htaccess like:
+	// RewriteEngine On
+	// RewriteRule ^[^/]+/$ %{REQUEST_URI}/../../404.php [NC,L]
+	// RewriteRule ^[^/]+/[^/]+$ %{REQUEST_URI}/../../404.php [NC,L]
+	// RewriteRule ^[^/]+/res/[^/]+$ %{REQUEST_URI}/../../404.php [NC,L]
+	// This example assumes your URL includes one directory level, i.e. http://localhost/vichan/
+	$config['files_in_cache'] = false;
+
 	// EXPERIMENTAL: Defer static HTML building to a moment, when a given file is actually accessed.
 	// Warning: This option won't run out of the box. You need to tell your webserver, that a file
 	// for serving 403 and 404 pages is /smart_build.php. Also, you need to turn off indexes.

inc/database.php

@@ -8,30 +8,31 @@ defined('TINYBOARD') or exit;
 
 class PreparedQueryDebug {
 	protected $query, $explain_query = false;
-	
+
 	public function __construct($query) {
 		global $pdo, $config;
 		$query = preg_replace("/[\n\t]+/", ' ', $query);
-		
+
 		$this->query = $pdo->prepare($query);
-		if ($config['debug'] && $config['debug_explain'] && preg_match('/^(SELECT|INSERT|UPDATE|DELETE) /i', $query))
+		//|INSERT|UPDATE|DELETE
+		if ($config['debug'] && $config['debug_explain'] && preg_match('/^(SELECT) /i', $query))
 			$this->explain_query = $pdo->prepare("EXPLAIN $query");
 	}
 	public function __call($function, $args) {
 		global $config, $debug;
-		
+
 		if ($config['debug'] && $function == 'execute') {
 			if ($this->explain_query) {
 				$this->explain_query->execute() or error(db_error($this->explain_query));
 			}
 			$start = microtime(true);
 		}
-		
+
 		if ($this->explain_query && $function == 'bindValue')
 			call_user_func_array(array($this->explain_query, $function), $args);
-		
+
 		$return = call_user_func_array(array($this->query, $function), $args);
-		
+
 		if ($config['debug'] && $function == 'execute') {
 			$time = microtime(true) - $start;
 			$debug['sql'][] = array(
@@ -42,7 +43,7 @@ class PreparedQueryDebug {
 			);
 			$debug['time']['db_queries'] += $time;
 		}
-		
+
 		return $return;
 	}
 }
@@ -51,16 +52,16 @@ function sql_open() {
 	global $pdo, $config, $debug;
 	if ($pdo)
 		return true;
-	
+
-	
+
 	if ($config['debug'])
 		$start = microtime(true);
-	
+
 	if (isset($config['db']['server'][0]) && $config['db']['server'][0] == ':')
 		$unix_socket = substr($config['db']['server'], 1);
 	else
 		$unix_socket = false;
-	
+
 	$dsn = $config['db']['type'] . ':' .
 		($unix_socket ? 'unix_socket=' . $unix_socket : 'host=' . $config['db']['server']) .
 		';dbname=' . $config['db']['database'];
@@ -74,10 +75,10 @@ function sql_open() {
 		if ($config['db']['persistent'])
 			$options[PDO::ATTR_PERSISTENT] = true;
 		$pdo = new PDO($dsn, $config['db']['user'], $config['db']['password'], $options);
-		
+
 		if ($config['debug'])
 			$debug['time']['db_connect'] = '~' . round((microtime(true) - $start) * 1000, 2) . 'ms';
-		
+
 		if (mysql_version() >= 50503)
 			query('SET NAMES utf8mb4') or error(db_error());
 		else
@@ -85,11 +86,11 @@ function sql_open() {
 		return $pdo;
 	} catch(PDOException $e) {
 		$message = $e->getMessage();
-		
+
 		// Remove any sensitive information
 		$message = str_replace($config['db']['user'], '<em>hidden</em>', $message);
 		$message = str_replace($config['db']['password'], '<em>hidden</em>', $message);
-		
+
 		// Print error
 		error(_('Database error: ') . $message);
 	}
@@ -98,7 +99,7 @@ function sql_open() {
 // 5.6.10 becomes 50610
 function mysql_version() {
 	global $pdo;
-	
+
 	$version = $pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
 	$v = explode('.', $version);
 	if (count($v) != 3)
@@ -108,11 +109,11 @@ function mysql_version() {
 
 function prepare($query) {
 	global $pdo, $debug, $config;
-	
+
 	$query = preg_replace('/``('.$config['board_regex'].')``/u', '`' . $config['db']['prefix'] . '$1`', $query);
-	
+
 	sql_open();
-	
+
 	if ($config['debug'])
 		return new PreparedQueryDebug($query);
 
@@ -121,13 +122,14 @@ function prepare($query) {
 
 function query($query) {
 	global $pdo, $debug, $config;
-	
+
 	$query = preg_replace('/``('.$config['board_regex'].')``/u', '`' . $config['db']['prefix'] . '$1`', $query);
-	
+
 	sql_open();
-	
+
 	if ($config['debug']) {
-		if ($config['debug_explain'] && preg_match('/^(SELECT|INSERT|UPDATE|DELETE) /i', $query)) {
+		//|INSERT|UPDATE|DELETE
+		if ($config['debug_explain'] && preg_match('/^(SELECT) /i', $query)) {
 			$explain = $pdo->query("EXPLAIN $query") or error(db_error());
 		}
 		$start = microtime(true);

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
 		'<p class="c">This alternative error page is being displayed because the other couldn\'t be found or hasn\'t loaded yet.</p></body></html>');
 }
 
-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);
@@ -643,49 +643,63 @@ function file_write($path, $data, $simple = false, $skip_purge = false) {
 		}
 	}
 
-	if (!$fp = fopen($path, $simple ? 'w' : 'c'))
+	if ($config['files_in_cache']) {
-		error('Unable to open file for writing: ' . $path);
+		Cache::set('vichan_filecache_'.$path, $data);
-
+		if ($config['gzip_static']) {
-	// File locking
+			$bytes=strlen($data);
-	if (!$simple && !flock($fp, LOCK_EX)) {
+			if ($bytes & ~0x3ff) {
-		error('Unable to lock file: ' . $path);
+				Cache::set('vichan_filecache_'.$path.'.gz', gzencode($data));
-	}
+			} else {
-
+				Cache::delete('vichan_filecache_'.$path.'.gz');
-	// Truncate file
+			}
-	if (!$simple && !ftruncate($fp, 0))
-		error('Unable to truncate file: ' . $path);
-
-	// Write data
-	if (($bytes = fwrite($fp, $data)) === false)
-		error('Unable to write to file: ' . $path);
-
-	// Unlock
-	if (!$simple)
-		flock($fp, LOCK_UN);
-
-	// Close
-	if (!fclose($fp))
-		error('Unable to close file: ' . $path);
-
-	/**
-	 * Create gzipped file.
-	 *
-	 * When writing into a file foo.bar and the size is larger or equal to 1
-	 * KiB, this also produces the gzipped version foo.bar.gz
-	 *
-	 * This is useful with nginx with gzip_static on.
-	 */
-	if ($config['gzip_static']) {
-		$gzpath = "$path.gz";
-
-		if ($bytes & ~0x3ff) {  // if ($bytes >= 1024)
-			if (file_put_contents($gzpath, gzencode($data), $simple ? 0 : LOCK_EX) === false)
-				error("Unable to write to file: $gzpath");
-			//if (!touch($gzpath, filemtime($path), fileatime($path)))
-			//	error("Unable to touch file: $gzpath");
 		}
-		else {
+	}
-			@unlink($gzpath);
+	else {
+		if (!$fp = fopen($path, $simple ? 'w' : 'c'))
+			error('Unable to open file for writing: ' . $path);
+
+		// File locking
+		if (!$simple && !flock($fp, LOCK_EX)) {
+			error('Unable to lock file: ' . $path);
+		}
+
+		// Truncate file
+		if (!$simple && !ftruncate($fp, 0))
+			error('Unable to truncate file: ' . $path);
+
+		// Write data
+		if (($bytes = fwrite($fp, $data)) === false)
+			error('Unable to write to file: ' . $path);
+
+		// Unlock
+		if (!$simple)
+			flock($fp, LOCK_UN);
+
+		// Close
+		if (!fclose($fp))
+			error('Unable to close file: ' . $path);
+
+		/**
+		 * Create gzipped file.
+		 *
+		 * When writing into a file foo.bar and the size is larger or equal to 1
+		 * KiB, this also produces the gzipped version foo.bar.gz
+		 *
+		 * This is useful with nginx with gzip_static on.
+		 */
+
+		if ($config['gzip_static']) {
+			$gzpath = "$path.gz";
+
+			if ($bytes & ~0x3ff) {  // if ($bytes >= 1024)
+				if (file_put_contents($gzpath, gzencode($data), $simple ? 0 : LOCK_EX) === false)
+					error("Unable to write to file: $gzpath");
+				//if (!touch($gzpath, filemtime($path), fileatime($path)))
+				//	error("Unable to touch file: $gzpath");
+			}
+			else {
+				@unlink($gzpath);
+			}
 		}
 	}
 
@@ -705,6 +719,7 @@ function file_write($path, $data, $simple = false, $skip_purge = false) {
 	}
 
 	if ($config['debug']) {
+		$bytes=strlen($data);
 		$debug['write'][] = $path . ': ' . $bytes . ' bytes';
 	}
 
@@ -720,11 +735,15 @@ function file_unlink($path) {
 		$debug['unlink'][] = $path;
 	}
 
+
+	Cache::delete('vichan_filecache_'.$path);
+	if ($config['gzip_static']) {
+		Cache::delete('vichan_filecache_'.$path.'.gz');
+	}
+
 	$ret = @unlink($path);
-
+	if ($config['gzip_static']) {
-        if ($config['gzip_static']) {
+		$gzpath = "$path.gz";
-                $gzpath = "$path.gz";
-
 		@unlink($gzpath);
 	}
 
@@ -792,7 +811,7 @@ function listBoards($just_uri = false) {
 			$boards[] = $board;
 		}
 	}
- 
+
 	if ($config['cache']['enabled'])
 		cache::set($cache_name, $boards);
 
@@ -858,10 +877,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 +891,7 @@ function displayBan($ban) {
 			}
 		}
 	}
-	
+
 	// Show banned page and exit
 	die(
 		Element('page.html', array(
@@ -897,7 +916,7 @@ function checkBan($board = false) {
 	if (!isset($_SERVER['REMOTE_ADDR'])) {
 		// Server misconfiguration
 		return;
-	}		
+	}
 
 	if (event('check-ban', $board))
 		return true;
@@ -912,7 +931,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 +960,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 +1019,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 +1060,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 +1222,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 +1273,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 +1324,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 +1374,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 +1588,7 @@ function checkMute() {
 			// Not expired yet
 			error(sprintf($config['error']['youaremuted'], $mute['time'] + $mutetime - time()));
 		} else {
-			// Already expired	
+			// Already expired
 			return;
 		}
 	}
@@ -1696,7 +1715,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 +1821,7 @@ function markup_url($matches) {
 		'rel' => 'nofollow',
 		'target' => '_blank',
 	);
-	
+
 	event('markup-url', $link);
 	$link = (array)$link;
 
@@ -1833,7 +1852,7 @@ function unicodify($body) {
 
 function extract_modifiers($body) {
 	$modifiers = array();
-	
+
 	if (preg_match_all('@<tinyboard ([\w\s]+)>(.*?)</tinyboard>@us', $body, $matches, PREG_SET_ORDER)) {
 		foreach ($matches as $match) {
 			if (preg_match('/^escape /', $match[1]))
@@ -1841,18 +1860,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('@<tinyboard (?!escape )([\w\s]+)>(.+?)</tinyboard>@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 +1912,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('  ', ' &nbsp;', $body);
 
@@ -1917,21 +1936,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 +1983,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 +2019,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 +2056,7 @@ function markup(&$body, $track_cites = false) {
 			if ($cite) {
 				if (isset($cited_posts[$_board][$cite])) {
 					$link = $cited_posts[$_board][$cite];
-					
+
 					$replacement = '<a ' .
 						($_board == $board['uri'] ?
 							'onclick="highlightReply(\''.$cite.'\');" '
@@ -2060,7 +2079,7 @@ function markup(&$body, $track_cites = false) {
 			}
 		}
 	}
-	
+
 	$tracked_cites = array_unique($tracked_cites, SORT_REGULAR);
 
 	$body = preg_replace("/^\s*&gt;.*$/m", '<span class="quote">$0</span>', $body);
@@ -2115,7 +2134,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 +2212,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 +2263,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 +2280,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 +2295,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 +2311,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 +2331,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 +2410,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--) {