New boards.html page now with tags

boards.php

@@ -10,10 +10,17 @@ if (php_sapi_name() == 'fpm-fcgi' && !$admin) {
 	error('Cannot be run directly.');
 }
 $boards = listBoards();
-
+$all_tags = array();
 $total_posts_hour = 0;
 $total_posts = 0;
 
+function to_tag($str) {
+	$str = trim($str);
+	$str = strtolower($str);
+	$str = str_replace(['_', ' '], '-', $str);
+	return $str;
+}
+
 foreach ($boards as $i => $board) {
 
 	//$query = prepare(sprintf("SELECT (SELECT MAX(id) from ``posts_%s``) AS max, (SELECT MAX(id) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) < DATE_SUB(NOW(), INTERVAL 1 HOUR)) AS oldmax, (SELECT MAX(id) from ``posts_%s``) AS max_d, (SELECT MAX(id) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) < DATE_SUB(NOW(), INTERVAL 1 DAY)) AS oldmax_d, (SELECT count(id) FROM ``posts_%s``) AS count;", $board['uri'], $board['uri'], $board['uri'], $board['uri'], $board['uri']));
@@ -28,6 +35,23 @@ SELECT MAX(id) max, (SELECT COUNT(*) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time)
 	$query->execute() or error(db_error($query));
 	$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);
+
+	$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'];
+			}
+		}
+	}
+
 	$pph = $r['pph'];
 	$ppd = $r['ppd'];
 
@@ -38,6 +62,7 @@ SELECT MAX(id) max, (SELECT COUNT(*) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time)
 	$boards[$i]['ppd'] = $ppd;
 	$boards[$i]['max'] = $r['max'];
 	$boards[$i]['uniq_ip'] = $r['uniq_ip'];
+	$boards[$i]['tags'] = $tags;
 }
 
 usort($boards, 
@@ -86,14 +111,18 @@ foreach ($boards as $i => &$board) {
 $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.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')));
+$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));
 
 $html = Element("page.html", array("config" => $config, "body" => $body, "title" => "Boards on &infin;chan"));
 if ($admin) {
 	echo $html;
 } else {
 	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]);

inc/functions.php

@@ -1099,12 +1099,6 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 			$antispam_query->bindValue(':board', $board['uri']);
 			$antispam_query->bindValue(':thread', $post['id']);
 			$antispam_query->execute() or error(db_error($antispam_query));
