From 9920a51ff5a5c6914f5bc72ce60c22245d5f1352 Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Fri, 17 Oct 2014 02:32:39 -0500
Subject: [PATCH 01/12] - Resolved board creation script throwing SQL error for
 mismatched column count. - Resolved warnings would be thrown if
 inc/dnsbls.php did not exist. - Resolved problem where shell_exec_error was
 incorrectly reporting a success in instances where 'md5sum' was not
 supported, resulting in "'md5sum'" literally being recorded as the file hash.
 This then lead to hex2bin throwing an error on page load, preventing access
 to threads (among other problems).

---
 inc/functions.php       |  40 +++--
 inc/instance-config.php | 389 +---------------------------------------
 inc/mod/pages.php       |   2 +-
 post.php                |  19 +-
 4 files changed, 51 insertions(+), 399 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index b61f5bb7..963a1e74 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -894,10 +894,14 @@ function insertFloodPost(array $post) {
 	$query->bindValue(':board', $board['uri']);
 	$query->bindValue(':time', time());
 	$query->bindValue(':posthash', make_comment_hex($post['body_nomarkup']));
-	if ($post['has_file'])
+	
+	if ($post['has_file']) {
 		$query->bindValue(':filehash', $post['filehash']);
-	else
+	}
+	else {
 		$query->bindValue(':filehash', null, PDO::PARAM_NULL);
+	}
+	
 	$query->bindValue(':isreply', !$post['op'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 }
@@ -2318,24 +2322,38 @@ function DNS($host) {
 
 function shell_exec_error($command, $suppress_stdout = false) {
 	global $config, $debug;
-
-	if ($config['debug'])
+	
+	if( $config['debug'] ) {
+		$which = microtime(true);
+	}
+	
+	// Determine if $command is a valid command. If we don't, the following is considered valid output.
+	// '$command' is not recognized as an internal or external command, operable program or batch file.
+	if( empty( shell_exec("which $command") ) ) {
+		return false;
+	}
+	
+	if( $config['debug'] ) {
 		$start = microtime(true);
-
+	}
+	
+	
 	$return = trim(shell_exec('PATH="' . escapeshellcmd($config['shell_path']) . ':$PATH";' .
 		$command . ' 2>&1 ' . ($suppress_stdout ? '> /dev/null ' : '') . '&& echo "TB_SUCCESS"'));
 	$return = preg_replace('/TB_SUCCESS$/', '', $return);
-
-	if ($config['debug']) {
-		$time = microtime(true) - $start;
+	
+	if( $config['debug'] ) {
+		$time_which = $start - $which;
+		$time       = microtime(true) - $start;
+		
 		$debug['exec'][] = array(
-			'command' => $command,
-			'time' => '~' . round($time * 1000, 2) . 'ms',
+			'command'  => $command,
+			'time'     => '~' . round($time * 1000, 2) . 'ms + ~' . round($time_which * 1000, 2) . 'ms',
 			'response' => $return ? $return : null
 		);
 		$debug['time']['exec'] += $time;
 	}
-
+	
 	return $return === 'TB_SUCCESS' ? false : $return;
 }
 
diff --git a/inc/instance-config.php b/inc/instance-config.php
index 699d1a18..db80c4c1 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -7,31 +7,25 @@
 *
 *  You can copy values from config.php (defaults) and paste them here.
 */
-	require_once "lib/htmlpurifier-4.5.0/library/HTMLPurifier.auto.php";
-	require_once "8chan-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';
-	$config['db']['database'] = '8chan';
+
+	$config['db']['server'] = '127.0.0.1:3307';
+	$config['db']['database'] = 'chan';
 	$config['db']['prefix'] = '';
-	$config['db']['user'] = 'root';
+	$config['db']['user'] = 'chan';
 	$config['db']['password'] = '';
-	$config['timezone'] = 'UTC';
-	$config['cache']['enabled'] = 'apc';
 
 
 	$config['cookies']['mod'] = 'mod';
-	$config['cookies']['salt'] = '';
-
-	$config['spam']['hidden_inputs_max_pass'] = 128;
-	$config['spam']['hidden_inputs_expire'] = 60 * 60 * 4; // three hours
+	$config['cookies']['salt'] = 'OTRkMWRlYmRlZmE2NGZkNmU5YThkZW';
 
 	$config['flood_time'] = 5;
 	$config['flood_time_ip'] = 30;
 	$config['flood_time_same'] = 2;
 	$config['max_body'] = 5000;
 	$config['reply_limit'] = 300;
+	$config['max_links'] = 40;
+	$config['max_filesize'] = 8388608;
 	$config['thumb_width'] = 255;
 	$config['thumb_height'] = 255;
 	$config['max_width'] = 10000;
@@ -39,371 +33,6 @@
 	$config['threads_per_page'] = 15;
 	$config['max_pages'] = 15;
 	$config['threads_preview'] = 5;
-	$config['root'] = '/';
-	$config['secure_trip_salt'] = '';
-	$config['always_noko'] = true;
-	$config['allow_no_country'] = true;
-	$config['thread_subject_in_title'] = true;
-	$config['spam']['hidden_inputs_max_pass'] = 128;
-	$config['ayah_enabled'] = true;
+	$config['root'] = '/8chan/';
+	$config['secure_trip_salt'] = 'ZjJmMzg1MzY4MWU3Y2UyNzkxYmQyNW';
 
-	// Load database credentials
-	require "secrets.php";
-
-	// Image shit
-	$config['thumb_method'] = 'gm+gifsicle';
-	$config['thumb_ext'] = '';
-	$config['thumb_keep_animation_frames'] = 100;
-	$config['show_ratio'] = true;
-	//$config['allow_upload_by_url'] = true;
-	$config['max_filesize'] = 1024 * 1024 * 8; // 8MB
-	$config['disable_images'] = false; 
-	$config['spoiler_images'] = true;
-	$config['image_reject_repost'] = true;
-	$config['allowed_ext_files'][] = 'webm';
-	$config['webm']['use_ffmpeg'] = true;
-	$config['webm']['allow_audio'] = true;
-	$config['webm']['max_length'] = 60 * 15;
-
-	// Mod shit
-	$config['mod']['groups'][25] = 'Supermod';
-	define_groups();
-	$config['mod']['capcode'][MOD] = array('Board Volunteer');
-	$config['mod']['capcode'][SUPERMOD] = array('Global Volunteer');
-	$config['custom_capcode']['Admin'] = array(
-		'<span class="capcode" style="color:blue;font-weight:bold"> <i class="fa fa-wheelchair"></i> %s</span>',
-	);
-	$config['custom_capcode']['Bear'] = array(
-		'<span class="capcode" style="color:brown;font-weight:bold"> <img src="/static/paw.svg" height="12" width="12"> %s</span>',
-	);
-	//$config['mod']['view_banlist'] = SUPERMOD;
-	$config['mod']['show_ip'] = SUPERMOD;
-	$config['mod']['show_ip_less'] = MOD;
-	$config['mod']['manageusers'] = SUPERMOD;
-	$config['mod']['noticeboard_post'] = SUPERMOD;
-	$config['mod']['search'] = SUPERMOD;
-	$config['mod']['debug_recent'] = ADMIN;
-	$config['mod']['debug_antispam'] = ADMIN;
-	$config['mod']['modlog'] = SUPERMOD;
-	$config['mod']['editpost'] = MOD;
-	$config['mod']['recent_reports'] = 65535;
-	$config['ban_show_post'] = true;
-
-	// Board shit
-	$config['max_links'] = 40;
-	$config['poster_id_length'] = 6;
-	$config['ayah_enabled'] = true;
-	$config['url_banner'] = '/banners.php';
-	//$config['default_stylesheet'] = array('Notsuba', 'notsuba.css');
-	$config['additional_javascript'][] = 'js/jquery.min.js';
-	$config['additional_javascript'][] = 'js/jquery.tablesorter.min.js';
-	$config['additional_javascript'][] = 'js/options.js';
-	$config['additional_javascript'][] = 'js/style-select.js';
-	$config['additional_javascript'][] = 'js/options/general.js';
-	$config['additional_javascript'][] = 'js/post-hover.js';
-	$config['additional_javascript'][] = 'js/update_boards.js';
-	$config['additional_javascript'][] = 'js/favorites.js';
-	$config['additional_javascript'][] = 'js/show-op.js';
-	$config['additional_javascript'][] = 'js/hide-threads.js';
-	$config['additional_javascript'][] = 'js/smartphone-spoiler.js';
-	$config['additional_javascript'][] = 'js/inline-expanding.js';
-	$config['additional_javascript'][] = 'js/show-backlinks.js';
-	$config['additional_javascript'][] = 'js/webm-settings.js';
-	$config['additional_javascript'][] = 'js/expand-video.js';
-	$config['additional_javascript'][] = 'js/treeview.js';
-	$config['additional_javascript'][] = 'js/quick-post-controls.js';
-	$config['additional_javascript'][] = 'js/expand-too-long.js';
-	$config['additional_javascript'][] = 'js/settings.js';
-	$config['additional_javascript'][] = 'js/fix-report-delete-submit.js';
-	$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/titlebar-notifications.js';
-	$config['additional_javascript'][] = 'js/auto-reload.js';
-	$config['additional_javascript'][] = 'js/quick-reply.js';
-	$config['additional_javascript'][] = 'js/options/user-css.js';
-	$config['additional_javascript'][] = 'js/options/user-js.js';
-	$config['additional_javascript'][] = 'js/forced-anon.js';
-	$config['additional_javascript'][] = 'js/toggle-locked-threads.js';
-	$config['additional_javascript'][] = 'js/toggle-images.js';
-	$config['additional_javascript'][] = 'js/mobile-style.js';
-	$config['additional_javascript'][] = 'js/id_highlighter.js';
-	$config['additional_javascript'][] = 'js/id_colors.js';
-	$config['additional_javascript'][] = 'js/inline.js';
-	$config['additional_javascript'][] = 'js/infinite-scroll.js';
-	$config['additional_javascript'][] = 'js/download-original.js';
-	$config['additional_javascript'][] = 'js/thread-watcher.js';
-
-	//$config['font_awesome_css'] = '/netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css';
-	
-	$config['stylesheets']['Dark'] = 'dark.css';
-	$config['stylesheets']['Photon'] = 'photon.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['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', 'meta', 'int'), 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'][] = 'Contribute to 8chan.co development at <a href="https://github.com/ctrlcctrlv/8chan">github</a>';
-	$config['footer'][] = 'To make a DMCA request or report illegal content, please email <a href="mailto:admin@8chan.co">admin@8chan.co</a> or use the "Global Report" functionality on every page.';
-
-	$config['search']['enable'] = true;
-
-//$config['debug'] = true;
-	$config['syslog'] = true;
-
-	$config['wordfilters'][] = array('\rule', ''); // 'true' means it's a regular expression
-
-	if (!function_exists('prettify_textarea')){
-		function prettify_textarea($s){
-			return str_replace("\t", '&#09;', str_replace("\n", '&#13;&#10;', htmlentities($s)));
-		}
-	}
-
-	if (!function_exists('purify')){
-		function purify($s){
-			$config = HTMLPurifier_Config::createDefault();
-			$purifier = new HTMLPurifier($config);
-			$clean_html = $purifier->purify($s);
-			return $clean_html;
-		}
-	}
-
-	$config['mod']['custom_pages']['/banners/(\%b)'] = function($b) {
-		global $config, $mod, $board;
-		require_once 'inc/image.php';
-
-		if (!in_array($b, $mod['boards']) and $mod['boards'][0] != '*')
-			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 (!in_array($b, $mod['boards']) and $mod['boards'][0] != '*')
-			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';
-			$allow_roll = isset($_POST['allow_roll']) ? 'true' : 'false';
-			$image_reject_repost = isset($_POST['image_reject_repost']) ? 'true' : 'false';
-			$allow_flash = isset($_POST['allow_flash']) ? '$config[\'allowed_ext_files\'][] = \'swf\';' : '';
-			$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\';' : '';
-$oekaki_js = <<<OEKAKI
-    \$config['additional_javascript'][] = 'js/jquery-ui.custom.min.js';
-    \$config['additional_javascript'][] = 'js/ajax.js';
-    \$config['additional_javascript'][] = 'js/wPaint/lib/wColorPicker.min.js';
-    \$config['additional_javascript'][] = 'js/wPaint/wPaint.min.js';
-    \$config['additional_javascript'][] = 'js/wPaint/plugins/main/wPaint.menu.main.min.js';
-    \$config['additional_javascript'][] = 'js/wPaint/plugins/text/wPaint.menu.text.min.js';
-    \$config['additional_javascript'][] = 'js/wPaint/plugins/shapes/wPaint.menu.main.shapes.min.js';
-    \$config['additional_javascript'][] = 'js/wPaint/plugins/file/wPaint.menu.main.file.min.js';
-    \$config['additional_javascript'][] = 'js/wpaint.js';
-    \$config['additional_javascript'][] = 'js/upload-selection.js';
-OEKAKI;
-			$oekaki = isset($_POST['oekaki']) ? $oekaki_js : '';
-			if ($_POST['locale'] !== 'en' && in_array($_POST['locale'], $possible_languages)) {
-				$locale = "\$config['locale'] = '{$_POST['locale']}.UTF-8';
-					   \$config['file_script'] = '$b/main.js';";
-			} 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['file_script'] = '$b/main.js';
-					   \$config['additional_javascript'][] = 'js/multi-image.js';";
-			} else {
-				$multiimage = '';
-			} 
-
-			$anonymous = base64_encode($_POST['anonymous']);
-			$blotter = base64_encode(purify(html_entity_decode($_POST['blotter'])));
-			$add_to_config = @file_get_contents($b.'/extra_config.php');
-			$replace = '';
-
-			if (isset($_POST['replace'])) {
-				if (count($_POST['replace']) == count($_POST['with'])) {
-					foreach ($_POST['replace'] as $i => $r ) {
-						if ($r !== '') {
-							$w = $_POST['with'][$i];
-							$replace .= '$config[\'wordfilters\'][] = array(base64_decode(\'' . base64_encode($r) . '\'), base64_decode(\'' . base64_encode($w) . '\'));';
-						}
-					}
-				}
-			}
-
-			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 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->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['allow_roll'] = $allow_roll;
-\$config['image_reject_repost'] = $image_reject_repost;
-\$config['anonymous'] = base64_decode('$anonymous');
-\$config['blotter'] = base64_decode('$blotter');
-\$config['stylesheets']['Custom'] = 'board/$b.css';
-\$config['default_stylesheet'] = array('Custom', \$config['stylesheets']['Custom']);
-$code_tags $katex $oekaki $replace $multiimage $allow_flash
-if (\$config['disable_images'])
-	\$config['max_pages'] = 10000;
-
-$locale
-$add_to_config
-EOT;
-
-			file_write($b.'/config.php', $config_file);
-			file_write('stylesheets/board/'.$b.'.css', $_POST['css']);
-			file_write($b.'/rules.html', Element('page.html', array('title'=>'Rules', 'subtitle'=>'', 'config'=>$config, 'body'=>'<div class="ban">'.purify($_POST['rules']).'</div>')));
-			file_write($b.'/rules.txt', $_POST['rules']);
-			openBoard($b);
-			buildIndex();
-			buildJavascript();
-			$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];
-
-		$rules = @file_get_contents($board['uri'] . '/rules.txt');
-		$css = @file_get_contents('stylesheets/board/' . $board['uri'] . '.css');
-	
-		openBoard($b);
-
-		rebuildThemes('bans');
-
-		if ($config['cache']['enabled']) 
-			cache::delete('board_' . $board['uri']);
-			cache::delete('all_boards');
-
-		mod_page(_('Board configuration'), 'mod/settings.html', array('board'=>$board, 'rules'=>prettify_textarea($rules), 'css'=>prettify_textarea($css), 'token'=>make_secure_link_token('settings/'.$board['uri']), 'languages'=>$possible_languages));
-	};
-	$config['embedding'] = array(
-		array(
-			'/^https?:\/\/(\w+\.)?youtube\.com\/watch\?v=([a-zA-Z0-9\-_]{10,11})(&.+)?$/i',
-			'<iframe style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%" frameborder="0" id="ytplayer" type="text/html" src="https://www.youtube.com/embed/$2"></iframe>'
-		),
-		array(
-			'/^https?:\/\/(\w+\.)?vimeo\.com\/(\d{2,10})(\?.+)?$/i',
-			'<object style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="https://vimeo.com/moogaloop.swf?clip_id=$2&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=00adef&amp;fullscreen=1&amp;autoplay=0&amp;loop=0" /><embed src="https://vimeo.com/moogaloop.swf?clip_id=$2&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=00adef&amp;fullscreen=1&amp;autoplay=0&amp;loop=0" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="%%tb_width%%" height="%%tb_height%%"></embed></object>'
-		),
-		array(
-			'/^https?:\/\/(\w+\.)?dailymotion\.com\/video\/([a-zA-Z0-9]{2,10})(_.+)?$/i',
-			'<object style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%"><param name="movie" value="https://www.dailymotion.com/swf/video/$2"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><param name="wmode" value="transparent"></param><embed type="application/x-shockwave-flash" src="https://www.dailymotion.com/swf/video/$2" width="%%tb_width%%" height="%%tb_height%%" wmode="transparent" allowfullscreen="true" allowscriptaccess="always"></embed></object>'
-		),
-		array(
-			'/^https?:\/\/(\w+\.)?metacafe\.com\/watch\/(\d+)\/([a-zA-Z0-9_\-.]+)\/(\?.+)?$/i',
-			'<div style="float:left;margin:10px 20px;width:%%tb_width%%px;height:%%tb_height%%px"><embed flashVars="playerVars=showStats=no|autoPlay=no" src="https://www.metacafe.com/fplayer/$2/$3.swf" width="%%tb_width%%" height="%%tb_height%%" wmode="transparent" allowFullScreen="true" allowScriptAccess="always" name="Metacafe_$2" pluginspage="https://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed></div>'
-		),
-		array(
-			'/^https?:\/\/video\.google\.com\/videoplay\?docid=(\d+)([&#](.+)?)?$/i',
-			'<embed src="https://video.google.com/googleplayer.swf?docid=$1&hl=en&fs=true" style="width:%%tb_width%%px;height:%%tb_height%%px;float:left;margin:10px 20px" allowFullScreen="true" allowScriptAccess="always" type="application/x-shockwave-flash"></embed>'
-		),
-		array(
-			'/^https?:\/\/(\w+\.)?vocaroo\.com\/i\/([a-zA-Z0-9]{2,15})$/i',
-			'<object style="float: left;margin: 10px 20px;" width="148" height="44"><param name="movie" value="https://vocaroo.com/player.swf?playMediaID=$2&autoplay=0"></param><param name="wmode" value="transparent"></param><embed src="https://vocaroo.com/player.swf?playMediaID=$2&autoplay=0" width="148" height="44" wmode="transparent" type="application/x-shockwave-flash"></embed></object>'
-		)
-	);
-
-$config['gzip_static'] = false;
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 3cdf1374..52b831aa 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -496,7 +496,7 @@ function mod_new_board() {
 			error(sprintf($config['error']['boardexists'], $board['url']));
 		}
 		
-		$query = prepare('INSERT INTO ``boards`` VALUES (:uri, :title, :subtitle)');
+		$query = prepare('INSERT INTO ``boards`` (``uri``, ``title``, ``subtitle``) VALUES (:uri, :title, :subtitle)');
 		$query->bindValue(':uri', $_POST['uri']);
 		$query->bindValue(':title', $_POST['title']);
 		$query->bindValue(':subtitle', $_POST['subtitle']);
diff --git a/post.php b/post.php
index 40f71555..0781d128 100644
--- a/post.php
+++ b/post.php
@@ -2,10 +2,13 @@
 /*
  *  Copyright (c) 2010-2014 Tinyboard Development Group
  */
+ 
+require "./inc/functions.php";
+require "./inc/anti-bot.php";
 
-require 'inc/functions.php';
-require 'inc/anti-bot.php';
-include "inc/dnsbls.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()) {
@@ -573,14 +576,16 @@ if (isset($_POST['delete'])) {
 		}
 		
 		$md5cmd = $config['bsd_md5'] ? 'md5 -r' : 'md5sum';
-
-		if ($output = shell_exec_error("cat $filenames | $md5cmd")) {
+		
+		if( ($output = shell_exec_error("cat $filenames | $md5cmd")) !== false ) {
 			$explodedvar = explode(' ', $output);
 			$hash = $explodedvar[0];
 			$post['filehash'] = $hash;
-		} elseif ($config['max_images'] === 1) {
+		}
+		elseif ($config['max_images'] === 1) {
 			$post['filehash'] = md5_file($upload);
-		} else {
+		}
+		else {
 			$str_to_hash = '';
 			foreach (explode(' ', $filenames) as $i => $f) {
 				$str_to_hash .= file_get_contents($f);

From ba0a874b2713c66526e7802aabf125576a284c9f Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Sat, 18 Oct 2014 03:32:00 -0500
Subject: [PATCH 02/12] [#184] Added <body> tag classes. Style selector now
 adds a <body> class. Moved board list under moderator dashboard.

---
 inc/instance-config.php | 389 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 380 insertions(+), 9 deletions(-)

diff --git a/inc/instance-config.php b/inc/instance-config.php
index db80c4c1..699d1a18 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -7,25 +7,31 @@
 *
 *  You can copy values from config.php (defaults) and paste them here.
 */
+	require_once "lib/htmlpurifier-4.5.0/library/HTMLPurifier.auto.php";
+	require_once "8chan-functions.php";
 
-
-	$config['db']['server'] = '127.0.0.1:3307';
-	$config['db']['database'] = 'chan';
+	// 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';
+	$config['db']['database'] = '8chan';
 	$config['db']['prefix'] = '';
-	$config['db']['user'] = 'chan';
+	$config['db']['user'] = 'root';
 	$config['db']['password'] = '';
+	$config['timezone'] = 'UTC';
+	$config['cache']['enabled'] = 'apc';
 
 
 	$config['cookies']['mod'] = 'mod';
-	$config['cookies']['salt'] = 'OTRkMWRlYmRlZmE2NGZkNmU5YThkZW';
+	$config['cookies']['salt'] = '';
+
+	$config['spam']['hidden_inputs_max_pass'] = 128;
+	$config['spam']['hidden_inputs_expire'] = 60 * 60 * 4; // three hours
 
 	$config['flood_time'] = 5;
 	$config['flood_time_ip'] = 30;
 	$config['flood_time_same'] = 2;
 	$config['max_body'] = 5000;
 	$config['reply_limit'] = 300;
-	$config['max_links'] = 40;
-	$config['max_filesize'] = 8388608;
 	$config['thumb_width'] = 255;
 	$config['thumb_height'] = 255;
 	$config['max_width'] = 10000;
@@ -33,6 +39,371 @@
 	$config['threads_per_page'] = 15;
 	$config['max_pages'] = 15;
 	$config['threads_preview'] = 5;
-	$config['root'] = '/8chan/';
-	$config['secure_trip_salt'] = 'ZjJmMzg1MzY4MWU3Y2UyNzkxYmQyNW';
+	$config['root'] = '/';
+	$config['secure_trip_salt'] = '';
+	$config['always_noko'] = true;
+	$config['allow_no_country'] = true;
+	$config['thread_subject_in_title'] = true;
+	$config['spam']['hidden_inputs_max_pass'] = 128;
+	$config['ayah_enabled'] = true;
 
+	// Load database credentials
+	require "secrets.php";
+
+	// Image shit
+	$config['thumb_method'] = 'gm+gifsicle';
+	$config['thumb_ext'] = '';
+	$config['thumb_keep_animation_frames'] = 100;
+	$config['show_ratio'] = true;
+	//$config['allow_upload_by_url'] = true;
+	$config['max_filesize'] = 1024 * 1024 * 8; // 8MB
+	$config['disable_images'] = false; 
+	$config['spoiler_images'] = true;
+	$config['image_reject_repost'] = true;
+	$config['allowed_ext_files'][] = 'webm';
+	$config['webm']['use_ffmpeg'] = true;
+	$config['webm']['allow_audio'] = true;
+	$config['webm']['max_length'] = 60 * 15;
+
+	// Mod shit
+	$config['mod']['groups'][25] = 'Supermod';
+	define_groups();
+	$config['mod']['capcode'][MOD] = array('Board Volunteer');
+	$config['mod']['capcode'][SUPERMOD] = array('Global Volunteer');
+	$config['custom_capcode']['Admin'] = array(
+		'<span class="capcode" style="color:blue;font-weight:bold"> <i class="fa fa-wheelchair"></i> %s</span>',
+	);
+	$config['custom_capcode']['Bear'] = array(
+		'<span class="capcode" style="color:brown;font-weight:bold"> <img src="/static/paw.svg" height="12" width="12"> %s</span>',
+	);
+	//$config['mod']['view_banlist'] = SUPERMOD;
+	$config['mod']['show_ip'] = SUPERMOD;
+	$config['mod']['show_ip_less'] = MOD;
+	$config['mod']['manageusers'] = SUPERMOD;
+	$config['mod']['noticeboard_post'] = SUPERMOD;
+	$config['mod']['search'] = SUPERMOD;
+	$config['mod']['debug_recent'] = ADMIN;
+	$config['mod']['debug_antispam'] = ADMIN;
+	$config['mod']['modlog'] = SUPERMOD;
+	$config['mod']['editpost'] = MOD;
+	$config['mod']['recent_reports'] = 65535;
+	$config['ban_show_post'] = true;
+
+	// Board shit
+	$config['max_links'] = 40;
+	$config['poster_id_length'] = 6;
+	$config['ayah_enabled'] = true;
+	$config['url_banner'] = '/banners.php';
+	//$config['default_stylesheet'] = array('Notsuba', 'notsuba.css');
+	$config['additional_javascript'][] = 'js/jquery.min.js';
+	$config['additional_javascript'][] = 'js/jquery.tablesorter.min.js';
+	$config['additional_javascript'][] = 'js/options.js';
+	$config['additional_javascript'][] = 'js/style-select.js';
+	$config['additional_javascript'][] = 'js/options/general.js';
+	$config['additional_javascript'][] = 'js/post-hover.js';
+	$config['additional_javascript'][] = 'js/update_boards.js';
+	$config['additional_javascript'][] = 'js/favorites.js';
+	$config['additional_javascript'][] = 'js/show-op.js';
+	$config['additional_javascript'][] = 'js/hide-threads.js';
+	$config['additional_javascript'][] = 'js/smartphone-spoiler.js';
+	$config['additional_javascript'][] = 'js/inline-expanding.js';
+	$config['additional_javascript'][] = 'js/show-backlinks.js';
+	$config['additional_javascript'][] = 'js/webm-settings.js';
+	$config['additional_javascript'][] = 'js/expand-video.js';
+	$config['additional_javascript'][] = 'js/treeview.js';
+	$config['additional_javascript'][] = 'js/quick-post-controls.js';
+	$config['additional_javascript'][] = 'js/expand-too-long.js';
+	$config['additional_javascript'][] = 'js/settings.js';
+	$config['additional_javascript'][] = 'js/fix-report-delete-submit.js';
+	$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/titlebar-notifications.js';
+	$config['additional_javascript'][] = 'js/auto-reload.js';
+	$config['additional_javascript'][] = 'js/quick-reply.js';
+	$config['additional_javascript'][] = 'js/options/user-css.js';
+	$config['additional_javascript'][] = 'js/options/user-js.js';
+	$config['additional_javascript'][] = 'js/forced-anon.js';
+	$config['additional_javascript'][] = 'js/toggle-locked-threads.js';
+	$config['additional_javascript'][] = 'js/toggle-images.js';
+	$config['additional_javascript'][] = 'js/mobile-style.js';
+	$config['additional_javascript'][] = 'js/id_highlighter.js';
+	$config['additional_javascript'][] = 'js/id_colors.js';
+	$config['additional_javascript'][] = 'js/inline.js';
+	$config['additional_javascript'][] = 'js/infinite-scroll.js';
+	$config['additional_javascript'][] = 'js/download-original.js';
+	$config['additional_javascript'][] = 'js/thread-watcher.js';
+
+	//$config['font_awesome_css'] = '/netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css';
+	
+	$config['stylesheets']['Dark'] = 'dark.css';
+	$config['stylesheets']['Photon'] = 'photon.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['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', 'meta', 'int'), 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'][] = 'Contribute to 8chan.co development at <a href="https://github.com/ctrlcctrlv/8chan">github</a>';
+	$config['footer'][] = 'To make a DMCA request or report illegal content, please email <a href="mailto:admin@8chan.co">admin@8chan.co</a> or use the "Global Report" functionality on every page.';
+
+	$config['search']['enable'] = true;
+
+//$config['debug'] = true;
+	$config['syslog'] = true;
+
+	$config['wordfilters'][] = array('\rule', ''); // 'true' means it's a regular expression
+
+	if (!function_exists('prettify_textarea')){
+		function prettify_textarea($s){
+			return str_replace("\t", '&#09;', str_replace("\n", '&#13;&#10;', htmlentities($s)));
+		}
+	}
+
+	if (!function_exists('purify')){
+		function purify($s){
+			$config = HTMLPurifier_Config::createDefault();
+			$purifier = new HTMLPurifier($config);
+			$clean_html = $purifier->purify($s);
+			return $clean_html;
+		}
+	}
+
+	$config['mod']['custom_pages']['/banners/(\%b)'] = function($b) {
+		global $config, $mod, $board;
+		require_once 'inc/image.php';
+
+		if (!in_array($b, $mod['boards']) and $mod['boards'][0] != '*')
+			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 (!in_array($b, $mod['boards']) and $mod['boards'][0] != '*')
+			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';
+			$allow_roll = isset($_POST['allow_roll']) ? 'true' : 'false';
+			$image_reject_repost = isset($_POST['image_reject_repost']) ? 'true' : 'false';
+			$allow_flash = isset($_POST['allow_flash']) ? '$config[\'allowed_ext_files\'][] = \'swf\';' : '';
+			$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\';' : '';
+$oekaki_js = <<<OEKAKI
+    \$config['additional_javascript'][] = 'js/jquery-ui.custom.min.js';
+    \$config['additional_javascript'][] = 'js/ajax.js';
+    \$config['additional_javascript'][] = 'js/wPaint/lib/wColorPicker.min.js';
+    \$config['additional_javascript'][] = 'js/wPaint/wPaint.min.js';
+    \$config['additional_javascript'][] = 'js/wPaint/plugins/main/wPaint.menu.main.min.js';
+    \$config['additional_javascript'][] = 'js/wPaint/plugins/text/wPaint.menu.text.min.js';
+    \$config['additional_javascript'][] = 'js/wPaint/plugins/shapes/wPaint.menu.main.shapes.min.js';
+    \$config['additional_javascript'][] = 'js/wPaint/plugins/file/wPaint.menu.main.file.min.js';
+    \$config['additional_javascript'][] = 'js/wpaint.js';
+    \$config['additional_javascript'][] = 'js/upload-selection.js';
+OEKAKI;
+			$oekaki = isset($_POST['oekaki']) ? $oekaki_js : '';
+			if ($_POST['locale'] !== 'en' && in_array($_POST['locale'], $possible_languages)) {
+				$locale = "\$config['locale'] = '{$_POST['locale']}.UTF-8';
+					   \$config['file_script'] = '$b/main.js';";
+			} 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['file_script'] = '$b/main.js';
+					   \$config['additional_javascript'][] = 'js/multi-image.js';";
+			} else {
+				$multiimage = '';
+			} 
+
+			$anonymous = base64_encode($_POST['anonymous']);
+			$blotter = base64_encode(purify(html_entity_decode($_POST['blotter'])));
+			$add_to_config = @file_get_contents($b.'/extra_config.php');
+			$replace = '';
+
+			if (isset($_POST['replace'])) {
+				if (count($_POST['replace']) == count($_POST['with'])) {
+					foreach ($_POST['replace'] as $i => $r ) {
+						if ($r !== '') {
+							$w = $_POST['with'][$i];
+							$replace .= '$config[\'wordfilters\'][] = array(base64_decode(\'' . base64_encode($r) . '\'), base64_decode(\'' . base64_encode($w) . '\'));';
+						}
+					}
+				}
+			}
+
+			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 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->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['allow_roll'] = $allow_roll;
+\$config['image_reject_repost'] = $image_reject_repost;
+\$config['anonymous'] = base64_decode('$anonymous');
+\$config['blotter'] = base64_decode('$blotter');
+\$config['stylesheets']['Custom'] = 'board/$b.css';
+\$config['default_stylesheet'] = array('Custom', \$config['stylesheets']['Custom']);
+$code_tags $katex $oekaki $replace $multiimage $allow_flash
+if (\$config['disable_images'])
+	\$config['max_pages'] = 10000;
+
+$locale
+$add_to_config
+EOT;
+
+			file_write($b.'/config.php', $config_file);
+			file_write('stylesheets/board/'.$b.'.css', $_POST['css']);
+			file_write($b.'/rules.html', Element('page.html', array('title'=>'Rules', 'subtitle'=>'', 'config'=>$config, 'body'=>'<div class="ban">'.purify($_POST['rules']).'</div>')));
+			file_write($b.'/rules.txt', $_POST['rules']);
+			openBoard($b);
+			buildIndex();
+			buildJavascript();
+			$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];
+
+		$rules = @file_get_contents($board['uri'] . '/rules.txt');
+		$css = @file_get_contents('stylesheets/board/' . $board['uri'] . '.css');
+	
+		openBoard($b);
+
+		rebuildThemes('bans');
+
+		if ($config['cache']['enabled']) 
+			cache::delete('board_' . $board['uri']);
+			cache::delete('all_boards');
+
+		mod_page(_('Board configuration'), 'mod/settings.html', array('board'=>$board, 'rules'=>prettify_textarea($rules), 'css'=>prettify_textarea($css), 'token'=>make_secure_link_token('settings/'.$board['uri']), 'languages'=>$possible_languages));
+	};
+	$config['embedding'] = array(
+		array(
+			'/^https?:\/\/(\w+\.)?youtube\.com\/watch\?v=([a-zA-Z0-9\-_]{10,11})(&.+)?$/i',
+			'<iframe style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%" frameborder="0" id="ytplayer" type="text/html" src="https://www.youtube.com/embed/$2"></iframe>'
+		),
+		array(
+			'/^https?:\/\/(\w+\.)?vimeo\.com\/(\d{2,10})(\?.+)?$/i',
+			'<object style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="https://vimeo.com/moogaloop.swf?clip_id=$2&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=00adef&amp;fullscreen=1&amp;autoplay=0&amp;loop=0" /><embed src="https://vimeo.com/moogaloop.swf?clip_id=$2&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=00adef&amp;fullscreen=1&amp;autoplay=0&amp;loop=0" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="%%tb_width%%" height="%%tb_height%%"></embed></object>'
+		),
+		array(
+			'/^https?:\/\/(\w+\.)?dailymotion\.com\/video\/([a-zA-Z0-9]{2,10})(_.+)?$/i',
+			'<object style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%"><param name="movie" value="https://www.dailymotion.com/swf/video/$2"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><param name="wmode" value="transparent"></param><embed type="application/x-shockwave-flash" src="https://www.dailymotion.com/swf/video/$2" width="%%tb_width%%" height="%%tb_height%%" wmode="transparent" allowfullscreen="true" allowscriptaccess="always"></embed></object>'
+		),
+		array(
+			'/^https?:\/\/(\w+\.)?metacafe\.com\/watch\/(\d+)\/([a-zA-Z0-9_\-.]+)\/(\?.+)?$/i',
+			'<div style="float:left;margin:10px 20px;width:%%tb_width%%px;height:%%tb_height%%px"><embed flashVars="playerVars=showStats=no|autoPlay=no" src="https://www.metacafe.com/fplayer/$2/$3.swf" width="%%tb_width%%" height="%%tb_height%%" wmode="transparent" allowFullScreen="true" allowScriptAccess="always" name="Metacafe_$2" pluginspage="https://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed></div>'
+		),
+		array(
+			'/^https?:\/\/video\.google\.com\/videoplay\?docid=(\d+)([&#](.+)?)?$/i',
+			'<embed src="https://video.google.com/googleplayer.swf?docid=$1&hl=en&fs=true" style="width:%%tb_width%%px;height:%%tb_height%%px;float:left;margin:10px 20px" allowFullScreen="true" allowScriptAccess="always" type="application/x-shockwave-flash"></embed>'
+		),
+		array(
+			'/^https?:\/\/(\w+\.)?vocaroo\.com\/i\/([a-zA-Z0-9]{2,15})$/i',
+			'<object style="float: left;margin: 10px 20px;" width="148" height="44"><param name="movie" value="https://vocaroo.com/player.swf?playMediaID=$2&autoplay=0"></param><param name="wmode" value="transparent"></param><embed src="https://vocaroo.com/player.swf?playMediaID=$2&autoplay=0" width="148" height="44" wmode="transparent" type="application/x-shockwave-flash"></embed></object>'
+		)
+	);
+
+$config['gzip_static'] = false;

From 685030159543a1829918a6e125a2699da61210c8 Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Sat, 18 Oct 2014 19:57:51 -0500
Subject: [PATCH 03/12] [#184] Added new files.

---
 stylesheets/mod/mod.css           | 51 +++++++++++++++++++++++++++++++
 templates/mod/header.html         |  1 +
 templates/mod/report_content.html | 13 ++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 stylesheets/mod/mod.css
 create mode 100644 templates/mod/header.html
 create mode 100644 templates/mod/report_content.html

diff --git a/stylesheets/mod/mod.css b/stylesheets/mod/mod.css
new file mode 100644
index 00000000..463b837e
--- /dev/null
+++ b/stylesheets/mod/mod.css
@@ -0,0 +1,51 @@
+.mod-reports {
+	display: block;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+	.mod-report {
+		border: none;
+		border-bottom: 1px solid #B7C5D9;
+		clear: left;
+		
+		margin: 0 0 0.5em 0;
+		padding: 0 0 0.5em 0;
+	}
+	.mod-report:last-child {
+		border-bottom: none;
+	}
+
+.report-list {
+	display: block;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+	.report-item {
+		display: inline-block;
+		margin: 0;
+		padding: 0;
+	}
+		.report-item .report {
+			background: #D6DAF0;
+			margin: 0.2em 4px;
+			padding: 0.2em 0.3em 0.5em 0.6em;
+			border-width: 1px;
+			border-style: none solid solid none;
+			border-color: #B7C5D9;
+			display: inline-block;
+			max-width: 94% !important;
+		}
+
+.report-content div.post.reply,
+.report-content div.thread {
+	background: #FFC4C4;
+	margin: 0.2em 4px;
+	padding: 0.2em 0.3em 0.5em 0.6em;
+	border-width: 1px;
+	border-style: none solid solid none;
+	border-color: #F88;
+	display: inline-block;
+	max-width: 94% !important;
+}
\ No newline at end of file
diff --git a/templates/mod/header.html b/templates/mod/header.html
new file mode 100644
index 00000000..b7892795
--- /dev/null
+++ b/templates/mod/header.html
@@ -0,0 +1 @@
+		<link rel="stylesheet" media="screen" href="{{ config.uri_stylesheets }}mod/mod.css" />
\ No newline at end of file
diff --git a/templates/mod/report_content.html b/templates/mod/report_content.html
new file mode 100644
index 00000000..e2a4342e
--- /dev/null
+++ b/templates/mod/report_content.html
@@ -0,0 +1,13 @@
+<li class="mod-report">
+	<div class="report-details">
+		<h2>{{ report_title }}</h2>
+	</div>
+	
+	<div class="report-content">
+		{{ content_html }}
+	</div>
+	
+	<ul class="report-list">
+		{{ reports_html }}
+	</ul>
+</li>
\ No newline at end of file

From 2d6d449bd2d720241b5774f403d08167bfa25e7c Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Sat, 18 Oct 2014 20:07:04 -0500
Subject: [PATCH 04/12] [#184] Added <body> tag classes. Style selector now
 adds a <body> class. Moved board list under moderator dashboard.

---
 d                                 | 553 ++++++++++++++++++++++++++++++
 inc/instance-config.php           |  14 +-
 inc/mod/pages.php                 | 210 ++++++++----
 install.php                       |  32 +-
 stylesheets/style.css             |   2 +-
 templates/8chan/index.html        |   2 +-
 templates/generic_page.html       |   2 +-
 templates/index.html              |   2 +-
 templates/main.js                 | 100 ++++--
 templates/mod/dashboard.html      | 170 ++++-----
 templates/mod/report.html         |  42 +--
 templates/mod/reports.html        |   4 +-
 templates/page.html               |   3 +-
 templates/post_thread.html        |   2 +-
 templates/themes/basic/index.html |   2 +-
 templates/thread.html             |   2 +-
 16 files changed, 915 insertions(+), 227 deletions(-)
 create mode 100644 d

diff --git a/d b/d
new file mode 100644
index 00000000..09ddbcc5
--- /dev/null
+++ b/d
@@ -0,0 +1,553 @@
+diff --git a/inc/instance-config.php b/inc/instance-config.php
+index 699d1a1..475f3ed 100644
+--- a/inc/instance-config.php
++++ b/inc/instance-config.php
+@@ -18,15 +18,15 @@
+ 	$config['db']['user'] = 'root';
+ 	$config['db']['password'] = '';
+ 	$config['timezone'] = 'UTC';
+-	$config['cache']['enabled'] = 'apc';
+-
+-
++	$config['cache']['enabled'] = false;
++	
++	
+ 	$config['cookies']['mod'] = 'mod';
+ 	$config['cookies']['salt'] = '';
+-
++	
+ 	$config['spam']['hidden_inputs_max_pass'] = 128;
+ 	$config['spam']['hidden_inputs_expire'] = 60 * 60 * 4; // three hours
+-
++	
+ 	$config['flood_time'] = 5;
+ 	$config['flood_time_ip'] = 30;
+ 	$config['flood_time_same'] = 2;
+@@ -46,10 +46,10 @@
+ 	$config['thread_subject_in_title'] = true;
+ 	$config['spam']['hidden_inputs_max_pass'] = 128;
+ 	$config['ayah_enabled'] = true;
+-
++	
+ 	// Load database credentials
+ 	require "secrets.php";
+-
++	
+ 	// Image shit
+ 	$config['thumb_method'] = 'gm+gifsicle';
+ 	$config['thumb_ext'] = '';
+diff --git a/install.php b/install.php
+index 8b3815a..07e94e7 100644
+--- a/install.php
++++ b/install.php
+@@ -579,7 +579,8 @@ if ($step == 0) {
+ 	</p>';
+ 	
+ 	echo Element('page.html', $page);
+-} elseif ($step == 1) {
++}
++elseif ($step == 1) {
+ 	$page['title'] = 'Pre-installation test';
+ 	
+ 	$can_exec = true;
+@@ -761,7 +762,8 @@ if ($step == 0) {
+ 		'title' => 'Checking environment',
+ 		'config' => $config
+ 	));
+-} elseif ($step == 2) {
++}
++elseif ($step == 2) {
+ 	// Basic config
+ 	$page['title'] = 'Configuration';
+ 	
+@@ -775,7 +777,8 @@ if ($step == 0) {
+ 		'title' => 'Configuration',
+ 		'config' => $config
+ 	));
+-} elseif ($step == 3) {
++}
++elseif ($step == 3) {
+ 	$instance_config = 
+ '<?php
+ 
+@@ -814,7 +817,8 @@ if ($step == 0) {
+ 	
+ 	if (@file_put_contents('inc/instance-config.php', $instance_config)) {
+ 		header('Location: ?step=4', true, $config['redirect_http']);
+-	} else {
++	}
++	else {
+ 		$page['title'] = 'Manual installation required';
+ 		$page['body'] = '
+ 			<p>I couldn\'t write to <strong>inc/instance-config.php</strong> with the new configuration, probably due to a permissions error.</p>
+@@ -826,7 +830,8 @@ if ($step == 0) {
+ 		';
+ 		echo Element('page.html', $page);
+ 	}
+-} elseif ($step == 4) {
++}
++elseif ($step == 4) {
+ 	// SQL installation
+ 	
+ 	buildJavascript();
+@@ -846,11 +851,15 @@ if ($step == 0) {
+ 	
+ 	$sql_errors = '';
+ 	foreach ($queries as $query) {
+-		if ($mysql_version < 50503)
++		if ($mysql_version < 50503) {
+ 			$query = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $query);
++		}
++		
+ 		$query = preg_replace('/^([\w\s]*)`([0-9a-zA-Z$_\x{0080}-\x{FFFF}]+)`/u', '$1``$2``', $query);
+-		if (!query($query))
++		
++		if (!query($query)) {
+ 			$sql_errors .= '<li>' . db_error() . '</li>';
++		}
+ 	}
+ 	
+ 	$page['title'] = 'Installation complete';
+@@ -858,7 +867,8 @@ if ($step == 0) {
+ 	
+ 	if (!empty($sql_errors)) {
+ 		$page['body'] .= '<div class="ban"><h2>SQL errors</h2><p>SQL errors were encountered when trying to install the database. This may be the result of using a database which is already occupied with a vichan installation; if so, you can probably ignore this.</p><p>The errors encountered were:</p><ul>' . $sql_errors . '</ul><p><a href="?step=5">Ignore errors and complete installation.</a></p></div>';
+-	} else {
++	}
++	else {
+ 		$boards = listBoards();
+ 		foreach ($boards as &$_board) {
+ 			setupBoard($_board);
+@@ -866,13 +876,11 @@ if ($step == 0) {
+ 		}
+ 		
+ 		file_write($config['has_installed'], VERSION);
+-		/*if (!file_unlink(__FILE__)) {
+-			$page['body'] .= '<div class="ban"><h2>Delete install.php!</h2><p>I couldn\'t remove <strong>install.php</strong>. You will have to remove it manually.</p></div>';
+-		}*/
+ 	}
+ 	
+ 	echo Element('page.html', $page);
+-} elseif ($step == 5) {
++}
++elseif ($step == 5) {
+ 	$page['title'] = 'Installation complete';
+ 	$page['body'] = '<p style="text-align:center">Thank you for using vichan. Please remember to report any bugs you discover.</p>';
+ 	
+diff --git a/templates/8chan/index.html b/templates/8chan/index.html
+index 459e7e8..4f25473 100644
+--- a/templates/8chan/index.html
++++ b/templates/8chan/index.html
+@@ -223,7 +223,7 @@
+     </style>
+   </head>
+ 
+-  <body>
++  <body class="8chan index">
+ 
+     <div id="main">
+ 
+diff --git a/templates/generic_page.html b/templates/generic_page.html
+index 0fe1f9c..4cd3116 100644
+--- a/templates/generic_page.html
++++ b/templates/generic_page.html
+@@ -6,7 +6,7 @@
+ 	<title>{{ board.url }} - {{ board.name }}</title>
+ 	{% endblock %}
+ </head>
+-<body>	
++<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 %}">
+ 	{{ 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="banner" src="{{ config.url_banner }}" {% 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 %}
+diff --git a/templates/index.html b/templates/index.html
+index aae87c1..5638fd6 100644
+--- a/templates/index.html
++++ b/templates/index.html
+@@ -14,7 +14,7 @@
+ 	{% include 'header.html' %}
+ 	<title>{{ board.url }} - {{ board.title|e }}</title>
+ </head>
+-<body>	
++<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 %}">
+ 	{{ 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 %}
+diff --git a/templates/main.js b/templates/main.js
+index 1ec4d26..d100f93 100644
+--- a/templates/main.js
++++ b/templates/main.js
+@@ -73,11 +73,6 @@ var saved = {};
+ 
+ 
+ var selectedstyle = '{% endraw %}{{ config.default_stylesheet.0|addslashes }}{% raw %}';
+-/*var styles = {
+-	{% endraw %}
+-	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
+-	{% endraw %}{% endfor %}{% raw %}
+-};*/
+ var board_name = false;
+ 
+ function changeStyle(styleName, link) {
+@@ -92,36 +87,78 @@ function changeStyle(styleName, link) {
+ 	{% endif %}
+ 	{% raw %}
+ 	
+-	if (!document.getElementById('stylesheet')) {
+-		var s = document.createElement('link');
+-		s.rel = 'stylesheet';
+-		s.type = 'text/css';
+-		s.id = 'stylesheet';
++	// Find the <dom> for the stylesheet. May be nothing.
++	var domStylesheet = document.getElementById('stylesheet');
++	// Determine if this stylesheet is the default.
++	var setToDefault  = ( styles[styleName] == "" || styles[styleName] == "/stylesheets/" );
++	// Turn "Yotsuba B" to "yotsuba_b" 
++	var attributeName = styleName.replace(/[^a-z0-9_\-]/gi, '_').toLowerCase();
++	
++	if( !domStylesheet && !setToDefault ) {
++		domStylesheet = document.createElement('link');
++		domStylesheet.rel = 'stylesheet';
++		domStylesheet.type = 'text/css';
++		domStylesheet.id = 'stylesheet';
++		
+ 		var x = document.getElementsByTagName('head')[0];
+-		x.appendChild(s);
++		x.appendChild(domStylesheet);
+ 	}
+-
+-	{% endraw %}
+-	var root = "{{ config.root }}";
+-	{% raw %}
+-	root = root.replace(/\/$/, "");
+-	
+-	document.getElementById('stylesheet').href = root + styles[styleName];
+-	selectedstyle = styleName;
+ 	
+-	if (document.getElementsByClassName('styles').length != 0) {
+-		var styleLinks = document.getElementsByClassName('styles')[0].childNodes;
+-		for (var i = 0; i < styleLinks.length; i++) {
+-			styleLinks[i].className = '';
++	if( !setToDefault ) {
++		{% endraw %}
++		var root = "{{ config.root }}";
++		{% raw %}
++		root = root.replace(/\/$/, "");
++		
++		domStylesheet.href = root + styles[styleName];
++		selectedstyle = styleName;
++		
++		if (document.getElementsByClassName('styles').length != 0) {
++			var styleLinks = document.getElementsByClassName('styles')[0].childNodes;
++			for (var i = 0; i < styleLinks.length; i++) {
++				styleLinks[i].className = '';
++			}
+ 		}
++		
++		if (link) {
++			link.className = 'selected';
++		}
++	}
++	else if( domStylesheet ) {
++		domStylesheet.parentNode.removeChild( domStylesheet );
+ 	}
+ 	
+-	if (link) {
+-		link.className = 'selected';
++	// Fix the classes on the body tag.
++	var body = document.getElementsByTagName('body')[0];
++	
++	if( body ) {
++		var bodyClasses = document.getElementsByTagName('body')[0].getAttribute('class').split(" ");
++		var bodyClassesNew = [];
++		
++		for( i = 0; i < bodyClasses.length; ++i ) {
++			var bodyClass = bodyClasses[ i ];
++			
++			// null class from a double-space.
++			if( bodyClass == "" ) {
++				continue;
++			}
++			
++			if( bodyClass.indexOf( "stylesheet-" ) == 0 ) {
++				continue;
++			}
++			
++			bodyClassesNew.push( bodyClass );
++		}
++		
++		// Add stylesheet-yotsuba_b at the end.
++		bodyClassesNew.push( "stylesheet-" + attributeName );
++		body.setAttribute( 'class', bodyClassesNew.join(" ") );
++		body.setAttribute( 'data-stylesheet', attributeName );
+ 	}
+ 	
+-	if (typeof $ != 'undefined')
++	if (typeof $ != 'undefined') {
+ 		$(window).trigger('stylesheet', styleName);
++	}
+ }
+ 
+ 
+@@ -167,7 +204,7 @@ function init_stylechooser() {
+ 			}
+ 		}
+ 	}
+-	{% endraw%}
++	{% endraw %}
+ {% else %}
+ 	{% raw %}
+ 	if (localStorage.stylesheet) {
+@@ -185,10 +222,13 @@ function init_stylechooser() {
+ 
+ function get_cookie(cookie_name) {
+ 	var results = document.cookie.match ( '(^|;) ?' + cookie_name + '=([^;]*)(;|$)');
+-	if (results)
++	
++	if (results) {
+ 		return (unescape(results[2]));
+-	else
++	}
++	else {
+ 		return null;
++	}
+ }
+ 
+ function highlightReply(id) {
+diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
+index 4f76625..87e67c8 100644
+--- a/templates/mod/dashboard.html
++++ b/templates/mod/dashboard.html
+@@ -1,40 +1,5 @@
+-<fieldset>
+-	<legend>{% trans 'Boards' %}</legend>
+-	
+-	<ul>
+-		{% for board in boards %}
+-		{% if board.uri in mod.boards or mod.boards[0] == '*' %}
+-			<li>
+-				<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board.uri) }}</a>
+-					 - 
+-				{{ board.title|e }}
+-				{% if board.subtitle %}
+-					<small>&mdash; 
+-						{% if config.allow_subtitle_html %}
+-							{{ board.subtitle }}
+-						{% else %}
+-							{{ board.subtitle|e }}
+-						{% endif %}
+-					</small>
+-
+-				{% endif %}
+-				{% if mod.type == "20" %}
+-					<a href="?/settings/{{ board.uri }}"><small>[{% trans 'settings' %}]</small></a>
+-				{% endif %}
+-				{% if mod|hasPermission(config.mod.manageboards) %}
+-					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
+-				{% endif %}
+-			</li>
+-		{% endif %}
+-		{% endfor %}
+-		
+-		{% if mod|hasPermission(config.mod.newboard) %}
+-			<li style="margin-top:15px"><a href="?/new-board"><strong>{% trans 'Create new board' %}</strong></a></li>
+-		{% endif %}
+-	</ul>
+-</fieldset>
+-
+-<fieldset>
++<!-- Messages -->
++<fieldset class="mod-dash mod-dash-set mod-dash-messages">
+ 	<legend>{% trans 'Messages' %}</legend>
+ 	<ul>
+ 		{% if mod|hasPermission(config.mod.noticeboard) %}
+@@ -78,7 +43,8 @@
+ 	</ul>
+ </fieldset>
+ 
+-<fieldset>
++<!-- Administration -->
++<fieldset class="mod-dash mod-dash-set mod-dash-messages">
+ 	<legend>{% trans 'Administration' %}</legend>
+ 	
+ 	<ul>
+@@ -123,57 +89,99 @@
+ 	</ul>
+ </fieldset>
+ 
++<!-- Search -->
+ {% if mod|hasPermission(config.mod.search) %}
+-	<fieldset>
+-		<legend>{% trans 'Search' %}</legend>
+-		
+-		<ul>
++<fieldset class="mod-dash mod-dash-set mod-dash-search">
++	<legend>{% trans 'Search' %}</legend>
++	
++	<ul>
++		<li>
++			{% include 'mod/search_form.html' %}
++		</li>
++	</ul>
++</fieldset>
++{%  endif %}
++
++<!-- Boards -->
++<fieldset class="mod-dash mod-dash-set mod-dash-boards">
++	<legend>{% trans 'Boards' %}</legend>
++	
++	<ul>
++		{% for board in boards %}
++		{% if board.uri in mod.boards or mod.boards[0] == '*' %}
+ 			<li>
+-				{% include 'mod/search_form.html' %}
++				<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board.uri) }}</a>
++					 - 
++				{{ board.title|e }}
++				{% if board.subtitle %}
++					<small>&mdash; 
++						{% if config.allow_subtitle_html %}
++							{{ board.subtitle }}
++						{% else %}
++							{{ board.subtitle|e }}
++						{% endif %}
++					</small>
++
++				{% endif %}
++				{% if mod.type == "20" %}
++					<a href="?/settings/{{ board.uri }}"><small>[{% trans 'settings' %}]</small></a>
++				{% endif %}
++				{% if mod|hasPermission(config.mod.manageboards) %}
++					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
++				{% endif %}
+ 			</li>
+-		</ul>
+-	</fieldset>
+-{%  endif %}
++		{% endif %}
++		{% endfor %}
++		
++		{% if mod|hasPermission(config.mod.newboard) %}
++			<li style="margin-top:15px"><a href="?/new-board"><strong>{% trans 'Create new board' %}</strong></a></li>
++		{% endif %}
++	</ul>
++</fieldset>
+ 
++<!-- Misc -->
+ {% if config.mod.dashboard_links|count %}
+-	<fieldset>
+-		<legend>{% trans 'Other' %}</legend>
+-	
+-		<ul>
+-			{% for label,link in config.mod.dashboard_links %}
+-				<li><a href="{{ link }}">{{ label }}</a></li>
+-			{% endfor %}
+-		</ul>
+-	</fieldset>
++<fieldset class="mod-dash mod-dash-set mod-dash-misc">
++	<legend>{% trans 'Other' %}</legend>
++
++	<ul>
++		{% for label,link in config.mod.dashboard_links %}
++			<li><a href="{{ link }}">{{ label }}</a></li>
++		{% endfor %}
++	</ul>
++</fieldset>
+ {% endif %}
+ 
++<!-- Debug Information -->
+ {% if config.debug %}
+-	<fieldset>
+-		<legend>{% trans 'Debug' %}</legend>
+-		<ul>
+-			<li><a href="?/debug/antispam">{% trans 'Anti-spam' %}</a></li>
+-			<li><a href="?/debug/recent">{% trans 'Recent posts' %}</a></li>
+-			{% if mod|hasPermission(config.mod.debug_sql) %}
+-				<li><a href="?/debug/sql">{% trans 'SQL' %}</a></li>
+-			{% endif %}
+-		</ul>
+-	</fieldset>
++<fieldset class="mod-dash mod-dash-set mod-dash-debug">
++	<legend>{% trans 'Debug' %}</legend>
++	<ul>
++		<li><a href="?/debug/antispam">{% trans 'Anti-spam' %}</a></li>
++		<li><a href="?/debug/recent">{% trans 'Recent posts' %}</a></li>
++		{% if mod|hasPermission(config.mod.debug_sql) %}
++			<li><a href="?/debug/sql">{% trans 'SQL' %}</a></li>
++		{% endif %}
++	</ul>
++</fieldset>
+ {% endif %}
+ 
++<!-- Update -->
+ {% if newer_release %}
+-	<fieldset>
+-		<legend>Update</legend>
+-		<ul>
+-			<li>
+-				A newer version of Tinyboard 
+-				(<strong>v{{ newer_release.massive }}.{{ newer_release.major }}.{{ newer_release.minor }}</strong>) is available! 
+-				See <a href="http://tinyboard.org">http://tinyboard.org/</a> for upgrade instructions.
+-			</li>
+-		</ul>
+-	</fieldset>
++<fieldset class="mod-dash mod-dash-set mod-dash-update">
++	<legend>Update</legend>
++	<ul>
++		<li>
++			A newer version of Tinyboard 
++			(<strong>v{{ newer_release.massive }}.{{ newer_release.major }}.{{ newer_release.minor }}</strong>) is available! 
++			See <a href="http://tinyboard.org">http://tinyboard.org/</a> for upgrade instructions.
++		</li>
++	</ul>
++</fieldset>
+ {% endif %}
+ 
+-<fieldset>
++<!-- Account Actions -->
++<fieldset class="mod-dash mod-dash-set mod-dash-account">
+ 	<legend>{% trans 'User account' %}</legend>
+ 	
+ 	<ul>
+diff --git a/templates/page.html b/templates/page.html
+index b136566..a3916b6 100644
+--- a/templates/page.html
++++ b/templates/page.html
+@@ -6,9 +6,10 @@
+ 		active_page = "page";
+ 	</script>
+ 	{% include 'header.html' %}
++	{% if mod %}{% include 'mod/header.html' %}{% endif %}
+ 	<title>{{ title }}</title>
+ </head>
+-<body>
++<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>
+diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html
+index 3376a68..0ec18f9 100644
+--- a/templates/themes/basic/index.html
++++ b/templates/themes/basic/index.html
+@@ -11,7 +11,7 @@
+ 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
+ 	{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
+ </head>
+-<body>
++<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 %}">
+ 	{{ boardlist.top }}
+ 	<header>
+ 		<h1>{{ settings.title }}</h1>
+diff --git a/templates/thread.html b/templates/thread.html
+index af2a6e0..a3ace9b 100644
+--- a/templates/thread.html
++++ b/templates/thread.html
+@@ -10,7 +10,7 @@
+ 	{% include 'header.html' %}
+ 	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
+ </head>
+-<body>
++<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 %}">
+ 	{{ 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 }}" {% 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 %}
diff --git a/inc/instance-config.php b/inc/instance-config.php
index 699d1a18..475f3ed6 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -18,15 +18,15 @@
 	$config['db']['user'] = 'root';
 	$config['db']['password'] = '';
 	$config['timezone'] = 'UTC';
-	$config['cache']['enabled'] = 'apc';
-
-
+	$config['cache']['enabled'] = false;
+	
+	
 	$config['cookies']['mod'] = 'mod';
 	$config['cookies']['salt'] = '';
-
+	
 	$config['spam']['hidden_inputs_max_pass'] = 128;
 	$config['spam']['hidden_inputs_expire'] = 60 * 60 * 4; // three hours
-
+	
 	$config['flood_time'] = 5;
 	$config['flood_time_ip'] = 30;
 	$config['flood_time_same'] = 2;
@@ -46,10 +46,10 @@
 	$config['thread_subject_in_title'] = true;
 	$config['spam']['hidden_inputs_max_pass'] = 128;
 	$config['ayah_enabled'] = true;
-
+	
 	// Load database credentials
 	require "secrets.php";
-
+	
 	// Image shit
 	$config['thumb_method'] = 'gm+gifsicle';
 	$config['thumb_ext'] = '';
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 52b831aa..0b7b78ca 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -2266,6 +2266,7 @@ function mod_reports($global = false) {
 	if ($mod['type'] == '20' and $global)
 		error($config['error']['noaccess']);
 	
+	// Get REPORTS.
 	$query = prepare("SELECT * FROM ``reports`` " . ($mod["type"] == "20" ? "WHERE board = :board" : "") . " ORDER BY `time` DESC LIMIT :limit");
 	if ($mod['type'] == '20')
 		$query->bindValue(':board', $mod['boards'][0]);
@@ -2273,82 +2274,156 @@ function mod_reports($global = false) {
 	if ($global) {
 		$query = prepare("SELECT * FROM ``reports`` WHERE global = TRUE ORDER BY `time` DESC LIMIT :limit");
 	}
-
+	
 	$query->bindValue(':limit', $config['mod']['recent_reports'], PDO::PARAM_INT);
 	
-
 	$query->execute() or error(db_error($query));
 	$reports = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	$report_queries = array();
-	foreach ($reports as $report) {
-		if (!isset($report_queries[$report['board']]))
-			$report_queries[$report['board']] = array();
-		$report_queries[$report['board']][] = $report['post'];
-	}
-	
-	$report_posts = array();
-	foreach ($report_queries as $board => $posts) {
-		$report_posts[$board] = array();
+	// Cut off here if we don't have any reports.
+	$reportCount = 0;
+	$reportHTML = '';
+	if( count( $reports ) > 0 ) {
 		
-		$query = query(sprintf('SELECT * FROM ``posts_%s`` WHERE `id` = ' . implode(' OR `id` = ', $posts), $board)) or error(db_error());
-		while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
-			$report_posts[$board][$post['id']] = $post;
+		// Build queries to fetch content.
+		$report_queries = array();
+		foreach ($reports as $report) {
+			if (!isset($report_queries[$report['board']]))
+				$report_queries[$report['board']] = array();
+			$report_queries[$report['board']][] = $report['post'];
+		}
+		
+		// Get reported CONTENT.
+		$report_posts = array();
+		foreach ($report_queries as $board => $posts) {
+			$report_posts[$board] = array();
+			
+			$query = query(sprintf('SELECT * FROM ``posts_%s`` WHERE `id` = ' . implode(' OR `id` = ', $posts), $board)) or error(db_error());
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+				$report_posts[$board][$post['id']] = $post;
+			}
+		}
+		
+		// Develop an associative array of posts to reports.
+		$report_index = array();
+		foreach( $reports as &$report ) {
+			
+			// Delete reports which are for removed content.
+			if( !isset( $report_posts[ $report['board'] ][ $report['post'] ] ) ) {
+				// Invalid report (post has since been deleted)
+				$query = prepare("DELETE FROM ``reports`` WHERE `post` = :id AND `board` = :board");
+				$query->bindValue(':id', $report['post'], PDO::PARAM_INT);
+				$query->bindValue(':board', $report['board']);
+				$query->execute() or error(db_error($query));
+				continue;
+			}
+			
+			// Build a unique ID.
+			$content_key = "{$report['board']}.{$report['post']}";
+			
+			// Create a dummy array if it doesn't already exist.
+			if( !isset( $report_index[ $content_key ] ) ) {
+				$report_index[ $content_key ] = array(
+					"board_id" => $report['board'],
+					"post_id"  => $report['post'],
+					"content"  => &$report_posts[ $report['board'] ][ $report['post'] ],
+					"reports"  => array(),
+				);
+			}
+			
+			// Add the report to the list of reports.
+			$report_index[ $content_key ]['reports'][ $report['id'] ] = &$report;
+			
+			// Increment the total report count.
+			++$reportCount;
+		}
+		
+		
+		// Only continue if we have something to do.
+		// If there are no valid reports left, we're done.
+		if( $reportCount > 0 ) {
+			
+			// Sort this report index by number of reports, desc.
+			usort( $report_index, function( $a, $b ) {
+				$ra = $a['reports'];
+				$rb = $b['reports'];
+				
+				if( $ra < $rb ) {
+					return 1;
+				}
+				else if( $rb > $ra ) {
+					return -1;
+				}
+				else {
+					return 0;
+				}
+			} );
+			
+			// Loop through the custom index.
+			foreach( $report_index as &$report_item ) {
+				$content = $report_item['content'];
+				
+				// Load board content.
+				openBoard($report_item['board_id']);
+				
+				// Load the reported content.
+				if( !$content['thread'] ) {
+					// Still need to fix this:
+					$po = new Thread($content, '?/', $mod, false);
+				}
+				else {
+					$po = new Post($content, '?/', $mod);
+				}
+				
+				// Add each report's template to this container.
+				$report_html = "";
+				$content_reports = 0;
+				foreach( $report_item['reports'] as $report ) {
+					$report_html .= Element('mod/report.html', array(
+						'report'    => $report,
+						'config'    => $config,
+						'mod'       => $mod,
+						'token'     => make_secure_link_token('reports/' . $report['id'] . '/dismiss'),
+						'token_all' => make_secure_link_token('reports/' . $report['id'] . '/dismissall')
+					));
+					
+					++$content_reports;
+				}
+				
+				// Build the ">>>/b/ thread reported 3 times" title.
+				$report_title = sprintf(
+					_('<a href="%s" title="View content" target="_new">&gt;&gt;&gt;/%s/</a> %s reported %d time(s).'),
+					"?/{$report_item['board_id']}/res/" . ( $content['thread'] ?: $content['id'] ) . ".html#{$content['thread']}",
+					$report_item['board_id'],
+					_( $content['thread'] ? "reply" : "thread" ),
+					$content_reports
+				);
+				
+				$content_html = Element('mod/report_content.html', array(
+					'reports_html'  => $report_html,
+					'report_count'  => $content_reports,
+					
+					'content_html'  => $po->build(true),
+					'content_board' => $report_item['board_id'],
+					'content'       => $content,
+					
+					'config'        => $config,
+					'mod'           => $mod,
+					'report_title'  => $report_title,
+				));
+				
+				$reportHTML .= $content_html;
+			}
 		}
 	}
 	
-	$count = 0;
-	$body = '';
-	foreach ($reports as $report) {
-		if (!isset($report_posts[$report['board']][$report['post']])) {
-			// // Invalid report (post has since been deleted)
-			$query = prepare("DELETE FROM ``reports`` WHERE `post` = :id AND `board` = :board");
-			$query->bindValue(':id', $report['post'], PDO::PARAM_INT);
-			$query->bindValue(':board', $report['board']);
-			$query->execute() or error(db_error($query));
-			continue;
-		}
-		
-		openBoard($report['board']);
-		
-		$post = &$report_posts[$report['board']][$report['post']];
-		
-		if (!$post['thread']) {
-			// Still need to fix this:
-			$po = new Thread($post, '?/', $mod, false);
-		} else {
-			$po = new Post($post, '?/', $mod);
-		}
-		
-		// a little messy and inefficient
-		$append_html = Element('mod/report.html', array(
-			'report' => $report,
-			'config' => $config,
-			'mod' => $mod,
-			'token' => make_secure_link_token('reports/' . $report['id'] . '/dismiss'),
-			'token_all' => make_secure_link_token('reports/' . $report['id'] . '/dismissall')
-		));
-		
-		// Bug fix for https://github.com/savetheinternet/Tinyboard/issues/21
-		$po->body = truncate($po->body, $po->link(), $config['body_truncate'] - substr_count($append_html, '<br>'));
-		
-		if (mb_strlen($po->body) + mb_strlen($append_html) > $config['body_truncate_char']) {
-			// still too long; temporarily increase limit in the config
-			$__old_body_truncate_char = $config['body_truncate_char'];
-			$config['body_truncate_char'] = mb_strlen($po->body) + mb_strlen($append_html);
-		}
-		
-		$po->body .= $append_html;
-		
-		$body .= $po->build(true) . '<hr>';
-		
-		if (isset($__old_body_truncate_char))
-			$config['body_truncate_char'] = $__old_body_truncate_char;
-		
-		$count++;
-	}
+	$pageArgs = array(
+		'count'   => $reportCount,
+		'reports' => $reportHTML,
+		'global'  => $global,
+	);
 	
-	mod_page(sprintf('%s (%d)', _('Report queue'), $count), 'mod/reports.html', array('reports' => $body, 'count' => $count));
+	mod_page( sprintf('%s (%d)', _( ( $global ? 'Global report queue' : 'Report queue' ) ), $reportCount), 'mod/reports.html', $pageArgs );
 }
 
 function mod_report_dismiss($id, $all = false) {
@@ -2361,7 +2436,8 @@ function mod_report_dismiss($id, $all = false) {
 		$ip = $report['ip'];
 		$board = $report['board'];
 		$post = $report['post'];
-	} else
+	}
+	else
 		error($config['error']['404']);
 	
 	if (!$all && !hasPermission($config['mod']['report_dismiss'], $board))
diff --git a/install.php b/install.php
index 8b3815a2..07e94e7f 100644
--- a/install.php
+++ b/install.php
@@ -579,7 +579,8 @@ if ($step == 0) {
 	</p>';
 	
 	echo Element('page.html', $page);
-} elseif ($step == 1) {
+}
+elseif ($step == 1) {
 	$page['title'] = 'Pre-installation test';
 	
 	$can_exec = true;
@@ -761,7 +762,8 @@ if ($step == 0) {
 		'title' => 'Checking environment',
 		'config' => $config
 	));
-} elseif ($step == 2) {
+}
+elseif ($step == 2) {
 	// Basic config
 	$page['title'] = 'Configuration';
 	
@@ -775,7 +777,8 @@ if ($step == 0) {
 		'title' => 'Configuration',
 		'config' => $config
 	));
-} elseif ($step == 3) {
+}
+elseif ($step == 3) {
 	$instance_config = 
 '<?php
 
@@ -814,7 +817,8 @@ if ($step == 0) {
 	
 	if (@file_put_contents('inc/instance-config.php', $instance_config)) {
 		header('Location: ?step=4', true, $config['redirect_http']);
-	} else {
+	}
+	else {
 		$page['title'] = 'Manual installation required';
 		$page['body'] = '
 			<p>I couldn\'t write to <strong>inc/instance-config.php</strong> with the new configuration, probably due to a permissions error.</p>
@@ -826,7 +830,8 @@ if ($step == 0) {
 		';
 		echo Element('page.html', $page);
 	}
-} elseif ($step == 4) {
+}
+elseif ($step == 4) {
 	// SQL installation
 	
 	buildJavascript();
@@ -846,11 +851,15 @@ if ($step == 0) {
 	
 	$sql_errors = '';
 	foreach ($queries as $query) {
-		if ($mysql_version < 50503)
+		if ($mysql_version < 50503) {
 			$query = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $query);
+		}
+		
 		$query = preg_replace('/^([\w\s]*)`([0-9a-zA-Z$_\x{0080}-\x{FFFF}]+)`/u', '$1``$2``', $query);
-		if (!query($query))
+		
+		if (!query($query)) {
 			$sql_errors .= '<li>' . db_error() . '</li>';
+		}
 	}
 	
 	$page['title'] = 'Installation complete';
@@ -858,7 +867,8 @@ if ($step == 0) {
 	
 	if (!empty($sql_errors)) {
 		$page['body'] .= '<div class="ban"><h2>SQL errors</h2><p>SQL errors were encountered when trying to install the database. This may be the result of using a database which is already occupied with a vichan installation; if so, you can probably ignore this.</p><p>The errors encountered were:</p><ul>' . $sql_errors . '</ul><p><a href="?step=5">Ignore errors and complete installation.</a></p></div>';
-	} else {
+	}
+	else {
 		$boards = listBoards();
 		foreach ($boards as &$_board) {
 			setupBoard($_board);
@@ -866,13 +876,11 @@ if ($step == 0) {
 		}
 		
 		file_write($config['has_installed'], VERSION);
-		/*if (!file_unlink(__FILE__)) {
-			$page['body'] .= '<div class="ban"><h2>Delete install.php!</h2><p>I couldn\'t remove <strong>install.php</strong>. You will have to remove it manually.</p></div>';
-		}*/
 	}
 	
 	echo Element('page.html', $page);
-} elseif ($step == 5) {
+}
+elseif ($step == 5) {
 	$page['title'] = 'Installation complete';
 	$page['body'] = '<p style="text-align:center">Thank you for using vichan. Please remember to report any bugs you discover.</p>';
 	
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 54823b2b..c33a0589 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -658,7 +658,7 @@ pre {
   margin-left: -20px;
 }
 
-div.thread:hover {
+.theme-catalog div.thread:hover {
   background: #D6DAF0;
   border-color: #B7C5D9;
 }
diff --git a/templates/8chan/index.html b/templates/8chan/index.html
index 459e7e8e..4f254736 100644
--- a/templates/8chan/index.html
+++ b/templates/8chan/index.html
@@ -223,7 +223,7 @@
     </style>
   </head>
 
-  <body>
+  <body class="8chan index">
 
     <div id="main">
 
diff --git a/templates/generic_page.html b/templates/generic_page.html
index 0fe1f9c5..4cd31162 100644
--- a/templates/generic_page.html
+++ b/templates/generic_page.html
@@ -6,7 +6,7 @@
 	<title>{{ board.url }} - {{ board.name }}</title>
 	{% endblock %}
 </head>
-<body>	
+<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 %}">
 	{{ 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="banner" src="{{ config.url_banner }}" {% 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 %}
diff --git a/templates/index.html b/templates/index.html
index aae87c17..5638fd65 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -14,7 +14,7 @@
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.title|e }}</title>
 </head>
-<body>	
+<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 %}">
 	{{ 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 %}
diff --git a/templates/main.js b/templates/main.js
index 1ec4d268..d100f93e 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -73,11 +73,6 @@ var saved = {};
 
 
 var selectedstyle = '{% endraw %}{{ config.default_stylesheet.0|addslashes }}{% raw %}';
-/*var styles = {
-	{% endraw %}
-	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
-	{% endraw %}{% endfor %}{% raw %}
-};*/
 var board_name = false;
 
 function changeStyle(styleName, link) {
@@ -92,36 +87,78 @@ function changeStyle(styleName, link) {
 	{% endif %}
 	{% raw %}
 	
-	if (!document.getElementById('stylesheet')) {
-		var s = document.createElement('link');
-		s.rel = 'stylesheet';
-		s.type = 'text/css';
-		s.id = 'stylesheet';
+	// Find the <dom> for the stylesheet. May be nothing.
+	var domStylesheet = document.getElementById('stylesheet');
+	// Determine if this stylesheet is the default.
+	var setToDefault  = ( styles[styleName] == "" || styles[styleName] == "/stylesheets/" );
+	// Turn "Yotsuba B" to "yotsuba_b" 
+	var attributeName = styleName.replace(/[^a-z0-9_\-]/gi, '_').toLowerCase();
+	
+	if( !domStylesheet && !setToDefault ) {
+		domStylesheet = document.createElement('link');
+		domStylesheet.rel = 'stylesheet';
+		domStylesheet.type = 'text/css';
+		domStylesheet.id = 'stylesheet';
+		
 		var x = document.getElementsByTagName('head')[0];
-		x.appendChild(s);
+		x.appendChild(domStylesheet);
 	}
-
-	{% endraw %}
-	var root = "{{ config.root }}";
-	{% raw %}
-	root = root.replace(/\/$/, "");
 	
-	document.getElementById('stylesheet').href = root + styles[styleName];
-	selectedstyle = styleName;
-	
-	if (document.getElementsByClassName('styles').length != 0) {
-		var styleLinks = document.getElementsByClassName('styles')[0].childNodes;
-		for (var i = 0; i < styleLinks.length; i++) {
-			styleLinks[i].className = '';
+	if( !setToDefault ) {
+		{% endraw %}
+		var root = "{{ config.root }}";
+		{% raw %}
+		root = root.replace(/\/$/, "");
+		
+		domStylesheet.href = root + styles[styleName];
+		selectedstyle = styleName;
+		
+		if (document.getElementsByClassName('styles').length != 0) {
+			var styleLinks = document.getElementsByClassName('styles')[0].childNodes;
+			for (var i = 0; i < styleLinks.length; i++) {
+				styleLinks[i].className = '';
+			}
+		}
+		
+		if (link) {
+			link.className = 'selected';
 		}
 	}
-	
-	if (link) {
-		link.className = 'selected';
+	else if( domStylesheet ) {
+		domStylesheet.parentNode.removeChild( domStylesheet );
 	}
 	
-	if (typeof $ != 'undefined')
+	// Fix the classes on the body tag.
+	var body = document.getElementsByTagName('body')[0];
+	
+	if( body ) {
+		var bodyClasses = document.getElementsByTagName('body')[0].getAttribute('class').split(" ");
+		var bodyClassesNew = [];
+		
+		for( i = 0; i < bodyClasses.length; ++i ) {
+			var bodyClass = bodyClasses[ i ];
+			
+			// null class from a double-space.
+			if( bodyClass == "" ) {
+				continue;
+			}
+			
+			if( bodyClass.indexOf( "stylesheet-" ) == 0 ) {
+				continue;
+			}
+			
+			bodyClassesNew.push( bodyClass );
+		}
+		
+		// Add stylesheet-yotsuba_b at the end.
+		bodyClassesNew.push( "stylesheet-" + attributeName );
+		body.setAttribute( 'class', bodyClassesNew.join(" ") );
+		body.setAttribute( 'data-stylesheet', attributeName );
+	}
+	
+	if (typeof $ != 'undefined') {
 		$(window).trigger('stylesheet', styleName);
+	}
 }
 
 
@@ -167,7 +204,7 @@ function init_stylechooser() {
 			}
 		}
 	}
-	{% endraw%}
+	{% endraw %}
 {% else %}
 	{% raw %}
 	if (localStorage.stylesheet) {
@@ -185,10 +222,13 @@ function init_stylechooser() {
 
 function get_cookie(cookie_name) {
 	var results = document.cookie.match ( '(^|;) ?' + cookie_name + '=([^;]*)(;|$)');
-	if (results)
+	
+	if (results) {
 		return (unescape(results[2]));
-	else
+	}
+	else {
 		return null;
+	}
 }
 
 function highlightReply(id) {
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 4f766254..87e67c85 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -1,40 +1,5 @@
-<fieldset>
-	<legend>{% trans 'Boards' %}</legend>
-	
-	<ul>
-		{% for board in boards %}
-		{% if board.uri in mod.boards or mod.boards[0] == '*' %}
-			<li>
-				<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board.uri) }}</a>
-					 - 
-				{{ board.title|e }}
-				{% if board.subtitle %}
-					<small>&mdash; 
-						{% if config.allow_subtitle_html %}
-							{{ board.subtitle }}
-						{% else %}
-							{{ board.subtitle|e }}
-						{% endif %}
-					</small>
-
-				{% endif %}
-				{% if mod.type == "20" %}
-					<a href="?/settings/{{ board.uri }}"><small>[{% trans 'settings' %}]</small></a>
-				{% endif %}
-				{% if mod|hasPermission(config.mod.manageboards) %}
-					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
-				{% endif %}
-			</li>
-		{% endif %}
-		{% endfor %}
-		
-		{% if mod|hasPermission(config.mod.newboard) %}
-			<li style="margin-top:15px"><a href="?/new-board"><strong>{% trans 'Create new board' %}</strong></a></li>
-		{% endif %}
-	</ul>
-</fieldset>
-
-<fieldset>
+<!-- Messages -->
+<fieldset class="mod-dash mod-dash-set mod-dash-messages">
 	<legend>{% trans 'Messages' %}</legend>
 	<ul>
 		{% if mod|hasPermission(config.mod.noticeboard) %}
@@ -78,7 +43,8 @@
 	</ul>
 </fieldset>
 
-<fieldset>
+<!-- Administration -->
+<fieldset class="mod-dash mod-dash-set mod-dash-messages">
 	<legend>{% trans 'Administration' %}</legend>
 	
 	<ul>
@@ -123,57 +89,99 @@
 	</ul>
 </fieldset>
 
+<!-- Search -->
 {% if mod|hasPermission(config.mod.search) %}
-	<fieldset>
-		<legend>{% trans 'Search' %}</legend>
-		
-		<ul>
-			<li>
-				{% include 'mod/search_form.html' %}
-			</li>
-		</ul>
-	</fieldset>
+<fieldset class="mod-dash mod-dash-set mod-dash-search">
+	<legend>{% trans 'Search' %}</legend>
+	
+	<ul>
+		<li>
+			{% include 'mod/search_form.html' %}
+		</li>
+	</ul>
+</fieldset>
 {%  endif %}
 
-{% if config.mod.dashboard_links|count %}
-	<fieldset>
-		<legend>{% trans 'Other' %}</legend>
+<!-- Boards -->
+<fieldset class="mod-dash mod-dash-set mod-dash-boards">
+	<legend>{% trans 'Boards' %}</legend>
 	
-		<ul>
-			{% for label,link in config.mod.dashboard_links %}
-				<li><a href="{{ link }}">{{ label }}</a></li>
-			{% endfor %}
-		</ul>
-	</fieldset>
-{% endif %}
-
-{% if config.debug %}
-	<fieldset>
-		<legend>{% trans 'Debug' %}</legend>
-		<ul>
-			<li><a href="?/debug/antispam">{% trans 'Anti-spam' %}</a></li>
-			<li><a href="?/debug/recent">{% trans 'Recent posts' %}</a></li>
-			{% if mod|hasPermission(config.mod.debug_sql) %}
-				<li><a href="?/debug/sql">{% trans 'SQL' %}</a></li>
-			{% endif %}
-		</ul>
-	</fieldset>
-{% endif %}
-
-{% if newer_release %}
-	<fieldset>
-		<legend>Update</legend>
-		<ul>
+	<ul>
+		{% for board in boards %}
+		{% if board.uri in mod.boards or mod.boards[0] == '*' %}
 			<li>
-				A newer version of Tinyboard 
-				(<strong>v{{ newer_release.massive }}.{{ newer_release.major }}.{{ newer_release.minor }}</strong>) is available! 
-				See <a href="http://tinyboard.org">http://tinyboard.org/</a> for upgrade instructions.
+				<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board.uri) }}</a>
+					 - 
+				{{ board.title|e }}
+				{% if board.subtitle %}
+					<small>&mdash; 
+						{% if config.allow_subtitle_html %}
+							{{ board.subtitle }}
+						{% else %}
+							{{ board.subtitle|e }}
+						{% endif %}
+					</small>
+
+				{% endif %}
+				{% if mod.type == "20" %}
+					<a href="?/settings/{{ board.uri }}"><small>[{% trans 'settings' %}]</small></a>
+				{% endif %}
+				{% if mod|hasPermission(config.mod.manageboards) %}
+					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
+				{% endif %}
 			</li>
-		</ul>
-	</fieldset>
+		{% endif %}
+		{% endfor %}
+		
+		{% if mod|hasPermission(config.mod.newboard) %}
+			<li style="margin-top:15px"><a href="?/new-board"><strong>{% trans 'Create new board' %}</strong></a></li>
+		{% endif %}
+	</ul>
+</fieldset>
+
+<!-- Misc -->
+{% if config.mod.dashboard_links|count %}
+<fieldset class="mod-dash mod-dash-set mod-dash-misc">
+	<legend>{% trans 'Other' %}</legend>
+
+	<ul>
+		{% for label,link in config.mod.dashboard_links %}
+			<li><a href="{{ link }}">{{ label }}</a></li>
+		{% endfor %}
+	</ul>
+</fieldset>
 {% endif %}
 
-<fieldset>
+<!-- Debug Information -->
+{% if config.debug %}
+<fieldset class="mod-dash mod-dash-set mod-dash-debug">
+	<legend>{% trans 'Debug' %}</legend>
+	<ul>
+		<li><a href="?/debug/antispam">{% trans 'Anti-spam' %}</a></li>
+		<li><a href="?/debug/recent">{% trans 'Recent posts' %}</a></li>
+		{% if mod|hasPermission(config.mod.debug_sql) %}
+			<li><a href="?/debug/sql">{% trans 'SQL' %}</a></li>
+		{% endif %}
+	</ul>
+</fieldset>
+{% endif %}
+
+<!-- Update -->
+{% if newer_release %}
+<fieldset class="mod-dash mod-dash-set mod-dash-update">
+	<legend>Update</legend>
+	<ul>
+		<li>
+			A newer version of Tinyboard 
+			(<strong>v{{ newer_release.massive }}.{{ newer_release.major }}.{{ newer_release.minor }}</strong>) is available! 
+			See <a href="http://tinyboard.org">http://tinyboard.org/</a> for upgrade instructions.
+		</li>
+	</ul>
+</fieldset>
+{% endif %}
+
+<!-- Account Actions -->
+<fieldset class="mod-dash mod-dash-set mod-dash-account">
 	<legend>{% trans 'User account' %}</legend>
 	
 	<ul>
diff --git a/templates/mod/report.html b/templates/mod/report.html
index b5392d5b..a3bc0f6d 100644
--- a/templates/mod/report.html
+++ b/templates/mod/report.html
@@ -1,26 +1,26 @@
-<div class="report">
-	<hr>
-	{% trans 'Board' %}: <a href="?/{{ report.board }}/{{ config.file_index }}">{{ config.board_abbreviation|sprintf(report.board) }}</a>
-	<br>
-	{% trans 'Reason' %}: {{ report.reason }}
-	<br>
-	{% trans 'Report date' %}: {{ report.time|date(config.post_date) }}
-	<br>
-	{% if mod|hasPermission(config.mod.show_ip, report.board) %}
-		{% trans 'Reported by' %}: <a href="?/IP/{{ report.ip }}">{{ report.ip }}</a>
+<li class="report-item">
+	<div class="report">
+		{% trans 'Board' %}: <a href="?/{{ report.board }}/{{ config.file_index }}">{{ config.board_abbreviation|sprintf(report.board) }}</a>
 		<br>
-	{% endif %}
-	{% if mod|hasPermission(config.mod.report_dismiss, report.board) or mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
-		<hr>
-		{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
-			<a title="{% trans 'Discard abuse report' %}" href="?/reports/{{ report.id }}/dismiss/{{ token }}">Dismiss</a>
+		{% trans 'Reason' %}: {{ report.reason }}
+		<br>
+		{% trans 'Report date' %}: {{ report.time|date(config.post_date) }}
+		<br>
+		{% if mod|hasPermission(config.mod.show_ip, report.board) %}
+			{% trans 'Reported by' %}: <a href="?/IP/{{ report.ip }}">{{ report.ip }}</a>
+			<br>
 		{% endif %}
-		{% if mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
+		{% if mod|hasPermission(config.mod.report_dismiss, report.board) or mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
+			<hr>
 			{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
-			 | 
+				<a title="{% trans 'Discard abuse report' %}" href="?/reports/{{ report.id }}/dismiss/{{ token }}">Dismiss</a>
+			{% endif %}
+			{% if mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
+				{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
+				 | 
+				{% endif %}
+				<a title="{% trans 'Discard all abuse reports by this IP address' %}" href="?/reports/{{ report.id }}/dismissall/{{ token_all }}">Dismiss+</a>
 			{% endif %}
-			<a title="{% trans 'Discard all abuse reports by this IP address' %}" href="?/reports/{{ report.id }}/dismissall/{{ token_all }}">Dismiss+</a>
 		{% endif %}
-	{% endif %}
-</div>
-
+	</div>
+</li>
\ No newline at end of file
diff --git a/templates/mod/reports.html b/templates/mod/reports.html
index 26bceacc..04853b70 100644
--- a/templates/mod/reports.html
+++ b/templates/mod/reports.html
@@ -1,5 +1,7 @@
 {% if reports %}
-	{{ reports }}
+	<ul class="mod-reports reports-global">
+		{{ reports }}
+	</ul>
 {% else %}
 	<p style="text-align:center" class="unimportant">({% trans 'There are no reports.' %})</p>
 {% endif %}
diff --git a/templates/page.html b/templates/page.html
index b136566a..a3916b6f 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -6,9 +6,10 @@
 		active_page = "page";
 	</script>
 	{% include 'header.html' %}
+	{% if mod %}{% include 'mod/header.html' %}{% endif %}
 	<title>{{ title }}</title>
 </head>
-<body>
+<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>
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 51d1fb0c..771f5ce0 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -1,7 +1,7 @@
 {% filter remove_whitespace %}
 {# tabs and new lines will be ignored #}
 
-<div id="thread_{{ post.id }}" data-board="{{ board.uri }}">
+<div class="thread" id="thread_{{ post.id }}" data-board="{{ board.uri }}">
 {% if not index %}<a id="{{ post.id }}" class="post_anchor"></a>{% endif %}
 
 {% include 'post/fileinfo.html' %}
diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html
index 3376a68f..0ec18f9a 100644
--- a/templates/themes/basic/index.html
+++ b/templates/themes/basic/index.html
@@ -11,7 +11,7 @@
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
 	{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
 </head>
-<body>
+<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 %}">
 	{{ boardlist.top }}
 	<header>
 		<h1>{{ settings.title }}</h1>
diff --git a/templates/thread.html b/templates/thread.html
index af2a6e08..a3ace9b5 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -10,7 +10,7 @@
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
 </head>
-<body>
+<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 %}">
 	{{ 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 }}" {% 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 %}

From e90eca7339a4152a3dc0a29c0ed202725061ded1 Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Sat, 18 Oct 2014 20:31:25 -0500
Subject: [PATCH 05/12] [#184] tomorrow.css.

---
 inc/config.php           |  29 ++++----
 stylesheets/tomorrow.css | 152 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+), 14 deletions(-)
 create mode 100644 stylesheets/tomorrow.css

diff --git a/inc/config.php b/inc/config.php
index 2ddbe905..8ddf3bb6 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -873,9 +873,10 @@
 	// Custom stylesheets available for the user to choose. See the "stylesheets/" folder for a list of
 	// available stylesheets (or create your own).
 	$config['stylesheets']['Yotsuba B'] = ''; // Default; there is no additional/custom stylesheet for this.
-	$config['stylesheets']['Yotsuba'] = 'yotsuba.css';
-	// $config['stylesheets']['Futaba'] = 'futaba.css';
-	// $config['stylesheets']['Dark'] = 'dark.css';
+	$config['stylesheets']['Yotsuba']   = 'yotsuba.css';
+	// $config['stylesheets']['Futaba']    = 'futaba.css';
+	// $config['stylesheets']['Dark']      = 'dark.css';
+	$config['stylesheets']['Tomorrow']  = 'tomorrow.css';
 
 	// The prefix for each stylesheet URI. Defaults to $config['root']/stylesheets/
 	// $config['uri_stylesheets'] = 'http://static.example.org/stylesheets/';
@@ -1222,21 +1223,21 @@
 	$config['capcode'] = ' <span class="capcode">## %s</span>';
 
 	// "## Custom" becomes lightgreen, italic and bold:
-	//$config['custom_capcode']['Custom'] ='<span class="capcode" style="color:lightgreen;font-style:italic;font-weight:bold"> ## %s</span>';
+	$config['custom_capcode']['Custom'] ='<span class="capcode" style="color:lightgreen;font-style:italic;font-weight:bold"> ## %s</span>';
 
 	// "## Mod" makes everything purple, including the name and tripcode:
-	//$config['custom_capcode']['Mod'] = array(
-	//	'<span class="capcode" style="color:purple"> ## %s</span>',
-	//	'color:purple', // Change name style; optional
-	//	'color:purple' // Change tripcode style; optional
-	//);
+	$config['custom_capcode']['Mod'] = array(
+		'<span class="capcode" style="color:purple"> ## %s</span>',
+		'color:purple', // Change name style; optional
+		'color:purple' // Change tripcode style; optional
+	);
 
 	// "## Admin" makes everything red and bold, including the name and tripcode:
-	//$config['custom_capcode']['Admin'] = array(
-	//	'<span class="capcode" style="color:red;font-weight:bold"> ## %s</span>',
-	//	'color:red;font-weight:bold', // Change name style; optional
-	//	'color:red;font-weight:bold' // Change tripcode style; optional
-	//);
+	$config['custom_capcode']['Admin'] = array(
+		'<span class="capcode" style="color:red;font-weight:bold"> ## %s</span>',
+		'color:red;font-weight:bold', // Change name style; optional
+		'color:red;font-weight:bold' // Change tripcode style; optional
+	);
 
 	// Enable the moving of single replies
 	$config['move_replies'] = false;
diff --git a/stylesheets/tomorrow.css b/stylesheets/tomorrow.css
new file mode 100644
index 00000000..1ddfcd3b
--- /dev/null
+++ b/stylesheets/tomorrow.css
@@ -0,0 +1,152 @@
+/** TOMORROW, I'LL ...
+
+A cool dark skin by 7185.
+https://github.com/7185/8chan-tomorrow/
+
+**/
+body {
+  background:#1d1f21 none;
+  color:#C5C8C6
+}
+h1,div.subtitle {
+  color:#C5C8C6!important
+}
+a:link,a:visited,p.intro a.email span.name {
+  color:#81a2be
+}
+a:link:hover {
+  color:#5F89AC
+}
+a.post_no {
+  color:#C5C8C6
+}
+a.post_no:hover {
+  color:#5F89AC!important
+}
+div.banner {
+  background-color:#1d1f21
+}
+div.post.reply {
+  background-color:#282a2e;
+  border:1px solid #282a2e;
+  margin-bottom:2px;
+  margin-left:16px;
+  margin-top:2px
+}
+div.post.reply.highlighted {
+  background-color:#1d1d21;
+  border:1px solid #111
+}
+div.post.reply div.body a {
+  color:#81a2be
+}
+div.post.reply div.body a:hover {
+  color:#5F89AC
+}
+div.post-hover {
+  border:1px solid #000!important;
+  box-shadow:none!important
+}
+div.thread:hover {
+  background-color:#1d1f21;
+  border-color:#000
+}
+p.intro span.subject {
+  color:#b294bb
+}
+p.intro span.name {
+  color:#C5C8C6
+}
+span.quote {
+  color:#adbd68
+}
+span.heading {
+  color:#F20
+}
+form table tr th {
+  background:#282a2e;
+  border:1px solid #111;
+  color:#C5C8C6
+}
+div.ban h2 {
+  background:#FCA;
+  color:inherit
+}
+div.ban {
+  border-color:#800
+}
+div.ban p {
+  color:#000
+}
+div.pages {
+  background:#1d1f21;
+  border-color:#1d1f21
+}
+div.pages a.selected {
+  color:#81a2be;
+  font-weight:700
+}
+div.boardlist {
+  background-color:#282a2e!important;
+  color:#C5C8C6
+}
+div.boardlist:nth-of-type(1) {
+  border-bottom:1px solid #111!important;
+  box-shadow:0 0 3px 0 #111
+}
+div.boardlist a {
+  color:#81a2be
+}
+hr {
+  background-color:#282a2e;
+  border:0;
+  height:1px
+}
+div#options_div {
+  background-color:#282a2e
+}
+div.options_tab_icon {
+  color: #AAA
+}
+div.options_tab_icon:hover {
+  background-color: #111
+}
+div.options_tab_icon.active {
+  color: #F20
+}
+div.blotter {
+  color:#F20
+}
+span.omitted {
+  color:#707070
+}
+p.intro a, span.omitted a {
+  text-decoration:none
+}
+form#quick-reply {
+  padding-right:1px;
+  border: 1px solid #111
+}
+span.capcode {
+  background-color: #000;
+  padding:2px 5px;
+  border-radius: 10px
+}
+div#watchlist {
+ border:1px solid #111;
+ background-color:#282a2e
+}
+div#watchlist a,a.watchThread {
+  color:#81a2be;
+  text-decoration:none
+}
+div#watchlist a:hover,a.watchThread:hover {
+  color:#5F89AC
+}
+/* Keep small thumbnails */
+a:not([data-expanded="true"]) .post-image{
+  width:auto!important;
+  height:auto!important;
+  max-height:200px!important;
+  max-width:200px!important
+}

From 3654c4f7ef51d731689594d293d2cb677e47d522 Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Sun, 19 Oct 2014 00:00:58 -0500
Subject: [PATCH 06/12] Signed-off-by: unknown
 <8n-tech@users.noreply.github.com>

---
 inc/config.php                    |  4 ++
 inc/mod/pages.php                 | 91 ++++++++++++++++++++++++++-----
 mod.php                           | 10 ++--
 stylesheets/mod/mod.css           | 61 +++++++++++++++++++--
 templates/mod/report.html         | 60 ++++++++++++++------
 templates/mod/report_content.html |  4 +-
 6 files changed, 188 insertions(+), 42 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 8ddf3bb6..e917c52e 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1388,6 +1388,10 @@
 	$config['mod']['reports'] = JANITOR;
 	// Dismiss an abuse report
 	$config['mod']['report_dismiss'] = JANITOR;
+	// Remove global status from a report
+	$config['mod']['report_demote'] = JANITOR;
+	// Elevate a global report to a local report.
+	$config['mod']['report_promote'] = JANITOR;
 	// Dismiss all abuse reports by an IP
 	$config['mod']['report_dismiss_ip'] = JANITOR;
 	// View list of bans
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 0b7b78ca..b0dbe47f 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -2266,16 +2266,18 @@ function mod_reports($global = false) {
 	if ($mod['type'] == '20' and $global)
 		error($config['error']['noaccess']);
 	
-	// Get REPORTS.
-	$query = prepare("SELECT * FROM ``reports`` " . ($mod["type"] == "20" ? "WHERE board = :board" : "") . " ORDER BY `time` DESC LIMIT :limit");
-	if ($mod['type'] == '20')
-		$query->bindValue(':board', $mod['boards'][0]);
-
-	if ($global) {
-		$query = prepare("SELECT * FROM ``reports`` WHERE global = TRUE ORDER BY `time` DESC LIMIT :limit");
-	}
+	// Limit reports to ONLY those in our scope.
+	$report_scope = $global ? "global" : "local";
 	
-	$query->bindValue(':limit', $config['mod']['recent_reports'], PDO::PARAM_INT);
+	// Get REPORTS.
+	$query = prepare("SELECT * FROM ``reports`` " . ($mod["type"] == "20" ? "WHERE board = :board" : "") . " WHERE ``{$report_scope}``=TRUE  LIMIT :limit");
+	
+	// Limit reports by board if the moderator is local.
+	if( $mod['type'] == '20' )
+		$query->bindValue(':board', $mod['boards'][0]);
+	
+	// Limit by config ceiling.
+	$query->bindValue( ':limit', $config['mod']['recent_reports'], PDO::PARAM_INT );
 	
 	$query->execute() or error(db_error($query));
 	$reports = $query->fetchAll(PDO::FETCH_ASSOC);
@@ -2380,11 +2382,14 @@ function mod_reports($global = false) {
 				$content_reports = 0;
 				foreach( $report_item['reports'] as $report ) {
 					$report_html .= Element('mod/report.html', array(
-						'report'    => $report,
-						'config'    => $config,
-						'mod'       => $mod,
-						'token'     => make_secure_link_token('reports/' . $report['id'] . '/dismiss'),
-						'token_all' => make_secure_link_token('reports/' . $report['id'] . '/dismissall')
+						'report'        => $report,
+						'config'        => $config,
+						'mod'           => $mod,
+						'global'        => $global,
+						'token_dismiss' => make_secure_link_token('reports/' . $report['id'] . '/dismiss'),
+						'token_ip'      => make_secure_link_token('reports/' . $report['id'] . '/dismissall'),
+						'token_demote'  => make_secure_link_token('reports/' . $report['id'] . '/demote'),
+						'token_promote' => make_secure_link_token('reports/' . $report['id'] . '/promote'),
 					));
 					
 					++$content_reports;
@@ -2464,6 +2469,64 @@ function mod_report_dismiss($id, $all = false) {
 	header('Location: ?/reports', true, $config['redirect_http']);
 }
 
+function mod_report_demote($id) {
+	global $config;
+	
+	$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id AND ``global`` = TRUE");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	if ($report = $query->fetch(PDO::FETCH_ASSOC)) {
+		$ip = $report['ip'];
+		$board = $report['board'];
+		$post = $report['post'];
+	}
+	else {
+		error($config['error']['404']);
+	}
+	
+	if( !hasPermission($config['mod']['report_demote'], $board) ) {
+		error($config['error']['noaccess']);
+	}
+	
+	$query = prepare("UPDATE ``reports`` SET ``global`` = FALSE WHERE `id` = :id");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	
+	
+	modLog("Demoted a global report for post #{$id}", $board);
+	
+	header('Location: ?/reports', true, $config['redirect_http']);
+}
+
+function mod_report_promote($id) {
+	global $config;
+	
+	$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id AND ``global`` = FALSE");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	if ($report = $query->fetch(PDO::FETCH_ASSOC)) {
+		$ip = $report['ip'];
+		$board = $report['board'];
+		$post = $report['post'];
+	}
+	else {
+		error($config['error']['404']);
+	}
+	
+	if( !hasPermission($config['mod']['report_promote'], $board) ) {
+		error($config['error']['noaccess']);
+	}
+	
+	$query = prepare("UPDATE ``reports`` SET ``global`` = TRUE WHERE `id` = :id");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	
+	
+	modLog("Promoted a local report for post #{$id}", $board);
+	
+	header('Location: ?/reports', true, $config['redirect_http']);
+}
+
 function mod_recent_posts($lim) {
 	global $config, $mod, $pdo;
 
diff --git a/mod.php b/mod.php
index 654d23fe..45fff1ad 100644
--- a/mod.php
+++ b/mod.php
@@ -53,10 +53,12 @@ $pages = array(
 	'/edit/(\%b)'				=> 'secure_POST edit_board',	// edit board details
 	'/new-board'				=> 'secure_POST new_board',	// create a new board
 	
-	'/rebuild'				=> 'secure_POST rebuild',	// rebuild static files
-	'/reports'				=> 'reports',			// report queue
-	'/reports/(global)'				=> 'reports',			// global report queue
-	'/reports/(\d+)/dismiss(all)?'		=> 'secure report_dismiss',	// dismiss a report
+	'/rebuild'                     => 'secure_POST rebuild',   // rebuild static files
+	'/reports'                     => 'reports',               // report queue
+	'/reports/(global)'            => 'reports',               // global report queue
+	'/reports/(\d+)/dismiss(all)?' => 'secure report_dismiss', // dismiss a report
+	'/reports/(\d+)/demote?'       => 'secure report_demote',  // demote a global report to a local report
+	'/reports/(\d+)/promote?'      => 'secure report_promote', // promote a local report to a global report
 	
 	'/IP/([\w.:]+)'				=> 'secure_POST ip',		// view ip address
 	'/IP/([\w.:]+)/remove_note/(\d+)'	=> 'secure ip_remove_note',	// remove note from ip address
diff --git a/stylesheets/mod/mod.css b/stylesheets/mod/mod.css
index 463b837e..42ff64d9 100644
--- a/stylesheets/mod/mod.css
+++ b/stylesheets/mod/mod.css
@@ -16,6 +16,10 @@
 		border-bottom: none;
 	}
 
+.report-header {
+	margin: 0 0 0.25em 0;
+}
+
 .report-list {
 	display: block;
 	list-style: none;
@@ -29,23 +33,72 @@
 	}
 		.report-item .report {
 			background: #D6DAF0;
-			margin: 0.2em 4px;
-			padding: 0.2em 0.3em 0.5em 0.6em;
+			margin: 0.2em 4px 0.2em 0;
+			padding: 0.3em 0.3em 0.5em 0.6em;
 			border-width: 1px;
 			border-style: none solid solid none;
 			border-color: #B7C5D9;
 			display: inline-block;
 			max-width: 94% !important;
 		}
+			.report-reason {
+				display: block;
+				font-size: 115%;
+				line-height: 115%;
+			}
+			
+			.report-details {
+				display: block;
+				margin: 0.3em 0 0 0;
+				padding: 0.3em 0 0 0;
+				clear: left;
+				list-style: none;
+			}
+				.report-detail {
+					display: block;
+					margin: 0;
+					padding: 0;
+				}
+					.detail-name {
+						display: inline-block;
+						min-width: 6.25em;
+					}
+			
+			.report-actions {
+				display: block;
+				border: none;
+				border-top: 1px solid #B7C5D9;
+				margin: 0.3em 0 0 0;
+				padding: 0.3em 0 0 0;
+				clear: left;
+				list-style: none;
+			}
+				.report-action {
+					display: inline-block;
+					margin: 0 0.5em 0 0;
+					padding: 0;
+				}
+				.report-action::after {
+					display: inline-block;
+					margin: 0 0 0 0.5em;
+					padding: 0;
+					content: ' | ';
+				}
+				.report-action:last-child::after {
+					display: none;
+					content: '';
+				}
+			
 
 .report-content div.post.reply,
 .report-content div.thread {
 	background: #FFC4C4;
-	margin: 0.2em 4px;
+	margin: 0.2em 4px 0.2em 0;
 	padding: 0.2em 0.3em 0.5em 0.6em;
 	border-width: 1px;
 	border-style: none solid solid none;
 	border-color: #F88;
 	display: inline-block;
 	max-width: 94% !important;
-}
\ No newline at end of file
+}
+
diff --git a/templates/mod/report.html b/templates/mod/report.html
index a3bc0f6d..f7b5b868 100644
--- a/templates/mod/report.html
+++ b/templates/mod/report.html
@@ -1,26 +1,52 @@
 <li class="report-item">
 	<div class="report">
-		{% trans 'Board' %}: <a href="?/{{ report.board }}/{{ config.file_index }}">{{ config.board_abbreviation|sprintf(report.board) }}</a>
-		<br>
-		{% trans 'Reason' %}: {{ report.reason }}
-		<br>
-		{% trans 'Report date' %}: {{ report.time|date(config.post_date) }}
-		<br>
-		{% if mod|hasPermission(config.mod.show_ip, report.board) %}
-			{% trans 'Reported by' %}: <a href="?/IP/{{ report.ip }}">{{ report.ip }}</a>
-			<br>
-		{% endif %}
+		<span class="report-reason">{% if report.reason %}{{ report.reason }}{% else %}<em>{% trans 'No reason given.' %}</em>{% endif %}</span>
+		
+		<ul class="report-details">
+			<li class="report-detail detail-date">
+				<span class="detail-name">{% trans 'Report date' %}:</span>
+				<span class="detail-value">{{ report.time|date(config.post_date) }}</span>
+			</li>
+			
+			{% if mod|hasPermission(config.mod.show_ip, report.board) %}
+			<li class="report-detail detail-date">
+				<span class="detail-name">{% trans 'Reported by' %}:</span>
+				<span class="detail-value"><a href="?/IP/{{ report.ip }}">{{ report.ip }}</a></span>
+			</li>
+			{% endif %}
+		</ul>
+		
 		{% if mod|hasPermission(config.mod.report_dismiss, report.board) or mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
-			<hr>
+		<ul class="report-actions">
 			{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
-				<a title="{% trans 'Discard abuse report' %}" href="?/reports/{{ report.id }}/dismiss/{{ token }}">Dismiss</a>
+			<li class="report-action">
+				<a class="action-item action-available" title="{% trans 'Discard abuse report' %}" href="?/reports/{{ report.id }}/dismiss/{{ token_dismiss }}">Dismiss</a>
+			</li>
 			{% endif %}
+			
 			{% if mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
-				{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
-				 | 
-				{% endif %}
-				<a title="{% trans 'Discard all abuse reports by this IP address' %}" href="?/reports/{{ report.id }}/dismissall/{{ token_all }}">Dismiss+</a>
+			<li class="report-action">
+				<a class="action-item action-available" title="{% trans 'Discard all abuse reports by this IP address' %}" href="?/reports/{{ report.id }}/dismissall/{{ token_ip }}">Dismiss+</a>
+			</li>
 			{% endif %}
+			
+			{% if global and mod|hasPermission(config.mod.report_demote, report.board) %}
+			<li class="report-action">
+				{% if report.local %}
+				<a class="action-item action-available" title="{% trans 'Demote global abuse report to a local report' %}" href="?/reports/{{ report.id }}/demote/{{ token_demote }}">Demote</a>
+				{% else %}
+				<span class="action-item action-unavailable" title="{% trans 'Report has already been dismissed locally' %}">Demote</span>
+				{% endif %}
+			</li>
+			{% elseif not global and mod|hasPermission(config.mod.report_promote, report.board) %}
+			<li class="report-action">
+				{% if report.global %}
+				<span class="action-item action-unavailable" title="{% trans 'Report is already a global report' %}">Promote</span>
+				{% else %}
+				<a class="action-item action-available" title="{% trans 'Promote local abuse report to a global report' %}" href="?/reports/{{ report.id }}/promote/{{ token_promote }}">Promote</a>
+				{% endif %}
+			</li>
+			{% endif %}
+		</ul>
 		{% endif %}
-	</div>
 </li>
\ No newline at end of file
diff --git a/templates/mod/report_content.html b/templates/mod/report_content.html
index e2a4342e..1ad534cb 100644
--- a/templates/mod/report_content.html
+++ b/templates/mod/report_content.html
@@ -1,7 +1,5 @@
 <li class="mod-report">
-	<div class="report-details">
-		<h2>{{ report_title }}</h2>
-	</div>
+	<h2 class="report-header">{{ report_title }}</h2>
 	
 	<div class="report-content">
 		{{ content_html }}

From a8a843bf4b81186571b57e9bcd001fcab3601611 Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Sun, 19 Oct 2014 00:07:16 -0500
Subject: [PATCH 07/12] [#184] Added Promote and Demote to reports. CSS
 improvements.

---
 inc/config.php                    |  4 ++
 inc/mod/pages.php                 | 91 ++++++++++++++++++++++++++-----
 mod.php                           | 10 ++--
 stylesheets/mod/mod.css           | 61 +++++++++++++++++++--
 templates/mod/report.html         | 60 ++++++++++++++------
 templates/mod/report_content.html |  4 +-
 6 files changed, 188 insertions(+), 42 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 8ddf3bb6..e917c52e 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1388,6 +1388,10 @@
 	$config['mod']['reports'] = JANITOR;
 	// Dismiss an abuse report
 	$config['mod']['report_dismiss'] = JANITOR;
+	// Remove global status from a report
+	$config['mod']['report_demote'] = JANITOR;
+	// Elevate a global report to a local report.
+	$config['mod']['report_promote'] = JANITOR;
 	// Dismiss all abuse reports by an IP
 	$config['mod']['report_dismiss_ip'] = JANITOR;
 	// View list of bans
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 0b7b78ca..b0dbe47f 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -2266,16 +2266,18 @@ function mod_reports($global = false) {
 	if ($mod['type'] == '20' and $global)
 		error($config['error']['noaccess']);
 	
-	// Get REPORTS.
-	$query = prepare("SELECT * FROM ``reports`` " . ($mod["type"] == "20" ? "WHERE board = :board" : "") . " ORDER BY `time` DESC LIMIT :limit");
-	if ($mod['type'] == '20')
-		$query->bindValue(':board', $mod['boards'][0]);
-
-	if ($global) {
-		$query = prepare("SELECT * FROM ``reports`` WHERE global = TRUE ORDER BY `time` DESC LIMIT :limit");
-	}
+	// Limit reports to ONLY those in our scope.
+	$report_scope = $global ? "global" : "local";
 	
-	$query->bindValue(':limit', $config['mod']['recent_reports'], PDO::PARAM_INT);
+	// Get REPORTS.
+	$query = prepare("SELECT * FROM ``reports`` " . ($mod["type"] == "20" ? "WHERE board = :board" : "") . " WHERE ``{$report_scope}``=TRUE  LIMIT :limit");
+	
+	// Limit reports by board if the moderator is local.
+	if( $mod['type'] == '20' )
+		$query->bindValue(':board', $mod['boards'][0]);
+	
+	// Limit by config ceiling.
+	$query->bindValue( ':limit', $config['mod']['recent_reports'], PDO::PARAM_INT );
 	
 	$query->execute() or error(db_error($query));
 	$reports = $query->fetchAll(PDO::FETCH_ASSOC);
@@ -2380,11 +2382,14 @@ function mod_reports($global = false) {
 				$content_reports = 0;
 				foreach( $report_item['reports'] as $report ) {
 					$report_html .= Element('mod/report.html', array(
-						'report'    => $report,
-						'config'    => $config,
-						'mod'       => $mod,
-						'token'     => make_secure_link_token('reports/' . $report['id'] . '/dismiss'),
-						'token_all' => make_secure_link_token('reports/' . $report['id'] . '/dismissall')
+						'report'        => $report,
+						'config'        => $config,
+						'mod'           => $mod,
+						'global'        => $global,
+						'token_dismiss' => make_secure_link_token('reports/' . $report['id'] . '/dismiss'),
+						'token_ip'      => make_secure_link_token('reports/' . $report['id'] . '/dismissall'),
+						'token_demote'  => make_secure_link_token('reports/' . $report['id'] . '/demote'),
+						'token_promote' => make_secure_link_token('reports/' . $report['id'] . '/promote'),
 					));
 					
 					++$content_reports;
@@ -2464,6 +2469,64 @@ function mod_report_dismiss($id, $all = false) {
 	header('Location: ?/reports', true, $config['redirect_http']);
 }
 
+function mod_report_demote($id) {
+	global $config;
+	
+	$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id AND ``global`` = TRUE");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	if ($report = $query->fetch(PDO::FETCH_ASSOC)) {
+		$ip = $report['ip'];
+		$board = $report['board'];
+		$post = $report['post'];
+	}
+	else {
+		error($config['error']['404']);
+	}
+	
+	if( !hasPermission($config['mod']['report_demote'], $board) ) {
+		error($config['error']['noaccess']);
+	}
+	
+	$query = prepare("UPDATE ``reports`` SET ``global`` = FALSE WHERE `id` = :id");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	
+	
+	modLog("Demoted a global report for post #{$id}", $board);
+	
+	header('Location: ?/reports', true, $config['redirect_http']);
+}
+
+function mod_report_promote($id) {
+	global $config;
+	
+	$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id AND ``global`` = FALSE");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	if ($report = $query->fetch(PDO::FETCH_ASSOC)) {
+		$ip = $report['ip'];
+		$board = $report['board'];
+		$post = $report['post'];
+	}
+	else {
+		error($config['error']['404']);
+	}
+	
+	if( !hasPermission($config['mod']['report_promote'], $board) ) {
+		error($config['error']['noaccess']);
+	}
+	
+	$query = prepare("UPDATE ``reports`` SET ``global`` = TRUE WHERE `id` = :id");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	
+	
+	modLog("Promoted a local report for post #{$id}", $board);
+	
+	header('Location: ?/reports', true, $config['redirect_http']);
+}
+
 function mod_recent_posts($lim) {
 	global $config, $mod, $pdo;
 
diff --git a/mod.php b/mod.php
index 654d23fe..45fff1ad 100644
--- a/mod.php
+++ b/mod.php
@@ -53,10 +53,12 @@ $pages = array(
 	'/edit/(\%b)'				=> 'secure_POST edit_board',	// edit board details
 	'/new-board'				=> 'secure_POST new_board',	// create a new board
 	
-	'/rebuild'				=> 'secure_POST rebuild',	// rebuild static files
-	'/reports'				=> 'reports',			// report queue
-	'/reports/(global)'				=> 'reports',			// global report queue
-	'/reports/(\d+)/dismiss(all)?'		=> 'secure report_dismiss',	// dismiss a report
+	'/rebuild'                     => 'secure_POST rebuild',   // rebuild static files
+	'/reports'                     => 'reports',               // report queue
+	'/reports/(global)'            => 'reports',               // global report queue
+	'/reports/(\d+)/dismiss(all)?' => 'secure report_dismiss', // dismiss a report
+	'/reports/(\d+)/demote?'       => 'secure report_demote',  // demote a global report to a local report
+	'/reports/(\d+)/promote?'      => 'secure report_promote', // promote a local report to a global report
 	
 	'/IP/([\w.:]+)'				=> 'secure_POST ip',		// view ip address
 	'/IP/([\w.:]+)/remove_note/(\d+)'	=> 'secure ip_remove_note',	// remove note from ip address
diff --git a/stylesheets/mod/mod.css b/stylesheets/mod/mod.css
index 463b837e..42ff64d9 100644
--- a/stylesheets/mod/mod.css
+++ b/stylesheets/mod/mod.css
@@ -16,6 +16,10 @@
 		border-bottom: none;
 	}
 
+.report-header {
+	margin: 0 0 0.25em 0;
+}
+
 .report-list {
 	display: block;
 	list-style: none;
@@ -29,23 +33,72 @@
 	}
 		.report-item .report {
 			background: #D6DAF0;
-			margin: 0.2em 4px;
-			padding: 0.2em 0.3em 0.5em 0.6em;
+			margin: 0.2em 4px 0.2em 0;
+			padding: 0.3em 0.3em 0.5em 0.6em;
 			border-width: 1px;
 			border-style: none solid solid none;
 			border-color: #B7C5D9;
 			display: inline-block;
 			max-width: 94% !important;
 		}
+			.report-reason {
+				display: block;
+				font-size: 115%;
+				line-height: 115%;
+			}
+			
+			.report-details {
+				display: block;
+				margin: 0.3em 0 0 0;
+				padding: 0.3em 0 0 0;
+				clear: left;
+				list-style: none;
+			}
+				.report-detail {
+					display: block;
+					margin: 0;
+					padding: 0;
+				}
+					.detail-name {
+						display: inline-block;
+						min-width: 6.25em;
+					}
+			
+			.report-actions {
+				display: block;
+				border: none;
+				border-top: 1px solid #B7C5D9;
+				margin: 0.3em 0 0 0;
+				padding: 0.3em 0 0 0;
+				clear: left;
+				list-style: none;
+			}
+				.report-action {
+					display: inline-block;
+					margin: 0 0.5em 0 0;
+					padding: 0;
+				}
+				.report-action::after {
+					display: inline-block;
+					margin: 0 0 0 0.5em;
+					padding: 0;
+					content: ' | ';
+				}
+				.report-action:last-child::after {
+					display: none;
+					content: '';
+				}
+			
 
 .report-content div.post.reply,
 .report-content div.thread {
 	background: #FFC4C4;
-	margin: 0.2em 4px;
+	margin: 0.2em 4px 0.2em 0;
 	padding: 0.2em 0.3em 0.5em 0.6em;
 	border-width: 1px;
 	border-style: none solid solid none;
 	border-color: #F88;
 	display: inline-block;
 	max-width: 94% !important;
-}
\ No newline at end of file
+}
+
diff --git a/templates/mod/report.html b/templates/mod/report.html
index a3bc0f6d..f7b5b868 100644
--- a/templates/mod/report.html
+++ b/templates/mod/report.html
@@ -1,26 +1,52 @@
 <li class="report-item">
 	<div class="report">
-		{% trans 'Board' %}: <a href="?/{{ report.board }}/{{ config.file_index }}">{{ config.board_abbreviation|sprintf(report.board) }}</a>
-		<br>
-		{% trans 'Reason' %}: {{ report.reason }}
-		<br>
-		{% trans 'Report date' %}: {{ report.time|date(config.post_date) }}
-		<br>
-		{% if mod|hasPermission(config.mod.show_ip, report.board) %}
-			{% trans 'Reported by' %}: <a href="?/IP/{{ report.ip }}">{{ report.ip }}</a>
-			<br>
-		{% endif %}
+		<span class="report-reason">{% if report.reason %}{{ report.reason }}{% else %}<em>{% trans 'No reason given.' %}</em>{% endif %}</span>
+		
+		<ul class="report-details">
+			<li class="report-detail detail-date">
+				<span class="detail-name">{% trans 'Report date' %}:</span>
+				<span class="detail-value">{{ report.time|date(config.post_date) }}</span>
+			</li>
+			
+			{% if mod|hasPermission(config.mod.show_ip, report.board) %}
+			<li class="report-detail detail-date">
+				<span class="detail-name">{% trans 'Reported by' %}:</span>
+				<span class="detail-value"><a href="?/IP/{{ report.ip }}">{{ report.ip }}</a></span>
+			</li>
+			{% endif %}
+		</ul>
+		
 		{% if mod|hasPermission(config.mod.report_dismiss, report.board) or mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
-			<hr>
+		<ul class="report-actions">
 			{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
-				<a title="{% trans 'Discard abuse report' %}" href="?/reports/{{ report.id }}/dismiss/{{ token }}">Dismiss</a>
+			<li class="report-action">
+				<a class="action-item action-available" title="{% trans 'Discard abuse report' %}" href="?/reports/{{ report.id }}/dismiss/{{ token_dismiss }}">Dismiss</a>
+			</li>
 			{% endif %}
+			
 			{% if mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
-				{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
-				 | 
-				{% endif %}
-				<a title="{% trans 'Discard all abuse reports by this IP address' %}" href="?/reports/{{ report.id }}/dismissall/{{ token_all }}">Dismiss+</a>
+			<li class="report-action">
+				<a class="action-item action-available" title="{% trans 'Discard all abuse reports by this IP address' %}" href="?/reports/{{ report.id }}/dismissall/{{ token_ip }}">Dismiss+</a>
+			</li>
 			{% endif %}
+			
+			{% if global and mod|hasPermission(config.mod.report_demote, report.board) %}
+			<li class="report-action">
+				{% if report.local %}
+				<a class="action-item action-available" title="{% trans 'Demote global abuse report to a local report' %}" href="?/reports/{{ report.id }}/demote/{{ token_demote }}">Demote</a>
+				{% else %}
+				<span class="action-item action-unavailable" title="{% trans 'Report has already been dismissed locally' %}">Demote</span>
+				{% endif %}
+			</li>
+			{% elseif not global and mod|hasPermission(config.mod.report_promote, report.board) %}
+			<li class="report-action">
+				{% if report.global %}
+				<span class="action-item action-unavailable" title="{% trans 'Report is already a global report' %}">Promote</span>
+				{% else %}
+				<a class="action-item action-available" title="{% trans 'Promote local abuse report to a global report' %}" href="?/reports/{{ report.id }}/promote/{{ token_promote }}">Promote</a>
+				{% endif %}
+			</li>
+			{% endif %}
+		</ul>
 		{% endif %}
-	</div>
 </li>
\ No newline at end of file
diff --git a/templates/mod/report_content.html b/templates/mod/report_content.html
index e2a4342e..1ad534cb 100644
--- a/templates/mod/report_content.html
+++ b/templates/mod/report_content.html
@@ -1,7 +1,5 @@
 <li class="mod-report">
-	<div class="report-details">
-		<h2>{{ report_title }}</h2>
-	</div>
+	<h2 class="report-header">{{ report_title }}</h2>
 	
 	<div class="report-content">
 		{{ content_html }}

From 01c80bd7adbfbae22bc939b164ca54ef3597346d Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Sun, 19 Oct 2014 11:07:07 -0500
Subject: [PATCH 08/12] [#184] System almost completely functional. Woo.

---
 inc/config.php                    |   2 +
 inc/mod/pages.php                 | 401 +++++++++++++++++++++++-------
 mod.php                           |  20 +-
 stylesheets/mod/mod.css           |  36 ++-
 stylesheets/style.css             |   4 +-
 templates/mod/dashboard.html      |   1 -
 templates/mod/report.html         |   8 +-
 templates/mod/report_content.html |  51 ++++
 templates/mod/reports.html        |   8 +-
 9 files changed, 416 insertions(+), 115 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index e917c52e..bcc22f8e 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1394,6 +1394,8 @@
 	$config['mod']['report_promote'] = JANITOR;
 	// Dismiss all abuse reports by an IP
 	$config['mod']['report_dismiss_ip'] = JANITOR;
+	// Dismiss all abuse reports on an individual post or thread
+	$config['mod']['report_dismiss_content'] = JANITOR;
 	// View list of bans
 	$config['mod']['view_banlist'] = MOD;
 	// View the username of the mod who made a ban
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index b0dbe47f..36beed88 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -2257,24 +2257,28 @@ function mod_rebuild() {
 	));
 }
 
-function mod_reports($global = false) {
+function mod_reports() {
 	global $config, $mod;
 	
-	if (!hasPermission($config['mod']['reports']))
-		error($config['error']['noaccess']);
+	// Parse arguments.
+	$urlArgs = func_get_args();
+	$global  = in_array( "global", $urlArgs );
 	
-	if ($mod['type'] == '20' and $global)
+	if( !hasPermission($config['mod']['reports']) ) {
 		error($config['error']['noaccess']);
+	}
 	
-	// Limit reports to ONLY those in our scope.
-	$report_scope = $global ? "global" : "local";
+	if( $mod['type'] == '20' and $global ) {
+		error($config['error']['noaccess']);
+	}
 	
 	// Get REPORTS.
-	$query = prepare("SELECT * FROM ``reports`` " . ($mod["type"] == "20" ? "WHERE board = :board" : "") . " WHERE ``{$report_scope}``=TRUE  LIMIT :limit");
+	$query = prepare("SELECT * FROM ``reports`` " . ($mod["type"] == "20" ? "WHERE board = :board" : "") . " WHERE ``".($global ? "global" : "local")."``=TRUE  LIMIT :limit");
 	
 	// Limit reports by board if the moderator is local.
-	if( $mod['type'] == '20' )
+	if( $mod['type'] == '20' ) {
 		$query->bindValue(':board', $mod['boards'][0]);
+	}
 	
 	// Limit by config ceiling.
 	$query->bindValue( ':limit', $config['mod']['recent_reports'], PDO::PARAM_INT );
@@ -2379,19 +2383,38 @@ function mod_reports($global = false) {
 				
 				// Add each report's template to this container.
 				$report_html = "";
+				$reports_can_demote = false;
+				$reports_can_promote = false;
 				$content_reports = 0;
 				foreach( $report_item['reports'] as $report ) {
+					$uri_report_base = "reports/" . ($global ? "global/" : "" ) . $report['id'];
 					$report_html .= Element('mod/report.html', array(
 						'report'        => $report,
 						'config'        => $config,
 						'mod'           => $mod,
 						'global'        => $global,
-						'token_dismiss' => make_secure_link_token('reports/' . $report['id'] . '/dismiss'),
-						'token_ip'      => make_secure_link_token('reports/' . $report['id'] . '/dismissall'),
-						'token_demote'  => make_secure_link_token('reports/' . $report['id'] . '/demote'),
-						'token_promote' => make_secure_link_token('reports/' . $report['id'] . '/promote'),
+						
+						'uri_dismiss'   => "?/{$uri_report_base}/dismiss",
+						'uri_ip'        => "?/{$uri_report_base}/dismissall",
+						'uri_demote'    => "?/{$uri_report_base}/demote",
+						'uri_promote'   => "?/{$uri_report_base}/promote",
+						'token_dismiss' => make_secure_link_token( $uri_report_base . '/dismiss' ),
+						'token_ip'      => make_secure_link_token( $uri_report_base . '/dismissall' ),
+						'token_demote'  => make_secure_link_token( $uri_report_base . '/demote' ),
+						'token_promote' => make_secure_link_token( $uri_report_base . '/promote' ),
 					));
 					
+					// Determines if we can "Demote All" / "Promote All"
+					// This logic only needs one instance of a demotable or promotable report to work.
+					// DEMOTE can occur when we're global and the report has a 1 for local (meaning locally, it's not dismissed)
+					// PROMOTE can occur when we're local and the report has a 0 for global (meaning it's not global).
+					if( $global && $report['local'] == "1" ) {
+						$reports_can_demote = true;
+					}
+					else if( !$global && $report['global'] != "1" ) {
+						$reports_can_promote = true;
+					}
+					
 					++$content_reports;
 				}
 				
@@ -2404,17 +2427,28 @@ function mod_reports($global = false) {
 					$content_reports
 				);
 				
+				$uri_content_base = "reports/" . ($global ? "global/" : "" ) . "content/";
 				$content_html = Element('mod/report_content.html', array(
-					'reports_html'  => $report_html,
-					'report_count'  => $content_reports,
+					'reports_html'          => $report_html,
+					'reports_can_demote'    => $reports_can_demote,
+					'reports_can_promote'   => $reports_can_promote,
+					'report_count'          => $content_reports,
+					'report_title'          => $report_title,
 					
-					'content_html'  => $po->build(true),
-					'content_board' => $report_item['board_id'],
-					'content'       => $content,
+					'content_html'          => $po->build(true),
+					'content_board'         => $report_item['board_id'],
+					'content'               => $content,
 					
-					'config'        => $config,
-					'mod'           => $mod,
-					'report_title'  => $report_title,
+					'uri_content_demote'    => "?/{$uri_content_base}{$report_item['board_id']}/{$content['id']}/demote",
+					'uri_content_promote'   => "?/{$uri_content_base}{$report_item['board_id']}/{$content['id']}/promote",
+					'uri_content_dismiss'   => "?/{$uri_content_base}{$report_item['board_id']}/{$content['id']}/dismiss",
+					'token_content_demote'  => make_secure_link_token( "{$uri_content_base}{$report_item['board_id']}/{$content['id']}/demote" ),
+					'token_content_promote' => make_secure_link_token( "{$uri_content_base}{$report_item['board_id']}/{$content['id']}/promote" ),
+					'token_content_dismiss' => make_secure_link_token( "{$uri_content_base}{$report_item['board_id']}/{$content['id']}/dismiss" ),
+					
+					'global'                => $global,
+					'config'                => $config,
+					'mod'                   => $mod,
 				));
 				
 				$reportHTML .= $content_html;
@@ -2431,98 +2465,277 @@ function mod_reports($global = false) {
 	mod_page( sprintf('%s (%d)', _( ( $global ? 'Global report queue' : 'Report queue' ) ), $reportCount), 'mod/reports.html', $pageArgs );
 }
 
-function mod_report_dismiss($id, $all = false) {
-	global $config;
+function mod_report_dismiss() {
+	global $config, $mod;
 	
-	$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id");
-	$query->bindValue(':id', $id);
-	$query->execute() or error(db_error($query));
-	if ($report = $query->fetch(PDO::FETCH_ASSOC)) {
-		$ip = $report['ip'];
-		$board = $report['board'];
-		$post = $report['post'];
-	}
-	else
-		error($config['error']['404']);
+	// Parse arguments.
+	$arguments = func_get_args();
+	$global    = in_array( "global", $arguments );
+	$content   = in_array( "content", $arguments );
 	
-	if (!$all && !hasPermission($config['mod']['report_dismiss'], $board))
+	if( $mod['type'] == '20' and $global ) {
 		error($config['error']['noaccess']);
-	
-	if ($all && !hasPermission($config['mod']['report_dismiss_ip'], $board))
-		error($config['error']['noaccess']);
-	
-	if ($all) {
-		$query = prepare("DELETE FROM ``reports`` WHERE `ip` = :ip");
-		$query->bindValue(':ip', $ip);
-	} else {
-		$query = prepare("DELETE FROM ``reports`` WHERE `id` = :id");
-		$query->bindValue(':id', $id);
 	}
-	$query->execute() or error(db_error($query));
 	
-	
-	if ($all)
-		modLog("Dismissed all reports by <a href=\"?/IP/$ip\">$ip</a>");
-	else
-		modLog("Dismissed a report for post #{$id}", $board);
-	
-	header('Location: ?/reports', true, $config['redirect_http']);
-}
-
-function mod_report_demote($id) {
-	global $config;
-	
-	$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id AND ``global`` = TRUE");
-	$query->bindValue(':id', $id);
-	$query->execute() or error(db_error($query));
-	if ($report = $query->fetch(PDO::FETCH_ASSOC)) {
-		$ip = $report['ip'];
-		$board = $report['board'];
-		$post = $report['post'];
+	if( $content ) {
+		$board = @$arguments[2];
+		$post  = @$arguments[3];
+		
+		if( !hasPermission($config['mod']['report_dismiss_content'], $board) ) {
+			error($config['error']['noaccess']);
+		}
+		
+		if( $board != "" && $post != "" ) {
+			
+			$query = prepare("SELECT `id` FROM `reports` WHERE `board` = :board AND `post` = :post");
+			$query->bindValue(':board', $board);
+			$query->bindValue(':post', $post);
+			$query->execute() or error(db_error($query));
+			if( count( $reports = $query->fetchAll(PDO::FETCH_ASSOC) ) > 0 ) {
+				
+				$report_ids = array();
+				foreach( $reports as $report ) {
+					$report_ids[ $report['id'] ] = $report['id'];
+				}
+				
+				if( $global ) {
+					$scope = "``global`` = FALSE AND ``local`` = FALSE";
+				}
+				else {
+					$scope = "``local`` = FALSE";
+				}
+				
+				$query = prepare("UPDATE ``reports`` SET {$scope} WHERE `id` IN (".implode(',', array_map('intval', $report_ids)).")");
+				$query->execute() or error(db_error($query));
+				
+				modLog("Promoted " . count($report_ids) . " local report(s) for post #{$post}", $board);
+			}
+			else {
+				error($config['error']['404']);
+			}
+		}
+		else {
+			error($config['error']['404']);
+		}
 	}
 	else {
-		error($config['error']['404']);
+		$report = @$arguments[1];
+		$all    = in_array( "all", $arguments );
+		
+		if( $report != "" ) {
+			
+			$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id");
+			$query->bindValue(':id', $report);
+			$query->execute() or error(db_error($query));
+			if ($reportobj = $query->fetch(PDO::FETCH_ASSOC)) {
+				$ip = $reportobj['ip'];
+				$board = $reportobj['board'];
+				$post = $reportobj['post'];
+				
+				if( !$all && !hasPermission($config['mod']['report_dismiss'], $board) ) {
+					error($config['error']['noaccess']);
+				}
+				if( $all && !hasPermission($config['mod']['report_dismiss_ip'], $board) ) {
+					error($config['error']['noaccess']);
+				}
+				
+				// Determine scope (local and global or just local) based on /global/ being in URI.
+				if( $global ) {
+					$scope = "`global` = FALSE";
+					$boards = "";
+				}
+				else {
+					$scope = "`local` = FALSE";
+					$boards = "AND `board` = '{$board}'";
+				}
+				
+				// Prepare query.
+				// We don't delete reports, only modify scope.
+				if( $all ) {
+					$query = prepare("UPDATE ``reports`` SET {$scope} WHERE `ip` = :ip {$boards}");
+					$query->bindValue(':ip', $ip);
+				}
+				else {
+					$query = prepare("UPDATE ``reports`` SET {$scope} WHERE `id` = :id {$boards}");
+					$query->bindValue(':id', $report);
+				}
+				
+				$query->execute() or error(db_error($query));
+				
+				if( $all ) {
+					modLog("Dismissed all reports by <a href=\"?/IP/{$ip}\">{$ip}</a>");
+				}
+				else {
+					modLog("Dismissed a report for post #{$post}", $board);
+				}
+			}
+			else {
+				error($config['error']['404']);
+			}
+		}
+		else {
+			error($config['error']['404']);
+		}
 	}
 	
-	if( !hasPermission($config['mod']['report_demote'], $board) ) {
-		error($config['error']['noaccess']);
-	}
-	
-	$query = prepare("UPDATE ``reports`` SET ``global`` = FALSE WHERE `id` = :id");
-	$query->bindValue(':id', $id);
-	$query->execute() or error(db_error($query));
-	
-	
-	modLog("Demoted a global report for post #{$id}", $board);
-	
-	header('Location: ?/reports', true, $config['redirect_http']);
-}
-
-function mod_report_promote($id) {
-	global $config;
-	
-	$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id AND ``global`` = FALSE");
-	$query->bindValue(':id', $id);
-	$query->execute() or error(db_error($query));
-	if ($report = $query->fetch(PDO::FETCH_ASSOC)) {
-		$ip = $report['ip'];
-		$board = $report['board'];
-		$post = $report['post'];
+	if( $global ) {
+		header('Location: ?/reports/global', true, $config['redirect_http']);
 	}
 	else {
-		error($config['error']['404']);
+		header('Location: ?/reports', true, $config['redirect_http']);
 	}
+}
+
+function mod_report_demote() {
+	global $config, $mod;
 	
-	if( !hasPermission($config['mod']['report_promote'], $board) ) {
+	if( $mod['type'] == '20' ) {
 		error($config['error']['noaccess']);
 	}
 	
-	$query = prepare("UPDATE ``reports`` SET ``global`` = TRUE WHERE `id` = :id");
-	$query->bindValue(':id', $id);
-	$query->execute() or error(db_error($query));
+	// Parse arguments.
+	$arguments = func_get_args();
+	$content = in_array( "content", $arguments );
 	
+	if( $content ) {
+		$board = @$arguments[2];
+		$post  = @$arguments[3];
+		
+		if( !hasPermission($config['mod']['report_demote'], $board) ) {
+			error($config['error']['noaccess']);
+		}
+		
+		if( $board != "" && $post != "" ) {
+			
+			$query = prepare("SELECT `id` FROM `reports` WHERE `global` = TRUE AND `board` = :board AND `post` = :post");
+			$query->bindValue(':board', $board);
+			$query->bindValue(':post', $post);
+			$query->execute() or error(db_error($query));
+			if( count( $reports = $query->fetchAll(PDO::FETCH_ASSOC) ) > 0 ) {
+				
+				$report_ids = array();
+				foreach( $reports as $report ) {
+					$report_ids[ $report['id'] ] = $report['id'];
+				}
+				
+				$query = prepare("UPDATE ``reports`` SET ``global`` = FALSE WHERE `id` IN (".implode(',', array_map('intval', $report_ids)).")");
+				$query->execute() or error(db_error($query));
+				
+				modLog("Demoted " . count($report_ids) . " global report(s) for post #{$post}", $board);
+			}
+			else {
+				error($config['error']['404']);
+			}
+		}
+		else {
+			error($config['error']['404']);
+		}
+	}
+	else {
+		$report = @$arguments[1];
+		
+		if( $report != "" ) {
+			
+			$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id AND ``global`` = TRUE");
+			$query->bindValue(':id', $report);
+			$query->execute() or error(db_error($query));
+			if( $reportobj = $query->fetch(PDO::FETCH_ASSOC) ) {
+				$ip = $reportobj['ip'];
+				$board = $reportobj['board'];
+				$post = $reportobj['post'];
+				
+				if( !hasPermission($config['mod']['report_demote'], $board) ) {
+					error($config['error']['noaccess']);
+				}
+				
+				$query = prepare("UPDATE ``reports`` SET ``global`` = FALSE WHERE `id` = :id");
+				$query->bindValue(':id', $report);
+				$query->execute() or error(db_error($query));
+				
+				modLog("Demoted a global report for post #{$report}", $board);
+			}
+			else {
+				error($config['error']['404']);
+			}
+		}
+		else {
+			error($config['error']['404']);
+		}
+	}
 	
-	modLog("Promoted a local report for post #{$id}", $board);
+	header('Location: ?/reports/global', true, $config['redirect_http']);
+}
+
+function mod_report_promote() {
+	global $config, $mod;
+	
+	// Parse arguments.
+	$arguments = func_get_args();
+	$content = in_array( "content", $arguments );
+	
+	if( $content ) {
+		$board = @$arguments[2];
+		$post  = @$arguments[3];
+		
+		if( !hasPermission($config['mod']['report_promote'], $board) ) {
+			error($config['error']['noaccess']);
+		}
+		
+		if( $board != "" && $post != "" ) {
+			$query = prepare("SELECT `id` FROM `reports` WHERE `global` = FALSE AND `board` = :board AND `post` = :post");
+			$query->bindValue(':board', $board);
+			$query->bindValue(':post', $post);
+			$query->execute() or error(db_error($query));
+			if( count( $reports = $query->fetchAll(PDO::FETCH_ASSOC) ) > 0 ) {
+				
+				$report_ids = array();
+				foreach( $reports as $report ) {
+					$report_ids[ $report['id'] ] = $report['id'];
+				}
+				
+				$query = prepare("UPDATE ``reports`` SET ``global`` = TRUE WHERE `id` IN (".implode(',', array_map('intval', $report_ids)).")");
+				$query->execute() or error(db_error($query));
+				
+				modLog("Promoted " . count($report_ids) . " local report(s) for post #{$post}", $board);
+			}
+			else {
+				error($config['error']['404']);
+			}
+		}
+		else {
+			error($config['error']['404']);
+		}
+	}
+	else {
+		$report = @$arguments[1];
+		
+		if( $report != "" ) {
+			$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id AND ``global`` = FALSE");
+			$query->bindValue(':id', $report);
+			$query->execute() or error(db_error($query));
+			if ($reportobj = $query->fetch(PDO::FETCH_ASSOC)) {
+				$ip = $reportobj['ip'];
+				$board = $reportobj['board'];
+				$post = $reportobj['post'];
+				
+				if( !hasPermission($config['mod']['report_promote'], $board) ) {
+					error($config['error']['noaccess']);
+				}
+				
+				$query = prepare("UPDATE ``reports`` SET ``global`` = TRUE WHERE `id` = :id");
+				$query->bindValue(':id', $report);
+				$query->execute() or error(db_error($query));
+				
+				modLog("Promoted a local report for post #{$report}", $board);
+			}
+			else {
+				error($config['error']['404']);
+			}
+		}
+		else {
+			error($config['error']['404']);
+		}
+	}
 	
 	header('Location: ?/reports', true, $config['redirect_http']);
 }
diff --git a/mod.php b/mod.php
index 45fff1ad..fc44d004 100644
--- a/mod.php
+++ b/mod.php
@@ -54,11 +54,21 @@ $pages = array(
 	'/new-board'				=> 'secure_POST new_board',	// create a new board
 	
 	'/rebuild'                     => 'secure_POST rebuild',   // rebuild static files
-	'/reports'                     => 'reports',               // report queue
-	'/reports/(global)'            => 'reports',               // global report queue
-	'/reports/(\d+)/dismiss(all)?' => 'secure report_dismiss', // dismiss a report
-	'/reports/(\d+)/demote?'       => 'secure report_demote',  // demote a global report to a local report
-	'/reports/(\d+)/promote?'      => 'secure report_promote', // promote a local report to a global report
+	
+	// Report management
+	// (global) denotes if the action is being carried out from the global dashboard,
+	// and if the return address should also be the global dashboard.
+	// Important to note that (?:global) will make no argument.
+	// (global)? will make argument 0 either "global" or "".
+	'/reports(?:/)?'                                              => 'reports',               // report queue
+	'/reports/(global)?(?:/)?'                                    => 'reports',               // global report queue
+	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)(?:/)?'         => 'reports',               // specific reported content (also historic)
+	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)/dismiss(?:/)?' => 'secure report_dismiss', // dismiss all reports on content
+	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)/demote(?:/)?'  => 'secure report_demote',  // demote all reports on content
+	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)/promote(?:/)?' => 'secure report_promote', // demote all reports on content
+	'/reports/(global)?(?:/)?(\d+)/dismiss(all)?(?:/)?'           => 'secure report_dismiss', // dismiss a report
+	'/reports/(global)?(?:/)?(\d+)/demote(?:/)?'                  => 'secure report_demote',  // demote a global report to a local report
+	'/reports/(global)?(?:/)?(\d+)/promote(?:/)?'                 => 'secure report_promote', // promote a local report to a global report
 	
 	'/IP/([\w.:]+)'				=> 'secure_POST ip',		// view ip address
 	'/IP/([\w.:]+)/remove_note/(\d+)'	=> 'secure ip_remove_note',	// remove note from ip address
diff --git a/stylesheets/mod/mod.css b/stylesheets/mod/mod.css
index 42ff64d9..1db7638f 100644
--- a/stylesheets/mod/mod.css
+++ b/stylesheets/mod/mod.css
@@ -9,8 +9,7 @@
 		border-bottom: 1px solid #B7C5D9;
 		clear: left;
 		
-		margin: 0 0 0.5em 0;
-		padding: 0 0 0.5em 0;
+		padding: 0.5em;
 	}
 	.mod-report:last-child {
 		border-bottom: none;
@@ -92,13 +91,38 @@
 
 .report-content div.post.reply,
 .report-content div.thread {
-	background: #FFC4C4;
+	background: #D6DAF0;
 	margin: 0.2em 4px 0.2em 0;
-	padding: 0.2em 0.3em 0.5em 0.6em;
+	padding: 0.3em 0.3em 0.5em 0.6em;
 	border-width: 1px;
 	border-style: none solid solid none;
-	border-color: #F88;
+	border-color: #B7C5D9;
 	display: inline-block;
 	max-width: 94% !important;
 }
-
+.mod-report:hover .report-content div.post.reply,
+.mod-report:hover .report-content div.thread {
+	background: #FFC4C4;
+	border-color: #F88;
+}
+	.report-content-actions {
+		display: block;
+		padding: 0.3em 0;
+		clear: left;
+		list-style: none;
+	}
+		.report-content-action {
+			display: inline-block;
+			margin: 0 0.5em 0 0;
+			padding: 0;
+		}
+		.report-content-action::after {
+			display: inline-block;
+			margin: 0 0 0 0.5em;
+			padding: 0;
+			content: ' | ';
+		}
+		.report-content-action:last-child::after {
+			display: none;
+			content: '';
+		}
diff --git a/stylesheets/style.css b/stylesheets/style.css
index c33a0589..e0b9ce4b 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -327,6 +327,7 @@ div#wrap {
   margin: 0 auto;
 }
 
+div.module,
 div.ban {
   background: white;
   border: 1px solid #98E;
@@ -334,7 +335,8 @@ div.ban {
   margin: 30px auto;
 }
 
-div.ban p,div.ban h2 {
+div.ban p,
+div.ban h2 {
   padding: 3px 7px;
 }
 
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 87e67c85..03cfbb14 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -57,7 +57,6 @@
 					{% if mod.type != 20 %}<a href="?/reports/global">Global reports ({{global_reports}})</a>{% endif %}
 				{% if reports > 0 %}</strong>{% endif %}
 			</li>
-
 		{% endif %}
 		{% if mod|hasPermission(config.mod.view_banlist) %}
 			<li><a href="?/bans">{% trans 'Ban list' %}</a></li>
diff --git a/templates/mod/report.html b/templates/mod/report.html
index f7b5b868..e3b79d07 100644
--- a/templates/mod/report.html
+++ b/templates/mod/report.html
@@ -20,20 +20,20 @@
 		<ul class="report-actions">
 			{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
 			<li class="report-action">
-				<a class="action-item action-available" title="{% trans 'Discard abuse report' %}" href="?/reports/{{ report.id }}/dismiss/{{ token_dismiss }}">Dismiss</a>
+				<a class="action-item action-available" title="{% trans 'Discard abuse report' %}" href="{{uri_dismiss}}/{{token_dismiss}}">Dismiss</a>
 			</li>
 			{% endif %}
 			
 			{% if mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
 			<li class="report-action">
-				<a class="action-item action-available" title="{% trans 'Discard all abuse reports by this IP address' %}" href="?/reports/{{ report.id }}/dismissall/{{ token_ip }}">Dismiss+</a>
+				<a class="action-item action-available" title="{% trans 'Discard all abuse reports by this IP address' %}" href="{{uri_ip}}/{{token_ip}}">Dismiss+</a>
 			</li>
 			{% endif %}
 			
 			{% if global and mod|hasPermission(config.mod.report_demote, report.board) %}
 			<li class="report-action">
 				{% if report.local %}
-				<a class="action-item action-available" title="{% trans 'Demote global abuse report to a local report' %}" href="?/reports/{{ report.id }}/demote/{{ token_demote }}">Demote</a>
+				<a class="action-item action-available" title="{% trans 'Demote global abuse report to a local report' %}" href="{{uri_demote}}/{{token_demote}}">Demote</a>
 				{% else %}
 				<span class="action-item action-unavailable" title="{% trans 'Report has already been dismissed locally' %}">Demote</span>
 				{% endif %}
@@ -43,7 +43,7 @@
 				{% if report.global %}
 				<span class="action-item action-unavailable" title="{% trans 'Report is already a global report' %}">Promote</span>
 				{% else %}
-				<a class="action-item action-available" title="{% trans 'Promote local abuse report to a global report' %}" href="?/reports/{{ report.id }}/promote/{{ token_promote }}">Promote</a>
+				<a class="action-item action-available" title="{% trans 'Promote local abuse report to a global report' %}" href="{{uri_promote}}/{{token_promote}}">Promote</a>
 				{% endif %}
 			</li>
 			{% endif %}
diff --git a/templates/mod/report_content.html b/templates/mod/report_content.html
index 1ad534cb..102781dc 100644
--- a/templates/mod/report_content.html
+++ b/templates/mod/report_content.html
@@ -3,6 +3,57 @@
 	
 	<div class="report-content">
 		{{ content_html }}
+		
+		<!-- Content Sweep Actions -->
+		<ul class="report-content-actions">
+			{% if global and mod|hasPermission(config.mod.report_demote, report.board) %}
+			<!-- Demote All -->
+			<li class="report-action">
+				{% if reports_can_demote %}
+				<a class="content-action-item content-action-available"title="{% trans 'Demote global abuse reports to local reports' %}" href="{{uri_content_demote}}/{{token_content_demote}}">Demote All</a>
+				{% else %}
+				<span class="content-action-item content-action-unavailable" title="{% trans 'Reports have all been dismissed locally' %}">Demote All</span>
+				{% endif %}
+			</li>
+			{% elseif not global and mod|hasPermission(config.mod.report_promote, report.board) %}
+			<!-- Promote All -->
+			<li class="report-action">
+				{% if reports_can_promote %}
+				<a class="content-action-item content-action-available"title="{% trans 'Promote all local abuse reports to global reports' %}" href="{{uri_content_promote}}/{{token_content_promote}}">Promote All</a>
+				{% else %}
+				<span class="content-action-item content-action-unavailable" title="{% trans 'Reports are already global reports' %}">Promote All</span>
+				{% endif %}
+			</li>
+			{% endif %}
+			
+			{% if mod|hasPermission(config.mod.report_dismiss_post, report.board) %}
+			<!-- Dismiss All -->
+			<li class="report-content-action">
+				<a class="content-action-item content-action-available" title="{% trans 'Discard all abuse reports on this content' %}" href="{{uri_content_dismiss}}/{{token_content_dismiss}}">Dismiss All</a>
+			</li>
+			{% endif %}
+			
+			{% if mod|hasPermission(config.mod.report_content_clean, report.board) %}
+			<!-- Clean Local -->
+			<li class="report-content-action">
+				<a class="content-action-item content-action-available" title="{% trans 'Ignore and dismiss local abuse reports on this post for this board' %}" href="?/reports/clean/{{ content_board }}/{{ report.id }}/{{ token_clean }}">Clean (/{{ content_board }}/)</a>
+			</li>
+			{% endif %}
+			
+			{% if mod|hasPermission(config.mod.report_content_clean_global, report.board) %}
+			<!-- Clean Global -->
+			<li class="report-content-action">
+				<a class="content-action-item content-action-available" title="{% trans 'Ignore and demote global abuse reports on this post' %}" href="?/reports/cleanglocal/{{ report.id }}/{{ token_clean_global }}">Clean (Global)</a>
+			</li>
+			{% endif %}
+			
+			{% if mod|hasPermission(config.mod.report_content_clean, report.board) and mod|hasPermission(config.mod.report_content_clean_global, report.board) %}
+			<!-- Clean Local + Global -->
+			<li class="report-content-action">
+				<a class="content-action-item content-action-available" title="{% trans 'Ignore and dismiss local AND global abuse reports on this post' %}" href="?/reports/content/{{ content_board }}/{{ token_clean_global }}">Clean (/{{ content_board }}/+Global)</a>
+			</li>
+			{% endif %}
+		</ul>
 	</div>
 	
 	<ul class="report-list">
diff --git a/templates/mod/reports.html b/templates/mod/reports.html
index 04853b70..99ce3093 100644
--- a/templates/mod/reports.html
+++ b/templates/mod/reports.html
@@ -1,8 +1,8 @@
 {% if reports %}
-	<ul class="mod-reports reports-global">
-		{{ reports }}
-	</ul>
+<ul class="mod-reports reports-global">
+	{{ reports }}
+</ul>
 {% else %}
-	<p style="text-align:center" class="unimportant">({% trans 'There are no reports.' %})</p>
+<p style="text-align:center" class="unimportant">({% trans 'There are no reports.' %})</p>
 {% endif %}
 

From 4c8e9203030af7fd4b785468ea785ae0f3ed279a Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Mon, 20 Oct 2014 10:17:19 -0500
Subject: [PATCH 09/12] [#184] Resolved duplicate report issue. Added
 rudamentary Clean functionality.

---
 inc/config.php                    |   5 +-
 inc/display.php                   |  55 ++++++++++++-
 inc/functions.php                 |   1 +
 inc/mod/pages.php                 | 127 ++++++++++++++++++++++++++++--
 mod.php                           |  26 +++---
 stylesheets/style.css             |  12 +++
 templates/mod/report.html         |   2 +-
 templates/mod/report_content.html |  47 ++++++-----
 templates/post/edited_at.html     |  15 +++-
 templates/post_reply.html         |   2 +-
 templates/post_thread.html        |   2 +-
 11 files changed, 241 insertions(+), 53 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index bcc22f8e..4190b0bb 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1382,7 +1382,10 @@
 	$config['mod']['flood'] = &$config['mod']['bypass_filters'];
 	// Raw HTML posting
 	$config['mod']['rawhtml'] = ADMIN;
-
+	// Clean/Unclean posts
+	$config['mod']['clean'] = JANITOR;
+	$config['mod']['clean_global'] = MOD;
+	
 	/* Administration */
 	// View the report queue
 	$config['mod']['reports'] = JANITOR;
diff --git a/inc/display.php b/inc/display.php
index 1a78e19b..bb6120ee 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -389,7 +389,32 @@ class Post {
 	public function build($index=false) {
 		global $board, $config;
 		
-		return Element('post_reply.html', array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'mod' => $this->mod));
+		return Element('post_reply.html', array(
+			'config' => $config,
+			'board' => $board,
+			'post' => &$this,
+			'index' => $index,
+			'mod' => $this->mod,
+			'clean' => $this->getClean(),
+		));
+	}
+	
+	public function getClean( ) {
+		global $board;
+		
+		if( !isset( $this->clean ) ) {
+			$query = prepare("SELECT * FROM `post_clean` WHERE `post_id` = :post AND `board_id` = :board");
+			$query->bindValue( ':board', $board['uri'] );
+			$query->bindValue( ':post',  $this->id );
+			
+			$query->execute() or error(db_error($query));
+			
+			if( !($this->clean = $query->fetch(PDO::FETCH_ASSOC)) ) {
+				$this->clean = array();
+			}
+		}
+		
+		return $this->clean;
 	}
 };
 
@@ -453,9 +478,35 @@ class Thread {
 		
 		event('show-thread', $this);
 
-		$built = Element('post_thread.html', array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'hasnoko50' => $hasnoko50, 'isnoko50' => $isnoko50, 'mod' => $this->mod));
+		$built = Element('post_thread.html', array(
+			'config' => $config,
+			'board' => $board,
+			'post' => &$this,
+			'index' => $index,
+			'hasnoko50' => $hasnoko50,
+			'isnoko50' => $isnoko50,
+			'mod' => $this->mod,
+			'clean' => $this->getClean(),
+		));
 		
 		return $built;
 	}
+	public function getClean( ) {
+		global $board, $config, $debug;
+		
+		if( !isset( $this->clean ) ) {
+			$query = prepare("SELECT * FROM `post_clean` WHERE `post_id` = :post AND `board_id` = :board");
+			$query->bindValue( ':board', $board['uri'] );
+			$query->bindValue( ':post',  $this->id );
+			
+			$query->execute() or error(db_error($query));
+			
+			if( !($this->clean = $query->fetch(PDO::FETCH_ASSOC)) ) {
+				$this->clean = array();
+			}
+		}
+		
+		return $this->clean;
+	}
 };
 
diff --git a/inc/functions.php b/inc/functions.php
index 672885be..48a399ec 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -311,6 +311,7 @@ function _syslog($priority, $message) {
 function verbose_error_handler($errno, $errstr, $errfile, $errline) {
 	if (error_reporting() == 0)
 		return false; // Looks like this warning was suppressed by the @ operator.
+	
 	error(utf8tohtml($errstr), true, array(
 		'file' => $errfile . ':' . $errline,
 		'errno' => $errno,
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 2b9d8fed..dde0c1bc 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -2257,6 +2257,7 @@ function mod_rebuild() {
 	));
 }
 
+
 function mod_reports() {
 	global $config, $mod;
 	
@@ -2276,7 +2277,7 @@ function mod_reports() {
 	$report_scope = $global ? "global" : "local";
 	
 	// Get REPORTS.
-	$query = prepare("SELECT * FROM ``reports`` " . ($mod["type"] == "20" ? "WHERE board = :board" : "") . " WHERE ``".($global ? "global" : "local")."``=TRUE  LIMIT :limit");
+	$query = prepare("SELECT * FROM ``reports`` " . ($mod["type"] == "20" ? "WHERE board = :board" : "") . " WHERE ``".($global ? "global" : "local")."`` = TRUE  LIMIT :limit");
 	
 	// Limit reports by board if the moderator is local.
 	if( $mod['type'] == '20' ) {
@@ -2335,27 +2336,26 @@ function mod_reports() {
 				$report_index[ $content_key ] = array(
 					"board_id" => $report['board'],
 					"post_id"  => $report['post'],
-					"content"  => &$report_posts[ $report['board'] ][ $report['post'] ],
+					"content"  => $report_posts[ $report['board'] ][ $report['post'] ],
 					"reports"  => array(),
 				);
 			}
 			
 			// Add the report to the list of reports.
-			$report_index[ $content_key ]['reports'][ $report['id'] ] = &$report;
+			$report_index[ $content_key ]['reports'][ $report['id'] ] = $report;
 			
 			// Increment the total report count.
 			++$reportCount;
 		}
 		
-		
 		// Only continue if we have something to do.
 		// If there are no valid reports left, we're done.
 		if( $reportCount > 0 ) {
 			
 			// Sort this report index by number of reports, desc.
 			usort( $report_index, function( $a, $b ) {
-				$ra = $a['reports'];
-				$rb = $b['reports'];
+				$ra = count( $a['reports'] );
+				$rb = count( $b['reports'] );
 				
 				if( $ra < $rb ) {
 					return 1;
@@ -2404,7 +2404,7 @@ function mod_reports() {
 						'token_dismiss' => make_secure_link_token( $uri_report_base . '/dismiss' ),
 						'token_ip'      => make_secure_link_token( $uri_report_base . '/dismissall' ),
 						'token_demote'  => make_secure_link_token( $uri_report_base . '/demote' ),
-						'token_promote' => make_secure_link_token( $uri_report_base . '/promote' ),
+						'token_promote' => make_secure_link_token( $uri_report_base . '/promote'  ),
 					));
 					
 					// Determines if we can "Demote All" / "Promote All"
@@ -2431,6 +2431,7 @@ function mod_reports() {
 				);
 				
 				$uri_content_base = "reports/" . ($global ? "global/" : "" ) . "content/";
+				$uri_clean_base   = "{$report_item['board_id']}/clean/{$content['id']}";
 				$content_html = Element('mod/report_content.html', array(
 					'reports_html'          => $report_html,
 					'reports_can_demote'    => $reports_can_demote,
@@ -2449,6 +2450,13 @@ function mod_reports() {
 					'token_content_promote' => make_secure_link_token( "{$uri_content_base}{$report_item['board_id']}/{$content['id']}/promote" ),
 					'token_content_dismiss' => make_secure_link_token( "{$uri_content_base}{$report_item['board_id']}/{$content['id']}/dismiss" ),
 					
+					'uri_clean'             => "?/{$uri_clean_base}/local",
+					'uri_clean_global'      => "?/{$uri_clean_base}/global",
+					'uri_clean_both'        => "?/{$uri_clean_base}/global+local",
+					'token_clean'           => make_secure_link_token( $uri_clean_base . '/local' ),
+					'token_clean_global'    => make_secure_link_token( $uri_clean_base . '/global' ),
+					'token_clean_both'      => make_secure_link_token( $uri_clean_base . '/global+local' ),
+					
 					'global'                => $global,
 					'config'                => $config,
 					'mod'                   => $mod,
@@ -2565,6 +2573,12 @@ function mod_report_dismiss() {
 				
 				$query->execute() or error(db_error($query));
 				
+				
+				// Cleanup - Remove reports that have been completely dismissed.
+				$query = prepare("DELETE FROM `reports` WHERE `local` = FALSE AND `global` = FALSE");
+				$query->execute() or error(db_error($query));
+				
+				
 				if( $all ) {
 					modLog("Dismissed all reports by <a href=\"?/IP/{$ip}\">{$ip}</a>");
 				}
@@ -2799,6 +2813,105 @@ function mod_recent_posts($lim) {
 
 }
 
+function mod_clean( $board, $unclean, $post, $global, $local ) {
+	global $config, $mod;
+	
+	if( !openBoard($board) ) {
+		error($config['error']['noboard']);
+	}
+	
+	$query_global = "";
+	$query_global_mod = "";
+	if( $global ) {
+		if( !hasPermission($config['mod']['clean_global'], $board) ) {
+			error($config['error']['noaccess']);
+		}
+		
+		$query_global = "`clean_global` = :clean";
+		$query_global_mod = "`clean_global_mod_id` = :mod";
+	}
+	
+	$query_local = "";
+	$query_local_mod = "";
+	if( $local ) {
+		if( !hasPermission($config['mod']['clean'], $board) ) {
+			error($config['error']['noaccess']);
+		}
+		
+		$query_local = "`clean_local` = :clean";
+		$query_local_mod = "`clean_local_mod_id` = :mod";
+	}
+	
+	
+	// Marking this post as "Clean" (report immune?)
+	if( !$unclean ) {
+		// Attempt to find a `post_clean` row for this content.
+		$query = prepare("SELECT * FROM `post_clean` WHERE `board_id` = :board AND `post_id` = :post");
+		$query->bindValue( ':board', $board );
+		$query->bindValue( ':post',  $post );
+		
+		$query->execute() or error(db_error($query));
+		
+		// If the $clean object doesn't exist we need to insert a row for this post.
+		if( !($clean = $query->fetch(PDO::FETCH_ASSOC)) ) {
+			$query = prepare("INSERT INTO `post_clean` (`post_id`, `board_id`) VALUES ( :post, :board )");
+			$query->bindValue( ':board', $board );
+			$query->bindValue( ':post',  $post );
+			
+			$query->execute() or error(db_error($query));
+			
+			if( $query->rowCount() == 0 ) {
+				error("The database failed to create a record for this content in `post_clean` to record clean status.");
+			}
+			
+			$clean = true;
+		}
+	}
+	// Revoking clean status (open it to reports?)
+	else {
+		// Attempt to find a `post_clean` row for this content.
+		$query = prepare("SELECT * FROM `post_clean` WHERE `board_id` = :board AND `post_id` = :post");
+		$query->bindValue( ':board', $board );
+		$query->bindValue( ':post',  $post );
+		
+		$query->execute() or error(db_error($query));
+		
+		if( !($clean = $query->fetch(PDO::FETCH_ASSOC)) ) {
+			error($config['error']['404']);
+		}
+	}
+	
+	// Update the `post_clean` row represented by $clean.
+	if( $clean ) {
+		// Build our query based on the URI arguments.
+		if( $global && $local ) {
+			$query = prepare("UPDATE `post_clean` SET {$query_global}, {$query_global_mod}, {$query_local}, {$query_local_mod} WHERE `board_id` = :board AND `post_id` = :post");
+		}
+		else if( $global ) {
+			$query = prepare("UPDATE `post_clean` SET {$query_global}, {$query_global_mod} WHERE `board_id` = :board AND `post_id` = :post");
+		}
+		else {
+			$query = prepare("UPDATE `post_clean` SET {$query_local}, {$query_local_mod} WHERE `board_id` = :board AND `post_id` = :post");
+		}
+		
+		$query->bindValue( ':clean', !$unclean );
+		$query->bindValue( ':mod',   $mod['id'] );
+		$query->bindValue( ':board', $board );
+		$query->bindValue( ':post',  $post );
+		
+		$query->execute() or error(db_error($query));
+		
+		// Log the action.
+		// This is super important because a mod intentionally screwing with clean status needs to be found out, fast.
+		$log_action = ($unclean ? "Closed" : "Re-opened" );
+		$log_scope  = ($local && $global ? "local and global" : ($local ? "local" : "global" ) );
+		modLog( "{$log_action} reports for post #{$post} in {$log_scope}.", $board);
+	}
+	
+	// Redirect
+	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+}
+
 function mod_config($board_config = false) {
 	global $config, $mod, $board;
 	
diff --git a/mod.php b/mod.php
index fc44d004..869d6af9 100644
--- a/mod.php
+++ b/mod.php
@@ -85,18 +85,20 @@ $pages = array(
 	'/search'				=> 'search_redirect',		// search
 	'/search/(posts|IP_notes|bans|log)/(.+)/(\d+)'	=> 'search',		// search
 	'/search/(posts|IP_notes|bans|log)/(.+)'	=> 'search',		// search
-
-	'/(\%b)/ban(&delete)?/(\d+)'		=> 'secure_POST ban_post', 	// ban poster
-	'/(\%b)/move/(\d+)'			=> 'secure_POST move',		// move thread
-	'/(\%b)/move_reply/(\d+)'			=> 'secure_POST move_reply',		// move reply
-	'/(\%b)/edit(_raw)?/(\d+)'		=> 'secure_POST edit_post',	// edit post
-	'/(\%b)/delete/(\d+)'			=> 'secure delete',		// delete post
-	'/(\%b)/deletefile/(\d+)/(\d+)'		=> 'secure deletefile',		// delete file from post
-	'/(\%b+)/spoiler/(\d+)/(\d+)'			=> 'secure spoiler_image',	// spoiler file
-	'/(\%b)/deletebyip/(\d+)(/global)?'	=> 'secure deletebyip',		// delete all posts by IP address
-	'/(\%b)/(un)?lock/(\d+)'		=> 'secure lock',		// lock thread
-	'/(\%b)/(un)?sticky/(\d+)'		=> 'secure sticky',		// sticky thread
-	'/(\%b)/bump(un)?lock/(\d+)'		=> 'secure bumplock',		// "bumplock" thread
+	
+	// Content management
+	'/(\%b)/ban(&delete)?/(\d+)'                      => 'secure_POST ban_post',   // ban poster
+	'/(\%b)/move/(\d+)'                               => 'secure_POST move',       // move thread
+	'/(\%b)/move_reply/(\d+)'                         => 'secure_POST move_reply', // move reply
+	'/(\%b)/edit(_raw)?/(\d+)'                        => 'secure_POST edit_post',  // edit post
+	'/(\%b)/delete/(\d+)'                             => 'secure delete',          // delete post
+	'/(\%b)/deletefile/(\d+)/(\d+)'                   => 'secure deletefile',      // delete file from post
+	'/(\%b+)/spoiler/(\d+)/(\d+)'                     => 'secure spoiler_image',   // spoiler file
+	'/(\%b)/deletebyip/(\d+)(/global)?'               => 'secure deletebyip',      // delete all posts by IP address
+	'/(\%b)/(un)?lock/(\d+)'                          => 'secure lock',            // lock thread
+	'/(\%b)/(un)?sticky/(\d+)'                        => 'secure sticky',          // sticky thread
+	'/(\%b)/bump(un)?lock/(\d+)'                      => 'secure bumplock',        // "bumplock" thread
+	'/(\%b)/(un)?clean/(\d+)/(global)?(?:\+)?(local)?' => 'secure clean',           // protect/unprotect from reports
 	
 	'/themes'				=> 'themes_list',		// manage themes
 	'/themes/(\w+)'				=> 'secure_POST theme_configure',		// configure/reconfigure theme
diff --git a/stylesheets/style.css b/stylesheets/style.css
index eb779912..61bc07a5 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -288,6 +288,18 @@ div.post.reply {
   max-width: 94%!important;
 }
 
+div.post_modified {
+  font-size: 10px;
+  min-width: 47.5em;
+  margin-left: 1.8em;
+  padding-top: 0.8em;
+}
+
+div.post_modified div.content-status {
+  margin-top: 0.4em;
+  padding-bottom: 0em;
+}
+
 span.trip {
   color: #228854;
 }
diff --git a/templates/mod/report.html b/templates/mod/report.html
index e3b79d07..5d07e0eb 100644
--- a/templates/mod/report.html
+++ b/templates/mod/report.html
@@ -1,5 +1,5 @@
 <li class="report-item">
-	<div class="report">
+	<div class="report" id="report-{{ report.id }}">
 		<span class="report-reason">{% if report.reason %}{{ report.reason }}{% else %}<em>{% trans 'No reason given.' %}</em>{% endif %}</span>
 		
 		<ul class="report-details">
diff --git a/templates/mod/report_content.html b/templates/mod/report_content.html
index 102781dc..e6fff9bd 100644
--- a/templates/mod/report_content.html
+++ b/templates/mod/report_content.html
@@ -6,6 +6,13 @@
 		
 		<!-- Content Sweep Actions -->
 		<ul class="report-content-actions">
+			{% if mod|hasPermission(config.mod.report_dismiss_content, report.board) %}
+			<!-- Dismiss All -->
+			<li class="report-content-action">
+				<a class="content-action-item content-action-available" title="{% trans 'Discard all abuse reports on this content' %}" href="{{uri_content_dismiss}}/{{token_content_dismiss}}">Dismiss All</a>
+			</li>
+			{% endif %}
+			
 			{% if global and mod|hasPermission(config.mod.report_demote, report.board) %}
 			<!-- Demote All -->
 			<li class="report-action">
@@ -26,31 +33,23 @@
 			</li>
 			{% endif %}
 			
-			{% if mod|hasPermission(config.mod.report_dismiss_post, report.board) %}
-			<!-- Dismiss All -->
+			{% if mod|hasPermission(config.mod.clean, report.board) or mod|hasPermission(config.mod.clean_global, report.board) %}
 			<li class="report-content-action">
-				<a class="content-action-item content-action-available" title="{% trans 'Discard all abuse reports on this content' %}" href="{{uri_content_dismiss}}/{{token_content_dismiss}}">Dismiss All</a>
-			</li>
-			{% endif %}
-			
-			{% if mod|hasPermission(config.mod.report_content_clean, report.board) %}
-			<!-- Clean Local -->
-			<li class="report-content-action">
-				<a class="content-action-item content-action-available" title="{% trans 'Ignore and dismiss local abuse reports on this post for this board' %}" href="?/reports/clean/{{ content_board }}/{{ report.id }}/{{ token_clean }}">Clean (/{{ content_board }}/)</a>
-			</li>
-			{% endif %}
-			
-			{% if mod|hasPermission(config.mod.report_content_clean_global, report.board) %}
-			<!-- Clean Global -->
-			<li class="report-content-action">
-				<a class="content-action-item content-action-available" title="{% trans 'Ignore and demote global abuse reports on this post' %}" href="?/reports/cleanglocal/{{ report.id }}/{{ token_clean_global }}">Clean (Global)</a>
-			</li>
-			{% endif %}
-			
-			{% if mod|hasPermission(config.mod.report_content_clean, report.board) and mod|hasPermission(config.mod.report_content_clean_global, report.board) %}
-			<!-- Clean Local + Global -->
-			<li class="report-content-action">
-				<a class="content-action-item content-action-available" title="{% trans 'Ignore and dismiss local AND global abuse reports on this post' %}" href="?/reports/content/{{ content_board }}/{{ token_clean_global }}">Clean (/{{ content_board }}/+Global)</a>
+				Clean&nbsp;
+				{% if mod|hasPermission(config.mod.clean, report.board) %}
+				<!-- Clean Local -->
+				<a class="content-action-item content-action-available" title="{% trans 'Ignore and dismiss local abuse reports on this post for this board' %}" href="{{ uri_clean }}/{{ token_clean }}">(/{{ content_board }}/)</a>
+				{% endif %}
+				{% if mod|hasPermission(config.mod.clean_global, report.board) %}
+				&nbsp;
+				<!-- Clean Global -->
+				<a class="content-action-item content-action-available" title="{% trans 'Ignore and demote global abuse reports on this post' %}" href="{{ uri_clean_global }}/{{ token_clean_global }}">(Global)</a>
+				&nbsp;
+				{% if mod|hasPermission(config.mod.clean, report.board) and mod|hasPermission(config.mod.clean_global, report.board) %}
+				<!-- Clean Local + Global -->
+				<a class="content-action-item content-action-available" title="{% trans 'Ignore and dismiss local AND global abuse reports on this post' %}" href="{{ uri_clean_both }}/{{ token_clean_both }}">(/{{ content_board }}/+Global)</a>
+				{% endif %}
+				{% endif %}
 			</li>
 			{% endif %}
 		</ul>
diff --git a/templates/post/edited_at.html b/templates/post/edited_at.html
index ac49fc81..4c55a8d4 100644
--- a/templates/post/edited_at.html
+++ b/templates/post/edited_at.html
@@ -1,4 +1,11 @@
-{% if post.edited_at %}
-	<br>
-	<span class="unimportant edited">Post last edited at <em class="edited-time">{{ post.edited_at }}</em></span>
-{% endif %}
+<div class="post_modified">
+	{% if post.edited_at %}
+		<div class="content-status edited">{% trans 'Post last edited at' %} <em class="edited-time">{{ post.edited_at }}</em></div>
+	{% endif %}
+	{% if clean.clean_local == '1' %}
+		<div class="content-status clean-local">{% trans 'Board rules permit this content' %}</div>
+	{% endif %}
+	{% if clean.clean_global == '1' %}
+		<div class="content-status clean-global">{% trans 'Global rules permit this content' %}</div>
+	{% endif %}
+</div>
\ No newline at end of file
diff --git a/templates/post_reply.html b/templates/post_reply.html
index 9a32f403..4455a575 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -22,8 +22,8 @@
 		{% if post.modifiers['ban message'] %}
 			{{ config.mod.ban_message|sprintf(post.modifiers['ban message']) }}
 		{% endif %}
-		{% include 'post/edited_at.html' %}
 	</div>
+	{% include 'post/edited_at.html' %}
 </div>
 <br/>
 {% endfilter %}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 771f5ce0..33e953ee 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -55,7 +55,6 @@
 		{% if post.modifiers['ban message'] %}
 			{{ config.mod.ban_message|sprintf(post.modifiers['ban message']) }}
 		{% endif %}
-		{% include 'post/edited_at.html' %}
 	</div>
 	{% if post.omitted or post.omitted_images %}
 		<span class="omitted">
@@ -78,6 +77,7 @@
 			{% endif %} {% trans %}omitted. Click reply to view.{% endtrans %}
 		</span>
 	{% endif %}
+	{% include 'post/edited_at.html' %}
 {% if not index %}
 {% endif %}
 </div>{% endfilter %}

From 9c5ec12aaadee6aaf7ed24f2dcec98b6ed0cf50d Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Tue, 21 Oct 2014 07:50:25 -0500
Subject: [PATCH 10/12] [#184] Reports made to clean posts are now ignored
 correctly (and in accordance with the local/global duality). Marking posts
 clean dismisses posts (also in accordance with local/global duality). Fixed
 up some templating issues (now display more correct messages and omit actions
 that are invalid). Moved Clean action off post-level and into reports action.

---
 inc/display.php                   | 29 ++++-------
 inc/mod/pages.php                 | 81 ++++++++++++++++++++++++++-----
 mod.php                           | 20 ++++----
 post.php                          | 65 +++++++++++++++++--------
 stylesheets/style.css             |  4 +-
 templates/mod/report.html         |  8 ++-
 templates/mod/report_content.html | 14 ++++--
 7 files changed, 151 insertions(+), 70 deletions(-)

diff --git a/inc/display.php b/inc/display.php
index bb6120ee..9b4c2d83 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -343,6 +343,7 @@ function embed_html($link) {
 	return 'Embedding error.';
 }
 
+
 class Post {
 	public function __construct($post, $root=null, $mod=false) {
 		global $config;
@@ -410,7 +411,14 @@ class Post {
 			$query->execute() or error(db_error($query));
 			
 			if( !($this->clean = $query->fetch(PDO::FETCH_ASSOC)) ) {
-				$this->clean = array();
+				$this->clean = array(
+					'post_id' => $this->id,
+					'board_id' => $board['uri'],
+					'clean_local' => "0",
+					'clean_global' => "0",
+					'clean_local_mod_id' => null,
+					'clean_global_mod_id' => null,
+				);
 			}
 		}
 		
@@ -418,7 +426,7 @@ class Post {
 	}
 };
 
-class Thread {
+class Thread extends Post {
 	public function __construct($post, $root = null, $mod = false, $hr = true) {
 		global $config;
 		if (!isset($root))
@@ -491,22 +499,5 @@ class Thread {
 		
 		return $built;
 	}
-	public function getClean( ) {
-		global $board, $config, $debug;
-		
-		if( !isset( $this->clean ) ) {
-			$query = prepare("SELECT * FROM `post_clean` WHERE `post_id` = :post AND `board_id` = :board");
-			$query->bindValue( ':board', $board['uri'] );
-			$query->bindValue( ':post',  $this->id );
-			
-			$query->execute() or error(db_error($query));
-			
-			if( !($this->clean = $query->fetch(PDO::FETCH_ASSOC)) ) {
-				$this->clean = array();
-			}
-		}
-		
-		return $this->clean;
-	}
 };
 
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index dde0c1bc..37b3892e 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1614,7 +1614,7 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 		}
 		
 		buildIndex();
-
+		
 		rebuildThemes('post', $board);
 		
 		header('Location: ?/' . sprintf($config['board_path'], $board) . $config['dir']['res'] . sprintf($config['file_page'], $post['thread'] ? $post['thread'] : $postID) . '#' . $postID, true, $config['redirect_http']);
@@ -2384,6 +2384,11 @@ function mod_reports() {
 					$po = new Post($content, '?/', $mod);
 				}
 				
+				// Fetch clean status.
+				$po->getClean();
+				$clean = $po->clean;
+				
+				
 				// Add each report's template to this container.
 				$report_html = "";
 				$reports_can_demote = false;
@@ -2396,6 +2401,7 @@ function mod_reports() {
 						'config'        => $config,
 						'mod'           => $mod,
 						'global'        => $global,
+						'clean'         => $clean,
 						
 						'uri_dismiss'   => "?/{$uri_report_base}/dismiss",
 						'uri_ip'        => "?/{$uri_report_base}/dismissall",
@@ -2430,8 +2436,14 @@ function mod_reports() {
 					$content_reports
 				);
 				
-				$uri_content_base = "reports/" . ($global ? "global/" : "" ) . "content/";
-				$uri_clean_base   = "{$report_item['board_id']}/clean/{$content['id']}";
+				
+				// Figure out some stuff we need for the page.
+				$reports_can_demote  = ( $clean['clean_local'] ? false : $reports_can_demote );
+				$reports_can_promote = ( $clean['clean_global'] ? false : $reports_can_promote );
+				$uri_content_base    = "reports/" . ($global ? "global/" : "" ) . "content/";
+				$uri_clean_base      = "reports/" . ($global ? "global/" : "" ) . "{$report_item['board_id']}/clean/{$content['id']}";
+				
+				// Build the actions page.
 				$content_html = Element('mod/report_content.html', array(
 					'reports_html'          => $report_html,
 					'reports_can_demote'    => $reports_can_demote,
@@ -2441,7 +2453,9 @@ function mod_reports() {
 					
 					'content_html'          => $po->build(true),
 					'content_board'         => $report_item['board_id'],
-					'content'               => $content,
+					'content'               => (array) $content,
+					
+					'clean'                 => $clean,
 					
 					'uri_content_demote'    => "?/{$uri_content_base}{$report_item['board_id']}/{$content['id']}/demote",
 					'uri_content_promote'   => "?/{$uri_content_base}{$report_item['board_id']}/{$content['id']}/promote",
@@ -2813,7 +2827,7 @@ function mod_recent_posts($lim) {
 
 }
 
-function mod_clean( $board, $unclean, $post, $global, $local ) {
+function mod_report_clean( $global_reports, $board, $unclean, $post, $global, $local ) {
 	global $config, $mod;
 	
 	if( !openBoard($board) ) {
@@ -2853,7 +2867,7 @@ function mod_clean( $board, $unclean, $post, $global, $local ) {
 		$query->execute() or error(db_error($query));
 		
 		// If the $clean object doesn't exist we need to insert a row for this post.
-		if( !($clean = $query->fetch(PDO::FETCH_ASSOC)) ) {
+		if( !($cleanRecord = $query->fetch(PDO::FETCH_ASSOC)) ) {
 			$query = prepare("INSERT INTO `post_clean` (`post_id`, `board_id`) VALUES ( :post, :board )");
 			$query->bindValue( ':board', $board );
 			$query->bindValue( ':post',  $post );
@@ -2864,7 +2878,7 @@ function mod_clean( $board, $unclean, $post, $global, $local ) {
 				error("The database failed to create a record for this content in `post_clean` to record clean status.");
 			}
 			
-			$clean = true;
+			$cleanRecord = true;
 		}
 	}
 	// Revoking clean status (open it to reports?)
@@ -2876,13 +2890,13 @@ function mod_clean( $board, $unclean, $post, $global, $local ) {
 		
 		$query->execute() or error(db_error($query));
 		
-		if( !($clean = $query->fetch(PDO::FETCH_ASSOC)) ) {
+		if( !($cleanRecord = $query->fetch(PDO::FETCH_ASSOC)) ) {
 			error($config['error']['404']);
 		}
 	}
 	
 	// Update the `post_clean` row represented by $clean.
-	if( $clean ) {
+	if( $cleanRecord ) {
 		// Build our query based on the URI arguments.
 		if( $global && $local ) {
 			$query = prepare("UPDATE `post_clean` SET {$query_global}, {$query_global_mod}, {$query_local}, {$query_local_mod} WHERE `board_id` = :board AND `post_id` = :post");
@@ -2895,21 +2909,64 @@ function mod_clean( $board, $unclean, $post, $global, $local ) {
 		}
 		
 		$query->bindValue( ':clean', !$unclean );
-		$query->bindValue( ':mod',   $mod['id'] );
+		$query->bindValue( ':mod',   $unclean ? NULL : $mod['id'] );
 		$query->bindValue( ':board', $board );
 		$query->bindValue( ':post',  $post );
 		
 		$query->execute() or error(db_error($query));
 		
+		// Finally, run a query to tidy up our records.
+		if( $unclean ) {
+			// Query is removing clean status from content.
+			// Remove any clean records that are now null.
+			$cleanup = prepare("DELETE FROM `post_clean` WHERE `clean_local` = FALSE AND `clean_global` = FALSE");
+			$query->execute() or error(db_error($query));
+		}
+		else {
+			// Content is clean, auto-handle all reports.
+			
+			// If this is a total clean, we don't need to update records first. 
+			if( !($global && $local) ) {
+				$query  = prepare("UPDATE `reports` SET `" . ($local ? "local" : "global") . "` = FALSE WHERE `board` = :board AND `post` = :post");
+				$query->bindValue( ':board', $board );
+				$query->bindValue( ':post',  $post );
+				
+				$query->execute() or error(db_error($query));
+				
+				// If we didn't hit anything, this content doesn't have reports, so don't run the delete query.
+				$require_delete = ($query->rowCount() > 0);
+				
+				if( $require_delete ) {
+					$query = prepare("DELETE FROM `reports` WHERE `local` = FALSE and `global` = FALSE");
+					
+					$query->execute() or error(db_error($query));
+				}
+			}
+			// This is a total clean, so delete content by ID rather than via cleanup.
+			else {
+				$query = prepare("DELETE FROM `reports` WHERE `board` = :board AND `post` = :post");
+				
+				$query->bindValue( ':board', $board );
+				$query->bindValue( ':post',  $post );
+				
+				$query->execute() or error(db_error($query));
+			}
+		}
+		
 		// Log the action.
-		// This is super important because a mod intentionally screwing with clean status needs to be found out, fast.
+		// Having clear wording of ths log is very important because of the nature of clean status.
 		$log_action = ($unclean ? "Closed" : "Re-opened" );
 		$log_scope  = ($local && $global ? "local and global" : ($local ? "local" : "global" ) );
 		modLog( "{$log_action} reports for post #{$post} in {$log_scope}.", $board);
 	}
 	
 	// Redirect
-	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+	if( $global_reports ) {
+		header('Location: ?/reports/global', true, $config['redirect_http']);
+	}
+	else {
+		header('Location: ?/reports', true, $config['redirect_http']);
+	}
 }
 
 function mod_config($board_config = false) {
diff --git a/mod.php b/mod.php
index 869d6af9..45c836ac 100644
--- a/mod.php
+++ b/mod.php
@@ -60,15 +60,16 @@ $pages = array(
 	// and if the return address should also be the global dashboard.
 	// Important to note that (?:global) will make no argument.
 	// (global)? will make argument 0 either "global" or "".
-	'/reports(?:/)?'                                              => 'reports',               // report queue
-	'/reports/(global)?(?:/)?'                                    => 'reports',               // global report queue
-	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)(?:/)?'         => 'reports',               // specific reported content (also historic)
-	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)/dismiss(?:/)?' => 'secure report_dismiss', // dismiss all reports on content
-	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)/demote(?:/)?'  => 'secure report_demote',  // demote all reports on content
-	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)/promote(?:/)?' => 'secure report_promote', // demote all reports on content
-	'/reports/(global)?(?:/)?(\d+)/dismiss(all)?(?:/)?'           => 'secure report_dismiss', // dismiss a report
-	'/reports/(global)?(?:/)?(\d+)/demote(?:/)?'                  => 'secure report_demote',  // demote a global report to a local report
-	'/reports/(global)?(?:/)?(\d+)/promote(?:/)?'                 => 'secure report_promote', // promote a local report to a global report
+	'/reports(?:/)?'                                                          => 'reports',               // report queue
+	'/reports/(global)?(?:/)?'                                                => 'reports',               // global report queue
+	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)(?:/)?'                     => 'reports',               // specific reported content (also historic)
+	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)/dismiss(?:/)?'             => 'secure report_dismiss', // dismiss all reports on content
+	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)/demote(?:/)?'              => 'secure report_demote',  // demote all reports on content
+	'/reports/(global)?(?:/)?(content)/(\%b)/(\d+)/promote(?:/)?'             => 'secure report_promote', // demote all reports on content
+	'/reports/(global)?(?:/)?(\d+)/dismiss(all)?(?:/)?'                       => 'secure report_dismiss', // dismiss a report
+	'/reports/(global)?(?:/)?(\d+)/demote(?:/)?'                              => 'secure report_demote',  // demote a global report to a local report
+	'/reports/(global)?(?:/)?(\d+)/promote(?:/)?'                             => 'secure report_promote', // promote a local report to a global report
+	'/reports/(global)?(?:/)?(\%b)/(un)?clean/(\d+)/(global)?(?:\+)?(local)?' => 'secure report_clean',   // protect/unprotect from reports
 	
 	'/IP/([\w.:]+)'				=> 'secure_POST ip',		// view ip address
 	'/IP/([\w.:]+)/remove_note/(\d+)'	=> 'secure ip_remove_note',	// remove note from ip address
@@ -98,7 +99,6 @@ $pages = array(
 	'/(\%b)/(un)?lock/(\d+)'                          => 'secure lock',            // lock thread
 	'/(\%b)/(un)?sticky/(\d+)'                        => 'secure sticky',          // sticky thread
 	'/(\%b)/bump(un)?lock/(\d+)'                      => 'secure bumplock',        // "bumplock" thread
-	'/(\%b)/(un)?clean/(\d+)/(global)?(?:\+)?(local)?' => 'secure clean',           // protect/unprotect from reports
 	
 	'/themes'				=> 'themes_list',		// manage themes
 	'/themes/(\w+)'				=> 'secure_POST theme_configure',		// configure/reconfigure theme
diff --git a/post.php b/post.php
index 29ab8552..099ea6d7 100644
--- a/post.php
+++ b/post.php
@@ -104,7 +104,8 @@ if (isset($_POST['delete'])) {
 		header('Content-Type: text/json');
 		echo json_encode(array('success' => true));
 	}
-} elseif (isset($_POST['report'])) {
+}
+elseif (isset($_POST['report'])) {
 	if (!isset($_POST['board'], $_POST['reason']))
 		error($config['error']['bot']);
 	
@@ -134,26 +135,45 @@ if (isset($_POST['delete'])) {
 	markup($reason);
 	
 	foreach ($report as &$id) {
-		$query = prepare(sprintf("SELECT `thread` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
+		$query = prepare(
+			"SELECT
+				`thread`,
+				`post_clean`.`clean_local`,
+				`post_clean`.`clean_global`
+			FROM `posts_{$board['uri']}`
+			LEFT JOIN `post_clean`
+				ON `post_clean`.`board_id` = '{$board['uri']}'
+				AND `post_clean`.`post_id` = :id
+			WHERE `id` = :id"
+		);
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
-		$thread = $query->fetchColumn();
-		
-		if ($config['syslog'])
-			_syslog(LOG_INFO, 'Reported post: ' .
-				'/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $thread ? $thread : $id) . ($thread ? '#' . $id : '') .
-				' for "' . $reason . '"'
-			);
-		$query = prepare("INSERT INTO ``reports`` (`time`, `ip`, `board`, `post`, `reason`, `local`, `global`) VALUES (:time, :ip, :board, :post, :reason, :local, :global)");
-		$query->bindValue(':time', time(), PDO::PARAM_INT);
-		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR'], PDO::PARAM_STR);
-		$query->bindValue(':board', $board['uri'], PDO::PARAM_INT);
-		$query->bindValue(':post', $id, PDO::PARAM_INT);
-		$query->bindValue(':reason', $reason, PDO::PARAM_STR);
-		$query->bindValue(':local', 1, PDO::PARAM_BOOL);
-		$query->bindValue(':global', isset($_POST['global']), PDO::PARAM_BOOL);
-		$query->execute() or error(db_error($query));
+		if( $post = $query->fetch(PDO::FETCH_ASSOC) ) {
+			$report_local  = !$post['clean_local'];
+			$report_global = isset($_POST['global']) && !$post['clean_global'];
+			
+			if( $report_local || $report_global ) {
+				$thread = $post['thread'];
+				
+				if ($config['syslog']) {
+					_syslog(LOG_INFO, 'Reported post: ' .
+						'/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $thread ? $thread : $id) . ($thread ? '#' . $id : '') .
+						' for "' . $reason . '"'
+					);
+				}
+				
+				$query = prepare("INSERT INTO `reports` (`time`, `ip`, `board`, `post`, `reason`, `local`, `global`) VALUES (:time, :ip, :board, :post, :reason, :local, :global)");
+				$query->bindValue(':time',   time(), PDO::PARAM_INT);
+				$query->bindValue(':ip',     $_SERVER['REMOTE_ADDR'], PDO::PARAM_STR);
+				$query->bindValue(':board',  $board['uri'], PDO::PARAM_INT);
+				$query->bindValue(':post',   $id, PDO::PARAM_INT);
+				$query->bindValue(':reason', $reason, PDO::PARAM_STR);
+				$query->bindValue(':local',  $report_local, PDO::PARAM_BOOL);
+				$query->bindValue(':global', $report_global, PDO::PARAM_BOOL);
+				$query->execute() or error(db_error($query));
+			}
+		}
 	}
 	
 	$is_mod = isset($_POST['mod']) && $_POST['mod'];
@@ -165,7 +185,8 @@ if (isset($_POST['delete'])) {
 		header('Content-Type: text/json');
 		echo json_encode(array('success' => true));
 	}
-} elseif (isset($_POST['post'])) {
+}
+elseif (isset($_POST['post'])) {
 	if (!isset($_POST['body'], $_POST['board']))
 		error($config['error']['bot']);
 
@@ -890,7 +911,8 @@ if (isset($_POST['delete'])) {
 			'id' => $id
 		));
 	}
-} elseif (isset($_POST['appeal'])) {
+}
+elseif (isset($_POST['appeal'])) {
 	if (!isset($_POST['ban_id']))
 		error($config['error']['bot']);
 	
@@ -931,7 +953,8 @@ if (isset($_POST['delete'])) {
 	$query->execute() or error(db_error($query));
 	
 	displayBan($ban);
-} else {
+}
+else {
 	if (!file_exists($config['has_installed'])) {
 		header('Location: install.php', true, $config['redirect_http']);
 	} else {
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 61bc07a5..f86a2c13 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -289,15 +289,15 @@ div.post.reply {
 }
 
 div.post_modified {
-  font-size: 10px;
   min-width: 47.5em;
   margin-left: 1.8em;
   padding-top: 0.8em;
 }
 
 div.post_modified div.content-status {
-  margin-top: 0.4em;
+  margin-top: 0.5em;
   padding-bottom: 0em;
+  font-size: 72%;
 }
 
 span.trip {
diff --git a/templates/mod/report.html b/templates/mod/report.html
index 5d07e0eb..0080cb51 100644
--- a/templates/mod/report.html
+++ b/templates/mod/report.html
@@ -32,7 +32,9 @@
 			
 			{% if global and mod|hasPermission(config.mod.report_demote, report.board) %}
 			<li class="report-action">
-				{% if report.local %}
+				{% if clean.clean_local %}
+				<span class="content-action-item content-action-unavailable" title="{% trans 'Content is permitted by board rules' %}">Demote</span>
+				{% elseif report.local %}
 				<a class="action-item action-available" title="{% trans 'Demote global abuse report to a local report' %}" href="{{uri_demote}}/{{token_demote}}">Demote</a>
 				{% else %}
 				<span class="action-item action-unavailable" title="{% trans 'Report has already been dismissed locally' %}">Demote</span>
@@ -40,7 +42,9 @@
 			</li>
 			{% elseif not global and mod|hasPermission(config.mod.report_promote, report.board) %}
 			<li class="report-action">
-				{% if report.global %}
+				{% if clean.clean_global %}
+				<span class="content-action-item content-action-unavailable" title="{% trans 'Content is permitted by global rules' %}">Promote</span>
+				{% elseif report.global %}
 				<span class="action-item action-unavailable" title="{% trans 'Report is already a global report' %}">Promote</span>
 				{% else %}
 				<a class="action-item action-available" title="{% trans 'Promote local abuse report to a global report' %}" href="{{uri_promote}}/{{token_promote}}">Promote</a>
diff --git a/templates/mod/report_content.html b/templates/mod/report_content.html
index e6fff9bd..1aad19eb 100644
--- a/templates/mod/report_content.html
+++ b/templates/mod/report_content.html
@@ -18,6 +18,8 @@
 			<li class="report-action">
 				{% if reports_can_demote %}
 				<a class="content-action-item content-action-available"title="{% trans 'Demote global abuse reports to local reports' %}" href="{{uri_content_demote}}/{{token_content_demote}}">Demote All</a>
+				{% elseif clean.clean_local %}
+				<span class="content-action-item content-action-unavailable" title="{% trans 'Content is permitted by board rules' %}">Demote All</span>
 				{% else %}
 				<span class="content-action-item content-action-unavailable" title="{% trans 'Reports have all been dismissed locally' %}">Demote All</span>
 				{% endif %}
@@ -27,31 +29,35 @@
 			<li class="report-action">
 				{% if reports_can_promote %}
 				<a class="content-action-item content-action-available"title="{% trans 'Promote all local abuse reports to global reports' %}" href="{{uri_content_promote}}/{{token_content_promote}}">Promote All</a>
+				{% elseif clean.clean_global %}
+				<span class="content-action-item content-action-unavailable" title="{% trans 'Content is permitted by global rules' %}">Promote All</span>
 				{% else %}
 				<span class="content-action-item content-action-unavailable" title="{% trans 'Reports are already global reports' %}">Promote All</span>
 				{% endif %}
 			</li>
 			{% endif %}
 			
+			{% if not clean.clean_local or not clean.clean_global %}
 			{% if mod|hasPermission(config.mod.clean, report.board) or mod|hasPermission(config.mod.clean_global, report.board) %}
 			<li class="report-content-action">
 				Clean&nbsp;
-				{% if mod|hasPermission(config.mod.clean, report.board) %}
+				{% if not clean.clean_local and mod|hasPermission(config.mod.clean, report.board) %}
 				<!-- Clean Local -->
 				<a class="content-action-item content-action-available" title="{% trans 'Ignore and dismiss local abuse reports on this post for this board' %}" href="{{ uri_clean }}/{{ token_clean }}">(/{{ content_board }}/)</a>
-				{% endif %}
-				{% if mod|hasPermission(config.mod.clean_global, report.board) %}
 				&nbsp;
+				{% endif %}
+				{% if not clean.clean_global and mod|hasPermission(config.mod.clean_global, report.board) %}
 				<!-- Clean Global -->
 				<a class="content-action-item content-action-available" title="{% trans 'Ignore and demote global abuse reports on this post' %}" href="{{ uri_clean_global }}/{{ token_clean_global }}">(Global)</a>
+				{% if not clean.clean_local and mod|hasPermission(config.mod.clean, report.board) %}
 				&nbsp;
-				{% if mod|hasPermission(config.mod.clean, report.board) and mod|hasPermission(config.mod.clean_global, report.board) %}
 				<!-- Clean Local + Global -->
 				<a class="content-action-item content-action-available" title="{% trans 'Ignore and dismiss local AND global abuse reports on this post' %}" href="{{ uri_clean_both }}/{{ token_clean_both }}">(/{{ content_board }}/+Global)</a>
 				{% endif %}
 				{% endif %}
 			</li>
 			{% endif %}
+			{% endif %}
 		</ul>
 	</div>
 	

From bac2307140777e354dcf158b1451b0431fbef3c4 Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Tue, 21 Oct 2014 08:10:07 -0500
Subject: [PATCH 11/12] [#184] Added config+functionality for removing clean
 status local+global if a post is edited. Fixed an issue where marking a post
 clean wouldn't trigger template reconstruction.

---
 inc/config.php    |  9 ++++++++-
 inc/mod/pages.php | 31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/inc/config.php b/inc/config.php
index 4190b0bb..d359c234 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1382,8 +1382,15 @@
 	$config['mod']['flood'] = &$config['mod']['bypass_filters'];
 	// Raw HTML posting
 	$config['mod']['rawhtml'] = ADMIN;
-	// Clean/Unclean posts
+	
+	// Clean System
+	// Post edits remove local clean?
+	$config['clean']['edits_remove_local'] = true;
+	// Post edits remove global clean?
+	$config['clean']['edits_remove_global'] = true;
+	// Mark post clean for board rule
 	$config['mod']['clean'] = JANITOR;
+	// Mark post clean for global rule
 	$config['mod']['clean_global'] = MOD;
 	
 	/* Administration */
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 37b3892e..6aaaa2fe 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1606,6 +1606,35 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 		}
 		$query->execute() or error(db_error($query));
 		
+		if( $config['clean']['edits_remove_local'] || $config['clean']['edits_remove_global'] ) {
+			
+			$query_global     = "`clean_global` = :clean";
+			$query_global_mod = "`clean_global_mod_id` = :mod";
+			$query_local      = "`clean_local` = :clean";
+			$query_local_mod  = "`clean_local_mod_id` = :mod";
+			
+			if( $config['clean']['edits_remove_local'] && $config['clean']['edits_remove_global'] ) {
+				$query = prepare("UPDATE `post_clean` SET {$query_global}, {$query_global_mod}, {$query_local}, {$query_local_mod} WHERE `board_id` = :board AND `post_id` = :post");
+			}
+			else if( $config['clean']['edits_remove_global'] ) {
+				$query = prepare("UPDATE `post_clean` SET {$query_global}, {$query_global_mod} WHERE `board_id` = :board AND `post_id` = :post");
+			}
+			else {
+				$query = prepare("UPDATE `post_clean` SET {$query_local}, {$query_local_mod} WHERE `board_id` = :board AND `post_id` = :post");
+			}
+			
+			$query->bindValue( ':clean', false );
+			$query->bindValue( ':mod',   NULL );
+			$query->bindValue( ':board', $board );
+			$query->bindValue( ':post',  $postID );
+			
+			$query->execute() or error(db_error($query));
+			
+			// Finally, run a query to tidy up our records.
+			$cleanup = prepare("DELETE FROM `post_clean` WHERE `clean_local` = FALSE AND `clean_global` = FALSE");
+			$query->execute() or error(db_error($query));
+		}
+		
 		if ($edit_raw_html) {
 			modLog("Edited raw HTML of post #{$postID}");
 		} else {
@@ -2958,6 +2987,8 @@ function mod_report_clean( $global_reports, $board, $unclean, $post, $global, $l
 		$log_action = ($unclean ? "Closed" : "Re-opened" );
 		$log_scope  = ($local && $global ? "local and global" : ($local ? "local" : "global" ) );
 		modLog( "{$log_action} reports for post #{$post} in {$log_scope}.", $board);
+		
+		rebuildPost( $post );
 	}
 	
 	// Redirect

From 6c74644881e20edf74ccab7312a9808a1b564a8c Mon Sep 17 00:00:00 2001
From: unknown <8n-tech@users.noreply.github.com>
Date: Wed, 22 Oct 2014 03:58:51 -0500
Subject: [PATCH 12/12] [#184] Removed "D". Whatever the fuck it was.

---
 d | 553 --------------------------------------------------------------
 1 file changed, 553 deletions(-)
 delete mode 100644 d

diff --git a/d b/d
deleted file mode 100644
index 09ddbcc5..00000000
--- a/d
+++ /dev/null
@@ -1,553 +0,0 @@
-diff --git a/inc/instance-config.php b/inc/instance-config.php
-index 699d1a1..475f3ed 100644
---- a/inc/instance-config.php
-+++ b/inc/instance-config.php
-@@ -18,15 +18,15 @@
- 	$config['db']['user'] = 'root';
- 	$config['db']['password'] = '';
- 	$config['timezone'] = 'UTC';
--	$config['cache']['enabled'] = 'apc';
--
--
-+	$config['cache']['enabled'] = false;
-+	
-+	
- 	$config['cookies']['mod'] = 'mod';
- 	$config['cookies']['salt'] = '';
--
-+	
- 	$config['spam']['hidden_inputs_max_pass'] = 128;
- 	$config['spam']['hidden_inputs_expire'] = 60 * 60 * 4; // three hours
--
-+	
- 	$config['flood_time'] = 5;
- 	$config['flood_time_ip'] = 30;
- 	$config['flood_time_same'] = 2;
-@@ -46,10 +46,10 @@
- 	$config['thread_subject_in_title'] = true;
- 	$config['spam']['hidden_inputs_max_pass'] = 128;
- 	$config['ayah_enabled'] = true;
--
-+	
- 	// Load database credentials
- 	require "secrets.php";
--
-+	
- 	// Image shit
- 	$config['thumb_method'] = 'gm+gifsicle';
- 	$config['thumb_ext'] = '';
-diff --git a/install.php b/install.php
-index 8b3815a..07e94e7 100644
---- a/install.php
-+++ b/install.php
-@@ -579,7 +579,8 @@ if ($step == 0) {
- 	</p>';
- 	
- 	echo Element('page.html', $page);
--} elseif ($step == 1) {
-+}
-+elseif ($step == 1) {
- 	$page['title'] = 'Pre-installation test';
- 	
- 	$can_exec = true;
-@@ -761,7 +762,8 @@ if ($step == 0) {
- 		'title' => 'Checking environment',
- 		'config' => $config
- 	));
--} elseif ($step == 2) {
-+}
-+elseif ($step == 2) {
- 	// Basic config
- 	$page['title'] = 'Configuration';
- 	
-@@ -775,7 +777,8 @@ if ($step == 0) {
- 		'title' => 'Configuration',
- 		'config' => $config
- 	));
--} elseif ($step == 3) {
-+}
-+elseif ($step == 3) {
- 	$instance_config = 
- '<?php
- 
-@@ -814,7 +817,8 @@ if ($step == 0) {
- 	
- 	if (@file_put_contents('inc/instance-config.php', $instance_config)) {
- 		header('Location: ?step=4', true, $config['redirect_http']);
--	} else {
-+	}
-+	else {
- 		$page['title'] = 'Manual installation required';
- 		$page['body'] = '
- 			<p>I couldn\'t write to <strong>inc/instance-config.php</strong> with the new configuration, probably due to a permissions error.</p>
-@@ -826,7 +830,8 @@ if ($step == 0) {
- 		';
- 		echo Element('page.html', $page);
- 	}
--} elseif ($step == 4) {
-+}
-+elseif ($step == 4) {
- 	// SQL installation
- 	
- 	buildJavascript();
-@@ -846,11 +851,15 @@ if ($step == 0) {
- 	
- 	$sql_errors = '';
- 	foreach ($queries as $query) {
--		if ($mysql_version < 50503)
-+		if ($mysql_version < 50503) {
- 			$query = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $query);
-+		}
-+		
- 		$query = preg_replace('/^([\w\s]*)`([0-9a-zA-Z$_\x{0080}-\x{FFFF}]+)`/u', '$1``$2``', $query);
--		if (!query($query))
-+		
-+		if (!query($query)) {
- 			$sql_errors .= '<li>' . db_error() . '</li>';
-+		}
- 	}
- 	
- 	$page['title'] = 'Installation complete';
-@@ -858,7 +867,8 @@ if ($step == 0) {
- 	
- 	if (!empty($sql_errors)) {
- 		$page['body'] .= '<div class="ban"><h2>SQL errors</h2><p>SQL errors were encountered when trying to install the database. This may be the result of using a database which is already occupied with a vichan installation; if so, you can probably ignore this.</p><p>The errors encountered were:</p><ul>' . $sql_errors . '</ul><p><a href="?step=5">Ignore errors and complete installation.</a></p></div>';
--	} else {
-+	}
-+	else {
- 		$boards = listBoards();
- 		foreach ($boards as &$_board) {
- 			setupBoard($_board);
-@@ -866,13 +876,11 @@ if ($step == 0) {
- 		}
- 		
- 		file_write($config['has_installed'], VERSION);
--		/*if (!file_unlink(__FILE__)) {
--			$page['body'] .= '<div class="ban"><h2>Delete install.php!</h2><p>I couldn\'t remove <strong>install.php</strong>. You will have to remove it manually.</p></div>';
--		}*/
- 	}
- 	
- 	echo Element('page.html', $page);
--} elseif ($step == 5) {
-+}
-+elseif ($step == 5) {
- 	$page['title'] = 'Installation complete';
- 	$page['body'] = '<p style="text-align:center">Thank you for using vichan. Please remember to report any bugs you discover.</p>';
- 	
-diff --git a/templates/8chan/index.html b/templates/8chan/index.html
-index 459e7e8..4f25473 100644
---- a/templates/8chan/index.html
-+++ b/templates/8chan/index.html
-@@ -223,7 +223,7 @@
-     </style>
-   </head>
- 
--  <body>
-+  <body class="8chan index">
- 
-     <div id="main">
- 
-diff --git a/templates/generic_page.html b/templates/generic_page.html
-index 0fe1f9c..4cd3116 100644
---- a/templates/generic_page.html
-+++ b/templates/generic_page.html
-@@ -6,7 +6,7 @@
- 	<title>{{ board.url }} - {{ board.name }}</title>
- 	{% endblock %}
- </head>
--<body>	
-+<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 %}">
- 	{{ 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="banner" src="{{ config.url_banner }}" {% 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 %}
-diff --git a/templates/index.html b/templates/index.html
-index aae87c1..5638fd6 100644
---- a/templates/index.html
-+++ b/templates/index.html
-@@ -14,7 +14,7 @@
- 	{% include 'header.html' %}
- 	<title>{{ board.url }} - {{ board.title|e }}</title>
- </head>
--<body>	
-+<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 %}">
- 	{{ 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 %}
-diff --git a/templates/main.js b/templates/main.js
-index 1ec4d26..d100f93 100644
---- a/templates/main.js
-+++ b/templates/main.js
-@@ -73,11 +73,6 @@ var saved = {};
- 
- 
- var selectedstyle = '{% endraw %}{{ config.default_stylesheet.0|addslashes }}{% raw %}';
--/*var styles = {
--	{% endraw %}
--	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
--	{% endraw %}{% endfor %}{% raw %}
--};*/
- var board_name = false;
- 
- function changeStyle(styleName, link) {
-@@ -92,36 +87,78 @@ function changeStyle(styleName, link) {
- 	{% endif %}
- 	{% raw %}
- 	
--	if (!document.getElementById('stylesheet')) {
--		var s = document.createElement('link');
--		s.rel = 'stylesheet';
--		s.type = 'text/css';
--		s.id = 'stylesheet';
-+	// Find the <dom> for the stylesheet. May be nothing.
-+	var domStylesheet = document.getElementById('stylesheet');
-+	// Determine if this stylesheet is the default.
-+	var setToDefault  = ( styles[styleName] == "" || styles[styleName] == "/stylesheets/" );
-+	// Turn "Yotsuba B" to "yotsuba_b" 
-+	var attributeName = styleName.replace(/[^a-z0-9_\-]/gi, '_').toLowerCase();
-+	
-+	if( !domStylesheet && !setToDefault ) {
-+		domStylesheet = document.createElement('link');
-+		domStylesheet.rel = 'stylesheet';
-+		domStylesheet.type = 'text/css';
-+		domStylesheet.id = 'stylesheet';
-+		
- 		var x = document.getElementsByTagName('head')[0];
--		x.appendChild(s);
-+		x.appendChild(domStylesheet);
- 	}
--
--	{% endraw %}
--	var root = "{{ config.root }}";
--	{% raw %}
--	root = root.replace(/\/$/, "");
--	
--	document.getElementById('stylesheet').href = root + styles[styleName];
--	selectedstyle = styleName;
- 	
--	if (document.getElementsByClassName('styles').length != 0) {
--		var styleLinks = document.getElementsByClassName('styles')[0].childNodes;
--		for (var i = 0; i < styleLinks.length; i++) {
--			styleLinks[i].className = '';
-+	if( !setToDefault ) {
-+		{% endraw %}
-+		var root = "{{ config.root }}";
-+		{% raw %}
-+		root = root.replace(/\/$/, "");
-+		
-+		domStylesheet.href = root + styles[styleName];
-+		selectedstyle = styleName;
-+		
-+		if (document.getElementsByClassName('styles').length != 0) {
-+			var styleLinks = document.getElementsByClassName('styles')[0].childNodes;
-+			for (var i = 0; i < styleLinks.length; i++) {
-+				styleLinks[i].className = '';
-+			}
- 		}
-+		
-+		if (link) {
-+			link.className = 'selected';
-+		}
-+	}
-+	else if( domStylesheet ) {
-+		domStylesheet.parentNode.removeChild( domStylesheet );
- 	}
- 	
--	if (link) {
--		link.className = 'selected';
-+	// Fix the classes on the body tag.
-+	var body = document.getElementsByTagName('body')[0];
-+	
-+	if( body ) {
-+		var bodyClasses = document.getElementsByTagName('body')[0].getAttribute('class').split(" ");
-+		var bodyClassesNew = [];
-+		
-+		for( i = 0; i < bodyClasses.length; ++i ) {
-+			var bodyClass = bodyClasses[ i ];
-+			
-+			// null class from a double-space.
-+			if( bodyClass == "" ) {
-+				continue;
-+			}
-+			
-+			if( bodyClass.indexOf( "stylesheet-" ) == 0 ) {
-+				continue;
-+			}
-+			
-+			bodyClassesNew.push( bodyClass );
-+		}
-+		
-+		// Add stylesheet-yotsuba_b at the end.
-+		bodyClassesNew.push( "stylesheet-" + attributeName );
-+		body.setAttribute( 'class', bodyClassesNew.join(" ") );
-+		body.setAttribute( 'data-stylesheet', attributeName );
- 	}
- 	
--	if (typeof $ != 'undefined')
-+	if (typeof $ != 'undefined') {
- 		$(window).trigger('stylesheet', styleName);
-+	}
- }
- 
- 
-@@ -167,7 +204,7 @@ function init_stylechooser() {
- 			}
- 		}
- 	}
--	{% endraw%}
-+	{% endraw %}
- {% else %}
- 	{% raw %}
- 	if (localStorage.stylesheet) {
-@@ -185,10 +222,13 @@ function init_stylechooser() {
- 
- function get_cookie(cookie_name) {
- 	var results = document.cookie.match ( '(^|;) ?' + cookie_name + '=([^;]*)(;|$)');
--	if (results)
-+	
-+	if (results) {
- 		return (unescape(results[2]));
--	else
-+	}
-+	else {
- 		return null;
-+	}
- }
- 
- function highlightReply(id) {
-diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
-index 4f76625..87e67c8 100644
---- a/templates/mod/dashboard.html
-+++ b/templates/mod/dashboard.html
-@@ -1,40 +1,5 @@
--<fieldset>
--	<legend>{% trans 'Boards' %}</legend>
--	
--	<ul>
--		{% for board in boards %}
--		{% if board.uri in mod.boards or mod.boards[0] == '*' %}
--			<li>
--				<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board.uri) }}</a>
--					 - 
--				{{ board.title|e }}
--				{% if board.subtitle %}
--					<small>&mdash; 
--						{% if config.allow_subtitle_html %}
--							{{ board.subtitle }}
--						{% else %}
--							{{ board.subtitle|e }}
--						{% endif %}
--					</small>
--
--				{% endif %}
--				{% if mod.type == "20" %}
--					<a href="?/settings/{{ board.uri }}"><small>[{% trans 'settings' %}]</small></a>
--				{% endif %}
--				{% if mod|hasPermission(config.mod.manageboards) %}
--					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
--				{% endif %}
--			</li>
--		{% endif %}
--		{% endfor %}
--		
--		{% if mod|hasPermission(config.mod.newboard) %}
--			<li style="margin-top:15px"><a href="?/new-board"><strong>{% trans 'Create new board' %}</strong></a></li>
--		{% endif %}
--	</ul>
--</fieldset>
--
--<fieldset>
-+<!-- Messages -->
-+<fieldset class="mod-dash mod-dash-set mod-dash-messages">
- 	<legend>{% trans 'Messages' %}</legend>
- 	<ul>
- 		{% if mod|hasPermission(config.mod.noticeboard) %}
-@@ -78,7 +43,8 @@
- 	</ul>
- </fieldset>
- 
--<fieldset>
-+<!-- Administration -->
-+<fieldset class="mod-dash mod-dash-set mod-dash-messages">
- 	<legend>{% trans 'Administration' %}</legend>
- 	
- 	<ul>
-@@ -123,57 +89,99 @@
- 	</ul>
- </fieldset>
- 
-+<!-- Search -->
- {% if mod|hasPermission(config.mod.search) %}
--	<fieldset>
--		<legend>{% trans 'Search' %}</legend>
--		
--		<ul>
-+<fieldset class="mod-dash mod-dash-set mod-dash-search">
-+	<legend>{% trans 'Search' %}</legend>
-+	
-+	<ul>
-+		<li>
-+			{% include 'mod/search_form.html' %}
-+		</li>
-+	</ul>
-+</fieldset>
-+{%  endif %}
-+
-+<!-- Boards -->
-+<fieldset class="mod-dash mod-dash-set mod-dash-boards">
-+	<legend>{% trans 'Boards' %}</legend>
-+	
-+	<ul>
-+		{% for board in boards %}
-+		{% if board.uri in mod.boards or mod.boards[0] == '*' %}
- 			<li>
--				{% include 'mod/search_form.html' %}
-+				<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board.uri) }}</a>
-+					 - 
-+				{{ board.title|e }}
-+				{% if board.subtitle %}
-+					<small>&mdash; 
-+						{% if config.allow_subtitle_html %}
-+							{{ board.subtitle }}
-+						{% else %}
-+							{{ board.subtitle|e }}
-+						{% endif %}
-+					</small>
-+
-+				{% endif %}
-+				{% if mod.type == "20" %}
-+					<a href="?/settings/{{ board.uri }}"><small>[{% trans 'settings' %}]</small></a>
-+				{% endif %}
-+				{% if mod|hasPermission(config.mod.manageboards) %}
-+					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
-+				{% endif %}
- 			</li>
--		</ul>
--	</fieldset>
--{%  endif %}
-+		{% endif %}
-+		{% endfor %}
-+		
-+		{% if mod|hasPermission(config.mod.newboard) %}
-+			<li style="margin-top:15px"><a href="?/new-board"><strong>{% trans 'Create new board' %}</strong></a></li>
-+		{% endif %}
-+	</ul>
-+</fieldset>
- 
-+<!-- Misc -->
- {% if config.mod.dashboard_links|count %}
--	<fieldset>
--		<legend>{% trans 'Other' %}</legend>
--	
--		<ul>
--			{% for label,link in config.mod.dashboard_links %}
--				<li><a href="{{ link }}">{{ label }}</a></li>
--			{% endfor %}
--		</ul>
--	</fieldset>
-+<fieldset class="mod-dash mod-dash-set mod-dash-misc">
-+	<legend>{% trans 'Other' %}</legend>
-+
-+	<ul>
-+		{% for label,link in config.mod.dashboard_links %}
-+			<li><a href="{{ link }}">{{ label }}</a></li>
-+		{% endfor %}
-+	</ul>
-+</fieldset>
- {% endif %}
- 
-+<!-- Debug Information -->
- {% if config.debug %}
--	<fieldset>
--		<legend>{% trans 'Debug' %}</legend>
--		<ul>
--			<li><a href="?/debug/antispam">{% trans 'Anti-spam' %}</a></li>
--			<li><a href="?/debug/recent">{% trans 'Recent posts' %}</a></li>
--			{% if mod|hasPermission(config.mod.debug_sql) %}
--				<li><a href="?/debug/sql">{% trans 'SQL' %}</a></li>
--			{% endif %}
--		</ul>
--	</fieldset>
-+<fieldset class="mod-dash mod-dash-set mod-dash-debug">
-+	<legend>{% trans 'Debug' %}</legend>
-+	<ul>
-+		<li><a href="?/debug/antispam">{% trans 'Anti-spam' %}</a></li>
-+		<li><a href="?/debug/recent">{% trans 'Recent posts' %}</a></li>
-+		{% if mod|hasPermission(config.mod.debug_sql) %}
-+			<li><a href="?/debug/sql">{% trans 'SQL' %}</a></li>
-+		{% endif %}
-+	</ul>
-+</fieldset>
- {% endif %}
- 
-+<!-- Update -->
- {% if newer_release %}
--	<fieldset>
--		<legend>Update</legend>
--		<ul>
--			<li>
--				A newer version of Tinyboard 
--				(<strong>v{{ newer_release.massive }}.{{ newer_release.major }}.{{ newer_release.minor }}</strong>) is available! 
--				See <a href="http://tinyboard.org">http://tinyboard.org/</a> for upgrade instructions.
--			</li>
--		</ul>
--	</fieldset>
-+<fieldset class="mod-dash mod-dash-set mod-dash-update">
-+	<legend>Update</legend>
-+	<ul>
-+		<li>
-+			A newer version of Tinyboard 
-+			(<strong>v{{ newer_release.massive }}.{{ newer_release.major }}.{{ newer_release.minor }}</strong>) is available! 
-+			See <a href="http://tinyboard.org">http://tinyboard.org/</a> for upgrade instructions.
-+		</li>
-+	</ul>
-+</fieldset>
- {% endif %}
- 
--<fieldset>
-+<!-- Account Actions -->
-+<fieldset class="mod-dash mod-dash-set mod-dash-account">
- 	<legend>{% trans 'User account' %}</legend>
- 	
- 	<ul>
-diff --git a/templates/page.html b/templates/page.html
-index b136566..a3916b6 100644
---- a/templates/page.html
-+++ b/templates/page.html
-@@ -6,9 +6,10 @@
- 		active_page = "page";
- 	</script>
- 	{% include 'header.html' %}
-+	{% if mod %}{% include 'mod/header.html' %}{% endif %}
- 	<title>{{ title }}</title>
- </head>
--<body>
-+<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>
-diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html
-index 3376a68..0ec18f9 100644
---- a/templates/themes/basic/index.html
-+++ b/templates/themes/basic/index.html
-@@ -11,7 +11,7 @@
- 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
- 	{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
- </head>
--<body>
-+<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 %}">
- 	{{ boardlist.top }}
- 	<header>
- 		<h1>{{ settings.title }}</h1>
-diff --git a/templates/thread.html b/templates/thread.html
-index af2a6e0..a3ace9b 100644
---- a/templates/thread.html
-+++ b/templates/thread.html
-@@ -10,7 +10,7 @@
- 	{% include 'header.html' %}
- 	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
- </head>
--<body>
-+<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 %}">
- 	{{ 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 }}" {% 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 %}