Fast forward

banners.php

@@ -1,31 +0,0 @@
-<?php
-
-header("Pragma-directive: no-cache");
-header("Cache-directive: no-cache");
-header("Cache-control: no-cache");
-header("Pragma: no-cache");
-header("Expires: 0");
-
-function get_custom_banner(&$b) {
-    # Validate the board name
-    if (!(isset($b) && preg_match('/^[a-z0-9+]{1,30}$/', $b)))
-        return null;
-
-    # Check if directory exists
-    $dir = "static/banners/$b/";
-    if (!is_dir($dir))
-        return null;
-
-    # Return random file if directory is not empty
-    $banners = array_diff(scandir($dir), array('..', '.'));
-    if (!$banners)
-        return null;
-    $r = array_rand($banners);
-    return $dir.$banners[$r];
-}
-
-$banner = get_custom_banner($_GET['board']);
-if ($banner)
-    header("Location: $banner");
-else
-    header("Location: static/8chan banner.png");

boards.php

@@ -64,7 +64,14 @@ $tagsHTML = Element("8chan/boards-tags.html", array(
 	)
 );
 
-$searchHTML = Element("8chan/boards-search.html", array(
+$query = query('SELECT np.* FROM newsplus np INNER JOIN `posts_n` p ON np.thread=p.id WHERE np.dead IS FALSE ORDER BY p.bump DESC');
+if ($query) {
+	$newsplus = $query->fetchAll(PDO::FETCH_ASSOC);
+} else {
+	$newsplus = false;
+}
+
+$searchArray = array(
 		"config"         => $config,
 		"boards"         => $boards,
 		"tags"           => $tags,
@@ -83,25 +90,37 @@ $searchHTML = Element("8chan/boards-search.html", array(
 		"page_updated"   => date('r'),
 		
 		"html_boards"    => $boardsHTML,
-		"html_tags"      => $tagsHTML
+		"html_tags"      => $tagsHTML,
+		"newsplus" => $newsplus
+);
+
+$searchHTML = Element("8chan/boards-index.html", $searchArray);
+
+$pageHTML = Element("page.html", array(
+		"title" => "8chan, the infinitely expanding imageboard",
+		"config" => $config,
+		"body"   => $searchHTML,
 	)
 );
 
-$pageHTML = Element("page.html", array(
+$searchHTML2 = Element("8chan/boards-search.html", $searchArray);
-		"title"  => _("Boardlist"),
+
+$pageHTML2 = Element("page.html", array(
+		"title" => "Boards on 8chan",
 		"config" => $config,
-		"body"   => $searchHTML,
+		"body"   => $searchHTML2,
-		"title" => _("Boards on ∞chan")
 	)
 );
 
+
 // We only want to cache if this is not a dynamic form request.
 // Otherwise, our information will be skewed by the search criteria.
 if (php_sapi_name() == 'cli') {
 	// Preserves the JSON output format of [{board},{board}].
 	$nonAssociativeBoardList = array_values($response['boardsFull']);
 	
-	file_write("boards.html", $pageHTML);
+	file_write("index.html", $pageHTML);
+	file_write("boards.html", $pageHTML2);
 	file_write("boards.json", json_encode($nonAssociativeBoardList));
 	
 	$topbar = array();

dnsbls_bypass.php

@@ -22,16 +22,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 	if ($resp === '1') {
 		$tor = checkDNSBL($_SERVER['REMOTE_ADDR']);
 		if (!$tor) {
-			$query = prepare('INSERT INTO ``dnsbl_bypass`` VALUES(:ip, NOW()) ON DUPLICATE KEY UPDATE `created`=NOW()');
+			$query = prepare('INSERT INTO ``dnsbl_bypass`` VALUES(:ip, NOW(), 0) ON DUPLICATE KEY UPDATE `created`=NOW(),`uses`=0');
 			$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 			$query->execute() or error(db_error($query));
-		} else {
-			$cookie = bin2hex(openssl_random_pseudo_bytes(16));
-			$query = prepare('INSERT INTO ``tor_cookies`` VALUES(:cookie, NOW(), 0)');
-			$query->bindValue(':cookie', $cookie);
-			$query->execute() or error(db_error($query));
-			setcookie("tor", $cookie);
 		}
+		$cookie = bin2hex(openssl_random_pseudo_bytes(16));
+		$query = prepare('INSERT INTO ``tor_cookies`` VALUES(:cookie, NOW(), 0)');
+		$query->bindValue(':cookie', $cookie);
+		$query->execute() or error(db_error($query));
+		setcookie("tor", $cookie, time()+60*60*3);
+	
 		echo Element("page.html", array("config" => $config, "body" => '', "title" => _("Success!"), "subtitle" => _("You may now go back and make your post.")));
 	} else {
 		error(_('You failed the CAPTCHA') . _('. <a href="https://8ch.net/dnsbls_bypass.php">Try again.</a> If it\'s not working, email admin@8chan.co for support.'));

faq.php

@@ -50,6 +50,9 @@ $body = <<<EOT
 <p>Other than that, you are free to institute whatever rules you want on your board.</p>
 <p><a href="/obscenity.html">More information about US obscenity laws and how they relate to 8chan boards</a></p>
 <p><a href="/dost.html">More information about the Dost test</a></p>
+
+<p><strong>TL;DR: 8chan considers all nude images of children to be child porn and they will be deleted and the posting address banned if viable.</strong></p>
+
 <p><a href="/personhood.html">Just who is this 8chan person anyway?</a></p>
 <h2>How do I add more volunteers?</h2>
 <p>You may do this in your board settings, click on "Edit board volunteers".

inc/8chan-mod-config.php

@@ -43,6 +43,7 @@
 	$config['mod']['view_ban'] = BOARDVOLUNTEER;
 	$config['mod']['reassign_board'] = GLOBALVOLUNTEER;
 	$config['mod']['move'] = GLOBALVOLUNTEER;
+	$config['mod']['pm_all'] = GLOBALVOLUNTEER;
 	$config['mod']['shadow_capcode'] = 'Global Volunteer';
 
 	// Mod pages assignment

inc/8chan-mod-pages.php

@@ -68,7 +68,7 @@
 		$salt = generate_salt();
 		$hashed = hash('sha256', $salt . sha1($password));
 
-		$query = prepare('UPDATE ``mods`` SET `password` = :hashed, `salt` = :salt WHERE BINARY username = :mod');
+		$query = prepare('UPDATE ``mods`` SET `password` = :hashed, `salt` = :salt, `email` = NULL WHERE BINARY username = :mod');
 		$query->bindValue(':hashed', $hashed);
 		$query->bindValue(':salt', $salt);
 		$query->bindValue(':mod', $mods[0]['username']);
@@ -105,7 +105,7 @@
 			if (!preg_match('/^[a-zA-Z0-9._]{1,30}$/', $_POST['username']))
 				error(_('Invalid username'));
 
-			if ($count > 10) {
+			if ($count > 20) {
 				error(_('Too many board volunteers!'));
 			}
 
@@ -219,7 +219,7 @@
 			if ($size[0] > 20 or $size[0] < 11 or $size[1] > 16 or $size[1] < 11){
 				error(_('Image wrong size!'));
 			}
-			if (sizeof($banners) > 256) {
+			if (sizeof($banners) > 512) {
 				error(_('Too many flags.'));
 			}
 
@@ -284,7 +284,7 @@ FLAGS;
 
 		if (isset($_POST['delete'])){
 			foreach ($_POST['delete'] as $i => $d){
-				if (!preg_match('/[0-9+]/', $d)){
+				if (!preg_match('/^[0-9]+$/', $d)){
 					error('Nice try.');
 				}
 				unlink("$dir/$d.png");
@@ -419,6 +419,9 @@ FLAGS;
 
 	function mod_8_banners($b) {
 		global $config, $mod, $board;
+
+		error('Banner editing is currently disabled. Please check back later!');
+
 		require_once 'inc/image.php';
 
 		if (!hasPermission($config['mod']['edit_banners'], $b))
@@ -468,7 +471,7 @@ FLAGS;
 
 		if (isset($_POST['delete'])){
 			foreach ($_POST['delete'] as $i => $d){
-				if (!preg_match('/[0-9+]\.(png|jpeg|jpg|gif)/', $d)){
+				if (!preg_match('/^[0-9]+\.(png|jpeg|jpg|gif)$/', $d)){
 					error('Nice try.');
 				}
 				unlink("$dir/$d");
@@ -757,7 +760,7 @@ EOT;
 				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 && strpos($match, '?') === false && strpos($match, ';') === false) {
+						if (strpos($match, $allowed_url) === 0) {
 							$match_okay = true;
 						}
 					}

inc/config.php

@@ -670,17 +670,19 @@
 	$config['markup'][] = array(
 		"/\[(aa|code)\](.+?)\[\/(?:aa|code)\]/ms", 
 		function($matches) {
-			$markupchars = array('_', '\'', '~', '*', '=');
+			$markupchars = array('_', '\'', '~', '*', '=', '-');
 			$replacement = $markupchars;
 			array_walk($replacement, function(&$v) {
 				$v = "&#".ord($v).";";
 			});
 
-			// These are hacky fixes for ###board-tags### and >quotes.
+			// These are hacky fixes for ###board-tags###, ellipses and >quotes.
 			$markupchars[] = '###';
 			$replacement[] = '###';
 			$markupchars[] = '>';
 			$replacement[] = '>';
+			$markupchars[] = '...';
+			$replacement[] = '...';
 
 			if ($matches[1] === 'aa') {
 				return '<span class="aa">' . str_replace($markupchars, $replacement, $matches[2]) . '</span>';

inc/functions.php

@@ -121,7 +121,7 @@ function loadConfig() {
 	}
 
 	if (!file_exists('inc/instance-config.php'))
-		$error('Tinyboard is not configured! Create inc/instance-config.php.');
+		$error('Posting is down momentarily. Please try again later.');
 
 	// Initialize locale as early as possible
 
@@ -2557,7 +2557,7 @@ function strip_combining_chars($str) {
 		$o = 0;
 		$ord = ordutf8($char, $o);
 
-		if ( ($ord >= 768 && $ord <= 879) || ($ord >= 1750 && $ord <= 1773) || ($ord >= 3655 && $ord <= 3659) || ($ord >= 7616 && $ord <= 7679) || ($ord >= 8400 && $ord <= 8447) || ($ord >= 65056 && $ord <= 65071)){
+		if ( ($ord >= 768 && $ord <= 879) || ($ord >= 1536 && $ord <= 1791) || ($ord >= 3655 && $ord <= 3659) || ($ord >= 7616 && $ord <= 7679) || ($ord >= 8400 && $ord <= 8447) || ($ord >= 65056 && $ord <= 65071)){
 			continue;
 		}
 

inc/image.php

@@ -361,7 +361,7 @@ class ImageConvert extends ImageBase {
 					escapeshellarg($this->src . '[0]'),
 					$this->width,
 					$this->height,
-					escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
+					escapeshellarg('jpg:'.$this->temp)))) || !file_exists($this->temp)) {
 
 					if (strpos($error, "known incorrect sRGB profile") === false &&
                                             strpos($error, "iCCP: Not recognizing known sRGB profile that has been edited") === false) {

inc/instance-config.php

@@ -81,7 +81,7 @@
 	$config['poster_id_length'] = 6;
 	$config['ayah_enabled'] = false;
 	$config['cbRecaptcha'] = true;
-	$config['url_banner'] = '/banners.php';
+	$config['url_banner'] = 'https://banners.8ch.net';
 	$config['additional_javascript_compile'] = true;
 	//$config['default_stylesheet'] = array('Notsuba', 'notsuba.css');
 	$config['additional_javascript'][] = 'js/jquery.min.js';
@@ -108,7 +108,6 @@
 	$config['additional_javascript'][] = 'js/hide-images.js';
 	$config['additional_javascript'][] = 'js/expand-all-images.js';
 	$config['additional_javascript'][] = 'js/local-time.js';
-	$config['additional_javascript'][] = 'js/no-animated-gif.js';
 	$config['additional_javascript'][] = 'js/expand.js';
 	$config['additional_javascript'][] = 'js/auto-reload.js';
 	$config['additional_javascript'][] = 'js/options/user-css.js';
@@ -166,7 +165,7 @@
 	$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', 'n', '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> home' => '/', '<i class="fa fa-tags" title="Boards"></i> board list' => '/boards.html', '<i class="fa fa-question" title="FAQ"></i> faq' => '/faq.html', '<i class="fa fa-random" title="Random"></i> random' => '/random.php', '<i class="fa fa-plus" title="New board"></i> create' => '/create.php', '<i class="fa fa-ban" title="Public ban list"></i> bans' => '/bans.html', '<i class="fa fa-search" title="Search"></i> search' => '/search.php', '<i class="fa fa-cog" title="Manage board"></i> manage' => '/mod.php', '<i class="fa fa-quote-right" title="Chat"></i> irc' => 'https://qchat.rizon.net/?channels=#8chan'), 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.';
@@ -232,6 +231,7 @@ $config['report_captcha'] = true;
 $config['no_top_bar_boards'] = false;
 
 $config['page_404'] = 'page_404';
+$config['convert_args'] = '-size %dx%d %s -thumbnail %dx%d -quality 85%% -background \'#d6daf0\' -alpha remove -auto-orient +profile "*" %s';
 
 // Flavor and design.
 $config['site_name'] = "&infin;chan";

inc/mod/pages.php

@@ -3557,6 +3557,7 @@ function mod_edit_page($id) {
 				break;
 			case 'infinity':
 				$c = $content;
+				$config['max_links'] = PHP_INT_MAX;
 				markup($content);
 				$write = $content;
 				$content = $c;

index.php

@@ -1,5 +1,5 @@
 <?php
-include 'inc/functions.php';
+/*include 'inc/functions.php';
 $query = query('SELECT np.* FROM newsplus np INNER JOIN `posts_n` p ON np.thread=p.id WHERE np.dead IS FALSE ORDER BY p.bump DESC');
 if ($query) {
 	$newsplus = $query->fetchAll(PDO::FETCH_ASSOC);
@@ -10,4 +10,4 @@ if ($query) {
 $index = Element("8chan/index.html", array("config" => $config, "newsplus" => $newsplus));
 file_write('index.html', $index);
 
-echo $index;
+echo $index;*/

js/favorites.js

@@ -11,7 +11,7 @@
  */
 
 if (!localStorage.favorites) {
-	localStorage.favorites = '[]';
+	localStorage.favorites = '["operate","b"]';
 }
 
 function favorite(board) {

js/forced-anon.js

@@ -111,10 +111,10 @@ $(document).ready(function() {
 		$('.poster_id').each(toggle_id);
 	}
 	
-	if(forced_anon) {
+	if (forced_anon) {
 		enable_fa();
 		if (window.Options && Options.get_tab('general')) {
-			$('#toggle-locked-threads>input').prop('checked', true);
+			$('#forced-anon>input').prop('checked', true);
 		}
 	}
 	

js/update_boards.js

@@ -3,22 +3,21 @@ $(document).ready(function(){
 window.boards = new Array();
 
 if (window.Options && Options.get_tab('general')) {
-	Options.extend_tab("general", "<label id='show-top'><input type='checkbox' /> "+_('Show top boards')+"</label>");
+	Options.extend_tab("general", "<label id='show_top_boards'><input type='checkbox' /> "+_('Show top boards')+"</label>");
 
-	if (typeof localStorage.show_top === 'undefined') {
+	if (typeof localStorage.show_top_boards === 'undefined') {
-		localStorage.show_top = 'true';
+		localStorage.show_top_boards = 'false';
-		var show_top = JSON.parse(localStorage.show_top);
+		var show_top = JSON.parse(localStorage.show_top_boards);
-		$('#show-top>input').attr('checked', 'checked');
-	} else {
-		var show_top = JSON.parse(localStorage.show_top);
-		if (show_top) $('#show-top>input').attr('checked', 'checked');
 	}
 
+	var show_top = JSON.parse(localStorage.show_top_boards);
+	if (show_top) $('#show_top_boards>input').attr('checked', 'checked');
 
-	$('#show-top>input').on('change', function() {
+
+	$('#show_top_boards>input').on('change', function() {
 		var show_top = ($(this).is(':checked'));
 
-		localStorage.show_top = JSON.stringify(show_top);
+		localStorage.show_top_boards = JSON.stringify(show_top);
 	});
 }
 
@@ -28,7 +27,7 @@ function handle_boards(data) {
 	})
 
 	if (boards[0]) {
-		$('.sub[data-description="3"]').after('<span class="sub" data-description="4"> [ '+boards.slice(0,25).join(" / ")+' ] </span>');
+		$('.sub[data-description="1"]').after('<span class="sub" data-description="4"> [ '+boards.slice(0,25).join(" / ")+' ] </span>');
 	}
 }
 

post.php

@@ -5,10 +5,6 @@
 require "./inc/functions.php";
 require "./inc/anti-bot.php";
 
-// The dnsbls is an optional DNS blacklist include.
-// Squelch warnings if it doesn't exist.
-@include "./inc/dnsbls.php";
-
 // Fix for magic quotes
 if (get_magic_quotes_gpc()) {
 	function strip_array($var) {
@@ -234,6 +230,7 @@ elseif (isset($_POST['post'])) {
 	// Check if board exists
 	if (!openBoard($post['board']))
 		error($config['error']['noboard']);
+
 	
 	if (!isset($_POST['name']))
 		$_POST['name'] = $config['anonymous'];
@@ -253,6 +250,12 @@ elseif (isset($_POST['post'])) {
 	} else
 		$post['op'] = true;
 
+	// The dnsbls is an optional DNS blacklist include.
+	// Squelch warnings if it doesn't exist.
+	if (!$config['captcha']['enabled'] && !($post['op'] && $config['new_thread_capt'])) {
+		@include "./inc/dnsbls.php";
+	}
+
 	// Check if banned
 	checkBan($board['uri']);
 

stylesheets/style.css

@@ -1250,6 +1250,7 @@ div.mix {
 	font-family: Mona, "MS PGothic", "ＭＳ Ｐゴシック", sans-serif;
 	display: block!important;
 	font-size: 12pt;
+	line-height: 1.1;
 }
 .dx,
 .dy,

templates/8chan/index.html

@@ -211,9 +211,9 @@
 					<br>
 					<span>[ <a href="/b/">/b/ - Random</a> | <a href="/n/">/n/ - News</a> | <a href="/boards/">/boards/ - Boards</a>]</span>
 					<br>
-					<strong>{% trans %}Top 25 boards:{% endtrans %}</strong>
+					<!-- <strong>{% trans %}Top 25 boards:{% endtrans %}</strong>
-					<span class="sub" data-description="3"></span>
+					<span class="sub" data-description="1"></span>
-					<!-- <br>
+					<br>
 					<strong>
 						{% trans %}Boards of the week:{% endtrans %}&nbsp;[&nbsp;
 						{% for board in config.boards_of_the_week %}

templates/header.html

@@ -4,7 +4,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
 		{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
 		{% if config.meta_description %}<meta name="description" content="{{ config.meta_description }}">{% endif %}
-		{% if not board.indexed %}<meta name="robots" content="noindex" />{% endif %}
+		{% if board and not board.indexed %}<meta name="robots" content="noindex" />{% endif %}
 		{% if config.default_stylesheet.1 != '' and not mod %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
 		{% if config.font_awesome %}<link rel="stylesheet" media="screen" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
 		{% if config.country_flags_condensed %}<link rel="stylesheet" href="{{ config.root }}{{ config.country_flags_condensed_css }}">{% endif %}

templates/index.html

@@ -19,7 +19,7 @@
 	{{ 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 %}
+	{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}/random/{{ 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 %}
 	
 	<header>
 		<h1>{{ board.url }} - {{ board.title|e }}</h1>
@@ -42,9 +42,7 @@
 		{{ config.announcement }}
 	{% endif %}
 
-	{% if board.uri not in config.banned_ad_boards %}
+	{% include 'ad_top.html' %}
-		{% include 'ad_top.html' %}
-	{% endif %}
 
 	{% if not no_post_form %}
 		{% include 'post_form.html' %}
@@ -85,6 +83,10 @@
 		{% include 'ad_bottom.html' %}
 	{% endif %}
 
+	{% if board.uri %}
+		<div id="8ch-bottom"></div>
+	{% endif %}
+
 	<footer>
 		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
 			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -

templates/mod/ban_form.html

@@ -77,7 +77,7 @@
 				<ul style="list-style:none;padding:2px 5px">
 					{% if mod.boards[0] == '*' %}
 					<li>
-						<input type="radio" name="board" value="*" id="ban-allboards" checked> 
+						<input type="radio" name="board" value="*" id="ban-allboards"> 
 						<label style="display:inline" for="ban-allboards">
 							<em>{% trans 'all boards' %}</em>
 						</label>
@@ -85,15 +85,20 @@
 					{% endif %}
 					
 					{% for board in boards %}
-					{% if board.uri in mod.boards or mod.boards[0] == '*' %}
+					{% if board.uri in mod.boards %}
 						<li>
 							<input type="radio" name="board" value="{{ board.uri }}" id="ban-board-{{ board.uri }}" {%if board.uri == mod.boards[0]%}checked{%endif%}> 
 							<label style="display:inline" for="ban-board-{{ board.uri }}">
 								{{ config.board_abbreviation|sprintf(board.uri) }} - {{ board.title|e }}
 							</label>
 						</li>
-					{% endif %}
+					{% endif %}	
 					{% endfor %}
+					{% if mod.boards[0] == '*' %}
+						<li>
+							<input type="radio" name="board" value="{{ board }}"> /{{ board }}/
+						</li>
+					{% endif %}
 				</ul>
 			</td>
 		</tr>

templates/mod/flags.html

@@ -5,7 +5,7 @@
 	<h2>{% trans %}Upload flag{% endtrans %}</h2>
 	<p><input type="text" name="description" placeholder="Flag description"><input type="file" name="file"></p>
 
-	<p><small>{% trans %}Flags must be a maximum of 48KB and 11-20 x 11-16 pixels.{% endtrans %}<br/>{% trans %}A maximum of 256 custom flags per board is enforced.{% endtrans %}</small></p>
+	<p><small>{% trans %}Flags must be a maximum of 48KB and 11-20 x 11-16 pixels.{% endtrans %}<br/>{% trans %}A maximum of 512 custom flags per board is enforced.{% endtrans %}</small></p>
 
 	<p><small>{% trans %}Important: Flags must be accompanied by a description of the flag that will be shown to the users to your board. The description must not exceed 255 characters. To use flags, you also must have "Enable user flags" enabled on your board settings page as well as having flags uploaded on this page.{% endtrans %}</small></p>
 

templates/mod/move.html

@@ -22,7 +22,7 @@
 			<th>{% trans 'Target board' %}</th>
 			<td>
 				<ul style="list-style:none;padding:0">
-					{% for targetboard in boards if targetboard.uri != board %}
+					{% for targetboard in boards if targetboard.uri != board and targetboard.uri == 'meta' %}
 						<li>
 							<input type="radio" name="board" value="{{ targetboard.uri }}" id="ban-board-{{ targetboard.uri }}" {% if boards|count == 2 %}checked{% endif %}> 
 							<label style="display:inline" for="ban-board-{{ targetboard.uri }}">

templates/mod/volunteers.html

@@ -3,7 +3,7 @@
 <form action="{{ action }}" method="post" enctype="multipart/form-data">
 	<input type="hidden" name="token" value="{{ token }}">
 	<h2>{% trans %}New user{% endtrans %}</h2>
-	<p><span class="unimportant">A maximum of ten board volunteers is enforced. Please make sure to give them all secure passwords. A board volunteer can do everything you can do, with the exception of viewing this page, the banners page, and the board settings page.</span></p>
+	<p><span class="unimportant">A maximum of twenty board volunteers is enforced. Please make sure to give them all secure passwords. A board volunteer can do everything you can do, with the exception of viewing this page, the banners page, and the board settings page.</span></p>
 	<table>
 		<tr><th>Username</th><th>Password</th>
 		<tr><td><input name="username"></td><td><input name="password"></td></tr>

templates/posts.sql

@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS ``posts_{{ board }}`` (
    `name` varchar(35) DEFAULT NULL,
    `trip` varchar(15) DEFAULT NULL,
    `capcode` varchar(50) DEFAULT NULL,
-   `body` text NOT NULL,
+   `body` longtext NOT NULL,
    `body_nomarkup` text,
    `time` int(11) NOT NULL,
    `bump` int(11) DEFAULT NULL,

templates/thread.html

@@ -23,10 +23,9 @@
 	<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 %}
+	{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}/random/{{ 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 %}
 	<header>
 		<h1>{{ board.url }} - {{ board.title|e }}</h1>
 		<div class="subtitle">
@@ -51,9 +50,7 @@
 	<div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a> <a class="unimportant" href="javascript:window.scrollTo(0,document.body.scrollHeight);
 ">[{% trans %}Go to bottom {% endtrans %}]</a></div>
 
-	{% if board.uri not in config.banned_ad_boards %}
+	{% include 'ad_top.html' %}
-		{% include 'ad_top.html' %}
-	{% endif %}
 
 	{% include 'post_form.html' %}
 
@@ -89,6 +86,10 @@
 		{% include 'ad_bottom.html' %}
 	{% endif %}
 
+	{% if board.uri %}
+		<div id="8ch-bottom"></div>
+	{% endif %}
+
 	<footer>
 		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
 			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -

tools/i18n_update.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-cd inc/locale; tx pull; cd -
+#cd inc/locale; tx pull; cd -
-cd inc/locale; K=`ls -d *_*`; cd -; for i in $K; do tools/i18n_compile.php -l $i; done
+cd inc/locale; K=`ls`; cd -; for i in $K; do tools/i18n_compile.php -l $i; done

tools/rebuild.php

@@ -40,15 +40,15 @@ if(!$options['quiet'])
 	echo "Clearing template cache...\n";
 
 load_twig();
-$twig->clearCacheFiles();
+//$twig->clearCacheFiles();
 
 if(!$options['quiet'])
 	echo "Regenerating theme files...\n";
-rebuildThemes('all');
+//rebuildThemes('all');
 
 if(!$options['quiet'])
 	echo "Generating Javascript file...\n";
-buildJavascript();
+#buildJavascript();
 
 $main_js = $config['file_script'];
 
@@ -69,7 +69,7 @@ foreach($boards as &$board) {
 		// different javascript file
 		if(!$options['quiet'])
 			echo "Generating Javascript file...\n";
-		buildJavascript();
+		#buildJavascript();
 	}
 	
 	
@@ -89,7 +89,7 @@ foreach($boards as &$board) {
 		}
 	}
 	
-	$query = query(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
+	$query = query(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `thread` IS NULL ORDER BY `time` DESC", $board['uri'])) or error(db_error());
 	while($post = $query->fetch()) {
 		if(!$options['quiet'])
 			echo "Rebuilding #{$post['id']}...\n";