-
-			cache::delete("thread_index_{$board['uri']}_{$post['id']}");
-			cache::delete("thread_index_display_{$board['uri']}_{$post['id']}");
-			cache::delete("thread_{$board['uri']}_{$post['id']}");
-			cache::delete("thread_50_{$board['uri']}_{$post['id']}");
-			cache::delete("catalog_{$board['uri']}");
 		} elseif ($query->rowCount() == 1) {
 			// Rebuild thread
 			$rebuild = &$post['thread'];
@@ -1198,7 +1192,6 @@ function index($page, $mod=false) {
 	$threads = array();
 	
 	while ($th = $query->fetch(PDO::FETCH_ASSOC)) {
-		if (($config['cache']['enabled'] && !($thread = cache::get("thread_index_display_{$board['uri']}_{$th['id']}")) || $mod)) {
 		$thread = new Thread($th, $mod ? '?/' : $config['root'], $mod);
 
 		if ($config['cache']['enabled']) {
@@ -1248,10 +1241,6 @@ function index($page, $mod=false) {
 			$thread->omitted_images = $omitted['image_count'] - $num_images;
 		}
 		
-			if ($config['cache']['enabled'] && !$mod)
-				cache::set("thread_index_display_{$board['uri']}_{$th['id']}", $thread);
-
-		}
 		$threads[] = $thread;
 		$body .= $thread->build(true);
 	}
@@ -1469,10 +1458,6 @@ function checkMute() {
 
 function buildIndex() {
 	global $board, $config, $build_pages;
-	if ($config['use_read_php']) {
-		cache::delete("catalog_{$board['uri']}");
-		return;
-	}
 
 	$pages = getPages();
 	if (!$config['try_smarter'])
@@ -1550,17 +1535,6 @@ function buildIndex() {
 function buildJavascript() {
 	global $config;
 
-	if ($config['cache']['enabled']) {
-		if (false === strpos($config['file_script'], '/')) {
-			$cache_name = 'main_js';
-		} else {
-			$b = explode('/', $config['file_script'])[0];
-			$cache_name = "board_{$b}_js";
-		}
-
-		cache::delete($cache_name);
-	}
-
 	$script = Element('main.js', array(
 		'config' => $config,
 	));
@@ -1582,14 +1556,7 @@ function buildJavascript() {
 		$script = JSMin::minify($script);
 	}
 
-	if ($config['cache']['enabled']) 
-		cache::set($cache_name, $script);
-
-	if (!$config['use_read_php']) {
 	file_write($config['file_script'], $script);
-	} else {
-		return $script;
-	}
 }
 
 function checkDNSBL() {
@@ -2023,22 +1990,17 @@ function strip_combining_chars($str) {
 
 function buildThread($id, $return = false, $mod = false) {
 	global $board, $config, $build_pages;
-	if (!$return && $config['use_read_php']) {
-		cache::delete("thread_index_{$board['uri']}_{$id}");
-		cache::delete("thread_50_{$board['uri']}_{$id}");
-		cache::delete("thread_index_display_{$board['uri']}_{$id}");
-		cache::delete("thread_{$board['uri']}_{$id}");
-		cache::delete("catalog_{$board['uri']}");
-		return;
-	}
-
 	$id = round($id);
 
 	if (event('build-thread', $id))
 		return;
 
-	if (!($thread = cache::get("thread_{$board['uri']}_{$id}")) || $mod) {
+	if ($config['cache']['enabled'] && !$mod) {
-		unset($thread);
+		// Clear cache
+		cache::delete("thread_index_{$board['uri']}_{$id}");
+		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));
@@ -2051,9 +2013,6 @@ function buildThread($id, $return = false, $mod = false) {
 		}
 	}
 
-		if (isset($thread)) cache::set("thread_{$board['uri']}_{$id}", $thread);
-	}
-
 	// Check if any posts were found
 	if (!isset($thread))
 		error($config['error']['nonexistant']);
@@ -2079,7 +2038,7 @@ function buildThread($id, $return = false, $mod = false) {
 		$build_pages[] = thread_find_page($id);
 
 	// json api
-	if ($config['api']['enabled'] && !$config['use_read_php']) {
+	if ($config['api']['enabled']) {
 		$api = new Api();
 		$json = json_encode($api->translateThread($thread));
 		$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . '.json';
@@ -2105,8 +2064,7 @@ function buildThread50($id, $return = false, $mod = false, $thread = null, $anti
 	if ($antibot)
 		$antibot->reset();
 		
-	if (!$thread && ($config['cache']['enabled'] && !($thread = cache::get("thread_50_{$board['uri']}_{$id}")))) {
+	if (!$thread) {
-		unset($thread);
 		$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id` DESC LIMIT :limit", $board['uri']));
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
 		$query->bindValue(':limit', $config['noko50_count']+1, PDO::PARAM_INT);
@@ -2143,8 +2101,6 @@ function buildThread50($id, $return = false, $mod = false, $thread = null, $anti
 		}
 
 		$thread->posts = array_reverse($thread->posts);
-		if ($config['cache']['enabled'])
-			cache::set("thread_50_{$board['uri']}_{$id}", $thread);
 	} else {
 		$allPosts = $thread->posts;
 

install.sql

@@ -67,6 +67,8 @@ CREATE TABLE IF NOT EXISTS `boards` (
   `subtitle` tinytext,
   `indexed` boolean default true,
   `public_bans` boolean default true,
+  `8archive` boolean default false,
+  `sfw` boolean default false,
   PRIMARY KEY (`uri`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
@@ -316,6 +318,19 @@ CREATE TABLE `post_clean` (
   UNIQUE KEY `clean_id_UNIQUE` (`clean_id`)
 );
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `board_tags`
+--
+
+CREATE TABLE `board_tags` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uri` varchar(30) DEFAULT NULL,
+  `tag` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+);
+
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

read.php

@@ -1,183 +0,0 @@
-<?php
-include 'inc/functions.php';
-//error_reporting(E_ALL);
-//ini_set('display_errors', 1);
-//var_dump(cache::get("thread_hello_1"));
-
-$query = $_SERVER['QUERY_STRING'];
-
-$pages = array(
-	'/(\%b)/?'										=> 'view_board',
-	'/(\%b)/(\d+)\.json'									=> 'view_api_index',
-	'/(\%b)/catalog\.json'									=> 'view_api_catalog',
-	'/(\%b)/threads\.json'									=> 'view_api_threads',
-	'/(\%b)/main\.js'									=> 'view_js',
-	'/main\.js'										=> 'view_js',
-	'/(\%b)/catalog(\.html)?'								=> 'view_catalog',
-	'/(\%b)/' . preg_quote($config['file_index'], '!')					=> 'view_board',
-	'/(\%b)/' . str_replace('%d', '(\d+)', preg_quote($config['file_page'], '!'))		=> 'view_board',
-	'/(\%b)/' . preg_quote($config['dir']['res'], '!') .
-			str_replace('%d', '(\d+)', '%d\+50(\.html)?')	=> 'view_thread50',
-	'/(\%b)/' . preg_quote($config['dir']['res'], '!') .
-			str_replace('%d', '(\d+)', '%d(\.html)?')	=> 'view_thread',
-);
-
-$new_pages = array();
-foreach ($pages as $key => $callback) {
-	if (is_string($callback) && preg_match('/^secure /', $callback))
-		$key .= '(/(?P<token>[a-f0-9]{8}))?';
-	$key = str_replace('\%b', '?P<board>' . sprintf(substr($config['board_path'], 0, -1), $config['board_regex']), $key);
-	$new_pages[@$key[0] == '!' ? $key : '!^' . $key . '(?:&[^&=]+=[^&]*)*$!u'] = $callback;
-}
-$pages = $new_pages;
-
-function view_thread50($boardName, $thread) {
-	global $config, $mod;
-	
-	if (!openBoard($boardName)) {
-		include '404.php';
-		return;
-	}
-	
-	$page = buildThread50($thread, true, false);
-	echo $page;
-}
-
-function view_thread($boardName, $thread) {
-	global $config, $mod;
-	
-	if (!openBoard($boardName)) {
-		include '404.php';
-		return;
-	}
-	
-	$page = buildThread($thread, true, false);
-	echo $page;
-}
-
-function view_api_index($boardName, $page) {
-	global $config, $board;
-
-	$api = new Api();
-
-	if (!openBoard($boardName)) {
-		include '404.php';
-		return;
-	}
-
-	$content = index($page+1);
-
-	if (!$content)
-		return;
-
-	if ($config['api']['enabled']) {
-		$threads = $content['threads'];
-		$json = json_encode($api->translatePage($threads));
-		header('Content-Type: text/json');
-
-		echo $json;
-	}
-}
-
-function APICatalog($boardName, $gen_threads = false) {
-	global $config;
-	if (!openBoard($boardName)) {
-		include '404.php';
-		return;
-	}
-
-	header('Content-Type: text/json');
-
-	$catalog = array();
-	$api = new Api();
-
-	for ($page = 1; $page <= $config['max_pages']; $page++) {
-		$content = index($page);
-		
-		if (!$content)
-			break;
-
-		$catalog[$page-1] = $content['threads'];
-	}
-
-	echo json_encode($api->translateCatalog($catalog, $gen_threads));
-}
-
-function view_api_catalog($boardName) {
-	APICatalog($boardName, false);
-}
-
-function view_api_threads($boardName) {
-	APICatalog($boardName, true);
-}
-
-function view_board($boardName, $page_no = 1) {
-	global $config, $mod;
-	
-	if (!openBoard($boardName)) {
-		include '404.php';
-		return;
-	}
-	
-	if (!$page = index($page_no, $mod)) {
-		error($config['error']['404']);
-	}
-	
-	$page['pages'] = getPages(false);
-	$page['pages'][$page_no-1]['selected'] = true;
-	$page['btn'] = getPageButtons($page['pages'], false);
-	$page['mod'] = false;
-	$page['config'] = $config;
-	
-	echo Element('index.html', $page);
-}
-
-function view_js($boardName = false) {
-	global $config;
-
-	if ($boardName && !openBoard($boardName))
-		error($config['error']['noboard']);
-
-	if (!$boardName) {
-		$cache_name = 'main_js';
-	} else {
-		$cache_name = "board_{$boardName}_js";
-	}
-
-	if (!($script = cache::get($cache_name))) {
-		$script = buildJavascript();
-	}
-
-	echo $script;
-}
-
-function view_catalog($boardName) {
-	global $board, $config;
-	$_theme = 'catalog';
-
-	$theme = loadThemeConfig($_theme);
-
-	if (!openBoard($boardName)) {
-		include '404.php';
-		return;
-	}
-
-	require_once $config['dir']['themes'] . '/' . $_theme . '/theme.php';
-
-	$catalog = $theme['build_function']('read_php', themeSettings($_theme), $board['uri']);
-	echo $catalog;
-}
-
-$found = false;
-foreach ($pages as $uri => $handler) {
-	if (preg_match($uri, $query, $matches)) {
-		$matches = array_slice($matches, 2);
-		if (is_callable($handler)) {
-			$found = true;
-			call_user_func_array($handler, $matches);
-		}
-	}
-}
-
-if (!$found)
-	include '404.php';

templates/8chan/boards-tags.html

@@ -0,0 +1,157 @@
+<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; height: 1.1em; white-space: nowrap;
+}
+.tags {
+overflow: hidden; width: 150px; height: 1.1em; white-space: nowrap;
+}
+.board-name {
+overflow: hidden; width: 200px; height: 1.1em; white-space: nowrap;
+}
+</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>
+
+<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>
+

templates/themes/catalog/theme.php

@@ -17,7 +17,6 @@
 			$boards = explode(' ', $settings['boards']);
 		}
 				
-		if (!$config['use_read_php']) {
 		if ($action == 'all') {
 			foreach ($boards as $board) {
 				$b = new Catalog();
@@ -28,18 +27,12 @@
 			$b->build($settings, $board);
 		}
 	}
-		if ($action == 'read_php') {
-			$b = new Catalog();
-			return $b->build($settings, $board, true);
-		}
-	}
 	
 	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
 	class Catalog {
-		public function build($settings, $board_name, $return = false) {
+		public function build($settings, $board_name) {
 			global $config, $board;
 			
-			if (!($config['cache']['enabled'] && $catalog_out = cache::get("catalog_{$board['uri']}"))) {;
 			openBoard($board_name);
 			
 			$recent_images = array();
@@ -97,7 +90,7 @@
 					$config['additional_javascript'][] = $s;
 			}
 
-			$catalog_out = Element('themes/catalog/catalog.html', Array(
+			file_write($config['dir']['home'] . $board_name . '/catalog.html', Element('themes/catalog/catalog.html', Array(
 				'settings' => $settings,
 				'config' => $config,
 				'boardlist' => createBoardlist(),
@@ -106,15 +99,6 @@
 				'stats' => $stats,
 				'board' => $board_name,
 				'link' => $config['root'] . $board['dir']
-			));
+			)));
-
-			cache::set("catalog_{$board['uri']}", $catalog_out);
-			}
-
-			if ($return) {
-				return $catalog_out;
-			} else {
-				file_write($config['dir']['home'] . $board_name . '/catalog.html', $catalog_out);
-			}
 		}
 	};