From 54012e2ee3a5ac7783727fc9a03ab9db5cb77dd2 Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Thu, 23 Oct 2014 05:07:54 -0500
Subject: [PATCH 01/70] [#201] Fixed edit text margins.

---
 inc/display.php       | 2 ++
 stylesheets/style.css | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/inc/display.php b/inc/display.php
index 9b4c2d83..f4cea4e5 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -345,6 +345,8 @@ function embed_html($link) {
 
 
 class Post {
+	public $clean;
+	
 	public function __construct($post, $root=null, $mod=false) {
 		global $config;
 		if (!isset($root))
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 0a3ed8eb..062b2731 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -291,14 +291,15 @@ div.post.reply {
 div.post_modified {
   min-width: 47.5em;
   margin-left: 1.8em;
-  padding-top: 0.8em;
 }
-
 div.post_modified div.content-status {
   margin-top: 0.5em;
   padding-bottom: 0em;
   font-size: 72%;
 }
+div.post_modified div.content-status:first-child {
+  margin-top: 1.3em;
+}
 
 span.trip {
   color: #228854;

From 08fd6ae474adfc4411346f222c150cf7f305f7a8 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 16:53:28 +0200
Subject: [PATCH 02/70] don`t rebuild a page, when not needed, even if it
 doesn`t exist

---
 inc/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 8674ecd0..86389e73 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1507,7 +1507,7 @@ function buildIndex() {
 		$filename = $board['dir'] . ($page == 1 ? $config['file_index'] : sprintf($config['file_page'], $page));
 
 		if (!$config['api']['enabled'] && $config['try_smarter'] && isset($build_pages) && !empty($build_pages)
-			&& !in_array($page, $build_pages) && is_file($filename))
+			&& !in_array($page, $build_pages) )
 			continue;
 		$content = index($page);
 		if (!$content)
@@ -1524,7 +1524,7 @@ function buildIndex() {
 		}
 
 		if ($config['api']['enabled'] && $config['try_smarter'] && isset($build_pages) && !empty($build_pages)
-			&& !in_array($page, $build_pages) && is_file($filename))
+			&& !in_array($page, $build_pages) )
 			continue;
 
 		if ($config['try_smarter']) {

From 453ecfdc6b665c857a25b2bb4063164bd99ee914 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 16:56:17 +0200
Subject: [PATCH 03/70] unlink a .gz version of a file if it exists

---
 inc/functions.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/inc/functions.php b/inc/functions.php
index 86389e73..68112c0e 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -630,6 +630,13 @@ function file_unlink($path) {
 	}
 
 	$ret = @unlink($path);
+
+        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']) {

From 3f381ee569425ad7276ca94739abd15897bbaa70 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 17:07:24 +0200
Subject: [PATCH 04/70] add a global_api variable for buildIndex

---
 inc/functions.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 68112c0e..5a74bc09 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1498,7 +1498,7 @@ function checkMute() {
 	}
 }
 
-function buildIndex() {
+function buildIndex($global_api = "yes") {
 	global $board, $config, $build_pages;
 
 	$pages = getPages();
@@ -1513,8 +1513,8 @@ function buildIndex() {
 	for ($page = 1; $page <= $config['max_pages']; $page++) {
 		$filename = $board['dir'] . ($page == 1 ? $config['file_index'] : sprintf($config['file_page'], $page));
 
-		if (!$config['api']['enabled'] && $config['try_smarter'] && isset($build_pages) && !empty($build_pages)
-			&& !in_array($page, $build_pages) )
+		if (!$config['api']['enabled'] && $global_api != "skip" && $config['try_smarter'] && isset($build_pages)
+			 && !empty($build_pages) && !in_array($page, $build_pages) )
 			continue;
 		$content = index($page);
 		if (!$content)
@@ -1530,8 +1530,8 @@ function buildIndex() {
 			$catalog[$page-1] = $threads;
 		}
 
-		if ($config['api']['enabled'] && $config['try_smarter'] && isset($build_pages) && !empty($build_pages)
-			&& !in_array($page, $build_pages) )
+		if ($config['api']['enabled'] && $global_api == "skip" && $config['try_smarter'] && isset($build_pages)
+			&& !empty($build_pages) && !in_array($page, $build_pages) )
 			continue;
 
 		if ($config['try_smarter']) {
@@ -1560,7 +1560,7 @@ function buildIndex() {
 	}
 
 	// json api catalog
-	if ($config['api']['enabled']) {
+	if ($config['api']['enabled'] && $global_api != "skip") {
 		$json = json_encode($api->translateCatalog($catalog));
 		$jsonFilename = $board['dir'] . 'catalog.json';
 		file_write($jsonFilename, $json);

From b2f6c4c9568cd0571ecbb8d91a1ae2139e00f64c Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 17:16:30 +0200
Subject: [PATCH 05/70] smart build: define configuration variables

---
 inc/config.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/inc/config.php b/inc/config.php
index b8e7617d..6244479f 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1239,9 +1239,20 @@
 	// Website favicon.
 	$config['url_favicon'] = 'static/favicon.ico';
 	
-	// EXPERIMENTAL: Try not to build pages when we shouldn't have to.
+	// Try not to build pages when we shouldn't have to.
 	$config['try_smarter'] = true;
 
+	// 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.
+	$config['smart_build'] = false;
+
+	// Smart build related: when a file doesn't exist, where should we redirect?
+	$config['page_404'] = '/404.html';
+
+	// Smart build related: extra entrypoints.
+	$config['smart_build_entrypoints'] = array();
+
 /*
  * ====================
  *  Mod settings

From 854b9689b305cbd23ed4abdaf24de143d5607a53 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 17:30:06 +0200
Subject: [PATCH 06/70] fix one of the previous commits: fix api_global

---
 inc/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 5a74bc09..2473ed7c 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1513,7 +1513,7 @@ function buildIndex($global_api = "yes") {
 	for ($page = 1; $page <= $config['max_pages']; $page++) {
 		$filename = $board['dir'] . ($page == 1 ? $config['file_index'] : sprintf($config['file_page'], $page));
 
-		if (!$config['api']['enabled'] && $global_api != "skip" && $config['try_smarter'] && isset($build_pages)
+		if ((!$config['api']['enabled'] || $global_api == "skip") && $config['try_smarter'] && isset($build_pages)
 			 && !empty($build_pages) && !in_array($page, $build_pages) )
 			continue;
 		$content = index($page);
@@ -1530,7 +1530,7 @@ function buildIndex($global_api = "yes") {
 			$catalog[$page-1] = $threads;
 		}
 
-		if ($config['api']['enabled'] && $global_api == "skip" && $config['try_smarter'] && isset($build_pages)
+		if ($config['api']['enabled'] && $global_api != "skip" && $config['try_smarter'] && isset($build_pages)
 			&& !empty($build_pages) && !in_array($page, $build_pages) )
 			continue;
 

From 1e5fb18f37c66fd7d14285312a08155384d404b7 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 17:50:59 +0200
Subject: [PATCH 07/70] smart_build.php: initial release

---
 smart_build.php | 139 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 smart_build.php

diff --git a/smart_build.php b/smart_build.php
new file mode 100644
index 00000000..6621238e
--- /dev/null
+++ b/smart_build.php
@@ -0,0 +1,139 @@
+<?php
+require_once("inc/functions.php");
+
+if (!$config['smart_build']) {
+  die('You need to enable $config["smart_build"]');
+}
+
+$config['smart_build'] = false; // Let's disable it, so we can build the page for real
+
+function sb_board($b, $page = 1) { global $config, $build_pages; $page = (int)$page;
+  if ($page < 1 && $page != -1) return false;
+  if (!openBoard($b)) return false;
+  if ($page > $config['max_pages']) return false;
+  $config['try_smarter'] = true;
+  $build_pages = array($page);
+  buildIndex("skip");
+  return true;
+}
+
+function sb_api_board($b, $page = 0) { $page = (int)$page;
+  return sb_board($b, $page + 1);
+}
+
+function sb_thread($b, $thread) { global $config; $thread = (int)$thread;
+  if (!openBoard($b)) return false;
+  buildThread($thread);
+  return true;
+}
+
+function sb_api($b) { global $config;
+  if (!openBoard($b)) return false;
+  $config['try_smarter'] = true;
+  $build_pages = array(-1);
+  buildIndex();
+  return true;
+}
+
+function sb_ukko() {
+  rebuildTheme("ukko", "post-thread");
+  return true;
+}
+
+function sb_catalog($b) {
+  rebuildTheme("catalog", "post-thread", $b); 
+  return true;
+}
+
+function sb_recent() {
+  rebuildTheme("recent", "post-thread"); 
+  return true;
+}
+
+$entrypoints = array();
+
+$entrypoints['/%b/']                       = 'sb_board';
+$entrypoints['/%b/'.$config['file_index']] = 'sb_board';
+$entrypoints['/%b/'.$config['file_page']]  = 'sb_board';
+$entrypoints['/%b/%d.json']                = 'sb_api_board';
+if ($config['api']['enabled']) {
+  $entrypoints['/%b/threads.json']         = 'sb_api';
+  $entrypoints['/%b/catalog.json']         = 'sb_api';
+}
+
+$entrypoints['/%b/'.$config['dir']['res'].$config['file_page']]          = 'sb_thread';
+$entrypoints['/%b/'.$config['dir']['res'].$config['file_page50']]        = 'sb_thread';
+if ($config['slugify']) {
+  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page_slug']]   = 'sb_thread';
+  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page50_slug']] = 'sb_thread';
+}
+if ($config['api']['enabled']) {
+  $entrypoints['/%b/'.$config['dir']['res'].'%d.json']                   = 'sb_thread';
+}
+
+$entrypoints['/*/']              = 'sb_ukko';
+$entrypoints['/*/index.html']    = 'sb_ukko';
+$entrypoints['/recent.html']     = 'sb_recent';
+$entrypoints['/%b/catalog.html'] = 'sb_catalog';
+
+$reached = false;
+
+$request = $_SERVER['REQUEST_URI'];
+
+foreach ($entrypoints as $id => $fun) {
+  $id = '@^' . preg_quote($id, '@') . '$@u'; 
+
+  $id = str_replace('%b', '('.$config['board_regex'].')', $id);
+  $id = str_replace('%d', '([0-9]+)',                     $id);
+  $id = str_replace('%s', '[a-zA-Z0-9-]+',                $id);
+
+  $matches = null;
+
+  if (preg_match ($id, $request, $matches)) {
+    array_shift($matches);
+
+    $reached = call_user_func_array($fun, $matches);
+
+    break;
+  }
+}
+
+if ($reached) {
+  if ($request[strlen($request)-1] == '/') {
+    $request .= 'index.html';
+  }
+  $request = '.'.$request;
+
+  if (!file_exists($request)) {
+    header("Location: ".$config['page_404']);
+    die();
+  }
+
+  header("HTTP/1.1 200 OK");
+  header("Status: 200 OK");
+  if (preg_match('/\.json$/', $request)) {
+    header("Content-Type", "application/json");
+  }
+  elseif (preg_match('/\.js$/', $request)) {
+    header("Content-Type", "text/javascript; charset=utf-8");
+  }
+  else {
+    header("Content-Type", "text/html; charset=utf-8");
+  }
+  header("Cache-Control: public, nocache, no-cache, max-age=0, must-revalidate");
+  header("Expires: Fri, 22 Feb 1991 06:00:00 GMT");
+  header("Last-Modified: ".date('r', filemtime($request)));
+
+  //if (isset ($_SERVER['HTTP_ACCEPT_ENCODING']) && preg_match('/gzip/', $_SERVER['HTTP_ACCEPT_ENCODING']) && file_exists($request.".gz")) {
+  //  header("Content-Encoding: gzip");
+  //  $file = fopen($request.".gz", 'r');
+  //}
+  //else {
+  $file = fopen($request, 'r');
+  //}
+  fpassthru($file);
+  fclose($file);
+}
+else {
+  header("Location: ".$config['page_404']);
+}

From 97e0380d658e89015cfd5048559bf71b025c50f5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 18:11:08 +0200
Subject: [PATCH 08/70] smart_build for buildIndex

---
 inc/functions.php | 101 +++++++++++++++++++++++++++-------------------
 1 file changed, 59 insertions(+), 42 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 2473ed7c..830b9761 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1501,53 +1501,62 @@ function checkMute() {
 function buildIndex($global_api = "yes") {
 	global $board, $config, $build_pages;
 
-	$pages = getPages();
-	if (!$config['try_smarter'])
-		$antibot = create_antibot($board['uri']);
+	if (!$config['smart_build']) {
+		$pages = getPages();
+		if (!$config['try_smarter'])
+			$antibot = create_antibot($board['uri']);
 
-	if ($config['api']['enabled']) {
-		$api = new Api();
-		$catalog = array();
+		if ($config['api']['enabled']) {
+			$api = new Api();
+			$catalog = array();
+		}
 	}
 
 	for ($page = 1; $page <= $config['max_pages']; $page++) {
 		$filename = $board['dir'] . ($page == 1 ? $config['file_index'] : sprintf($config['file_page'], $page));
+		$jsonFilename = $board['dir'] . ($page - 1) . '.json'; // pages should start from 0
 
-		if ((!$config['api']['enabled'] || $global_api == "skip") && $config['try_smarter'] && isset($build_pages)
-			 && !empty($build_pages) && !in_array($page, $build_pages) )
-			continue;
-		$content = index($page);
-		if (!$content)
-			break;
-
-		// json api
-		if ($config['api']['enabled']) {
-			$threads = $content['threads'];
-			$json = json_encode($api->translatePage($threads));
-			$jsonFilename = $board['dir'] . ($page - 1) . '.json'; // pages should start from 0
-			file_write($jsonFilename, $json);
-
-			$catalog[$page-1] = $threads;
-		}
-
-		if ($config['api']['enabled'] && $global_api != "skip" && $config['try_smarter'] && isset($build_pages)
-			&& !empty($build_pages) && !in_array($page, $build_pages) )
+		if ((!$config['api']['enabled'] || $global_api == "skip" || $config['smart_build']) && $config['try_smarter']
+			 && isset($build_pages) && !empty($build_pages) && !in_array($page, $build_pages) )
 			continue;
 
-		if ($config['try_smarter']) {
-			$antibot = create_antibot($board['uri'], 0 - $page);
-			$content['current_page'] = $page;
-		}
-		$antibot->reset();
-		$content['pages'] = $pages;
-		$content['pages'][$page-1]['selected'] = true;
-		$content['btn'] = getPageButtons($content['pages']);
-		$content['antibot'] = $antibot;
+		if (!$config['smart_build']) {
+			$content = index($page);
+			if (!$content)
+				break;
 
-		file_write($filename, Element('index.html', $content));
+			// json api
+			if ($config['api']['enabled']) {
+				$threads = $content['threads'];
+				$json = json_encode($api->translatePage($threads));
+				file_write($jsonFilename, $json);
+
+				$catalog[$page-1] = $threads;
+			}
+
+			if ($config['api']['enabled'] && $global_api != "skip" && $config['try_smarter'] && isset($build_pages)
+				&& !empty($build_pages) && !in_array($page, $build_pages) )
+				continue;
+
+			if ($config['try_smarter']) {
+				$antibot = create_antibot($board['uri'], 0 - $page);
+				$content['current_page'] = $page;
+			}
+			$antibot->reset();
+			$content['pages'] = $pages;
+			$content['pages'][$page-1]['selected'] = true;
+			$content['btn'] = getPageButtons($content['pages']);
+			$content['antibot'] = $antibot;
+
+			file_write($filename, Element('index.html', $content));
+		}
+		else {
+			file_unlink($filename);
+			file_unlink($jsonFilename);
+		}
 	}
 
-	if ($page < $config['max_pages']) {
+	if (!$config['smart_build'] && $page < $config['max_pages']) {
 		for (;$page<=$config['max_pages'];$page++) {
 			$filename = $board['dir'] . ($page==1 ? $config['file_index'] : sprintf($config['file_page'], $page));
 			file_unlink($filename);
@@ -1561,13 +1570,21 @@ function buildIndex($global_api = "yes") {
 
 	// json api catalog
 	if ($config['api']['enabled'] && $global_api != "skip") {
-		$json = json_encode($api->translateCatalog($catalog));
-		$jsonFilename = $board['dir'] . 'catalog.json';
-		file_write($jsonFilename, $json);
+		if ($config['smart_build']) {
+			$jsonFilename = $board['dir'] . 'catalog.json';
+			file_unlink($jsonFilename);
+			$jsonFilename = $board['dir'] . 'threads.json';
+			file_unlink($jsonFilename);
+		}
+		else {
+			$json = json_encode($api->translateCatalog($catalog));
+			$jsonFilename = $board['dir'] . 'catalog.json';
+			file_write($jsonFilename, $json);
 
-		$json = json_encode($api->translateCatalog($catalog, true));
-		$jsonFilename = $board['dir'] . 'threads.json';
-		file_write($jsonFilename, $json);
+			$json = json_encode($api->translateCatalog($catalog, true));
+			$jsonFilename = $board['dir'] . 'threads.json';
+			file_write($jsonFilename, $json);
+		}
 	}
 
 	if ($config['try_smarter'])

From d14594ce6384e7f07b56b941523fdc350e5dcac1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 18:13:32 +0200
Subject: [PATCH 09/70] functions.php fix: after_open_board support; so that we
 may disable smart_build immediately after open_board

---
 inc/functions.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/inc/functions.php b/inc/functions.php
index 830b9761..9cafa9a7 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -469,6 +469,11 @@ function openBoard($uri) {
 	$board = getBoardInfo($uri);
 	if ($board) {
 		setupBoard($board);
+
+		if (function_exists('after_open_board')) {
+			after_open_board();
+		}
+
 		return true;
 	}
 	return false;

From 66638348dc446e73b088224ff4f2c99a23292cfd Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 18:43:48 +0200
Subject: [PATCH 10/70] smart_build: buildThread

---
 inc/functions.php | 89 ++++++++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 39 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 9cafa9a7..0adade57 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2078,51 +2078,62 @@ function buildThread($id, $return = false, $mod = false) {
 		cache::delete("thread_{$board['uri']}_{$id}");
 	}
 
-	$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id`", $board['uri']));
-	$query->bindValue(':id', $id, PDO::PARAM_INT);
-	$query->execute() or error(db_error($query));
+	if (!$config['smart_build'] || $return || $mod) {
+		$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id`", $board['uri']));
+		$query->bindValue(':id', $id, PDO::PARAM_INT);
+		$query->execute() or error(db_error($query));
 
-	while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
-		if (!isset($thread)) {
-			$thread = new Thread($post, $mod ? '?/' : $config['root'], $mod);
-		} else {
-			$thread->add(new Post($post, $mod ? '?/' : $config['root'], $mod));
+		while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+			if (!isset($thread)) {
+				$thread = new Thread($post, $mod ? '?/' : $config['root'], $mod);
+			} else {
+				$thread->add(new Post($post, $mod ? '?/' : $config['root'], $mod));
+			}
+		}
+
+		// 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);
+
+		$body = Element('thread.html', array(
+			'board' => $board,
+			'thread' => $thread,
+			'body' => $thread->build(),
+			'config' => $config,
+			'id' => $id,
+			'mod' => $mod,
+			'hasnoko50' => $hasnoko50,
+			'isnoko50' => false,
+			'antibot' => $antibot,
+			'boardlist' => createBoardlist($mod),
+			'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
+		));
+
+		if ($config['try_smarter'] && !$mod)
+			$build_pages[] = thread_find_page($id);
+
+		// json api
+		if ($config['api']['enabled']) {
+			$api = new Api();
+			$json = json_encode($api->translateThread($thread));
+			$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . '.json';
+			file_write($jsonFilename, $json);
 		}
 	}
-
-	// 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);
-
-	$body = Element('thread.html', array(
-		'board' => $board,
-		'thread' => $thread,
-		'body' => $thread->build(),
-		'config' => $config,
-		'id' => $id,
-		'mod' => $mod,
-		'hasnoko50' => $hasnoko50,
-		'isnoko50' => false,
-		'antibot' => $antibot,
-		'boardlist' => createBoardlist($mod),
-		'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
-	));
-
-	if ($config['try_smarter'] && !$mod)
-		$build_pages[] = thread_find_page($id);
-
-	// json api
-	if ($config['api']['enabled']) {
-		$api = new Api();
-		$json = json_encode($api->translateThread($thread));
+	else {
 		$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . '.json';
-		file_write($jsonFilename, $json);
+		file_unlink($jsonFilename);
 	}
 
-	if ($return) {
+	if ($config['smart_build'] && !$return && !$mod) {
+		$noko50fn = $board['dir'] . $config['dir']['res'] . link_for(array('id' => $id), true);
+		file_unlink($noko50fn);
+
+		file_unlink($board['dir'] . $config['dir']['res'] . link_for(array('id' => $id)));
+	} else if ($return) {
 		return $body;
 	} else {
 		$noko50fn = $board['dir'] . $config['dir']['res'] . sprintf($config['file_page50'], $id);

From 4244f2cad36d1a9760e16b4b1f7088f981156296 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 1 Apr 2015 18:46:48 +0200
Subject: [PATCH 11/70] smart_build.php: misc fixes

---
 smart_build.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/smart_build.php b/smart_build.php
index 6621238e..d937241b 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -7,8 +7,12 @@ if (!$config['smart_build']) {
 
 $config['smart_build'] = false; // Let's disable it, so we can build the page for real
 
+function after_open_board() { global $config;
+  $config['smart_build'] = false;
+};
+
 function sb_board($b, $page = 1) { global $config, $build_pages; $page = (int)$page;
-  if ($page < 1 && $page != -1) return false;
+  if ($page < 1) return false;
   if (!openBoard($b)) return false;
   if ($page > $config['max_pages']) return false;
   $config['try_smarter'] = true;
@@ -46,7 +50,7 @@ function sb_catalog($b) {
 }
 
 function sb_recent() {
-  rebuildTheme("recent", "post-thread"); 
+  rebuildTheme("recent", "post-thread");
   return true;
 }
 

From 7581fc3094b2df85dc3342360b7ce043393be058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=81abanowski?= <marcin@6irc.net>
Date: Thu, 2 Apr 2015 20:27:10 +0200
Subject: [PATCH 12/70] smart_build.php: optimizations, guards, also a
 functionality to correct slugs

---
 smart_build.php | 68 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/smart_build.php b/smart_build.php
index d937241b..56299aee 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -25,12 +25,53 @@ function sb_api_board($b, $page = 0) { $page = (int)$page;
   return sb_board($b, $page + 1);
 }
 
-function sb_thread($b, $thread) { global $config; $thread = (int)$thread;
+function sb_thread($b, $thread, $slugcheck = false) { global $config; $thread = (int)$thread;
+  if ($thread < 1) return false;
+
+  if (!preg_match('/^'.$config['board_regex'].'$/u', $b)) return false;
+
+  if (Cache::get("thread_exists_".$b."_".$thread) == "no") return false;
+
+  $query = prepare(sprintf("SELECT MAX(`id`) AS `max` FROM ``posts_%s``", $b));
+  if (!$query->execute()) return false;
+
+  $s = $query->fetch(PDO::FETCH_ASSOC);
+  $max = $s['max'];
+
+  if ($thread > $max) return false;
+
+  $query = prepare(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL", $b));
+  $query->bindValue(':id', $thread);
+  
+  if (!$query->execute() || !$query->fetch(PDO::FETCH_ASSOC) ) {
+    Cache::set("thread_exists_".$b."_".$thread, "no");
+    return false;
+  }
+
+  if ($slugcheck && $config['slugify']) {
+    global $request;
+
+    $link = link_for(array("id" => $thread), $slugcheck === 50, array("uri" => $b));
+    $link = "/".$b."/".$config['dir']['res'].$link;
+
+    if ($link != $request) {
+      header("Location: $link", true, 301);
+      die();
+    }
+  }
+  
   if (!openBoard($b)) return false;
   buildThread($thread);
   return true;
 }
 
+function sb_thread_slugcheck($b, $thread) {
+  return sb_thread($b, $thread, true);
+}
+function sb_thread_slugcheck50($b, $thread) {
+  return sb_thread($b, $thread, 50);
+}
+
 function sb_api($b) { global $config;
   if (!openBoard($b)) return false;
   $config['try_smarter'] = true;
@@ -65,11 +106,11 @@ if ($config['api']['enabled']) {
   $entrypoints['/%b/catalog.json']         = 'sb_api';
 }
 
-$entrypoints['/%b/'.$config['dir']['res'].$config['file_page']]          = 'sb_thread';
-$entrypoints['/%b/'.$config['dir']['res'].$config['file_page50']]        = 'sb_thread';
+$entrypoints['/%b/'.$config['dir']['res'].$config['file_page']]          = 'sb_thread_slugcheck';
+$entrypoints['/%b/'.$config['dir']['res'].$config['file_page50']]        = 'sb_thread_slugcheck50';
 if ($config['slugify']) {
-  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page_slug']]   = 'sb_thread';
-  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page50_slug']] = 'sb_thread';
+  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page_slug']]   = 'sb_thread_slugcheck';
+  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page50_slug']] = 'sb_thread_slugcheck50';
 }
 if ($config['api']['enabled']) {
   $entrypoints['/%b/'.$config['dir']['res'].'%d.json']                   = 'sb_thread';
@@ -102,6 +143,18 @@ foreach ($entrypoints as $id => $fun) {
   }
 }
 
+function die_404() { global $config;
+  if (!$config['page_404']) {
+    header("HTTP/1.1 404 Not Exists");
+    header("Status: 404 Not Exists");
+    echo "<h1>404 Not Exists</h1><p>Page doesn't exist<hr><address>vichan</address>";
+  }
+  else {
+    header("Location: ".$config['page_404']);
+  }
+  die();
+}
+
 if ($reached) {
   if ($request[strlen($request)-1] == '/') {
     $request .= 'index.html';
@@ -109,8 +162,7 @@ if ($reached) {
   $request = '.'.$request;
 
   if (!file_exists($request)) {
-    header("Location: ".$config['page_404']);
-    die();
+    die_404();
   }
 
   header("HTTP/1.1 200 OK");
@@ -139,5 +191,5 @@ if ($reached) {
   fclose($file);
 }
 else {
-  header("Location: ".$config['page_404']);
+  die_404();
 }

From 076bd22586d61a0000b09296d65ba3c9ecff6e0e Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 2 Apr 2015 20:35:17 +0200
Subject: [PATCH 13/70] smart_build.php: additional fixes

---
 smart_build.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/smart_build.php b/smart_build.php
index 56299aee..d8352621 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -124,6 +124,7 @@ $entrypoints['/%b/catalog.html'] = 'sb_catalog';
 $reached = false;
 
 $request = $_SERVER['REQUEST_URI'];
+list($request) = explode('?', $request);
 
 foreach ($entrypoints as $id => $fun) {
   $id = '@^' . preg_quote($id, '@') . '$@u'; 
@@ -145,13 +146,14 @@ foreach ($entrypoints as $id => $fun) {
 
 function die_404() { global $config;
   if (!$config['page_404']) {
-    header("HTTP/1.1 404 Not Exists");
-    header("Status: 404 Not Exists");
-    echo "<h1>404 Not Exists</h1><p>Page doesn't exist<hr><address>vichan</address>";
+    header("HTTP/1.1 404 Not Found");
+    header("Status: 404 Not Found");
+    echo "<h1>404 Not Found</h1><p>Page doesn't exist<hr><address>vichan</address>";
   }
   else {
     header("Location: ".$config['page_404']);
   }
+
   die();
 }
 

From 0c3c982d7a7771e93d133405a519331dc59e8ddd Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 2 Apr 2015 20:43:06 +0200
Subject: [PATCH 14/70] smart_build.php: add a protection for +50; maybe we
 don`t need to rebuild after all?

---
 smart_build.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/smart_build.php b/smart_build.php
index d8352621..dd9450ae 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -59,6 +59,14 @@ function sb_thread($b, $thread, $slugcheck = false) { global $config; $thread =
       die();
     }
   }
+
+  if ($slugcheck == 50) { // Should we really generate +50 page? Maybe there are not enough posts anyway
+    global $request;
+    $r = str_replace("+50", "", $request);
+    $r = substr($r, 1); // Cut the slash
+
+    if (file_exists($r)) return false;
+  }
   
   if (!openBoard($b)) return false;
   buildThread($thread);

From 402dd58a4bf4ab6f4a67ba41d52631c4da5bbac4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 2 Apr 2015 20:53:50 +0200
Subject: [PATCH 15/70] smart_build.php: a small fix to catalog handling

---
 smart_build.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/smart_build.php b/smart_build.php
index dd9450ae..fb467233 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -94,6 +94,8 @@ function sb_ukko() {
 }
 
 function sb_catalog($b) {
+  if (!openBoard($b)) return false;
+
   rebuildTheme("catalog", "post-thread", $b); 
   return true;
 }

From 36b1714e42c905430daeada1c4174fb118832afd Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 2 Apr 2015 20:54:28 +0200
Subject: [PATCH 16/70] themes can use smart_build now

---
 templates/themes/catalog/theme.php | 25 +++++++++++++++++++++----
 templates/themes/recent/theme.php  | 10 ++++++++--
 templates/themes/ukko/theme.php    | 10 +++++++++-
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index a7dfabd9..42fad1ea 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -20,12 +20,25 @@
 		if ($action == 'all') {
 			foreach ($boards as $board) {
 				$b = new Catalog();
-				$b->build($settings, $board);
+
+				if ($config['smart_build']) {
+					file_unlink($config['dir']['home'] . $board . '/catalog.html');
+				}
+				else {
+					$b->build($settings, $board);
+				}
+
 				if (php_sapi_name() === "cli") echo "Rebuilding $board catalog...\n";
 			}
 		} elseif ($action == 'post-thread' || ($settings['update_on_posts'] && $action == 'post') || ($settings['update_on_posts'] && $action == 'post-delete') && (in_array($board, $boards) | $settings['all'])) {
 			$b = new Catalog();
-			$b->build($settings, $board);
+
+			if ($config['smart_build']) {
+				file_unlink($config['dir']['home'] . $board . '/catalog.html');
+			}
+			else {
+				$b->build($settings, $board);
+			}
 		}
 	}
 	
@@ -33,8 +46,12 @@
 	class Catalog {
 		public function build($settings, $board_name) {
 			global $config, $board;
-			
-			openBoard($board_name);
+
+			if ($board['uri'] != $board_name) {			
+				if (!openBoard($board_name)) {
+					error(sprintf(_("Board %s doesn't exist"), $board_name));
+				}
+			}
 			
 			$recent_images = array();
 			$recent_posts = array();
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index b1153477..57fe92b5 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -24,8 +24,14 @@
 			
 			$this->excluded = explode(' ', $settings['exclude']);
 			
-			if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
-				file_write($config['dir']['home'] . $settings['html'], $this->homepage($settings));
+			if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete') {
+				if ($config['smart_build']) {
+					file_unlink($config['dir']['home'] . $settings['html']);
+				}
+				else {
+					file_write($config['dir']['home'] . $settings['html'], $this->homepage($settings));
+				}
+			}
 		}
 		
 		// Build news page
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index 0f7c3e1a..fb851bdd 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -2,6 +2,8 @@
 	require 'info.php';
 	
 	function ukko_build($action, $settings) {
+		global $config;
+
 		$ukko = new ukko();
 		$ukko->settings = $settings;
 
@@ -9,7 +11,13 @@
 			return;
 		}
 
-		file_write($settings['uri'] . '/index.html', $ukko->build());
+		if ($config['smart_build']) {
+			file_unlink($settings['uri'] . '/index.html');
+		}
+		else {
+			file_write($settings['uri'] . '/index.html', $ukko->build());
+		}
+
 		file_write($settings['uri'] . '/ukko.js', Element('themes/ukko/ukko.js', array()));
 	}
 	

From 3b9e174173f56215f8b47e85879dcfbe1752bcc6 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 3 Apr 2015 05:57:39 +0200
Subject: [PATCH 17/70] sitemap theme for smart_build

---
 smart_build.php                    |  9 ++++++
 templates/themes/sitemap/theme.php | 49 +++++++++++++++++-------------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/smart_build.php b/smart_build.php
index fb467233..43734e4f 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -105,6 +105,11 @@ function sb_recent() {
   return true;
 }
 
+function sb_sitemap() {
+  rebuildTheme("sitemap", "all");
+  return true;
+}
+
 $entrypoints = array();
 
 $entrypoints['/%b/']                       = 'sb_board';
@@ -130,6 +135,7 @@ $entrypoints['/*/']              = 'sb_ukko';
 $entrypoints['/*/index.html']    = 'sb_ukko';
 $entrypoints['/recent.html']     = 'sb_recent';
 $entrypoints['/%b/catalog.html'] = 'sb_catalog';
+$entrypoints['/sitemap.xml']     = 'sb_sitemap';
 
 $reached = false;
 
@@ -185,6 +191,9 @@ if ($reached) {
   elseif (preg_match('/\.js$/', $request)) {
     header("Content-Type", "text/javascript; charset=utf-8");
   }
+  elseif (preg_match('/\.xml$/', $request)) {
+    header("Content-Type", "application/xml");
+  }
   else {
     header("Content-Type", "text/html; charset=utf-8");
   }
diff --git a/templates/themes/sitemap/theme.php b/templates/themes/sitemap/theme.php
index 3e048dd5..368afe58 100644
--- a/templates/themes/sitemap/theme.php
+++ b/templates/themes/sitemap/theme.php
@@ -10,30 +10,37 @@
 		//	- boards (board list changed)
 		//	- post (a post has been made)
 		//	- thread (a thread has been made)
+
+		if ($action != 'all') { 	
+			if ($action != 'post-thread' && $action != 'post-delete')
+				return;
 		
-		if ($action != 'post-thread' && $action != 'post-delete')
-			return;
-		
-		if (isset($settings['regen_time']) && $settings['regen_time'] > 0) {
-			if ($last_gen = @filemtime($settings['path'])) {
-				if (time() - $last_gen < (int)$settings['regen_time'])
-					return; // Too soon
+			if (isset($settings['regen_time']) && $settings['regen_time'] > 0) {
+				if ($last_gen = @filemtime($settings['path'])) {
+					if (time() - $last_gen < (int)$settings['regen_time'])
+						return; // Too soon
+				}
 			}
 		}
-		
-		$boards = explode(' ', $settings['boards']);
-		
-		$threads = array();
-		
-		foreach ($boards as $board) {
-			$query = query(sprintf("SELECT `id` AS `thread_id`, (SELECT `time` FROM ``posts_%s`` WHERE `thread` = `thread_id` OR `id` = `thread_id` ORDER BY `time` DESC LIMIT 1) AS `lastmod` FROM ``posts_%s`` WHERE `thread` IS NULL", $board, $board)) or error(db_error());
-			$threads[$board] = $query->fetchAll(PDO::FETCH_ASSOC);
+
+		if ($config['smart_build']) {
+			file_unlink($settings['path']);
 		}
+		else {		
+			$boards = explode(' ', $settings['boards']);
+		
+			$threads = array();
+		
+			foreach ($boards as $board) {
+				$query = query(sprintf("SELECT `id` AS `thread_id`, (SELECT `time` FROM ``posts_%s`` WHERE `thread` = `thread_id` OR `id` = `thread_id` ORDER BY `time` DESC LIMIT 1) AS `lastmod` FROM ``posts_%s`` WHERE `thread` IS NULL", $board, $board)) or error(db_error());
+				$threads[$board] = $query->fetchAll(PDO::FETCH_ASSOC);
+			}
 				
-		file_write($settings['path'], Element('themes/sitemap/sitemap.xml', Array(
-			'settings' => $settings,
-			'config' => $config,
-			'threads' => $threads,
-			'boards' => $boards,
-		)));
+			file_write($settings['path'], Element('themes/sitemap/sitemap.xml', Array(
+				'settings' => $settings,
+				'config' => $config,
+				'threads' => $threads,
+				'boards' => $boards,
+			)));
+		}
 	}

From da75891dd8d66070e0f7bbcb9e80fce0f4bc8126 Mon Sep 17 00:00:00 2001
From: Jayme Brereton <jayme@limesquare.com.au>
Date: Sun, 5 Apr 2015 20:14:58 +0930
Subject: [PATCH 18/70] made the define_groups function play nice on hhvm

---
 inc/functions.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 0adade57..56b43f6f 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -327,8 +327,12 @@ function verbose_error_handler($errno, $errstr, $errfile, $errline) {
 function define_groups() {
 	global $config;
 
-	foreach ($config['mod']['groups'] as $group_value => $group_name)
-		defined($group_name) or define($group_name, $group_value, true);
+	foreach ($config['mod']['groups'] as $group_value => $group_name) {
+		$group_name = strtoupper($group_name);
+		if(!defined($group_name)) {
+			define($group_name, $group_value, true);
+		}
+	}
 	
 	ksort($config['mod']['groups']);
 }

From c67520d8b16964efad4451e8fd5864b4b64c6d0d Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 16:20:59 +0200
Subject: [PATCH 19/70] ukko: small optimization: move js creation to install
 time

---
 templates/themes/ukko/info.php  | 1 +
 templates/themes/ukko/theme.php | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/themes/ukko/info.php b/templates/themes/ukko/info.php
index 45a687fc..9a0a53e6 100644
--- a/templates/themes/ukko/info.php
+++ b/templates/themes/ukko/info.php
@@ -49,6 +49,7 @@
 		function ukko_install($settings) {
 			if (!file_exists($settings['uri']))
 				@mkdir($settings['uri'], 0777) or error("Couldn't create " . $settings['uri'] . ". Check permissions.", true);
+	                file_write($settings['uri'] . '/ukko.js', Element('themes/ukko/ukko.js', array()));
 		}
 	}
 	
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index fb851bdd..ebf25c15 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -17,8 +17,6 @@
 		else {
 			file_write($settings['uri'] . '/index.html', $ukko->build());
 		}
-
-		file_write($settings['uri'] . '/ukko.js', Element('themes/ukko/ukko.js', array()));
 	}
 	
 	class ukko {

From 0e84743f7a62e2e18efa6fd49084b5e142a48221 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 16:38:16 +0200
Subject: [PATCH 20/70] optimization: get rid of one more sql query related to
 installed themes

---
 inc/functions.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 56b43f6f..9c3f880b 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -351,9 +351,22 @@ function rebuildThemes($action, $boardname = false) {
 	$_board = $board;
 
 	// List themes
-	$query = query("SELECT `theme` FROM ``theme_settings`` WHERE `name` IS NULL AND `value` IS NULL") or error(db_error());
+	if ($themes = Cache::get("themes")) {
+		// OK, we already have themes loaded
+	}
+	else {
+		$query = query("SELECT `theme` FROM ``theme_settings`` WHERE `name` IS NULL AND `value` IS NULL") or error(db_error());
 
-	while ($theme = $query->fetch(PDO::FETCH_ASSOC)) {
+		$themes = array();
+
+		while ($theme = $query->fetch(PDO::FETCH_ASSOC)) {
+			$themes[] = $theme;
+		}
+
+		Cache::set("themes", $themes);
+	}
+
+	foreach ($themes as $theme) {
 		// Restore them
 		$config = $_config;
 		$board = $_board;
@@ -407,6 +420,10 @@ function rebuildTheme($theme, $action, $board = false) {
 
 
 function themeSettings($theme) {
+	if ($settings = Cache::get("theme_settings_".$theme)) {
+		return $settings;
+	}
+
 	$query = prepare("SELECT `name`, `value` FROM ``theme_settings`` WHERE `theme` = :theme AND `name` IS NOT NULL");
 	$query->bindValue(':theme', $theme);
 	$query->execute() or error(db_error($query));
@@ -416,6 +433,8 @@ function themeSettings($theme) {
 		$settings[$s['name']] = $s['value'];
 	}
 
+	Cache::set("theme_settings_".$theme, $settings);
+
 	return $settings;
 }
 

From 099ea5bbbf84c8559271d7441cc003a10f6eb242 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 16:45:51 +0200
Subject: [PATCH 21/70] add tmp subdirectory (a filesystem used for further
 optimizations)

---
 tmp/cache/.gitkeep | 0
 tmp/locks/.gitkeep | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tmp/cache/.gitkeep
 create mode 100644 tmp/locks/.gitkeep

diff --git a/tmp/cache/.gitkeep b/tmp/cache/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/tmp/locks/.gitkeep b/tmp/locks/.gitkeep
new file mode 100644
index 00000000..e69de29b

From 3368ca1141c6c5a57d97978a7f3409a2f6d873a8 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 16:52:35 +0200
Subject: [PATCH 22/70] optimization: locale caching, so we don`t have to
 reparse instance-config every single time

---
 inc/functions.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 9c3f880b..1e6b9123 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -96,18 +96,28 @@ function loadConfig() {
 
 	// Initialize locale as early as possible
 
-	$config['locale'] = 'en';
+	// Those calls are expensive. Unfortunately, our cache system is not initialized at this point.
+	// So, we may store the locale in a tmp/ filesystem.
 
-	$configstr = file_get_contents('inc/instance-config.php');
+	if (file_exists($fn = 'tmp/cache/locale_' . ( isset($board['uri']) ? $board['uri'] : '' ) ) ) {
+		$config['locale'] = file_get_contents($fn);
+	}
+	else {
+		$config['locale'] = 'en';
+
+		$configstr = file_get_contents('inc/instance-config.php');
 
 		if (isset($board['dir']) && file_exists($board['dir'] . '/config.php')) {
-				$configstr .= file_get_contents($board['dir'] . '/config.php');
+			$configstr .= file_get_contents($board['dir'] . '/config.php');
 		}
-	$matches = array();
-	preg_match_all('/[^\/*#]\$config\s*\[\s*[\'"]locale[\'"]\s*\]\s*=\s*([\'"])(.*?)\1/', $configstr, $matches);
-	if ($matches && isset ($matches[2]) && $matches[2]) {
-		$matches = $matches[2];
-		$config['locale'] = $matches[count($matches)-1];
+		$matches = array();
+		preg_match_all('/[^\/*#]\$config\s*\[\s*[\'"]locale[\'"]\s*\]\s*=\s*([\'"])(.*?)\1/', $configstr, $matches);
+		if ($matches && isset ($matches[2]) && $matches[2]) {
+			$matches = $matches[2];
+			$config['locale'] = $matches[count($matches)-1];
+		}
+
+		file_put_contents($fn, $config['locale']);
 	}
 
 	if ($config['locale'] != $current_locale) {

From 372e3fc3fce2d40a7eb5b49195d326c2c7274d7a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 16:59:04 +0200
Subject: [PATCH 23/70] uncache themes on settings change

---
 inc/mod/pages.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 7efabae6..97a33487 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -3333,10 +3333,14 @@ function mod_theme_configure($theme_name) {
 				$query->bindValue(':value', $_POST[$conf['name']]);
 			$query->execute() or error(db_error($query));
 		}
-		
+
 		$query = prepare("INSERT INTO ``theme_settings`` VALUES(:theme, NULL, NULL)");
 		$query->bindValue(':theme', $theme_name);
 		$query->execute() or error(db_error($query));
+
+		// Clean cache
+		Cache::delete("themes");
+		Cache::delete("theme_settings_".$theme);
 		
 		$result = true;
 		$message = false;
@@ -3384,11 +3388,15 @@ function mod_theme_uninstall($theme_name) {
 
 	if (!hasPermission($config['mod']['themes']))
 		error($config['error']['noaccess']);
-	
+
 	$query = prepare("DELETE FROM ``theme_settings`` WHERE `theme` = :theme");
 	$query->bindValue(':theme', $theme_name);
 	$query->execute() or error(db_error($query));
 
+	// Clean cache
+	Cache::delete("themes");
+	Cache::delete("theme_settings_".$theme);
+
 	header('Location: ?/themes', true, $config['redirect_http']);
 }
 

From 093b1b605ba1ccc3d55d984acb315d8345cbb1a2 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 17:13:55 +0200
Subject: [PATCH 24/70] cache.php: fs cache

---
 inc/cache.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/inc/cache.php b/inc/cache.php
index d1200919..d6bc9211 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -50,6 +50,17 @@ class Cache {
 			case 'php':
 				$data = isset(self::$cache[$key]) ? self::$cache[$key] : false;
 				break;
+			case 'fs':
+				$key = str_replace('/', '::', $key);
+				$key = str_replace("\0", '', $key);
+				if (!file_exists('tmp/cache/'.$key)) {
+					$data = false;
+				}
+				else {
+					$data = file_get_contents('tmp/cache/'.$key);
+					$data = json_decode($data, true);
+				}
+				break;
 			case 'redis':
 				if (!self::$cache)
 					self::init();
@@ -87,6 +98,11 @@ class Cache {
 			case 'xcache':
 				xcache_set($key, $value, $expires);
 				break;
+			case 'fs':
+				$key = str_replace('/', '::', $key);
+				$key = str_replace("\0", '', $key);
+				file_put_contents('tmp/cache/'.$key, json_encode($value));
+				break;
 			case 'php':
 				self::$cache[$key] = $value;
 				break;
@@ -113,6 +129,11 @@ class Cache {
 			case 'xcache':
 				xcache_unset($key);
 				break;
+			case 'fs':
+				$key = str_replace('/', '::', $key);
+				$key = str_replace("\0", '', $key);
+				unlink('tmp/cache/'.$key);
+				break;
 			case 'php':
 				unset(self::$cache[$key]);
 				break;
@@ -134,6 +155,12 @@ class Cache {
 			case 'php':
 				self::$cache = array();
 				break;
+			case 'fs':
+				$files = glob('tmp/cache/*');
+				foreach ($files as $file) {
+					unlink($file);
+				}
+				break;
 			case 'redis':
 				if (!self::$cache)
 					self::init();

From 5c5751647dd2de6ede57ecf622df0cfa157bd6ed Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 18:46:45 +0200
Subject: [PATCH 25/70] update gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8fecf08c..825799da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,12 @@ Thumbs.db
 *.orig
 *~
 
+# tmp filesystem
+/tmp/cache/*
+/tmp/locks/*
+!/tmp/cache/.gitkeep
+!/tmp/locks/.gitkeep
+
 #vichan custom
 favicon.ico
 /static/spoiler.png

From 7c78dad6d89a39795d0ec35c2927609960f692d2 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 18:42:23 +0200
Subject: [PATCH 26/70] =?UTF-8?q?smart=5Fbuild.php:=20nginx=20=E2=80=93=20?=
 =?UTF-8?q?cache=20404=20replies=20for=20120s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 smart_build.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smart_build.php b/smart_build.php
index 43734e4f..993d7858 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -169,7 +169,7 @@ function die_404() { global $config;
   else {
     header("Location: ".$config['page_404']);
   }
-
+  header("X-Accel-Expires: 120");
   die();
 }
 

From 8da7ec3bdedc480dbd4cf732e003cbb5795126e1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 18:59:33 +0200
Subject: [PATCH 27/70] try_smarter: fix two bugs. 1. uncovered by the second,
 during a bump only the page the thread was on and first page were rebuild,
 despite threads rearranging their positions on the remaining pages. happening
 always. 2. during smart build, the page wasn`t ordered to be rebuilt

---
 inc/functions.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 1e6b9123..af029d43 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1049,8 +1049,9 @@ function bumpThread($id) {
 	if (event('bump', $id))
 		return true;
 
-	if ($config['try_smarter'])
-		$build_pages[] = thread_find_page($id);
+	if ($config['try_smarter']) {
+		$build_pages = array_merge(range(1, thread_find_page($id)), $build_pages);
+	}
 
 	$query = prepare(sprintf("UPDATE ``posts_%s`` SET `bump` = :time WHERE `id` = :id AND `thread` IS NULL", $board['uri']));
 	$query->bindValue(':time', time(), PDO::PARAM_INT);
@@ -2111,6 +2112,9 @@ function buildThread($id, $return = false, $mod = false) {
 		cache::delete("thread_{$board['uri']}_{$id}");
 	}
 
+	if ($config['try_smarter'] && !$mod)
+		$build_pages[] = thread_find_page($id);
+
 	if (!$config['smart_build'] || $return || $mod) {
 		$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id`", $board['uri']));
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
@@ -2145,9 +2149,6 @@ function buildThread($id, $return = false, $mod = false) {
 			'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
 		));
 
-		if ($config['try_smarter'] && !$mod)
-			$build_pages[] = thread_find_page($id);
-
 		// json api
 		if ($config['api']['enabled']) {
 			$api = new Api();

From c1045de87ff7bc8b1d8e1f4e0e7cb7c177db5cf3 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 19:28:00 +0200
Subject: [PATCH 28/70] infinity/smart_build: disable slugify for now

---
 smart_build.php | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/smart_build.php b/smart_build.php
index 993d7858..da1966d0 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -48,18 +48,6 @@ function sb_thread($b, $thread, $slugcheck = false) { global $config; $thread =
     return false;
   }
 
-  if ($slugcheck && $config['slugify']) {
-    global $request;
-
-    $link = link_for(array("id" => $thread), $slugcheck === 50, array("uri" => $b));
-    $link = "/".$b."/".$config['dir']['res'].$link;
-
-    if ($link != $request) {
-      header("Location: $link", true, 301);
-      die();
-    }
-  }
-
   if ($slugcheck == 50) { // Should we really generate +50 page? Maybe there are not enough posts anyway
     global $request;
     $r = str_replace("+50", "", $request);
@@ -73,9 +61,6 @@ function sb_thread($b, $thread, $slugcheck = false) { global $config; $thread =
   return true;
 }
 
-function sb_thread_slugcheck($b, $thread) {
-  return sb_thread($b, $thread, true);
-}
 function sb_thread_slugcheck50($b, $thread) {
   return sb_thread($b, $thread, 50);
 }
@@ -121,12 +106,8 @@ if ($config['api']['enabled']) {
   $entrypoints['/%b/catalog.json']         = 'sb_api';
 }
 
-$entrypoints['/%b/'.$config['dir']['res'].$config['file_page']]          = 'sb_thread_slugcheck';
+$entrypoints['/%b/'.$config['dir']['res'].$config['file_page']]          = 'sb_thread';
 $entrypoints['/%b/'.$config['dir']['res'].$config['file_page50']]        = 'sb_thread_slugcheck50';
-if ($config['slugify']) {
-  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page_slug']]   = 'sb_thread_slugcheck';
-  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page50_slug']] = 'sb_thread_slugcheck50';
-}
 if ($config['api']['enabled']) {
   $entrypoints['/%b/'.$config['dir']['res'].'%d.json']                   = 'sb_thread';
 }

From 9907ae29b818624ec3c9e8a4c6c82d927270fa29 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 27 Feb 2015 21:16:03 +0100
Subject: [PATCH 29/70] rearrange config processing a bit

---
 inc/functions.php | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index af029d43..72487d23 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -138,10 +138,6 @@ function loadConfig() {
 		init_locale($config['locale'], $error);
 	}
 
-	if (!isset($__version))
-		$__version = file_exists('.installed') ? trim(file_get_contents('.installed')) : false;
-	$config['version'] = $__version;
-
 	date_default_timezone_set($config['timezone']);
 
 	if (!isset($config['global_message']))
@@ -150,6 +146,7 @@ function loadConfig() {
 	if (!isset($config['post_url']))
 		$config['post_url'] = $config['root'] . $config['file_post'];
 
+
 	if (!isset($config['referer_match']))
 		if (isset($_SERVER['HTTP_HOST'])) {
 			$config['referer_match'] = '/^' .
@@ -220,19 +217,12 @@ function loadConfig() {
 	if (!isset($config['user_flags']))
 		$config['user_flags'] = array();
 
+	// Effectful config processing below:
+
 	if ($config['root_file']) {
 		chdir($config['root_file']);
 	}
 
-	if ($config['verbose_errors']) {
-		set_error_handler('verbose_error_handler');
-		error_reporting(E_ALL);
-		ini_set('display_errors', true);
-		ini_set('html_errors', false);
-	} else {
-		ini_set('display_errors', false);
-	}
-
 	// Keep the original address to properly comply with other board configurations
 	if (!isset($__ip))
 		$__ip = $_SERVER['REMOTE_ADDR'];
@@ -241,11 +231,25 @@ function loadConfig() {
 	if (preg_match('/^\:\:(ffff\:)?(\d+\.\d+\.\d+\.\d+)$/', $__ip, $m))
 		$_SERVER['REMOTE_ADDR'] = $m[2];
 
+	if (!isset($__version))
+		$__version = file_exists('.installed') ? trim(file_get_contents('.installed')) : false;
+	$config['version'] = $__version;
+
+	if ($config['verbose_errors']) {
+		set_error_handler('verbose_error_handler');
+		error_reporting(E_ALL);
+		ini_set('display_errors', true);
+		ini_set('html_errors', false);
+	} else {
+		ini_set('display_errors', false);
+	}
+
 	if ($config['syslog'])
 		openlog('tinyboard', LOG_ODELAY, LOG_SYSLOG); // open a connection to sysem logger
 
 	if ($config['recaptcha'])
 		require_once 'inc/lib/recaptcha/recaptchalib.php';
+	
 	if ($config['cache']['enabled'])
 		require_once 'inc/cache.php';
 

From 18e5de9a1ffda546313462cb22fcf94bccfa375d Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 18:48:53 +0200
Subject: [PATCH 30/70] cache_config preliminary release

---
 inc/config.php    |  5 ++++
 inc/functions.php | 73 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 6244479f..e1ad3eec 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -132,6 +132,11 @@
 	// Tinyboard to use.
 	$config['cache']['redis'] = array('localhost', 6379, '', 1);
 
+	// EXPERIMENTAL: Should we cache configs? Warning: this changes board behaviour, i'd say, a lot.
+	// If you have any lambdas/includes present in your config, you should move them to instance-functions.php
+	// (this file will be explicitly loaded during cache hit, but not during cache miss).
+	$config['cache_config'] = false;
+
 /*
  * ====================
  *  Cookie settings
diff --git a/inc/functions.php b/inc/functions.php
index 72487d23..8aa0e4d8 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -50,15 +50,40 @@ $current_locale = 'en';
 
 
 function loadConfig() {
-	global $board, $config, $__ip, $debug, $__version, $microtime_start, $current_locale;
+	global $board, $config, $__ip, $debug, $__version, $microtime_start, $current_locale, $events;
 
 	$error = function_exists('error') ? 'error' : 'basic_error_function_because_the_other_isnt_loaded_yet';
 
-	reset_events();
+	$boardsuffix = isset($board['uri']) ? $board['uri'] : '';
 
 	if (!isset($_SERVER['REMOTE_ADDR']))
 		$_SERVER['REMOTE_ADDR'] = '0.0.0.0';
 
+	if (file_exists('tmp/cache/cache_config.php')) {
+		require_once('tmp/cache/cache_config.php');
+	}
+
+
+	if (isset($config['cache_config']) && 
+	    $config['cache_config'] &&
+            $config = Cache::get('config_' . $boardsuffix ) ) {
+		$events = Cache::get('events_' . $boardsuffix );
+
+		if (file_exists('inc/instance-functions.php')) {
+			require_once('inc/instance-functions.php');
+		}
+
+		if ($config['locale'] != $current_locale) {
+                	$current_locale = $config['locale'];
+                	init_locale($config['locale'], $error);
+        	}
+	}
+	else {
+		$config = array();
+	// We will indent that later.
+
+	reset_events();	
+
 	$arrays = array(
 		'db',
 		'api',
@@ -86,7 +111,6 @@ function loadConfig() {
 		'dashboard_links'
 	);
 
-	$config = array();
 	foreach ($arrays as $key) {
 		$config[$key] = array();
 	}
@@ -99,7 +123,7 @@ function loadConfig() {
 	// Those calls are expensive. Unfortunately, our cache system is not initialized at this point.
 	// So, we may store the locale in a tmp/ filesystem.
 
-	if (file_exists($fn = 'tmp/cache/locale_' . ( isset($board['uri']) ? $board['uri'] : '' ) ) ) {
+	if (file_exists($fn = 'tmp/cache/locale_' . $boardsuffix ) ) {
 		$config['locale'] = file_get_contents($fn);
 	}
 	else {
@@ -138,8 +162,6 @@ function loadConfig() {
 		init_locale($config['locale'], $error);
 	}
 
-	date_default_timezone_set($config['timezone']);
-
 	if (!isset($config['global_message']))
 		$config['global_message'] = false;
 
@@ -217,8 +239,22 @@ function loadConfig() {
 	if (!isset($config['user_flags']))
 		$config['user_flags'] = array();
 
+	if (!isset($__version))
+		$__version = file_exists('.installed') ? trim(file_get_contents('.installed')) : false;
+	$config['version'] = $__version;
+
+	if ($config['allow_roll'])
+		event_handler('post', 'diceRoller');
+
+	if (is_array($config['anonymous']))
+		$config['anonymous'] = $config['anonymous'][array_rand($config['anonymous'])];
+
+
+	}
 	// Effectful config processing below:
 
+	date_default_timezone_set($config['timezone']);
+
 	if ($config['root_file']) {
 		chdir($config['root_file']);
 	}
@@ -231,10 +267,6 @@ function loadConfig() {
 	if (preg_match('/^\:\:(ffff\:)?(\d+\.\d+\.\d+\.\d+)$/', $__ip, $m))
 		$_SERVER['REMOTE_ADDR'] = $m[2];
 
-	if (!isset($__version))
-		$__version = file_exists('.installed') ? trim(file_get_contents('.installed')) : false;
-	$config['version'] = $__version;
-
 	if ($config['verbose_errors']) {
 		set_error_handler('verbose_error_handler');
 		error_reporting(E_ALL);
@@ -258,13 +290,22 @@ function loadConfig() {
 		event_handler('post', 'postHandler');
 	}
 
-	if (is_array($config['anonymous']))
-		$config['anonymous'] = $config['anonymous'][array_rand($config['anonymous'])];
-
-	if ($config['allow_roll'])
-		event_handler('post', 'diceRoller');
-
 	event('load-config');
+
+	if ($config['cache_config'] && !isset ($config['cache_config_loaded'])) {
+		file_put_contents('tmp/cache/cache_config.php', '<?php '.
+			'$config = array();'.
+			'$config[\'cache\'] = '.
+			var_export($config['cache'], true).';'.
+			'$config[\'cache_config\'] = true;'.
+			'require_once(\'inc/cache.php\');'
+		);
+
+		$config['cache_config_loaded'] = true;
+
+		Cache::set('config_'.$boardsuffix, $config);
+		Cache::set('events_'.$boardsuffix, $events);
+	}
 	
 	if ($config['debug']) {
 		if (!isset($debug)) {

From 0969d1b538aeaf685470a05335d1e65637d65f58 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 20:04:27 +0200
Subject: [PATCH 31/70] cache_config: fix debug notice

---
 inc/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 8aa0e4d8..33a6f5d4 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -295,9 +295,9 @@ function loadConfig() {
 	if ($config['cache_config'] && !isset ($config['cache_config_loaded'])) {
 		file_put_contents('tmp/cache/cache_config.php', '<?php '.
 			'$config = array();'.
-			'$config[\'cache\'] = '.
-			var_export($config['cache'], true).';'.
+			'$config[\'cache\'] = '.var_export($config['cache'], true).';'.
 			'$config[\'cache_config\'] = true;'.
+			'$config[\'debug\'] = '.var_export($config['debug'], true).';'.
 			'require_once(\'inc/cache.php\');'
 		);
 

From d67313f9fae077e1df6a6ac51149860535cd38f0 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 5 Apr 2015 20:25:57 +0200
Subject: [PATCH 32/70] groups were not defined

---
 inc/functions.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/functions.php b/inc/functions.php
index 33a6f5d4..30de9d15 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -69,6 +69,8 @@ function loadConfig() {
             $config = Cache::get('config_' . $boardsuffix ) ) {
 		$events = Cache::get('events_' . $boardsuffix );
 
+		define_groups();
+
 		if (file_exists('inc/instance-functions.php')) {
 			require_once('inc/instance-functions.php');
 		}

From 9ca7dae9c9a553aa85e73e054b00a076a3607105 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 19:50:50 +0200
Subject: [PATCH 33/70] infinity/smart-build: clean cache on rebuilding the
 boards

---
 inc/8chan-mod-pages.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/inc/8chan-mod-pages.php b/inc/8chan-mod-pages.php
index 3eb7de07..135a1c46 100644
--- a/inc/8chan-mod-pages.php
+++ b/inc/8chan-mod-pages.php
@@ -661,6 +661,18 @@ EOT;
 			// Faster than openBoard and bypasses cache...we're trusting the PHP output
 			// to be safe enough to run with every request, we can eval it here.
 			eval(str_replace('flags.php', "$b/flags.php", preg_replace('/^\<\?php$/m', '', $config_file)));
+			// czaks: maybe reconsider using it, now that config is cached?
+
+			// Clean the cache
+			if ($config['cache']['enabled']) {
+				cache::delete('board_' . $board['uri']);
+				cache::delete('all_boards');
+
+				cache::delete('config_' . $board['uri']);
+				cache::delete('events_' . $board['uri']);
+
+				unlink('tmp/cache/locale_' . $board['uri']);
+			}
 
 			// be smarter about rebuilds...only some changes really require us to rebuild all threads
 			if ($_config['captcha']['enabled'] != $config['captcha']['enabled']
@@ -686,10 +698,5 @@ EOT;
  
 		$css = @file_get_contents('stylesheets/board/' . $board['uri'] . '.css');
 	
-		if ($config['cache']['enabled']) {
-			cache::delete('board_' . $board['uri']);
-			cache::delete('all_boards');
-		}
-
 		mod_page(_('Board configuration'), 'mod/settings.html', array('board'=>$board, 'css'=>prettify_textarea($css), 'token'=>make_secure_link_token('settings/'.$board['uri']), 'languages'=>$possible_languages,'allowed_urls'=>$config['allowed_offsite_urls']));
 	};

From be4bf70278ba69a957aa953864484935932ee70b Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 20:00:18 +0200
Subject: [PATCH 34/70] infinity/smart-build: don`t include gettext php lib if
 a shared object is loaded: adaptation of vichan-devel/cbbebc

---
 inc/functions.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/functions.php b/inc/functions.php
index 30de9d15..821cc48a 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -19,7 +19,9 @@ require_once 'inc/database.php';
 require_once 'inc/events.php';
 require_once 'inc/api.php';
 require_once 'inc/bans.php';
-require_once 'inc/lib/gettext/gettext.inc';
+if (!extension_loaded('gettext')) {
+	require_once 'inc/lib/gettext/gettext.inc';
+}
 require_once 'inc/lib/parsedown/Parsedown.php'; // todo: option for parsedown instead of Tinyboard/STI markup
 require_once 'inc/mod/auth.php';
 

From 798121060caf7d31b3e70ea295ad5759c3e0d6a1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 22:18:05 +0200
Subject: [PATCH 35/70] infinity/smart-build: missing slugify patchset fix

---
 inc/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 821cc48a..480df77f 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2212,10 +2212,10 @@ function buildThread($id, $return = false, $mod = false) {
 	}
 
 	if ($config['smart_build'] && !$return && !$mod) {
-		$noko50fn = $board['dir'] . $config['dir']['res'] . link_for(array('id' => $id), true);
+		$noko50fn = $board['dir'] . $config['dir']['res'] . sprintf($config['file_page50'], $id);
 		file_unlink($noko50fn);
 
-		file_unlink($board['dir'] . $config['dir']['res'] . link_for(array('id' => $id)));
+		file_unlink($board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $id));
 	} else if ($return) {
 		return $body;
 	} else {

From ca92457e889bd5dc11a34a8f3cddcc4aa48a3a0b Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 22:37:47 +0200
Subject: [PATCH 36/70] infinity/smart-build: rearrange the config files for
 cache_config

---
 inc/8chan-functions.php           |  20 +
 inc/8chan-mod-pages-functions.php | 680 ++++++++++++++++++++++++++++++
 inc/8chan-mod-pages.php           | 662 +----------------------------
 inc/instance-config.php           |  17 +-
 inc/instance-functions.php        |  17 +
 5 files changed, 727 insertions(+), 669 deletions(-)
 create mode 100644 inc/8chan-mod-pages-functions.php
 create mode 100644 inc/instance-functions.php

diff --git a/inc/8chan-functions.php b/inc/8chan-functions.php
index 5a50ec74..ef289616 100644
--- a/inc/8chan-functions.php
+++ b/inc/8chan-functions.php
@@ -54,3 +54,23 @@ function human_time_diff( $from, $to = '' ) {
 
 	return $since;
 }
+
+function is_billion_laughs($arr1, $arr2) {
+        $arr = array();
+        foreach ($arr1 as $k => $v) {
+		$arr[$v] = $arr2[$k];
+        }
+
+        for ($i = 0; $i <= sizeof($arr); $i++) {
+		$cur = array_slice($arr, $i, 1);
+		$pst = array_slice($arr, 0, $i);
+                if (!$cur) continue;
+                $kk = array_keys($cur)[0];
+                $vv = array_values($cur)[0];
+                foreach ($pst as $k => $v) {
+                        if (str_replace($kk, $vv, $v) != $v)
+                                return true;
+                }
+        }
+        return false;
+}
diff --git a/inc/8chan-mod-pages-functions.php b/inc/8chan-mod-pages-functions.php
new file mode 100644
index 00000000..eef96790
--- /dev/null
+++ b/inc/8chan-mod-pages-functions.php
@@ -0,0 +1,680 @@
+<?php
+	$config['mod']['show_ip'] = GLOBALVOLUNTEER;
+	$config['mod']['show_ip_less'] = BOARDVOLUNTEER;
+	$config['mod']['manageusers'] = GLOBALVOLUNTEER;
+	$config['mod']['noticeboard_post'] = GLOBALVOLUNTEER;
+	$config['mod']['search'] = GLOBALVOLUNTEER;
+	$config['mod']['clean_global'] = GLOBALVOLUNTEER;
+	$config['mod']['view_notes'] = DISABLED;
+	$config['mod']['create_notes'] = DISABLED;
+	$config['mod']['edit_config'] = DISABLED;
+	$config['mod']['debug_recent'] = ADMIN;
+	$config['mod']['debug_antispam'] = ADMIN;
+	$config['mod']['noticeboard_post'] = ADMIN;
+	$config['mod']['modlog'] = GLOBALVOLUNTEER;
+	$config['mod']['mod_board_log'] = MOD;
+	$config['mod']['editpost'] = BOARDVOLUNTEER;
+	$config['mod']['edit_banners'] = MOD;
+	$config['mod']['edit_flags'] = MOD;
+	$config['mod']['edit_settings'] = MOD;
+	$config['mod']['edit_volunteers'] = MOD;
+	$config['mod']['edit_tags'] = MOD;
+	$config['mod']['clean'] = BOARDVOLUNTEER;
+	// new perms
+
+	$config['mod']['ban'] = BOARDVOLUNTEER;
+	$config['mod']['bandelete'] = BOARDVOLUNTEER;
+	$config['mod']['unban'] = BOARDVOLUNTEER;
+	$config['mod']['deletebyip'] = BOARDVOLUNTEER;
+	$config['mod']['sticky'] = BOARDVOLUNTEER;
+	$config['mod']['cycle'] = BOARDVOLUNTEER;
+	$config['mod']['lock'] = BOARDVOLUNTEER;
+	$config['mod']['postinlocked'] = BOARDVOLUNTEER;
+	$config['mod']['bumplock'] = BOARDVOLUNTEER;
+	$config['mod']['view_bumplock'] = BOARDVOLUNTEER;
+	$config['mod']['bypass_field_disable'] = BOARDVOLUNTEER;
+	$config['mod']['view_banlist'] = BOARDVOLUNTEER;
+	$config['mod']['view_banstaff'] = BOARDVOLUNTEER;
+	$config['mod']['public_ban'] = BOARDVOLUNTEER;
+	$config['mod']['recent'] = BOARDVOLUNTEER;
+	$config['mod']['ban_appeals'] = BOARDVOLUNTEER;
+	$config['mod']['view_ban_appeals'] = BOARDVOLUNTEER;
+	$config['mod']['view_ban'] = BOARDVOLUNTEER;
+	$config['mod']['reassign_board'] = GLOBALVOLUNTEER;
+	$config['mod']['move'] = GLOBALVOLUNTEER;
+	$config['mod']['shadow_capcode'] = 'Global Volunteer';
+
+
+	function mod_8_tags ($b) {
+		global $board, $config;
+
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		if (!hasPermission($config['mod']['edit_tags'], $b))
+			error($config['error']['noaccess']);
+
+		if (isset($_POST['tags'])) {
+			if (sizeof($_POST['tags']) > 5)
+				error(_('Too many tags.'));
+
+			$delete = prepare('DELETE FROM ``board_tags`` WHERE uri = :uri');
+			$delete->bindValue(':uri', $b);
+			$delete->execute();
+
+			foreach ($_POST['tags'] as $i => $tag) {
+				if ($tag) {
+					if (strlen($tag) > 255)
+						continue;
+
+					$insert = prepare('INSERT INTO ``board_tags``(uri, tag) VALUES (:uri, :tag)');
+					$insert->bindValue(':uri', $b);
+					$insert->bindValue(':tag', utf8tohtml($tag));
+					$insert->execute();
+				}
+			}
+
+			$update = prepare('UPDATE ``boards`` SET sfw = :sfw WHERE uri = :uri');
+			$update->bindValue(':uri', $b);
+			$update->bindValue(':sfw', isset($_POST['sfw']));
+			$update->execute();
+		}
+		$query = prepare('SELECT * FROM ``board_tags`` WHERE uri = :uri');
+		$query->bindValue(':uri', $b);
+		$query->execute();
+
+		$tags = $query->fetchAll();
+
+		$query = prepare('SELECT `sfw` FROM ``boards`` WHERE uri = :uri');
+		$query->bindValue(':uri', $b);
+		$query->execute();
+
+		$sfw = $query->fetchColumn();
+
+		mod_page(_('Edit tags'), 'mod/tags.html', array('board'=>$board,'token'=>make_secure_link_token('tags/'.$board['uri']), 'tags'=>$tags, 'sfw'=>$sfw));
+	}
+
+	function mod_8_reassign($b) {
+		global $board, $config;
+
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		if (!hasPermission($config['mod']['reassign_board'], $b))
+			error($config['error']['noaccess']);
+
+		$query = query("SELECT id, username FROM mods WHERE boards = '$b' AND type = 20");
+		$mods = $query->fetchAll();
+
+		if (!$mods) {
+			error('No mods?');
+		}
+
+		$password = base64_encode(openssl_random_pseudo_bytes(9));
+		$salt = generate_salt();
+		$hashed = hash('sha256', $salt . sha1($password));
+
+		$query = prepare('UPDATE ``mods`` SET `password` = :hashed, `salt` = :salt WHERE BINARY username = :mod');
+		$query->bindValue(':hashed', $hashed);
+		$query->bindValue(':salt', $salt);
+		$query->bindValue(':mod', $mods[0]['username']);
+		$query->execute();
+
+		$body = "Thanks for your interest in this board. Kindly find the username and password below. You can login at https://8ch.net/mod.php.<br>Username: {$mods[0]['username']}<br>Password: {$password}<br>Thanks for using 8chan!";
+
+		modLog("Reassigned board /$b/");
+		
+		mod_page(_('Edit reassign'), 'blank.html', array('board'=>$board,'token'=>make_secure_link_token('reassign/'.$board['uri']),'body'=>$body));
+	}
+
+	function mod_8_volunteers($b) {
+		global $board, $config, $pdo;
+		if (!hasPermission($config['mod']['edit_volunteers'], $b))
+			error($config['error']['noaccess']);
+
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		if (isset($_POST['username'], $_POST['password'])) {
+			$query = prepare('SELECT * FROM ``mods`` WHERE type = 19 AND boards = :board');
+			$query->bindValue(':board', $b);
+			$query->execute() or error(db_error($query));
+			$count = $query->rowCount();
+			$query = prepare('SELECT `username` FROM ``mods``');
+			$query->execute() or error(db_error($query));
+			$volunteers = $query->fetchAll(PDO::FETCH_ASSOC);
+
+			if ($_POST['username'] == '')
+				error(sprintf($config['error']['required'], 'username'));
+			if ($_POST['password'] == '')
+				error(sprintf($config['error']['required'], 'password'));
+			if (!preg_match('/^[a-zA-Z0-9._]{1,30}$/', $_POST['username']))
+				error(_('Invalid username'));
+
+			if ($count > 10) {
+				error(_('Too many board volunteers!'));
+			}
+
+			foreach ($volunteers as $i => $v) {
+				if (strtolower($_POST['username']) == strtolower($v['username'])) {
+					error(_('Refusing to create a volunteer with the same username as an existing one.'));
+				}
+			}
+
+			$salt = generate_salt();
+			$password = hash('sha256', $salt . sha1($_POST['password']));
+			
+			$query = prepare('INSERT INTO ``mods`` VALUES (NULL, :username, :password, :salt, 19, :board)');
+			$query->bindValue(':username', $_POST['username']);
+			$query->bindValue(':password', $password);
+			$query->bindValue(':salt', $salt);
+			$query->bindValue(':board', $b);
+			$query->execute() or error(db_error($query));
+			
+			$userID = $pdo->lastInsertId();
+
+
+			modLog('Created a new volunteer: ' . utf8tohtml($_POST['username']) . ' <small>(#' . $userID . ')</small>');
+		}
+
+		if (isset($_POST['delete'])){
+			foreach ($_POST['delete'] as $i => $d){
+				$query = prepare('SELECT * FROM ``mods`` WHERE id = :id');
+				$query->bindValue(':id', $d);
+				$query->execute() or error(db_error($query));
+				
+				$result = $query->fetch(PDO::FETCH_ASSOC);
+
+				if (!$result) {
+					error(_('Volunteer does not exist!'));
+				}
+
+				if ($result['boards'] != $b || $result['type'] != BOARDVOLUNTEER) {
+					error($config['error']['noaccess']);
+				}
+
+				$query = prepare('DELETE FROM ``mods`` WHERE id = :id');
+				$query->bindValue(':id', $d);
+				$query->execute() or error(db_error($query));
+			}
+		}
+
+		$query = prepare('SELECT * FROM ``mods`` WHERE type = 19 AND boards = :board');
+		$query->bindValue(':board', $b);
+		$query->execute() or error(db_error($query));
+		$volunteers = $query->fetchAll(PDO::FETCH_ASSOC);
+			
+		mod_page(_('Edit volunteers'), 'mod/volunteers.html', array('board'=>$board,'token'=>make_secure_link_token('volunteers/'.$board['uri']),'volunteers'=>$volunteers));
+	
+	}
+
+	function mod_8_flags($b) {
+		global $config, $mod, $board;
+		require_once 'inc/image.php';
+		if (!hasPermission($config['mod']['edit_flags'], $b))
+			error($config['error']['noaccess']);
+
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		if (file_exists("$b/flags.ser"))
+			$config['user_flags'] = unserialize(file_get_contents("$b/flags.ser"));
+
+		$dir = 'static/custom-flags/'.$b;
+
+		if (!is_dir($dir)){
+			mkdir($dir, 0777, true);
+		}
+
+		function handle_file($id = false, $description, $b, $dir) {
+			global $config;
+
+			if (!isset($description) and $description)
+				error(_('You must enter a flag description!'));
+
+			if (strlen($description) > 255)
+				error(_('Flag description too long!'));
+	
+			if ($id) {
+				$f = 'flag-'.$id;
+			} else { 
+				$f = 'file';
+				$id = time() . substr(microtime(), 2, 3);
+			}
+
+			$upload = $_FILES[$f]['tmp_name'];
+			$banners = array_diff(scandir($dir), array('..', '.'));
+
+			if (!is_readable($upload))
+				error($config['error']['nomove']);
+
+			$extension = strtolower(mb_substr($_FILES[$f]['name'], mb_strrpos($_FILES[$f]['name'], '.') + 1));
+
+			if ($extension != 'png') {
+				error(_('Flags must be in PNG format.'));
+			}
+	
+			if (filesize($upload) > 48000){
+				error(_('File too large!'));
+			}
+
+			if (!$size = @getimagesize($upload)) {
+				error($config['error']['invalidimg']);
+			}
+
+			if ($size[0] > 20 or $size[0] < 11 or $size[1] > 16 or $size[1] < 11){
+				error(_('Image wrong size!'));
+			}
+			if (sizeof($banners) > 256) {
+				error(_('Too many flags.'));
+			}
+
+			copy($upload, "$dir/$id.$extension");
+			purge("$dir/$id.$extension");
+			$config['user_flags'][$id] = utf8tohtml($description);
+			file_write($b.'/flags.ser', serialize($config['user_flags']));
+		}
+	
+		// Handle a new flag, if any.
+		if (isset($_FILES['file'])){
+			handle_file(false, $_POST['description'], $b, $dir);
+		}
+
+		// Handle edits to existing flags.
+		foreach ($_FILES as $k => $a) {
+			if (empty($_FILES[$k]['tmp_name'])) continue;
+
+			if (preg_match('/^flag-(\d+)$/', $k, $matches)) {
+				$id = (int)$matches[1];
+				if (!isset($_POST['description-'.$id])) continue;
+
+				if (isset($config['user_flags'][$id])) {
+					handle_file($id, $_POST['description-'.$id], $b, $dir);
+				}
+			}
+		}
+
+		// Description just changed, flag not edited.
+		foreach ($_POST as $k => $v) {
+			if (!preg_match('/^description-(\d+)$/', $k, $matches)) continue;
+			$id = (int)$matches[1];
+			if (!isset($_POST['description-'.$id])) continue;
+
+			$description = $_POST['description-'.$id];
+
+			if (strlen($description) > 255)
+				error(_('Flag description too long!'));
+			$config['user_flags'][$id] = utf8tohtml($description);
+			file_write($b.'/flags.ser', serialize($config['user_flags']));
+		}
+
+		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+			$flags = <<<FLAGS
+<?php
+\$config['country_flags'] = false;
+\$config['country_flags_condensed'] = false;
+\$config['user_flag'] = true;
+\$config['uri_flags'] = '/static/custom-flags/$b/%s.png';
+\$config['flag_style'] = '';
+\$config['user_flags'] = unserialize(file_get_contents('$b/flags.ser'));
+FLAGS;
+
+			file_write($b.'/flags.php', $flags);
+		}
+
+
+		if (isset($_POST['delete'])){
+			foreach ($_POST['delete'] as $i => $d){
+				if (!preg_match('/[0-9+]/', $d)){
+					error('Nice try.');
+				}
+				unlink("$dir/$d.png");
+				$id = explode('.', $d)[0];
+				unset($config['user_flags'][$id]);
+				file_write($b.'/flags.ser', serialize($config['user_flags']));
+			}
+		}
+
+		if (isset($_POST['alphabetize'])) {
+			asort($config['user_flags'], SORT_NATURAL | SORT_FLAG_CASE);
+			file_write($b.'/flags.ser', serialize($config['user_flags']));
+		}
+
+		$banners = array_diff(scandir($dir), array('..', '.'));
+		mod_page(_('Edit flags'), 'mod/flags.html', array('board'=>$board,'banners'=>$banners,'token'=>make_secure_link_token('banners/'.$board['uri'])));
+	}
+
+	function mod_8_banners($b) {
+		global $config, $mod, $board;
+		require_once 'inc/image.php';
+
+		if (!hasPermission($config['mod']['edit_banners'], $b))
+			error($config['error']['noaccess']);
+	
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		$dir = 'static/banners/'.$b;
+
+		if (!is_dir($dir)){
+			mkdir($dir, 0777, true);
+		}
+
+
+		if (isset($_FILES['file'])){
+			$upload = $_FILES['file']['tmp_name'];
+			$banners = array_diff(scandir($dir), array('..', '.'));
+
+			if (!is_readable($upload))
+				error($config['error']['nomove']);
+
+			$id = time() . substr(microtime(), 2, 3);
+			$extension = strtolower(mb_substr($_FILES['file']['name'], mb_strrpos($_FILES['file']['name'], '.') + 1));
+
+			if (!in_array($extension, array('jpg','jpeg','png','gif'))){
+				error('Not an image extension.');
+			}
+	
+			if (filesize($upload) > 512000){
+				error('File too large!');
+			}
+
+			if (!$size = @getimagesize($upload)) {
+				error($config['error']['invalidimg']);
+			}
+
+			if ($size[0] != 300 or $size[1] != 100){
+				error('Image wrong size!');
+			}
+			if (sizeof($banners) >= 50) {
+				error('Too many banners.');
+			}
+
+			copy($upload, "$dir/$id.$extension");
+		}
+
+		if (isset($_POST['delete'])){
+			foreach ($_POST['delete'] as $i => $d){
+				if (!preg_match('/[0-9+]\.(png|jpeg|jpg|gif)/', $d)){
+					error('Nice try.');
+				}
+				unlink("$dir/$d");
+			}
+		}
+
+		$banners = array_diff(scandir($dir), array('..', '.'));
+		mod_page(_('Edit banners'), 'mod/banners.html', array('board'=>$board,'banners'=>$banners,'token'=>make_secure_link_token('banners/'.$board['uri'])));
+
+	}
+
+	function mod_8_settings($b) {
+		global $config, $mod;
+
+		//if ($b === 'infinity' && $mod['type'] !== ADMIN)
+		//	error('Settings temporarily disabled for this board.');
+
+		if (!in_array($b, $mod['boards']) and $mod['boards'][0] != '*')
+			error($config['error']['noaccess']);
+
+		if (!hasPermission($config['mod']['edit_settings'], $b))
+			error($config['error']['noaccess']);
+	
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		$possible_languages = array_diff(scandir('inc/locale/'), array('..', '.', '.tx', 'README.md'));
+
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+			$title = $_POST['title'];
+			$subtitle = $_POST['subtitle'];
+			$country_flags = isset($_POST['country_flags']) ? 'true' : 'false';
+			$field_disable_name = isset($_POST['field_disable_name']) ? 'true' : 'false';
+			$enable_embedding = isset($_POST['enable_embedding']) ? 'true' : 'false';
+			$force_image_op = isset($_POST['force_image_op']) ? 'true' : 'false';
+			$disable_images = isset($_POST['disable_images']) ? 'true' : 'false';
+			$poster_ids = isset($_POST['poster_ids']) ? 'true' : 'false';
+			$show_sages = isset($_POST['show_sages']) ? 'true' : 'false';
+			$auto_unicode = isset($_POST['auto_unicode']) ? 'true' : 'false';
+			$strip_combining_chars = isset($_POST['strip_combining_chars']) ? 'true' : 'false';
+			$allow_roll = isset($_POST['allow_roll']) ? 'true' : 'false';
+			$image_reject_repost = isset($_POST['image_reject_repost']) ? 'true' : 'false';
+			$image_reject_repost_in_thread = isset($_POST['image_reject_repost_in_thread']) ? 'true' : 'false';
+			$early_404 = isset($_POST['early_404']) ? 'true' : 'false';
+			$allow_delete = isset($_POST['allow_delete']) ? 'true' : 'false';
+			$allow_flash = isset($_POST['allow_flash']) ? '$config[\'allowed_ext_files\'][] = \'swf\';' : '';
+			$allow_pdf = isset($_POST['allow_pdf']) ? '$config[\'allowed_ext_files\'][] = \'pdf\';' : '';
+			$code_tags = isset($_POST['code_tags']) ? '$config[\'additional_javascript\'][] = \'js/code_tags/run_prettify.js\';$config[\'markup\'][] = array("/\[code\](.+?)\[\/code\]/ms", "<code><pre class=\'prettyprint\' style=\'display:inline-block\'>\$1</pre></code>");' : '';
+			$katex = isset($_POST['katex']) ? '$config[\'katex\'] = true;$config[\'additional_javascript\'][] = \'js/katex/katex.min.js\'; $config[\'markup\'][] = array("/\[tex\](.+?)\[\/tex\]/ms", "<span class=\'tex\'>\$1</span>"); $config[\'additional_javascript\'][] = \'js/katex-enable.js\';' : '';
+			$user_flags = isset($_POST['user_flags']) ? "if (file_exists('$b/flags.php')) { include 'flags.php'; }\n" : '';
+			$captcha = isset($_POST['captcha']) ? 'true' : 'false';
+			$force_subject_op = isset($_POST['force_subject_op']) ? 'true' : 'false';
+			$force_flag = isset($_POST['force_flag']) ? 'true' : 'false';
+			$tor_posting = isset($_POST['tor_posting']) ? 'true' : 'false';
+			$new_thread_capt = isset($_POST['new_thread_capt']) ? 'true' : 'false';
+			$oekaki = isset($_POST['oekaki']) ? 'true' : 'false';
+			
+			if ($_POST['locale'] !== 'en' && in_array($_POST['locale'], $possible_languages)) {
+				$locale = "\$config['locale'] = '{$_POST['locale']}.UTF-8';";
+			} else {
+				$locale = '';
+			} 
+
+			if (isset($_POST['max_images']) && (int)$_POST['max_images'] && (int)$_POST['max_images'] <= 5) {
+				$_POST['max_images'] = (int)$_POST['max_images'];
+				$multiimage = "\$config['max_images'] = {$_POST['max_images']};
+					   \$config['additional_javascript'][] = 'js/multi-image.js';";
+			} else {
+				$multiimage = '';
+			} 
+
+			$anonymous = base64_encode($_POST['anonymous']);
+			$blotter = base64_encode(purify_html(html_entity_decode($_POST['blotter'])));
+			$add_to_config = @file_get_contents($b.'/extra_config.php');
+			$replace = '';
+
+			if (isset($_POST['replace'])) {
+				if (sizeof($_POST['replace']) > 200 || sizeof($_POST['with']) > 200) {
+					error(_('Sorry, max 200 wordfilters allowed.'));
+				}
+				if (count($_POST['replace']) == count($_POST['with'])) {
+					foreach ($_POST['replace'] as $i => $r ) {
+						if ($r !== '') {
+							$w = $_POST['with'][$i];
+							
+							if (strlen($w) > 255) {
+								error(sprintf(_('Sorry, %s is too long. Max replacement is 255 characters'), utf8tohtml($w)));
+							}
+
+							$replace .= '$config[\'wordfilters\'][] = array(base64_decode(\'' . base64_encode($r) . '\'), base64_decode(\'' . base64_encode($w) . '\'));';
+						}
+					}
+				}
+				if (is_billion_laughs($_POST['replace'], $_POST['with'])) {
+					error(_('Wordfilters may not wordfilter previous wordfilters. For example, if a filters to bb and b filters to cc, that is not allowed.'));
+				}
+			}
+
+			if (isset($_POST['hour_max_threads']) && in_array($_POST['hour_max_threads'], ['10', '25', '50', '100'])) {
+				$hour_max_threads = $_POST['hour_max_threads'];	
+			} else {
+				$hour_max_threads = 'false';
+			}
+
+			if (isset($_POST['max_pages'])) {
+				$mp = (int)$_POST['max_pages'];
+				if ($mp > 25 || $mp < 2) {
+					$max_pages = 15;
+				} else {
+					$max_pages = $mp;
+				}
+			} else {
+				$max_pages = 15;
+			}			
+
+			if (isset($_POST['reply_limit'])) {
+				$rl = (int)$_POST['reply_limit'];
+				if ($rl > 750 || $rl < 250 || $rl % 25) {
+					$reply_limit = 250;
+				} else {
+					$reply_limit = $rl;
+				}
+			} else {
+				$reply_limit = 250;
+			}
+
+			if (isset($_POST['max_newlines'])) {
+				$mn = (int)$_POST['max_newlines'];
+				if ($mn < 20 || $mn > 300) {
+					$max_newlines = 0;
+				} else {
+					$max_newlines = $mn;
+				}
+			} else {
+				$max_newlines = $mn;
+			}
+
+			if (!(strlen($title) < 40))
+				error('Invalid title');
+			if (!(strlen($subtitle) < 200))
+				error('Invalid subtitle');
+
+			$query = prepare('UPDATE ``boards`` SET `title` = :title, `subtitle` = :subtitle, `indexed` = :indexed, `public_bans` = :public_bans, `public_logs` = :public_logs, `8archive` = :8archive WHERE `uri` = :uri');
+			$query->bindValue(':title', $title);
+			$query->bindValue(':subtitle', $subtitle);
+			$query->bindValue(':uri', $b);
+			$query->bindValue(':indexed', !isset($_POST['meta_noindex']));
+			$query->bindValue(':public_bans', isset($_POST['public_bans']));
+			$query->bindValue(':public_logs', (int)$_POST['public_logs']);
+			$query->bindValue(':8archive', isset($_POST['8archive']));
+			$query->execute() or error(db_error($query));
+
+			$config_file = <<<EOT
+<?php
+\$config['country_flags'] = $country_flags;
+\$config['field_disable_name'] = $field_disable_name;
+\$config['enable_embedding'] = $enable_embedding;
+\$config['force_image_op'] = $force_image_op;
+\$config['disable_images'] = $disable_images;
+\$config['poster_ids'] = $poster_ids;
+\$config['show_sages'] = $show_sages;
+\$config['auto_unicode'] = $auto_unicode;
+\$config['strip_combining_chars'] = $strip_combining_chars;
+\$config['allow_roll'] = $allow_roll;
+\$config['image_reject_repost'] = $image_reject_repost;
+\$config['image_reject_repost_in_thread'] = $image_reject_repost_in_thread;
+\$config['early_404'] = $early_404;
+\$config['allow_delete'] = $allow_delete;
+\$config['anonymous'] = base64_decode('$anonymous');
+\$config['blotter'] = base64_decode('$blotter');
+\$config['stylesheets']['Custom'] = 'board/$b.css';
+\$config['default_stylesheet'] = array('Custom', \$config['stylesheets']['Custom']);
+\$config['captcha']['enabled'] = $captcha;
+\$config['force_subject_op'] = $force_subject_op;
+\$config['force_flag'] = $force_flag;
+\$config['tor_posting'] = $tor_posting;
+\$config['new_thread_capt'] = $new_thread_capt;
+\$config['hour_max_threads'] = $hour_max_threads;
+\$config['reply_limit'] = $reply_limit;
+\$config['max_pages'] = $max_pages;
+\$config['max_newlines'] = $max_newlines;
+\$config['oekaki'] = $oekaki;
+$code_tags $katex $replace $multiimage $allow_flash $allow_pdf $user_flags
+if (\$config['disable_images'])
+	\$config['max_pages'] = 10000;
+
+$locale
+$add_to_config
+EOT;
+
+			// Clean up our CSS...no more expression() or off-site URLs.
+			$clean_css = preg_replace('/expression\s*\(/', '', $_POST['css']);
+	
+			$matched = array();
+
+			preg_match_all("#{$config['link_regex']}#im", $clean_css, $matched);
+			
+			if (isset($matched[0])) {
+				foreach ($matched[0] as $match) {
+					$match_okay = false;
+					foreach ($config['allowed_offsite_urls'] as $allowed_url) {
+						if (strpos($match, $allowed_url) !== false && strpos($match, '#') === false) {
+							$match_okay = true;
+						}
+					}
+					if ($match_okay !== true) {
+						error(sprintf(_("Off-site link \"%s\" is not allowed in the board stylesheet"), $match));
+					}
+				}
+			}
+			
+			//Filter out imports from sites with potentially unsafe content
+			$match_imports = '@import[^;]*';
+			$matched = array();
+			preg_match_all("#$match_imports#im", $clean_css, $matched);
+			
+			$unsafe_import_urls = array('https://a.pomf.se/');
+			
+			if (isset($matched[0])) {
+				foreach ($matched[0] as $match) {
+					$match_okay = true;
+					foreach ($unsafe_import_urls as $unsafe_import_url) {
+						if (strpos($match, $unsafe_import_url) !== false && strpos($match, '#') === false) {
+							$match_okay = false;
+						}
+					}
+					if ($match_okay !== true) {
+						error(sprintf(_("Potentially unsafe import \"%s\" is not allowed in the board stylesheet"), $match));
+					}
+				}
+			}
+
+			$query = query('SELECT `uri`, `title`, `subtitle` FROM ``boards`` WHERE `8archive` = TRUE');
+			file_write('8archive.json', json_encode($query->fetchAll(PDO::FETCH_ASSOC)));
+			file_write($b.'/config.php', $config_file);
+			file_write('stylesheets/board/'.$b.'.css', $clean_css);
+
+			$_config = $config;
+			unset($config['wordfilters']);
+
+			// Faster than openBoard and bypasses cache...we're trusting the PHP output
+			// to be safe enough to run with every request, we can eval it here.
+			eval(str_replace('flags.php', "$b/flags.php", preg_replace('/^\<\?php$/m', '', $config_file)));
+			// czaks: maybe reconsider using it, now that config is cached?
+
+			// Clean the cache
+			if ($config['cache']['enabled']) {
+				cache::delete('board_' . $board['uri']);
+				cache::delete('all_boards');
+
+				cache::delete('config_' . $board['uri']);
+				cache::delete('events_' . $board['uri']);
+
+				unlink('tmp/cache/locale_' . $board['uri']);
+			}
+
+			// be smarter about rebuilds...only some changes really require us to rebuild all threads
+			if ($_config['captcha']['enabled'] != $config['captcha']['enabled']
+			 || $_config['new_thread_capt'] != $config['new_thread_capt'] /*New thread captcha - if toggling "enable captcha" requires this, toggling new thread capt does too, I guess.*/
+			 || $_config['captcha']['extra'] != $config['captcha']['extra']
+			 || $_config['blotter'] != $config['blotter']
+			 || $_config['field_disable_name'] != $config['field_disable_name']
+			 || $_config['show_sages'] != (isset($config['show_sages']) && $config['show_sages'])) {
+				buildIndex();
+				$query = query(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `thread` IS NULL", $b)) or error(db_error());
+				while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+					buildThread($post['id']);
+				}
+			}
+		
+			modLog('Edited board settings', $b);
+		}
+
+		$query = prepare('SELECT * FROM boards WHERE uri = :board');
+		$query->bindValue(':board', $b);
+		$query->execute() or error(db_error($query));
+		$board = $query->fetchAll()[0];
+ 
+		$css = @file_get_contents('stylesheets/board/' . $board['uri'] . '.css');
+	
+		mod_page(_('Board configuration'), 'mod/settings.html', array('board'=>$board, 'css'=>prettify_textarea($css), 'token'=>make_secure_link_token('settings/'.$board['uri']), 'languages'=>$possible_languages,'allowed_urls'=>$config['allowed_offsite_urls']));
+	}
diff --git a/inc/8chan-mod-pages.php b/inc/8chan-mod-pages.php
index 135a1c46..7894be58 100644
--- a/inc/8chan-mod-pages.php
+++ b/inc/8chan-mod-pages.php
@@ -1,26 +1,4 @@
 <?php
-	if (!function_exists('is_billion_laughs')){
-		function is_billion_laughs($arr1, $arr2) {
-			$arr = array();
-			foreach ($arr1 as $k => $v) {
-				$arr[$v] = $arr2[$k];
-			}
-
-			for ($i = 0; $i <= sizeof($arr); $i++) {
-				$cur = array_slice($arr, $i, 1);
-				$pst = array_slice($arr, 0, $i);
-				if (!$cur) continue;
-				$kk = array_keys($cur)[0];
-				$vv = array_values($cur)[0];
-				foreach ($pst as $k => $v) {
-					if (str_replace($kk, $vv, $v) != $v)
-						return true;
-				}
-			}
-			return false;
-		}
-	}
-
 	$config['mod']['show_ip'] = GLOBALVOLUNTEER;
 	$config['mod']['show_ip_less'] = BOARDVOLUNTEER;
 	$config['mod']['manageusers'] = GLOBALVOLUNTEER;
@@ -67,636 +45,10 @@
 	$config['mod']['shadow_capcode'] = 'Global Volunteer';
 
 
-	$config['mod']['custom_pages']['/tags/(\%b)'] = function ($b) {
-		global $board, $config;
-
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		if (!hasPermission($config['mod']['edit_tags'], $b))
-			error($config['error']['noaccess']);
-
-		if (isset($_POST['tags'])) {
-			if (sizeof($_POST['tags']) > 5)
-				error(_('Too many tags.'));
-
-			$delete = prepare('DELETE FROM ``board_tags`` WHERE uri = :uri');
-			$delete->bindValue(':uri', $b);
-			$delete->execute();
-
-			foreach ($_POST['tags'] as $i => $tag) {
-				if ($tag) {
-					if (strlen($tag) > 255)
-						continue;
-
-					$insert = prepare('INSERT INTO ``board_tags``(uri, tag) VALUES (:uri, :tag)');
-					$insert->bindValue(':uri', $b);
-					$insert->bindValue(':tag', utf8tohtml($tag));
-					$insert->execute();
-				}
-			}
-
-			$update = prepare('UPDATE ``boards`` SET sfw = :sfw WHERE uri = :uri');
-			$update->bindValue(':uri', $b);
-			$update->bindValue(':sfw', isset($_POST['sfw']));
-			$update->execute();
-		}
-		$query = prepare('SELECT * FROM ``board_tags`` WHERE uri = :uri');
-		$query->bindValue(':uri', $b);
-		$query->execute();
-
-		$tags = $query->fetchAll();
-
-		$query = prepare('SELECT `sfw` FROM ``boards`` WHERE uri = :uri');
-		$query->bindValue(':uri', $b);
-		$query->execute();
-
-		$sfw = $query->fetchColumn();
-
-		mod_page(_('Edit tags'), 'mod/tags.html', array('board'=>$board,'token'=>make_secure_link_token('tags/'.$board['uri']), 'tags'=>$tags, 'sfw'=>$sfw));
-	};
-
-	$config['mod']['custom_pages']['/reassign/(\%b)'] = function($b) {
-		global $board, $config;
-
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		if (!hasPermission($config['mod']['reassign_board'], $b))
-			error($config['error']['noaccess']);
-
-		$query = query("SELECT id, username FROM mods WHERE boards = '$b' AND type = 20");
-		$mods = $query->fetchAll();
-
-		if (!$mods) {
-			error('No mods?');
-		}
-
-		$password = base64_encode(openssl_random_pseudo_bytes(9));
-		$salt = generate_salt();
-		$hashed = hash('sha256', $salt . sha1($password));
-
-		$query = prepare('UPDATE ``mods`` SET `password` = :hashed, `salt` = :salt WHERE BINARY username = :mod');
-		$query->bindValue(':hashed', $hashed);
-		$query->bindValue(':salt', $salt);
-		$query->bindValue(':mod', $mods[0]['username']);
-		$query->execute();
-
-		$body = "Thanks for your interest in this board. Kindly find the username and password below. You can login at https://8ch.net/mod.php.<br>Username: {$mods[0]['username']}<br>Password: {$password}<br>Thanks for using 8chan!";
-
-		modLog("Reassigned board /$b/");
-		
-		mod_page(_('Edit reassign'), 'blank.html', array('board'=>$board,'token'=>make_secure_link_token('reassign/'.$board['uri']),'body'=>$body));
-	};
-
-	$config['mod']['custom_pages']['/volunteers/(\%b)'] = function($b) {
-		global $board, $config, $pdo;
-		if (!hasPermission($config['mod']['edit_volunteers'], $b))
-			error($config['error']['noaccess']);
-
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		if (isset($_POST['username'], $_POST['password'])) {
-			$query = prepare('SELECT * FROM ``mods`` WHERE type = 19 AND boards = :board');
-			$query->bindValue(':board', $b);
-			$query->execute() or error(db_error($query));
-			$count = $query->rowCount();
-			$query = prepare('SELECT `username` FROM ``mods``');
-			$query->execute() or error(db_error($query));
-			$volunteers = $query->fetchAll(PDO::FETCH_ASSOC);
-
-			if ($_POST['username'] == '')
-				error(sprintf($config['error']['required'], 'username'));
-			if ($_POST['password'] == '')
-				error(sprintf($config['error']['required'], 'password'));
-			if (!preg_match('/^[a-zA-Z0-9._]{1,30}$/', $_POST['username']))
-				error(_('Invalid username'));
-
-			if ($count > 10) {
-				error(_('Too many board volunteers!'));
-			}
-
-			foreach ($volunteers as $i => $v) {
-				if (strtolower($_POST['username']) == strtolower($v['username'])) {
-					error(_('Refusing to create a volunteer with the same username as an existing one.'));
-				}
-			}
-
-			$salt = generate_salt();
-			$password = hash('sha256', $salt . sha1($_POST['password']));
-			
-			$query = prepare('INSERT INTO ``mods`` VALUES (NULL, :username, :password, :salt, 19, :board)');
-			$query->bindValue(':username', $_POST['username']);
-			$query->bindValue(':password', $password);
-			$query->bindValue(':salt', $salt);
-			$query->bindValue(':board', $b);
-			$query->execute() or error(db_error($query));
-			
-			$userID = $pdo->lastInsertId();
-
-
-			modLog('Created a new volunteer: ' . utf8tohtml($_POST['username']) . ' <small>(#' . $userID . ')</small>');
-		}
-
-		if (isset($_POST['delete'])){
-			foreach ($_POST['delete'] as $i => $d){
-				$query = prepare('SELECT * FROM ``mods`` WHERE id = :id');
-				$query->bindValue(':id', $d);
-				$query->execute() or error(db_error($query));
-				
-				$result = $query->fetch(PDO::FETCH_ASSOC);
-
-				if (!$result) {
-					error(_('Volunteer does not exist!'));
-				}
-
-				if ($result['boards'] != $b || $result['type'] != BOARDVOLUNTEER) {
-					error($config['error']['noaccess']);
-				}
-
-				$query = prepare('DELETE FROM ``mods`` WHERE id = :id');
-				$query->bindValue(':id', $d);
-				$query->execute() or error(db_error($query));
-			}
-		}
-
-		$query = prepare('SELECT * FROM ``mods`` WHERE type = 19 AND boards = :board');
-		$query->bindValue(':board', $b);
-		$query->execute() or error(db_error($query));
-		$volunteers = $query->fetchAll(PDO::FETCH_ASSOC);
-			
-		mod_page(_('Edit volunteers'), 'mod/volunteers.html', array('board'=>$board,'token'=>make_secure_link_token('volunteers/'.$board['uri']),'volunteers'=>$volunteers));
-	
-	};
-
-	$config['mod']['custom_pages']['/flags/(\%b)'] = function($b) {
-		global $config, $mod, $board;
-		require_once 'inc/image.php';
-		if (!hasPermission($config['mod']['edit_flags'], $b))
-			error($config['error']['noaccess']);
-
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		if (file_exists("$b/flags.ser"))
-			$config['user_flags'] = unserialize(file_get_contents("$b/flags.ser"));
-
-		$dir = 'static/custom-flags/'.$b;
-
-		if (!is_dir($dir)){
-			mkdir($dir, 0777, true);
-		}
-
-		function handle_file($id = false, $description, $b, $dir) {
-			global $config;
-
-			if (!isset($description) and $description)
-				error(_('You must enter a flag description!'));
-
-			if (strlen($description) > 255)
-				error(_('Flag description too long!'));
-	
-			if ($id) {
-				$f = 'flag-'.$id;
-			} else { 
-				$f = 'file';
-				$id = time() . substr(microtime(), 2, 3);
-			}
-
-			$upload = $_FILES[$f]['tmp_name'];
-			$banners = array_diff(scandir($dir), array('..', '.'));
-
-			if (!is_readable($upload))
-				error($config['error']['nomove']);
-
-			$extension = strtolower(mb_substr($_FILES[$f]['name'], mb_strrpos($_FILES[$f]['name'], '.') + 1));
-
-			if ($extension != 'png') {
-				error(_('Flags must be in PNG format.'));
-			}
-	
-			if (filesize($upload) > 48000){
-				error(_('File too large!'));
-			}
-
-			if (!$size = @getimagesize($upload)) {
-				error($config['error']['invalidimg']);
-			}
-
-			if ($size[0] > 20 or $size[0] < 11 or $size[1] > 16 or $size[1] < 11){
-				error(_('Image wrong size!'));
-			}
-			if (sizeof($banners) > 256) {
-				error(_('Too many flags.'));
-			}
-
-			copy($upload, "$dir/$id.$extension");
-			purge("$dir/$id.$extension");
-			$config['user_flags'][$id] = utf8tohtml($description);
-			file_write($b.'/flags.ser', serialize($config['user_flags']));
-		}
-	
-		// Handle a new flag, if any.
-		if (isset($_FILES['file'])){
-			handle_file(false, $_POST['description'], $b, $dir);
-		}
-
-		// Handle edits to existing flags.
-		foreach ($_FILES as $k => $a) {
-			if (empty($_FILES[$k]['tmp_name'])) continue;
-
-			if (preg_match('/^flag-(\d+)$/', $k, $matches)) {
-				$id = (int)$matches[1];
-				if (!isset($_POST['description-'.$id])) continue;
-
-				if (isset($config['user_flags'][$id])) {
-					handle_file($id, $_POST['description-'.$id], $b, $dir);
-				}
-			}
-		}
-
-		// Description just changed, flag not edited.
-		foreach ($_POST as $k => $v) {
-			if (!preg_match('/^description-(\d+)$/', $k, $matches)) continue;
-			$id = (int)$matches[1];
-			if (!isset($_POST['description-'.$id])) continue;
-
-			$description = $_POST['description-'.$id];
-
-			if (strlen($description) > 255)
-				error(_('Flag description too long!'));
-			$config['user_flags'][$id] = utf8tohtml($description);
-			file_write($b.'/flags.ser', serialize($config['user_flags']));
-		}
-
-		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-			$flags = <<<FLAGS
-<?php
-\$config['country_flags'] = false;
-\$config['country_flags_condensed'] = false;
-\$config['user_flag'] = true;
-\$config['uri_flags'] = '/static/custom-flags/$b/%s.png';
-\$config['flag_style'] = '';
-\$config['user_flags'] = unserialize(file_get_contents('$b/flags.ser'));
-FLAGS;
-
-			file_write($b.'/flags.php', $flags);
-		}
-
-
-		if (isset($_POST['delete'])){
-			foreach ($_POST['delete'] as $i => $d){
-				if (!preg_match('/[0-9+]/', $d)){
-					error('Nice try.');
-				}
-				unlink("$dir/$d.png");
-				$id = explode('.', $d)[0];
-				unset($config['user_flags'][$id]);
-				file_write($b.'/flags.ser', serialize($config['user_flags']));
-			}
-		}
-
-		if (isset($_POST['alphabetize'])) {
-			asort($config['user_flags'], SORT_NATURAL | SORT_FLAG_CASE);
-			file_write($b.'/flags.ser', serialize($config['user_flags']));
-		}
-
-		$banners = array_diff(scandir($dir), array('..', '.'));
-		mod_page(_('Edit flags'), 'mod/flags.html', array('board'=>$board,'banners'=>$banners,'token'=>make_secure_link_token('banners/'.$board['uri'])));
-	};
-
-	$config['mod']['custom_pages']['/banners/(\%b)'] = function($b) {
-		global $config, $mod, $board;
-		require_once 'inc/image.php';
-
-		if (!hasPermission($config['mod']['edit_banners'], $b))
-			error($config['error']['noaccess']);
-	
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		$dir = 'static/banners/'.$b;
-
-		if (!is_dir($dir)){
-			mkdir($dir, 0777, true);
-		}
-
-
-		if (isset($_FILES['file'])){
-			$upload = $_FILES['file']['tmp_name'];
-			$banners = array_diff(scandir($dir), array('..', '.'));
-
-			if (!is_readable($upload))
-				error($config['error']['nomove']);
-
-			$id = time() . substr(microtime(), 2, 3);
-			$extension = strtolower(mb_substr($_FILES['file']['name'], mb_strrpos($_FILES['file']['name'], '.') + 1));
-
-			if (!in_array($extension, array('jpg','jpeg','png','gif'))){
-				error('Not an image extension.');
-			}
-	
-			if (filesize($upload) > 512000){
-				error('File too large!');
-			}
-
-			if (!$size = @getimagesize($upload)) {
-				error($config['error']['invalidimg']);
-			}
-
-			if ($size[0] != 300 or $size[1] != 100){
-				error('Image wrong size!');
-			}
-			if (sizeof($banners) >= 50) {
-				error('Too many banners.');
-			}
-
-			copy($upload, "$dir/$id.$extension");
-		}
-
-		if (isset($_POST['delete'])){
-			foreach ($_POST['delete'] as $i => $d){
-				if (!preg_match('/[0-9+]\.(png|jpeg|jpg|gif)/', $d)){
-					error('Nice try.');
-				}
-				unlink("$dir/$d");
-			}
-		}
-
-		$banners = array_diff(scandir($dir), array('..', '.'));
-		mod_page(_('Edit banners'), 'mod/banners.html', array('board'=>$board,'banners'=>$banners,'token'=>make_secure_link_token('banners/'.$board['uri'])));
-
-	};
-
-	$config['mod']['custom_pages']['/settings/(\%b)'] = function($b) {
-		global $config, $mod;
-
-		//if ($b === 'infinity' && $mod['type'] !== ADMIN)
-		//	error('Settings temporarily disabled for this board.');
-
-		if (!in_array($b, $mod['boards']) and $mod['boards'][0] != '*')
-			error($config['error']['noaccess']);
-
-		if (!hasPermission($config['mod']['edit_settings'], $b))
-			error($config['error']['noaccess']);
-	
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		$possible_languages = array_diff(scandir('inc/locale/'), array('..', '.', '.tx', 'README.md'));
-
-		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$title = $_POST['title'];
-			$subtitle = $_POST['subtitle'];
-			$country_flags = isset($_POST['country_flags']) ? 'true' : 'false';
-			$field_disable_name = isset($_POST['field_disable_name']) ? 'true' : 'false';
-			$enable_embedding = isset($_POST['enable_embedding']) ? 'true' : 'false';
-			$force_image_op = isset($_POST['force_image_op']) ? 'true' : 'false';
-			$disable_images = isset($_POST['disable_images']) ? 'true' : 'false';
-			$poster_ids = isset($_POST['poster_ids']) ? 'true' : 'false';
-			$show_sages = isset($_POST['show_sages']) ? 'true' : 'false';
-			$auto_unicode = isset($_POST['auto_unicode']) ? 'true' : 'false';
-			$strip_combining_chars = isset($_POST['strip_combining_chars']) ? 'true' : 'false';
-			$allow_roll = isset($_POST['allow_roll']) ? 'true' : 'false';
-			$image_reject_repost = isset($_POST['image_reject_repost']) ? 'true' : 'false';
-			$image_reject_repost_in_thread = isset($_POST['image_reject_repost_in_thread']) ? 'true' : 'false';
-			$early_404 = isset($_POST['early_404']) ? 'true' : 'false';
-			$allow_delete = isset($_POST['allow_delete']) ? 'true' : 'false';
-			$allow_flash = isset($_POST['allow_flash']) ? '$config[\'allowed_ext_files\'][] = \'swf\';' : '';
-			$allow_pdf = isset($_POST['allow_pdf']) ? '$config[\'allowed_ext_files\'][] = \'pdf\';' : '';
-			$code_tags = isset($_POST['code_tags']) ? '$config[\'additional_javascript\'][] = \'js/code_tags/run_prettify.js\';$config[\'markup\'][] = array("/\[code\](.+?)\[\/code\]/ms", "<code><pre class=\'prettyprint\' style=\'display:inline-block\'>\$1</pre></code>");' : '';
-			$katex = isset($_POST['katex']) ? '$config[\'katex\'] = true;$config[\'additional_javascript\'][] = \'js/katex/katex.min.js\'; $config[\'markup\'][] = array("/\[tex\](.+?)\[\/tex\]/ms", "<span class=\'tex\'>\$1</span>"); $config[\'additional_javascript\'][] = \'js/katex-enable.js\';' : '';
-			$user_flags = isset($_POST['user_flags']) ? "if (file_exists('$b/flags.php')) { include 'flags.php'; }\n" : '';
-			$captcha = isset($_POST['captcha']) ? 'true' : 'false';
-			$force_subject_op = isset($_POST['force_subject_op']) ? 'true' : 'false';
-			$force_flag = isset($_POST['force_flag']) ? 'true' : 'false';
-			$tor_posting = isset($_POST['tor_posting']) ? 'true' : 'false';
-			$new_thread_capt = isset($_POST['new_thread_capt']) ? 'true' : 'false';
-			$oekaki = isset($_POST['oekaki']) ? 'true' : 'false';
-			
-			if ($_POST['locale'] !== 'en' && in_array($_POST['locale'], $possible_languages)) {
-				$locale = "\$config['locale'] = '{$_POST['locale']}.UTF-8';";
-			} else {
-				$locale = '';
-			} 
-
-			if (isset($_POST['max_images']) && (int)$_POST['max_images'] && (int)$_POST['max_images'] <= 5) {
-				$_POST['max_images'] = (int)$_POST['max_images'];
-				$multiimage = "\$config['max_images'] = {$_POST['max_images']};
-					   \$config['additional_javascript'][] = 'js/multi-image.js';";
-			} else {
-				$multiimage = '';
-			} 
-
-			$anonymous = base64_encode($_POST['anonymous']);
-			$blotter = base64_encode(purify_html(html_entity_decode($_POST['blotter'])));
-			$add_to_config = @file_get_contents($b.'/extra_config.php');
-			$replace = '';
-
-			if (isset($_POST['replace'])) {
-				if (sizeof($_POST['replace']) > 200 || sizeof($_POST['with']) > 200) {
-					error(_('Sorry, max 200 wordfilters allowed.'));
-				}
-				if (count($_POST['replace']) == count($_POST['with'])) {
-					foreach ($_POST['replace'] as $i => $r ) {
-						if ($r !== '') {
-							$w = $_POST['with'][$i];
-							
-							if (strlen($w) > 255) {
-								error(sprintf(_('Sorry, %s is too long. Max replacement is 255 characters'), utf8tohtml($w)));
-							}
-
-							$replace .= '$config[\'wordfilters\'][] = array(base64_decode(\'' . base64_encode($r) . '\'), base64_decode(\'' . base64_encode($w) . '\'));';
-						}
-					}
-				}
-				if (is_billion_laughs($_POST['replace'], $_POST['with'])) {
-					error(_('Wordfilters may not wordfilter previous wordfilters. For example, if a filters to bb and b filters to cc, that is not allowed.'));
-				}
-			}
-
-			if (isset($_POST['hour_max_threads']) && in_array($_POST['hour_max_threads'], ['10', '25', '50', '100'])) {
-				$hour_max_threads = $_POST['hour_max_threads'];	
-			} else {
-				$hour_max_threads = 'false';
-			}
-
-			if (isset($_POST['max_pages'])) {
-				$mp = (int)$_POST['max_pages'];
-				if ($mp > 25 || $mp < 2) {
-					$max_pages = 15;
-				} else {
-					$max_pages = $mp;
-				}
-			} else {
-				$max_pages = 15;
-			}			
-
-			if (isset($_POST['reply_limit'])) {
-				$rl = (int)$_POST['reply_limit'];
-				if ($rl > 750 || $rl < 250 || $rl % 25) {
-					$reply_limit = 250;
-				} else {
-					$reply_limit = $rl;
-				}
-			} else {
-				$reply_limit = 250;
-			}
-
-			if (isset($_POST['max_newlines'])) {
-				$mn = (int)$_POST['max_newlines'];
-				if ($mn < 20 || $mn > 300) {
-					$max_newlines = 0;
-				} else {
-					$max_newlines = $mn;
-				}
-			} else {
-				$max_newlines = $mn;
-			}
-
-			if (!(strlen($title) < 40))
-				error('Invalid title');
-			if (!(strlen($subtitle) < 200))
-				error('Invalid subtitle');
-
-			$query = prepare('UPDATE ``boards`` SET `title` = :title, `subtitle` = :subtitle, `indexed` = :indexed, `public_bans` = :public_bans, `public_logs` = :public_logs, `8archive` = :8archive WHERE `uri` = :uri');
-			$query->bindValue(':title', $title);
-			$query->bindValue(':subtitle', $subtitle);
-			$query->bindValue(':uri', $b);
-			$query->bindValue(':indexed', !isset($_POST['meta_noindex']));
-			$query->bindValue(':public_bans', isset($_POST['public_bans']));
-			$query->bindValue(':public_logs', (int)$_POST['public_logs']);
-			$query->bindValue(':8archive', isset($_POST['8archive']));
-			$query->execute() or error(db_error($query));
-
-			$config_file = <<<EOT
-<?php
-\$config['country_flags'] = $country_flags;
-\$config['field_disable_name'] = $field_disable_name;
-\$config['enable_embedding'] = $enable_embedding;
-\$config['force_image_op'] = $force_image_op;
-\$config['disable_images'] = $disable_images;
-\$config['poster_ids'] = $poster_ids;
-\$config['show_sages'] = $show_sages;
-\$config['auto_unicode'] = $auto_unicode;
-\$config['strip_combining_chars'] = $strip_combining_chars;
-\$config['allow_roll'] = $allow_roll;
-\$config['image_reject_repost'] = $image_reject_repost;
-\$config['image_reject_repost_in_thread'] = $image_reject_repost_in_thread;
-\$config['early_404'] = $early_404;
-\$config['allow_delete'] = $allow_delete;
-\$config['anonymous'] = base64_decode('$anonymous');
-\$config['blotter'] = base64_decode('$blotter');
-\$config['stylesheets']['Custom'] = 'board/$b.css';
-\$config['default_stylesheet'] = array('Custom', \$config['stylesheets']['Custom']);
-\$config['captcha']['enabled'] = $captcha;
-\$config['force_subject_op'] = $force_subject_op;
-\$config['force_flag'] = $force_flag;
-\$config['tor_posting'] = $tor_posting;
-\$config['new_thread_capt'] = $new_thread_capt;
-\$config['hour_max_threads'] = $hour_max_threads;
-\$config['reply_limit'] = $reply_limit;
-\$config['max_pages'] = $max_pages;
-\$config['max_newlines'] = $max_newlines;
-\$config['oekaki'] = $oekaki;
-$code_tags $katex $replace $multiimage $allow_flash $allow_pdf $user_flags
-if (\$config['disable_images'])
-	\$config['max_pages'] = 10000;
-
-$locale
-$add_to_config
-EOT;
-
-			// Clean up our CSS...no more expression() or off-site URLs.
-			$clean_css = preg_replace('/expression\s*\(/', '', $_POST['css']);
-	
-			$matched = array();
-
-			preg_match_all("#{$config['link_regex']}#im", $clean_css, $matched);
-			
-			if (isset($matched[0])) {
-				foreach ($matched[0] as $match) {
-					$match_okay = false;
-					foreach ($config['allowed_offsite_urls'] as $allowed_url) {
-						if (strpos($match, $allowed_url) !== false && strpos($match, '#') === false) {
-							$match_okay = true;
-						}
-					}
-					if ($match_okay !== true) {
-						error(sprintf(_("Off-site link \"%s\" is not allowed in the board stylesheet"), $match));
-					}
-				}
-			}
-			
-			//Filter out imports from sites with potentially unsafe content
-			$match_imports = '@import[^;]*';
-			$matched = array();
-			preg_match_all("#$match_imports#im", $clean_css, $matched);
-			
-			$unsafe_import_urls = array('https://a.pomf.se/');
-			
-			if (isset($matched[0])) {
-				foreach ($matched[0] as $match) {
-					$match_okay = true;
-					foreach ($unsafe_import_urls as $unsafe_import_url) {
-						if (strpos($match, $unsafe_import_url) !== false && strpos($match, '#') === false) {
-							$match_okay = false;
-						}
-					}
-					if ($match_okay !== true) {
-						error(sprintf(_("Potentially unsafe import \"%s\" is not allowed in the board stylesheet"), $match));
-					}
-				}
-			}
-
-			$query = query('SELECT `uri`, `title`, `subtitle` FROM ``boards`` WHERE `8archive` = TRUE');
-			file_write('8archive.json', json_encode($query->fetchAll(PDO::FETCH_ASSOC)));
-			file_write($b.'/config.php', $config_file);
-			file_write('stylesheets/board/'.$b.'.css', $clean_css);
-
-			$_config = $config;
-			unset($config['wordfilters']);
-
-			// Faster than openBoard and bypasses cache...we're trusting the PHP output
-			// to be safe enough to run with every request, we can eval it here.
-			eval(str_replace('flags.php', "$b/flags.php", preg_replace('/^\<\?php$/m', '', $config_file)));
-			// czaks: maybe reconsider using it, now that config is cached?
-
-			// Clean the cache
-			if ($config['cache']['enabled']) {
-				cache::delete('board_' . $board['uri']);
-				cache::delete('all_boards');
-
-				cache::delete('config_' . $board['uri']);
-				cache::delete('events_' . $board['uri']);
-
-				unlink('tmp/cache/locale_' . $board['uri']);
-			}
-
-			// be smarter about rebuilds...only some changes really require us to rebuild all threads
-			if ($_config['captcha']['enabled'] != $config['captcha']['enabled']
-			 || $_config['new_thread_capt'] != $config['new_thread_capt'] /*New thread captcha - if toggling "enable captcha" requires this, toggling new thread capt does too, I guess.*/
-			 || $_config['captcha']['extra'] != $config['captcha']['extra']
-			 || $_config['blotter'] != $config['blotter']
-			 || $_config['field_disable_name'] != $config['field_disable_name']
-			 || $_config['show_sages'] != (isset($config['show_sages']) && $config['show_sages'])) {
-				buildIndex();
-				$query = query(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `thread` IS NULL", $b)) or error(db_error());
-				while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
-					buildThread($post['id']);
-				}
-			}
-		
-			modLog('Edited board settings', $b);
-		}
-
-		$query = prepare('SELECT * FROM boards WHERE uri = :board');
-		$query->bindValue(':board', $b);
-		$query->execute() or error(db_error($query));
-		$board = $query->fetchAll()[0];
- 
-		$css = @file_get_contents('stylesheets/board/' . $board['uri'] . '.css');
-	
-		mod_page(_('Board configuration'), 'mod/settings.html', array('board'=>$board, 'css'=>prettify_textarea($css), 'token'=>make_secure_link_token('settings/'.$board['uri']), 'languages'=>$possible_languages,'allowed_urls'=>$config['allowed_offsite_urls']));
-	};
+	// Mod pages code now resides in 8chan-mod-pages-functions.php file
+	$config['mod']['custom_pages']['/tags/(\%b)'] = '8_tags';
+	$config['mod']['custom_pages']['/reassign/(\%b)'] = '8_reassign';
+	$config['mod']['custom_pages']['/volunteers/(\%b)'] = '8_volunteers';
+	$config['mod']['custom_pages']['/flags/(\%b)'] = '8_flags';
+	$config['mod']['custom_pages']['/banners/(\%b)'] = '8_banners';
+	$config['mod']['custom_pages']['/settings/(\%b)'] = '8_settings';
diff --git a/inc/instance-config.php b/inc/instance-config.php
index bc8d63da..152bb9d4 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -8,7 +8,7 @@
 *  You can copy values from config.php (defaults) and paste them here.
 */
 	require_once "lib/htmlpurifier-4.6.0/library/HTMLPurifier.auto.php";
-	require_once "8chan-functions.php";
+	require_once "instance-functions.php";
 
 	// Note - you may want to change some of these in secrets.php instead of here
 	// See the secrets.example.php file
@@ -177,19 +177,7 @@
 	$config['hour_max_threads'] = 10;
 	$config['filters'][] = array(
 		'condition' => array(
-			'custom' => function($post) {
-				global $config, $board;
-				if (!$config['hour_max_threads']) return false;
-
-				if ($post['op']) {
-					$query = prepare(sprintf('SELECT COUNT(*) AS `count` FROM ``posts_%s`` WHERE `thread` IS NULL AND FROM_UNIXTIME(`time`) > DATE_SUB(NOW(), INTERVAL 1 HOUR);', $board['uri']));
-					$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
-					$query->execute() or error(db_error($query));
-					$r = $query->fetch(PDO::FETCH_ASSOC);
-
-					return ($r['count'] > $config['hour_max_threads']);
-				}
-			}	
+			'custom' => 'test_posts_per_hour'
 		),
 		'action' => 'reject',
 		'message' => 'On this board, to prevent raids the number of threads that can be created per hour is limited. Please try again later, or post in an existing thread.'
@@ -212,6 +200,7 @@ $config['enable_antibot'] = false;
 $config['spam']['unicode'] = false;
 $config['twig_cache'] = false;
 $config['report_captcha'] = true;
+
 // 8chan specific mod pages
 require '8chan-mod-pages.php';
 	
diff --git a/inc/instance-functions.php b/inc/instance-functions.php
new file mode 100644
index 00000000..f291714f
--- /dev/null
+++ b/inc/instance-functions.php
@@ -0,0 +1,17 @@
+<?php
+require_once("inc/8chan-functions.php");
+require_once("inc/8chan-mod-pages-functions.php");
+
+function max_posts_per_hour($post) {
+	global $config, $board;
+	if (!$config['hour_max_threads']) return false;
+
+	if ($post['op']) {
+		$query = prepare(sprintf('SELECT COUNT(*) AS `count` FROM ``posts_%s`` WHERE `thread` IS NULL AND FROM_UNIXTIME(`time`) > DATE_SUB(NOW(), INTERVAL 1 HOUR);', $board[$
+		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
+		$query->execute() or error(db_error($query));
+		$r = $query->fetch(PDO::FETCH_ASSOC);
+
+		return ($r['count'] > $config['hour_max_threads']);
+	}
+}

From a123d8b2eefd71110d9bba4b66d221989db7a2bb Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 22:42:15 +0200
Subject: [PATCH 37/70] infinity/smart-build: do it other way around
 (esthetics)

---
 inc/8chan-mod-config.php          |  54 +++
 inc/8chan-mod-pages-functions.php | 680 ------------------------------
 inc/8chan-mod-pages.php           | 640 +++++++++++++++++++++++++++-
 inc/instance-config.php           |   2 +-
 inc/instance-functions.php        |   2 +-
 5 files changed, 689 insertions(+), 689 deletions(-)
 create mode 100644 inc/8chan-mod-config.php
 delete mode 100644 inc/8chan-mod-pages-functions.php

diff --git a/inc/8chan-mod-config.php b/inc/8chan-mod-config.php
new file mode 100644
index 00000000..7894be58
--- /dev/null
+++ b/inc/8chan-mod-config.php
@@ -0,0 +1,54 @@
+<?php
+	$config['mod']['show_ip'] = GLOBALVOLUNTEER;
+	$config['mod']['show_ip_less'] = BOARDVOLUNTEER;
+	$config['mod']['manageusers'] = GLOBALVOLUNTEER;
+	$config['mod']['noticeboard_post'] = GLOBALVOLUNTEER;
+	$config['mod']['search'] = GLOBALVOLUNTEER;
+	$config['mod']['clean_global'] = GLOBALVOLUNTEER;
+	$config['mod']['view_notes'] = DISABLED;
+	$config['mod']['create_notes'] = DISABLED;
+	$config['mod']['edit_config'] = DISABLED;
+	$config['mod']['debug_recent'] = ADMIN;
+	$config['mod']['debug_antispam'] = ADMIN;
+	$config['mod']['noticeboard_post'] = ADMIN;
+	$config['mod']['modlog'] = GLOBALVOLUNTEER;
+	$config['mod']['mod_board_log'] = MOD;
+	$config['mod']['editpost'] = BOARDVOLUNTEER;
+	$config['mod']['edit_banners'] = MOD;
+	$config['mod']['edit_flags'] = MOD;
+	$config['mod']['edit_settings'] = MOD;
+	$config['mod']['edit_volunteers'] = MOD;
+	$config['mod']['edit_tags'] = MOD;
+	$config['mod']['clean'] = BOARDVOLUNTEER;
+	// new perms
+
+	$config['mod']['ban'] = BOARDVOLUNTEER;
+	$config['mod']['bandelete'] = BOARDVOLUNTEER;
+	$config['mod']['unban'] = BOARDVOLUNTEER;
+	$config['mod']['deletebyip'] = BOARDVOLUNTEER;
+	$config['mod']['sticky'] = BOARDVOLUNTEER;
+	$config['mod']['cycle'] = BOARDVOLUNTEER;
+	$config['mod']['lock'] = BOARDVOLUNTEER;
+	$config['mod']['postinlocked'] = BOARDVOLUNTEER;
+	$config['mod']['bumplock'] = BOARDVOLUNTEER;
+	$config['mod']['view_bumplock'] = BOARDVOLUNTEER;
+	$config['mod']['bypass_field_disable'] = BOARDVOLUNTEER;
+	$config['mod']['view_banlist'] = BOARDVOLUNTEER;
+	$config['mod']['view_banstaff'] = BOARDVOLUNTEER;
+	$config['mod']['public_ban'] = BOARDVOLUNTEER;
+	$config['mod']['recent'] = BOARDVOLUNTEER;
+	$config['mod']['ban_appeals'] = BOARDVOLUNTEER;
+	$config['mod']['view_ban_appeals'] = BOARDVOLUNTEER;
+	$config['mod']['view_ban'] = BOARDVOLUNTEER;
+	$config['mod']['reassign_board'] = GLOBALVOLUNTEER;
+	$config['mod']['move'] = GLOBALVOLUNTEER;
+	$config['mod']['shadow_capcode'] = 'Global Volunteer';
+
+
+	// Mod pages code now resides in 8chan-mod-pages-functions.php file
+	$config['mod']['custom_pages']['/tags/(\%b)'] = '8_tags';
+	$config['mod']['custom_pages']['/reassign/(\%b)'] = '8_reassign';
+	$config['mod']['custom_pages']['/volunteers/(\%b)'] = '8_volunteers';
+	$config['mod']['custom_pages']['/flags/(\%b)'] = '8_flags';
+	$config['mod']['custom_pages']['/banners/(\%b)'] = '8_banners';
+	$config['mod']['custom_pages']['/settings/(\%b)'] = '8_settings';
diff --git a/inc/8chan-mod-pages-functions.php b/inc/8chan-mod-pages-functions.php
deleted file mode 100644
index eef96790..00000000
--- a/inc/8chan-mod-pages-functions.php
+++ /dev/null
@@ -1,680 +0,0 @@
-<?php
-	$config['mod']['show_ip'] = GLOBALVOLUNTEER;
-	$config['mod']['show_ip_less'] = BOARDVOLUNTEER;
-	$config['mod']['manageusers'] = GLOBALVOLUNTEER;
-	$config['mod']['noticeboard_post'] = GLOBALVOLUNTEER;
-	$config['mod']['search'] = GLOBALVOLUNTEER;
-	$config['mod']['clean_global'] = GLOBALVOLUNTEER;
-	$config['mod']['view_notes'] = DISABLED;
-	$config['mod']['create_notes'] = DISABLED;
-	$config['mod']['edit_config'] = DISABLED;
-	$config['mod']['debug_recent'] = ADMIN;
-	$config['mod']['debug_antispam'] = ADMIN;
-	$config['mod']['noticeboard_post'] = ADMIN;
-	$config['mod']['modlog'] = GLOBALVOLUNTEER;
-	$config['mod']['mod_board_log'] = MOD;
-	$config['mod']['editpost'] = BOARDVOLUNTEER;
-	$config['mod']['edit_banners'] = MOD;
-	$config['mod']['edit_flags'] = MOD;
-	$config['mod']['edit_settings'] = MOD;
-	$config['mod']['edit_volunteers'] = MOD;
-	$config['mod']['edit_tags'] = MOD;
-	$config['mod']['clean'] = BOARDVOLUNTEER;
-	// new perms
-
-	$config['mod']['ban'] = BOARDVOLUNTEER;
-	$config['mod']['bandelete'] = BOARDVOLUNTEER;
-	$config['mod']['unban'] = BOARDVOLUNTEER;
-	$config['mod']['deletebyip'] = BOARDVOLUNTEER;
-	$config['mod']['sticky'] = BOARDVOLUNTEER;
-	$config['mod']['cycle'] = BOARDVOLUNTEER;
-	$config['mod']['lock'] = BOARDVOLUNTEER;
-	$config['mod']['postinlocked'] = BOARDVOLUNTEER;
-	$config['mod']['bumplock'] = BOARDVOLUNTEER;
-	$config['mod']['view_bumplock'] = BOARDVOLUNTEER;
-	$config['mod']['bypass_field_disable'] = BOARDVOLUNTEER;
-	$config['mod']['view_banlist'] = BOARDVOLUNTEER;
-	$config['mod']['view_banstaff'] = BOARDVOLUNTEER;
-	$config['mod']['public_ban'] = BOARDVOLUNTEER;
-	$config['mod']['recent'] = BOARDVOLUNTEER;
-	$config['mod']['ban_appeals'] = BOARDVOLUNTEER;
-	$config['mod']['view_ban_appeals'] = BOARDVOLUNTEER;
-	$config['mod']['view_ban'] = BOARDVOLUNTEER;
-	$config['mod']['reassign_board'] = GLOBALVOLUNTEER;
-	$config['mod']['move'] = GLOBALVOLUNTEER;
-	$config['mod']['shadow_capcode'] = 'Global Volunteer';
-
-
-	function mod_8_tags ($b) {
-		global $board, $config;
-
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		if (!hasPermission($config['mod']['edit_tags'], $b))
-			error($config['error']['noaccess']);
-
-		if (isset($_POST['tags'])) {
-			if (sizeof($_POST['tags']) > 5)
-				error(_('Too many tags.'));
-
-			$delete = prepare('DELETE FROM ``board_tags`` WHERE uri = :uri');
-			$delete->bindValue(':uri', $b);
-			$delete->execute();
-
-			foreach ($_POST['tags'] as $i => $tag) {
-				if ($tag) {
-					if (strlen($tag) > 255)
-						continue;
-
-					$insert = prepare('INSERT INTO ``board_tags``(uri, tag) VALUES (:uri, :tag)');
-					$insert->bindValue(':uri', $b);
-					$insert->bindValue(':tag', utf8tohtml($tag));
-					$insert->execute();
-				}
-			}
-
-			$update = prepare('UPDATE ``boards`` SET sfw = :sfw WHERE uri = :uri');
-			$update->bindValue(':uri', $b);
-			$update->bindValue(':sfw', isset($_POST['sfw']));
-			$update->execute();
-		}
-		$query = prepare('SELECT * FROM ``board_tags`` WHERE uri = :uri');
-		$query->bindValue(':uri', $b);
-		$query->execute();
-
-		$tags = $query->fetchAll();
-
-		$query = prepare('SELECT `sfw` FROM ``boards`` WHERE uri = :uri');
-		$query->bindValue(':uri', $b);
-		$query->execute();
-
-		$sfw = $query->fetchColumn();
-
-		mod_page(_('Edit tags'), 'mod/tags.html', array('board'=>$board,'token'=>make_secure_link_token('tags/'.$board['uri']), 'tags'=>$tags, 'sfw'=>$sfw));
-	}
-
-	function mod_8_reassign($b) {
-		global $board, $config;
-
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		if (!hasPermission($config['mod']['reassign_board'], $b))
-			error($config['error']['noaccess']);
-
-		$query = query("SELECT id, username FROM mods WHERE boards = '$b' AND type = 20");
-		$mods = $query->fetchAll();
-
-		if (!$mods) {
-			error('No mods?');
-		}
-
-		$password = base64_encode(openssl_random_pseudo_bytes(9));
-		$salt = generate_salt();
-		$hashed = hash('sha256', $salt . sha1($password));
-
-		$query = prepare('UPDATE ``mods`` SET `password` = :hashed, `salt` = :salt WHERE BINARY username = :mod');
-		$query->bindValue(':hashed', $hashed);
-		$query->bindValue(':salt', $salt);
-		$query->bindValue(':mod', $mods[0]['username']);
-		$query->execute();
-
-		$body = "Thanks for your interest in this board. Kindly find the username and password below. You can login at https://8ch.net/mod.php.<br>Username: {$mods[0]['username']}<br>Password: {$password}<br>Thanks for using 8chan!";
-
-		modLog("Reassigned board /$b/");
-		
-		mod_page(_('Edit reassign'), 'blank.html', array('board'=>$board,'token'=>make_secure_link_token('reassign/'.$board['uri']),'body'=>$body));
-	}
-
-	function mod_8_volunteers($b) {
-		global $board, $config, $pdo;
-		if (!hasPermission($config['mod']['edit_volunteers'], $b))
-			error($config['error']['noaccess']);
-
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		if (isset($_POST['username'], $_POST['password'])) {
-			$query = prepare('SELECT * FROM ``mods`` WHERE type = 19 AND boards = :board');
-			$query->bindValue(':board', $b);
-			$query->execute() or error(db_error($query));
-			$count = $query->rowCount();
-			$query = prepare('SELECT `username` FROM ``mods``');
-			$query->execute() or error(db_error($query));
-			$volunteers = $query->fetchAll(PDO::FETCH_ASSOC);
-
-			if ($_POST['username'] == '')
-				error(sprintf($config['error']['required'], 'username'));
-			if ($_POST['password'] == '')
-				error(sprintf($config['error']['required'], 'password'));
-			if (!preg_match('/^[a-zA-Z0-9._]{1,30}$/', $_POST['username']))
-				error(_('Invalid username'));
-
-			if ($count > 10) {
-				error(_('Too many board volunteers!'));
-			}
-
-			foreach ($volunteers as $i => $v) {
-				if (strtolower($_POST['username']) == strtolower($v['username'])) {
-					error(_('Refusing to create a volunteer with the same username as an existing one.'));
-				}
-			}
-
-			$salt = generate_salt();
-			$password = hash('sha256', $salt . sha1($_POST['password']));
-			
-			$query = prepare('INSERT INTO ``mods`` VALUES (NULL, :username, :password, :salt, 19, :board)');
-			$query->bindValue(':username', $_POST['username']);
-			$query->bindValue(':password', $password);
-			$query->bindValue(':salt', $salt);
-			$query->bindValue(':board', $b);
-			$query->execute() or error(db_error($query));
-			
-			$userID = $pdo->lastInsertId();
-
-
-			modLog('Created a new volunteer: ' . utf8tohtml($_POST['username']) . ' <small>(#' . $userID . ')</small>');
-		}
-
-		if (isset($_POST['delete'])){
-			foreach ($_POST['delete'] as $i => $d){
-				$query = prepare('SELECT * FROM ``mods`` WHERE id = :id');
-				$query->bindValue(':id', $d);
-				$query->execute() or error(db_error($query));
-				
-				$result = $query->fetch(PDO::FETCH_ASSOC);
-
-				if (!$result) {
-					error(_('Volunteer does not exist!'));
-				}
-
-				if ($result['boards'] != $b || $result['type'] != BOARDVOLUNTEER) {
-					error($config['error']['noaccess']);
-				}
-
-				$query = prepare('DELETE FROM ``mods`` WHERE id = :id');
-				$query->bindValue(':id', $d);
-				$query->execute() or error(db_error($query));
-			}
-		}
-
-		$query = prepare('SELECT * FROM ``mods`` WHERE type = 19 AND boards = :board');
-		$query->bindValue(':board', $b);
-		$query->execute() or error(db_error($query));
-		$volunteers = $query->fetchAll(PDO::FETCH_ASSOC);
-			
-		mod_page(_('Edit volunteers'), 'mod/volunteers.html', array('board'=>$board,'token'=>make_secure_link_token('volunteers/'.$board['uri']),'volunteers'=>$volunteers));
-	
-	}
-
-	function mod_8_flags($b) {
-		global $config, $mod, $board;
-		require_once 'inc/image.php';
-		if (!hasPermission($config['mod']['edit_flags'], $b))
-			error($config['error']['noaccess']);
-
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		if (file_exists("$b/flags.ser"))
-			$config['user_flags'] = unserialize(file_get_contents("$b/flags.ser"));
-
-		$dir = 'static/custom-flags/'.$b;
-
-		if (!is_dir($dir)){
-			mkdir($dir, 0777, true);
-		}
-
-		function handle_file($id = false, $description, $b, $dir) {
-			global $config;
-
-			if (!isset($description) and $description)
-				error(_('You must enter a flag description!'));
-
-			if (strlen($description) > 255)
-				error(_('Flag description too long!'));
-	
-			if ($id) {
-				$f = 'flag-'.$id;
-			} else { 
-				$f = 'file';
-				$id = time() . substr(microtime(), 2, 3);
-			}
-
-			$upload = $_FILES[$f]['tmp_name'];
-			$banners = array_diff(scandir($dir), array('..', '.'));
-
-			if (!is_readable($upload))
-				error($config['error']['nomove']);
-
-			$extension = strtolower(mb_substr($_FILES[$f]['name'], mb_strrpos($_FILES[$f]['name'], '.') + 1));
-
-			if ($extension != 'png') {
-				error(_('Flags must be in PNG format.'));
-			}
-	
-			if (filesize($upload) > 48000){
-				error(_('File too large!'));
-			}
-
-			if (!$size = @getimagesize($upload)) {
-				error($config['error']['invalidimg']);
-			}
-
-			if ($size[0] > 20 or $size[0] < 11 or $size[1] > 16 or $size[1] < 11){
-				error(_('Image wrong size!'));
-			}
-			if (sizeof($banners) > 256) {
-				error(_('Too many flags.'));
-			}
-
-			copy($upload, "$dir/$id.$extension");
-			purge("$dir/$id.$extension");
-			$config['user_flags'][$id] = utf8tohtml($description);
-			file_write($b.'/flags.ser', serialize($config['user_flags']));
-		}
-	
-		// Handle a new flag, if any.
-		if (isset($_FILES['file'])){
-			handle_file(false, $_POST['description'], $b, $dir);
-		}
-
-		// Handle edits to existing flags.
-		foreach ($_FILES as $k => $a) {
-			if (empty($_FILES[$k]['tmp_name'])) continue;
-
-			if (preg_match('/^flag-(\d+)$/', $k, $matches)) {
-				$id = (int)$matches[1];
-				if (!isset($_POST['description-'.$id])) continue;
-
-				if (isset($config['user_flags'][$id])) {
-					handle_file($id, $_POST['description-'.$id], $b, $dir);
-				}
-			}
-		}
-
-		// Description just changed, flag not edited.
-		foreach ($_POST as $k => $v) {
-			if (!preg_match('/^description-(\d+)$/', $k, $matches)) continue;
-			$id = (int)$matches[1];
-			if (!isset($_POST['description-'.$id])) continue;
-
-			$description = $_POST['description-'.$id];
-
-			if (strlen($description) > 255)
-				error(_('Flag description too long!'));
-			$config['user_flags'][$id] = utf8tohtml($description);
-			file_write($b.'/flags.ser', serialize($config['user_flags']));
-		}
-
-		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-			$flags = <<<FLAGS
-<?php
-\$config['country_flags'] = false;
-\$config['country_flags_condensed'] = false;
-\$config['user_flag'] = true;
-\$config['uri_flags'] = '/static/custom-flags/$b/%s.png';
-\$config['flag_style'] = '';
-\$config['user_flags'] = unserialize(file_get_contents('$b/flags.ser'));
-FLAGS;
-
-			file_write($b.'/flags.php', $flags);
-		}
-
-
-		if (isset($_POST['delete'])){
-			foreach ($_POST['delete'] as $i => $d){
-				if (!preg_match('/[0-9+]/', $d)){
-					error('Nice try.');
-				}
-				unlink("$dir/$d.png");
-				$id = explode('.', $d)[0];
-				unset($config['user_flags'][$id]);
-				file_write($b.'/flags.ser', serialize($config['user_flags']));
-			}
-		}
-
-		if (isset($_POST['alphabetize'])) {
-			asort($config['user_flags'], SORT_NATURAL | SORT_FLAG_CASE);
-			file_write($b.'/flags.ser', serialize($config['user_flags']));
-		}
-
-		$banners = array_diff(scandir($dir), array('..', '.'));
-		mod_page(_('Edit flags'), 'mod/flags.html', array('board'=>$board,'banners'=>$banners,'token'=>make_secure_link_token('banners/'.$board['uri'])));
-	}
-
-	function mod_8_banners($b) {
-		global $config, $mod, $board;
-		require_once 'inc/image.php';
-
-		if (!hasPermission($config['mod']['edit_banners'], $b))
-			error($config['error']['noaccess']);
-	
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		$dir = 'static/banners/'.$b;
-
-		if (!is_dir($dir)){
-			mkdir($dir, 0777, true);
-		}
-
-
-		if (isset($_FILES['file'])){
-			$upload = $_FILES['file']['tmp_name'];
-			$banners = array_diff(scandir($dir), array('..', '.'));
-
-			if (!is_readable($upload))
-				error($config['error']['nomove']);
-
-			$id = time() . substr(microtime(), 2, 3);
-			$extension = strtolower(mb_substr($_FILES['file']['name'], mb_strrpos($_FILES['file']['name'], '.') + 1));
-
-			if (!in_array($extension, array('jpg','jpeg','png','gif'))){
-				error('Not an image extension.');
-			}
-	
-			if (filesize($upload) > 512000){
-				error('File too large!');
-			}
-
-			if (!$size = @getimagesize($upload)) {
-				error($config['error']['invalidimg']);
-			}
-
-			if ($size[0] != 300 or $size[1] != 100){
-				error('Image wrong size!');
-			}
-			if (sizeof($banners) >= 50) {
-				error('Too many banners.');
-			}
-
-			copy($upload, "$dir/$id.$extension");
-		}
-
-		if (isset($_POST['delete'])){
-			foreach ($_POST['delete'] as $i => $d){
-				if (!preg_match('/[0-9+]\.(png|jpeg|jpg|gif)/', $d)){
-					error('Nice try.');
-				}
-				unlink("$dir/$d");
-			}
-		}
-
-		$banners = array_diff(scandir($dir), array('..', '.'));
-		mod_page(_('Edit banners'), 'mod/banners.html', array('board'=>$board,'banners'=>$banners,'token'=>make_secure_link_token('banners/'.$board['uri'])));
-
-	}
-
-	function mod_8_settings($b) {
-		global $config, $mod;
-
-		//if ($b === 'infinity' && $mod['type'] !== ADMIN)
-		//	error('Settings temporarily disabled for this board.');
-
-		if (!in_array($b, $mod['boards']) and $mod['boards'][0] != '*')
-			error($config['error']['noaccess']);
-
-		if (!hasPermission($config['mod']['edit_settings'], $b))
-			error($config['error']['noaccess']);
-	
-		if (!openBoard($b))
-			error("Could not open board!");
-
-		$possible_languages = array_diff(scandir('inc/locale/'), array('..', '.', '.tx', 'README.md'));
-
-		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$title = $_POST['title'];
-			$subtitle = $_POST['subtitle'];
-			$country_flags = isset($_POST['country_flags']) ? 'true' : 'false';
-			$field_disable_name = isset($_POST['field_disable_name']) ? 'true' : 'false';
-			$enable_embedding = isset($_POST['enable_embedding']) ? 'true' : 'false';
-			$force_image_op = isset($_POST['force_image_op']) ? 'true' : 'false';
-			$disable_images = isset($_POST['disable_images']) ? 'true' : 'false';
-			$poster_ids = isset($_POST['poster_ids']) ? 'true' : 'false';
-			$show_sages = isset($_POST['show_sages']) ? 'true' : 'false';
-			$auto_unicode = isset($_POST['auto_unicode']) ? 'true' : 'false';
-			$strip_combining_chars = isset($_POST['strip_combining_chars']) ? 'true' : 'false';
-			$allow_roll = isset($_POST['allow_roll']) ? 'true' : 'false';
-			$image_reject_repost = isset($_POST['image_reject_repost']) ? 'true' : 'false';
-			$image_reject_repost_in_thread = isset($_POST['image_reject_repost_in_thread']) ? 'true' : 'false';
-			$early_404 = isset($_POST['early_404']) ? 'true' : 'false';
-			$allow_delete = isset($_POST['allow_delete']) ? 'true' : 'false';
-			$allow_flash = isset($_POST['allow_flash']) ? '$config[\'allowed_ext_files\'][] = \'swf\';' : '';
-			$allow_pdf = isset($_POST['allow_pdf']) ? '$config[\'allowed_ext_files\'][] = \'pdf\';' : '';
-			$code_tags = isset($_POST['code_tags']) ? '$config[\'additional_javascript\'][] = \'js/code_tags/run_prettify.js\';$config[\'markup\'][] = array("/\[code\](.+?)\[\/code\]/ms", "<code><pre class=\'prettyprint\' style=\'display:inline-block\'>\$1</pre></code>");' : '';
-			$katex = isset($_POST['katex']) ? '$config[\'katex\'] = true;$config[\'additional_javascript\'][] = \'js/katex/katex.min.js\'; $config[\'markup\'][] = array("/\[tex\](.+?)\[\/tex\]/ms", "<span class=\'tex\'>\$1</span>"); $config[\'additional_javascript\'][] = \'js/katex-enable.js\';' : '';
-			$user_flags = isset($_POST['user_flags']) ? "if (file_exists('$b/flags.php')) { include 'flags.php'; }\n" : '';
-			$captcha = isset($_POST['captcha']) ? 'true' : 'false';
-			$force_subject_op = isset($_POST['force_subject_op']) ? 'true' : 'false';
-			$force_flag = isset($_POST['force_flag']) ? 'true' : 'false';
-			$tor_posting = isset($_POST['tor_posting']) ? 'true' : 'false';
-			$new_thread_capt = isset($_POST['new_thread_capt']) ? 'true' : 'false';
-			$oekaki = isset($_POST['oekaki']) ? 'true' : 'false';
-			
-			if ($_POST['locale'] !== 'en' && in_array($_POST['locale'], $possible_languages)) {
-				$locale = "\$config['locale'] = '{$_POST['locale']}.UTF-8';";
-			} else {
-				$locale = '';
-			} 
-
-			if (isset($_POST['max_images']) && (int)$_POST['max_images'] && (int)$_POST['max_images'] <= 5) {
-				$_POST['max_images'] = (int)$_POST['max_images'];
-				$multiimage = "\$config['max_images'] = {$_POST['max_images']};
-					   \$config['additional_javascript'][] = 'js/multi-image.js';";
-			} else {
-				$multiimage = '';
-			} 
-
-			$anonymous = base64_encode($_POST['anonymous']);
-			$blotter = base64_encode(purify_html(html_entity_decode($_POST['blotter'])));
-			$add_to_config = @file_get_contents($b.'/extra_config.php');
-			$replace = '';
-
-			if (isset($_POST['replace'])) {
-				if (sizeof($_POST['replace']) > 200 || sizeof($_POST['with']) > 200) {
-					error(_('Sorry, max 200 wordfilters allowed.'));
-				}
-				if (count($_POST['replace']) == count($_POST['with'])) {
-					foreach ($_POST['replace'] as $i => $r ) {
-						if ($r !== '') {
-							$w = $_POST['with'][$i];
-							
-							if (strlen($w) > 255) {
-								error(sprintf(_('Sorry, %s is too long. Max replacement is 255 characters'), utf8tohtml($w)));
-							}
-
-							$replace .= '$config[\'wordfilters\'][] = array(base64_decode(\'' . base64_encode($r) . '\'), base64_decode(\'' . base64_encode($w) . '\'));';
-						}
-					}
-				}
-				if (is_billion_laughs($_POST['replace'], $_POST['with'])) {
-					error(_('Wordfilters may not wordfilter previous wordfilters. For example, if a filters to bb and b filters to cc, that is not allowed.'));
-				}
-			}
-
-			if (isset($_POST['hour_max_threads']) && in_array($_POST['hour_max_threads'], ['10', '25', '50', '100'])) {
-				$hour_max_threads = $_POST['hour_max_threads'];	
-			} else {
-				$hour_max_threads = 'false';
-			}
-
-			if (isset($_POST['max_pages'])) {
-				$mp = (int)$_POST['max_pages'];
-				if ($mp > 25 || $mp < 2) {
-					$max_pages = 15;
-				} else {
-					$max_pages = $mp;
-				}
-			} else {
-				$max_pages = 15;
-			}			
-
-			if (isset($_POST['reply_limit'])) {
-				$rl = (int)$_POST['reply_limit'];
-				if ($rl > 750 || $rl < 250 || $rl % 25) {
-					$reply_limit = 250;
-				} else {
-					$reply_limit = $rl;
-				}
-			} else {
-				$reply_limit = 250;
-			}
-
-			if (isset($_POST['max_newlines'])) {
-				$mn = (int)$_POST['max_newlines'];
-				if ($mn < 20 || $mn > 300) {
-					$max_newlines = 0;
-				} else {
-					$max_newlines = $mn;
-				}
-			} else {
-				$max_newlines = $mn;
-			}
-
-			if (!(strlen($title) < 40))
-				error('Invalid title');
-			if (!(strlen($subtitle) < 200))
-				error('Invalid subtitle');
-
-			$query = prepare('UPDATE ``boards`` SET `title` = :title, `subtitle` = :subtitle, `indexed` = :indexed, `public_bans` = :public_bans, `public_logs` = :public_logs, `8archive` = :8archive WHERE `uri` = :uri');
-			$query->bindValue(':title', $title);
-			$query->bindValue(':subtitle', $subtitle);
-			$query->bindValue(':uri', $b);
-			$query->bindValue(':indexed', !isset($_POST['meta_noindex']));
-			$query->bindValue(':public_bans', isset($_POST['public_bans']));
-			$query->bindValue(':public_logs', (int)$_POST['public_logs']);
-			$query->bindValue(':8archive', isset($_POST['8archive']));
-			$query->execute() or error(db_error($query));
-
-			$config_file = <<<EOT
-<?php
-\$config['country_flags'] = $country_flags;
-\$config['field_disable_name'] = $field_disable_name;
-\$config['enable_embedding'] = $enable_embedding;
-\$config['force_image_op'] = $force_image_op;
-\$config['disable_images'] = $disable_images;
-\$config['poster_ids'] = $poster_ids;
-\$config['show_sages'] = $show_sages;
-\$config['auto_unicode'] = $auto_unicode;
-\$config['strip_combining_chars'] = $strip_combining_chars;
-\$config['allow_roll'] = $allow_roll;
-\$config['image_reject_repost'] = $image_reject_repost;
-\$config['image_reject_repost_in_thread'] = $image_reject_repost_in_thread;
-\$config['early_404'] = $early_404;
-\$config['allow_delete'] = $allow_delete;
-\$config['anonymous'] = base64_decode('$anonymous');
-\$config['blotter'] = base64_decode('$blotter');
-\$config['stylesheets']['Custom'] = 'board/$b.css';
-\$config['default_stylesheet'] = array('Custom', \$config['stylesheets']['Custom']);
-\$config['captcha']['enabled'] = $captcha;
-\$config['force_subject_op'] = $force_subject_op;
-\$config['force_flag'] = $force_flag;
-\$config['tor_posting'] = $tor_posting;
-\$config['new_thread_capt'] = $new_thread_capt;
-\$config['hour_max_threads'] = $hour_max_threads;
-\$config['reply_limit'] = $reply_limit;
-\$config['max_pages'] = $max_pages;
-\$config['max_newlines'] = $max_newlines;
-\$config['oekaki'] = $oekaki;
-$code_tags $katex $replace $multiimage $allow_flash $allow_pdf $user_flags
-if (\$config['disable_images'])
-	\$config['max_pages'] = 10000;
-
-$locale
-$add_to_config
-EOT;
-
-			// Clean up our CSS...no more expression() or off-site URLs.
-			$clean_css = preg_replace('/expression\s*\(/', '', $_POST['css']);
-	
-			$matched = array();
-
-			preg_match_all("#{$config['link_regex']}#im", $clean_css, $matched);
-			
-			if (isset($matched[0])) {
-				foreach ($matched[0] as $match) {
-					$match_okay = false;
-					foreach ($config['allowed_offsite_urls'] as $allowed_url) {
-						if (strpos($match, $allowed_url) !== false && strpos($match, '#') === false) {
-							$match_okay = true;
-						}
-					}
-					if ($match_okay !== true) {
-						error(sprintf(_("Off-site link \"%s\" is not allowed in the board stylesheet"), $match));
-					}
-				}
-			}
-			
-			//Filter out imports from sites with potentially unsafe content
-			$match_imports = '@import[^;]*';
-			$matched = array();
-			preg_match_all("#$match_imports#im", $clean_css, $matched);
-			
-			$unsafe_import_urls = array('https://a.pomf.se/');
-			
-			if (isset($matched[0])) {
-				foreach ($matched[0] as $match) {
-					$match_okay = true;
-					foreach ($unsafe_import_urls as $unsafe_import_url) {
-						if (strpos($match, $unsafe_import_url) !== false && strpos($match, '#') === false) {
-							$match_okay = false;
-						}
-					}
-					if ($match_okay !== true) {
-						error(sprintf(_("Potentially unsafe import \"%s\" is not allowed in the board stylesheet"), $match));
-					}
-				}
-			}
-
-			$query = query('SELECT `uri`, `title`, `subtitle` FROM ``boards`` WHERE `8archive` = TRUE');
-			file_write('8archive.json', json_encode($query->fetchAll(PDO::FETCH_ASSOC)));
-			file_write($b.'/config.php', $config_file);
-			file_write('stylesheets/board/'.$b.'.css', $clean_css);
-
-			$_config = $config;
-			unset($config['wordfilters']);
-
-			// Faster than openBoard and bypasses cache...we're trusting the PHP output
-			// to be safe enough to run with every request, we can eval it here.
-			eval(str_replace('flags.php', "$b/flags.php", preg_replace('/^\<\?php$/m', '', $config_file)));
-			// czaks: maybe reconsider using it, now that config is cached?
-
-			// Clean the cache
-			if ($config['cache']['enabled']) {
-				cache::delete('board_' . $board['uri']);
-				cache::delete('all_boards');
-
-				cache::delete('config_' . $board['uri']);
-				cache::delete('events_' . $board['uri']);
-
-				unlink('tmp/cache/locale_' . $board['uri']);
-			}
-
-			// be smarter about rebuilds...only some changes really require us to rebuild all threads
-			if ($_config['captcha']['enabled'] != $config['captcha']['enabled']
-			 || $_config['new_thread_capt'] != $config['new_thread_capt'] /*New thread captcha - if toggling "enable captcha" requires this, toggling new thread capt does too, I guess.*/
-			 || $_config['captcha']['extra'] != $config['captcha']['extra']
-			 || $_config['blotter'] != $config['blotter']
-			 || $_config['field_disable_name'] != $config['field_disable_name']
-			 || $_config['show_sages'] != (isset($config['show_sages']) && $config['show_sages'])) {
-				buildIndex();
-				$query = query(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `thread` IS NULL", $b)) or error(db_error());
-				while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
-					buildThread($post['id']);
-				}
-			}
-		
-			modLog('Edited board settings', $b);
-		}
-
-		$query = prepare('SELECT * FROM boards WHERE uri = :board');
-		$query->bindValue(':board', $b);
-		$query->execute() or error(db_error($query));
-		$board = $query->fetchAll()[0];
- 
-		$css = @file_get_contents('stylesheets/board/' . $board['uri'] . '.css');
-	
-		mod_page(_('Board configuration'), 'mod/settings.html', array('board'=>$board, 'css'=>prettify_textarea($css), 'token'=>make_secure_link_token('settings/'.$board['uri']), 'languages'=>$possible_languages,'allowed_urls'=>$config['allowed_offsite_urls']));
-	}
diff --git a/inc/8chan-mod-pages.php b/inc/8chan-mod-pages.php
index 7894be58..eef96790 100644
--- a/inc/8chan-mod-pages.php
+++ b/inc/8chan-mod-pages.php
@@ -45,10 +45,636 @@
 	$config['mod']['shadow_capcode'] = 'Global Volunteer';
 
 
-	// Mod pages code now resides in 8chan-mod-pages-functions.php file
-	$config['mod']['custom_pages']['/tags/(\%b)'] = '8_tags';
-	$config['mod']['custom_pages']['/reassign/(\%b)'] = '8_reassign';
-	$config['mod']['custom_pages']['/volunteers/(\%b)'] = '8_volunteers';
-	$config['mod']['custom_pages']['/flags/(\%b)'] = '8_flags';
-	$config['mod']['custom_pages']['/banners/(\%b)'] = '8_banners';
-	$config['mod']['custom_pages']['/settings/(\%b)'] = '8_settings';
+	function mod_8_tags ($b) {
+		global $board, $config;
+
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		if (!hasPermission($config['mod']['edit_tags'], $b))
+			error($config['error']['noaccess']);
+
+		if (isset($_POST['tags'])) {
+			if (sizeof($_POST['tags']) > 5)
+				error(_('Too many tags.'));
+
+			$delete = prepare('DELETE FROM ``board_tags`` WHERE uri = :uri');
+			$delete->bindValue(':uri', $b);
+			$delete->execute();
+
+			foreach ($_POST['tags'] as $i => $tag) {
+				if ($tag) {
+					if (strlen($tag) > 255)
+						continue;
+
+					$insert = prepare('INSERT INTO ``board_tags``(uri, tag) VALUES (:uri, :tag)');
+					$insert->bindValue(':uri', $b);
+					$insert->bindValue(':tag', utf8tohtml($tag));
+					$insert->execute();
+				}
+			}
+
+			$update = prepare('UPDATE ``boards`` SET sfw = :sfw WHERE uri = :uri');
+			$update->bindValue(':uri', $b);
+			$update->bindValue(':sfw', isset($_POST['sfw']));
+			$update->execute();
+		}
+		$query = prepare('SELECT * FROM ``board_tags`` WHERE uri = :uri');
+		$query->bindValue(':uri', $b);
+		$query->execute();
+
+		$tags = $query->fetchAll();
+
+		$query = prepare('SELECT `sfw` FROM ``boards`` WHERE uri = :uri');
+		$query->bindValue(':uri', $b);
+		$query->execute();
+
+		$sfw = $query->fetchColumn();
+
+		mod_page(_('Edit tags'), 'mod/tags.html', array('board'=>$board,'token'=>make_secure_link_token('tags/'.$board['uri']), 'tags'=>$tags, 'sfw'=>$sfw));
+	}
+
+	function mod_8_reassign($b) {
+		global $board, $config;
+
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		if (!hasPermission($config['mod']['reassign_board'], $b))
+			error($config['error']['noaccess']);
+
+		$query = query("SELECT id, username FROM mods WHERE boards = '$b' AND type = 20");
+		$mods = $query->fetchAll();
+
+		if (!$mods) {
+			error('No mods?');
+		}
+
+		$password = base64_encode(openssl_random_pseudo_bytes(9));
+		$salt = generate_salt();
+		$hashed = hash('sha256', $salt . sha1($password));
+
+		$query = prepare('UPDATE ``mods`` SET `password` = :hashed, `salt` = :salt WHERE BINARY username = :mod');
+		$query->bindValue(':hashed', $hashed);
+		$query->bindValue(':salt', $salt);
+		$query->bindValue(':mod', $mods[0]['username']);
+		$query->execute();
+
+		$body = "Thanks for your interest in this board. Kindly find the username and password below. You can login at https://8ch.net/mod.php.<br>Username: {$mods[0]['username']}<br>Password: {$password}<br>Thanks for using 8chan!";
+
+		modLog("Reassigned board /$b/");
+		
+		mod_page(_('Edit reassign'), 'blank.html', array('board'=>$board,'token'=>make_secure_link_token('reassign/'.$board['uri']),'body'=>$body));
+	}
+
+	function mod_8_volunteers($b) {
+		global $board, $config, $pdo;
+		if (!hasPermission($config['mod']['edit_volunteers'], $b))
+			error($config['error']['noaccess']);
+
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		if (isset($_POST['username'], $_POST['password'])) {
+			$query = prepare('SELECT * FROM ``mods`` WHERE type = 19 AND boards = :board');
+			$query->bindValue(':board', $b);
+			$query->execute() or error(db_error($query));
+			$count = $query->rowCount();
+			$query = prepare('SELECT `username` FROM ``mods``');
+			$query->execute() or error(db_error($query));
+			$volunteers = $query->fetchAll(PDO::FETCH_ASSOC);
+
+			if ($_POST['username'] == '')
+				error(sprintf($config['error']['required'], 'username'));
+			if ($_POST['password'] == '')
+				error(sprintf($config['error']['required'], 'password'));
+			if (!preg_match('/^[a-zA-Z0-9._]{1,30}$/', $_POST['username']))
+				error(_('Invalid username'));
+
+			if ($count > 10) {
+				error(_('Too many board volunteers!'));
+			}
+
+			foreach ($volunteers as $i => $v) {
+				if (strtolower($_POST['username']) == strtolower($v['username'])) {
+					error(_('Refusing to create a volunteer with the same username as an existing one.'));
+				}
+			}
+
+			$salt = generate_salt();
+			$password = hash('sha256', $salt . sha1($_POST['password']));
+			
+			$query = prepare('INSERT INTO ``mods`` VALUES (NULL, :username, :password, :salt, 19, :board)');
+			$query->bindValue(':username', $_POST['username']);
+			$query->bindValue(':password', $password);
+			$query->bindValue(':salt', $salt);
+			$query->bindValue(':board', $b);
+			$query->execute() or error(db_error($query));
+			
+			$userID = $pdo->lastInsertId();
+
+
+			modLog('Created a new volunteer: ' . utf8tohtml($_POST['username']) . ' <small>(#' . $userID . ')</small>');
+		}
+
+		if (isset($_POST['delete'])){
+			foreach ($_POST['delete'] as $i => $d){
+				$query = prepare('SELECT * FROM ``mods`` WHERE id = :id');
+				$query->bindValue(':id', $d);
+				$query->execute() or error(db_error($query));
+				
+				$result = $query->fetch(PDO::FETCH_ASSOC);
+
+				if (!$result) {
+					error(_('Volunteer does not exist!'));
+				}
+
+				if ($result['boards'] != $b || $result['type'] != BOARDVOLUNTEER) {
+					error($config['error']['noaccess']);
+				}
+
+				$query = prepare('DELETE FROM ``mods`` WHERE id = :id');
+				$query->bindValue(':id', $d);
+				$query->execute() or error(db_error($query));
+			}
+		}
+
+		$query = prepare('SELECT * FROM ``mods`` WHERE type = 19 AND boards = :board');
+		$query->bindValue(':board', $b);
+		$query->execute() or error(db_error($query));
+		$volunteers = $query->fetchAll(PDO::FETCH_ASSOC);
+			
+		mod_page(_('Edit volunteers'), 'mod/volunteers.html', array('board'=>$board,'token'=>make_secure_link_token('volunteers/'.$board['uri']),'volunteers'=>$volunteers));
+	
+	}
+
+	function mod_8_flags($b) {
+		global $config, $mod, $board;
+		require_once 'inc/image.php';
+		if (!hasPermission($config['mod']['edit_flags'], $b))
+			error($config['error']['noaccess']);
+
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		if (file_exists("$b/flags.ser"))
+			$config['user_flags'] = unserialize(file_get_contents("$b/flags.ser"));
+
+		$dir = 'static/custom-flags/'.$b;
+
+		if (!is_dir($dir)){
+			mkdir($dir, 0777, true);
+		}
+
+		function handle_file($id = false, $description, $b, $dir) {
+			global $config;
+
+			if (!isset($description) and $description)
+				error(_('You must enter a flag description!'));
+
+			if (strlen($description) > 255)
+				error(_('Flag description too long!'));
+	
+			if ($id) {
+				$f = 'flag-'.$id;
+			} else { 
+				$f = 'file';
+				$id = time() . substr(microtime(), 2, 3);
+			}
+
+			$upload = $_FILES[$f]['tmp_name'];
+			$banners = array_diff(scandir($dir), array('..', '.'));
+
+			if (!is_readable($upload))
+				error($config['error']['nomove']);
+
+			$extension = strtolower(mb_substr($_FILES[$f]['name'], mb_strrpos($_FILES[$f]['name'], '.') + 1));
+
+			if ($extension != 'png') {
+				error(_('Flags must be in PNG format.'));
+			}
+	
+			if (filesize($upload) > 48000){
+				error(_('File too large!'));
+			}
+
+			if (!$size = @getimagesize($upload)) {
+				error($config['error']['invalidimg']);
+			}
+
+			if ($size[0] > 20 or $size[0] < 11 or $size[1] > 16 or $size[1] < 11){
+				error(_('Image wrong size!'));
+			}
+			if (sizeof($banners) > 256) {
+				error(_('Too many flags.'));
+			}
+
+			copy($upload, "$dir/$id.$extension");
+			purge("$dir/$id.$extension");
+			$config['user_flags'][$id] = utf8tohtml($description);
+			file_write($b.'/flags.ser', serialize($config['user_flags']));
+		}
+	
+		// Handle a new flag, if any.
+		if (isset($_FILES['file'])){
+			handle_file(false, $_POST['description'], $b, $dir);
+		}
+
+		// Handle edits to existing flags.
+		foreach ($_FILES as $k => $a) {
+			if (empty($_FILES[$k]['tmp_name'])) continue;
+
+			if (preg_match('/^flag-(\d+)$/', $k, $matches)) {
+				$id = (int)$matches[1];
+				if (!isset($_POST['description-'.$id])) continue;
+
+				if (isset($config['user_flags'][$id])) {
+					handle_file($id, $_POST['description-'.$id], $b, $dir);
+				}
+			}
+		}
+
+		// Description just changed, flag not edited.
+		foreach ($_POST as $k => $v) {
+			if (!preg_match('/^description-(\d+)$/', $k, $matches)) continue;
+			$id = (int)$matches[1];
+			if (!isset($_POST['description-'.$id])) continue;
+
+			$description = $_POST['description-'.$id];
+
+			if (strlen($description) > 255)
+				error(_('Flag description too long!'));
+			$config['user_flags'][$id] = utf8tohtml($description);
+			file_write($b.'/flags.ser', serialize($config['user_flags']));
+		}
+
+		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+			$flags = <<<FLAGS
+<?php
+\$config['country_flags'] = false;
+\$config['country_flags_condensed'] = false;
+\$config['user_flag'] = true;
+\$config['uri_flags'] = '/static/custom-flags/$b/%s.png';
+\$config['flag_style'] = '';
+\$config['user_flags'] = unserialize(file_get_contents('$b/flags.ser'));
+FLAGS;
+
+			file_write($b.'/flags.php', $flags);
+		}
+
+
+		if (isset($_POST['delete'])){
+			foreach ($_POST['delete'] as $i => $d){
+				if (!preg_match('/[0-9+]/', $d)){
+					error('Nice try.');
+				}
+				unlink("$dir/$d.png");
+				$id = explode('.', $d)[0];
+				unset($config['user_flags'][$id]);
+				file_write($b.'/flags.ser', serialize($config['user_flags']));
+			}
+		}
+
+		if (isset($_POST['alphabetize'])) {
+			asort($config['user_flags'], SORT_NATURAL | SORT_FLAG_CASE);
+			file_write($b.'/flags.ser', serialize($config['user_flags']));
+		}
+
+		$banners = array_diff(scandir($dir), array('..', '.'));
+		mod_page(_('Edit flags'), 'mod/flags.html', array('board'=>$board,'banners'=>$banners,'token'=>make_secure_link_token('banners/'.$board['uri'])));
+	}
+
+	function mod_8_banners($b) {
+		global $config, $mod, $board;
+		require_once 'inc/image.php';
+
+		if (!hasPermission($config['mod']['edit_banners'], $b))
+			error($config['error']['noaccess']);
+	
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		$dir = 'static/banners/'.$b;
+
+		if (!is_dir($dir)){
+			mkdir($dir, 0777, true);
+		}
+
+
+		if (isset($_FILES['file'])){
+			$upload = $_FILES['file']['tmp_name'];
+			$banners = array_diff(scandir($dir), array('..', '.'));
+
+			if (!is_readable($upload))
+				error($config['error']['nomove']);
+
+			$id = time() . substr(microtime(), 2, 3);
+			$extension = strtolower(mb_substr($_FILES['file']['name'], mb_strrpos($_FILES['file']['name'], '.') + 1));
+
+			if (!in_array($extension, array('jpg','jpeg','png','gif'))){
+				error('Not an image extension.');
+			}
+	
+			if (filesize($upload) > 512000){
+				error('File too large!');
+			}
+
+			if (!$size = @getimagesize($upload)) {
+				error($config['error']['invalidimg']);
+			}
+
+			if ($size[0] != 300 or $size[1] != 100){
+				error('Image wrong size!');
+			}
+			if (sizeof($banners) >= 50) {
+				error('Too many banners.');
+			}
+
+			copy($upload, "$dir/$id.$extension");
+		}
+
+		if (isset($_POST['delete'])){
+			foreach ($_POST['delete'] as $i => $d){
+				if (!preg_match('/[0-9+]\.(png|jpeg|jpg|gif)/', $d)){
+					error('Nice try.');
+				}
+				unlink("$dir/$d");
+			}
+		}
+
+		$banners = array_diff(scandir($dir), array('..', '.'));
+		mod_page(_('Edit banners'), 'mod/banners.html', array('board'=>$board,'banners'=>$banners,'token'=>make_secure_link_token('banners/'.$board['uri'])));
+
+	}
+
+	function mod_8_settings($b) {
+		global $config, $mod;
+
+		//if ($b === 'infinity' && $mod['type'] !== ADMIN)
+		//	error('Settings temporarily disabled for this board.');
+
+		if (!in_array($b, $mod['boards']) and $mod['boards'][0] != '*')
+			error($config['error']['noaccess']);
+
+		if (!hasPermission($config['mod']['edit_settings'], $b))
+			error($config['error']['noaccess']);
+	
+		if (!openBoard($b))
+			error("Could not open board!");
+
+		$possible_languages = array_diff(scandir('inc/locale/'), array('..', '.', '.tx', 'README.md'));
+
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+			$title = $_POST['title'];
+			$subtitle = $_POST['subtitle'];
+			$country_flags = isset($_POST['country_flags']) ? 'true' : 'false';
+			$field_disable_name = isset($_POST['field_disable_name']) ? 'true' : 'false';
+			$enable_embedding = isset($_POST['enable_embedding']) ? 'true' : 'false';
+			$force_image_op = isset($_POST['force_image_op']) ? 'true' : 'false';
+			$disable_images = isset($_POST['disable_images']) ? 'true' : 'false';
+			$poster_ids = isset($_POST['poster_ids']) ? 'true' : 'false';
+			$show_sages = isset($_POST['show_sages']) ? 'true' : 'false';
+			$auto_unicode = isset($_POST['auto_unicode']) ? 'true' : 'false';
+			$strip_combining_chars = isset($_POST['strip_combining_chars']) ? 'true' : 'false';
+			$allow_roll = isset($_POST['allow_roll']) ? 'true' : 'false';
+			$image_reject_repost = isset($_POST['image_reject_repost']) ? 'true' : 'false';
+			$image_reject_repost_in_thread = isset($_POST['image_reject_repost_in_thread']) ? 'true' : 'false';
+			$early_404 = isset($_POST['early_404']) ? 'true' : 'false';
+			$allow_delete = isset($_POST['allow_delete']) ? 'true' : 'false';
+			$allow_flash = isset($_POST['allow_flash']) ? '$config[\'allowed_ext_files\'][] = \'swf\';' : '';
+			$allow_pdf = isset($_POST['allow_pdf']) ? '$config[\'allowed_ext_files\'][] = \'pdf\';' : '';
+			$code_tags = isset($_POST['code_tags']) ? '$config[\'additional_javascript\'][] = \'js/code_tags/run_prettify.js\';$config[\'markup\'][] = array("/\[code\](.+?)\[\/code\]/ms", "<code><pre class=\'prettyprint\' style=\'display:inline-block\'>\$1</pre></code>");' : '';
+			$katex = isset($_POST['katex']) ? '$config[\'katex\'] = true;$config[\'additional_javascript\'][] = \'js/katex/katex.min.js\'; $config[\'markup\'][] = array("/\[tex\](.+?)\[\/tex\]/ms", "<span class=\'tex\'>\$1</span>"); $config[\'additional_javascript\'][] = \'js/katex-enable.js\';' : '';
+			$user_flags = isset($_POST['user_flags']) ? "if (file_exists('$b/flags.php')) { include 'flags.php'; }\n" : '';
+			$captcha = isset($_POST['captcha']) ? 'true' : 'false';
+			$force_subject_op = isset($_POST['force_subject_op']) ? 'true' : 'false';
+			$force_flag = isset($_POST['force_flag']) ? 'true' : 'false';
+			$tor_posting = isset($_POST['tor_posting']) ? 'true' : 'false';
+			$new_thread_capt = isset($_POST['new_thread_capt']) ? 'true' : 'false';
+			$oekaki = isset($_POST['oekaki']) ? 'true' : 'false';
+			
+			if ($_POST['locale'] !== 'en' && in_array($_POST['locale'], $possible_languages)) {
+				$locale = "\$config['locale'] = '{$_POST['locale']}.UTF-8';";
+			} else {
+				$locale = '';
+			} 
+
+			if (isset($_POST['max_images']) && (int)$_POST['max_images'] && (int)$_POST['max_images'] <= 5) {
+				$_POST['max_images'] = (int)$_POST['max_images'];
+				$multiimage = "\$config['max_images'] = {$_POST['max_images']};
+					   \$config['additional_javascript'][] = 'js/multi-image.js';";
+			} else {
+				$multiimage = '';
+			} 
+
+			$anonymous = base64_encode($_POST['anonymous']);
+			$blotter = base64_encode(purify_html(html_entity_decode($_POST['blotter'])));
+			$add_to_config = @file_get_contents($b.'/extra_config.php');
+			$replace = '';
+
+			if (isset($_POST['replace'])) {
+				if (sizeof($_POST['replace']) > 200 || sizeof($_POST['with']) > 200) {
+					error(_('Sorry, max 200 wordfilters allowed.'));
+				}
+				if (count($_POST['replace']) == count($_POST['with'])) {
+					foreach ($_POST['replace'] as $i => $r ) {
+						if ($r !== '') {
+							$w = $_POST['with'][$i];
+							
+							if (strlen($w) > 255) {
+								error(sprintf(_('Sorry, %s is too long. Max replacement is 255 characters'), utf8tohtml($w)));
+							}
+
+							$replace .= '$config[\'wordfilters\'][] = array(base64_decode(\'' . base64_encode($r) . '\'), base64_decode(\'' . base64_encode($w) . '\'));';
+						}
+					}
+				}
+				if (is_billion_laughs($_POST['replace'], $_POST['with'])) {
+					error(_('Wordfilters may not wordfilter previous wordfilters. For example, if a filters to bb and b filters to cc, that is not allowed.'));
+				}
+			}
+
+			if (isset($_POST['hour_max_threads']) && in_array($_POST['hour_max_threads'], ['10', '25', '50', '100'])) {
+				$hour_max_threads = $_POST['hour_max_threads'];	
+			} else {
+				$hour_max_threads = 'false';
+			}
+
+			if (isset($_POST['max_pages'])) {
+				$mp = (int)$_POST['max_pages'];
+				if ($mp > 25 || $mp < 2) {
+					$max_pages = 15;
+				} else {
+					$max_pages = $mp;
+				}
+			} else {
+				$max_pages = 15;
+			}			
+
+			if (isset($_POST['reply_limit'])) {
+				$rl = (int)$_POST['reply_limit'];
+				if ($rl > 750 || $rl < 250 || $rl % 25) {
+					$reply_limit = 250;
+				} else {
+					$reply_limit = $rl;
+				}
+			} else {
+				$reply_limit = 250;
+			}
+
+			if (isset($_POST['max_newlines'])) {
+				$mn = (int)$_POST['max_newlines'];
+				if ($mn < 20 || $mn > 300) {
+					$max_newlines = 0;
+				} else {
+					$max_newlines = $mn;
+				}
+			} else {
+				$max_newlines = $mn;
+			}
+
+			if (!(strlen($title) < 40))
+				error('Invalid title');
+			if (!(strlen($subtitle) < 200))
+				error('Invalid subtitle');
+
+			$query = prepare('UPDATE ``boards`` SET `title` = :title, `subtitle` = :subtitle, `indexed` = :indexed, `public_bans` = :public_bans, `public_logs` = :public_logs, `8archive` = :8archive WHERE `uri` = :uri');
+			$query->bindValue(':title', $title);
+			$query->bindValue(':subtitle', $subtitle);
+			$query->bindValue(':uri', $b);
+			$query->bindValue(':indexed', !isset($_POST['meta_noindex']));
+			$query->bindValue(':public_bans', isset($_POST['public_bans']));
+			$query->bindValue(':public_logs', (int)$_POST['public_logs']);
+			$query->bindValue(':8archive', isset($_POST['8archive']));
+			$query->execute() or error(db_error($query));
+
+			$config_file = <<<EOT
+<?php
+\$config['country_flags'] = $country_flags;
+\$config['field_disable_name'] = $field_disable_name;
+\$config['enable_embedding'] = $enable_embedding;
+\$config['force_image_op'] = $force_image_op;
+\$config['disable_images'] = $disable_images;
+\$config['poster_ids'] = $poster_ids;
+\$config['show_sages'] = $show_sages;
+\$config['auto_unicode'] = $auto_unicode;
+\$config['strip_combining_chars'] = $strip_combining_chars;
+\$config['allow_roll'] = $allow_roll;
+\$config['image_reject_repost'] = $image_reject_repost;
+\$config['image_reject_repost_in_thread'] = $image_reject_repost_in_thread;
+\$config['early_404'] = $early_404;
+\$config['allow_delete'] = $allow_delete;
+\$config['anonymous'] = base64_decode('$anonymous');
+\$config['blotter'] = base64_decode('$blotter');
+\$config['stylesheets']['Custom'] = 'board/$b.css';
+\$config['default_stylesheet'] = array('Custom', \$config['stylesheets']['Custom']);
+\$config['captcha']['enabled'] = $captcha;
+\$config['force_subject_op'] = $force_subject_op;
+\$config['force_flag'] = $force_flag;
+\$config['tor_posting'] = $tor_posting;
+\$config['new_thread_capt'] = $new_thread_capt;
+\$config['hour_max_threads'] = $hour_max_threads;
+\$config['reply_limit'] = $reply_limit;
+\$config['max_pages'] = $max_pages;
+\$config['max_newlines'] = $max_newlines;
+\$config['oekaki'] = $oekaki;
+$code_tags $katex $replace $multiimage $allow_flash $allow_pdf $user_flags
+if (\$config['disable_images'])
+	\$config['max_pages'] = 10000;
+
+$locale
+$add_to_config
+EOT;
+
+			// Clean up our CSS...no more expression() or off-site URLs.
+			$clean_css = preg_replace('/expression\s*\(/', '', $_POST['css']);
+	
+			$matched = array();
+
+			preg_match_all("#{$config['link_regex']}#im", $clean_css, $matched);
+			
+			if (isset($matched[0])) {
+				foreach ($matched[0] as $match) {
+					$match_okay = false;
+					foreach ($config['allowed_offsite_urls'] as $allowed_url) {
+						if (strpos($match, $allowed_url) !== false && strpos($match, '#') === false) {
+							$match_okay = true;
+						}
+					}
+					if ($match_okay !== true) {
+						error(sprintf(_("Off-site link \"%s\" is not allowed in the board stylesheet"), $match));
+					}
+				}
+			}
+			
+			//Filter out imports from sites with potentially unsafe content
+			$match_imports = '@import[^;]*';
+			$matched = array();
+			preg_match_all("#$match_imports#im", $clean_css, $matched);
+			
+			$unsafe_import_urls = array('https://a.pomf.se/');
+			
+			if (isset($matched[0])) {
+				foreach ($matched[0] as $match) {
+					$match_okay = true;
+					foreach ($unsafe_import_urls as $unsafe_import_url) {
+						if (strpos($match, $unsafe_import_url) !== false && strpos($match, '#') === false) {
+							$match_okay = false;
+						}
+					}
+					if ($match_okay !== true) {
+						error(sprintf(_("Potentially unsafe import \"%s\" is not allowed in the board stylesheet"), $match));
+					}
+				}
+			}
+
+			$query = query('SELECT `uri`, `title`, `subtitle` FROM ``boards`` WHERE `8archive` = TRUE');
+			file_write('8archive.json', json_encode($query->fetchAll(PDO::FETCH_ASSOC)));
+			file_write($b.'/config.php', $config_file);
+			file_write('stylesheets/board/'.$b.'.css', $clean_css);
+
+			$_config = $config;
+			unset($config['wordfilters']);
+
+			// Faster than openBoard and bypasses cache...we're trusting the PHP output
+			// to be safe enough to run with every request, we can eval it here.
+			eval(str_replace('flags.php', "$b/flags.php", preg_replace('/^\<\?php$/m', '', $config_file)));
+			// czaks: maybe reconsider using it, now that config is cached?
+
+			// Clean the cache
+			if ($config['cache']['enabled']) {
+				cache::delete('board_' . $board['uri']);
+				cache::delete('all_boards');
+
+				cache::delete('config_' . $board['uri']);
+				cache::delete('events_' . $board['uri']);
+
+				unlink('tmp/cache/locale_' . $board['uri']);
+			}
+
+			// be smarter about rebuilds...only some changes really require us to rebuild all threads
+			if ($_config['captcha']['enabled'] != $config['captcha']['enabled']
+			 || $_config['new_thread_capt'] != $config['new_thread_capt'] /*New thread captcha - if toggling "enable captcha" requires this, toggling new thread capt does too, I guess.*/
+			 || $_config['captcha']['extra'] != $config['captcha']['extra']
+			 || $_config['blotter'] != $config['blotter']
+			 || $_config['field_disable_name'] != $config['field_disable_name']
+			 || $_config['show_sages'] != (isset($config['show_sages']) && $config['show_sages'])) {
+				buildIndex();
+				$query = query(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `thread` IS NULL", $b)) or error(db_error());
+				while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+					buildThread($post['id']);
+				}
+			}
+		
+			modLog('Edited board settings', $b);
+		}
+
+		$query = prepare('SELECT * FROM boards WHERE uri = :board');
+		$query->bindValue(':board', $b);
+		$query->execute() or error(db_error($query));
+		$board = $query->fetchAll()[0];
+ 
+		$css = @file_get_contents('stylesheets/board/' . $board['uri'] . '.css');
+	
+		mod_page(_('Board configuration'), 'mod/settings.html', array('board'=>$board, 'css'=>prettify_textarea($css), 'token'=>make_secure_link_token('settings/'.$board['uri']), 'languages'=>$possible_languages,'allowed_urls'=>$config['allowed_offsite_urls']));
+	}
diff --git a/inc/instance-config.php b/inc/instance-config.php
index 152bb9d4..4a1572a7 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -202,7 +202,7 @@ $config['twig_cache'] = false;
 $config['report_captcha'] = true;
 
 // 8chan specific mod pages
-require '8chan-mod-pages.php';
+require '8chan-mod-config.php';
 	
 // Load database credentials
 require "secrets.php";
diff --git a/inc/instance-functions.php b/inc/instance-functions.php
index f291714f..d3fdf24b 100644
--- a/inc/instance-functions.php
+++ b/inc/instance-functions.php
@@ -1,6 +1,6 @@
 <?php
 require_once("inc/8chan-functions.php");
-require_once("inc/8chan-mod-pages-functions.php");
+require_once("inc/8chan-mod-pages.php");
 
 function max_posts_per_hour($post) {
 	global $config, $board;

From 92e4314a6285a21c16eaca7b4e0d6c0ba98e2aac Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 22:44:48 +0200
Subject: [PATCH 38/70] infinity/smart-build: lol nano

---
 inc/instance-functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/instance-functions.php b/inc/instance-functions.php
index d3fdf24b..a2102f94 100644
--- a/inc/instance-functions.php
+++ b/inc/instance-functions.php
@@ -7,7 +7,7 @@ function max_posts_per_hour($post) {
 	if (!$config['hour_max_threads']) return false;
 
 	if ($post['op']) {
-		$query = prepare(sprintf('SELECT COUNT(*) AS `count` FROM ``posts_%s`` WHERE `thread` IS NULL AND FROM_UNIXTIME(`time`) > DATE_SUB(NOW(), INTERVAL 1 HOUR);', $board[$
+		$query = prepare(sprintf('SELECT COUNT(*) AS `count` FROM ``posts_%s`` WHERE `thread` IS NULL AND FROM_UNIXTIME(`time`) > DATE_SUB(NOW(), INTERVAL 1 HOUR);', $board['uri']));
 		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 		$query->execute() or error(db_error($query));
 		$r = $query->fetch(PDO::FETCH_ASSOC);

From be88d026bd2aaa66d265a29651b22f792cc957de Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 22:47:46 +0200
Subject: [PATCH 39/70] infinity/smart-build: typo

---
 inc/instance-config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/instance-config.php b/inc/instance-config.php
index 4a1572a7..97b20491 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -177,7 +177,7 @@
 	$config['hour_max_threads'] = 10;
 	$config['filters'][] = array(
 		'condition' => array(
-			'custom' => 'test_posts_per_hour'
+			'custom' => 'max_posts_per_hour'
 		),
 		'action' => 'reject',
 		'message' => 'On this board, to prevent raids the number of threads that can be created per hour is limited. Please try again later, or post in an existing thread.'

From ab74235a4b6a1d0d3ffa4ac1f72cf4e61497a543 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 22:51:02 +0200
Subject: [PATCH 40/70] fs cache backend: silence the error

---
 inc/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/cache.php b/inc/cache.php
index d6bc9211..852aefa2 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -132,7 +132,7 @@ class Cache {
 			case 'fs':
 				$key = str_replace('/', '::', $key);
 				$key = str_replace("\0", '', $key);
-				unlink('tmp/cache/'.$key);
+				@unlink('tmp/cache/'.$key);
 				break;
 			case 'php':
 				unset(self::$cache[$key]);

From 1670da07cb3e9f76ba224c0c716b3c2e5f003059 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 22:55:52 +0200
Subject: [PATCH 41/70] infinity/smart-build: move a require to
 instance-functions

---
 inc/instance-config.php    | 1 -
 inc/instance-functions.php | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/instance-config.php b/inc/instance-config.php
index 97b20491..529b266c 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -7,7 +7,6 @@
 *
 *  You can copy values from config.php (defaults) and paste them here.
 */
-	require_once "lib/htmlpurifier-4.6.0/library/HTMLPurifier.auto.php";
 	require_once "instance-functions.php";
 
 	// Note - you may want to change some of these in secrets.php instead of here
diff --git a/inc/instance-functions.php b/inc/instance-functions.php
index a2102f94..9bcc7c3f 100644
--- a/inc/instance-functions.php
+++ b/inc/instance-functions.php
@@ -2,6 +2,9 @@
 require_once("inc/8chan-functions.php");
 require_once("inc/8chan-mod-pages.php");
 
+require_once "lib/htmlpurifier-4.6.0/library/HTMLPurifier.auto.php";
+
+
 function max_posts_per_hour($post) {
 	global $config, $board;
 	if (!$config['hour_max_threads']) return false;

From 8a6a20bd9c71e2c3cb48a27655643731bb63f321 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 23:54:00 +0200
Subject: [PATCH 42/70] infinity/smart-build: fix context

---
 inc/8chan-mod-pages.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/inc/8chan-mod-pages.php b/inc/8chan-mod-pages.php
index eef96790..d3a207bd 100644
--- a/inc/8chan-mod-pages.php
+++ b/inc/8chan-mod-pages.php
@@ -641,17 +641,6 @@ EOT;
 			eval(str_replace('flags.php', "$b/flags.php", preg_replace('/^\<\?php$/m', '', $config_file)));
 			// czaks: maybe reconsider using it, now that config is cached?
 
-			// Clean the cache
-			if ($config['cache']['enabled']) {
-				cache::delete('board_' . $board['uri']);
-				cache::delete('all_boards');
-
-				cache::delete('config_' . $board['uri']);
-				cache::delete('events_' . $board['uri']);
-
-				unlink('tmp/cache/locale_' . $board['uri']);
-			}
-
 			// be smarter about rebuilds...only some changes really require us to rebuild all threads
 			if ($_config['captcha']['enabled'] != $config['captcha']['enabled']
 			 || $_config['new_thread_capt'] != $config['new_thread_capt'] /*New thread captcha - if toggling "enable captcha" requires this, toggling new thread capt does too, I guess.*/
@@ -673,6 +662,16 @@ EOT;
 		$query->bindValue(':board', $b);
 		$query->execute() or error(db_error($query));
 		$board = $query->fetchAll()[0];
+
+		// Clean the cache
+		if ($config['cache']['enabled']) {
+			cache::delete('board_' . $board['uri']);
+			cache::delete('all_boards');
+
+			cache::delete('config_' . $board['uri']);
+			cache::delete('events_' . $board['uri']);
+			unlink('tmp/cache/locale_' . $board['uri']);
+		}
  
 		$css = @file_get_contents('stylesheets/board/' . $board['uri'] . '.css');
 	

From ef8ef2c0b43f73c09a1601739ae02c74628aa680 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 6 Apr 2015 23:58:23 +0200
Subject: [PATCH 43/70] infinity/smart-build: rebuild config cache when flags
 are modified

---
 inc/8chan-mod-pages.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/inc/8chan-mod-pages.php b/inc/8chan-mod-pages.php
index d3a207bd..9d74b8bf 100644
--- a/inc/8chan-mod-pages.php
+++ b/inc/8chan-mod-pages.php
@@ -319,6 +319,11 @@
 \$config['user_flags'] = unserialize(file_get_contents('$b/flags.ser'));
 FLAGS;
 
+	                if ($config['cache']['enabled']) {
+	                        cache::delete('config_' . $b);
+	                        cache::delete('events_' . $b);
+			}
+
 			file_write($b.'/flags.php', $flags);
 		}
 

From e3a8308e0033e6bbde6fd3bbc9536d789b473454 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 7 Apr 2015 00:04:55 +0200
Subject: [PATCH 44/70] infinity/smart-build: fix order of loading

---
 inc/instance-config.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/inc/instance-config.php b/inc/instance-config.php
index 529b266c..0826e894 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -7,8 +7,6 @@
 *
 *  You can copy values from config.php (defaults) and paste them here.
 */
-	require_once "instance-functions.php";
-
 	// Note - you may want to change some of these in secrets.php instead of here
 	// See the secrets.example.php file
 	$config['db']['server'] = 'localhost';
@@ -202,6 +200,9 @@ $config['report_captcha'] = true;
 
 // 8chan specific mod pages
 require '8chan-mod-config.php';
+
+// Load instance functions later on
+require_once 'instance-functions.php';
 	
 // Load database credentials
 require "secrets.php";

From ac693427f86731f0342f92f2b8191d5fd10374d1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 7 Apr 2015 00:20:07 +0200
Subject: [PATCH 45/70] infinity/smart-build: needless code duplication, fixed
 now

---
 inc/8chan-mod-config.php |  3 +--
 inc/8chan-mod-pages.php  | 46 ----------------------------------------
 2 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/inc/8chan-mod-config.php b/inc/8chan-mod-config.php
index 7894be58..1c2ed2ac 100644
--- a/inc/8chan-mod-config.php
+++ b/inc/8chan-mod-config.php
@@ -44,8 +44,7 @@
 	$config['mod']['move'] = GLOBALVOLUNTEER;
 	$config['mod']['shadow_capcode'] = 'Global Volunteer';
 
-
-	// Mod pages code now resides in 8chan-mod-pages-functions.php file
+	// Mod pages assignment
 	$config['mod']['custom_pages']['/tags/(\%b)'] = '8_tags';
 	$config['mod']['custom_pages']['/reassign/(\%b)'] = '8_reassign';
 	$config['mod']['custom_pages']['/volunteers/(\%b)'] = '8_volunteers';
diff --git a/inc/8chan-mod-pages.php b/inc/8chan-mod-pages.php
index 9d74b8bf..a8e44311 100644
--- a/inc/8chan-mod-pages.php
+++ b/inc/8chan-mod-pages.php
@@ -1,50 +1,4 @@
 <?php
-	$config['mod']['show_ip'] = GLOBALVOLUNTEER;
-	$config['mod']['show_ip_less'] = BOARDVOLUNTEER;
-	$config['mod']['manageusers'] = GLOBALVOLUNTEER;
-	$config['mod']['noticeboard_post'] = GLOBALVOLUNTEER;
-	$config['mod']['search'] = GLOBALVOLUNTEER;
-	$config['mod']['clean_global'] = GLOBALVOLUNTEER;
-	$config['mod']['view_notes'] = DISABLED;
-	$config['mod']['create_notes'] = DISABLED;
-	$config['mod']['edit_config'] = DISABLED;
-	$config['mod']['debug_recent'] = ADMIN;
-	$config['mod']['debug_antispam'] = ADMIN;
-	$config['mod']['noticeboard_post'] = ADMIN;
-	$config['mod']['modlog'] = GLOBALVOLUNTEER;
-	$config['mod']['mod_board_log'] = MOD;
-	$config['mod']['editpost'] = BOARDVOLUNTEER;
-	$config['mod']['edit_banners'] = MOD;
-	$config['mod']['edit_flags'] = MOD;
-	$config['mod']['edit_settings'] = MOD;
-	$config['mod']['edit_volunteers'] = MOD;
-	$config['mod']['edit_tags'] = MOD;
-	$config['mod']['clean'] = BOARDVOLUNTEER;
-	// new perms
-
-	$config['mod']['ban'] = BOARDVOLUNTEER;
-	$config['mod']['bandelete'] = BOARDVOLUNTEER;
-	$config['mod']['unban'] = BOARDVOLUNTEER;
-	$config['mod']['deletebyip'] = BOARDVOLUNTEER;
-	$config['mod']['sticky'] = BOARDVOLUNTEER;
-	$config['mod']['cycle'] = BOARDVOLUNTEER;
-	$config['mod']['lock'] = BOARDVOLUNTEER;
-	$config['mod']['postinlocked'] = BOARDVOLUNTEER;
-	$config['mod']['bumplock'] = BOARDVOLUNTEER;
-	$config['mod']['view_bumplock'] = BOARDVOLUNTEER;
-	$config['mod']['bypass_field_disable'] = BOARDVOLUNTEER;
-	$config['mod']['view_banlist'] = BOARDVOLUNTEER;
-	$config['mod']['view_banstaff'] = BOARDVOLUNTEER;
-	$config['mod']['public_ban'] = BOARDVOLUNTEER;
-	$config['mod']['recent'] = BOARDVOLUNTEER;
-	$config['mod']['ban_appeals'] = BOARDVOLUNTEER;
-	$config['mod']['view_ban_appeals'] = BOARDVOLUNTEER;
-	$config['mod']['view_ban'] = BOARDVOLUNTEER;
-	$config['mod']['reassign_board'] = GLOBALVOLUNTEER;
-	$config['mod']['move'] = GLOBALVOLUNTEER;
-	$config['mod']['shadow_capcode'] = 'Global Volunteer';
-
-
 	function mod_8_tags ($b) {
 		global $board, $config;
 

From 51b93e643d04e1e16c6beaff7f144856025c2247 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 7 Apr 2015 01:44:55 +0200
Subject: [PATCH 46/70] 8chan/smart-build: includable 404.php

---
 inc/instance-config.php    | 3 ++-
 inc/instance-functions.php | 4 ++++
 smart_build.php            | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/inc/instance-config.php b/inc/instance-config.php
index 0826e894..1701fc64 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -198,6 +198,8 @@ $config['spam']['unicode'] = false;
 $config['twig_cache'] = false;
 $config['report_captcha'] = true;
 
+$config['page_404'] = 'page_404';
+
 // 8chan specific mod pages
 require '8chan-mod-config.php';
 
@@ -206,4 +208,3 @@ require_once 'instance-functions.php';
 	
 // Load database credentials
 require "secrets.php";
-
diff --git a/inc/instance-functions.php b/inc/instance-functions.php
index 9bcc7c3f..71e933d1 100644
--- a/inc/instance-functions.php
+++ b/inc/instance-functions.php
@@ -18,3 +18,7 @@ function max_posts_per_hour($post) {
 		return ($r['count'] > $config['hour_max_threads']);
 	}
 }
+
+function page_404() {
+	include('404.php');
+}
diff --git a/smart_build.php b/smart_build.php
index da1966d0..ac016480 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -147,6 +147,9 @@ function die_404() { global $config;
     header("Status: 404 Not Found");
     echo "<h1>404 Not Found</h1><p>Page doesn't exist<hr><address>vichan</address>";
   }
+  elseif (is_callable($config['page_404'])) {
+    $config['page_404']();
+  }
   else {
     header("Location: ".$config['page_404']);
   }

From be80df21f0bf72210ac4b87ac6e0c773f2a6fd3a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 7 Apr 2015 01:48:03 +0200
Subject: [PATCH 47/70] 8chan/smart-build: 404.php should global $config? php
 is weird

---
 404.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/404.php b/404.php
index e74eb65b..7422be23 100644
--- a/404.php
+++ b/404.php
@@ -3,6 +3,8 @@
 require_once "inc/functions.php";
 header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
 
+global $config;
+
 $dir = "static/404/";
 
 if (!is_dir($dir))

From d0e240acb7f736f060e5bbb0f0bd2ac0ce31f367 Mon Sep 17 00:00:00 2001
From: ninjadoge24 <ninjadoge24@gmail.com>
Date: Wed, 8 Apr 2015 21:49:03 +0530
Subject: [PATCH 48/70] Remove redundant check for existence of board

It already gets checked in line 217.
---
 post.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/post.php b/post.php
index 65e7db13..177c2dba 100644
--- a/post.php
+++ b/post.php
@@ -235,10 +235,6 @@ elseif (isset($_POST['post'])) {
 		$post['thread'] = round($_POST['thread']);
 	} else
 		$post['op'] = true;
-	
-	// Check if board exists
-	if (!openBoard($post['board']))
-		error($config['error']['noboard']);
 
 	// Check if banned
 	checkBan($board['uri']);

From ee7c624517f52450a5959457b633143bb2c6174b Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Thu, 9 Apr 2015 20:11:48 +1000
Subject: [PATCH 49/70] Signed-off-by: 8n-tech
 <8n-tech@users.noreply.github.com>

inc/functions.php
- Fixed issues with dio on windows machines.

inc/lib/Twig/Extensions/Extension/Tinyboard.php
- Added strict (int) typecasting to avoid critical errors in timestamp formatting.

index.php
- Fixed issue where opening index.php would whitepage.

static/nsfw.png
static/swf.png
- Added missing static files.
---
 inc/functions.php                             |  40 ++++++++++--------
 .../Twig/Extensions/Extension/Tinyboard.php   |   4 +-
 index.php                                     |   2 +
 static/nsfw.png                               | Bin 0 -> 1229 bytes
 static/sfw.png                                | Bin 0 -> 1232 bytes
 5 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 static/nsfw.png
 create mode 100644 static/sfw.png

diff --git a/inc/functions.php b/inc/functions.php
index 480df77f..4a4969ae 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -628,41 +628,47 @@ function purge($uri) {
 
 function file_write($path, $data, $simple = false, $skip_purge = false) {
 	global $config, $debug;
-
+	
 	if (preg_match('/^remote:\/\/(.+)\:(.+)$/', $path, $m)) {
 		if (isset($config['remote'][$m[1]])) {
 			require_once 'inc/remote.php';
-
+			
 			$remote = new Remote($config['remote'][$m[1]]);
 			$remote->write($data, $m[2]);
 			return;
-		} else {
+		}
+		else {
 			error('Invalid remote server: ' . $m[1]);
 		}
 	}
-
-	if (!$fp = dio_open($path, O_WRONLY | O_CREAT, 0644))
+	else {
+		// This will convert a local, relative path like "b/index.html" to a full path.
+		// dio_open does not work with relative paths on Windows machines.
+		$path = realpath(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
+	}
+	
+	if (!$fp = dio_open( $path, O_WRONLY | O_CREAT | O_TRUNC, 0644)) {
 		error('Unable to open file for writing: ' . $path);
-
+	}
+	
 	// File locking
-	if (dio_fcntl($fp, F_SETLKW, array('type' => F_WRLCK)) === -1) {
+	if (function_exists("dio_fcntl") && dio_fcntl($fp, F_SETLKW, array('type' => F_WRLCK)) === -1) {
 		error('Unable to lock file: ' . $path);
 	}
-
-	// Truncate file
-	if (!dio_truncate($fp, 0))
-		error('Unable to truncate file: ' . $path);
-
+	
 	// Write data
-	if (($bytes = dio_write($fp, $data)) === false)
+	if (($bytes = dio_write($fp, $data)) === false) {
 		error('Unable to write to file: ' . $path);
-
+	}
+	
 	// Unlock
-	dio_fcntl($fp, F_SETLK, array('type' => F_UNLCK));
-
+	if (function_exists("dio_fcntl")) {
+		dio_fcntl($fp, F_SETLK, array('type' => F_UNLCK));
+	}
+	
 	// Close
 	dio_close($fp);
-
+	
 	/**
 	 * Create gzipped file.
 	 *
diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index 1c5b8981..f41e0768 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -76,7 +76,7 @@ function twig_remove_whitespace_filter($data) {
 }
 
 function twig_date_filter($date, $format) {
-	return gmstrftime($format, $date);
+	return gmstrftime($format, (int) $date);
 }
 
 function twig_hasPermission_filter($mod, $permission, $board = null) {
@@ -86,7 +86,7 @@ function twig_hasPermission_filter($mod, $permission, $board = null) {
 function twig_extension_filter($value, $case_insensitive = true) {
 	$ext = mb_substr($value, mb_strrpos($value, '.') + 1);
 	if($case_insensitive)
-		$ext = mb_strtolower($ext);		
+		$ext = mb_strtolower($ext);
 	return $ext;
 }
 
diff --git a/index.php b/index.php
index 12fec902..a44b56e5 100644
--- a/index.php
+++ b/index.php
@@ -9,3 +9,5 @@ if ($query) {
 
 $index = Element("8chan/index.html", array("config" => $config, "newsplus" => $newsplus));
 file_write('index.html', $index);
+
+echo $index;
\ No newline at end of file
diff --git a/static/nsfw.png b/static/nsfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..475868b30edf938de0994384f0e3b72ebea07f78
GIT binary patch
literal 1229
zcmV;;1Ty=HP)<h;3K|Lk000e1NJLTq000mG000XJ1^@s6cH#{=000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R0001FNkl<ZC>6a>K@I>x1Y`gIXREWCbS5&1%Q{d(
z6%VtpNDp(*EHNUi!>m<&RwD;iQVtC?#jI8Q2#(?;{fVGEaXW#JQSCZ3{=sEHcL2|R
rK&29A1n2rq!9ce1^a}KW+TGw65pEz5;MfpB00000NkvXXu0mjf2PH|^

literal 0
HcmV?d00001

diff --git a/static/sfw.png b/static/sfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..e031f3c3f7772113a2c19b3b2b14981d23086bf0
GIT binary patch
literal 1232
zcmV;>1TXuEP)<h;3K|Lk000e1NJLTq000mG000XJ1^@s6cH#{=000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R0001INkl<ZC>6C*TMmFQ2otmWUs+dYNk^F3H1Z+k
z(XJudQDduNW=L0{#hN(FST2pyzPFaQV(kL~yWm&wUjg3X$y(<C1SKuq0LwFk=%#ZJ
uhpZtCXPP;i65w){KMVMeq{qu%8ud<l;42WG4}tXn0000<MNUMnLSTX(cus8q

literal 0
HcmV?d00001


From 0ceb814ab383587e5ff2d017b8c528a893d2ee4e Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Mon, 13 Apr 2015 14:24:55 +1000
Subject: [PATCH 50/70] - Added board-search.php with improved board directory
 searching. - Added new functions to functions.php for fetching board meta. -
 Added new styling for non-index page 12-col layouts. - Modified templating
 for board directories. - Moved CSS from the index page to CSS files.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                 | 162 +++++++++++++++++
 boards.php                       |  11 +-
 inc/functions.php                |  84 ++++++++-
 stylesheets/style.css            | 298 ++++++++++++++++++++++++-------
 templates/8chan/boards-tags.html | 252 ++++++++++----------------
 templates/8chan/boards.html      | 102 ++++-------
 templates/8chan/index.html       |  27 ---
 7 files changed, 609 insertions(+), 327 deletions(-)
 create mode 100644 board-search.php

diff --git a/board-search.php b/board-search.php
new file mode 100644
index 00000000..d9fb3ec2
--- /dev/null
+++ b/board-search.php
@@ -0,0 +1,162 @@
+<?php
+
+include "inc/functions.php";
+
+$CanViewUnindexed = isset($mod["type"]) && $mod["type"] <= GlobalVolunteer;
+
+
+/* The expected output of this page is JSON. */
+$response = array();
+
+
+/* Prefetch some information. */
+$languages = array(
+	"en",
+	"es",
+);
+
+
+/* Determine search parameters from $_GET */
+$search = array(
+	'lang' => false,
+	'nsfw' => true,
+	'tags' => false,
+);
+
+// Include NSFW boards?
+if (isset( $_GET['nsfw'] )) {
+	$search['nsfw'] = (bool) $_GET['nsfw'];
+}
+
+// Include what language (if the language is not blank and we recognize it)?
+if (isset( $_GET['lang'] ) && isset($languages[$search['lang']])) {
+	$search['lang'] = $_GET['lang'];
+}
+
+// Include what tag?
+if (isset( $_GET['tags'] )) {
+	$search['tags'] = $_GET['tags'];
+}
+
+/* Search boards */
+$boards = listBoards();
+$response['boards'] = array();
+
+// Loop through our available boards and filter out inapplicable ones based on standard filtering.
+foreach ($boards as $board) {
+	// Checks we can do without looking at config.
+	if (
+		// Indexed, or we are staff,
+		( $CanViewUnindexed !== true && !$board['indexed'] )
+		// Not filtering NSFW, or board is SFW.
+		|| ( $search['nsfw'] !== true && $board['sfw'] != 1 )
+	) {
+		continue;
+	}
+	
+	// Load board config.
+	$boardConfig = loadBoardConfig( $board['uri'] );
+	
+	// Determine language/locale and tags.
+	$boardLang = strtolower( array_slice( explode( "_", $boardConfig['locale'] ?: "" ), 0 )[0] ); // en_US -> en OR en -> en
+	
+	// Check against our config search options.
+	if ( $search['lang'] !== false && $search['lang'] != $boardLang ) {
+		continue;
+	}
+	
+	$board['locale'] = $boardLang;
+	
+	$response['boards'][ $board['uri'] ] = $board;
+}
+
+
+/* Tag Fetching */
+// (We have do this even if we're not filtering by tags so that we know what each board's tags are)
+
+// Fetch all board tags for our boards.
+$boardTags = fetchBoardTags( array_keys( $response['boards'] ) );
+
+// Loop through each board and determine if there are tag matches.
+foreach ($response['boards'] as $boardUri => &$board) {
+	// If we are filtering by tag and there is no match, remove from the response.
+	if ( $search['tags'] !== false && ( !isset( $boardTags[ $boardUri ] ) || !in_array( $search['tags'], $boardTags[ $boardUri ] )) ) {
+		unset( $response['boards'][$boardUri] );
+	}
+	// If we aren't filtering / there is a match AND we have tags, set the tags.
+	else if ( isset( $boardTags[ $boardUri ] ) && $boardTags[ $boardUri ] ) {
+		$board['tags'] = $boardTags[ $boardUri ];
+	}
+	// Othrwise, just declare our tag array blank.
+	else {
+		$board['tags'] = array();
+	}
+}
+
+
+/* Activity Fetching */
+$boardActivity = fetchBoardActivity( array_keys( $response['boards'] ) );
+
+// Loop through each board and record activity to it.
+// We will also be weighing and building a tag list.
+foreach ($response['boards'] as $boardUri => &$board) {
+	$board['active'] = (int) $boardActivity['active'][ $boardUri ];
+	$board['pph'] = (int) $boardActivity['average'][ $boardUri ];
+	
+	if (isset($board['tags']) && count($board['tags']) > 0) {
+		foreach ($board['tags'] as $tag) {
+			if (isset($response['tag'][$tag])) {
+				$response['tag'][$tag] += $board['active'];
+			}
+			else {
+				$response['tag'][$tag] = $board['active'];
+			}
+		}
+	}
+}
+
+// Get the top most popular tags.
+if (count($response['tag']) > 0) {
+	// Sort by most active tags.
+	arsort( $response['tag'] );
+	// Get the first n most active tags.
+	$response['tag'] = array_splice( $response['tag'], 0, 200 );
+	
+	$tagLightest = end( array_keys( $response['tag'] ) );
+}
+
+
+/* (Please) Respond */
+$json = json_encode( $response );
+
+// Error Handling
+switch (json_last_error()) {
+	case JSON_ERROR_NONE:
+		$jsonError = false;
+		break;
+	case JSON_ERROR_DEPTH:
+		$jsonError = 'Maximum stack depth exceeded';
+		break;
+	case JSON_ERROR_STATE_MISMATCH:
+		$jsonError = 'Underflow or the modes mismatch';
+		break;
+	case JSON_ERROR_CTRL_CHAR:
+		$jsonError = 'Unexpected control character found';
+		break;
+	case JSON_ERROR_SYNTAX:
+		$jsonError = 'Syntax error, malformed JSON';
+		break;
+	case JSON_ERROR_UTF8:
+		$jsonError = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+		break;
+	default:
+		$jsonError = 'Unknown error';
+		break;
+}
+
+if ($jsonError) {
+	$json = "{\"error\":\"{$jsonError}\"}";
+}
+
+// Successful output
+echo $json;
\ No newline at end of file
diff --git a/boards.php b/boards.php
index 87ba7ddf..a1cb260b 100644
--- a/boards.php
+++ b/boards.php
@@ -122,7 +122,7 @@ $body = Element("8chan/boards-tags.html", array("config" => $config, "n_boards"
 
 $html = Element("page.html", array("config" => $config, "body" => $body, "title" => "Boards on &infin;chan"));
 $boards_top2k = $boards;
-array_splice($boards_top2k, 2000);
+array_splice($boards_top2k, 100);
 $boards_top2k = array_values($boards_top2k);
 $body = Element("8chan/boards-tags.html", array("config" => $config, "n_boards" => $n_boards, "t_boards" => $t_boards, "hidden_boards_total" => $hidden_boards_total, "total_posts" => $total_posts, "total_posts_hour" => $total_posts_hour, "boards" => $boards_top2k, "last_update" => date('r'), "uptime_p" => shell_exec('uptime -p'), 'tags' => $all_tags, 'top2k' => true));
 $html_top2k = Element("page.html", array("config" => $config, "body" => $body, "title" => "Boards on &infin;chan"));
@@ -133,10 +133,10 @@ if ($admin) {
 	foreach ($boards as $i => &$b) { unset($b['img']); }
 	file_write("boards.json", json_encode($boards));
 	file_write("tags.json", json_encode($all_tags));
-	foreach ($boards as $i => $b) {
+	foreach ($boards as $i => $b) {/*
 		if (in_array($b['uri'], $config['no_top_bar_boards'])) {
 			unset($boards[$i]);
-		}
+		}*/
 		unset($boards[$i]['img']);
 	}
 
@@ -147,6 +147,5 @@ if ($admin) {
 	file_write("boards-top20.json", json_encode($boards));
 	file_write("boards.html", $html_top2k);
 	file_write("boards_full.html", $html);
-	echo 'Done';
-}
-
+	echo $html;
+}
\ No newline at end of file
diff --git a/inc/functions.php b/inc/functions.php
index 4a4969ae..1e2b9be7 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -516,9 +516,9 @@ function setupBoard($array) {
 	$board = array(
 		'uri' => $array['uri'],
 		'title' => $array['title'],
-		'subtitle' => $array['subtitle'],
-		'indexed' => $array['indexed'],
-		'public_logs' => $array['public_logs']
+		'subtitle' => isset($array['subtitle']) ? $array['subtitle'] : "",
+		'indexed' => isset($array['indexed']) ? $array['indexed'] : true,
+		'public_logs' => isset($array['public_logs']) ? $array['public_logs'] : true,
 	);
 
 	// older versions
@@ -804,6 +804,84 @@ function listBoards($just_uri = false, $indexed_only = false) {
 	return $boards;
 }
 
+function loadBoardConfig( $uri ) {
+	$config = array(
+		"locale" => "en_US",
+	);
+	$configPath = "/{$uri}/config.php";
+	
+	if (file_exists( $configPath ) && is_readable( $configPath )) {
+		include( $configPath );
+	}
+	
+	// **DO NOT** use $config outside of this local scope.
+	// It's used by our global config array.
+	return $config;
+}
+
+function fetchBoardActivity( $uris ) {
+	$boardActivity = array();
+	
+	/*
+	$uris = "\"" . implode( (array) $uris, "\",\"" ) . "\"";
+	
+	$tagQuery = prepare("SELECT * FROM ``board_tags`` WHERE `uri` IN ({$uris})");
+	$tagQuery->execute() or error(db_error($tagQuery));
+	$tagResult = $tagQuery->fetchAll(PDO::FETCH_ASSOC);
+	
+	if ($tagResult) {
+		foreach ($tagResult as $tagRow) {
+			$tag = $tagRow['tag'];
+			$tag = trim($tag);
+			$tag = strtolower($tag);
+			$tag = str_replace(['_', ' '], '-', $tag);
+			
+			if (!isset($boardTags[ $tagRow['uri'] ])) {
+				$boardTags[ $tagRow['uri'] ] = array();
+			}
+			
+			$boardTags[ $tagRow['uri'] ][] = htmlentities( utf8_encode( $tag ) );
+		}
+	}
+	*/
+	
+	foreach( (array) $uris as $uri ) {
+		$random = rand( -1000, 1000 );
+		if( $random < 0 ) $random = 0;
+		
+		$boardActivity['active'][ $uri ] = $random;
+		$boardActivity['average'][ $uri ] = $random * 72;
+	}
+	
+	return $boardActivity;
+}
+
+function fetchBoardTags( $uris ) {
+	$boardTags = array();
+	$uris = "\"" . implode( (array) $uris, "\",\"" ) . "\"";
+	
+	$tagQuery = prepare("SELECT * FROM ``board_tags`` WHERE `uri` IN ({$uris})");
+	$tagQuery->execute() or error(db_error($tagQuery));
+	$tagResult = $tagQuery->fetchAll(PDO::FETCH_ASSOC);
+	
+	if ($tagResult) {
+		foreach ($tagResult as $tagRow) {
+			$tag = $tagRow['tag'];
+			$tag = trim($tag);
+			$tag = strtolower($tag);
+			$tag = str_replace(['_', ' '], '-', $tag);
+			
+			if (!isset($boardTags[ $tagRow['uri'] ])) {
+				$boardTags[ $tagRow['uri'] ] = array();
+			}
+			
+			$boardTags[ $tagRow['uri'] ][] = htmlentities( utf8_encode( $tag ) );
+		}
+	}
+	
+	return $boardTags;
+}
+
 function until($timestamp) {
 	$difference = $timestamp - time();
 	switch(TRUE){
diff --git a/stylesheets/style.css b/stylesheets/style.css
index b5706afc..e862b9f6 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1,3 +1,6 @@
+/* === GENERAL TAG SETTINGS === */
+
+/* Page Layouts */
 body {
   background: #EEF2FF url('img/fade-blue.png') repeat-x 50% 0%;
   color: black;
@@ -8,6 +11,69 @@ body {
   padding-right: 4px;
 }
 
+main,
+aside,
+section {
+	display: block;
+	margin: 0 auto;
+	width: 100%;
+}
+
+main {
+	max-width: 1110px;
+}
+
+/* Tables */
+table {
+  margin: auto;
+  width: 100%;
+}
+
+table {
+	margin: auto;
+	width: 100%;
+}
+table tbody td {
+	margin: 0;
+	padding: 4px 15px 4px 4px;
+	
+	text-align: left;
+}
+table thead th {
+	border: 1px solid #000333;
+	padding: 4px 15px 5px 5px;
+	
+	background: #98E;
+	color: #000333;
+	text-align: left;
+	white-space: nowrap;
+}
+table tbody tr:nth-of-type( even ) {
+	background-color: #D6DAF0;
+}
+
+td.minimal,th.minimal {
+  width: 1%;
+  white-space: nowrap;
+}
+
+table.mod.config-editor {
+  font-size: 9pt;
+  width: 100%;
+}
+
+table.mod.config-editor td {
+  text-align: left;
+  padding: 5px;
+  border-bottom: 1px solid #98e;
+}
+
+table.mod.config-editor input[type="text"] {
+  width: 98%;
+}
+
+
+/* Uncategorized */
 #post-form-outer {
   text-align: center;
 }
@@ -538,50 +604,10 @@ hr {
   clear: left;
 }
 
-div.boardlist {
-  color: #89A;
-  font-size: 9pt;
-  margin-top: 3px;
-}
-
-div.boardlist.bottom {
-  margin-top: 20px;
-}
-
-div.boardlist a {
-  text-decoration: none;
-}
-
 div.report {
   color: #333;
 }
 
-table.modlog {
-  margin: auto;
-  width: 100%;
-}
-
-table.modlog tr td {
-  text-align: left;
-  margin: 0;
-  padding: 4px 15px 0 0;
-}
-
-table.modlog tr th {
-  text-align: left;
-  padding: 4px 15px 5px 5px;
-  white-space: nowrap;
-}
-
-table.modlog tr th {
-  background: #98E;
-}
-
-td.minimal,th.minimal {
-  width: 1%;
-  white-space: nowrap;
-}
-
 div.top_notice {
   text-align: center;
   margin: 5px auto;
@@ -605,21 +631,6 @@ div.blotter {
   text-align: center;
 }
 
-table.mod.config-editor {
-  font-size: 9pt;
-  width: 100%;
-}
-
-table.mod.config-editor td {
-  text-align: left;
-  padding: 5px;
-  border-bottom: 1px solid #98e;
-}
-
-table.mod.config-editor input[type="text"] {
-  width: 98%;
-}
-
 .desktop-style div.boardlist:not(.bottom) {
   position: fixed;
   top: 0;
@@ -1012,7 +1023,6 @@ span.pln {
   color:grey;
 }
 
-
 @media screen and (min-width: 768px) {
   p.intro {
     clear: none;
@@ -1023,8 +1033,67 @@ span.pln {
   }
 }
 
-/* threadwatcher */
+/* === GENERAL CLASSES === */
+.loading {
+	background: none;
+	background-color: none;
+	background-image: url('/static/infinity.gif');
+	background-position: center center;
+	background-repeat: no-repeat;
+	min-height: 76px;
+	min-width:  128px;
+}
 
+
+/* Responsive helpers */
+.col {
+	box-sizing: border-box;
+	float: left;
+}
+
+.col-12 { width: 100%; }
+.col-11 { width: 91.66666667%; }
+.col-10 { width: 83.33333333%; }
+.col-9 { width: 75%; }
+.col-8 { width: 66.66666667%; }
+.col-7 { width: 58.33333333%; }
+.col-6 { width: 50%; }
+.col-5 { width: 41.66666667%; }
+.col-4 { width: 33.33333333%; }
+.col-3 { width: 25%; }
+.col-2 { width: 16.66666667%; }
+.col-1 { width: 8.33333333%; }
+
+.left-push {
+	float: left;
+}
+.right-push {
+	float: right;
+}
+
+/* Layout design */
+.box {
+	background: #D6DAF0;
+	border: 1px solid #000333;
+	color: #000333;
+	margin: 0 0 12px 0;
+}
+.box-title {
+	background: #98E;
+	color: #000333;
+	font-size: 120%;
+	font-weight: bold;
+	padding: 4px 8px;
+}
+.box-content {
+	padding: 0 8px;
+	margin: 4px 0;
+}
+
+
+/* === SPECIFIC PAGES & FEATURES === */
+
+/* threadwatcher */
 #watchlist {
 	display: none;
 	max-height: 250px;
@@ -1067,25 +1136,25 @@ div.mix {
 }
 
 /* Mona Font */
-
 .aa {
 	font-family: Mona, "MS PGothic", "ＭＳ Ｐゴシック", sans-serif;
 	display: block!important;
 	font-size: 12pt;
 }
-
-.dx,.dy,.dz {
+.dx,
+.dy,
+.dz {
 	width: 30px;
 	text-align: right;
 	display: inline-block;
 }
 
+/* Dice */
 .dice-option table {
 	border: 1px dotted black;
 	margin: 0;
 	border-collapse: collapse;
 }
-
 .dice-option table td {
 	text-align: center;
 	border-left: 1px dotted black;
@@ -1095,7 +1164,6 @@ div.mix {
 }
 
 /* Quick reply (why was most of this ever in the script?) */
-
 #quick-reply {
 	position: fixed;
 	right: 5%;
@@ -1261,3 +1329,109 @@ div.mix {
 .dropzone .remove-btn:hover {
   color: rgba(125, 125, 125, 1);
 }
+
+/* Board List */
+div.boardlist {
+	margin-top: 3px;
+	
+	color: #89A;
+	font-size: 9pt;
+}
+div.boardlist.bottom {
+	margin-top: 20px;
+}
+div.boardlist a {
+	text-decoration: none;
+}
+
+table.board-list-table {
+	display: table;
+	margin: -2px;
+	overflow: hidden;
+	table-layout: fixed;
+}
+
+table.board-list-table .board-meta {
+	padding-right: 4px;
+	width: 44px;
+}
+table.board-list-table .board-uri {
+	max-width: 196px;
+}
+table.board-list-table .board-title {
+	width: auto;
+}
+table.board-list-table .board-pph {
+	width: 55px;
+}
+table.board-list-table .board-max {
+	width: 90px;
+}
+table.board-list-table .board-unique {
+	width: 100px;
+}
+table.board-list-table .board-tags {
+	width: auto;
+}
+
+table.board-list-table div.board-cell {
+	max-width: 100%;
+	overflow: hidden;
+}
+
+aside.search-container {
+}
+aside.search-container .box {
+	margin-right: 12px;
+}
+
+.board-search {
+	padding: 0 0 8px 0;
+	margin: 8px;
+	border-bottom: 1px solid #000333;
+}
+.search-item {
+	margin: 8px 0;
+}
+.search-sfw {
+	cursor: pointer;
+	font-size: 110%;
+	line-height: 120%;
+	vertical-align: bottom;
+}
+#search-sfw-input {
+	margin: 0;
+	padding: 0;
+	transform: scale(1.20);
+}
+#search-lang-input,
+#search-tag-input {
+	box-sizing: border-box;
+	font-size: 110%;
+	line-height: 120%;
+	vertical-align: top;
+	padding: 2px 0 2px 4px;
+	max-width: 100%;
+	min-width: 100%;
+	width: 100%:
+}
+
+ul.tag-list {
+	display: block;
+	list-style: none;
+	padding: 0;
+	margin: 0 8px;
+}
+ul.tag-list::after {
+	content: ' ';
+	display: block;
+	clear: both;
+}
+li.tag-item {
+	display: inline-block;
+	float: left;
+	font-size: 100%;
+	list-style: none;
+	margin: 0;
+	padding: 0 0.6em 0 0;
+}
\ No newline at end of file
diff --git a/templates/8chan/boards-tags.html b/templates/8chan/boards-tags.html
index baf1e6d0..71515f1e 100644
--- a/templates/8chan/boards-tags.html
+++ b/templates/8chan/boards-tags.html
@@ -1,162 +1,90 @@
-<style>
-th.header {
-    background-image: url(/static/bg.gif); 
-    cursor: pointer; 
-    background-repeat: no-repeat; 
-    background-position: center right; 
-    padding-left: 20px; 
-    margin-left: -1px; 
-}
-th.headerSortUp { 
-    background-image: url(/static/asc.gif); 
-} 
-th.headerSortDown { 
-    background-image: url(/static/desc.gif); 
-} 
-table.modlog tr td.expand-td {
-  position: relative;
-}
-table.modlog tr td.expand-td:hover div{
-  background-color: #FFF;
-  position: absolute;
-  width: auto;
-  box-shadow: 0px 0px 5px #000;
-  padding: 0px 0 3px;
-  top: 5px;
-  left: 0;
-  z-index: 100;
-}
-.flag-eo {
-    background-image: url(/static/eo.png);
-}
-.flag-en {
-    background-image: url(/static/en.png);
-}
-.flag-jbo {
-    background-image: url(/static/jbo.png);
-}
-.uri {
-overflow: hidden; width: 75px; white-space: nowrap;
-}
-.tags {
-overflow: hidden; width: 150px; white-space: nowrap;
-}
-.board-name {
-overflow: hidden; width: 200px; white-space: nowrap;
-}
-tr:nth-child(even) { background-color: #D6DAF0 }
-</style>
-
-<p style='text-align:center'>{% trans %}There are currently <strong>{{n_boards}}</strong> boards + <strong>{{hidden_boards_total}}</strong> unindexed boards = <strong>{{t_boards}}</strong> total boards. Site-wide, {{total_posts_hour}} posts have been made in the last hour, with {{total_posts}} being made on all active boards since October 23, 2013.{% endtrans %}</p>
-
-{% if top2k %}
-<p style='text-align:center'><a href="/boards_full.html">{% trans %}This list only shows the top 2000 boards. Until we can move tag searching onto the server side, click here for the full list.{% endtrans %}</a></p>
-{% endif %}
-
-<div style='height:100px; overflow-y:scroll' class="tags-container">
-	<strong class="tags-strong">Tags:</strong>&nbsp;
-	{% for tag, pop in tags %}
-		{% if pop > 1000 %}
-			<a class="tag" href="#" style="font-size:1.75em">{{ tag }}</a> 
-		{% elseif pop > 500 %}
-			<a class="tag" href="#" style="font-size:1.5em">{{ tag }}</a> 
-		{% elseif pop > 100 %}
-			<a class="tag" href="#" style="font-size:1.25em">{{ tag }}</a> 
-		{% else %}
-			<a class="tag" href="#">{{ tag }}</a> 
-		{% endif %}
-	{% endfor %}
-</div>
-
-<table class="modlog" style="width:auto"><thead>
-<tr>
-	<th>B</th>
-	<th>{% trans %}Board{% endtrans %}</th>
-	<th>{% trans %}Title{% endtrans %}</th>
-	<th title="Posts per hour">{% trans %}PPH{% endtrans %}</th>
-	<th>{% trans %}Total posts{% endtrans %}</th>
-	<th title="Unique IPs to post in the last 72 hours">{% trans %}Active users{% endtrans %}</th>
-	<th>{% trans %}Tags{% endtrans %}</th>
-</tr></thead><tbody>
-{% for board in boards %}
-	<tr>
-	<td>{{ board.img|raw }} {% if board['sfw'] %}<img src="/static/sfw.png" title="Safe for work">{% else %}<img src="/static/nsfw.png" title="Not safe for work">{% endif %}</td>
-	<td><div class="uri"><a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>{{lock|raw}}</div></td>
-	<td class="expand-td" title="Created {{board['time']}} ({{board['ago']}} ago)"><div class="board-name">{{ board['title'] }}</div></td>
-	<td style='text-align:right'>{{board['pph']}}</td>
-	<td style='text-align:right'>{{board['max']}}</td>
-	<td style='text-align:right'>{{board['uniq_ip']}}</td>
-	<td class="expand-td"><div class="tags">{% for tag in board.tags %}<span class="board-tag">{{ tag }}</span>&nbsp;{% endfor %}</div></td>
-{% endfor %}
-</tbody></table>
-<p style='text-align:center'><em>Page last updated: {{last_update}}</em></p>
-<p style='text-align:center'>{{uptime_p}} without interruption (read)</p>
-<script>
-
-$(function() { 
-	$('table').tablesorter({sortList: [[5,1]], 
-	textExtraction: function(node) {
-		childNode = node.childNodes[0];
-		if (!childNode) { return node.innerHTML; }
-		if (childNode.tagName == 'IMG') {
-			return childNode.getAttribute('class');
-		} else {
-			return (childNode.innerHTML ? childNode.innerHTML : childNode.textContent);
-		}
-	}
-	});
-
-function filter_table(search) {
-$("tbody>tr").css("display", "table-row");
-
-if ($('#clear-selection').length === 0) {
-$('.tags-strong').before('<a href="#" id="clear-selection">[clear selection]</a>');
-$('#clear-selection').on('click', function(e){
-e.preventDefault();
-$("tbody>tr").css("display", "table-row");
-window.location.hash = '';
-});
-}
-
-window.location.hash = search;
-
-var tags = $(".board-tag").filter(function() {
-    return $(this).text() === search;
-});
-
-$("tbody>tr").css("display", "none");
-
-tags.parents("tr").css("display", "table-row");
-
-}
-
-$("a.tag").on("click", function(e) {
-e.preventDefault();
-filter_table($(this).text());
-});
-
-$('.tags-strong').before('<label>Filter tags: <input type="text" id="filter-tags"></label> ');
-
-$('#filter-tags').on('keyup', function(e) {
-$("a.tag").css("display", "inline-block");
-
-var search = $(this).val();
-
-if (!search) return;
-
-var tags = $("a.tag").filter(function() {
-    return (new RegExp(search)).test($(this).text());
-});
-
-$("a.tag").css("display", "none");
-
-tags.css("display", "inline-block");
-});
-
-if (window.location.hash) {
-	filter_table(window.location.hash.replace('#',''));
-}
-
-}); 
-</script>
-
+<main id="boardlist">
+	<section class="description box col col-12">
+		<h2 class="box-title">Global Statistics</h2>
+		<p class="box-content">{% trans %}There are currently <strong>{{t_boards}}</strong> total boards, <strong>{{hidden_boards_total}}</strong> of which are unindexed. Site-wide, {{total_posts_hour}} posts have been made in the last hour, with {{total_posts}} being made on all active boards since October 23, 2013.{% endtrans %}</p>
+		{% if uptime %}<p class="box-content">{{uptime_p}} without interruption</p>{% endif %}
+		<p class="box-content">This page last updated <time>{{last_update}}</time>.</p>
+	</section>
+	
+	<div class="board-list">
+		<aside class="search-container col col-2">
+			<form id="search-form" class="box" method="post" target="/board-search.php">
+				<h2 class="box-title">Search</h2>
+				
+				<div class="board-search box-content">
+					<label class="search-item search-sfw">
+						<input type="checkbox" id="search-sfw-input" checked="checked" />&nbsp;NSFW boards
+					</label>
+					
+					<div class="search-item search-lang">
+						<select id="search-lang-input">
+							<optgroup label="Popular">
+								<option>All languages</option>
+								<option>English</option>
+								<option>Spanish</option>
+							</optgroup>
+							<optgroup label="All">
+								<option>Chinese</option>
+							</optgroup>
+						</select>
+					</div>
+					
+					<div class="search-item search-tag">
+						<input type="text" id="search-tag-input" placeholder="Search tags..." />
+					</div>
+					
+					<div class="search-item search-submit">
+						<button id="search-submit">Search</button>
+					</div>
+				</div>
+				
+				<ul class="tag-list box-content">
+					{% for tag, pop in tags %}
+						<li class="tag-item">
+							<a class="tag-link" href="#">{{ tag }}</a> 
+						</li>
+					{% endfor %}
+				</ul>
+			</form>
+		</aside>
+		
+		<section class="board-list col col-10">
+			<table class="board-list-table">
+				<colgroup>
+					<col class="board-meta" />
+					<col class="board-uri" />
+					<col class="board-title" />
+					<col class="board-pph" />
+					<col class="board-max" />
+					<col class="board-unique" />
+					<col class="board-tags" />
+				</colgroup>
+				<thead>
+					<tr>
+						<th class="board-meta"></th>
+						<th class="board-uri">{% trans %}Board{% endtrans %}</th>
+						<th class="board-title">{% trans %}Title{% endtrans %}</th>
+						<th class="board-pph" title="Posts per hour">{% trans %}PPH{% endtrans %}</th>
+						<th class="board-max">{% trans %}Total posts{% endtrans %}</th>
+						<th class="board-unique" title="Unique IPs to post in the last 72 hours">{% trans %}Active users{% endtrans %}</th>
+						<th class="board-tags">{% trans %}Tags{% endtrans %}</th>
+					</tr>
+				</thead>
+				
+				<tbody>
+					{% for board in boards %}
+					<tr>
+						<td class="board-meta">{{ board.img|raw }} {% if board['sfw'] %}<img src="/static/sfw.png" title="Safe for work">{% else %}<img src="/static/nsfw.png" title="Not safe for work">{% endif %}</td>
+						<td class="board-uri"><div class="board-list-wrapper uri"><a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>{{lock|raw}}</div></td>
+						<td class="board-title"><div class="board-cell" title="Created {{board['time']}} ({{board['ago']}} ago)">{{ board['title'] }}</div></td>
+						<td class="board-pph"><div class="board-cell">{{board['pph']}}</td>
+						<td class="board-max"><div class="board-cell">{{board['max']}}</td>
+						<td class="board-unique"><div class="board-cell">{{board['uniq_ip']}}</td>
+						<td class="board-tags"><div class="board-cell">{% for tag in board.tags %}<span class="board-tag">{{ tag }}</span>&nbsp;{% endfor %}</div></td>
+					</tr>
+					{% endfor %}
+				</tbody>
+			</table>
+		</section>
+	</div>
+</main>
\ No newline at end of file
diff --git a/templates/8chan/boards.html b/templates/8chan/boards.html
index 15fdad01..4687a6dd 100644
--- a/templates/8chan/boards.html
+++ b/templates/8chan/boards.html
@@ -1,68 +1,36 @@
-<style>
-th.header {
-    background-image: url(/static/bg.gif); 
-    cursor: pointer; 
-    background-repeat: no-repeat; 
-    background-position: center right; 
-    padding-left: 20px; 
-    margin-left: -1px; 
-}
-th.headerSortUp { 
-    background-image: url(/static/asc.gif); 
-} 
-th.headerSortDown { 
-    background-image: url(/static/desc.gif); 
-} 
-.flag-eo {
-    background-image: url(/static/eo.png);
-}
-.flag-en {
-    background-image: url(/static/en.png);
-}
-.flag-jbo {
-    background-image: url(/static/jbo.png);
-}
-</style>
-
-<p style='text-align:center'>{% trans %}There are currently <strong>{{n_boards}}</strong> boards + <strong>{{hidden_boards_total}}</strong> unindexed boards = <strong>{{t_boards}}</strong> total boards. Site-wide, {{total_posts_hour}} posts have been made in the last hour, with {{total_posts}} being made on all active boards since October 23, 2013.{% endtrans %}</p>
-
-<table class="modlog" style="width:auto"><thead>
-<tr>
-	<th>L</th>
-	<th>{% trans %}Board{% endtrans %}</th>
-	<th>{% trans %}Board title{% endtrans %}</th>
-	<th>{% trans %}Posts in last hour{% endtrans %}</th>
-	<th>{% trans %}Total posts{% endtrans %}</th>
-	<th>{% trans %}Unique IPs{% endtrans %}</th>
-	<th>{% trans %}Created{% endtrans %}</th>
-</tr></thead><tbody>
-{% for board in boards %}
-	<tr>
-	<td>{{ board.img|raw }}</td>
-	<td><a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>{{lock|raw}}</td>
-	<td>{{ board['title'] }}</td>
-	<td style='text-align:right'>{{board['pph']}}</td>
-	<td style='text-align:right'>{{board['max']}}</td>
-	<td style='text-align:right'>{{board['uniq_ip']}}</td>
-	<td>{{board['time']}} ({{board['ago']}} ago)</td></tr>
-{% endfor %}
-</tbody></table>
-<p style='text-align:center'><em>Page last updated: {{last_update}}</em></p>
-<p style='text-align:center'>{{uptime_p}} without interruption</p>
-<script>
-
-$(function() { 
-	$('table').tablesorter({sortList: [[5,1]], 
-	textExtraction: function(node) {
-		childNode = node.childNodes[0];
-		if (!childNode) { return node.innerHTML; }
-		if (childNode.tagName == 'IMG') {
-			return childNode.getAttribute('class');
-		} else {
-			return (childNode.innerHTML ? childNode.innerHTML : childNode.textContent);
-		}
-	}
-	});
-}); 
-</script>
+<div class="boardlist">
+	<p>{% trans %}There are currently <strong>{{n_boards}}</strong> boards + <strong>{{hidden_boards_total}}</strong> unindexed boards = <strong>{{t_boards}}</strong> total boards. Site-wide, {{total_posts_hour}} posts have been made in the last hour, with {{total_posts}} being made on all active boards since October 23, 2013.{% endtrans %}</p>
+	
+	<table>
+		<thead>
+			<tr>
+				<th>L</th>
+				<th>{% trans %}Board{% endtrans %}</th>
+				<th>{% trans %}Board title{% endtrans %}</th>
+				<th>{% trans %}Posts in last hour{% endtrans %}</th>
+				<th>{% trans %}Total posts{% endtrans %}</th>
+				<th>{% trans %}Unique IPs{% endtrans %}</th>
+				<th>{% trans %}Created{% endtrans %}</th>
+			</tr>
+		</thead>
+		<tbody class="loading">
+			
+		</tbody>
+		<tbody>
+			{% for board in boards %}
+			<tr>
+				<td>{{ board.img|raw }}</td>
+				<td><a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>{{lock|raw}}</td>
+				<td>{{ board['title'] }}</td>
+				<td>{{board['pph']}}</td>
+				<td style='text-align:right'>{{board['max']}}</td>
+				<td style='text-align:right'>{{board['uniq_ip']}}</td>
+				<td>{{board['time']}} ({{board['ago']}} ago)</td>
+			</tr>
+			{% endfor %}
+		</tbody>
+	</table>
 
+	<p><em>Page last updated: {{last_update}}</em></p>
+	<p>{{uptime_p}} without interruption</p>
+</div>
\ No newline at end of file
diff --git a/templates/8chan/index.html b/templates/8chan/index.html
index 19b42dc1..d8c6d40a 100644
--- a/templates/8chan/index.html
+++ b/templates/8chan/index.html
@@ -4,33 +4,6 @@
 		<meta charset="utf-8">
 		<title>∞chan</title>
 		<style type="text/css">
-			/* Responsive helpers */
-
-	.col {
-		float: left;
-	}
-	
-	.col-12 { width: 100%; }
-	.col-11 { width: 91.66666667%; }
-	.col-10 { width: 83.33333333%; }
-	.col-9 { width: 75%; }
-	.col-8 { width: 66.66666667%; }
-	.col-7 { width: 58.33333333%; }
-	.col-6 { width: 50%; }
-	.col-5 { width: 41.66666667%; }
-	.col-4 { width: 33.33333333%; }
-	.col-3 { width: 25%; }
-	.col-2 { width: 16.66666667%; }
-	.col-1 { width: 8.33333333%; }
-	
-	.left-push {
-		float: left;
-	}
-	
-	.right-push {
-		float: right;
-	}
-	
 	/* Main */
 	
 	* {

From 6d1eb9961d67f2d0fbb3fc3c427fb2803c0b61d4 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Tue, 14 Apr 2015 01:40:45 +1000
Subject: [PATCH 51/70] - board-search.php can now act as an include as well as
 a direct request. - boards.php completely rewritten to work with new
 board-search.php. Functions (sort-of) without JavaScript. - inc/functions.php
 fetchBoardActivity() now pulls total board counts with a more reliable and
 faster method. - inc/functions.php fetchBoardActivity() & fetchBoardTags()
 now expect db prefixes. - stylesheets/stylesheet.css now handles title search
 bar. - boards-tags.html completely thrown out for flat tag list styling. -
 boards-search.html added for the new page layout. - boards-table.html added
 for the <tbody> contents.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                   | 108 ++++++++++-------
 boards.php                         | 187 ++++++++++-------------------
 inc/functions.php                  |  25 +++-
 stylesheets/style.css              |   3 +-
 templates/8chan/boards-search.html |  78 ++++++++++++
 templates/8chan/boards-table.html  |  11 ++
 templates/8chan/boards-tags.html   |  95 +--------------
 7 files changed, 243 insertions(+), 264 deletions(-)
 create mode 100644 templates/8chan/boards-search.html
 create mode 100644 templates/8chan/boards-table.html

diff --git a/board-search.php b/board-search.php
index d9fb3ec2..044aaad7 100644
--- a/board-search.php
+++ b/board-search.php
@@ -1,6 +1,11 @@
 <?php
 
-include "inc/functions.php";
+// We want to return a value if we're included.
+// Otherwise, we will be printing a JSON object-array.
+$Included = defined("TINYBOARD");
+if (!$Included) {
+	include "inc/functions.php";
+}
 
 $CanViewUnindexed = isset($mod["type"]) && $mod["type"] <= GlobalVolunteer;
 
@@ -18,9 +23,10 @@ $languages = array(
 
 /* Determine search parameters from $_GET */
 $search = array(
-	'lang' => false,
-	'nsfw' => true,
-	'tags' => false,
+	'lang'   => false,
+	'nsfw'   => true,
+	'tags'   => false,
+	'titles' => false,
 );
 
 // Include NSFW boards?
@@ -96,67 +102,83 @@ foreach ($response['boards'] as $boardUri => &$board) {
 
 /* Activity Fetching */
 $boardActivity = fetchBoardActivity( array_keys( $response['boards'] ) );
+$response['tags'] = array();
 
 // Loop through each board and record activity to it.
 // We will also be weighing and building a tag list.
 foreach ($response['boards'] as $boardUri => &$board) {
 	$board['active'] = (int) $boardActivity['active'][ $boardUri ];
-	$board['pph'] = (int) $boardActivity['average'][ $boardUri ];
+	$board['posts']  = (int) $boardActivity['posts'][ $boardUri ];
+	$board['pph']    = (int) $boardActivity['average'][ $boardUri ];
 	
 	if (isset($board['tags']) && count($board['tags']) > 0) {
 		foreach ($board['tags'] as $tag) {
-			if (isset($response['tag'][$tag])) {
-				$response['tag'][$tag] += $board['active'];
+			if (isset($response['tags'][$tag])) {
+				$response['tags'][$tag] += $board['active'];
 			}
 			else {
-				$response['tag'][$tag] = $board['active'];
+				$response['tags'][$tag] = $board['active'];
 			}
 		}
 	}
 }
 
+// Sort boards by their popularity, then by their total posts.
+$boardActivityValues = array();
+
+foreach ($response['boards'] as $boardUri => $board) {
+	$boardActivityValues[$boardUri] = "{$board['active']}.{$board['posts']}";
+}
+
+array_multisort($boardActivityValues, SORT_DESC, $response['boards']);
+
 // Get the top most popular tags.
-if (count($response['tag']) > 0) {
+if (count($response['tags']) > 0) {
 	// Sort by most active tags.
-	arsort( $response['tag'] );
+	arsort( $response['tags'] );
 	// Get the first n most active tags.
-	$response['tag'] = array_splice( $response['tag'], 0, 200 );
+	$response['tags'] = array_splice( $response['tags'], 0, 200 );
 	
-	$tagLightest = end( array_keys( $response['tag'] ) );
+	// $tagLightest = end( array_keys( $response['tag'] ) );
 }
 
 
 /* (Please) Respond */
-$json = json_encode( $response );
+if (!$Included) {
+	$json = json_encode( $response );
 
-// Error Handling
-switch (json_last_error()) {
-	case JSON_ERROR_NONE:
-		$jsonError = false;
-		break;
-	case JSON_ERROR_DEPTH:
-		$jsonError = 'Maximum stack depth exceeded';
-		break;
-	case JSON_ERROR_STATE_MISMATCH:
-		$jsonError = 'Underflow or the modes mismatch';
-		break;
-	case JSON_ERROR_CTRL_CHAR:
-		$jsonError = 'Unexpected control character found';
-		break;
-	case JSON_ERROR_SYNTAX:
-		$jsonError = 'Syntax error, malformed JSON';
-		break;
-	case JSON_ERROR_UTF8:
-		$jsonError = 'Malformed UTF-8 characters, possibly incorrectly encoded';
-		break;
-	default:
-		$jsonError = 'Unknown error';
-		break;
+	// Error Handling
+	switch (json_last_error()) {
+		case JSON_ERROR_NONE:
+			$jsonError = false;
+			break;
+		case JSON_ERROR_DEPTH:
+			$jsonError = 'Maximum stack depth exceeded';
+			break;
+		case JSON_ERROR_STATE_MISMATCH:
+			$jsonError = 'Underflow or the modes mismatch';
+			break;
+		case JSON_ERROR_CTRL_CHAR:
+			$jsonError = 'Unexpected control character found';
+			break;
+		case JSON_ERROR_SYNTAX:
+			$jsonError = 'Syntax error, malformed JSON';
+			break;
+		case JSON_ERROR_UTF8:
+			$jsonError = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+			break;
+		default:
+			$jsonError = 'Unknown error';
+			break;
+	}
+
+	if ($jsonError) {
+		$json = "{\"error\":\"{$jsonError}\"}";
+	}
+
+	// Successful output
+	echo $json;
 }
-
-if ($jsonError) {
-	$json = "{\"error\":\"{$jsonError}\"}";
-}
-
-// Successful output
-echo $json;
\ No newline at end of file
+else {
+	return $response;
+}
\ No newline at end of file
diff --git a/boards.php b/boards.php
index a1cb260b..afd96841 100644
--- a/boards.php
+++ b/boards.php
@@ -1,6 +1,6 @@
 <?php
 
-include "inc/functions.php";
+include "inc/functions.php"; // October 23, 2013
 include "inc/countries.php";
 
 $admin = isset($mod["type"]) && $mod["type"]<=30;
@@ -8,144 +8,83 @@ $admin = isset($mod["type"]) && $mod["type"]<=30;
 if (php_sapi_name() == 'fpm-fcgi' && !$admin) {
 	error('Cannot be run directly.');
 }
-$boards = listBoards();
-$all_tags = array();
-$total_posts_hour = 0;
-$total_posts = 0;
-$write_maxes = false;
 
-function to_tag($str) {
-	$str = trim($str);
-	$str = strtolower($str);
-	$str = str_replace(['_', ' '], '-', $str);
-	return $str;
+/* Build parameters for page */
+$searchJson = include "board-search.php";
+$boards     = array();
+$tags       = array();
+
+if (count($searchJson)) {
+	if (isset($searchJson['boards'])) {
+		$boards = $searchJson['boards'];
+	}
+	if (isset($searchJson['tags'])) {
+		$tags   = $searchJson['tags'];
+	}
 }
 
-if (!file_exists('maxes.txt') || filemtime('maxes.txt') < (time() - (60*60))) {
-	$fp = fopen('maxes.txt', 'w+');
-	$write_maxes = true;
-}
-
-foreach ($boards as $i => $board) {
-	$query = prepare(sprintf("
+/* $query = prepare(sprintf("
 SELECT IFNULL(MAX(id),0) max,
 (SELECT COUNT(*) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 1 HOUR)) pph,
 (SELECT COUNT(DISTINCT ip) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 3 DAY)) uniq_ip
  FROM ``posts_%s``
 ", $board['uri'], $board['uri'], $board['uri'], $board['uri'], $board['uri']));
 	$query->execute() or error(db_error($query));
-	$r = $query->fetch(PDO::FETCH_ASSOC);
+	$r = $query->fetch(PDO::FETCH_ASSOC); */
 
-	$tquery = prepare("SELECT `tag` FROM ``board_tags`` WHERE `uri` = :uri");
-	$tquery->execute([":uri" => $board['uri']]) or error(db_error($tquery));
-	$r2 = $tquery->fetchAll(PDO::FETCH_ASSOC);
+$boardQuery = prepare("SELECT COUNT(1) AS 'boards_total', COUNT(indexed) AS 'boards_public' FROM ``boards``");
+$boardQuery->execute() or error(db_error($tagQuery));
+$boardResult = $boardQuery->fetchAll(PDO::FETCH_ASSOC)[0];
 
-	$tags = array();
-	if ($r2) {
-		foreach ($r2 as $ii => $t) {
-			$tag=to_tag($t['tag']);
-			$tags[] = $tag;
-			if (!isset($all_tags[$tag])) {
-				$all_tags[$tag] = (int)$r['uniq_ip'];
-			} else {
-				$all_tags[$tag] += $r['uniq_ip'];
-			}
-		}
-	}
+$boards_total  = $boardResult['boards_total'];
+$boards_public = $boardResult['boards_public'];
+$boards_hidden = $boardResult['boards_total'] - $boardResult['boards_public'];
 
-	$pph = $r['pph'];
+$posts_hour    = 0;
+$posts_total   = 0;
 
-	$total_posts_hour += $pph;
-	$total_posts += $r['max'];
+/* Create and distribute page */
+$boardsHTML = Element("8chan/boards-table.html", array(
+		"config"        => $config,
+		"boards"        => $boards,
+	)
+);
 
-	$boards[$i]['pph'] = $pph;
-	$boards[$i]['ppd'] = $pph*24;
-	$boards[$i]['max'] = $r['max'];
-	$boards[$i]['uniq_ip'] = $r['uniq_ip'];
-	$boards[$i]['tags'] = $tags;
+$tagsHTML = Element("8chan/boards-tags.html", array(
+		"config"        => $config,
+		"tags"          => $tags,
+	)
+);
 
-	if ($write_maxes) fwrite($fp, $board['uri'] . ':' . $boards[$i]['max'] . "\n");
-}
-if ($write_maxes) fclose($fp);
+$searchHTML = Element("8chan/boards-search.html", array(
+		"config"        => $config,
+		
+		"boards_total"  => $boards_total,
+		"boards_public" => $boards_public,
+		"boards_hidden" => $boards_hidden,
+		
+		"posts_hour"    => $posts_hour,
+		"posts_total"   => $posts_total,
+		
+		"page_updated"  => date('r'),
+		"uptime"        => shell_exec('uptime -p'),
+		
+		"html_boards"   => $boardsHTML,
+		"html_tags"     => $tagsHTML
+	)
+);
 
-usort($boards, 
-function ($a, $b) { 
-	$x = $b['uniq_ip'] - $a['uniq_ip']; 
-	if ($x) { return $x; 
-	//} else { return strcmp($a['uri'], $b['uri']); }
-	} else { return $b['max'] - $a['max']; }
-});
+$config['additional_javascript'] = array(
+	'js/jquery.min.js',
+	'js/board-directory.js'
+);
 
-$hidden_boards_total = 0;
-$rows = array();
-foreach ($boards as $i => &$board) {
-	$board_config = @file_get_contents($board['uri'].'/config.php');
-	$boardCONFIG = array();
-	if ($board_config && $board['uri'] !== 'int') {
-		$board_config = str_replace('$config', '$boardCONFIG', $board_config);
-		$board_config = str_replace('<?php', '', $board_config);
-		@eval($board_config);
-	}
-	$showboard = $board['indexed'];
-	$locale = isset($boardCONFIG['locale'])?$boardCONFIG['locale']:'en';
+$pageHTML = Element("page.html", array(
+		"config" => $config,
+		"body"   => $searchHTML,
+		"title"  => "Boards on &infin;chan"
+	)
+);
 
-	$board['title'] = utf8tohtml($board['title']);
-	$locale_arr = explode('_', $locale);
-	$locale_short = isset($locale_arr[1]) ? strtolower($locale_arr[1]) : strtolower($locale_arr[0]);
-	$locale_short = str_replace('.utf-8', '', $locale_short);
-	$country = get_country($locale_short);
-	if ($board['uri'] === 'int') {$locale_short = 'eo'; $locale = 'eo'; $country = 'Esperanto';}
-
-	$board['img'] = "<img class=\"flag flag-$locale_short\" src=\"/static/blank.gif\" style=\"width:16px;height:11px;\" alt=\"$country\" title=\"$country\">";
-
-	if ($showboard || $admin) {
-		if (!$showboard) {
-			$lock = ' <i class="fa fa-lock" title="No index"></i>';
-		} else {
-			$lock = '';
-		}
-		$board['ago'] = human_time_diff(strtotime($board['time']));
-	} else {
-		unset($boards[$i]);
-		$hidden_boards_total += 1;
-	}
-}
-
-$n_boards = sizeof($boards);
-$t_boards = $hidden_boards_total + $n_boards;
-
-$boards = array_values($boards);
-arsort($all_tags);
-
-$config['additional_javascript'] = array('js/jquery.min.js', 'js/jquery.tablesorter.min.js');
-$body = Element("8chan/boards-tags.html", array("config" => $config, "n_boards" => $n_boards, "t_boards" => $t_boards, "hidden_boards_total" => $hidden_boards_total, "total_posts" => $total_posts, "total_posts_hour" => $total_posts_hour, "boards" => $boards, "last_update" => date('r'), "uptime_p" => shell_exec('uptime -p'), 'tags' => $all_tags, 'top2k' => false));
-
-$html = Element("page.html", array("config" => $config, "body" => $body, "title" => "Boards on &infin;chan"));
-$boards_top2k = $boards;
-array_splice($boards_top2k, 100);
-$boards_top2k = array_values($boards_top2k);
-$body = Element("8chan/boards-tags.html", array("config" => $config, "n_boards" => $n_boards, "t_boards" => $t_boards, "hidden_boards_total" => $hidden_boards_total, "total_posts" => $total_posts, "total_posts_hour" => $total_posts_hour, "boards" => $boards_top2k, "last_update" => date('r'), "uptime_p" => shell_exec('uptime -p'), 'tags' => $all_tags, 'top2k' => true));
-$html_top2k = Element("page.html", array("config" => $config, "body" => $body, "title" => "Boards on &infin;chan"));
-
-if ($admin) {
-	echo $html;
-} else {
-	foreach ($boards as $i => &$b) { unset($b['img']); }
-	file_write("boards.json", json_encode($boards));
-	file_write("tags.json", json_encode($all_tags));
-	foreach ($boards as $i => $b) {/*
-		if (in_array($b['uri'], $config['no_top_bar_boards'])) {
-			unset($boards[$i]);
-		}*/
-		unset($boards[$i]['img']);
-	}
-
-	array_splice($boards, 48);
-
-	$boards = array_values($boards);
-
-	file_write("boards-top20.json", json_encode($boards));
-	file_write("boards.html", $html_top2k);
-	file_write("boards_full.html", $html);
-	echo $html;
-}
\ No newline at end of file
+file_write("boards.html", $pageHTML);
+echo $pageHTML;
\ No newline at end of file
diff --git a/inc/functions.php b/inc/functions.php
index 1e2b9be7..cb2dc364 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -820,11 +820,14 @@ function loadBoardConfig( $uri ) {
 }
 
 function fetchBoardActivity( $uris ) {
+	global $config;
+	
 	$boardActivity = array();
 	
-	/*
-	$uris = "\"" . implode( (array) $uris, "\",\"" ) . "\"";
+	$tablePrefix = "{$config['db']['prefix']}posts_";
+	$uris        = "\"{$tablePrefix}" . implode( (array) $uris, "\",\"{$tablePrefix}" ) . "\"";
 	
+	/*
 	$tagQuery = prepare("SELECT * FROM ``board_tags`` WHERE `uri` IN ({$uris})");
 	$tagQuery->execute() or error(db_error($tagQuery));
 	$tagResult = $tagQuery->fetchAll(PDO::FETCH_ASSOC);
@@ -845,20 +848,30 @@ function fetchBoardActivity( $uris ) {
 	}
 	*/
 	
-	foreach( (array) $uris as $uri ) {
+	$aiQuery = prepare("SELECT `TABLE_NAME`, `AUTO_INCREMENT` FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = \"{$config['db']['database']}\" AND TABLE_NAME IN ({$uris})");
+	$aiQuery->execute() or error(db_error($aiQuery));
+	$aiResult = $aiQuery->fetchAll(PDO::FETCH_ASSOC);
+	
+	foreach ($aiResult as $aiRow) {
+		$uri   = str_replace( $tablePrefix, "", $aiRow['TABLE_NAME'] );
+		$posts = $aiRow['AUTO_INCREMENT'] - 1;
+		
 		$random = rand( -1000, 1000 );
 		if( $random < 0 ) $random = 0;
 		
-		$boardActivity['active'][ $uri ] = $random;
-		$boardActivity['average'][ $uri ] = $random * 72;
+		$boardActivity['active'][ $uri ]  = $random;
+		$boardActivity['average'][ $uri ] = ($random * 72) / 72;
+		$boardActivity['posts'][ $uri ]   = $posts;
 	}
 	
 	return $boardActivity;
 }
 
 function fetchBoardTags( $uris ) {
+	global $config;
+	
 	$boardTags = array();
-	$uris = "\"" . implode( (array) $uris, "\",\"" ) . "\"";
+	$uris = "\"{$config['db']['prefix']}" . implode( (array) $uris, "\",\"" ) . "\"";
 	
 	$tagQuery = prepare("SELECT * FROM ``board_tags`` WHERE `uri` IN ({$uris})");
 	$tagQuery->execute() or error(db_error($tagQuery));
diff --git a/stylesheets/style.css b/stylesheets/style.css
index e862b9f6..916067fc 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1394,10 +1394,10 @@ aside.search-container .box {
 	margin: 8px 0;
 }
 .search-sfw {
+	display: block;
 	cursor: pointer;
 	font-size: 110%;
 	line-height: 120%;
-	vertical-align: bottom;
 }
 #search-sfw-input {
 	margin: 0;
@@ -1405,6 +1405,7 @@ aside.search-container .box {
 	transform: scale(1.20);
 }
 #search-lang-input,
+#search-title-input,
 #search-tag-input {
 	box-sizing: border-box;
 	font-size: 110%;
diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
new file mode 100644
index 00000000..1aff831c
--- /dev/null
+++ b/templates/8chan/boards-search.html
@@ -0,0 +1,78 @@
+<main id="boardlist">
+	<section class="description box col col-12">
+		<h2 class="box-title">Global Statistics</h2>
+		<p class="box-content">{% trans %}There are currently <strong>{{boards_public}}</strong> public boards, <strong>{{boards_total}}</strong> total. Site-wide, {{posts_hour}} posts have been made in the last hour, with {{posts_total}} being made on all active boards since {{founding_date}}.{% endtrans %}</p>
+		{% if uptime %}<p class="box-content">{{uptime}} without interruption</p>{% endif %}
+		<p class="box-content">This page last updated {{page_updated}}.</p>
+	</section>
+	
+	<div class="board-list">
+		<aside class="search-container col col-2">
+			<form id="search-form" class="box" method="post" target="/board-search.php">
+				<h2 class="box-title">Search</h2>
+				
+				<div class="board-search box-content">
+					<label class="search-item search-sfw">
+						<input type="checkbox" id="search-sfw-input" name="sfw" checked="checked" />&nbsp;NSFW boards
+					</label>
+					
+					<div class="search-item search-title">
+						<input type="text" id="search-title-input" name="title" placeholder="Search titles..." />
+					</div>
+					
+					<div class="search-item search-lang">
+						<select id="search-lang-input" name="lang">
+							<optgroup label="Popular">
+								<option>All languages</option>
+								<option>English</option>
+								<option>Spanish</option>
+							</optgroup>
+							<optgroup label="All">
+								<option>Chinese</option>
+							</optgroup>
+						</select>
+					</div>
+					
+					<div class="search-item search-tag">
+						<input type="text" id="search-tag-input" name="tag" placeholder="Search tags..." />
+					</div>
+					
+					<div class="search-item search-submit">
+						<button id="search-submit">Search</button>
+					</div>
+				</div>
+				
+				<ul class="tag-list box-content">
+					{{html_tags}}
+				</ul>
+			</form>
+		</aside>
+		
+		<section class="board-list col col-10">
+			<table class="board-list-table">
+				<colgroup>
+					<col class="board-meta" />
+					<col class="board-uri" />
+					<col class="board-title" />
+					<col class="board-pph" />
+					<col class="board-max" />
+					<col class="board-unique" />
+					<col class="board-tags" />
+				</colgroup>
+				<thead>
+					<tr>
+						<th class="board-meta" data-column="meta"></th>
+						<th class="board-uri" data-column="uri">{% trans %}Board{% endtrans %}</th>
+						<th class="board-title" data-column="title">{% trans %}Title{% endtrans %}</th>
+						<th class="board-pph" data-column="pph" title="Posts per hour">{% trans %}PPH{% endtrans %}</th>
+						<th class="board-max" data-column="max">{% trans %}Total posts{% endtrans %}</th>
+						<th class="board-unique" data-column="unique" title="Unique IPs to post in the last 72 hours">{% trans %}Active users{% endtrans %}</th>
+						<th class="board-tags" data-column="tags">{% trans %}Tags{% endtrans %}</th>
+					</tr>
+				</thead>
+				
+				<tbody class="board-list-tbody">{{html_boards}}</tbody>
+			</table>
+		</section>
+	</div>
+</main>
\ No newline at end of file
diff --git a/templates/8chan/boards-table.html b/templates/8chan/boards-table.html
new file mode 100644
index 00000000..6682ce6c
--- /dev/null
+++ b/templates/8chan/boards-table.html
@@ -0,0 +1,11 @@
+{% for board in boards %}
+<tr>
+	<td class="board-meta">{{ board.img|raw }} {% if board['sfw'] %}<img src="/static/sfw.png" title="Safe for work">{% else %}<img src="/static/nsfw.png" title="Not safe for work">{% endif %}</td>
+	<td class="board-uri"><div class="board-list-wrapper uri"><a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>{{lock|raw}}</div></td>
+	<td class="board-title"><div class="board-cell" title="Created {{board['time']}} ({{board['ago']}} ago)">{{ board['title'] }}</div></td>
+	<td class="board-pph"><div class="board-cell">{{board['pph']}}</td>
+	<td class="board-max"><div class="board-cell">{{board['posts']}}</td>
+	<td class="board-unique"><div class="board-cell">{{board['active']}}</td>
+	<td class="board-tags"><div class="board-cell">{% for tag in board.tags %}<span class="board-tag">{{ tag }}</span>&nbsp;{% endfor %}</div></td>
+</tr>
+{% endfor %}
\ No newline at end of file
diff --git a/templates/8chan/boards-tags.html b/templates/8chan/boards-tags.html
index 71515f1e..f569c339 100644
--- a/templates/8chan/boards-tags.html
+++ b/templates/8chan/boards-tags.html
@@ -1,90 +1,5 @@
-<main id="boardlist">
-	<section class="description box col col-12">
-		<h2 class="box-title">Global Statistics</h2>
-		<p class="box-content">{% trans %}There are currently <strong>{{t_boards}}</strong> total boards, <strong>{{hidden_boards_total}}</strong> of which are unindexed. Site-wide, {{total_posts_hour}} posts have been made in the last hour, with {{total_posts}} being made on all active boards since October 23, 2013.{% endtrans %}</p>
-		{% if uptime %}<p class="box-content">{{uptime_p}} without interruption</p>{% endif %}
-		<p class="box-content">This page last updated <time>{{last_update}}</time>.</p>
-	</section>
-	
-	<div class="board-list">
-		<aside class="search-container col col-2">
-			<form id="search-form" class="box" method="post" target="/board-search.php">
-				<h2 class="box-title">Search</h2>
-				
-				<div class="board-search box-content">
-					<label class="search-item search-sfw">
-						<input type="checkbox" id="search-sfw-input" checked="checked" />&nbsp;NSFW boards
-					</label>
-					
-					<div class="search-item search-lang">
-						<select id="search-lang-input">
-							<optgroup label="Popular">
-								<option>All languages</option>
-								<option>English</option>
-								<option>Spanish</option>
-							</optgroup>
-							<optgroup label="All">
-								<option>Chinese</option>
-							</optgroup>
-						</select>
-					</div>
-					
-					<div class="search-item search-tag">
-						<input type="text" id="search-tag-input" placeholder="Search tags..." />
-					</div>
-					
-					<div class="search-item search-submit">
-						<button id="search-submit">Search</button>
-					</div>
-				</div>
-				
-				<ul class="tag-list box-content">
-					{% for tag, pop in tags %}
-						<li class="tag-item">
-							<a class="tag-link" href="#">{{ tag }}</a> 
-						</li>
-					{% endfor %}
-				</ul>
-			</form>
-		</aside>
-		
-		<section class="board-list col col-10">
-			<table class="board-list-table">
-				<colgroup>
-					<col class="board-meta" />
-					<col class="board-uri" />
-					<col class="board-title" />
-					<col class="board-pph" />
-					<col class="board-max" />
-					<col class="board-unique" />
-					<col class="board-tags" />
-				</colgroup>
-				<thead>
-					<tr>
-						<th class="board-meta"></th>
-						<th class="board-uri">{% trans %}Board{% endtrans %}</th>
-						<th class="board-title">{% trans %}Title{% endtrans %}</th>
-						<th class="board-pph" title="Posts per hour">{% trans %}PPH{% endtrans %}</th>
-						<th class="board-max">{% trans %}Total posts{% endtrans %}</th>
-						<th class="board-unique" title="Unique IPs to post in the last 72 hours">{% trans %}Active users{% endtrans %}</th>
-						<th class="board-tags">{% trans %}Tags{% endtrans %}</th>
-					</tr>
-				</thead>
-				
-				<tbody>
-					{% for board in boards %}
-					<tr>
-						<td class="board-meta">{{ board.img|raw }} {% if board['sfw'] %}<img src="/static/sfw.png" title="Safe for work">{% else %}<img src="/static/nsfw.png" title="Not safe for work">{% endif %}</td>
-						<td class="board-uri"><div class="board-list-wrapper uri"><a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>{{lock|raw}}</div></td>
-						<td class="board-title"><div class="board-cell" title="Created {{board['time']}} ({{board['ago']}} ago)">{{ board['title'] }}</div></td>
-						<td class="board-pph"><div class="board-cell">{{board['pph']}}</td>
-						<td class="board-max"><div class="board-cell">{{board['max']}}</td>
-						<td class="board-unique"><div class="board-cell">{{board['uniq_ip']}}</td>
-						<td class="board-tags"><div class="board-cell">{% for tag in board.tags %}<span class="board-tag">{{ tag }}</span>&nbsp;{% endfor %}</div></td>
-					</tr>
-					{% endfor %}
-				</tbody>
-			</table>
-		</section>
-	</div>
-</main>
\ No newline at end of file
+{% for tag, weight in tags %}
+<li class="tag-item">
+	<a class="tag-link" href="#">{{tag}}</a> 
+</li>
+{% endfor %}
\ No newline at end of file

From 316e681bbd16d19226bc3574c9cf306e35dab802 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Tue, 14 Apr 2015 05:36:38 +1000
Subject: [PATCH 52/70] New CLI tool for upgrade: tools/migrate_board_stats.php
 - Adds new coumn to `boards` for easy-access post total storage. - Migrates
 the AUTO_INCREMENT number to the `posts_total` column for every board. This
 ensures accurate post count measurement. - Adds `board_stats` table for
 recording histric data. - Retroactively records all boards into
 `board_stats`.

- inc/functions.php Added handling for `posts_total` column in `boards`.
- inc/functions.php Removed some bogus data from fetchBoardActivity
- board-search.php Fixed issue with SFW filtering.
- board-search.php Now accurately sends `posts_total` data for board sum posts.
- boards-search.html Various form fixes so search now submits correctly.
- boards-table.html Fixed `posts_total` value.


Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                   |  41 ++++++----
 inc/functions.php                  |  55 +++++--------
 templates/8chan/boards-search.html |  18 ++---
 templates/8chan/boards-table.html  |   2 +-
 tools/migrate_board_stats.php      | 125 +++++++++++++++++++++++++++++
 5 files changed, 179 insertions(+), 62 deletions(-)
 create mode 100644 tools/migrate_board_stats.php

diff --git a/board-search.php b/board-search.php
index 044aaad7..5f172036 100644
--- a/board-search.php
+++ b/board-search.php
@@ -23,26 +23,30 @@ $languages = array(
 
 /* Determine search parameters from $_GET */
 $search = array(
-	'lang'   => false,
-	'nsfw'   => true,
-	'tags'   => false,
-	'titles' => false,
+	'lang'  => false,
+	'nsfw'  => true,
+	'tags'  => false,
+	'title' => false,
 );
 
 // Include NSFW boards?
-if (isset( $_GET['nsfw'] )) {
-	$search['nsfw'] = (bool) $_GET['nsfw'];
+if (isset( $_GET['sfw'] ) && $_GET['sfw'] != "") {
+	$search['nsfw'] = !$_GET['sfw'];
 }
 
 // Include what language (if the language is not blank and we recognize it)?
-if (isset( $_GET['lang'] ) && isset($languages[$search['lang']])) {
+if (isset( $_GET['lang'] ) && $_GET['lang'] != "" && isset($languages[$search['lang']])) {
 	$search['lang'] = $_GET['lang'];
 }
 
 // Include what tag?
-if (isset( $_GET['tags'] )) {
+if (isset( $_GET['tags'] ) && $_GET['tags'] != "") {
 	$search['tags'] = $_GET['tags'];
 }
+// Include what in the uri / title / subtitle?
+if (isset( $_GET['title'] ) && $_GET['title'] != "") {
+	$search['title'] = $_GET['title'];
+}
 
 /* Search boards */
 $boards = listBoards();
@@ -108,7 +112,6 @@ $response['tags'] = array();
 // We will also be weighing and building a tag list.
 foreach ($response['boards'] as $boardUri => &$board) {
 	$board['active'] = (int) $boardActivity['active'][ $boardUri ];
-	$board['posts']  = (int) $boardActivity['posts'][ $boardUri ];
 	$board['pph']    = (int) $boardActivity['average'][ $boardUri ];
 	
 	if (isset($board['tags']) && count($board['tags']) > 0) {
@@ -124,13 +127,19 @@ foreach ($response['boards'] as $boardUri => &$board) {
 }
 
 // Sort boards by their popularity, then by their total posts.
-$boardActivityValues = array();
+$boardActivityValues   = array();
+$boardTotalPostsValues = array();
 
-foreach ($response['boards'] as $boardUri => $board) {
-	$boardActivityValues[$boardUri] = "{$board['active']}.{$board['posts']}";
+foreach ($response['boards'] as $boardUri => &$board) {
+	$boardActivityValues[$boardUri]   = (int) $board['active'];
+	$boardTotalPostsValues[$boardUri] = (int) $board['posts_total']; 
 }
 
-array_multisort($boardActivityValues, SORT_DESC, $response['boards']);
+array_multisort(
+	$boardActivityValues, SORT_DESC, SORT_NUMERIC, // Sort by number of active posters
+	$boardTotalPostsValues, SORT_DESC, SORT_NUMERIC, // Then, sort by total number of posts
+	$response['boards']
+);
 
 // Get the top most popular tags.
 if (count($response['tags']) > 0) {
@@ -146,7 +155,7 @@ if (count($response['tags']) > 0) {
 /* (Please) Respond */
 if (!$Included) {
 	$json = json_encode( $response );
-
+	
 	// Error Handling
 	switch (json_last_error()) {
 		case JSON_ERROR_NONE:
@@ -171,11 +180,11 @@ if (!$Included) {
 			$jsonError = 'Unknown error';
 			break;
 	}
-
+	
 	if ($jsonError) {
 		$json = "{\"error\":\"{$jsonError}\"}";
 	}
-
+	
 	// Successful output
 	echo $json;
 }
diff --git a/inc/functions.php b/inc/functions.php
index cb2dc364..7b572dfc 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -786,9 +786,23 @@ function listBoards($just_uri = false, $indexed_only = false) {
 		return $boards;
 
 	if (!$just_uri) {
-		$query = query("SELECT ``boards``.`uri` uri, ``boards``.`title` title, ``boards``.`subtitle` subtitle, ``board_create``.`time` time, ``boards``.`indexed` indexed, ``boards``.`sfw` sfw FROM ``boards``" . ( $indexed_only ? " WHERE `indexed` = 1 " : "" ) . "LEFT JOIN ``board_create`` ON ``boards``.`uri` = ``board_create``.`uri` ORDER BY ``boards``.`uri`") or error(db_error());
+		$query = query(
+			"SELECT
+				``boards``.`uri` uri,
+				``boards``.`title` title,
+				``boards``.`subtitle` subtitle,
+				``board_create``.`time` time,
+				``boards``.`indexed` indexed,
+				``boards``.`sfw` sfw,
+				``boards``.`posts_total` posts_total
+			FROM ``boards``" . ( $indexed_only ? " WHERE `indexed` = 1 " : "" ) .
+			"LEFT JOIN ``board_create``
+				ON ``boards``.`uri` = ``board_create``.`uri`
+			ORDER BY ``boards``.`uri`") or error(db_error());
+		
 		$boards = $query->fetchAll(PDO::FETCH_ASSOC);
-	} else {
+	}
+	else {
 		$boards = array();
 		$query = query("SELECT `uri` FROM ``boards``" . ( $indexed_only ? " WHERE `indexed` = 1" : "" ) . " ORDER BY ``boards``.`uri`") or error(db_error());
 		while (true) {
@@ -823,45 +837,14 @@ function fetchBoardActivity( $uris ) {
 	global $config;
 	
 	$boardActivity = array();
+	//$uris          = "\"" . implode( (array) $uris, "\",\"" ) . "\"";
 	
-	$tablePrefix = "{$config['db']['prefix']}posts_";
-	$uris        = "\"{$tablePrefix}" . implode( (array) $uris, "\",\"{$tablePrefix}" ) . "\"";
-	
-	/*
-	$tagQuery = prepare("SELECT * FROM ``board_tags`` WHERE `uri` IN ({$uris})");
-	$tagQuery->execute() or error(db_error($tagQuery));
-	$tagResult = $tagQuery->fetchAll(PDO::FETCH_ASSOC);
-	
-	if ($tagResult) {
-		foreach ($tagResult as $tagRow) {
-			$tag = $tagRow['tag'];
-			$tag = trim($tag);
-			$tag = strtolower($tag);
-			$tag = str_replace(['_', ' '], '-', $tag);
-			
-			if (!isset($boardTags[ $tagRow['uri'] ])) {
-				$boardTags[ $tagRow['uri'] ] = array();
-			}
-			
-			$boardTags[ $tagRow['uri'] ][] = htmlentities( utf8_encode( $tag ) );
-		}
-	}
-	*/
-	
-	$aiQuery = prepare("SELECT `TABLE_NAME`, `AUTO_INCREMENT` FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = \"{$config['db']['database']}\" AND TABLE_NAME IN ({$uris})");
-	$aiQuery->execute() or error(db_error($aiQuery));
-	$aiResult = $aiQuery->fetchAll(PDO::FETCH_ASSOC);
-	
-	foreach ($aiResult as $aiRow) {
-		$uri   = str_replace( $tablePrefix, "", $aiRow['TABLE_NAME'] );
-		$posts = $aiRow['AUTO_INCREMENT'] - 1;
-		
-		$random = rand( -1000, 1000 );
+	foreach ($uris as $uri) {
+		$random = 0;//rand( -1000, 1000 );
 		if( $random < 0 ) $random = 0;
 		
 		$boardActivity['active'][ $uri ]  = $random;
 		$boardActivity['average'][ $uri ] = ($random * 72) / 72;
-		$boardActivity['posts'][ $uri ]   = $posts;
 	}
 	
 	return $boardActivity;
diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
index 1aff831c..e7519dd0 100644
--- a/templates/8chan/boards-search.html
+++ b/templates/8chan/boards-search.html
@@ -1,40 +1,40 @@
 <main id="boardlist">
 	<section class="description box col col-12">
 		<h2 class="box-title">Global Statistics</h2>
-		<p class="box-content">{% trans %}There are currently <strong>{{boards_public}}</strong> public boards, <strong>{{boards_total}}</strong> total. Site-wide, {{posts_hour}} posts have been made in the last hour, with {{posts_total}} being made on all active boards since {{founding_date}}.{% endtrans %}</p>
+		<p class="box-content">{% trans %}There are currently <strong>{{boards_public}}</strong> public boards, <strong>{{boards_total}}</strong> total. Site-wide, <strong>{{posts_hour}}</strong> posts have been made in the last hour, with <strong>{{posts_total}}</strong> being made on all active boards since {{founding_date}}.{% endtrans %}</p>
 		{% if uptime %}<p class="box-content">{{uptime}} without interruption</p>{% endif %}
 		<p class="box-content">This page last updated {{page_updated}}.</p>
 	</section>
 	
 	<div class="board-list">
 		<aside class="search-container col col-2">
-			<form id="search-form" class="box" method="post" target="/board-search.php">
+			<form id="search-form" class="box" method="get" target="/board-search.php">
 				<h2 class="box-title">Search</h2>
 				
 				<div class="board-search box-content">
 					<label class="search-item search-sfw">
-						<input type="checkbox" id="search-sfw-input" name="sfw" checked="checked" />&nbsp;NSFW boards
+						<input type="checkbox" id="search-sfw-input" name="sfw" value="1" />&nbsp;Hide NSFW boards
 					</label>
 					
 					<div class="search-item search-title">
-						<input type="text" id="search-title-input" name="title" placeholder="Search titles..." />
+						<input type="text" id="search-title-input" name="title" name="title" value="" placeholder="Search titles..." />
 					</div>
 					
 					<div class="search-item search-lang">
 						<select id="search-lang-input" name="lang">
 							<optgroup label="Popular">
-								<option>All languages</option>
-								<option>English</option>
-								<option>Spanish</option>
+								<option value="">All languages</option>
+								<option value="en">English</option>
+								<option value="es">Spanish</option>
 							</optgroup>
 							<optgroup label="All">
-								<option>Chinese</option>
+								<option value="cn">Chinese</option>
 							</optgroup>
 						</select>
 					</div>
 					
 					<div class="search-item search-tag">
-						<input type="text" id="search-tag-input" name="tag" placeholder="Search tags..." />
+						<input type="text" id="search-tag-input" name="tags" value="" placeholder="Search tags..." />
 					</div>
 					
 					<div class="search-item search-submit">
diff --git a/templates/8chan/boards-table.html b/templates/8chan/boards-table.html
index 6682ce6c..a43f3d67 100644
--- a/templates/8chan/boards-table.html
+++ b/templates/8chan/boards-table.html
@@ -4,7 +4,7 @@
 	<td class="board-uri"><div class="board-list-wrapper uri"><a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>{{lock|raw}}</div></td>
 	<td class="board-title"><div class="board-cell" title="Created {{board['time']}} ({{board['ago']}} ago)">{{ board['title'] }}</div></td>
 	<td class="board-pph"><div class="board-cell">{{board['pph']}}</td>
-	<td class="board-max"><div class="board-cell">{{board['posts']}}</td>
+	<td class="board-max"><div class="board-cell">{{board['posts_total']}}</td>
 	<td class="board-unique"><div class="board-cell">{{board['active']}}</td>
 	<td class="board-tags"><div class="board-cell">{% for tag in board.tags %}<span class="board-tag">{{ tag }}</span>&nbsp;{% endfor %}</div></td>
 </tr>
diff --git a/tools/migrate_board_stats.php b/tools/migrate_board_stats.php
new file mode 100644
index 00000000..8ef7b9b4
--- /dev/null
+++ b/tools/migrate_board_stats.php
@@ -0,0 +1,125 @@
+<?php
+require dirname(__FILE__) . '/inc/cli.php';
+
+/* Convert AI value to colun value for ez access */
+// Add column `posts_total` to `boards`.
+// This can potentially error if ran multiple times.. but that shouldn't kill the script
+echo "Altering `boards` to add `posts_total`...\n";
+query( "ALTER TABLE `boards` ADD COLUMN `posts_total` INT(11) UNSIGNED NOT NULL DEFAULT 0" );
+
+// Set the value for posts_total for each board.
+echo "Updating `boards` to include `posts_total` values...\n";
+$tablePrefix = "{$config['db']['prefix']}posts_";
+
+$aiQuery = prepare("SELECT `TABLE_NAME`, `AUTO_INCREMENT` FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = \"{$config['db']['database']}\"");
+$aiQuery->execute() or error(db_error($aiQuery));
+$aiResult = $aiQuery->fetchAll(PDO::FETCH_ASSOC);
+
+foreach ($aiResult as $aiRow) {
+	$uri   = str_replace( $tablePrefix, "", $aiRow['TABLE_NAME'] );
+	$posts = (int)($aiRow['AUTO_INCREMENT'] - 1); // Don't worry! The column is unsigned. -1 becomes 0.
+	
+	echo "   {$uri} has {$posts} post".($posts!=1?"s":"")."\n";
+	query( "UPDATE `boards` SET `posts_total`={$posts} WHERE `uri`=\"{$uri}\";" );
+}
+
+unset( $aiQuery, $aiResult, $uri, $posts );
+
+/* Add statistics table and transmute post information to that */
+// Add `board_stats`
+echo "Adding `board_stats` ...\n";
+query(
+	"CREATE TABLE IF NOT EXISTS ``board_stats`` (
+		`stat_uri` VARCHAR(58) NOT NULL,
+		`stat_hour` INT(11) UNSIGNED NOT NULL,
+		`post_count` INT(11) UNSIGNED NULL,
+		`post_id_array` TEXT NULL,
+		`author_ip_count` INT(11) UNSIGNED NULL,
+		`author_ip_array` TEXT NULL,
+		PRIMARY KEY (`stat_uri`, `stat_hour`)
+	);"
+);
+
+$boards = listBoards();
+
+echo "Translating posts to stats ...\n";
+foreach ($boards as $board) {
+	$postQuery = prepare("SELECT `id`, `time`, `ip` FROM ``posts_{$board['uri']}``");
+	$postQuery->execute() or error(db_error($postQuery));
+	$postResult = $postQuery->fetchAll(PDO::FETCH_ASSOC);
+	
+	// Determine the number of posts for each hour.
+	$postHour = array();
+	
+	foreach ($postResult as $post) {
+		// Winds back timestamp to last hour. (1428947438  -> 1428944400)
+		$postHourTime = (int)($post['time'] / 3600) * 3600;
+		
+		if (!isset($postHour[ $postHourTime ])) {
+			$postHour[ $postHourTime ] = array();
+		}
+		
+		$postDatum = &$postHour[ $postHourTime ];
+		
+		// Add to post count.
+		if (!isset($postDatum['post_count'])) {
+			$postDatum['post_count'] = 1;
+		}
+		else {
+			++$postDatum['post_count'];
+		}
+		
+		// Add to post id array.
+		if (!isset($postDatum['post_id_array'])) {
+			$postDatum['post_id_array'] = array( (int)$post['id'] );
+		}
+		else {
+			$postDatum['post_id_array'][] = (int)$post['id'];
+		}
+		
+		// Add to ip array.
+		if (!isset($postDatum['author_ip_array'])) {
+			$postDatum['author_ip_array'][ less_ip( $post['ip'] ) ] = 1;
+		}
+		
+		// Count ip array.
+		$postDatum['author_ip_count'] = count( $postDatum['post_id_array'] );
+		
+		unset( $postHourTime );
+	}
+	
+	// Prep data for insert.
+	foreach ($postHour as $postHourTime => &$postHourData) {
+		$postDatum = &$postHour[ $postHourTime ];
+		
+		// Serialize arrays for TEXT insert.
+		$postDatum['post_id_array'  ] = str_replace( "\"", "\\\"", serialize( $postDatum['post_id_array'] ) );
+		$postDatum['author_ip_array'] = str_replace( "\"", "\\\"", serialize( array_keys( $postDatum['author_ip_array'] ) ) );
+	}
+	
+	// Bash this shit together into a set of insert statements.
+	$statsInserts = array();
+	
+	foreach ($postHour as $postHourTime => $postHourData) {
+		$statsInserts[] = "(\"{$board['uri']}\", \"{$postHourTime}\", \"{$postHourData['post_count']}\", \"{$postHourData['post_id_array']}\", \"{$postHourData['author_ip_count']}\", \"{$postHourData['author_ip_array']}\" )";
+	}
+	
+	if (count($statsInserts) > 0) {
+		$statsInsert = "VALUES" . implode( ", ", $statsInserts );
+		echo "   {$board['uri']} is building " . count($statsInserts) . " stat rows.\n";
+		
+		// Insert this data into our statistics table.
+		$postStatQuery = prepare(
+			"REPLACE INTO ``board_stats`` (stat_uri, stat_hour, post_count, post_id_array, author_ip_count, author_ip_array) {$statsInsert}"
+		);
+		$postStatQuery->execute() or error(db_error($postStatQuery));
+	}
+	else {
+		echo "   {$board['uri']} has no posts!\n";
+	}
+	
+	unset( $postQuery, $postResult, $postStatQuery, $postHour, $statsInserts, $statsInsert );
+}
+
+
+echo "Done! ^^;";
\ No newline at end of file

From ecfe072a4fe0ed1fa6f51d0d9637fdf4c25f0dad Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Wed, 15 Apr 2015 01:01:32 +1000
Subject: [PATCH 53/70] - IMPORTANT: Now EXPLICITLY defines $post['time'] as
 PHP time() instead of relying on database NOW(). - Increased memory
 management in all of my recent work. - board-search.php Fetches activity from
 board_stats and now includes timestamp as a search option. - boards.php
 Correctly fetches board activity and formats numbers. - inc/functions.php
 Completely reworked activity fetching. - inc/functions Wrote
 updateStatisticsForPost() which streams new posts in statistics. - post.php
 Writes into updateStatisticsForPost() for streaming new posts. - Added
 styling for tags (in progress work). - tools/migrate_board_stats.php Now
 correcty defines author_ip_count.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                   |  37 ++++++-
 boards.php                         |  27 ++---
 inc/functions.php                  | 152 ++++++++++++++++++++++++-----
 post.php                           |  47 +++++----
 stylesheets/style.css              |  14 +++
 templates/8chan/boards-search.html |   2 +
 templates/8chan/boards-table.html  |   2 +-
 templates/8chan/boards.html        | 114 +++++++++++++++-------
 tools/migrate_board_stats.php      |   8 +-
 9 files changed, 303 insertions(+), 100 deletions(-)

diff --git a/board-search.php b/board-search.php
index 5f172036..c156fffb 100644
--- a/board-search.php
+++ b/board-search.php
@@ -26,6 +26,7 @@ $search = array(
 	'lang'  => false,
 	'nsfw'  => true,
 	'tags'  => false,
+	'time'  => ( (int)( time() / 3600 ) * 3600 ) - 3600,
 	'title' => false,
 );
 
@@ -43,6 +44,12 @@ if (isset( $_GET['lang'] ) && $_GET['lang'] != "" && isset($languages[$search['l
 if (isset( $_GET['tags'] ) && $_GET['tags'] != "") {
 	$search['tags'] = $_GET['tags'];
 }
+
+// What time range?
+if (isset( $_GET['time'] ) && is_numeric( $_GET['time'] ) ) {
+	$search['time'] = ( (int)( $_GET['time'] / 3600 ) * 3600 );
+}
+
 // Include what in the uri / title / subtitle?
 if (isset( $_GET['title'] ) && $_GET['title'] != "") {
 	$search['title'] = $_GET['title'];
@@ -80,6 +87,8 @@ foreach ($boards as $board) {
 	$response['boards'][ $board['uri'] ] = $board;
 }
 
+unset( $boards );
+
 
 /* Tag Fetching */
 // (We have do this even if we're not filtering by tags so that we know what each board's tags are)
@@ -103,16 +112,33 @@ foreach ($response['boards'] as $boardUri => &$board) {
 	}
 }
 
+unset( $boardTags );
+
 
 /* Activity Fetching */
-$boardActivity = fetchBoardActivity( array_keys( $response['boards'] ) );
+$boardActivity = fetchBoardActivity( array_keys( $response['boards'] ), $search['time'], true );
 $response['tags'] = array();
 
 // Loop through each board and record activity to it.
 // We will also be weighing and building a tag list.
 foreach ($response['boards'] as $boardUri => &$board) {
-	$board['active'] = (int) $boardActivity['active'][ $boardUri ];
-	$board['pph']    = (int) $boardActivity['average'][ $boardUri ];
+	$board['active'] = 0;
+	$board['pph']    = 0;
+	
+	if (isset($boardActivity['active'][ $boardUri ])) {
+		$board['active'] = (int) $boardActivity['active'][ $boardUri ];
+	}
+	if (isset($boardActivity['average'][ $boardUri ])) {
+		$precision = 4 - strlen( $boardActivity['average'][ $boardUri ] );
+		
+		if( $precision < 0 ) {
+			$precision = 0;
+		}
+		
+		$board['pph'] = round( $boardActivity['average'][ $boardUri ], 2 );
+		
+		unset( $precision );
+	}
 	
 	if (isset($board['tags']) && count($board['tags']) > 0) {
 		foreach ($board['tags'] as $tag) {
@@ -126,6 +152,8 @@ foreach ($response['boards'] as $boardUri => &$board) {
 	}
 }
 
+unset( $boardActivity );
+
 // Sort boards by their popularity, then by their total posts.
 $boardActivityValues   = array();
 $boardTotalPostsValues = array();
@@ -152,6 +180,9 @@ if (count($response['tags']) > 0) {
 }
 
 
+/* Include our interpreted search terms. */
+$response['search'] = $search;
+
 /* (Please) Respond */
 if (!$Included) {
 	$json = json_encode( $response );
diff --git a/boards.php b/boards.php
index afd96841..06e18086 100644
--- a/boards.php
+++ b/boards.php
@@ -1,9 +1,10 @@
 <?php
 
-include "inc/functions.php"; // October 23, 2013
+include "inc/functions.php";
 include "inc/countries.php";
 
-$admin = isset($mod["type"]) && $mod["type"]<=30;
+$admin         = isset($mod["type"]) && $mod["type"]<=30;
+$founding_date = "October 23, 2013";
 
 if (php_sapi_name() == 'fpm-fcgi' && !$admin) {
 	error('Cannot be run directly.');
@@ -23,25 +24,16 @@ if (count($searchJson)) {
 	}
 }
 
-/* $query = prepare(sprintf("
-SELECT IFNULL(MAX(id),0) max,
-(SELECT COUNT(*) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 1 HOUR)) pph,
-(SELECT COUNT(DISTINCT ip) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 3 DAY)) uniq_ip
- FROM ``posts_%s``
-", $board['uri'], $board['uri'], $board['uri'], $board['uri'], $board['uri']));
-	$query->execute() or error(db_error($query));
-	$r = $query->fetch(PDO::FETCH_ASSOC); */
-
-$boardQuery = prepare("SELECT COUNT(1) AS 'boards_total', COUNT(indexed) AS 'boards_public' FROM ``boards``");
+$boardQuery = prepare("SELECT COUNT(1) AS 'boards_total', SUM(indexed) AS 'boards_public', SUM(posts_total) AS 'posts_total' FROM ``boards``");
 $boardQuery->execute() or error(db_error($tagQuery));
 $boardResult = $boardQuery->fetchAll(PDO::FETCH_ASSOC)[0];
 
-$boards_total  = $boardResult['boards_total'];
-$boards_public = $boardResult['boards_public'];
-$boards_hidden = $boardResult['boards_total'] - $boardResult['boards_public'];
+$boards_total  = number_format( $boardResult['boards_total'], 0 );
+$boards_public = number_format( $boardResult['boards_public'], 0 );
+$boards_hidden = number_format( $boardResult['boards_total'] - $boardResult['boards_public'], 0 );
 
-$posts_hour    = 0;
-$posts_total   = 0;
+$posts_hour    = number_format( fetchBoardActivity(), 0 );
+$posts_total   = number_format( $boardResult['posts_total'], 0 );
 
 /* Create and distribute page */
 $boardsHTML = Element("8chan/boards-table.html", array(
@@ -66,6 +58,7 @@ $searchHTML = Element("8chan/boards-search.html", array(
 		"posts_hour"    => $posts_hour,
 		"posts_total"   => $posts_total,
 		
+		"founding_date" => $founding_date,
 		"page_updated"  => date('r'),
 		"uptime"        => shell_exec('uptime -p'),
 		
diff --git a/inc/functions.php b/inc/functions.php
index 7b572dfc..98f07377 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -833,18 +833,65 @@ function loadBoardConfig( $uri ) {
 	return $config;
 }
 
-function fetchBoardActivity( $uris ) {
+function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed = false ) {
 	global $config;
 	
-	$boardActivity = array();
-	//$uris          = "\"" . implode( (array) $uris, "\",\"" ) . "\"";
+	// Set our search time for now if we didn't pass one.
+	if (!is_integer($forTime)) {
+		$forTime = time();
+	}
+	// Get the last hour for this timestamp.
+	$forHour = ( (int)( $forTime / 3600 ) * 3600 ) - 3600;
 	
-	foreach ($uris as $uri) {
-		$random = 0;//rand( -1000, 1000 );
-		if( $random < 0 ) $random = 0;
+	$boardActivity = array(
+		'active'  => array(),
+		'average' => array(),
+	);
+	
+	// Query for stats for these boards.
+	if (count($uris)) {
+		$uriSearch = "`stat_uri` IN (\"" . implode( (array) $uris, "\",\"" ) . "\") AND ";
+	}
+	else {
+		$uriSearch = "";
+	}
+	
+	if ($detailed === true) {
+		$bsQuery = prepare("SELECT `stat_uri`, `post_count`, `author_ip_array` FROM ``board_stats`` WHERE {$uriSearch} ( `stat_hour` <= :hour AND `stat_hour` >= :hoursago )");
+		$bsQuery->bindValue(':hour', $forHour, PDO::PARAM_INT);
+		$bsQuery->bindValue(':hoursago', $forHour - ( 3600 * 72 ), PDO::PARAM_INT);
+		$bsQuery->execute() or error(db_error($bsQuery));
+		$bsResult = $bsQuery->fetchAll(PDO::FETCH_ASSOC);
 		
-		$boardActivity['active'][ $uri ]  = $random;
-		$boardActivity['average'][ $uri ] = ($random * 72) / 72;
+		
+		// Format the results.
+		foreach ($bsResult as $bsRow) {
+			if (!isset($boardActivity['active'][$bsRow['stat_uri']])) {
+				$boardActivity['active'][$bsRow['stat_uri']] = unserialize( $bsRow['author_ip_array'] );
+				$boardActivity['average'][$bsRow['stat_uri']] = $bsRow['post_count'];
+			}
+			else {
+				$boardActivity['active'][$bsRow['stat_uri']] = array_merge( $boardActivity['active'][$bsRow['stat_uri']], unserialize( $bsRow['author_ip_array'] ) );
+				$boardActivity['average'][$bsRow['stat_uri']] = $bsRow['post_count'];
+			}
+		}
+		
+		foreach ($boardActivity['active'] as &$activity) {
+			$activity = count( array_unique( $activity ) );
+		}
+		foreach ($boardActivity['average'] as &$activity) {
+			$activity /= 72;
+		}
+	}
+	// Simple return.
+	else {
+		$bsQuery = prepare("SELECT SUM(`post_count`) AS `post_count` FROM ``board_stats`` WHERE {$uriSearch} ( `stat_hour` <= :hour AND `stat_hour` >= :hoursago )");
+		$bsQuery->bindValue(':hour', $forHour, PDO::PARAM_INT);
+		$bsQuery->bindValue(':hoursago', $forHour - ( 3600 * 72 ), PDO::PARAM_INT);
+		$bsQuery->execute() or error(db_error($bsQuery));
+		$bsResult = $bsQuery->fetchAll(PDO::FETCH_ASSOC);
+		
+		$boardActivity = $bsResult[0]['post_count'];
 	}
 	
 	return $boardActivity;
@@ -854,7 +901,7 @@ function fetchBoardTags( $uris ) {
 	global $config;
 	
 	$boardTags = array();
-	$uris = "\"{$config['db']['prefix']}" . implode( (array) $uris, "\",\"" ) . "\"";
+	$uris = "\"" . implode( (array) $uris, "\",\"" ) . "\"";
 	
 	$tagQuery = prepare("SELECT * FROM ``board_tags`` WHERE `uri` IN ({$uris})");
 	$tagQuery->execute() or error(db_error($tagQuery));
@@ -1090,70 +1137,70 @@ function insertFloodPost(array $post) {
 function post(array $post) {
 	global $pdo, $board;
 	$query = prepare(sprintf("INSERT INTO ``posts_%s`` VALUES ( NULL, :thread, :subject, :email, :name, :trip, :capcode, :body, :body_nomarkup, :time, :time, :files, :num_files, :filehash, :password, :ip, :sticky, :locked, :cycle, 0, :embed, NULL)", $board['uri']));
-
+	
 	// Basic stuff
 	if (!empty($post['subject'])) {
 		$query->bindValue(':subject', $post['subject']);
 	} else {
 		$query->bindValue(':subject', null, PDO::PARAM_NULL);
 	}
-
+	
 	if (!empty($post['email'])) {
 		$query->bindValue(':email', $post['email']);
 	} else {
 		$query->bindValue(':email', null, PDO::PARAM_NULL);
 	}
-
+	
 	if (!empty($post['trip'])) {
 		$query->bindValue(':trip', $post['trip']);
 	} else {
 		$query->bindValue(':trip', null, PDO::PARAM_NULL);
 	}
-
+	
 	$query->bindValue(':name', $post['name']);
 	$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']) {
 		$query->bindValue(':sticky', true, PDO::PARAM_INT);
 	} else {
 		$query->bindValue(':sticky', false, PDO::PARAM_INT);
 	}
-
+	
 	if ($post['op'] && $post['mod'] && isset($post['locked']) && $post['locked']) {
 		$query->bindValue(':locked', true, PDO::PARAM_INT);
 	} else {
 		$query->bindValue(':locked', false, PDO::PARAM_INT);
 	}
-
+	
 	if ($post['op'] && $post['mod'] && isset($post['cycle']) && $post['cycle']) {
 		$query->bindValue(':cycle', true, PDO::PARAM_INT);
 	} else {
 		$query->bindValue(':cycle', false, PDO::PARAM_INT);
 	}
-
+	
 	if ($post['mod'] && isset($post['capcode']) && $post['capcode']) {
 		$query->bindValue(':capcode', $post['capcode'], PDO::PARAM_INT);
 	} else {
 		$query->bindValue(':capcode', null, PDO::PARAM_NULL);
 	}
-
+	
 	if (!empty($post['embed'])) {
 		$query->bindValue(':embed', $post['embed']);
 	} else {
 		$query->bindValue(':embed', null, PDO::PARAM_NULL);
 	}
-
+	
 	if ($post['op']) {
 		// No parent thread, image
 		$query->bindValue(':thread', null, PDO::PARAM_NULL);
 	} else {
 		$query->bindValue(':thread', $post['thread'], PDO::PARAM_INT);
 	}
-
+	
 	if ($post['has_file']) {
 		$query->bindValue(':files', json_encode($post['files']));
 		$query->bindValue(':num_files', $post['num_files']);
@@ -1163,12 +1210,12 @@ function post(array $post) {
 		$query->bindValue(':num_files', 0);
 		$query->bindValue(':filehash', null, PDO::PARAM_NULL);
 	}
-
+	
 	if (!$query->execute()) {
 		undoImage($post);
 		error(db_error($query));
 	}
-
+	
 	return $pdo->lastInsertId();
 }
 
@@ -1462,6 +1509,65 @@ function index($page, $mod=false) {
 	);
 }
 
+// Handle statistic tracking for a new post.
+function updateStatisticsForPost( $post, $new = true ) {
+	$postIp   = isset($post['ip']) ? $post['ip'] : $_SERVER['REMOTE_ADDR'];
+	$postUri  = $post['board'];
+	$postTime = (int)( $post['time'] / 3600 ) * 3600;
+	
+	$bsQuery = prepare("SELECT * FROM ``board_stats`` WHERE `stat_uri` = :uri AND `stat_hour` = :hour");
+	$bsQuery->bindValue(':uri', $postUri);
+	$bsQuery->bindValue(':hour', $postTime, PDO::PARAM_INT);
+	$bsQuery->execute() or error(db_error($bsQuery));
+	$bsResult = $bsQuery->fetchAll(PDO::FETCH_ASSOC);
+	
+	// Flesh out the new stats row.
+	$boardStats = array();
+	
+	// If we already have a row, we're going to be adding this post to it.
+	if (count($bsResult)) {
+		$boardStats = $bsResult[0];
+		$boardStats['stat_uri']          = $postUri;
+		$boardStats['stat_hour']         = $postTime;
+		$boardStats['post_id_array']     = unserialize( $boardStats['post_id_array'] );
+		$boardStats['author_ip_array']   = unserialize( $boardStats['author_ip_array'] );
+		
+		++$boardStats['post_count'];
+		$boardStats['post_id_array'][]   = (int) $post['id'];
+		$boardStats['author_ip_array'][] = less_ip( $postIp );
+		$boardStats['author_ip_array']   = array_unique( $boardStats['author_ip_array'] );
+	}
+	// If this a new row, we're building the stat to only reflect this first post.
+	else {
+		$boardStats['stat_uri']          = $postUri;
+		$boardStats['stat_hour']         = $postTime;
+		$boardStats['post_count']        = 1;
+		$boardStats['post_id_array']     = array( (int) $post['id'] );
+		$boardStats['author_ip_count']   = 1;
+		$boardStats['author_ip_array']   = array( less_ip( $postIp ) );
+	}
+	
+	// Cleanly serialize our array for insertion.
+	$boardStats['post_id_array']   = str_replace( "\"", "\\\"", serialize( $boardStats['post_id_array'] ) );
+	$boardStats['author_ip_array'] = str_replace( "\"", "\\\"", serialize( $boardStats['author_ip_array'] ) );
+	
+	
+	// Insert this data into our statistics table.
+	$statsInsert = "VALUES(\"{$boardStats['stat_uri']}\", \"{$boardStats['stat_hour']}\", \"{$boardStats['post_count']}\", \"{$boardStats['post_id_array']}\", \"{$boardStats['author_ip_count']}\", \"{$boardStats['author_ip_array']}\" )";
+	
+	$postStatQuery = prepare(
+		"REPLACE INTO ``board_stats`` (stat_uri, stat_hour, post_count, post_id_array, author_ip_count, author_ip_array) {$statsInsert}"
+	);
+	$postStatQuery->execute() or error(db_error($postStatQuery));
+	
+	// Update the posts_total tracker on the board.
+	if ($new) {
+		query("UPDATE ``boards`` SET `posts_total`=`posts_total`+1 WHERE `uri`=\"{$postUri}\"");
+	}
+	
+	return $boardStats;
+}
+
 function getPageButtons($pages, $mod=false) {
 	global $config, $board;
 
diff --git a/post.php b/post.php
index 177c2dba..38898e11 100644
--- a/post.php
+++ b/post.php
@@ -209,11 +209,16 @@ if (isset($_POST['delete'])) {
 	}
 }
 elseif (isset($_POST['post'])) {
-	if (!isset($_POST['body'], $_POST['board']))
+	if (!isset($_POST['body'], $_POST['board'])) {
 		error($config['error']['bot']);
-
-	$post = array('board' => $_POST['board'], 'files' => array());
-
+	}
+	
+	$post = array(
+		'board' => $_POST['board'],
+		'files' => array(),
+		'time'  => time(), // Timezone independent UNIX timecode.
+	);
+	
 	// Check if board exists
 	if (!openBoard($post['board']))
 		error($config['error']['noboard']);
@@ -228,7 +233,7 @@ elseif (isset($_POST['post'])) {
 		$_POST['subject'] = '';
 	
 	if (!isset($_POST['password']))
-		$_POST['password'] = '';	
+		$_POST['password'] = '';
 	
 	if (isset($_POST['thread'])) {
 		$post['op'] = false;
@@ -708,7 +713,7 @@ elseif (isset($_POST['post'])) {
 		do_filters($post);
 	}
 	
-	if ($post['has_file']) {	
+	if ($post['has_file']) {
 		foreach ($post['files'] as $key => &$file) {
 		if ($file['is_an_image'] && $config['ie_mime_type_detection'] !== false) {
 			// Check IE MIME type detection XSS exploit
@@ -906,10 +911,15 @@ elseif (isset($_POST['post'])) {
 		$post['files'] = $post['files'];
 	$post['num_files'] = sizeof($post['files']);
 	
+	// Commit the post to the database.
 	$post['id'] = $id = post($post);
 	
 	insertFloodPost($post);
-
+	
+	// Update statistics for this board.
+	updateStatisticsForPost( $post );
+	
+	
 	// Handle cyclical threads
 	if (!$post['op'] && isset($thread['cycle']) && $thread['cycle']) {
 		// Query is a bit weird due to "This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery'" (MariaDB Ver 15.1 Distrib 10.0.17-MariaDB, for Linux (x86_64))
@@ -1005,17 +1015,20 @@ elseif (isset($_POST['post'])) {
 	event('post-after', $post);
 	
 	buildIndex();
-
-	// We are already done, let's continue our heavy-lifting work in the background (if we run off FastCGI)
-	if (function_exists('fastcgi_finish_request'))
-		@fastcgi_finish_request();
-
-	if ($post['op'])
-		rebuildThemes('post-thread', $board['uri']);
-	else
-		rebuildThemes('post', $board['uri']);
 	
-} elseif (isset($_POST['appeal'])) {
+	// We are already done, let's continue our heavy-lifting work in the background (if we run off FastCGI)
+	if (function_exists('fastcgi_finish_request')) {
+		@fastcgi_finish_request();
+	}
+	
+	if ($post['op']) {
+		rebuildThemes('post-thread', $board['uri']);
+	}
+	else {
+		rebuildThemes('post', $board['uri']);
+	}
+}
+elseif (isset($_POST['appeal'])) {
 	if (!isset($_POST['ban_id']))
 		error($config['error']['bot']);
 	
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 916067fc..ff29bb2a 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1363,15 +1363,19 @@ table.board-list-table .board-title {
 }
 table.board-list-table .board-pph {
 	width: 55px;
+	padding: 4px;
 }
 table.board-list-table .board-max {
 	width: 90px;
+	padding: 4px;
 }
 table.board-list-table .board-unique {
 	width: 100px;
+	padding: 4px;
 }
 table.board-list-table .board-tags {
 	width: auto;
+	padding: 0 15px 0 4px;
 }
 
 table.board-list-table div.board-cell {
@@ -1435,4 +1439,14 @@ li.tag-item {
 	list-style: none;
 	margin: 0;
 	padding: 0 0.6em 0 0;
+}
+a.tag-link {
+	overflow: hidden;
+	white-space: nowrap;
+}
+li.tag-item a.tag-link {
+}
+td.board-tags a.tag-link {
+	display: inline-block;
+	margin: 0 0.4em 0 0;
 }
\ No newline at end of file
diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
index e7519dd0..57f5834c 100644
--- a/templates/8chan/boards-search.html
+++ b/templates/8chan/boards-search.html
@@ -72,6 +72,8 @@
 				</thead>
 				
 				<tbody class="board-list-tbody">{{html_boards}}</tbody>
+				
+				<tfoot class="board-list-loading loading"></tfoot>
 			</table>
 		</section>
 	</div>
diff --git a/templates/8chan/boards-table.html b/templates/8chan/boards-table.html
index a43f3d67..f3451ae1 100644
--- a/templates/8chan/boards-table.html
+++ b/templates/8chan/boards-table.html
@@ -6,6 +6,6 @@
 	<td class="board-pph"><div class="board-cell">{{board['pph']}}</td>
 	<td class="board-max"><div class="board-cell">{{board['posts_total']}}</td>
 	<td class="board-unique"><div class="board-cell">{{board['active']}}</td>
-	<td class="board-tags"><div class="board-cell">{% for tag in board.tags %}<span class="board-tag">{{ tag }}</span>&nbsp;{% endfor %}</div></td>
+	<td class="board-tags"><div class="board-cell">{% for tag in board.tags %}<a class="tag-link" href="#">{{ tag }}</a>{% endfor %}</div></td>
 </tr>
 {% endfor %}
\ No newline at end of file
diff --git a/templates/8chan/boards.html b/templates/8chan/boards.html
index 4687a6dd..db6b2682 100644
--- a/templates/8chan/boards.html
+++ b/templates/8chan/boards.html
@@ -1,36 +1,80 @@
-<div class="boardlist">
-	<p>{% trans %}There are currently <strong>{{n_boards}}</strong> boards + <strong>{{hidden_boards_total}}</strong> unindexed boards = <strong>{{t_boards}}</strong> total boards. Site-wide, {{total_posts_hour}} posts have been made in the last hour, with {{total_posts}} being made on all active boards since October 23, 2013.{% endtrans %}</p>
+<main id="boardlist">
+	<section class="description box col col-12">
+		<h2 class="box-title">Global Statistics</h2>
+		<p class="box-content">{% trans %}There are currently <strong>{{boards_public}}</strong> public boards, <strong>{{boards_total}}</strong> total. Site-wide, {{posts_hour}} posts have been made in the last hour, with {{posts_total}} being made on all active boards since {{founding_date}}.{% endtrans %}</p>
+		{% if uptime %}<p class="box-content">{{uptime}} without interruption</p>{% endif %}
+		<p class="box-content">This page last updated {{page_updated}}.</p>
+	</section>
 	
-	<table>
-		<thead>
-			<tr>
-				<th>L</th>
-				<th>{% trans %}Board{% endtrans %}</th>
-				<th>{% trans %}Board title{% endtrans %}</th>
-				<th>{% trans %}Posts in last hour{% endtrans %}</th>
-				<th>{% trans %}Total posts{% endtrans %}</th>
-				<th>{% trans %}Unique IPs{% endtrans %}</th>
-				<th>{% trans %}Created{% endtrans %}</th>
-			</tr>
-		</thead>
-		<tbody class="loading">
-			
-		</tbody>
-		<tbody>
-			{% for board in boards %}
-			<tr>
-				<td>{{ board.img|raw }}</td>
-				<td><a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>{{lock|raw}}</td>
-				<td>{{ board['title'] }}</td>
-				<td>{{board['pph']}}</td>
-				<td style='text-align:right'>{{board['max']}}</td>
-				<td style='text-align:right'>{{board['uniq_ip']}}</td>
-				<td>{{board['time']}} ({{board['ago']}} ago)</td>
-			</tr>
-			{% endfor %}
-		</tbody>
-	</table>
-
-	<p><em>Page last updated: {{last_update}}</em></p>
-	<p>{{uptime_p}} without interruption</p>
-</div>
\ No newline at end of file
+	<div class="board-list">
+		<aside class="search-container col col-2">
+			<form id="search-form" class="box" method="post" target="/board-search.php">
+				<h2 class="box-title">Search</h2>
+				
+				<div class="board-search box-content">
+					<label class="search-item search-sfw">
+						<input type="checkbox" id="search-sfw-input" name="sfw" checked="checked" />&nbsp;NSFW boards
+					</label>
+					
+					<div class="search-item search-title">
+						<input type="text" id="search-title-input" name="title" placeholder="Search titles..." />
+					</div>
+					
+					<div class="search-item search-lang">
+						<select id="search-lang-input" name="lang">
+							<optgroup label="Popular">
+								<option>All languages</option>
+								<option>English</option>
+								<option>Spanish</option>
+							</optgroup>
+							<optgroup label="All">
+								<option>Chinese</option>
+							</optgroup>
+						</select>
+					</div>
+					
+					<div class="search-item search-tag">
+						<input type="text" id="search-tag-input" name="tag" placeholder="Search tags..." />
+					</div>
+					
+					<div class="search-item search-submit">
+						<button id="search-submit">Search</button>
+					</div>
+				</div>
+				
+				<ul class="tag-list box-content">
+					<li class="tag-item">
+						<a class="tag-link" href="#">{{html_tags}}</a> 
+					</li>
+				</ul>
+			</form>
+		</aside>
+		
+		<section class="board-list col col-10">
+			<table class="board-list-table">
+				<colgroup>
+					<col class="board-meta" />
+					<col class="board-uri" />
+					<col class="board-title" />
+					<col class="board-pph" />
+					<col class="board-max" />
+					<col class="board-unique" />
+					<col class="board-tags" />
+				</colgroup>
+				<thead>
+					<tr>
+						<th class="board-meta" data-column="meta"></th>
+						<th class="board-uri" data-column="uri">{% trans %}Board{% endtrans %}</th>
+						<th class="board-title" data-column="title">{% trans %}Title{% endtrans %}</th>
+						<th class="board-pph" data-column="pph" title="Posts per hour">{% trans %}PPH{% endtrans %}</th>
+						<th class="board-max" data-column="max">{% trans %}Total posts{% endtrans %}</th>
+						<th class="board-unique" data-column="unique" title="Unique IPs to post in the last 72 hours">{% trans %}Active users{% endtrans %}</th>
+						<th class="board-tags" data-column="tags">{% trans %}Tags{% endtrans %}</th>
+					</tr>
+				</thead>
+				
+				<tbody class="board-list-tbody">{{html_boards}}</tbody>
+			</table>
+		</section>
+	</div>
+</main>
\ No newline at end of file
diff --git a/tools/migrate_board_stats.php b/tools/migrate_board_stats.php
index 8ef7b9b4..8184e037 100644
--- a/tools/migrate_board_stats.php
+++ b/tools/migrate_board_stats.php
@@ -79,11 +79,10 @@ foreach ($boards as $board) {
 		
 		// Add to ip array.
 		if (!isset($postDatum['author_ip_array'])) {
-			$postDatum['author_ip_array'][ less_ip( $post['ip'] ) ] = 1;
+			$postDatum['author_ip_array'] = array();
 		}
 		
-		// Count ip array.
-		$postDatum['author_ip_count'] = count( $postDatum['post_id_array'] );
+		$postDatum['author_ip_array'][ less_ip( $post['ip'] ) ] = 1;
 		
 		unset( $postHourTime );
 	}
@@ -93,7 +92,8 @@ foreach ($boards as $board) {
 		$postDatum = &$postHour[ $postHourTime ];
 		
 		// Serialize arrays for TEXT insert.
-		$postDatum['post_id_array'  ] = str_replace( "\"", "\\\"", serialize( $postDatum['post_id_array'] ) );
+		$postDatum['post_id_array']   = str_replace( "\"", "\\\"", serialize( $postDatum['post_id_array'] ) );
+		$postDatum['author_ip_count'] = count( array_keys( $postDatum['author_ip_array'] ) );
 		$postDatum['author_ip_array'] = str_replace( "\"", "\\\"", serialize( array_keys( $postDatum['author_ip_array'] ) ) );
 	}
 	

From f09def271299487adbac122e312bdeb0771e107f Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Wed, 15 Apr 2015 05:06:49 +1000
Subject: [PATCH 54/70] Main change with this commit is adding
 board-directory.js which is to handle JS enabled searching.

Highly incomplete. Barely functional. Just lays groundwork.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 boards.php                         |  10 +-
 js/board-directory.js              | 192 +++++++++++++++++++++++++++++
 stylesheets/style.css              |   7 ++
 templates/8chan/boards-search.html |   8 +-
 4 files changed, 210 insertions(+), 7 deletions(-)
 create mode 100644 js/board-directory.js

diff --git a/boards.php b/boards.php
index 06e18086..40a9e841 100644
--- a/boards.php
+++ b/boards.php
@@ -36,6 +36,11 @@ $posts_hour    = number_format( fetchBoardActivity(), 0 );
 $posts_total   = number_format( $boardResult['posts_total'], 0 );
 
 /* Create and distribute page */
+$config['additional_javascript'] = array(
+	'js/jquery.min.js',
+	'js/board-directory.js'
+);
+
 $boardsHTML = Element("8chan/boards-table.html", array(
 		"config"        => $config,
 		"boards"        => $boards,
@@ -67,11 +72,6 @@ $searchHTML = Element("8chan/boards-search.html", array(
 	)
 );
 
-$config['additional_javascript'] = array(
-	'js/jquery.min.js',
-	'js/board-directory.js'
-);
-
 $pageHTML = Element("page.html", array(
 		"config" => $config,
 		"body"   => $searchHTML,
diff --git a/js/board-directory.js b/js/board-directory.js
new file mode 100644
index 00000000..d9858150
--- /dev/null
+++ b/js/board-directory.js
@@ -0,0 +1,192 @@
+// ============================================================
+// Purpose                      : Board directory handling
+// Contributors                 : 8n-tech
+// ============================================================
+
+;( function( window, $, undefined ) {
+	var boardlist = {
+		options : {
+			$boardlist : false,
+			
+			// Selectors for finding and binding elements.
+			selector   : {
+				'boardlist'     : "#boardlist",
+				
+				'board-head'    : ".board-list-head",
+				'board-body'    : ".board-list-tbody",
+				'board-loading' : ".board-list-loading",
+				
+				'search'        : "#search-form",
+				'search-lang'   : "#search-lang-input",
+				'search-sfw'    : "#search-sfw-input",
+				'search-tag'    : "#search-tag-input",
+				'search-title'  : "#search-title-input",
+				'search-submit' : "#search-submit",
+			},
+			
+			// HTML Templates for dynamic construction
+			template   : {
+				// Board row item
+				'board-row'          : "<tr></tr>",
+				
+				// Individual cell definitions
+				'board-cell-meta'    : "<td class=\"board-meta\"></td>",
+				'board-cell-uri'     : "<td class=\"board-uri\"></td>",
+				'board-cell-title'   : "<td class=\"board-title\"></td>",
+				'board-cell-pph'     : "<td class=\"board-pph\"></td>",
+				'board-cell-max'     : "<td class=\"board-max\"></td>",
+				'board-cell-unique'  : "<td class=\"board-unique\"></td>",
+				'board-cell-tags'    : "<td class=\"board-tags\"></td>",
+				
+				// Content wrapper
+				// Used to help constrain contents to their <td>.
+				'board-content-wrap' : "<div class=\"board-cell\"></div>",
+				
+				
+				// Tagging
+				'board-datum-tags' : "<a class=\"tag-link\" href=\"#\"></a>"
+			}
+		},
+		
+		bind : {
+			form : function() {
+				var selectors = boardlist.options.selector;
+				
+				var $search       = $( selectors['search'] ),
+				    $searchLang   = $( selectors['search-lang'] ),
+				    $searchSfw    = $( selectors['search-sfw'] ),
+				    $searchTag    = $( selectors['search-tag'] ),
+				    $searchTitle  = $( selectors['search-title'] ),
+				    $searchSubmit = $( selectors['search-submit'] );
+				
+				var searchForms   = {
+						'boardlist'    : boardlist.$boardlist,
+						'search'       : $search,
+						'searchLang'   : $searchLang,
+						'searchSfw'    : $searchSfw,
+						'searchTag'    : $searchTag,
+						'searchTitle'  : $searchTitle,
+						'searchSubmit' : $searchSubmit
+					};
+				
+				
+				if ($search.length > 0) {
+					// Bind form events.
+					$search.on( 'submit', searchForms, boardlist.events.searchSubmit );
+					$searchSubmit.on( 'click', searchForms, boardlist.events.searchSubmit );
+				}
+			}
+		},
+		
+		build  : {
+			boardlist : function(data) {
+				boardlist.build.boards(data['boards']);
+				boardlist.build.tags(data['tags']);
+				
+			},
+			
+			boards : function(data) {
+				// Find our head, columns, and body.
+				var $head = $( boardlist.options.selector['board-head'], boardlist.$boardlist ),
+				    $cols = $("[data-column]", $head ),
+				    $body = $( boardlist.options.selector['board-body'], boardlist.$boardlist );
+				
+				$.each( data, function( index, row ) {
+					var $row = $( boardlist.options.template['board-row'] );
+					
+					$cols.each( function( index, col ) {
+						var $col   = $(col),
+						    column = $col.attr('data-column'),
+						    value  = row[column]
+						    $cell  = $( boardlist.options.template['board-cell-' + column] ),
+						    $wrap  = $( boardlist.options.template['board-content-wrap'] );
+						
+						if (value instanceof Array) {
+							if (typeof boardlist.options.template['board-datum-' + column] !== "undefined") {
+								$.each( value, function( index, singleValue ) {
+									$( boardlist.options.template['board-datum-' + column] )
+										.text( singleValue )
+										.appendTo( $wrap );
+								} );
+							}
+							else {
+								$wrap.text( value.join(" ") );
+							}
+						}
+						else {
+							$wrap.text( value );
+						}
+						
+						$wrap.appendTo( $cell );
+						$cell.appendTo( $row );
+					} );
+						
+						if( index >= 100 ) return false;
+					
+					$row.appendTo( $body );
+				} );
+				
+			},
+			
+			tags : function(data) {
+				
+			}
+		},
+		
+		events : {
+			searchSubmit : function(event) {
+				event.preventDefault();
+				
+				var $boardlist = event.data.boardlist,
+				    $boardbody = $( boardlist.options.selector['board-body'], $boardlist ),
+				    $boardload = $( boardlist.options.selector['board-loading'], $boardlist );
+				
+				$boardbody.html("");
+				$boardload.show();
+				
+				$.get(
+					"/board-search.php",
+					{
+						'lang'  : event.data.searchLang.val(),
+						'tags'  : event.data.searchTag.val(),
+						//'time'  : event.data.searchTag.val(),
+						'title' : event.data.searchTitle.val(),
+						'sfw'   : event.data.searchSfw.prop('checked') ? 1 : 0
+					},
+					function(data) {
+						$boardload.hide();
+						boardlist.build.boardlist( $.parseJSON(data) );
+					}
+				);
+				
+				return false;
+			}
+		},
+		
+		init : function( target ) {
+			if (typeof target !== "string") {
+				target = boardlist.options.selector.boardlist;
+			}
+			
+			var $target = $(target);
+			
+			if ($target.length > 0 ) {
+				boardlist.$boardlist = $target;
+				boardlist.bind.form();
+			}
+		}
+	};
+	
+	// Tie to the vichan object.
+	if (typeof window.vichan === "undefined") {
+		window.vichan = {};
+	}
+	window.vichan.boardlist = boardlist;
+	
+	// Initialize the boardlist when the document is ready.
+	$( document ).on( 'ready', window.vichan.boardlist.init );
+	// Run it now if we're already ready.
+	if  (document.readyState === 'complete') {
+		window.vichan.boardlist.init();
+	}
+} )( window, jQuery );
\ No newline at end of file
diff --git a/stylesheets/style.css b/stylesheets/style.css
index ff29bb2a..17dae01e 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1383,6 +1383,13 @@ table.board-list-table div.board-cell {
 	overflow: hidden;
 }
 
+tfoot.board-list-loading {
+	display: none;
+}
+tfoot.board-list-loading .loading {
+	height: 80px;
+}
+
 aside.search-container {
 }
 aside.search-container .box {
diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
index 57f5834c..934403d9 100644
--- a/templates/8chan/boards-search.html
+++ b/templates/8chan/boards-search.html
@@ -59,7 +59,7 @@
 					<col class="board-unique" />
 					<col class="board-tags" />
 				</colgroup>
-				<thead>
+				<thead class="board-list-head">
 					<tr>
 						<th class="board-meta" data-column="meta"></th>
 						<th class="board-uri" data-column="uri">{% trans %}Board{% endtrans %}</th>
@@ -73,7 +73,11 @@
 				
 				<tbody class="board-list-tbody">{{html_boards}}</tbody>
 				
-				<tfoot class="board-list-loading loading"></tfoot>
+				<tfoot class="board-list-loading">
+					<tr>
+						<td colspan="7" class="loading"></td>
+					</tr>
+				</tfoot>
 			</table>
 		</section>
 	</div>

From 0347bf772d17dafc39fe044a0425627883b24fa1 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Wed, 15 Apr 2015 22:02:11 +1000
Subject: [PATCH 55/70] - board-search.php Improved result limiting. -
 boards.php Passes omit information - js/board-directory.js Improved code
 organization. - js/board-directory.js Added NSFW icon. -
 js/board-directory.js Added basic locale handling. - js/board-directory.js
 Disabled submit button until JS is bound.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                   |  10 ++-
 boards.php                         |  34 ++++----
 js/board-directory.js              | 125 ++++++++++++++++++++---------
 static/infinity-small.gif          | Bin 0 -> 6104 bytes
 templates/8chan/boards-search.html |  22 ++++-
 templates/8chan/boards-table.html  |   7 +-
 6 files changed, 138 insertions(+), 60 deletions(-)
 create mode 100644 static/infinity-small.gif

diff --git a/board-search.php b/board-search.php
index c156fffb..8aaa7245 100644
--- a/board-search.php
+++ b/board-search.php
@@ -28,6 +28,8 @@ $search = array(
 	'tags'  => false,
 	'time'  => ( (int)( time() / 3600 ) * 3600 ) - 3600,
 	'title' => false,
+	
+	'index' => count( $_GET ) == 0,
 );
 
 // Include NSFW boards?
@@ -169,12 +171,18 @@ array_multisort(
 	$response['boards']
 );
 
+$boardLimit = $search['index'] ? 50 : 100;
+
+$response['omitted'] = $search['index'] ? 0 : count( $response['boards'] ) - $boardLimit;
+$response['boards']  = array_splice( $response['boards'], 0, $boardLimit );
+$response['order']   = array_keys( $response['boards'] );
+
 // Get the top most popular tags.
 if (count($response['tags']) > 0) {
 	// Sort by most active tags.
 	arsort( $response['tags'] );
 	// Get the first n most active tags.
-	$response['tags'] = array_splice( $response['tags'], 0, 200 );
+	$response['tags'] = array_splice( $response['tags'], 0, 100 );
 	
 	// $tagLightest = end( array_keys( $response['tag'] ) );
 }
diff --git a/boards.php b/boards.php
index 40a9e841..4234aefd 100644
--- a/boards.php
+++ b/boards.php
@@ -28,12 +28,13 @@ $boardQuery = prepare("SELECT COUNT(1) AS 'boards_total', SUM(indexed) AS 'board
 $boardQuery->execute() or error(db_error($tagQuery));
 $boardResult = $boardQuery->fetchAll(PDO::FETCH_ASSOC)[0];
 
-$boards_total  = number_format( $boardResult['boards_total'], 0 );
-$boards_public = number_format( $boardResult['boards_public'], 0 );
-$boards_hidden = number_format( $boardResult['boards_total'] - $boardResult['boards_public'], 0 );
+$boards_total   = number_format( $boardResult['boards_total'], 0 );
+$boards_public  = number_format( $boardResult['boards_public'], 0 );
+$boards_hidden  = number_format( $boardResult['boards_total'] - $boardResult['boards_public'], 0 );
+$boards_omitted = (int) $searchJson['omitted'];
 
-$posts_hour    = number_format( fetchBoardActivity(), 0 );
-$posts_total   = number_format( $boardResult['posts_total'], 0 );
+$posts_hour     = number_format( fetchBoardActivity(), 0 );
+$posts_total    = number_format( $boardResult['posts_total'], 0 );
 
 /* Create and distribute page */
 $config['additional_javascript'] = array(
@@ -54,21 +55,22 @@ $tagsHTML = Element("8chan/boards-tags.html", array(
 );
 
 $searchHTML = Element("8chan/boards-search.html", array(
-		"config"        => $config,
+		"config"         => $config,
 		
-		"boards_total"  => $boards_total,
-		"boards_public" => $boards_public,
-		"boards_hidden" => $boards_hidden,
+		"boards_total"   => $boards_total,
+		"boards_public"  => $boards_public,
+		"boards_hidden"  => $boards_hidden,
+		"boards_omitted" => $boards_omitted,
 		
-		"posts_hour"    => $posts_hour,
-		"posts_total"   => $posts_total,
+		"posts_hour"     => $posts_hour,
+		"posts_total"    => $posts_total,
 		
-		"founding_date" => $founding_date,
-		"page_updated"  => date('r'),
-		"uptime"        => shell_exec('uptime -p'),
+		"founding_date"  => $founding_date,
+		"page_updated"   => date('r'),
+		"uptime"         => shell_exec('uptime -p'),
 		
-		"html_boards"   => $boardsHTML,
-		"html_tags"     => $tagsHTML
+		"html_boards"    => $boardsHTML,
+		"html_tags"      => $tagsHTML
 	)
 );
 
diff --git a/js/board-directory.js b/js/board-directory.js
index d9858150..6fe7edee 100644
--- a/js/board-directory.js
+++ b/js/board-directory.js
@@ -34,17 +34,19 @@
 				'board-cell-uri'     : "<td class=\"board-uri\"></td>",
 				'board-cell-title'   : "<td class=\"board-title\"></td>",
 				'board-cell-pph'     : "<td class=\"board-pph\"></td>",
-				'board-cell-max'     : "<td class=\"board-max\"></td>",
-				'board-cell-unique'  : "<td class=\"board-unique\"></td>",
+				'board-cell-posts_total' : "<td class=\"board-max\"></td>",
+				'board-cell-active'  : "<td class=\"board-unique\"></td>",
 				'board-cell-tags'    : "<td class=\"board-tags\"></td>",
 				
 				// Content wrapper
 				// Used to help constrain contents to their <td>.
 				'board-content-wrap' : "<div class=\"board-cell\"></div>",
 				
-				
-				// Tagging
-				'board-datum-tags' : "<a class=\"tag-link\" href=\"#\"></a>"
+				'board-datum-lang'   : "<span class=\"board-lang\"></span>",
+				'board-datum-uri'    : "<a class=\"board-link\"></a>",
+				'board-datum-sfw'    : "<i class=\"fa fa-briefcase board-sfw\" title=\"SFW\"></i>",
+				'board-datum-nsfw'   : "<i class=\"fa fa-briefcase board-nsfw\" title=\"NSFW\"></i>",
+				'board-datum-tags'   : "<a class=\"tag-link\" href=\"#\"></a>"
 			}
 		},
 		
@@ -73,59 +75,101 @@
 				if ($search.length > 0) {
 					// Bind form events.
 					$search.on( 'submit', searchForms, boardlist.events.searchSubmit );
-					$searchSubmit.on( 'click', searchForms, boardlist.events.searchSubmit );
+					$searchSubmit.prop( 'disabled', false ).on( 'click', searchForms, boardlist.events.searchSubmit );
 				}
 			}
 		},
 		
 		build  : {
 			boardlist : function(data) {
-				boardlist.build.boards(data['boards']);
+				boardlist.build.boards(data['boards'], data['order']);
 				boardlist.build.tags(data['tags']);
 				
 			},
 			
-			boards : function(data) {
+			boards : function(data, order) {
 				// Find our head, columns, and body.
 				var $head = $( boardlist.options.selector['board-head'], boardlist.$boardlist ),
 				    $cols = $("[data-column]", $head ),
 				    $body = $( boardlist.options.selector['board-body'], boardlist.$boardlist );
 				
-				$.each( data, function( index, row ) {
-					var $row = $( boardlist.options.template['board-row'] );
+				$.each( order, function( index, uri ) {
+					var row  = data[uri];
+					    $row = $( boardlist.options.template['board-row'] );
 					
 					$cols.each( function( index, col ) {
-						var $col   = $(col),
-						    column = $col.attr('data-column'),
-						    value  = row[column]
-						    $cell  = $( boardlist.options.template['board-cell-' + column] ),
-						    $wrap  = $( boardlist.options.template['board-content-wrap'] );
-						
-						if (value instanceof Array) {
-							if (typeof boardlist.options.template['board-datum-' + column] !== "undefined") {
-								$.each( value, function( index, singleValue ) {
-									$( boardlist.options.template['board-datum-' + column] )
-										.text( singleValue )
-										.appendTo( $wrap );
-								} );
-							}
-							else {
-								$wrap.text( value.join(" ") );
-							}
-						}
-						else {
-							$wrap.text( value );
-						}
-						
-						$wrap.appendTo( $cell );
-						$cell.appendTo( $row );
+						boardlist.build.board( row, col ).appendTo( $row );
 					} );
-						
-						if( index >= 100 ) return false;
+					
+					if( index >= 100 ) return false;
 					
 					$row.appendTo( $body );
 				} );
+			},
+			board : function( row, col ) {
+				var $col   = $(col),
+				    column = $col.attr('data-column'),
+				    value  = row[column]
+				    $cell  = $( boardlist.options.template['board-cell-' + column] ),
+				    $wrap  = $( boardlist.options.template['board-content-wrap'] );
 				
+				if (typeof boardlist.build.boardcell[column] === "undefined") {
+					if (value instanceof Array) {
+						if (typeof boardlist.options.template['board-datum-' + column] !== "undefined") {
+							$.each( value, function( index, singleValue ) {
+								$( boardlist.options.template['board-datum-' + column] )
+									.text( singleValue )
+									.appendTo( $wrap );
+							} );
+						}
+						else {
+							$wrap.text( value.join(" ") );
+						}
+					}
+					else {
+						$wrap.text( value );
+					}
+				}
+				else {
+					var $content = boardlist.build.boardcell[column]( row, value );
+					
+					if ($content instanceof jQuery) {
+						// We use .append() instead of .appendTo() as we do elsewhere
+						// because $content can be multiple elements.
+						$wrap.append( $content );
+					}
+					else if (typeof $content === "string") {
+						$wrap.html( $content );
+					}
+					else {
+						console.log("Special cell constructor returned a " + (typeof $content) + " that board-directory.js cannot interpret.");
+					}
+				}
+				
+				$wrap.appendTo( $cell );
+				return $cell;
+			},
+			boardcell : {
+				'meta' : function( row, value ) {
+					return $( boardlist.options.template['board-datum-lang'] ).text( row['locale'] );
+				},
+				'uri'  : function( row, value ) {
+					var $link = $( boardlist.options.template['board-datum-uri'] ),
+						$sfw  = $( boardlist.options.template['board-datum-' + (row['sfw'] == 1 ? "sfw" : "nsfw")] );
+					
+					$link
+						.attr( 'href', "/"+row['uri']+"/" )
+						.text( "/"+row['uri']+"/" );
+					
+					// I decided against NSFW icons because it clutters the index.
+					// Blue briefcase = SFW. No briefcase = NSFW. Seems better.
+					if (row['sfw'] == 1) {
+						return $link[0].outerHTML + $sfw[0].outerHTML;
+					}
+					else {
+						return $link[0].outerHTML;
+					}
+				}
 			},
 			
 			tags : function(data) {
@@ -168,10 +212,13 @@
 				target = boardlist.options.selector.boardlist;
 			}
 			
-			var $target = $(target);
+			var $boardlist = $(target);
 			
-			if ($target.length > 0 ) {
-				boardlist.$boardlist = $target;
+			if ($boardlist.length > 0 ) {
+				$( boardlist.options.selector['board-loading'], $boardlist ).hide();
+				
+				
+				boardlist.$boardlist = $boardlist;
 				boardlist.bind.form();
 			}
 		}
diff --git a/static/infinity-small.gif b/static/infinity-small.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c7a2978ea87b54c6a7d5402dfa92ddc29255b4ef
GIT binary patch
literal 6104
zcmchb{Xf(D|Ht2(%`VK^W;B#$u7zA*b+s8Y5_1`Hw4stHqz+E?*|3^Wqev1PVlJw=
zC>K%Nj7HLENhN14k}gh%j&nXbxAVDhzTe-<58t1@?|<O+zP}!?=i~W!K7IXY?jEeI
z00H>tG+<I@Vt&=!w9M4(s+oDYxy^MOi*k#F-xjQ{S=m(BINWfsy>5GN>fYG<G3kud
zrP{^%nzh|^yWzLPPZyugF3*PE3Z45hx4(7&@t)(;zfL<>IZypM_3D>bed@k#mD|)y
zYOkAKw<m8;e45}5@^;khm|LDpzn?zwapJ|N7jD&Vdz<!BZ&I@**|d6^_?5WkSxud)
z?r8VXJ&k)T%Pm7%LXx_YUjFhj{C0TLM3cL~ePC`Nwk@{ddBf4JqgO|-%ID-B0*}&>
z(jOoE=qdDk{rR=>y>ffacJF%ca|7p`s+`VB&t4w6Ji0g<ax3KOldD%ot`sT?58XSI
z-kbjH!?W(`ZsnpfN*v{Q!}0OL<E<52Bkx4!^yeJBdob%^*5s#2-v-~Jp`zsO<e|4i
zLCrzCYj>Y|a7r*PaIJQw)KPZT?uzS(yYT43;m*S`tufpI?(>h&N8XLpJ*)E&dfa(=
z=Sb&~6TK&@lvUB<=$`2wMl<8$(8d1Q{>0A2lE)=%8T*FvM%SCJ(~{G*&uVwq?QVbF
zUOrl0peTsA9r1qUJ*|NzdM?V7=k2?*PdF~@oa($keZOj~s_j)9f0$3MBR5Vo(na($
z(leKaE>(|J56%x}^kp=^X!dXPj}%ANKd<NXbI!`n-krJ|&=@fPW&YaewWb$M0Zjp!
z4>Qy5ryc7#=5)iU^;IjYgOz$ewNhF6=GQmz9r4A(#Z#ZB4zwTGS+n!!rJqmsove6T
z(eb(?r90);<So?)mH4GNSDqW(5?uVaxcBE?#al(^o6fQ)W&Lyg=LgR-+nG<^J(11I
zBr_5}k>7!~1NN2nnGZ5=s%}1<dD!xz<$?M^-auZ#qk>2CkNzS1#}92k^!?ly*c^EM
z>Gk|a`3LVE99|fnS)Kv@Uq0jiXa)L&g;FUDA4fZT4ba-5#$O=_7%&ak{QU!emk9vx
z1Nsn~=wg917p`L+qYw-G&tnj-0J$|lUI4ZYo`M4=-dOwz_zv1wE%gEh3C?7u8@pW4
zMu7=qjx!n>o3+anQK9u93|#x>r$!vv?t0!?jP4|7R*Q?Dv(cs$o6CwE@^Lj?a~}q8
zPSe4JXpDsqPD^suc9m-aLmQVJbM{thKN51vO6<2|V7^t;>_6ruW7iGa@ju~{sTtA(
z7msL1ll~-FMCI=GSDF6Rxpgw{EI?4MbZ7Ll*CXm(he*p2iIGy)h}<B8RU#Qzh;{pu
zu!ybezeq%y=d(&?26I8l7#p(SEjbdDB*T{<i3hHO-QviJCRm;75O(%!o*4^Oy}R_-
zm3&N7pdb{B<_vqk9|tz0<2VN4No*~9q2rf7?|vd<7@^0OqM7lC9FziyYQ_%@HmA7h
z>AS0vf#m6W{?2ede>^|o%xCvW-J|n>crwE5W2BRe<d77(5)jQIuLsn>9?%2vxJ`{u
z4g^r}L6RWZu5>#C2%wgboqs?D5)oumiYZX38zw9u>XzC5fHcioQjoFkzKbh^+7ib+
z$f=SMchzewpo4qBV}~v<su0^|0$$;_dI9><icb~4sW(^tSYf@F*KQM~36r+<)<qCO
z;6xO<Kfmd=WLqq3)`pmx97@tZj!E8Q-xOWu{%JOup%jn$rliS!-@g=a2nciE((4e}
z;RV|k&>TU)tjE=}9+wf@@vzVqAZ+z^UIl={y?~e~r<aV<ay$S`o=igYD})E4SHNnr
zlm^}38)g+sWJ6*9LM4dX-;p79nCRuNIDYW)&P<ZL<lW7|23nm_GGnFDtq`fzyE5!7
zEV%j)#o6c4O9#<+r{$!UrF4xL44|jKV+p4pbNqzlo>|uK+rWS=3{8qs--(k>H<e@r
z@Kg5<gKvD=QP{11S#pC~aBO`X#kV-rydZ#{{KcMyJ%@7w(;2O567){2nZGDF{t+i=
z9&`GXgvcoY@Rc4`7&ZkDElo5f@)jh9Dd<^JWC`yn#}zw^S#_MtuLU14+pD0~ZWVzy
z?)4D`YesPL?-?YQ6ifDTI^=q)$zNLBJd$9pQ02faH~q9euKkf0D4<gF>#N^2)jX-6
zJ{5J_YQk?YumF0N#Ec-`E<}<{N>}IM?5mqxv~~ba?TI-?rskQadhQ<Of<WtO_3(SR
zQve+zm=zA>Y%m8CiOaJRL>9!_k3gv%bTM+vV@(d#`CS4CuJ&IQh86i6tJUtAZ1rOf
z3y$d`=&*v0Z*(>Y3t3@3%iClYvXm&67IP8iB{fNW)o`Ajxxq{l1G<sxKcv@!F=iFz
z>!|ePD;;V%GF>Y~wB0@>wz?Wcl78(J<n;Vx_Sq&tsRiioGOJ)FGeDeXN=>Zbw9*VW
z3cnBUL-uqWX<DC2_C1px3MlXTo2kJ(sWP)zy@ivCo0z1x)w&s>YKx~5iOK<(c2st|
zeJ}|q*tE;uM&KYLBMfb8Sc^4>I5{59AF|7Hg-@<)x_rnICCnHX>7jR(ueJ(#L@k#d
zie+5Q=sBsxJj{MM(d#1GtkQp#T04}t<upmf`|>$9FWU0YGusE$u=}}KTG}2=+H7AE
z^wpImcNPH{IP^*$9wo$<kUY1c>d6$VF;Qp(8or)Xl5es4^ELu>)rvSys)KX#@1To8
z{RjhU`pThNmV)1IQ;|p~)*5g~zSaSy#RFsnZvU&S$^JTd6~sj^lb*%`<x{oBM^-UU
zy)<n>o9YD1EI+RP9fOt+jE_=FTqtS&6(1A<Kt^lMbm3Sku7Rmhw&m|cqx?F(idU<Q
z{z$--@CU$bswvo^d1>O{;&~JH2FR_Y(jh*GtpoN8s2^F%r#-CP`r(>hPsjUbx*Fj1
zpyb~}p%g$OXIAKw3kMQa?h7@Kiin_$l|}p7L9n@t`Tg=np=A-A0Ji}orbFBS*N9E<
zk|F9f6zkuXtIWCF^X`PUF`ksUiN9et1j<mWK_WNprtxyj(FsnZGuj9Kg-vb$!N+=K
z*gnw9I7X+2d7tkct%a;Ub~;g;MYGr1mz?|o6O74a0sLzQ|1@Uj7z3gt_tiNG79cst
z+*}qt(hR#+RXXST(XjeJXmjjdN8);5_r3+Aa!)2gvgyleC_r%VYEn4t8N9U3eOF!a
zvdmaR-^UeyC4^a6NDH$|_E@SN$uqJyh$(A*+OL7y%&cUJy=fcVwBzb>m50VTNkD?%
z;+pr}2s>iFQ-jQxHK7_z@frY6X2slicDP3z63rdJB!Sp*3&9t{QOKgZ${}AezSL@`
ze8~j3cv!Or5Zqky^&#oM%TT+=n>C~S;tDz4?T62=Ur*mf2`X26Av24<Ow<4f+5kDM
zHQuR^=#c(tk&jb&m{UrUdGPoP9BuN&$Zq99iih<Pk~fsdks^o|ADnquV?_*A%MMuT
zx1?43LH`Xf%~%Q%7(`%Xx+LKNeAhw%lI;JaaD#<ufH+*J&(|{YC$E;V=x%=60a5V!
zkNwx6AT^mVVMr)S+*(7jBnb2P#`^r0g!(6??R;U}P7$Pa;@)-apvuxJL$z*{Sg-S%
z-~!gd69<Ab%WhPR#nE`WF7SEye0=`}Iy@Reme+X^fqVD_D!>L`g_{9_G_g5Q3EQc8
zYZ7Ehaovrz7AXc7$v_ouTttvIcEV}+^d{bzXq3C@J{YP7k_WDnS#Kf}IkgzU7C0ux
z|E2(Y5jUu(BA+A{U&ICxR7@ceRSg`IEb?eICOLWM)4eOhY7ns76AN`Ct>>QSKJ<)8
zUe*_KZ|a(qY8tHDdB1bMwa{mR3)27qkSWe7VhYaoUgLTJ-w|3o@aP;8m?Y8#vqRjY
zK(7^VAg<^t0_5(|g?&c>lQAW!?=Lgq0ODv^MsNlZKqB^r$tSNAfw>`|spKB4jx0*I
z-}wjiEfUCh2USnoSkw|_rRnBriS$x$xM&U=G`(>7lcdb>x1P5@rGJ#TZ33YTPyjMe
z2e!>L@UK>0Cn*SLS00mg>{+fZaQ(?&9>N4b*WXQhUFZAWB>o2rPh_9h#yPEB{McR^
z&oBrM3B}I&o^t`?O+%OGy|C8W5vmzS78?aaKp2b@!~&qS*9DYoAO5&%`gGWez?jum
zOZRZ~iHtK3Ilf7woLnx9<2Czxj63rhNL9@dZG$%Du7FORzBhj!PBB+i*g%@z(8M3#
zT-Mc$c+!+87zGltd#o*ee!(5Dbf3)_QZse#M(tGL^TptWhx-uco_KmV%aW}tR_)KY
ztZNeARo35n=}j4vFUSj~@4?HR{n+eif_5OqGEYKA8d3FD;6f%358Z}{6s8kFm%#7^
z=km7t&fV^NvyW!+YcSQ*sYrTm{Jd0i=TZOQVLz6t!v9B7Z&Mq89E#{}8X0CbM^u|!
zLE3itw+tKk>*xo}{W0spiE3=Y0}~C?oG8SfU))D5=s7xVAxq~F7UQ}0ZPvdm6WS6$
zN4IXQOVv4i;0fHSP#F($9$&YzI={8OH6m;qQ;NZDA!D(g29jb;8A5}cGE=@x^u35h
zd4ehY1izd!foOWDc&}7Lqpr`ioNO-Q*l7PT^)jShq6ep<_~bC6<~2=M%T1V$#t{&s
z9-Zj9)D&?WoU3pyQ<_b}Y1oRlNXJ{!yD@H6HVOOzK!e%086z4=c>&V>qW6~fqhK5q
z0{zd<?#MK0v*Stkv#6|*gxvUqxURxfYTW4d^?TE|Io4QaXX~AxMt5K#*DTy_L|sdg
zf%ToDr!*P>%q2}$o+>dFA;s4)3}UX;3vOH^CFsQrG1X<cDab`r_~Dz9i*OLijIgz?
zj0+sI(=9ho(BJ||fx3he{RrXyzJu^?Yvae_onGdq0%w~Sh1*MF)3!5iQLsRSQa4gz
zC)EYAKmV?28eecD1@@Ch{&FMvUbgPTCnE2<dCo`#tuKJ@O9Sh86igegYYyM#2MPip
zff;k+SqcwlLSibUHPS+&jw5dMVBRAR(dm%KDv!8vr$rx#$CvIm<(nfSz7l?mr{#E}
zzlfCW0)LJr4s7Yqr_zkHKp6?v7*!D0bc(UL+$YYEyFDV=$12$P>ZW)o?s6B-7~FBB
z?@TcPVGQV}L1X`wXnv<t1NV@CZ&TfIbHe?HV4IwI-kYqk4^SMLG(_Y(H)R}*d1=Vv
z!#p?c&?(Mae0FYqjilecH>rsR2|YQ#29>`yT23w6LTQCmoD9<iLHi!xvOCs2kt47m
z8Ah>o1kc86oHMrd;?q+to^tidBCpU}8|0;0Fw|!L>}(L%WAh**o6qxxYjx7yvoN`G
zG%{B{n~kA(Ls(z=Cq2owGRIdF26@XWVoq_o7P@gyDlpOuHAC7?vaQt;>>j+gawS!Y
zKB@inWb#s(95Wq>;`v`=&Rn{oV~_)|QWu|zpqh~N!o&Ac*?~#mG&+_gFTlPCn_ASa
z_1%Nm1NR;rdri7zwAmitJyxr5AQ(<JMndANISzJuiJ3Vhc>(m-m^zsfJ^<gSp>G3Z
z2t&>Xm_!#U4zkQI1Vf3HN@wE>RgNap^h}c)Ypx~RV+S@kMOI*q_2j)~e30GNOi2@E
z76_|&5jJHBa8uIboM_n3clYpV;R6L&OiL-@%d9*mCF&S&g;enb9W3XyZd{9co7R`=
zJ18j{0ss=Vm?WdD%~7k&)>=1x1D6X+i(;yRr|;*AvRd+?fwi+DTSyMGc^n-^NLW52
zcQ8j7;yCpZV+Mq3ex=7qmVA7QglIkfB&UH=1j8WjdM;UbS>y6ab!z2SnI5hi?TrX!
zdDp}Dg!dLZ9F=Vddm25mdPrE^0lO0kL68@`OaL`519$THOes*P3n8~1j{+QfBEs+6
z2kiv{-M44Vc&$NgULWe)Br!vYI8Y&3Q_2{><`L#1MKDuXxRzgA;EvMLLMNK*NO4-N
zq;Ri6h#KC;9JIF9@gFYlXAYi=v!p5LLjpqKX~G2oJiVUcN;qNEl5Y=U!$MO29l&!)
zoVcpL+w_yp@6B#}pKdUwgwfKkuMe}e`ALcM!G!5VfcRgS7A5+dZ9YMXS1IVg%~kTr
zeL^JAn|unAe?o`?N;G5jyR{BdV+lca;fS{&Si2~+IdJ`<_uI}iLxJ70^QbIe(qI>C
ze9xG&Tml9!LES_CA`HL=wMd2&(#XTil7gNPyT2lrq(0XWL1O33WzcADlD(08W^4b`
z9H>1hBlWjMNdX)%4Fd^oh8}m;aXnd~EA*|7anK8<!vMVoziqc8%bks@^80#{e6ldZ
z^unXMdLZ$;MPFc>-UEI#|Fd`f7Az!i5g|Fpx#f-a3y5TaHkgzsPUmAkg>wy~!`Xjy
zI}fbenZBKLjlB?P6T3=~fCTVxPRI^LYXvPIWAk}PEFj&vq}>;pY%kv9a|J~mRWg)s
zQRT>e1}Z>+8qH<fkWPPX7a)by%XqWMl0_*E$gt5RjK7zbg!Y9)#o~7=Q@YOQnI2W%
z08K00hMs6VJ1Ith1Upx0q(=uJ&>=_q9~Ov<!K8md)sF?-2O4{htc~n(K6KayoxBzY
zWPF!qxQN979SXe|rR$m2V%G8g-2WzX=>KKOR{<xFQP);tI*cg-S#R+CK}&OtC3n{M
zydmPVV^#<Yf58EHyY9Io%RjdSyeP_As;59fnR*$NG~N><FPODZM4Ax^{QAb2P0GB1
zy6vY)&f?HTy;~3#9}6#S5Es>=rsZ<$_k*nv4>Y8hV)>|NIwN%ow{LO0=u&j5&31dP
rv;zy<5Sy-CBKKmSTBFH2#yFq0g-Vo1myaqBzk_GGrqbGyZ~K1%el>7h

literal 0
HcmV?d00001

diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
index 934403d9..39c3f4c2 100644
--- a/templates/8chan/boards-search.html
+++ b/templates/8chan/boards-search.html
@@ -39,6 +39,16 @@
 					
 					<div class="search-item search-submit">
 						<button id="search-submit">Search</button>
+						<span id="search-loading" class="loading-small board-list-loading" style="display: none;"></span>
+						<script type="text/javascript">
+							/* Cheeky hack.
+							   DOM Mutation is now depreceated, but board-directory.js fires before this button is added.
+							   Since .ready() only fires after the entire page loads, we have this here to disable it as soon
+							   as we pass it in the DOM structure.
+							   We don't just disable="disable" it because then it would be broken for all non-JS browsers. */
+							   document.getElementById( 'search-submit' ).disabled = "disabled";
+							   document.getElementById( 'search-loading' ).style.display = "inline-block";
+						</script>
 					</div>
 				</div>
 				
@@ -65,14 +75,22 @@
 						<th class="board-uri" data-column="uri">{% trans %}Board{% endtrans %}</th>
 						<th class="board-title" data-column="title">{% trans %}Title{% endtrans %}</th>
 						<th class="board-pph" data-column="pph" title="Posts per hour">{% trans %}PPH{% endtrans %}</th>
-						<th class="board-max" data-column="max">{% trans %}Total posts{% endtrans %}</th>
-						<th class="board-unique" data-column="unique" title="Unique IPs to post in the last 72 hours">{% trans %}Active users{% endtrans %}</th>
+						<th class="board-max" data-column="posts_total">{% trans %}Total posts{% endtrans %}</th>
+						<th class="board-unique" data-column="active" title="Unique IPs to post in the last 72 hours">{% trans %}Active users{% endtrans %}</th>
 						<th class="board-tags" data-column="tags">{% trans %}Tags{% endtrans %}</th>
 					</tr>
 				</thead>
 				
 				<tbody class="board-list-tbody">{{html_boards}}</tbody>
 				
+				{% if boards_omitted > 0 %}
+				<tbody class="board-list-omitted" data-omitted="{{boards_omitted}}">
+					<tr>
+						<td colspan="7">{{boards_omitted}} board{% if boards_omitted != 1 %}s were{% else %} was{% endif %} omitted.</td>
+					</tr>
+				</tbody>
+				{% endif %}
+				
 				<tfoot class="board-list-loading">
 					<tr>
 						<td colspan="7" class="loading"></td>
diff --git a/templates/8chan/boards-table.html b/templates/8chan/boards-table.html
index f3451ae1..40f823bb 100644
--- a/templates/8chan/boards-table.html
+++ b/templates/8chan/boards-table.html
@@ -1,7 +1,10 @@
 {% for board in boards %}
 <tr>
-	<td class="board-meta">{{ board.img|raw }} {% if board['sfw'] %}<img src="/static/sfw.png" title="Safe for work">{% else %}<img src="/static/nsfw.png" title="Not safe for work">{% endif %}</td>
-	<td class="board-uri"><div class="board-list-wrapper uri"><a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>{{lock|raw}}</div></td>
+	<td class="board-meta">{{ board.locale }}</td>
+	<td class="board-uri"><div class="board-cell">
+		<a href='/{{board['uri']}}/'>/{{board['uri']}}/</a>
+		{% if board['sfw'] %}<i class="fa fa-briefcase board-sfw" title="SFW"></i>{% endif %}
+	</div></td>
 	<td class="board-title"><div class="board-cell" title="Created {{board['time']}} ({{board['ago']}} ago)">{{ board['title'] }}</div></td>
 	<td class="board-pph"><div class="board-cell">{{board['pph']}}</td>
 	<td class="board-max"><div class="board-cell">{{board['posts_total']}}</td>

From 67bab31510af9135fdd0a6fff8777fd9f82076f1 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Thu, 16 Apr 2015 00:35:36 +1000
Subject: [PATCH 56/70] - Reworked tag weight.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                 | 77 +++++++++++++++++++++++---------
 boards.php                       |  4 +-
 stylesheets/style.css            | 39 +++++++++++++---
 templates/8chan/boards-tags.html |  2 +-
 4 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/board-search.php b/board-search.php
index 8aaa7245..f6d08766 100644
--- a/board-search.php
+++ b/board-search.php
@@ -119,7 +119,6 @@ unset( $boardTags );
 
 /* Activity Fetching */
 $boardActivity = fetchBoardActivity( array_keys( $response['boards'] ), $search['time'], true );
-$response['tags'] = array();
 
 // Loop through each board and record activity to it.
 // We will also be weighing and building a tag list.
@@ -141,21 +140,8 @@ foreach ($response['boards'] as $boardUri => &$board) {
 		
 		unset( $precision );
 	}
-	
-	if (isset($board['tags']) && count($board['tags']) > 0) {
-		foreach ($board['tags'] as $tag) {
-			if (isset($response['tags'][$tag])) {
-				$response['tags'][$tag] += $board['active'];
-			}
-			else {
-				$response['tags'][$tag] = $board['active'];
-			}
-		}
-	}
 }
 
-unset( $boardActivity );
-
 // Sort boards by their popularity, then by their total posts.
 $boardActivityValues   = array();
 $boardTotalPostsValues = array();
@@ -177,16 +163,63 @@ $response['omitted'] = $search['index'] ? 0 : count( $response['boards'] ) - $bo
 $response['boards']  = array_splice( $response['boards'], 0, $boardLimit );
 $response['order']   = array_keys( $response['boards'] );
 
-// Get the top most popular tags.
-if (count($response['tags']) > 0) {
-	// Sort by most active tags.
-	arsort( $response['tags'] );
-	// Get the first n most active tags.
-	$response['tags'] = array_splice( $response['tags'], 0, 100 );
-	
-	// $tagLightest = end( array_keys( $response['tag'] ) );
+
+// Loop through the truncated array to compile tags.
+$response['tags'] = array();
+$tagUsage = array( 'boards' => array(), 'users' => array() );
+
+foreach ($response['boards'] as $boardUri => &$board) {
+	if (isset($board['tags']) && count($board['tags']) > 0) {
+		foreach ($board['tags'] as $tag) {
+			if (!isset($tagUsage['boards'][$tag])) {
+				$tagUsage['boards'][$tag] = 0;
+			}
+			if (!isset($tagUsage['users'][$tag])) {
+				$tagUsage['users'][$tag] = 0;
+			}
+			
+			$response['tags'][$tag] = true;
+			++$tagUsage['boards'][$tag];
+			$tagUsage['users'][$tag] += $board['active'];
+		}
+	}
 }
 
+// Get the top most popular tags.
+if (count($response['tags']) > 0) {
+	arsort( $tagUsage['boards'] );
+	arsort( $tagUsage['users'] );
+	
+	array_multisort(
+		$tagUsage['boards'], SORT_DESC, SORT_NUMERIC,
+		$tagUsage['users'], SORT_DESC, SORT_NUMERIC,
+		$response['tags']
+	);
+	
+	// Get the first n most active tags.
+	$response['tags'] = array_splice( $response['tags'], 0, 100 );
+	$response['tagOrder'] = array_keys( $response['tags'] );
+	$response['tagWeight'] = array();
+	
+	$tagsMostUsers  = max( $tagUsage['users'] );
+	$tagsLeastUsers = min( $tagUsage['users'] );
+	$tagsAvgUsers   = array_sum( $tagUsage['users'] ) / count( $tagUsage['users'] );
+	
+	$weightDepartureFurthest = 0;
+	
+	foreach ($tagUsage['users'] as $tagUsers) {
+		$weightDeparture = abs( $tagUsers - $tagsAvgUsers );
+		
+		if( $weightDeparture > $weightDepartureFurthest ) {
+			$weightDepartureFurthest = $weightDeparture;
+		}
+	}
+	
+	foreach ($tagUsage['users'] as $tagName => $tagUsers) {
+		$weightDeparture = abs( $tagUsers - $tagsAvgUsers );
+		$response['tagWeight'][$tagName] = 75 + round( 100 * ( $weightDeparture / $weightDepartureFurthest ), 0);
+	}
+}
 
 /* Include our interpreted search terms. */
 $response['search'] = $search;
diff --git a/boards.php b/boards.php
index 4234aefd..923971b6 100644
--- a/boards.php
+++ b/boards.php
@@ -19,8 +19,8 @@ if (count($searchJson)) {
 	if (isset($searchJson['boards'])) {
 		$boards = $searchJson['boards'];
 	}
-	if (isset($searchJson['tags'])) {
-		$tags   = $searchJson['tags'];
+	if (isset($searchJson['tagWeight'])) {
+		$tags   = $searchJson['tagWeight'];
 	}
 }
 
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 17dae01e..04cba240 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1043,6 +1043,15 @@ span.pln {
 	min-height: 76px;
 	min-width:  128px;
 }
+.loading-small {
+	background: none;
+	background-color: none;
+	background-image: url('/static/infinity-small.gif');
+	background-position: center center;
+	background-repeat: no-repeat;
+	min-height: 24px;
+	min-width:  48px;
+}
 
 
 /* Responsive helpers */
@@ -1378,6 +1387,18 @@ table.board-list-table .board-tags {
 	padding: 0 15px 0 4px;
 }
 
+table.board-list-table .board-uri .board-nsfw {
+	color: rgb(230,0,0);
+	margin: 0 0 0 0.6em;
+	float: right;
+}
+table.board-list-table .board-uri .board-sfw {
+	/* I'm using blue instead of green to help users with Deuteranopia (most common form of colorblndness). */
+	color: rgb(0,0,230);
+	margin: 0 0 0 0.6em;
+	float: right;
+}
+
 table.board-list-table div.board-cell {
 	max-width: 100%;
 	overflow: hidden;
@@ -1397,9 +1418,7 @@ aside.search-container .box {
 }
 
 .board-search {
-	padding: 0 0 8px 0;
-	margin: 8px;
-	border-bottom: 1px solid #000333;
+	margin: 8px 0;
 }
 .search-item {
 	margin: 8px 0;
@@ -1427,12 +1446,17 @@ aside.search-container .box {
 	min-width: 100%;
 	width: 100%:
 }
+#search-loading {
+	display: inline-block;
+	vertical-align: bottom;
+}
 
 ul.tag-list {
 	display: block;
 	list-style: none;
-	padding: 0;
-	margin: 0 8px;
+	margin: 8px 8px -9px 8px;
+	padding: 8px 0 0 0;
+	border-top: 1px solid #000333;
 }
 ul.tag-list::after {
 	content: ' ';
@@ -1445,7 +1469,10 @@ li.tag-item {
 	font-size: 100%;
 	list-style: none;
 	margin: 0;
-	padding: 0 0.6em 0 0;
+	padding: 0 4px 0 0;
+}
+li.tag-item:last-child {
+	padding-bottom: 17px;
 }
 a.tag-link {
 	overflow: hidden;
diff --git a/templates/8chan/boards-tags.html b/templates/8chan/boards-tags.html
index f569c339..5a6f4868 100644
--- a/templates/8chan/boards-tags.html
+++ b/templates/8chan/boards-tags.html
@@ -1,5 +1,5 @@
 {% for tag, weight in tags %}
 <li class="tag-item">
-	<a class="tag-link" href="#">{{tag}}</a> 
+	<a class="tag-link" href="#" style="font-size: {{weight}}%;">{{tag}}</a> 
 </li>
 {% endfor %}
\ No newline at end of file

From ec90c96459792bb41aaecb8ce7a1aeaa91612d0d Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Thu, 16 Apr 2015 05:46:48 +1000
Subject: [PATCH 57/70] - board-search.php Now properly calculates tag weight.
 - boards.php Passes $search parameters into Twig. - js/board-reictory.js
 Stores last search parameters and handles tag click events. - Twig now passes
 old search parameters into the search form. - Tags now link in such a way
 that they will preserve form data and other tags when clicked in a browser
 without JavaScript.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                   | 56 ++++++++++++++++--
 boards.php                         | 23 ++++++--
 js/board-directory.js              | 93 ++++++++++++++++++++----------
 templates/8chan/boards-search.html |  8 +--
 templates/8chan/boards-table.html  |  2 +-
 templates/8chan/boards-tags.html   |  2 +-
 6 files changed, 139 insertions(+), 45 deletions(-)

diff --git a/board-search.php b/board-search.php
index f6d08766..7e088c05 100644
--- a/board-search.php
+++ b/board-search.php
@@ -25,6 +25,7 @@ $languages = array(
 $search = array(
 	'lang'  => false,
 	'nsfw'  => true,
+	'page'  => 0,
 	'tags'  => false,
 	'time'  => ( (int)( time() / 3600 ) * 3600 ) - 3600,
 	'title' => false,
@@ -37,6 +38,15 @@ if (isset( $_GET['sfw'] ) && $_GET['sfw'] != "") {
 	$search['nsfw'] = !$_GET['sfw'];
 }
 
+// Bringing up more results
+if (isset( $_GET['page'] ) && $_GET['page'] != "") {
+	$search['page'] = (int) $_GET['page'];
+	
+	if ($search['page'] < 0) {
+		$search['page'] = 0;
+	}
+}
+
 // Include what language (if the language is not blank and we recognize it)?
 if (isset( $_GET['lang'] ) && $_GET['lang'] != "" && isset($languages[$search['lang']])) {
 	$search['lang'] = $_GET['lang'];
@@ -44,7 +54,8 @@ if (isset( $_GET['lang'] ) && $_GET['lang'] != "" && isset($languages[$search['l
 
 // Include what tag?
 if (isset( $_GET['tags'] ) && $_GET['tags'] != "") {
-	$search['tags'] = $_GET['tags'];
+	$search['tags'] = explode( " ", $_GET['tags'] );
+	$search['tags'] = array_splice( $search['tags'], 0, 5 );
 }
 
 // What time range?
@@ -73,6 +84,31 @@ foreach ($boards as $board) {
 		continue;
 	}
 	
+	// Are we searching by title?
+	if ($search['title'] !== false) {
+		// This checks each component of the board's identity against our search terms.
+		// The weight determines order.
+		// "left" would match /leftypol/ and /nkvd/ which has /leftypol/ in the title.
+		// /leftypol/ would always appear above it but it would match both.
+		if (strpos("/{$board['uri']}/", $search['title']) !== false) {
+			$board['weight'] = 30;
+		}
+		else if (strpos($board['title'], $search['title']) !== false) {
+			$board['weight'] = 20;
+		}
+		else if (strpos($board['subtitle'], $search['title']) !== false) {
+			$board['weight'] = 10;
+		}
+		else {
+			continue;
+		}
+		
+		unset( $boardTitleString );
+	}
+	else {
+		$board['weight'] = 0;
+	}
+	
 	// Load board config.
 	$boardConfig = loadBoardConfig( $board['uri'] );
 	
@@ -101,7 +137,7 @@ $boardTags = fetchBoardTags( array_keys( $response['boards'] ) );
 // Loop through each board and determine if there are tag matches.
 foreach ($response['boards'] as $boardUri => &$board) {
 	// If we are filtering by tag and there is no match, remove from the response.
-	if ( $search['tags'] !== false && ( !isset( $boardTags[ $boardUri ] ) || !in_array( $search['tags'], $boardTags[ $boardUri ] )) ) {
+	if ( $search['tags'] !== false && ( !isset( $boardTags[ $boardUri ] ) || count(array_intersect($search['tags'], $boardTags[ $boardUri ])) !== count($search['tags']) ) ) {
 		unset( $response['boards'][$boardUri] );
 	}
 	// If we aren't filtering / there is a match AND we have tags, set the tags.
@@ -145,13 +181,16 @@ foreach ($response['boards'] as $boardUri => &$board) {
 // Sort boards by their popularity, then by their total posts.
 $boardActivityValues   = array();
 $boardTotalPostsValues = array();
+$boardWeightValues     = array();
 
 foreach ($response['boards'] as $boardUri => &$board) {
 	$boardActivityValues[$boardUri]   = (int) $board['active'];
 	$boardTotalPostsValues[$boardUri] = (int) $board['posts_total']; 
+	$boardWeightValues[$boardUri]     = (int) $board['weight']; 
 }
 
 array_multisort(
+	$boardWeightValues, SORT_DESC, SORT_NUMERIC, // Sort by weight
 	$boardActivityValues, SORT_DESC, SORT_NUMERIC, // Sort by number of active posters
 	$boardTotalPostsValues, SORT_DESC, SORT_NUMERIC, // Then, sort by total number of posts
 	$response['boards']
@@ -159,8 +198,8 @@ array_multisort(
 
 $boardLimit = $search['index'] ? 50 : 100;
 
-$response['omitted'] = $search['index'] ? 0 : count( $response['boards'] ) - $boardLimit;
-$response['boards']  = array_splice( $response['boards'], 0, $boardLimit );
+$response['omitted'] = count( $response['boards'] ) - $boardLimit;
+$response['boards']  = array_splice( $response['boards'], $search['page'], $boardLimit );
 $response['order']   = array_keys( $response['boards'] );
 
 
@@ -216,8 +255,13 @@ if (count($response['tags']) > 0) {
 	}
 	
 	foreach ($tagUsage['users'] as $tagName => $tagUsers) {
-		$weightDeparture = abs( $tagUsers - $tagsAvgUsers );
-		$response['tagWeight'][$tagName] = 75 + round( 100 * ( $weightDeparture / $weightDepartureFurthest ), 0);
+		if ($weightDepartureFurthest != 0) {
+			$weightDeparture = abs( $tagUsers - $tagsAvgUsers );
+			$response['tagWeight'][$tagName] = 75 + round( 100 * ( $weightDeparture / $weightDepartureFurthest ), 0);
+		}
+		else {
+			$response['tagWeight'][$tagName] = 0;
+		}
 	}
 }
 
diff --git a/boards.php b/boards.php
index 923971b6..5dd5fa97 100644
--- a/boards.php
+++ b/boards.php
@@ -36,6 +36,16 @@ $boards_omitted = (int) $searchJson['omitted'];
 $posts_hour     = number_format( fetchBoardActivity(), 0 );
 $posts_total    = number_format( $boardResult['posts_total'], 0 );
 
+// This incredibly stupid looking chunk of code builds a query string using existing information.
+// It's used to make clickable tags for users without JavaScript for graceful degredation.
+// Because of how it orders tags, what you end up with is a prefix that always ends in tags=x+
+// ?tags= or ?sfw=1&tags= or ?title=foo&tags=bar+ - etc
+$tagQueryGet = $_GET;
+$tagQueryTags = isset($tagQueryGet['tags']) ? $tagQueryGet['tags'] : "";
+unset($tagQueryGet['tags']);
+$tagQueryGet['tags'] = $tagQueryTags;
+$tag_query      = "?" . http_build_query( $tagQueryGet ) . ($tagQueryTags != "" ? "+" : "");
+
 /* Create and distribute page */
 $config['additional_javascript'] = array(
 	'js/jquery.min.js',
@@ -43,19 +53,24 @@ $config['additional_javascript'] = array(
 );
 
 $boardsHTML = Element("8chan/boards-table.html", array(
-		"config"        => $config,
-		"boards"        => $boards,
+		"config"         => $config,
+		"boards"         => $boards,
+		"tag_query"      => $tag_query,
+		
 	)
 );
 
 $tagsHTML = Element("8chan/boards-tags.html", array(
-		"config"        => $config,
-		"tags"          => $tags,
+		"config"         => $config,
+		"tags"           => $tags,
+		"tag_query"      => $tag_query,
+		
 	)
 );
 
 $searchHTML = Element("8chan/boards-search.html", array(
 		"config"         => $config,
+		"search"         => $searchJson['search'],
 		
 		"boards_total"   => $boards_total,
 		"boards_public"  => $boards_public,
diff --git a/js/board-directory.js b/js/board-directory.js
index 6fe7edee..f22b686b 100644
--- a/js/board-directory.js
+++ b/js/board-directory.js
@@ -22,6 +22,8 @@
 				'search-tag'    : "#search-tag-input",
 				'search-title'  : "#search-title-input",
 				'search-submit' : "#search-submit",
+				
+				'tag-link'      : ".tag-link"
 			},
 			
 			// HTML Templates for dynamic construction
@@ -50,6 +52,8 @@
 			}
 		},
 		
+		lastSearch : {},
+		
 		bind : {
 			form : function() {
 				var selectors = boardlist.options.selector;
@@ -71,11 +75,17 @@
 						'searchSubmit' : $searchSubmit
 					};
 				
-				
 				if ($search.length > 0) {
 					// Bind form events.
-					$search.on( 'submit', searchForms, boardlist.events.searchSubmit );
-					$searchSubmit.prop( 'disabled', false ).on( 'click', searchForms, boardlist.events.searchSubmit );
+					boardlist.$boardlist
+						// Tag click
+						.on( 'click', selectors['tag-link'], searchForms, boardlist.events.tagClick )
+						// Form Submission
+						.on( 'submit', selectors['search'], searchForms, boardlist.events.searchSubmit )
+						// Submit click
+						.on( 'click', selectors['search-submit'], searchForms, boardlist.events.searchSubmit );
+						
+					$searchSubmit.prop( 'disabled', false );
 				}
 			}
 		},
@@ -83,6 +93,7 @@
 		build  : {
 			boardlist : function(data) {
 				boardlist.build.boards(data['boards'], data['order']);
+				boardlist.build.lastSearch(data['search']);
 				boardlist.build.tags(data['tags']);
 				
 			},
@@ -101,12 +112,10 @@
 						boardlist.build.board( row, col ).appendTo( $row );
 					} );
 					
-					if( index >= 100 ) return false;
-					
 					$row.appendTo( $body );
 				} );
 			},
-			board : function( row, col ) {
+			board : function(row, col) {
 				var $col   = $(col),
 				    column = $col.attr('data-column'),
 				    value  = row[column]
@@ -150,10 +159,10 @@
 				return $cell;
 			},
 			boardcell : {
-				'meta' : function( row, value ) {
+				'meta' : function(row, value) {
 					return $( boardlist.options.template['board-datum-lang'] ).text( row['locale'] );
 				},
-				'uri'  : function( row, value ) {
+				'uri'  : function(row, value) {
 					var $link = $( boardlist.options.template['board-datum-uri'] ),
 						$sfw  = $( boardlist.options.template['board-datum-' + (row['sfw'] == 1 ? "sfw" : "nsfw")] );
 					
@@ -172,8 +181,18 @@
 				}
 			},
 			
+			lastSearch : function(search) {
+				return boardlist.lastSearch =  { 
+					'lang'  : search.lang === false ? "" : search.lang,
+					'page'  : search.page,
+					'tags'  : search.tags === false ? "" : search.tags.join(" "),
+					'time'  : search.time,
+					'title' : search.title === false ? "" : search.title,
+					'sfw'   : search.nsfw ? 0 : 1
+				};
+			},
+			
 			tags : function(data) {
-				
 			}
 		},
 		
@@ -181,32 +200,49 @@
 			searchSubmit : function(event) {
 				event.preventDefault();
 				
-				var $boardlist = event.data.boardlist,
-				    $boardbody = $( boardlist.options.selector['board-body'], $boardlist ),
-				    $boardload = $( boardlist.options.selector['board-loading'], $boardlist );
+				boardlist.submit( { 
+					'lang'  : event.data.searchLang.val(),
+					'tags'  : event.data.searchTag.val(),
+					'title' : event.data.searchTitle.val(),
+					'sfw'   : event.data.searchSfw.prop('checked') ? 1 : 0
+				} );
 				
-				$boardbody.html("");
-				$boardload.show();
+				return false;
+			},
+			
+			tagClick : function(event) {
+				event.preventDefault();
 				
-				$.get(
-					"/board-search.php",
-					{
-						'lang'  : event.data.searchLang.val(),
-						'tags'  : event.data.searchTag.val(),
-						//'time'  : event.data.searchTag.val(),
-						'title' : event.data.searchTitle.val(),
-						'sfw'   : event.data.searchSfw.prop('checked') ? 1 : 0
-					},
-					function(data) {
-						$boardload.hide();
-						boardlist.build.boardlist( $.parseJSON(data) );
-					}
-				);
+				var $this  = $(this),
+					$input = $( boardlist.options.selector['search-tag'] );
+				
+				$input
+					.val( ( $input.val() + " " + $this.text() ).replace(/\s+/g, " ").trim() )
+					.trigger( 'change' )
+					.focus();
 				
 				return false;
 			}
 		},
 		
+		submit : function( parameters ) {
+			var $boardlist = boardlist.$boardlist,
+				$boardbody = $( boardlist.options.selector['board-body'], $boardlist ),
+				$boardload = $( boardlist.options.selector['board-loading'], $boardlist );
+			
+			$boardbody.html("");
+			$boardload.show();
+			
+			$.get(
+				"/board-search.php",
+				parameters,
+				function(data) {
+					$boardload.hide();
+					boardlist.build.boardlist( $.parseJSON(data) );
+				}
+			);
+		},
+		
 		init : function( target ) {
 			if (typeof target !== "string") {
 				target = boardlist.options.selector.boardlist;
@@ -217,7 +253,6 @@
 			if ($boardlist.length > 0 ) {
 				$( boardlist.options.selector['board-loading'], $boardlist ).hide();
 				
-				
 				boardlist.$boardlist = $boardlist;
 				boardlist.bind.form();
 			}
diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
index 39c3f4c2..b4d17d65 100644
--- a/templates/8chan/boards-search.html
+++ b/templates/8chan/boards-search.html
@@ -8,16 +8,16 @@
 	
 	<div class="board-list">
 		<aside class="search-container col col-2">
-			<form id="search-form" class="box" method="get" target="/board-search.php">
+			<form id="search-form" class="box" method="get" action="/boards.php">
 				<h2 class="box-title">Search</h2>
 				
 				<div class="board-search box-content">
 					<label class="search-item search-sfw">
-						<input type="checkbox" id="search-sfw-input" name="sfw" value="1" />&nbsp;Hide NSFW boards
+						<input type="checkbox" id="search-sfw-input" name="sfw" value="1" {% if not search.nsfw %}checked="checked"{% endif %} />&nbsp;Hide NSFW boards
 					</label>
 					
 					<div class="search-item search-title">
-						<input type="text" id="search-title-input" name="title" name="title" value="" placeholder="Search titles..." />
+						<input type="text" id="search-title-input" name="title" name="title" value="{{search.title}}" placeholder="Search titles..." />
 					</div>
 					
 					<div class="search-item search-lang">
@@ -34,7 +34,7 @@
 					</div>
 					
 					<div class="search-item search-tag">
-						<input type="text" id="search-tag-input" name="tags" value="" placeholder="Search tags..." />
+						<input type="text" id="search-tag-input" name="tags" value="{{ search.tags|join(' ') }}" placeholder="Search tags..." />
 					</div>
 					
 					<div class="search-item search-submit">
diff --git a/templates/8chan/boards-table.html b/templates/8chan/boards-table.html
index 40f823bb..82e48436 100644
--- a/templates/8chan/boards-table.html
+++ b/templates/8chan/boards-table.html
@@ -9,6 +9,6 @@
 	<td class="board-pph"><div class="board-cell">{{board['pph']}}</td>
 	<td class="board-max"><div class="board-cell">{{board['posts_total']}}</td>
 	<td class="board-unique"><div class="board-cell">{{board['active']}}</td>
-	<td class="board-tags"><div class="board-cell">{% for tag in board.tags %}<a class="tag-link" href="#">{{ tag }}</a>{% endfor %}</div></td>
+	<td class="board-tags"><div class="board-cell">{% for tag in board.tags %}<a class="tag-link" href="{{ tag_query }}{{ tag }}">{{ tag }}</a>{% endfor %}</div></td>
 </tr>
 {% endfor %}
\ No newline at end of file
diff --git a/templates/8chan/boards-tags.html b/templates/8chan/boards-tags.html
index 5a6f4868..e3453516 100644
--- a/templates/8chan/boards-tags.html
+++ b/templates/8chan/boards-tags.html
@@ -1,5 +1,5 @@
 {% for tag, weight in tags %}
 <li class="tag-item">
-	<a class="tag-link" href="#" style="font-size: {{weight}}%;">{{tag}}</a> 
+	<a class="tag-link" href="{{ tag_query }}{{ tag }}" style="font-size: {{weight}}%;">{{tag}}</a> 
 </li>
 {% endfor %}
\ No newline at end of file

From 497e554f49b71960f38934b5aed862cd51cbe82a Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Thu, 16 Apr 2015 07:02:17 +1000
Subject: [PATCH 58/70] "Load more" button and functionality.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                   |  1 +
 boards.php                         |  2 ++
 js/board-directory.js              | 58 ++++++++++++++++++++++++++----
 stylesheets/style.css              | 17 +++++++--
 templates/8chan/boards-search.html | 27 ++++++++------
 5 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/board-search.php b/board-search.php
index 7e088c05..931a0d53 100644
--- a/board-search.php
+++ b/board-search.php
@@ -199,6 +199,7 @@ array_multisort(
 $boardLimit = $search['index'] ? 50 : 100;
 
 $response['omitted'] = count( $response['boards'] ) - $boardLimit;
+$response['omitted'] = $response['omitted'] < 0 ? 0 : $response['omitted'];
 $response['boards']  = array_splice( $response['boards'], $search['page'], $boardLimit );
 $response['order']   = array_keys( $response['boards'] );
 
diff --git a/boards.php b/boards.php
index 5dd5fa97..39876d68 100644
--- a/boards.php
+++ b/boards.php
@@ -70,6 +70,8 @@ $tagsHTML = Element("8chan/boards-tags.html", array(
 
 $searchHTML = Element("8chan/boards-search.html", array(
 		"config"         => $config,
+		"boards"         => $boards,
+		"tags"           => $tags,
 		"search"         => $searchJson['search'],
 		
 		"boards_total"   => $boards_total,
diff --git a/js/board-directory.js b/js/board-directory.js
index f22b686b..1b3ad830 100644
--- a/js/board-directory.js
+++ b/js/board-directory.js
@@ -15,6 +15,7 @@
 				'board-head'    : ".board-list-head",
 				'board-body'    : ".board-list-tbody",
 				'board-loading' : ".board-list-loading",
+				'board-omitted' : ".board-list-omitted",
 				
 				'search'        : "#search-form",
 				'search-lang'   : "#search-lang-input",
@@ -23,7 +24,12 @@
 				'search-title'  : "#search-title-input",
 				'search-submit' : "#search-submit",
 				
-				'tag-link'      : ".tag-link"
+				'tag-link'      : ".tag-link",
+				
+				'footer-page'   : ".board-page-num",
+				'footer-count'  : ".board-page-count",
+				'footer-total'  : ".board-page-total",
+				'footer-more'   : ".board-page-loadmore"
 			},
 			
 			// HTML Templates for dynamic construction
@@ -78,6 +84,8 @@
 				if ($search.length > 0) {
 					// Bind form events.
 					boardlist.$boardlist
+						// Load more
+						.on( 'click', selectors['board-omitted'], searchForms, boardlist.events.loadMore )
 						// Tag click
 						.on( 'click', selectors['tag-link'], searchForms, boardlist.events.tagClick )
 						// Form Submission
@@ -94,18 +102,19 @@
 			boardlist : function(data) {
 				boardlist.build.boards(data['boards'], data['order']);
 				boardlist.build.lastSearch(data['search']);
+				boardlist.build.footer(data);
 				boardlist.build.tags(data['tags']);
 				
 			},
 			
-			boards : function(data, order) {
+			boards : function(boards, order) {
 				// Find our head, columns, and body.
 				var $head = $( boardlist.options.selector['board-head'], boardlist.$boardlist ),
 				    $cols = $("[data-column]", $head ),
 				    $body = $( boardlist.options.selector['board-body'], boardlist.$boardlist );
 				
 				$.each( order, function( index, uri ) {
-					var row  = data[uri];
+					var row  = boards[uri];
 					    $row = $( boardlist.options.template['board-row'] );
 					
 					$cols.each( function( index, col ) {
@@ -114,6 +123,7 @@
 					
 					$row.appendTo( $body );
 				} );
+				
 			},
 			board : function(row, col) {
 				var $col   = $(col),
@@ -192,14 +202,46 @@
 				};
 			},
 			
+			footer : function(data) {
+				var selector = boardlist.options.selector,
+				    $page    = $( selector['footer-page'], boardlist.$boardlist ),
+				    $count   = $( selector['footer-count'], boardlist.$boardlist ),
+				    $total   = $( selector['footer-total'], boardlist.$boardlist ),
+				    $more    = $( selector['footer-more'], boardlist.$boardlist );
+				
+				var boards   = Object.keys(data['boards']).length,
+				    omitted  = data['omitted'] - data['search']['page'];
+				
+				if (omitted < 0) {
+					omitted = 0;
+				}
+				
+				var total    = boards + omitted + data['search']['page'];
+				
+				//$page.text( data['search']['page'] );
+				$count.text( data['search']['page'] + boards );
+				$total.text( total );
+				$more.toggle( omitted != 0 );
+			},
+			
 			tags : function(data) {
 			}
 		},
 		
 		events : {
+			loadMore : function(event) {
+				var parameters = $.extend( {}, boardlist.lastSearch );
+				
+				parameters.page = $( boardlist.options.selector['board-body'], boardlist.$boardlist ).children().length;
+				
+				boardlist.submit( parameters );
+			},
+			
 			searchSubmit : function(event) {
 				event.preventDefault();
 				
+				$( boardlist.options.selector['board-body'], boardlist.$boardlist ).html("");
+				
 				boardlist.submit( { 
 					'lang'  : event.data.searchLang.val(),
 					'tags'  : event.data.searchTag.val(),
@@ -227,17 +269,19 @@
 		
 		submit : function( parameters ) {
 			var $boardlist = boardlist.$boardlist,
-				$boardbody = $( boardlist.options.selector['board-body'], $boardlist ),
-				$boardload = $( boardlist.options.selector['board-loading'], $boardlist );
+			    $boardload = $( boardlist.options.selector['board-loading'], $boardlist ),
+			    $searchSubmit = $( boardlist.options.selector['search-submit'] );
 			
-			$boardbody.html("");
+			$searchSubmit.prop( 'disabled', true );
 			$boardload.show();
 			
-			$.get(
+			return $.get(
 				"/board-search.php",
 				parameters,
 				function(data) {
+					$searchSubmit.prop( 'disabled', false );
 					$boardload.hide();
+					
 					boardlist.build.boardlist( $.parseJSON(data) );
 				}
 			);
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 04cba240..022cc319 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1356,6 +1356,7 @@ div.boardlist a {
 table.board-list-table {
 	display: table;
 	margin: -2px;
+	margin-bottom: 10px;
 	overflow: hidden;
 	table-layout: fixed;
 }
@@ -1404,14 +1405,26 @@ table.board-list-table div.board-cell {
 	overflow: hidden;
 }
 
-tfoot.board-list-loading {
+tbody.board-list-loading {
 	display: none;
 }
-tfoot.board-list-loading .loading {
+tbody.board-list-loading .loading {
 	height: 80px;
 }
 
+tbody.board-list-omitted td {
+	background: #98E;
+	border-top: 1px solid #000333;
+	padding: 8px;
+	font-size: 125%;
+	text-align: center;
+}
+tbody.board-list-omitted .board-page-loadmore {
+	display: none;
+}
+
 aside.search-container {
+	margin-bottom: 12px;
 }
 aside.search-container .box {
 	margin-right: 12px;
diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
index b4d17d65..7d02cbd4 100644
--- a/templates/8chan/boards-search.html
+++ b/templates/8chan/boards-search.html
@@ -83,19 +83,26 @@
 				
 				<tbody class="board-list-tbody">{{html_boards}}</tbody>
 				
-				{% if boards_omitted > 0 %}
-				<tbody class="board-list-omitted" data-omitted="{{boards_omitted}}">
-					<tr>
-						<td colspan="7">{{boards_omitted}} board{% if boards_omitted != 1 %}s were{% else %} was{% endif %} omitted.</td>
-					</tr>
-				</tbody>
-				{% endif %}
-				
-				<tfoot class="board-list-loading">
+				<tbody class="board-list-loading">
 					<tr>
 						<td colspan="7" class="loading"></td>
 					</tr>
-				</tfoot>
+				</tbody>
+				
+				<tbody class="board-list-omitted" data-omitted="{{boards_omitted}}">
+					<tr>
+						<td colspan="7">Displaying results <span class="board-page-num">{{search.page}}</span> through <span class="board-page-count">{{ boards|count + search.page}}</span> out of <span class="board-page-total">{{ boards|count + boards_omitted }}</span>. <span class="board-page-loadmore">Click to load more.</span></td>
+						
+						{% if boards_omitted > 0 %}
+						<script type="text/javascript">
+							/* Cheeky hack redux.
+							   We want to show the loadmore for JS users when we have omitted boards.
+							   However, the board-directory.js isn't designed to manipulate the page index on immediate load. */
+							document.getElementsByClassName("board-page-loadmore")[0].style.display = "inline";
+						</script>
+						{% endif %}
+					</tr>
+				</tbody>
 			</table>
 		</section>
 	</div>

From 9eb8452793d3eec2ed31231b81349f2e7b1bdcac Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Thu, 16 Apr 2015 07:08:30 +1000
Subject: [PATCH 59/70] Made the range for board range now inclusive. i.e. 1-50
 instead of 0-50. 101-200 instead of 100-200.

---
 templates/8chan/boards-search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
index 7d02cbd4..41ef5cbd 100644
--- a/templates/8chan/boards-search.html
+++ b/templates/8chan/boards-search.html
@@ -91,7 +91,7 @@
 				
 				<tbody class="board-list-omitted" data-omitted="{{boards_omitted}}">
 					<tr>
-						<td colspan="7">Displaying results <span class="board-page-num">{{search.page}}</span> through <span class="board-page-count">{{ boards|count + search.page}}</span> out of <span class="board-page-total">{{ boards|count + boards_omitted }}</span>. <span class="board-page-loadmore">Click to load more.</span></td>
+						<td colspan="7">Displaying results <span class="board-page-num">{{search.page + 1}}</span> through <span class="board-page-count">{{ boards|count + search.page}}</span> out of <span class="board-page-total">{{ boards|count + boards_omitted }}</span>. <span class="board-page-loadmore">Click to load more.</span></td>
 						
 						{% if boards_omitted > 0 %}
 						<script type="text/javascript">

From 95e92c40a8aae8861ff2d7e64d9fdf042bab64e4 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Thu, 16 Apr 2015 19:41:52 +1000
Subject: [PATCH 60/70] Bug fixes.

- board-search.php Fixed an issue with tag weight where all tags have an equal prominance
- inc/functions.php Fixed an issue where board stats were incorrectly assuming all recent activity was in the last hour.
- js/board-directory.js JS will now repopulate the tag list.
- Improved handling of the load more button.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                   |  2 +-
 inc/functions.php                  | 16 +++++++---
 js/board-directory.js              | 49 ++++++++++++++++++++++++------
 stylesheets/style.css              |  9 ++++++
 templates/8chan/boards-search.html |  4 +--
 5 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/board-search.php b/board-search.php
index 931a0d53..74272b35 100644
--- a/board-search.php
+++ b/board-search.php
@@ -261,7 +261,7 @@ if (count($response['tags']) > 0) {
 			$response['tagWeight'][$tagName] = 75 + round( 100 * ( $weightDeparture / $weightDepartureFurthest ), 0);
 		}
 		else {
-			$response['tagWeight'][$tagName] = 0;
+			$response['tagWeight'][$tagName] = 100;
 		}
 	}
 }
diff --git a/inc/functions.php b/inc/functions.php
index 98f07377..a6677d3a 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -841,6 +841,7 @@ function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed
 		$forTime = time();
 	}
 	// Get the last hour for this timestamp.
+	$nowHour = ( (int)( time() / 3600 ) * 3600 );
 	$forHour = ( (int)( $forTime / 3600 ) * 3600 ) - 3600;
 	
 	$boardActivity = array(
@@ -857,7 +858,7 @@ function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed
 	}
 	
 	if ($detailed === true) {
-		$bsQuery = prepare("SELECT `stat_uri`, `post_count`, `author_ip_array` FROM ``board_stats`` WHERE {$uriSearch} ( `stat_hour` <= :hour AND `stat_hour` >= :hoursago )");
+		$bsQuery = prepare("SELECT `stat_uri`, `stat_hour`, `post_count`, `author_ip_array` FROM ``board_stats`` WHERE {$uriSearch} ( `stat_hour` <= :hour AND `stat_hour` >= :hoursago )");
 		$bsQuery->bindValue(':hour', $forHour, PDO::PARAM_INT);
 		$bsQuery->bindValue(':hoursago', $forHour - ( 3600 * 72 ), PDO::PARAM_INT);
 		$bsQuery->execute() or error(db_error($bsQuery));
@@ -867,11 +868,17 @@ function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed
 		// Format the results.
 		foreach ($bsResult as $bsRow) {
 			if (!isset($boardActivity['active'][$bsRow['stat_uri']])) {
-				$boardActivity['active'][$bsRow['stat_uri']] = unserialize( $bsRow['author_ip_array'] );
+				if ($bsRow['stat_hour'] == $forHour) {
+					$boardActivity['active'][$bsRow['stat_uri']] = unserialize( $bsRow['author_ip_array'] );
+				}
+				
 				$boardActivity['average'][$bsRow['stat_uri']] = $bsRow['post_count'];
 			}
 			else {
-				$boardActivity['active'][$bsRow['stat_uri']] = array_merge( $boardActivity['active'][$bsRow['stat_uri']], unserialize( $bsRow['author_ip_array'] ) );
+				if ($bsRow['stat_hour'] == $forHour) {
+					$boardActivity['active'][$bsRow['stat_uri']] = array_merge( $boardActivity['active'][$bsRow['stat_uri']], unserialize( $bsRow['author_ip_array'] ) );
+				}
+				
 				$boardActivity['average'][$bsRow['stat_uri']] = $bsRow['post_count'];
 			}
 		}
@@ -885,9 +892,8 @@ function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed
 	}
 	// Simple return.
 	else {
-		$bsQuery = prepare("SELECT SUM(`post_count`) AS `post_count` FROM ``board_stats`` WHERE {$uriSearch} ( `stat_hour` <= :hour AND `stat_hour` >= :hoursago )");
+		$bsQuery = prepare("SELECT SUM(`post_count`) AS `post_count` FROM ``board_stats`` WHERE {$uriSearch} ( `stat_hour` = :hour )");
 		$bsQuery->bindValue(':hour', $forHour, PDO::PARAM_INT);
-		$bsQuery->bindValue(':hoursago', $forHour - ( 3600 * 72 ), PDO::PARAM_INT);
 		$bsQuery->execute() or error(db_error($bsQuery));
 		$bsResult = $bsQuery->fetchAll(PDO::FETCH_ASSOC);
 		
diff --git a/js/board-directory.js b/js/board-directory.js
index 1b3ad830..b278fbde 100644
--- a/js/board-directory.js
+++ b/js/board-directory.js
@@ -24,12 +24,13 @@
 				'search-title'  : "#search-title-input",
 				'search-submit' : "#search-submit",
 				
+				'tag-list'      : ".tag-list",
 				'tag-link'      : ".tag-link",
 				
 				'footer-page'   : ".board-page-num",
 				'footer-count'  : ".board-page-count",
 				'footer-total'  : ".board-page-total",
-				'footer-more'   : ".board-page-loadmore"
+				'footer-more'   : "#board-list-more"
 			},
 			
 			// HTML Templates for dynamic construction
@@ -50,11 +51,18 @@
 				// Used to help constrain contents to their <td>.
 				'board-content-wrap' : "<div class=\"board-cell\"></div>",
 				
+				// Individual items or parts of a single table cell.
 				'board-datum-lang'   : "<span class=\"board-lang\"></span>",
 				'board-datum-uri'    : "<a class=\"board-link\"></a>",
 				'board-datum-sfw'    : "<i class=\"fa fa-briefcase board-sfw\" title=\"SFW\"></i>",
 				'board-datum-nsfw'   : "<i class=\"fa fa-briefcase board-nsfw\" title=\"NSFW\"></i>",
-				'board-datum-tags'   : "<a class=\"tag-link\" href=\"#\"></a>"
+				'board-datum-tags'   : "<a class=\"tag-link\" href=\"#\"></a>",
+				
+				
+				// Tag list.
+				'tag-list'           : "<ul class=\"tag-list\"></ul>",
+				'tag-item'           : "<li class=\"tag-item\"></li>",
+				'tag-link'           : "<a class=\"tag-link\" href=\"#\"></a>"
 			}
 		},
 		
@@ -103,7 +111,7 @@
 				boardlist.build.boards(data['boards'], data['order']);
 				boardlist.build.lastSearch(data['search']);
 				boardlist.build.footer(data);
-				boardlist.build.tags(data['tags']);
+				boardlist.build.tags(data['tagWeight']);
 				
 			},
 			
@@ -207,7 +215,8 @@
 				    $page    = $( selector['footer-page'], boardlist.$boardlist ),
 				    $count   = $( selector['footer-count'], boardlist.$boardlist ),
 				    $total   = $( selector['footer-total'], boardlist.$boardlist ),
-				    $more    = $( selector['footer-more'], boardlist.$boardlist );
+				    $more    = $( selector['footer-more'], boardlist.$boardlist ),
+				    $omitted = $( selector['board-omitted'], boardlist.$boardlist );
 				
 				var boards   = Object.keys(data['boards']).length,
 				    omitted  = data['omitted'] - data['search']['page'];
@@ -221,10 +230,29 @@
 				//$page.text( data['search']['page'] );
 				$count.text( data['search']['page'] + boards );
 				$total.text( total );
-				$more.toggle( omitted != 0 );
+				$more.toggleClass( "board-list-hasmore", omitted != 0 );
+				$omitted.toggle( boards + omitted > 0 );
 			},
 			
-			tags : function(data) {
+			tags : function(tags) {
+				var selector = boardlist.options.selector,
+				    template = boardlist.options.template,
+				    $list    = $( selector['tag-list'], boardlist.$boardlist );
+				
+				if ($list.length) {
+					
+					$.each( tags, function(tag, weight) {
+						var $item = $( template['tag-item'] ),
+						    $link = $( template['tag-link'] );
+						
+						$link
+							.css( 'font-size', weight+"%" )
+							.text( tag )
+							.appendTo( $item );
+						
+						$item.appendTo( $list );
+					} );
+				}
 			}
 		},
 		
@@ -240,6 +268,7 @@
 			searchSubmit : function(event) {
 				event.preventDefault();
 				
+				$( boardlist.options.selector['tag-list'], boardlist.$boardlist ).html("");
 				$( boardlist.options.selector['board-body'], boardlist.$boardlist ).html("");
 				
 				boardlist.submit( { 
@@ -268,12 +297,14 @@
 		},
 		
 		submit : function( parameters ) {
-			var $boardlist = boardlist.$boardlist,
-			    $boardload = $( boardlist.options.selector['board-loading'], $boardlist ),
-			    $searchSubmit = $( boardlist.options.selector['search-submit'] );
+			var $boardlist    = boardlist.$boardlist,
+			    $boardload    = $( boardlist.options.selector['board-loading'], $boardlist ),
+			    $searchSubmit = $( boardlist.options.selector['search-submit'], $boardlist ),
+			    $footerMore   = $( boardlist.options.selector['board-omitted'], $boardlist );
 			
 			$searchSubmit.prop( 'disabled', true );
 			$boardload.show();
+			$footerMore.hide();
 			
 			return $.get(
 				"/board-search.php",
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 022cc319..62559dd4 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1419,9 +1419,18 @@ tbody.board-list-omitted td {
 	font-size: 125%;
 	text-align: center;
 }
+tbody.board-list-omitted #board-list-more {
+	cursor: default;
+}
+tbody.board-list-omitted #board-list-more.board-list-hasmore {
+	cursor: pointer;
+}
 tbody.board-list-omitted .board-page-loadmore {
 	display: none;
 }
+tbody.board-list-omitted .board-list-hasmore .board-page-loadmore {
+	display: inline;
+}
 
 aside.search-container {
 	margin-bottom: 12px;
diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
index 41ef5cbd..d8bbbeb3 100644
--- a/templates/8chan/boards-search.html
+++ b/templates/8chan/boards-search.html
@@ -91,14 +91,14 @@
 				
 				<tbody class="board-list-omitted" data-omitted="{{boards_omitted}}">
 					<tr>
-						<td colspan="7">Displaying results <span class="board-page-num">{{search.page + 1}}</span> through <span class="board-page-count">{{ boards|count + search.page}}</span> out of <span class="board-page-total">{{ boards|count + boards_omitted }}</span>. <span class="board-page-loadmore">Click to load more.</span></td>
+						<td colspan="7" id="board-list-more">Displaying results <span class="board-page-num">{{search.page + 1}}</span> through <span class="board-page-count">{{ boards|count + search.page}}</span> out of <span class="board-page-total">{{ boards|count + boards_omitted }}</span>. <span class="board-page-loadmore">Click to load more.</span></td>
 						
 						{% if boards_omitted > 0 %}
 						<script type="text/javascript">
 							/* Cheeky hack redux.
 							   We want to show the loadmore for JS users when we have omitted boards.
 							   However, the board-directory.js isn't designed to manipulate the page index on immediate load. */
-							document.getElementsByClassName("board-page-loadmore")[0].style.display = "inline";
+							document.getElementById("board-list-more").className = "board-list-hasmore";
 						</script>
 						{% endif %}
 					</tr>

From 80c312b7e3d9c96c05fca89bebb9d86477759696 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Thu, 16 Apr 2015 20:55:04 +1000
Subject: [PATCH 61/70] Issue #460 - No linkbanks to the index or frontpage

I've added the infinity logo to page.html. Any standard page (boards / mod pages / plain pages) will have the logo.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 boards.php              |   3 +--
 inc/instance-config.php |  16 ++++++++++------
 static/nsfw.png         | Bin 1229 -> 0 bytes
 static/sfw.png          | Bin 1232 -> 0 bytes
 stylesheets/style.css   |  17 +++++++++++++++++
 templates/page.html     |  10 +++++++++-
 6 files changed, 37 insertions(+), 9 deletions(-)
 delete mode 100644 static/nsfw.png
 delete mode 100644 static/sfw.png

diff --git a/boards.php b/boards.php
index 39876d68..c85346e8 100644
--- a/boards.php
+++ b/boards.php
@@ -93,8 +93,7 @@ $searchHTML = Element("8chan/boards-search.html", array(
 
 $pageHTML = Element("page.html", array(
 		"config" => $config,
-		"body"   => $searchHTML,
-		"title"  => "Boards on &infin;chan"
+		"body"   => $searchHTML
 	)
 );
 
diff --git a/inc/instance-config.php b/inc/instance-config.php
index 1701fc64..56783e33 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -152,25 +152,25 @@
 	$config['stylesheets']['Dark'] = 'dark.css';
 	$config['stylesheets']['Photon'] = 'photon.css';
 	$config['stylesheets']['Redchanit'] = 'redchanit.css';
-
+	
 	$config['stylesheets_board'] = true;
 	$config['markup'][] = array("/^[ |\t]*==(.+?)==[ |\t]*$/m", "<span class=\"heading\">\$1</span>");
 	$config['markup'][] = array("/\[spoiler\](.+?)\[\/spoiler\]/", "<span class=\"spoiler\">\$1</span>");
 	$config['markup'][] = array("/~~(.+?)~~/", "<s>\$1</s>");
 	$config['markup'][] = array("/__(.+?)__/", "<u>\$1</u>");
 	$config['markup'][] = array("/###([^\s']+)###/", "<a href='/boards.html#\$1'>###\$1###</a>");
-
+	
 	$config['boards'] = array(array('<i class="fa fa-home" title="Home"></i>' => '/', '<i class="fa fa-tags" title="Boards"></i>' => '/boards.html', '<i class="fa fa-question" title="FAQ"></i>' => '/faq.html', '<i class="fa fa-random" title="Random"></i>' => '/random.php', '<i class="fa fa-plus" title="New board"></i>' => '/create.php', '<i class="fa fa-ban" title="Public ban list"></i>' => '/bans.html', '<i class="fa fa-search" title="Search"></i>' => '/search.php', '<i class="fa fa-cog" title="Manage board"></i>' => '/mod.php', '<i class="fa fa-quote-right" title="Chat"></i>' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'news+', 'boards'), array('operate', 'meta'), array('<i class="fa fa-twitter" title="Twitter"></i>'=>'https://twitter.com/infinitechan'));
 	//$config['boards'] = array(array('<i class="fa fa-home" title="Home"></i>' => '/', '<i class="fa fa-tags" title="Boards"></i>' => '/boards.html', '<i class="fa fa-question" title="FAQ"></i>' => '/faq.html', '<i class="fa fa-random" title="Random"></i>' => '/random.php', '<i class="fa fa-plus" title="New board"></i>' => '/create.php', '<i class="fa fa-search" title="Search"></i>' => '/search.php', '<i class="fa fa-cog" title="Manage board"></i>' => '/mod.php', '<i class="fa fa-quote-right" title="Chat"></i>' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'meta', 'int'), array('v', 'a', 'tg', 'fit', 'pol', 'tech', 'mu', 'co', 'sp', 'boards'), array('<i class="fa fa-twitter" title="Twitter"></i>'=>'https://twitter.com/infinitechan'));
-
+	
 	$config['footer'][] = 'All posts on 8chan are the responsibility of the individual poster and not the administration of 8chan, pursuant to 47 U.S.C. &sect; 230.';
 	$config['footer'][] = 'We have not been served any secret court orders and are not under any gag orders.';
 	$config['footer'][] = 'To make a DMCA request or report illegal content, please email <a href="mailto:admin@8chan.co">admin@8chan.co</a>.';
-
+	
 	$config['search']['enable'] = true;
-
+	
 	$config['syslog'] = true;
-
+	
 	$config['hour_max_threads'] = 10;
 	$config['filters'][] = array(
 		'condition' => array(
@@ -200,6 +200,10 @@ $config['report_captcha'] = true;
 
 $config['page_404'] = 'page_404';
 
+// Flavor and design.
+$config['site_name'] = "&infin;chan";
+$config['site_logo'] = "/static/logo_33.svg";
+
 // 8chan specific mod pages
 require '8chan-mod-config.php';
 
diff --git a/static/nsfw.png b/static/nsfw.png
deleted file mode 100644
index 475868b30edf938de0994384f0e3b72ebea07f78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1229
zcmV;;1Ty=HP)<h;3K|Lk000e1NJLTq000mG000XJ1^@s6cH#{=000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R0001FNkl<ZC>6a>K@I>x1Y`gIXREWCbS5&1%Q{d(
z6%VtpNDp(*EHNUi!>m<&RwD;iQVtC?#jI8Q2#(?;{fVGEaXW#JQSCZ3{=sEHcL2|R
rK&29A1n2rq!9ce1^a}KW+TGw65pEz5;MfpB00000NkvXXu0mjf2PH|^

diff --git a/static/sfw.png b/static/sfw.png
deleted file mode 100644
index e031f3c3f7772113a2c19b3b2b14981d23086bf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1232
zcmV;>1TXuEP)<h;3K|Lk000e1NJLTq000mG000XJ1^@s6cH#{=000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R0001INkl<ZC>6C*TMmFQ2otmWUs+dYNk^F3H1Z+k
z(XJudQDduNW=L0{#hN(FST2pyzPFaQV(kL~yWm&wUjg3X$y(<C1SKuq0LwFk=%#ZJ
uhpZtCXPP;i65w){KMVMeq{qu%8ud<l;42WG4}tXn0000<MNUMnLSTX(cus8q

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 62559dd4..372bdd74 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1033,6 +1033,23 @@ span.pln {
   }
 }
 
+/* === SITE-WIDE ASSETS === */
+#logo {
+	display: block;
+	width: 100%;
+	padding: 0;
+	margin: 0;
+	text-align: center;
+}
+#logo-link {
+	display: inline;
+}
+#logo-img {
+	display: inline-block;
+	height: 128px;
+	width: auto;
+}
+
 /* === GENERAL CLASSES === */
 .loading {
 	background: none;
diff --git a/templates/page.html b/templates/page.html
index c8cb8f2f..11b6b953 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -12,7 +12,15 @@
 <body class="8chan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} stylesheet-{% if config.default_stylesheet.1 != '' and not mod %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr>{% endif %}
 	<header>
-		<h1>{{ title }}</h1>
+		{% if config.site_logo %}
+		<figure id="logo">
+			<a id="logo-link" href="/" title="Return to the front page">
+				<img id="logo-img" src="{{config.site_logo}}" alt="{{config.site_nane}}" />
+			</a>
+		</figure>
+		{% endif %}
+		
+		{% if title %}<h1>{{ title }}</h1>{% endif %}
 		<div class="subtitle">
 			{% if subtitle %}
 				{{ subtitle }}

From 62380bfbde396b5ba1d62af233996d7fb3094a20 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Fri, 17 Apr 2015 04:02:11 +1000
Subject: [PATCH 62/70] #458 - Issue Added RTL support for Arabic writers.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 inc/functions.php       | 57 +++++++++++++++++++++++++++++++++++++++--
 inc/instance-config.php |  4 +++
 post.php                |  3 ++-
 stylesheets/style.css   | 15 ++++++++++-
 4 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index a6677d3a..b2d01da4 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2266,8 +2266,27 @@ function markup(&$body, $track_cites = false, $op = false) {
 
 	if ($config['strip_superfluous_returns'])
 		$body = preg_replace('/\s+$/', '', $body);
-
-	$body = preg_replace("/\n/", '<br/>', $body);
+	
+	if ($config['markup_paragraphs']) {
+		$paragraphs = explode("\n", $body);
+		$bodyNew = "";
+		
+		foreach ($paragraphs as $paragraph) {
+			if (strlen(trim($paragraph)) > 0) {
+				$paragraphDirection = is_rtl($paragraph) ? "rtl" : "ltr";
+			}
+			else {
+				$paragraphDirection = "empty";
+			}
+			
+			$bodyNew .= "<p class=\"body-line {$paragraphDirection}\">" . $paragraph . "</p>";
+		}
+		
+		$body = $bodyNew;
+	}
+	else {
+		$body = preg_replace("/\n/", '<br/>', $body);
+	}
 	
 	if ($config['markup_repair_tidy']) {
 		$tidy = new tidy();
@@ -2324,6 +2343,40 @@ function ordutf8($string, &$offset) {
 	return $code;
 }
 
+function uniord($u) {
+	$k = mb_convert_encoding($u, 'UCS-2LE', 'UTF-8');
+	$k1 = ord(substr($k, 0, 1));
+	$k2 = ord(substr($k, 1, 1));
+	return $k2 * 256 + $k1;
+}
+
+function is_rtl($str) {
+	if(mb_detect_encoding($str) !== 'UTF-8') {
+		$str = mb_convert_encoding($str, mb_detect_encoding($str),'UTF-8');
+	}
+	
+	preg_match_all('/[^\n\s]+/', $str, $matches);
+	preg_match_all('/.|\n\s/u', $str, $matches);
+	$chars = $matches[0];
+	$arabic_count = 0;
+	$latin_count = 0;
+	$total_count = 0;
+	
+	foreach ($chars as $char) {
+		$pos = uniord($char);
+		
+		if ($pos >= 1536 && $pos <= 1791) {
+			$arabic_count++;
+		}
+		else if ($pos > 123 && $pos < 123) {
+			$latin_count++;
+		}
+		$total_count++;
+	}
+	
+	return (($arabic_count/$total_count) > 0.5);
+}
+
 function strip_combining_chars($str) {
 	$chars = preg_split('//u', $str, -1, PREG_SPLIT_NO_EMPTY);
 	$str = '';
diff --git a/inc/instance-config.php b/inc/instance-config.php
index 56783e33..46478d20 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -140,6 +140,7 @@
 	$config['additional_javascript'][] = 'js/auto-scroll.js';
 	$config['additional_javascript'][] = 'js/twemoji/twemoji.js';
 	$config['additional_javascript'][] = 'js/file-selector.js';
+	$config['additional_javascript'][] = 'js/board-directory.js';
 	// Oekaki (now depends on config.oekaki so can be in all scripts)
 	$config['additional_javascript'][] = 'js/jquery-ui.custom.min.js';
 	$config['additional_javascript'][] = 'js/wPaint/8ch.js';
@@ -160,6 +161,9 @@
 	$config['markup'][] = array("/__(.+?)__/", "<u>\$1</u>");
 	$config['markup'][] = array("/###([^\s']+)###/", "<a href='/boards.html#\$1'>###\$1###</a>");
 	
+	$config['markup_paragraphs'] = true;
+	$config['markup_rtl'] = true;
+	
 	$config['boards'] = array(array('<i class="fa fa-home" title="Home"></i>' => '/', '<i class="fa fa-tags" title="Boards"></i>' => '/boards.html', '<i class="fa fa-question" title="FAQ"></i>' => '/faq.html', '<i class="fa fa-random" title="Random"></i>' => '/random.php', '<i class="fa fa-plus" title="New board"></i>' => '/create.php', '<i class="fa fa-ban" title="Public ban list"></i>' => '/bans.html', '<i class="fa fa-search" title="Search"></i>' => '/search.php', '<i class="fa fa-cog" title="Manage board"></i>' => '/mod.php', '<i class="fa fa-quote-right" title="Chat"></i>' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'news+', 'boards'), array('operate', 'meta'), array('<i class="fa fa-twitter" title="Twitter"></i>'=>'https://twitter.com/infinitechan'));
 	//$config['boards'] = array(array('<i class="fa fa-home" title="Home"></i>' => '/', '<i class="fa fa-tags" title="Boards"></i>' => '/boards.html', '<i class="fa fa-question" title="FAQ"></i>' => '/faq.html', '<i class="fa fa-random" title="Random"></i>' => '/random.php', '<i class="fa fa-plus" title="New board"></i>' => '/create.php', '<i class="fa fa-search" title="Search"></i>' => '/search.php', '<i class="fa fa-cog" title="Manage board"></i>' => '/mod.php', '<i class="fa fa-quote-right" title="Chat"></i>' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'meta', 'int'), array('v', 'a', 'tg', 'fit', 'pol', 'tech', 'mu', 'co', 'sp', 'boards'), array('<i class="fa fa-twitter" title="Twitter"></i>'=>'https://twitter.com/infinitechan'));
 	
diff --git a/post.php b/post.php
index 38898e11..ce6a5f47 100644
--- a/post.php
+++ b/post.php
@@ -643,7 +643,8 @@ elseif (isset($_POST['post'])) {
 	
 	if (mysql_version() >= 50503) {
 		$post['body_nomarkup'] = $post['body']; // Assume we're using the utf8mb4 charset
-	} else {
+	}
+	else {
 		// MySQL's `utf8` charset only supports up to 3-byte symbols
 		// Remove anything >= 0x010000
 		
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 372bdd74..61678115 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -368,7 +368,12 @@ div.delete {
 }
 
 div.post.reply p {
-  margin: 0.3em 0 0 0;
+	display: block;
+	margin: 0;
+	
+	line-height: 1.16em;
+	font-size: 13px;
+	min-height: 1.16em;
 }
 
 div.post.reply div.body {
@@ -1070,6 +1075,14 @@ span.pln {
 	min-width:  48px;
 }
 
+/* Text and accessibility */
+.ltr {
+	direction: ltr;
+}
+.rtl {
+	direction: rtl;
+	font-family: Tahoma;
+}
 
 /* Responsive helpers */
 .col {

From fdce50adf9feaeebadaff2a60e5dae355db6b75f Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Fri, 17 Apr 2015 04:03:01 +1000
Subject: [PATCH 63/70] #456 Added CSS styling for mobile view of boardlist.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 stylesheets/style.css | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 61678115..6c661947 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1535,4 +1535,28 @@ li.tag-item a.tag-link {
 td.board-tags a.tag-link {
 	display: inline-block;
 	margin: 0 0.4em 0 0;
+}
+
+@media screen and (max-width: 1100px) {
+	aside.search-container {
+		width: 100%;
+		margin-bottom: 12px;
+	}
+	aside.search-container .box {
+		margin-right: 0;
+	}
+	
+	section.board-list {
+		margin-top: 12px;
+		width: 100%;
+	}
+	
+	table.board-list-table .board-meta,
+	table.board-list-table .board-pph,
+	table.board-list-table .board-tags {
+		padding: 0;
+		margin: 0;
+		font-size: 0;
+		width: 0;
+	}
 }
\ No newline at end of file

From 72576429063ed167592d6839300ba0e93c4ab1d8 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Sat, 18 Apr 2015 04:39:50 +1000
Subject: [PATCH 64/70] #461 - Added "Post a Reply" button to the thread index
 page.

Also improved some CSS and HTML aspects of the thread layout.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 inc/instance-config.php      |  1 +
 stylesheets/style.css        | 86 ++++++++++++++++++++++++++++--------
 templates/report_delete.html | 21 +++++----
 templates/thread.html        | 32 +++++++++-----
 4 files changed, 103 insertions(+), 37 deletions(-)

diff --git a/inc/instance-config.php b/inc/instance-config.php
index 46478d20..099b7bd2 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -126,6 +126,7 @@
 	$config['additional_javascript'][] = 'js/thread-watcher.js';
 	$config['additional_javascript'][] = 'js/ajax.js';
 	$config['additional_javascript'][] = 'js/quick-reply.js';
+	$config['additional_javascript'][] = 'js/quick-post-controls.js';
 	$config['additional_javascript'][] = 'js/show-own-posts.js';
 	$config['additional_javascript'][] = 'js/youtube.js';
 	$config['additional_javascript'][] = 'js/comment-toolbar.js';
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 6c661947..b930a4c4 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -363,10 +363,6 @@ p.intro a {
   color: maroon;
 }
 
-div.delete {
-  float: right;
-}
-
 div.post.reply p {
 	display: block;
 	margin: 0;
@@ -1130,8 +1126,76 @@ span.pln {
 }
 
 
+.clearfix {
+	display: block;
+	clear: both;
+	visibility: hidden;
+	overflow: hidden;
+	
+	font-size: 0px;
+	line-height: 0px;
+	
+	box-sizing: border-box;
+	border: none;
+	height: 0;
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	zoom: 1;
+}
+
 /* === SPECIFIC PAGES & FEATURES === */
 
+/* Board List */
+div.boardlist {
+	margin-top: 3px;
+	
+	color: #89A;
+	font-size: 9pt;
+}
+div.boardlist.bottom {
+	margin-top: 12px;
+	clear: both;
+}
+div.boardlist a {
+	text-decoration: none;
+}
+
+/* Threads */
+/* Thread Footer */
+#thread-interactions {
+	margin: 8px 0;
+	clear: both;
+}
+#thread-links {
+	float: left;
+}
+#thread-links > a {
+	padding-left: none;
+	padding-right: 10px;
+}
+#thread-quick-reply {
+	display: none;
+	position: absolute;
+	left: 50%;
+	right: 50%;
+	text-align: center;
+	width: 100px;
+	margin-left: -50px;
+}
+#thread_stats {
+	float: right;
+}
+
+#post-moderation-fields {
+	float: right;
+	text-align: right;
+}
+#delete-fields {
+}
+#report-fields {
+}
+
 /* threadwatcher */
 #watchlist {
 	display: none;
@@ -1369,20 +1433,6 @@ div.mix {
   color: rgba(125, 125, 125, 1);
 }
 
-/* Board List */
-div.boardlist {
-	margin-top: 3px;
-	
-	color: #89A;
-	font-size: 9pt;
-}
-div.boardlist.bottom {
-	margin-top: 20px;
-}
-div.boardlist a {
-	text-decoration: none;
-}
-
 table.board-list-table {
 	display: table;
 	margin: -2px;
diff --git a/templates/report_delete.html b/templates/report_delete.html
index d5d0debe..04fb8b09 100644
--- a/templates/report_delete.html
+++ b/templates/report_delete.html
@@ -1,14 +1,17 @@
-{% if config.allow_delete %}
-<div class="delete">
-	{% trans %}Delete Post{% endtrans %} [<input title="Delete file only" type="checkbox" name="file" id="delete_file" />
-	 <label for="delete_file">{% trans %}File{% endtrans %}</label>] <label for="password">{% trans %}Password{% endtrans %}</label> 
+<div id="post-moderation-fields">
+	{% if config.allow_delete %}
+	<div id="delete-fields">
+		{% trans %}Delete Post{% endtrans %} [<input title="Delete file only" type="checkbox" name="file" id="delete_file" />
+		 <label for="delete_file">{% trans %}File{% endtrans %}</label>] <label for="password">{% trans %}Password{% endtrans %}</label> 
 		<input id="password" type="password" name="password" size="12" maxlength="18" />
 		<input type="submit" name="delete" value="{% trans %}Delete{% endtrans %}" />
-</div>
-{% endif %}
-<div class="delete" style="clear:both">
-	<label for="reason">{% trans %}Reason{% endtrans %}</label> 
+	</div>
+	{% endif %}
+	
+	<div id="report-fields">
+		<label for="reason">{% trans %}Reason{% endtrans %}</label> 
 		<input id="reason" type="text" name="reason" size="20" maxlength="30" />
 		[<input title="Global Report" type="checkbox" name="global" id="global_report" /><label for="global_report" title="Report rule violation (CP, etc) to global staff">{% trans %}Global{% endtrans %}</label>]
 		<input type="submit" name="report" value="{% trans %}Report{% endtrans %}" />
-</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/thread.html b/templates/thread.html
index a5ded2df..a40b903f 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -22,6 +22,7 @@
 	<title>{{ board.url }} - {{ meta_subject }}</title>
 </head>
 <body class="8chan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' and not mod %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
+	<a name="top"></a> 
 	{{ boardlist.top }}
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}?board={{ board.uri|url_encode }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
@@ -53,19 +54,30 @@
 
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
+	
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
-	<input type="hidden" name="board" value="{{ board.uri }}" />
-	{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
-	{{ body }}
-	{% include 'report_delete.html' %}
+		<input type="hidden" name="board" value="{{ board.uri }}" />
+		{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
+		
+		{{ body }}
+		
+		<div id="thread-interactions">
+			<span id="thread-links">
+				<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
+				<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
+				<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+			</span>
+			
+			<span id="thread-quick-reply">
+				<a id="link-quick-reply" href="#">[{% trans %}Post a Reply{% endtrans %}]</a>
+			</span>
+			
+			{% include 'report_delete.html' %}
+		</div>
+		
+		<div class="clearfix"></div>
 	</form>
 	
-	<span id="thread-links">
-		<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-		<a id="thread-top" href="#" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
-		<a id="thread-catalog" style="padding-left: 10px" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
-	</span>
-
 	{{ boardlist.bottom }}
 
 	{% if board.uri not in config.banned_ad_boards %}

From 32061668a320aa929c59a17a3af5db4d4a90cb69 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Sun, 19 Apr 2015 13:10:13 +1000
Subject: [PATCH 65/70] #456 #458 - Completed language support on boards list.
 #461 - "Post a reply" button JS added.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php                   | 18 ++++++++----------
 boards.php                         | 11 +++--------
 inc/functions.php                  |  2 +-
 inc/instance-config.php            | 26 ++++++++++++++++++++++++++
 js/quick-post-controls.js          | 11 +++++++++--
 stylesheets/style.css              |  2 +-
 templates/8chan/boards-search.html |  4 +++-
 7 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/board-search.php b/board-search.php
index 74272b35..a02c89bf 100644
--- a/board-search.php
+++ b/board-search.php
@@ -14,13 +14,6 @@ $CanViewUnindexed = isset($mod["type"]) && $mod["type"] <= GlobalVolunteer;
 $response = array();
 
 
-/* Prefetch some information. */
-$languages = array(
-	"en",
-	"es",
-);
-
-
 /* Determine search parameters from $_GET */
 $search = array(
 	'lang'  => false,
@@ -48,7 +41,7 @@ if (isset( $_GET['page'] ) && $_GET['page'] != "") {
 }
 
 // Include what language (if the language is not blank and we recognize it)?
-if (isset( $_GET['lang'] ) && $_GET['lang'] != "" && isset($languages[$search['lang']])) {
+if (isset( $_GET['lang'] ) && $_GET['lang'] != "" && isset($config['languages'][$_GET['lang']])) {
 	$search['lang'] = $_GET['lang'];
 }
 
@@ -116,11 +109,16 @@ foreach ($boards as $board) {
 	$boardLang = strtolower( array_slice( explode( "_", $boardConfig['locale'] ?: "" ), 0 )[0] ); // en_US -> en OR en -> en
 	
 	// Check against our config search options.
-	if ( $search['lang'] !== false && $search['lang'] != $boardLang ) {
+	if ($search['lang'] !== false && $search['lang'] != $boardLang) {
 		continue;
 	}
 	
-	$board['locale'] = $boardLang;
+	if (isset($config['languages'][$boardLang])) {
+		$board['locale'] = $config['languages'][$boardLang];
+	}
+	else {
+		$board['locale'] = $boardLang;
+	}
 	
 	$response['boards'][ $board['uri'] ] = $board;
 }
diff --git a/boards.php b/boards.php
index c85346e8..0acdfaf5 100644
--- a/boards.php
+++ b/boards.php
@@ -1,7 +1,6 @@
 <?php
 
 include "inc/functions.php";
-include "inc/countries.php";
 
 $admin         = isset($mod["type"]) && $mod["type"]<=30;
 $founding_date = "October 23, 2013";
@@ -40,18 +39,13 @@ $posts_total    = number_format( $boardResult['posts_total'], 0 );
 // It's used to make clickable tags for users without JavaScript for graceful degredation.
 // Because of how it orders tags, what you end up with is a prefix that always ends in tags=x+
 // ?tags= or ?sfw=1&tags= or ?title=foo&tags=bar+ - etc
-$tagQueryGet = $_GET;
-$tagQueryTags = isset($tagQueryGet['tags']) ? $tagQueryGet['tags'] : "";
+$tagQueryGet    = $_GET;
+$tagQueryTags   = isset($tagQueryGet['tags']) ? $tagQueryGet['tags'] : "";
 unset($tagQueryGet['tags']);
 $tagQueryGet['tags'] = $tagQueryTags;
 $tag_query      = "?" . http_build_query( $tagQueryGet ) . ($tagQueryTags != "" ? "+" : "");
 
 /* Create and distribute page */
-$config['additional_javascript'] = array(
-	'js/jquery.min.js',
-	'js/board-directory.js'
-);
-
 $boardsHTML = Element("8chan/boards-table.html", array(
 		"config"         => $config,
 		"boards"         => $boards,
@@ -73,6 +67,7 @@ $searchHTML = Element("8chan/boards-search.html", array(
 		"boards"         => $boards,
 		"tags"           => $tags,
 		"search"         => $searchJson['search'],
+		"languages"      => $config['languages'],
 		
 		"boards_total"   => $boards_total,
 		"boards_public"  => $boards_public,
diff --git a/inc/functions.php b/inc/functions.php
index b2d01da4..8a279b41 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -822,7 +822,7 @@ function loadBoardConfig( $uri ) {
 	$config = array(
 		"locale" => "en_US",
 	);
-	$configPath = "/{$uri}/config.php";
+	$configPath = "./{$uri}/config.php";
 	
 	if (file_exists( $configPath ) && is_readable( $configPath )) {
 		include( $configPath );
diff --git a/inc/instance-config.php b/inc/instance-config.php
index 099b7bd2..c6fb8cea 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -185,6 +185,32 @@
 		'message' => 'On this board, to prevent raids the number of threads that can be created per hour is limited. Please try again later, or post in an existing thread.'
 	);
 
+	$config['languages'] = array(
+		'ch' => "汉语",
+		'cz' => "Čeština",
+		'dk' => "Dansk",
+		'de' => "Deutsch",
+		'eo' => "Esperanto",
+		'en' => "English",
+		'es' => "Español",
+		'fi' => "Suomi",
+		'fr' => "Français",
+		'hu' => "Magyar",
+		'it' => "Italiano",
+		'jp' => "日本語",
+		'jbo' => "Lojban",
+		'lt' => "Lietuvių Kalba",
+		'lv' => "Latviešu Valoda",
+		'no' => "Norsk",
+		'nl' => "Nederlands Vlaams",
+		'pl' => "Polski",
+		'pt' => "Português",
+		'ru' => "Русский",
+		'sk' => "Slovenský Jazyk",
+		'tw' => "Taiwanese",
+	);
+
+	
 $config['gzip_static'] = false;
 $config['hash_masked_ip'] = true;
 $config['force_subject_op'] = false;
diff --git a/js/quick-post-controls.js b/js/quick-post-controls.js
index 4e8df1cb..67c4bc51 100644
--- a/js/quick-post-controls.js
+++ b/js/quick-post-controls.js
@@ -90,5 +90,12 @@ $(document).ready(function(){
 	$(document).on('new_post', function(e, post) {
 		$(post).find('input[type=checkbox].delete').each(init_qpc);
 	});
-});
-
+	
+	// Bottom of the page quick reply function
+	$("#thread-quick-reply").show();
+	$("#link-quick-reply").on( 'click', function(event) {
+		event.preventDefault();
+		$(window).trigger('cite', ['']);
+		return false;
+	} );
+} );
\ No newline at end of file
diff --git a/stylesheets/style.css b/stylesheets/style.css
index b930a4c4..a46677bb 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1443,7 +1443,7 @@ table.board-list-table {
 
 table.board-list-table .board-meta {
 	padding-right: 4px;
-	width: 44px;
+	width: 70px;
 }
 table.board-list-table .board-uri {
 	max-width: 196px;
diff --git a/templates/8chan/boards-search.html b/templates/8chan/boards-search.html
index d8bbbeb3..e4d70032 100644
--- a/templates/8chan/boards-search.html
+++ b/templates/8chan/boards-search.html
@@ -28,7 +28,9 @@
 								<option value="es">Spanish</option>
 							</optgroup>
 							<optgroup label="All">
-								<option value="cn">Chinese</option>
+								{% for lang_code, lang_name in languages %} 
+								<option value="{{lang_code}}">{{lang_name}}</option>
+								{% endfor %}
 							</optgroup>
 						</select>
 					</div>

From 5f5dbbd1631fcfa49df8113d3782c0b32b09a45a Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Sun, 19 Apr 2015 22:11:56 +1000
Subject: [PATCH 66/70] #456 - boards.php no longer generates a cache file or
 forbids direct access if a $_GET is specified. #456 - boards.php now
 generates a boards.json and boards-top20.json when accessed directly. #456 -
 Added API compatibility to board-search.php ('max' and 'ppd') #456 - Fixed an
 issue with listBoards() that caused an SQL error if you only asked for
 indexed.

fuck I hope this works

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php  | 21 ++++++++++++++++-----
 boards.php        | 14 ++++++++++++--
 inc/functions.php | 31 ++++++++++++++++++++++++++-----
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/board-search.php b/board-search.php
index a02c89bf..b573edd1 100644
--- a/board-search.php
+++ b/board-search.php
@@ -125,7 +125,6 @@ foreach ($boards as $board) {
 
 unset( $boards );
 
-
 /* Tag Fetching */
 // (We have do this even if we're not filtering by tags so that we know what each board's tags are)
 
@@ -137,6 +136,7 @@ foreach ($response['boards'] as $boardUri => &$board) {
 	// If we are filtering by tag and there is no match, remove from the response.
 	if ( $search['tags'] !== false && ( !isset( $boardTags[ $boardUri ] ) || count(array_intersect($search['tags'], $boardTags[ $boardUri ])) !== count($search['tags']) ) ) {
 		unset( $response['boards'][$boardUri] );
+		continue;
 	}
 	// If we aren't filtering / there is a match AND we have tags, set the tags.
 	else if ( isset( $boardTags[ $boardUri ] ) && $boardTags[ $boardUri ] ) {
@@ -146,6 +146,9 @@ foreach ($response['boards'] as $boardUri => &$board) {
 	else {
 		$board['tags'] = array();
 	}
+	
+	// Legacy support for API readers.
+	$board['max'] = &$board['posts_total'];
 }
 
 unset( $boardTags );
@@ -159,6 +162,7 @@ $boardActivity = fetchBoardActivity( array_keys( $response['boards'] ), $search[
 foreach ($response['boards'] as $boardUri => &$board) {
 	$board['active'] = 0;
 	$board['pph']    = 0;
+	$board['ppd']    = 0;
 	
 	if (isset($boardActivity['active'][ $boardUri ])) {
 		$board['active'] = (int) $boardActivity['active'][ $boardUri ];
@@ -171,6 +175,7 @@ foreach ($response['boards'] as $boardUri => &$board) {
 		}
 		
 		$board['pph'] = round( $boardActivity['average'][ $boardUri ], 2 );
+		$board['ppd'] = round( $boardActivity['today'][ $boardUri ], 2 );
 		
 		unset( $precision );
 	}
@@ -194,11 +199,17 @@ array_multisort(
 	$response['boards']
 );
 
-$boardLimit = $search['index'] ? 50 : 100;
+if (php_sapi_name() == 'cli') {
+	$boardLimit = $search['index'] ? 50 : 100;
+
+	$response['omitted'] = count( $response['boards'] ) - $boardLimit;
+	$response['omitted'] = $response['omitted'] < 0 ? 0 : $response['omitted'];
+	$response['boards']  = array_splice( $response['boards'], $search['page'], $boardLimit );
+}
+else {
+	$response['omitted'] = 0;
+}
 
-$response['omitted'] = count( $response['boards'] ) - $boardLimit;
-$response['omitted'] = $response['omitted'] < 0 ? 0 : $response['omitted'];
-$response['boards']  = array_splice( $response['boards'], $search['page'], $boardLimit );
 $response['order']   = array_keys( $response['boards'] );
 
 
diff --git a/boards.php b/boards.php
index 0acdfaf5..600951d4 100644
--- a/boards.php
+++ b/boards.php
@@ -5,7 +5,7 @@ include "inc/functions.php";
 $admin         = isset($mod["type"]) && $mod["type"]<=30;
 $founding_date = "October 23, 2013";
 
-if (php_sapi_name() == 'fpm-fcgi' && !$admin) {
+if (php_sapi_name() == 'fpm-fcgi' && !$admin && count($_GET) == 0) {
 	error('Cannot be run directly.');
 }
 
@@ -92,5 +92,15 @@ $pageHTML = Element("page.html", array(
 	)
 );
 
-file_write("boards.html", $pageHTML);
+// We only want to cache if this is not a dynamic form request.
+// Otherwise, our information will be skewed by the search criteria.
+if (count($_GET) == 0) {
+	// Preserves the JSON output format of [{board},{board}].
+	$nonAssociativeBoardList = array_values($boards);
+	
+	file_write("boards.html", $pageHTML);
+	file_write("boards.json", json_encode($nonAssociativeBoardList));
+	file_write("boards-top20.json", json_encode(array_splice($nonAssociativeBoardList, 0, 48)));
+}
+
 echo $pageHTML;
\ No newline at end of file
diff --git a/inc/functions.php b/inc/functions.php
index 8a279b41..1d5f8216 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -795,10 +795,11 @@ function listBoards($just_uri = false, $indexed_only = false) {
 				``boards``.`indexed` indexed,
 				``boards``.`sfw` sfw,
 				``boards``.`posts_total` posts_total
-			FROM ``boards``" . ( $indexed_only ? " WHERE `indexed` = 1 " : "" ) .
-			"LEFT JOIN ``board_create``
-				ON ``boards``.`uri` = ``board_create``.`uri`
-			ORDER BY ``boards``.`uri`") or error(db_error());
+			FROM ``boards``
+			LEFT JOIN ``board_create``
+				ON ``boards``.`uri` = ``board_create``.`uri`" .
+			( $indexed_only ? " WHERE `indexed` = 1 " : "" ) .
+			"ORDER BY ``boards``.`uri`") or error(db_error());
 		
 		$boards = $query->fetchAll(PDO::FETCH_ASSOC);
 	}
@@ -840,12 +841,17 @@ function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed
 	if (!is_integer($forTime)) {
 		$forTime = time();
 	}
+	
 	// Get the last hour for this timestamp.
 	$nowHour = ( (int)( time() / 3600 ) * 3600 );
+	// Get the hour before. This is what we actually use for pulling data.
 	$forHour = ( (int)( $forTime / 3600 ) * 3600 ) - 3600;
+	// Get the hour from yesterday to calculate posts per day.
+	$yesterHour = $forHour - ( 3600 * 23 );
 	
 	$boardActivity = array(
 		'active'  => array(),
+		'today'   => array(),
 		'average' => array(),
 	);
 	
@@ -867,10 +873,21 @@ function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed
 		
 		// Format the results.
 		foreach ($bsResult as $bsRow) {
+			// Do we need to define the arrays for this URI?
 			if (!isset($boardActivity['active'][$bsRow['stat_uri']])) {
 				if ($bsRow['stat_hour'] == $forHour) {
 					$boardActivity['active'][$bsRow['stat_uri']] = unserialize( $bsRow['author_ip_array'] );
 				}
+				else {
+					$boardActivity['active'][$bsRow['stat_uri']] = array();
+				}
+				
+				if ($bsRow['stat_hour'] <= $forHour && $bsRow['stat_hour'] >= $yesterHour) {
+					$boardActivity['today'][$bsRow['stat_uri']] = $bsRow['post_count'];
+				}
+				else {
+					$boardActivity['today'][$bsRow['stat_uri']] = 0;
+				}
 				
 				$boardActivity['average'][$bsRow['stat_uri']] = $bsRow['post_count'];
 			}
@@ -879,7 +896,11 @@ function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed
 					$boardActivity['active'][$bsRow['stat_uri']] = array_merge( $boardActivity['active'][$bsRow['stat_uri']], unserialize( $bsRow['author_ip_array'] ) );
 				}
 				
-				$boardActivity['average'][$bsRow['stat_uri']] = $bsRow['post_count'];
+				if ($bsRow['stat_hour'] <= $forHour && $bsRow['stat_hour'] >= $yesterHour) {
+					$boardActivity['today'][$bsRow['stat_uri']] += $bsRow['post_count'];
+				}
+				
+				$boardActivity['average'][$bsRow['stat_uri']] += $bsRow['post_count'];
 			}
 		}
 		

From 558152790d4931d7e7de1ddfed9c79527e5f665b Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Sun, 19 Apr 2015 23:00:39 +1000
Subject: [PATCH 67/70] More board directory stuff.

#456 - Fixed issue where the CLI was generating the wrong index.
#456 - Fixed issue where the user was requesting 100% of the boards on pagination.
#456 - Fixed issue where board active users tracked the last hour and not the last 72 hours.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php  | 14 ++++++--------
 boards.php        |  7 +++++--
 inc/functions.php | 13 ++-----------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/board-search.php b/board-search.php
index b573edd1..5d51134b 100644
--- a/board-search.php
+++ b/board-search.php
@@ -200,16 +200,14 @@ array_multisort(
 );
 
 if (php_sapi_name() == 'cli') {
-	$boardLimit = $search['index'] ? 50 : 100;
-
-	$response['omitted'] = count( $response['boards'] ) - $boardLimit;
-	$response['omitted'] = $response['omitted'] < 0 ? 0 : $response['omitted'];
-	$response['boards']  = array_splice( $response['boards'], $search['page'], $boardLimit );
-}
-else {
-	$response['omitted'] = 0;
+	$response['boardsFull'] = $response['boards'];
 }
 
+$boardLimit = $search['index'] ? 50 : 100;
+
+$response['omitted'] = count( $response['boards'] ) - $boardLimit;
+$response['omitted'] = $response['omitted'] < 0 ? 0 : $response['omitted'];
+$response['boards']  = array_splice( $response['boards'], $search['page'], $boardLimit );
 $response['order']   = array_keys( $response['boards'] );
 
 
diff --git a/boards.php b/boards.php
index 600951d4..72d1ea33 100644
--- a/boards.php
+++ b/boards.php
@@ -94,13 +94,16 @@ $pageHTML = Element("page.html", array(
 
 // We only want to cache if this is not a dynamic form request.
 // Otherwise, our information will be skewed by the search criteria.
-if (count($_GET) == 0) {
+if (php_sapi_name() == 'cli') {
 	// Preserves the JSON output format of [{board},{board}].
-	$nonAssociativeBoardList = array_values($boards);
+	$nonAssociativeBoardList = array_values($response['boardsFull']);
 	
 	file_write("boards.html", $pageHTML);
 	file_write("boards.json", json_encode($nonAssociativeBoardList));
 	file_write("boards-top20.json", json_encode(array_splice($nonAssociativeBoardList, 0, 48)));
+	
+	echo "The board directories have regenerated.";
+	exit;
 }
 
 echo $pageHTML;
\ No newline at end of file
diff --git a/inc/functions.php b/inc/functions.php
index 1d5f8216..4c16f065 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -875,13 +875,6 @@ function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed
 		foreach ($bsResult as $bsRow) {
 			// Do we need to define the arrays for this URI?
 			if (!isset($boardActivity['active'][$bsRow['stat_uri']])) {
-				if ($bsRow['stat_hour'] == $forHour) {
-					$boardActivity['active'][$bsRow['stat_uri']] = unserialize( $bsRow['author_ip_array'] );
-				}
-				else {
-					$boardActivity['active'][$bsRow['stat_uri']] = array();
-				}
-				
 				if ($bsRow['stat_hour'] <= $forHour && $bsRow['stat_hour'] >= $yesterHour) {
 					$boardActivity['today'][$bsRow['stat_uri']] = $bsRow['post_count'];
 				}
@@ -889,17 +882,15 @@ function fetchBoardActivity( array $uris = array(), $forTime = false, $detailed
 					$boardActivity['today'][$bsRow['stat_uri']] = 0;
 				}
 				
+				$boardActivity['active'][$bsRow['stat_uri']] = unserialize( $bsRow['author_ip_array'] );
 				$boardActivity['average'][$bsRow['stat_uri']] = $bsRow['post_count'];
 			}
 			else {
-				if ($bsRow['stat_hour'] == $forHour) {
-					$boardActivity['active'][$bsRow['stat_uri']] = array_merge( $boardActivity['active'][$bsRow['stat_uri']], unserialize( $bsRow['author_ip_array'] ) );
-				}
-				
 				if ($bsRow['stat_hour'] <= $forHour && $bsRow['stat_hour'] >= $yesterHour) {
 					$boardActivity['today'][$bsRow['stat_uri']] += $bsRow['post_count'];
 				}
 				
+				$boardActivity['active'][$bsRow['stat_uri']] = array_merge( $boardActivity['active'][$bsRow['stat_uri']], unserialize( $bsRow['author_ip_array'] ) );
 				$boardActivity['average'][$bsRow['stat_uri']] += $bsRow['post_count'];
 			}
 		}

From 2c39452190ecc3c399e11123909e72a03f996457 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Mon, 20 Apr 2015 00:51:45 +1000
Subject: [PATCH 68/70] Fixed some styling issues with the latest update.

#201 - Increased top padding of post blocks.
#458 - Fixed meme arrows.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 inc/functions.php     | 11 +++++++++--
 stylesheets/style.css |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 4c16f065..b7da4c7f 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2274,7 +2274,7 @@ function markup(&$body, $track_cites = false, $op = false) {
 	
 	$tracked_cites = array_unique($tracked_cites, SORT_REGULAR);
 
-	$body = preg_replace("/^\s*&gt;.*$/m", '<span class="quote">$0</span>', $body);
+	//$body = preg_replace("/^\s*&gt;.*$/m", '<span class="quote">$0</span>', $body);
 
 	if ($config['strip_superfluous_returns'])
 		$body = preg_replace('/\s+$/', '', $body);
@@ -2291,7 +2291,14 @@ function markup(&$body, $track_cites = false, $op = false) {
 				$paragraphDirection = "empty";
 			}
 			
-			$bodyNew .= "<p class=\"body-line {$paragraphDirection}\">" . $paragraph . "</p>";
+			if (strpos($paragraph, "&gt;")===0) {
+				$quoteClass = "quote";
+			}
+			else {
+				$quoteClass = "";
+			}
+			
+			$bodyNew .= "<p class=\"body-line {$paragraphDirection} {$quoteClass}\">" . $paragraph . "</p>";
 		}
 		
 		$body = $bodyNew;
diff --git a/stylesheets/style.css b/stylesheets/style.css
index a46677bb..a19d35d3 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -399,7 +399,7 @@ div.post div.body {
 div.post.reply {
   background: #D6DAF0;
   margin: 0.2em 4px;
-  padding: 0.2em 0.3em 0.5em 0.6em;
+  padding: 0.5em 0.3em 0.5em 0.6em;
   border-width: 1px;
   border-style: none solid solid none;
   border-color: #B7C5D9;
@@ -436,7 +436,7 @@ span.trip {
   color: #228854;
 }
 
-span.quote {
+.quote {
   color: #789922;
 }
 
@@ -1039,7 +1039,7 @@ span.pln {
 	display: block;
 	width: 100%;
 	padding: 0;
-	margin: 0;
+	margin: 0 0 0 0;
 	text-align: center;
 }
 #logo-link {

From 41f2156b2bd19b9a5e47b466891eb848fe873b23 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Mon, 20 Apr 2015 01:25:47 +1000
Subject: [PATCH 69/70] Fixed paragraph margins in OP.

---
 stylesheets/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stylesheets/style.css b/stylesheets/style.css
index a19d35d3..c77bfd0f 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -363,7 +363,7 @@ p.intro a {
   color: maroon;
 }
 
-div.post.reply p {
+div.post p {
 	display: block;
 	margin: 0;
 	
@@ -372,7 +372,7 @@ div.post.reply p {
 	min-height: 1.16em;
 }
 
-div.post.reply div.body {
+div.post div.body {
   margin-left: 1.8em;
   margin-top: 0.8em;
   padding-right: 3em;

From aa370fe797aa0b7b8cd9df2b6a6dfc98457c8af8 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Mon, 20 Apr 2015 02:30:51 +1000
Subject: [PATCH 70/70] Sweeping CSS fixes.

#467 - Added a title to the board list page.
#467 - Fixed every single custom stylesheet.
#467 - Fixed several stray CSS isues.
#467 - Removed most precision from the PPH.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 board-search.php          | 10 +++-------
 boards.php                |  6 +++---
 stylesheets/dark.css      | 31 +++++++++++++++++++++++++++++++
 stylesheets/photon.css    | 28 ++++++++++++++++++++++++++++
 stylesheets/redchanit.css | 29 +++++++++++++++++++++++++++++
 stylesheets/style.css     |  5 +++++
 stylesheets/tomorrow.css  | 29 +++++++++++++++++++++++++++++
 stylesheets/yotsuba.css   | 33 +++++++++++++++++++++++++++++++--
 8 files changed, 159 insertions(+), 12 deletions(-)

diff --git a/board-search.php b/board-search.php
index 5d51134b..7df27f4f 100644
--- a/board-search.php
+++ b/board-search.php
@@ -168,14 +168,10 @@ foreach ($response['boards'] as $boardUri => &$board) {
 		$board['active'] = (int) $boardActivity['active'][ $boardUri ];
 	}
 	if (isset($boardActivity['average'][ $boardUri ])) {
-		$precision = 4 - strlen( $boardActivity['average'][ $boardUri ] );
+		$precision = 1;
 		
-		if( $precision < 0 ) {
-			$precision = 0;
-		}
-		
-		$board['pph'] = round( $boardActivity['average'][ $boardUri ], 2 );
-		$board['ppd'] = round( $boardActivity['today'][ $boardUri ], 2 );
+		$board['pph'] = round( $boardActivity['average'][ $boardUri ], $precision );
+		$board['ppd'] = round( $boardActivity['today'][ $boardUri ], $precision );
 		
 		unset( $precision );
 	}
diff --git a/boards.php b/boards.php
index 72d1ea33..2ca61816 100644
--- a/boards.php
+++ b/boards.php
@@ -46,6 +46,8 @@ $tagQueryGet['tags'] = $tagQueryTags;
 $tag_query      = "?" . http_build_query( $tagQueryGet ) . ($tagQueryTags != "" ? "+" : "");
 
 /* Create and distribute page */
+// buildJavascript();
+
 $boardsHTML = Element("8chan/boards-table.html", array(
 		"config"         => $config,
 		"boards"         => $boards,
@@ -87,6 +89,7 @@ $searchHTML = Element("8chan/boards-search.html", array(
 );
 
 $pageHTML = Element("page.html", array(
+		"title"  => _("Boardlist"),
 		"config" => $config,
 		"body"   => $searchHTML
 	)
@@ -101,9 +104,6 @@ if (php_sapi_name() == 'cli') {
 	file_write("boards.html", $pageHTML);
 	file_write("boards.json", json_encode($nonAssociativeBoardList));
 	file_write("boards-top20.json", json_encode(array_splice($nonAssociativeBoardList, 0, 48)));
-	
-	echo "The board directories have regenerated.";
-	exit;
 }
 
 echo $pageHTML;
\ No newline at end of file
diff --git a/stylesheets/dark.css b/stylesheets/dark.css
index 0287959e..0cf4c4f4 100644
--- a/stylesheets/dark.css
+++ b/stylesheets/dark.css
@@ -198,3 +198,34 @@ div.report {
 .modlog tr:nth-child(even), .modlog th {
 	background-color: #282A2E;
 }
+
+
+
+.box {
+	background: #333333;
+	border-color: #555555;
+	color: #C5C8C6;
+	border-radius: 10px;
+}
+.box-title {
+	background: transparent;
+	color: #32DD72;
+}
+
+table thead th {
+	background: #333333;
+	border-color: #555555;
+	color: #C5C8C6;
+	border-radius: 4px;
+}
+table tbody tr:nth-of-type( even ) {
+	background-color: #333333;
+}
+
+table.board-list-table .board-uri .board-sfw {
+	color: #446655;
+}
+tbody.board-list-omitted td {
+	background: #333333;
+	border-color: #555555;
+}
\ No newline at end of file
diff --git a/stylesheets/photon.css b/stylesheets/photon.css
index a487e4dd..4d876ea0 100644
--- a/stylesheets/photon.css
+++ b/stylesheets/photon.css
@@ -329,3 +329,31 @@ form table tr td div {
 .desktop-style div.boardlist:not(.bottom) {
     background-color: #DDDDDD;
 }
+
+
+
+.box {
+	background: #DDDDDD;
+	border-color: #CCCCCC;
+	color: #333333;
+	border-radius: 7px;
+}
+.box-title {
+	border-radius: 7px;
+}
+
+table thead th {
+	background: transparent;
+	border: none;
+}
+table tbody tr:nth-of-type( even ) {
+	background-color: #DDDDDD;
+}
+
+table.board-list-table .board-uri .board-sfw {
+	color: #333333;
+}
+tbody.board-list-omitted td {
+	background: transparent;
+	border: none;
+}
\ No newline at end of file
diff --git a/stylesheets/redchanit.css b/stylesheets/redchanit.css
index 9577730f..78456f31 100644
--- a/stylesheets/redchanit.css
+++ b/stylesheets/redchanit.css
@@ -57,4 +57,33 @@ p.intro a.email span.name {
 
 a {
   color: #8020FF;
+}
+
+
+
+.box {
+	background: #343C4E;
+	border: none;
+	color: #FFF;
+}
+.box-title {
+	background: #7F8CA8;
+	color: #0F0C5D;
+}
+
+table thead th {
+	background: #343C4E;
+	border: none;
+	color: #FFF;
+}
+table tbody tr:nth-of-type( even ) {
+	background-color: #343C4E;
+}
+
+table.board-list-table .board-uri .board-sfw {
+	color: #D00;
+}
+tbody.board-list-omitted td {
+	background: #343C4E;
+	border: none;
 }
\ No newline at end of file
diff --git a/stylesheets/style.css b/stylesheets/style.css
index c77bfd0f..4e0846e4 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -86,6 +86,10 @@ table.mod.config-editor input[type="text"] {
   width: 100%;
 }
 
+#post-form-inner .post-table tr {
+	background-color: transparent;
+}
+
 .post-table th, .post-table-options th {
   width: 85px;
 }
@@ -363,6 +367,7 @@ p.intro a {
   color: maroon;
 }
 
+p.body-line,
 div.post p {
 	display: block;
 	margin: 0;
diff --git a/stylesheets/tomorrow.css b/stylesheets/tomorrow.css
index 04860284..17b95957 100644
--- a/stylesheets/tomorrow.css
+++ b/stylesheets/tomorrow.css
@@ -156,3 +156,32 @@ div#watchlist a:hover,a.watchThread:hover {
 .modlog tr:nth-child(even), .modlog th {
 	background-color: #282A2E;
 }
+
+
+
+.box {
+	background: #282a2e;
+	border-color: #111;
+	color: #C5C8C6;
+}
+.box-title {
+	background: #282a2e;
+	color: #C5C8C6;
+}
+
+table thead th {
+	background: #282a2e;
+	border-color: #111;
+	color: #C5C8C6;
+}
+table tbody tr:nth-of-type( even ) {
+	background-color: #282a2e;
+}
+
+table.board-list-table .board-uri .board-sfw {
+	color: #C5C8C6;
+}
+tbody.board-list-omitted td {
+	background: #282a2e;
+	border-color: #111;
+}
\ No newline at end of file
diff --git a/stylesheets/yotsuba.css b/stylesheets/yotsuba.css
index 8997b696..34e4d079 100644
--- a/stylesheets/yotsuba.css
+++ b/stylesheets/yotsuba.css
@@ -3,10 +3,10 @@ body {
 	color: #800000;
 }
 a:link, a:visited, p.intro a.email span.name {
-	color: #0000ff;
+	color: #800;
 }
 a:link:hover {
-	color: #d00;
+	color: #e00;
 }
 a.post_no {
 	color: #800000;
@@ -66,3 +66,32 @@ table.modlog tr th {
 .desktop-style div.boardlist:nth-child(1) {
 	background-color: #F0E0D6;
 }
+
+
+
+.box {
+	background: #fff;
+	border-color: #800;
+	color: #000;
+}
+.box-title {
+	background: #fca;
+	color: #800;
+}
+
+table thead th {
+	border-color: #800;
+	background: #fca;
+	color: #800;
+}
+table tbody tr:nth-of-type( even ) {
+	background-color: #ede2d4;
+}
+
+table.board-list-table .board-uri .board-sfw {
+	color: #800;
+}
+tbody.board-list-omitted td {
+	background: #fca;
+	border-color: #800;
+}
\ No newline at end of file