From fe66c51a19920378885fb790d341cc50c933b046 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 10 Mar 2015 13:13:18 +0100
Subject: ... (minor fix for locales)

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

diff --git a/inc/functions.php b/inc/functions.php
index 2a398ae7..f1fb07d7 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -358,7 +358,7 @@ function rebuildThemes($action, $boardname = false) {
 		// Reload the locale	
 	        if ($config['locale'] != $current_locale) {
 	                $current_locale = $config['locale'];
-	                init_locale($config['locale'], $error);
+	                init_locale($config['locale']);
 	        }
 
 		if (PHP_SAPI === 'cli') {
-- 
cgit v1.3


From d2de4419bddbb7b0e09ced1f01d3ccb45aecc50f Mon Sep 17 00:00:00 2001
From: Matthieu <matthieu@localhost.localdomain>
Date: Thu, 14 Jan 2016 21:05:24 +0100
Subject: Added: config option to hide email in post. (prevent emailfag but let
 the possibility to sage and noko)

---
 inc/config.php           | 3 +++
 templates/post/name.html | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 69b4bd3a..d5bdbfe5 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -550,6 +550,9 @@
 	// When true, the sage won't be displayed
 	$config['hide_sage'] = false;
 
+	// Don't display user's email when it's not "sage"
+	$config['hide_email'] = false;
+
 	// Attach country flags to posts.
 	$config['country_flags'] = false;
 
diff --git a/templates/post/name.html b/templates/post/name.html
index 13c676c7..e7f85f8b 100644
--- a/templates/post/name.html
+++ b/templates/post/name.html
@@ -1,5 +1,5 @@
 {% set capcode = post.capcode|capcode %}
-{% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') %}
+{% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') and config.hide_email!=true %}
 	{# start email #}
 	<a class="email" href="mailto:{{ post.email }}">
 {% endif %}
@@ -7,7 +7,7 @@
 	{% if post.trip|length > 0 %}
 		<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>
 	{% endif %}
-{% if post.email|length > 0 %}
+{% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') and config.hide_email!=true %}
 	{# end email #}
 	</a>
 {% endif %}
-- 
cgit v1.3


From 028fd3df15b2e2edc96c5b84156b0b039ea16562 Mon Sep 17 00:00:00 2001
From: Matthieu <matthieu@localhost.localdomain>
Date: Thu, 14 Jan 2016 20:16:51 +0100
Subject: Added: RSS theme

---
 templates/themes/rss/info.php  |  61 ++++++++++++++++++++
 templates/themes/rss/rss.xml   |  28 ++++++++++
 templates/themes/rss/theme.php | 124 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 213 insertions(+)
 create mode 100755 templates/themes/rss/info.php
 create mode 100644 templates/themes/rss/rss.xml
 create mode 100755 templates/themes/rss/theme.php

diff --git a/templates/themes/rss/info.php b/templates/themes/rss/info.php
new file mode 100755
index 00000000..14b39eb9
--- /dev/null
+++ b/templates/themes/rss/info.php
@@ -0,0 +1,61 @@
+<?php
+	$theme = Array();
+	
+	// Theme name
+	$theme['name'] = 'RSS';
+	// Description (you can use Tinyboard markup here)
+	$theme['description'] = 'Show recent posts and images as a RSS';
+	$theme['version'] = 'v0.1';
+	
+	// Theme configuration	
+	$theme['config'] = Array();
+	
+	$theme['config'][] = Array(
+		'title' => 'Title',
+		'name' => 'title',
+		'type' => 'text',
+		'default' => 'Recent Posts RSS'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'Excluded boards',
+		'name' => 'exclude',
+		'type' => 'text',
+		'comment' => '(space seperated)'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => '# of recent posts',
+		'name' => 'limit_posts',
+		'type' => 'text',
+		'default' => '30',
+		'comment' => '(maximum posts to display)'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'XML file',
+		'name' => 'xml',
+		'type' => 'text',
+		'default' => 'recent.xml',
+		'comment' => '(eg. "recent.xml")'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'Base URL',
+		'name' => 'base_url',
+		'type' => 'text',
+		'default' => 'http://test.com',
+		'comment' => '(eg. "http://test.com")'
+	);
+	
+	// Unique function name for building everything
+	$theme['build_function'] = 'rss_recentposts_build';
+	$theme['install_callback'] = 'rss_recentposts_install';
+
+	if (!function_exists('rss_recentposts_install')) {
+		function rss_recentposts_install($settings) {
+			if (!is_numeric($settings['limit_posts']) || $settings['limit_posts'] < 0)
+				return Array(false, '<strong>' . utf8tohtml($settings['limit_posts']) . '</strong> is not a non-negative integer.');
+		}
+	}
+	
diff --git a/templates/themes/rss/rss.xml b/templates/themes/rss/rss.xml
new file mode 100644
index 00000000..30fdb473
--- /dev/null
+++ b/templates/themes/rss/rss.xml
@@ -0,0 +1,28 @@
+{% filter remove_whitespace %}
+<?xml version="1.0" encoding="utf-8"?>
+<rss xmlns:dc="http://purl.org/dc/elements/1.1/"
+     version="2.0">
+  <channel>
+    <description>
+      <![CDATA[{{ settings.subtitle }}]]>
+    </description>
+    <title>{{ settings.title }}</title>
+    <generator>Tinyboard {{ config.version }}</generator>
+    <link>{{ settings.base_url }}{{ config.root }}{{ settings.html }}</link>
+    {% for post in recent_posts %}
+    <item>
+      <title>{{ post.board_name }}</title>
+      <description>
+	<![CDATA[
+		 <a href="{{ settings.base_url }}{{ post.link }}">
+		 {{ post.snippet }}
+		 </a>
+	]]>
+      </description>
+      <link>{{ settings.base_url }}{{ post.link }}</link>
+      <guid>{{ settings.base_url }}{{ post.link }}</guid>
+    </item>
+    {% endfor %}
+  </channel>
+</rss>
+{% endfilter %}
diff --git a/templates/themes/rss/theme.php b/templates/themes/rss/theme.php
new file mode 100755
index 00000000..33c1b210
--- /dev/null
+++ b/templates/themes/rss/theme.php
@@ -0,0 +1,124 @@
+<?php
+	require 'info.php';
+	
+	function rss_recentposts_build($action, $settings, $board) {
+		// Possible values for $action:
+		//	- all (rebuild everything, initialization)
+		//	- news (news has been updated)
+		//	- boards (board list changed)
+		//	- post (a post has been made)
+		//	- post-thread (a thread has been made)
+		
+		$b = new RSSRecentPosts();
+		$b->build($action, $settings);
+	}
+	
+	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
+	class RSSRecentPosts {
+		public function build($action, $settings) {
+			global $config, $_theme;
+			
+			/*if ($action == 'all') {
+				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . $settings['css']);
+			}*/
+			
+			$this->excluded = explode(' ', $settings['exclude']);
+			
+			if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
+				file_write($config['dir']['home'] . $settings['xml'], $this->homepage($settings));
+		}
+		
+		// Build news page
+		public function homepage($settings) {
+			global $config, $board;
+			
+			//$recent_images = Array();
+			$recent_posts = Array();
+			//$stats = Array();
+			
+			$boards = listBoards();
+			
+			/*$query = '';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
+			$query = query($query) or error(db_error());
+			
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+				openBoard($post['board']);
+				
+				// board settings won't be available in the template file, so generate links now
+				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
+				$post['src'] = $config['uri_thumb'] . $post['thumb'];
+				
+				//$recent_images[] = $post;
+			}*/
+			
+			
+			$query = '';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
+			$query = query($query) or error(db_error());
+			
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+				openBoard($post['board']);
+				
+				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
+				$post['snippet'] = pm_snippet($post['body'], 30);
+				$post['board_name'] = $board['name'];
+				
+				$recent_posts[] = $post;
+			}
+			
+			// Total posts
+			/*$query = 'SELECT SUM(`top`) FROM (';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT MAX(`id`) AS `top` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
+			$query = query($query) or error(db_error());*/
+			//$stats['total_posts'] = number_format($query->fetchColumn());
+			
+			// Unique IPs
+			/*$query = 'SELECT COUNT(DISTINCT(`ip`)) FROM (';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT `ip` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
+			$query = query($query) or error(db_error());
+			//$stats['unique_posters'] = number_format($query->fetchColumn());*/
+			
+			// Active content
+			/*$query = 'SELECT SUM(`filesize`) FROM (';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT `filesize` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
+			$query = query($query) or error(db_error());
+			//$stats['active_content'] = $query->fetchColumn();*/
+			
+			return Element('themes/rss/rss.xml', Array(
+				'settings' => $settings,
+				'config' => $config,
+				//'boardlist' => createBoardlist(),
+				//'recent_images' => $recent_images,
+				'recent_posts' => $recent_posts,
+				//'stats' => $stats
+			));
+		}
+	};
+	
+?>
-- 
cgit v1.3


From caaf741691c9d44a9a186d6ce924fecb04f4f347 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 22 Apr 2016 05:35:43 +0200
Subject: [SECURITY] keep up with modern password hashing standards

---
 inc/config.php    | 15 ++++++++++++
 inc/mod/auth.php  | 71 ++++++++++++++++++++++++++++++++++++++++++++++---------
 inc/mod/pages.php | 11 ++++-----
 install.php       |  7 +++++-
 install.sql       |  4 ++--
 5 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index d5bdbfe5..c0e967af 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1672,3 +1672,18 @@
 		'<a href="https://youtu.be/$2" target="_blank" class="file">'.
 		'<img style="width:360px;height:270px;" src="//img.youtube.com/vi/$2/0.jpg" class="post-image"/>'.
 		'</a></div>';
+
+	// Password hashing function
+	//
+	// $5$ <- SHA256
+	// $6$ <- SHA512
+	//
+	// 25000 rounds make for ~0.05s on my 2015 Core i3 computer.
+	//
+	// https://secure.php.net/manual/en/function.crypt.php
+	$config['password_crypt'] = '$6$rounds=25000$';
+
+	// Password hashing method version
+	// If set to 0, it won't upgrade hashes using old password encryption schema, only create new.
+	// You can set it to a higher value, to further migrate to other password hashing function.
+	$config['password_crypt_version'] = 1;
diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index 01ed5b68..fa1a0f4f 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -18,7 +18,18 @@ function mkhash($username, $password, $salt = false) {
 	}
 	
 	// generate hash (method is not important as long as it's strong)
-	$hash = substr(base64_encode(md5($username . $config['cookies']['salt'] . sha1($username . $password . $salt . ($config['mod']['lock_ip'] ? $_SERVER['REMOTE_ADDR'] : ''), true), true)), 0, 20);
+	$hash = substr(
+		base64_encode(
+			md5(
+				$username . $config['cookies']['salt'] . sha1(
+					$username . $password . $salt . (
+						$config['mod']['lock_ip'] ? $_SERVER['REMOTE_ADDR'] : ''
+					), true
+				) . sha1($config['password_crypt_version']) // Log out users being logged in with older password encryption schema
+				, true
+			)
+		), 0, 20
+	);
 	
 	if (isset($generated_salt))
 		return array($hash, $salt);
@@ -26,25 +37,63 @@ function mkhash($username, $password, $salt = false) {
 		return $hash;
 }
 
-function generate_salt() {
-	mt_srand(microtime(true) * 100000 + memory_get_usage(true));
-	return md5(uniqid(mt_rand(), true));
+function crypt_password_old($password) {
+	$salt = generate_salt();
+	$password = hash('sha256', $salt . sha1($password));
+	return array($salt, $password);
 }
 
-function login($username, $password, $makehash=true) {
-	global $mod;
-	
-	// SHA1 password
-	if ($makehash) {
-		$password = sha1($password);
+function crypt_password($password) {
+	global $config;
+	// `salt` database field is reused as a version value. We don't want it to be 0.
+	$version = $config['password_crypt_version'] ? $config['password_crypt_version'] : 1;
+	$new_salt = generate_salt();
+	$password = crypt($password, $config['password_crypt'] . $new_salt . "$");
+	return array($version, $password);
+}
+
+function test_password($password, $salt, $test) {
+	global $config;
+
+	// Version = 0 denotes an old password hashing schema. In the same column, the
+	// password hash was kept previously
+	$version = (strlen($salt) <= 8) ? (int) $salt : 0;
+
+	if ($version == 0) {
+		$comp = hash('sha256', $salt . sha1($test));
 	}
+	else {
+		$comp = crypt($test, $password);
+	}
+	return array($version, hash_equals($password, $comp));
+}
+
+function generate_salt() {
+	// 128 bits of entropy
+	return strtr(base64_encode(mcrypt_create_iv(16, MCRYPT_DEV_URANDOM)), '+', '.');
+}
+
+function login($username, $password) {
+	global $mod, $config;
 	
 	$query = prepare("SELECT `id`, `type`, `boards`, `password`, `salt` FROM ``mods`` WHERE `username` = :username");
 	$query->bindValue(':username', $username);
 	$query->execute() or error(db_error($query));
 	
 	if ($user = $query->fetch(PDO::FETCH_ASSOC)) {
-		if ($user['password'] === hash('sha256', $user['salt'] . $password)) {
+		list($version, $ok) = test_password($user['password'], $user['salt'], $password);
+
+		if ($ok) {
+			if ($config['password_crypt_version'] > $version) {
+				// It's time to upgrade the password hashing method!
+				list ($user['salt'], $user['password']) = crypt_password($password);
+				$query = prepare("UPDATE ``mods`` SET `password` = :password, `salt` = :salt WHERE `id` = :id");
+				$query->bindValue(':password', $user['password']);
+				$query->bindValue(':salt', $user['salt']);
+				$query->bindValue(':id', $user['id']);
+				$query->execute() or error(db_error($query));
+			}
+
 			return $mod = array(
 				'id' => $user['id'],
 				'type' => $user['type'],
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 2c679b20..a07de4c7 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1734,9 +1734,8 @@ function mod_user($uid) {
 		}
 		
 		if ($_POST['password'] != '') {
-			$salt = generate_salt();
-			$password = hash('sha256', $salt . sha1($_POST['password']));
-			
+			list($salt, $password) = crypt_password($_POST['password']);
+
 			$query = prepare('UPDATE ``mods`` SET `password` = :password, `salt` = :salt WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
 			$query->bindValue(':password', $password);
@@ -1761,8 +1760,7 @@ function mod_user($uid) {
 	
 	if (hasPermission($config['mod']['change_password']) && $uid == $mod['id'] && isset($_POST['password'])) {
 		if ($_POST['password'] != '') {
-			$salt = generate_salt();
-			$password = hash('sha256', $salt . sha1($_POST['password']));
+			list($salt, $password) = crypt_password($_POST['password']);
 
 			$query = prepare('UPDATE ``mods`` SET `password` = :password, `salt` = :salt WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
@@ -1834,8 +1832,7 @@ function mod_user_new() {
 		if (!isset($config['mod']['groups'][$type]) || $type == DISABLED)
 			error(sprintf($config['error']['invalidfield'], 'type'));
 		
-		$salt = generate_salt();
-		$password = hash('sha256', $salt . sha1($_POST['password']));
+		list($salt, $password) = crypt_password($_POST['password']);
 		
 		$query = prepare('INSERT INTO ``mods`` VALUES (NULL, :username, :password, :salt, :type, :boards)');
 		$query->bindValue(':username', $_POST['username']);
diff --git a/install.php b/install.php
index 95caf8ec..5a2d724a 100644
--- a/install.php
+++ b/install.php
@@ -1,10 +1,12 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', '4.9.93');
+define('VERSION', '5.0.0');
 
 require 'inc/functions.php';
 
+loadConfig();
+
 $step = isset($_GET['step']) ? round($_GET['step']) : 0;
 $page = array(
 	'config' => $config,
@@ -551,6 +553,9 @@ if (file_exists($config['has_installed'])) {
                         foreach ($boards as &$board) {
                                 query(sprintf('ALTER TABLE ``posts_%s`` ADD `slug` VARCHAR(255) DEFAULT NULL AFTER `embed`;', $board['uri'])) or error(db_error());
 			}
+                case '4.9.93':
+                        query('ALTER TABLE ``mods`` CHANGE `password` `password` VARCHAR(255) NOT NULL;') or error(db_error());
+                        query('ALTER TABLE ``mods`` CHANGE `salt` `salt` VARCHAR(64) NOT NULL;') or error(db_error());
 		case false:
 			// TODO: enhance Tinyboard -> vichan upgrade path.
 			query("CREATE TABLE IF NOT EXISTS ``search_queries`` (  `ip` varchar(39) NOT NULL,  `time` int(11) NOT NULL,  `query` text NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8;") or error(db_error());
diff --git a/install.sql b/install.sql
index 969107a2..fbf220c1 100644
--- a/install.sql
+++ b/install.sql
@@ -131,8 +131,8 @@ CREATE TABLE IF NOT EXISTS `modlogs` (
 CREATE TABLE IF NOT EXISTS `mods` (
   `id` smallint(6) unsigned NOT NULL AUTO_INCREMENT,
   `username` varchar(30) NOT NULL,
-  `password` char(64) CHARACTER SET ascii NOT NULL COMMENT 'SHA256',
-  `salt` char(32) CHARACTER SET ascii NOT NULL,
+  `password` varchar(256) CHARACTER SET ascii NOT NULL COMMENT 'SHA256',
+  `salt` varchar(64) CHARACTER SET ascii NOT NULL,
   `type` smallint(2) NOT NULL,
   `boards` text CHARACTER SET utf8 NOT NULL,
   PRIMARY KEY (`id`),
-- 
cgit v1.3


From 48726950d9e2e60d543c8e30ac2e719fb3b80822 Mon Sep 17 00:00:00 2001
From: 27chan <27chan@openmailbox.org>
Date: Wed, 27 Apr 2016 14:25:51 -0300
Subject: Update Font Awesome

Update Font Awesome to 4.6.1
---
 stylesheets/font-awesome/css/font-awesome.css      | 168 ++++++++++++++++++++-
 stylesheets/font-awesome/css/font-awesome.min.css  |   4 +-
 stylesheets/font-awesome/fonts/FontAwesome.otf     | Bin 106260 -> 123112 bytes
 .../font-awesome/fonts/fontawesome-webfont.eot     | Bin 68875 -> 75220 bytes
 .../font-awesome/fonts/fontawesome-webfont.svg     |  99 ++++++++----
 .../font-awesome/fonts/fontawesome-webfont.ttf     | Bin 138204 -> 150920 bytes
 .../font-awesome/fonts/fontawesome-webfont.woff    | Bin 81284 -> 89076 bytes
 .../font-awesome/fonts/fontawesome-webfont.woff2   | Bin 64464 -> 70728 bytes
 stylesheets/font-awesome/less/font-awesome.less    |   3 +-
 stylesheets/font-awesome/less/icons.less           |  47 ++++++
 stylesheets/font-awesome/less/mixins.less          |  38 ++++-
 stylesheets/font-awesome/less/path.less            |   2 +-
 stylesheets/font-awesome/less/screen-reader.less   |   5 +
 stylesheets/font-awesome/less/variables.less       |  51 ++++++-
 stylesheets/font-awesome/scss/_icons.scss          |  47 ++++++
 stylesheets/font-awesome/scss/_mixins.scss         |  38 ++++-
 stylesheets/font-awesome/scss/_screen-reader.scss  |   5 +
 stylesheets/font-awesome/scss/_variables.scss      |  51 ++++++-
 stylesheets/font-awesome/scss/font-awesome.scss    |   3 +-
 19 files changed, 513 insertions(+), 48 deletions(-)
 create mode 100644 stylesheets/font-awesome/less/screen-reader.less
 create mode 100644 stylesheets/font-awesome/scss/_screen-reader.scss

diff --git a/stylesheets/font-awesome/css/font-awesome.css b/stylesheets/font-awesome/css/font-awesome.css
index 880eb825..bb0fe51a 100644
--- a/stylesheets/font-awesome/css/font-awesome.css
+++ b/stylesheets/font-awesome/css/font-awesome.css
@@ -1,13 +1,13 @@
 /*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.4.0');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.6.1');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -118,31 +118,31 @@
   }
 }
 .fa-rotate-90 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
   -webkit-transform: rotate(90deg);
   -ms-transform: rotate(90deg);
   transform: rotate(90deg);
 }
 .fa-rotate-180 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
   -webkit-transform: rotate(180deg);
   -ms-transform: rotate(180deg);
   transform: rotate(180deg);
 }
 .fa-rotate-270 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
   -webkit-transform: rotate(270deg);
   -ms-transform: rotate(270deg);
   transform: rotate(270deg);
 }
 .fa-flip-horizontal {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
   -webkit-transform: scale(-1, 1);
   -ms-transform: scale(-1, 1);
   transform: scale(-1, 1);
 }
 .fa-flip-vertical {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
   -webkit-transform: scale(1, -1);
   -ms-transform: scale(1, -1);
   transform: scale(1, -1);
@@ -2024,3 +2024,155 @@
 .fa-fonticons:before {
   content: "\f280";
 }
+.fa-reddit-alien:before {
+  content: "\f281";
+}
+.fa-edge:before {
+  content: "\f282";
+}
+.fa-credit-card-alt:before {
+  content: "\f283";
+}
+.fa-codiepie:before {
+  content: "\f284";
+}
+.fa-modx:before {
+  content: "\f285";
+}
+.fa-fort-awesome:before {
+  content: "\f286";
+}
+.fa-usb:before {
+  content: "\f287";
+}
+.fa-product-hunt:before {
+  content: "\f288";
+}
+.fa-mixcloud:before {
+  content: "\f289";
+}
+.fa-scribd:before {
+  content: "\f28a";
+}
+.fa-pause-circle:before {
+  content: "\f28b";
+}
+.fa-pause-circle-o:before {
+  content: "\f28c";
+}
+.fa-stop-circle:before {
+  content: "\f28d";
+}
+.fa-stop-circle-o:before {
+  content: "\f28e";
+}
+.fa-shopping-bag:before {
+  content: "\f290";
+}
+.fa-shopping-basket:before {
+  content: "\f291";
+}
+.fa-hashtag:before {
+  content: "\f292";
+}
+.fa-bluetooth:before {
+  content: "\f293";
+}
+.fa-bluetooth-b:before {
+  content: "\f294";
+}
+.fa-percent:before {
+  content: "\f295";
+}
+.fa-gitlab:before {
+  content: "\f296";
+}
+.fa-wpbeginner:before {
+  content: "\f297";
+}
+.fa-wpforms:before {
+  content: "\f298";
+}
+.fa-envira:before {
+  content: "\f299";
+}
+.fa-universal-access:before {
+  content: "\f29a";
+}
+.fa-wheelchair-alt:before {
+  content: "\f29b";
+}
+.fa-question-circle-o:before {
+  content: "\f29c";
+}
+.fa-blind:before {
+  content: "\f29d";
+}
+.fa-audio-description:before {
+  content: "\f29e";
+}
+.fa-volume-control-phone:before {
+  content: "\f2a0";
+}
+.fa-braille:before {
+  content: "\f2a1";
+}
+.fa-assistive-listening-systems:before {
+  content: "\f2a2";
+}
+.fa-asl-interpreting:before,
+.fa-american-sign-language-interpreting:before {
+  content: "\f2a3";
+}
+.fa-deafness:before,
+.fa-hard-of-hearing:before,
+.fa-deaf:before {
+  content: "\f2a4";
+}
+.fa-glide:before {
+  content: "\f2a5";
+}
+.fa-glide-g:before {
+  content: "\f2a6";
+}
+.fa-signing:before,
+.fa-sign-language:before {
+  content: "\f2a7";
+}
+.fa-low-vision:before {
+  content: "\f2a8";
+}
+.fa-viadeo:before {
+  content: "\f2a9";
+}
+.fa-viadeo-square:before {
+  content: "\f2aa";
+}
+.fa-snapchat:before {
+  content: "\f2ab";
+}
+.fa-snapchat-ghost:before {
+  content: "\f2ac";
+}
+.fa-snapchat-square:before {
+  content: "\f2ad";
+}
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  clip: auto;
+}
diff --git a/stylesheets/font-awesome/css/font-awesome.min.css b/stylesheets/font-awesome/css/font-awesome.min.css
index ee4e9782..885b3840 100644
--- a/stylesheets/font-awesome/css/font-awesome.min.css
+++ b/stylesheets/font-awesome/css/font-awesome.min.css
@@ -1,4 +1,4 @@
 /*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.4.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}
+ */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.6.1');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.6.1') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.6.1') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.6.1') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
diff --git a/stylesheets/font-awesome/fonts/FontAwesome.otf b/stylesheets/font-awesome/fonts/FontAwesome.otf
index 681bdd4d..59853bcd 100644
Binary files a/stylesheets/font-awesome/fonts/FontAwesome.otf and b/stylesheets/font-awesome/fonts/FontAwesome.otf differ
diff --git a/stylesheets/font-awesome/fonts/fontawesome-webfont.eot b/stylesheets/font-awesome/fonts/fontawesome-webfont.eot
index a30335d7..96f92f9b 100644
Binary files a/stylesheets/font-awesome/fonts/fontawesome-webfont.eot and b/stylesheets/font-awesome/fonts/fontawesome-webfont.eot differ
diff --git a/stylesheets/font-awesome/fonts/fontawesome-webfont.svg b/stylesheets/font-awesome/fonts/fontawesome-webfont.svg
index 6fd19abc..5a5f0ecd 100644
--- a/stylesheets/font-awesome/fonts/fontawesome-webfont.svg
+++ b/stylesheets/font-awesome/fonts/fontawesome-webfont.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg">
 <metadata></metadata>
 <defs>
 <font id="fontawesomeregular" horiz-adv-x="1536" >
@@ -169,7 +169,7 @@
 <glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf092;" d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4 q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4 t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16 q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
 <glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
 <glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
@@ -178,7 +178,7 @@
 <glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
 <glyph unicode="&#xf09a;" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf09b;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24 q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5 t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12 q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
 <glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
 <glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
 <glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
@@ -219,8 +219,8 @@
 <glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
+<glyph unicode="&#xf0d4;" d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585 h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf0d5;" horiz-adv-x="2304" d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62 q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
 <glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
@@ -362,7 +362,7 @@
 <glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
 <glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
+<glyph unicode="&#xf16c;" d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
 <glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
 <glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
 <glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -410,7 +410,7 @@
 <glyph unicode="&#xf19c;" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
 <glyph unicode="&#xf19d;" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
 <glyph unicode="&#xf19e;" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-<glyph unicode="&#xf1a0;" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
+<glyph unicode="&#xf1a0;" d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5 t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
 <glyph unicode="&#xf1a1;" horiz-adv-x="1792" d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26 t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37 q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191 t348 71t348 -71t286 -191t191 -286t71 -348z" />
 <glyph unicode="&#xf1a2;" d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54 q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83 q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf1a3;" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -454,7 +454,7 @@
 <glyph unicode="&#xf1cb;" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
 <glyph unicode="&#xf1cc;" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
 <glyph unicode="&#xf1cd;" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-<glyph unicode="&#xf1ce;" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
+<glyph unicode="&#xf1ce;" horiz-adv-x="1792" d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5 t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
 <glyph unicode="&#xf1d0;" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
 <glyph unicode="&#xf1d1;" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
 <glyph unicode="&#xf1d2;" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
@@ -484,7 +484,7 @@
 <glyph unicode="&#xf1eb;" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
 <glyph unicode="&#xf1ec;" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
 <glyph unicode="&#xf1ed;" d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246 q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598 q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
-<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
+<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M441 864q32 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640 q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
 <glyph unicode="&#xf1f0;" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
 <glyph unicode="&#xf1f1;" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
 <glyph unicode="&#xf1f2;" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
@@ -555,7 +555,7 @@
 <glyph unicode="&#xf237;" d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
 <glyph unicode="&#xf238;" d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56 t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
 <glyph unicode="&#xf239;" d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47 t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
-<glyph unicode="&#xf23a;" horiz-adv-x="1792" d="M1792 204v-209h-642v209h134v926h-6l-314 -1135h-243l-310 1135h-8v-926h135v-209h-538v209h69q21 0 43 19.5t22 37.5v881q0 18 -22 40t-43 22h-69v209h672l221 -821h6l223 821h670v-209h-71q-19 0 -41 -22t-22 -40v-881q0 -18 21.5 -37.5t41.5 -19.5h71z" />
+<glyph unicode="&#xf23a;" horiz-adv-x="1792" d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116 q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
 <glyph unicode="&#xf23b;" d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
 <glyph unicode="&#xf23c;" horiz-adv-x="2296" d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5 q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5 q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42 q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37 q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5 q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139 q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 4 5 8q16 18 60 23h13q5 18 19 30t33 8 t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132 q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132 q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-106 2 -211 0v1q-1 -27 2.5 -86 t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103 q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34l3 9v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4l-10 -2.5t-12 -2 l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-2 0 -3 -0.5t-3 -0.5h-3q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130t-73 70 q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -2 -1 -5t-1 -4q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150 q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12 q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
 <glyph unicode="&#xf23d;" horiz-adv-x="2304" d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5 t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5 t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
@@ -600,11 +600,11 @@
 <glyph unicode="&#xf267;" horiz-adv-x="1792" d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640 q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5 t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5 t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5 t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191 t191 -286t71 -348z" />
 <glyph unicode="&#xf268;" horiz-adv-x="1792" d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962 q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
 <glyph unicode="&#xf269;" horiz-adv-x="1792" d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5 q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5 q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
-<glyph unicode="&#xf26a;" d="M768 -92q77 0 139.5 63t100.5 166t59 234.5t21 268.5t-21 268.5t-59 234.5t-100.5 166t-139.5 63t-139.5 -63t-100.5 -166t-59 -234.5t-21 -268.5t21 -268.5t59 -234.5t100.5 -166t139.5 -63zM768 -256q-184 0 -333 77t-240 203t-141 287t-50 329t50 329t141 287t240 203 t333 77q148 0 274 -50t214.5 -136t151.5 -201t92.5 -244t29.5 -265t-29.5 -265t-92.5 -244t-151.5 -201t-214.5 -136t-274 -50z" />
-<glyph unicode="&#xf26b;" horiz-adv-x="1792" d="M716 -69q-143 35 -261.5 114t-197.5 191q-139 -300 -17 -398q26 -21 85 -24.5t127.5 9.5t141 41.5t122.5 66.5zM693 762h452q0 108 -61.5 169t-168.5 61q-103 0 -162.5 -62.5t-59.5 -167.5zM1724 1137h-34q26 102 22.5 170t-25 110t-63.5 57t-93.5 11t-115 -26.5 t-128.5 -56.5t-134 -79q129 -37 238.5 -113.5t185 -179t110 -231.5t15.5 -262h-1005q0 -60 10 -106t34 -85t69.5 -60t112.5 -21q87 0 142.5 44t72.5 122h540q-71 -230 -281.5 -377t-477.5 -147q-83 0 -159 15q-35 -40 -151 -94t-248 -78t-219 35q-78 60 -100 159t7 214 t88 242t143.5 248t173.5 226.5t177.5 183.5t156.5 112v24q-120 -37 -258.5 -137.5t-240.5 -207t-159 -195.5q4 106 34 201t80 169t118 135.5t147.5 100.5t168 65.5t180.5 29.5t185 -8q310 186 503 189h7q57 0 103 -18q80 -30 98 -132.5t-30 -248.5z" />
+<glyph unicode="&#xf26a;" horiz-adv-x="1792" d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339 q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z " />
+<glyph unicode="&#xf26b;" horiz-adv-x="1792" d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606 q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
 <glyph unicode="&#xf26c;" horiz-adv-x="2048" d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23 v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
 <glyph unicode="&#xf26d;" horiz-adv-x="1792" d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34 h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100 q-68 175 -180 287z" />
-<glyph unicode="&#xf26e;" horiz-adv-x="2304" d="M1391 390v0l-1 1q-15 18 -34.5 37.5t-62.5 57.5t-93.5 62t-95.5 24q-48 0 -83 -21.5t-51 -54t-23 -59t-7 -47.5v0v0q0 -21 7 -48t23 -59t51 -53.5t83 -21.5q45 0 95.5 24t94 62.5t62 57t34.5 37.5zM2103 390q0 21 -7 47.5t-23 59t-51 54t-83 21.5q-45 0 -95.5 -24 t-94 -62.5t-62 -57t-34.5 -37.5l-1 -1v0v0l1 -1q15 -18 34.5 -37.5t62.5 -57.5t93.5 -62t95.5 -24q48 0 83 21.5t51 53.5t23 59t7 48zM2304 393q0 -69 -24 -137.5t-68 -126t-116 -93.5t-159 -36q-68 0 -134 24t-113.5 58.5t-84.5 69.5t-59.5 59t-25.5 24t-22.5 -24 t-54.5 -58.5t-81.5 -69.5t-115 -59t-143.5 -24q-65 0 -123.5 22.5t-96.5 54t-66.5 66.5t-41 59.5t-12.5 32.5q0 -8 -8.5 -26.5t-25 -45.5t-47 -55t-69 -52.5t-96.5 -40t-125 -15.5q-71 0 -130 15.5t-98.5 39.5t-70.5 56.5t-48 63.5t-27.5 63.5t-14 54t-3.5 36.5h217 q0 -55 49 -107.5t126 -52.5q79 0 134.5 67t55.5 148q0 80 -52 136.5t-138 56.5q-5 0 -13 -0.5t-31 -5t-43 -12t-42 -24.5t-34 -40h-195l102 583h602v-174h-445q-27 -159 -41 -248q4 0 16.5 13t31.5 28.5t65 28.5t108 13t114 -20.5t82.5 -49.5t51.5 -58.5t31 -50t11 -20.5 t13 25t36.5 60.5t60.5 71.5t97 61t133 25t140.5 -25t115.5 -60.5t83.5 -71.5t56.5 -61t21 -25q2 0 22 25t56 60.5t83.5 71.5t115.5 61t140 25q92 0 164.5 -35t115.5 -93t65 -125t22 -137z" />
+<glyph unicode="&#xf26e;" d="M1401 -11l-6 -6q-113 -114 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6 q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13 q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 32 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249 q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 32.5 -6t30.5 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183 q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46 t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
 <glyph unicode="&#xf270;" horiz-adv-x="1792" d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30 q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57 t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133 q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
 <glyph unicode="&#xf271;" horiz-adv-x="1792" d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9 h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224 v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
 <glyph unicode="&#xf272;" horiz-adv-x="1792" d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23 t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47 t47 -113v-96h128q52 0 90 -38t38 -90z" />
@@ -621,20 +621,65 @@
 <glyph unicode="&#xf27d;" horiz-adv-x="1792" d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246 q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
 <glyph unicode="&#xf27e;" d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
 <glyph unicode="&#xf280;" d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72 h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275 l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
-<glyph unicode="&#xf281;" horiz-adv-x="1792" />
-<glyph unicode="&#xf282;" horiz-adv-x="1792" />
-<glyph unicode="&#xf283;" horiz-adv-x="1792" />
-<glyph unicode="&#xf284;" horiz-adv-x="1792" />
-<glyph unicode="&#xf285;" horiz-adv-x="1792" />
-<glyph unicode="&#xf286;" horiz-adv-x="1792" />
-<glyph unicode="&#xf287;" horiz-adv-x="1792" />
-<glyph unicode="&#xf288;" horiz-adv-x="1792" />
-<glyph unicode="&#xf289;" horiz-adv-x="1792" />
-<glyph unicode="&#xf28a;" horiz-adv-x="1792" />
-<glyph unicode="&#xf28b;" horiz-adv-x="1792" />
-<glyph unicode="&#xf28c;" horiz-adv-x="1792" />
-<glyph unicode="&#xf28d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf28e;" horiz-adv-x="1792" />
+<glyph unicode="&#xf281;" horiz-adv-x="1792" d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5 l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44 t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106 q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
+<glyph unicode="&#xf282;" horiz-adv-x="1792" d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53 q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
+<glyph unicode="&#xf283;" horiz-adv-x="2304" d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
+<glyph unicode="&#xf284;" horiz-adv-x="1792" d="M1549 857q55 0 85.5 -28.5t30.5 -83.5t-34 -82t-91 -27h-136v-177h-25v398h170zM1710 267l-4 -11l-5 -10q-113 -230 -330.5 -366t-474.5 -136q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q244 0 454.5 -124t329.5 -338l2 -4l8 -16 q-30 -15 -136.5 -68.5t-163.5 -84.5q-6 -3 -479 -268q384 -183 799 -366zM896 -234q250 0 462.5 132.5t322.5 357.5l-287 129q-72 -140 -206 -222t-292 -82q-151 0 -280 75t-204 204t-75 280t75 280t204 204t280 75t280 -73.5t204 -204.5l280 143q-116 208 -321 329 t-443 121q-119 0 -232.5 -31.5t-209 -87.5t-176.5 -137t-137 -176.5t-87.5 -209t-31.5 -232.5t31.5 -232.5t87.5 -209t137 -176.5t176.5 -137t209 -87.5t232.5 -31.5z" />
+<glyph unicode="&#xf285;" horiz-adv-x="1792" d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
+<glyph unicode="&#xf286;" horiz-adv-x="1792" d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96 q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h16v393q-32 19 -32 55q0 26 19 45t45 19t45 -19t19 -45q0 -36 -32 -55v-9h272q16 0 16 -16v-224q0 -16 -16 -16h-272v-128h16q16 0 16 -16v-112h128 v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96q16 0 16 -16z" />
+<glyph unicode="&#xf287;" horiz-adv-x="2304" d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96 q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5 t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
+<glyph unicode="&#xf288;" horiz-adv-x="1792" d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348 t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="&#xf289;" horiz-adv-x="2304" d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22 q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5 q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13 q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
+<glyph unicode="&#xf28a;" d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83 t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20 q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5 t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
+<glyph unicode="&#xf28b;" d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103 t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf28c;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273 t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
+<glyph unicode="&#xf28d;" d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
+<glyph unicode="&#xf28e;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273 t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
+<glyph unicode="&#xf290;" horiz-adv-x="1792" d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="&#xf291;" horiz-adv-x="2048" d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5 t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416 q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441 h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
+<glyph unicode="&#xf292;" horiz-adv-x="1792" d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12 q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311 q15 0 25 -12q9 -12 6 -28z" />
+<glyph unicode="&#xf293;" d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5 t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
+<glyph unicode="&#xf294;" horiz-adv-x="1024" d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
+<glyph unicode="&#xf295;" d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5 t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="&#xf296;" horiz-adv-x="1792" d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
+<glyph unicode="&#xf297;" horiz-adv-x="1792" d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111 q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
+<glyph unicode="&#xf298;" d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14 t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
+<glyph unicode="&#xf299;" horiz-adv-x="1792" d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57 q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285 q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
+<glyph unicode="&#xf29a;" horiz-adv-x="1792" d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42 q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298 t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="&#xf29b;" d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300 l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
+<glyph unicode="&#xf29c;" d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5 t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5 t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5 t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf29d;" horiz-adv-x="1408" d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457 q-67 -192 -92 -234q-16 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521 q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661 q3 -1 7 1t7 4l3 2q11 9 11 17z" />
+<glyph unicode="&#xf29e;" horiz-adv-x="2304" d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10 t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5 t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5 h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96 t9.5 -70.5z" />
+<glyph unicode="&#xf2a0;" horiz-adv-x="1408" d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5 q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127 l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272 t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249 q-18 -19 -45 -19z" />
+<glyph unicode="&#xf2a1;" horiz-adv-x="2176" d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352 q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864 q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136 t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56 t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136 t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
+<glyph unicode="&#xf2a2;" horiz-adv-x="1792" d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72 t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45 t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4 q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
+<glyph unicode="&#xf2a3;" horiz-adv-x="2304" d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55 q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5 q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101 q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35 q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5 q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
+<glyph unicode="&#xf2a4;" horiz-adv-x="1792" d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19 t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74 t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233 l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
+<glyph unicode="&#xf2a5;" d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2 q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10 q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf2a6;" horiz-adv-x="1535" d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5 l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5 q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9 q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
+<glyph unicode="&#xf2a7;" horiz-adv-x="1664" d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37 t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38 l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147l-4 -4t-5 -4q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148q-34 23 -76 23 q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26l-12 224 q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
+<glyph unicode="&#xf2a8;" horiz-adv-x="1792" d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5 q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841 q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5 q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
+<glyph unicode="&#xf2a9;" horiz-adv-x="1280" d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5 q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
+<glyph unicode="&#xf2aa;" d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5 q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 43 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
+<glyph unicode="&#xf2ab;" d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114 q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5 t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
+<glyph unicode="&#xf2ac;" horiz-adv-x="1664" d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35 q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5 t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
+<glyph unicode="&#xf2ad;" d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115 q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15 t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf2ae;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b0;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b1;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b2;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b3;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b4;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b5;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b6;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b7;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b8;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b9;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2ba;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2bb;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2bc;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2bd;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2be;" horiz-adv-x="1792" />
 <glyph unicode="&#xf500;" horiz-adv-x="1792" />
 </font>
 </defs></svg> 
\ No newline at end of file
diff --git a/stylesheets/font-awesome/fonts/fontawesome-webfont.ttf b/stylesheets/font-awesome/fonts/fontawesome-webfont.ttf
index d7994e13..86784df9 100644
Binary files a/stylesheets/font-awesome/fonts/fontawesome-webfont.ttf and b/stylesheets/font-awesome/fonts/fontawesome-webfont.ttf differ
diff --git a/stylesheets/font-awesome/fonts/fontawesome-webfont.woff b/stylesheets/font-awesome/fonts/fontawesome-webfont.woff
index 6fd4ede0..c7faa19c 100644
Binary files a/stylesheets/font-awesome/fonts/fontawesome-webfont.woff and b/stylesheets/font-awesome/fonts/fontawesome-webfont.woff differ
diff --git a/stylesheets/font-awesome/fonts/fontawesome-webfont.woff2 b/stylesheets/font-awesome/fonts/fontawesome-webfont.woff2
index 5560193c..cab8571d 100644
Binary files a/stylesheets/font-awesome/fonts/fontawesome-webfont.woff2 and b/stylesheets/font-awesome/fonts/fontawesome-webfont.woff2 differ
diff --git a/stylesheets/font-awesome/less/font-awesome.less b/stylesheets/font-awesome/less/font-awesome.less
index e3f89c8f..76709600 100644
--- a/stylesheets/font-awesome/less/font-awesome.less
+++ b/stylesheets/font-awesome/less/font-awesome.less
@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 
@@ -15,3 +15,4 @@
 @import "rotated-flipped.less";
 @import "stacked.less";
 @import "icons.less";
+@import "screen-reader.less";
diff --git a/stylesheets/font-awesome/less/icons.less b/stylesheets/font-awesome/less/icons.less
index 6ebe9669..c5e64309 100644
--- a/stylesheets/font-awesome/less/icons.less
+++ b/stylesheets/font-awesome/less/icons.less
@@ -675,3 +675,50 @@
 .@{fa-css-prefix}-vimeo:before { content: @fa-var-vimeo; }
 .@{fa-css-prefix}-black-tie:before { content: @fa-var-black-tie; }
 .@{fa-css-prefix}-fonticons:before { content: @fa-var-fonticons; }
+.@{fa-css-prefix}-reddit-alien:before { content: @fa-var-reddit-alien; }
+.@{fa-css-prefix}-edge:before { content: @fa-var-edge; }
+.@{fa-css-prefix}-credit-card-alt:before { content: @fa-var-credit-card-alt; }
+.@{fa-css-prefix}-codiepie:before { content: @fa-var-codiepie; }
+.@{fa-css-prefix}-modx:before { content: @fa-var-modx; }
+.@{fa-css-prefix}-fort-awesome:before { content: @fa-var-fort-awesome; }
+.@{fa-css-prefix}-usb:before { content: @fa-var-usb; }
+.@{fa-css-prefix}-product-hunt:before { content: @fa-var-product-hunt; }
+.@{fa-css-prefix}-mixcloud:before { content: @fa-var-mixcloud; }
+.@{fa-css-prefix}-scribd:before { content: @fa-var-scribd; }
+.@{fa-css-prefix}-pause-circle:before { content: @fa-var-pause-circle; }
+.@{fa-css-prefix}-pause-circle-o:before { content: @fa-var-pause-circle-o; }
+.@{fa-css-prefix}-stop-circle:before { content: @fa-var-stop-circle; }
+.@{fa-css-prefix}-stop-circle-o:before { content: @fa-var-stop-circle-o; }
+.@{fa-css-prefix}-shopping-bag:before { content: @fa-var-shopping-bag; }
+.@{fa-css-prefix}-shopping-basket:before { content: @fa-var-shopping-basket; }
+.@{fa-css-prefix}-hashtag:before { content: @fa-var-hashtag; }
+.@{fa-css-prefix}-bluetooth:before { content: @fa-var-bluetooth; }
+.@{fa-css-prefix}-bluetooth-b:before { content: @fa-var-bluetooth-b; }
+.@{fa-css-prefix}-percent:before { content: @fa-var-percent; }
+.@{fa-css-prefix}-gitlab:before { content: @fa-var-gitlab; }
+.@{fa-css-prefix}-wpbeginner:before { content: @fa-var-wpbeginner; }
+.@{fa-css-prefix}-wpforms:before { content: @fa-var-wpforms; }
+.@{fa-css-prefix}-envira:before { content: @fa-var-envira; }
+.@{fa-css-prefix}-universal-access:before { content: @fa-var-universal-access; }
+.@{fa-css-prefix}-wheelchair-alt:before { content: @fa-var-wheelchair-alt; }
+.@{fa-css-prefix}-question-circle-o:before { content: @fa-var-question-circle-o; }
+.@{fa-css-prefix}-blind:before { content: @fa-var-blind; }
+.@{fa-css-prefix}-audio-description:before { content: @fa-var-audio-description; }
+.@{fa-css-prefix}-volume-control-phone:before { content: @fa-var-volume-control-phone; }
+.@{fa-css-prefix}-braille:before { content: @fa-var-braille; }
+.@{fa-css-prefix}-assistive-listening-systems:before { content: @fa-var-assistive-listening-systems; }
+.@{fa-css-prefix}-asl-interpreting:before,
+.@{fa-css-prefix}-american-sign-language-interpreting:before { content: @fa-var-american-sign-language-interpreting; }
+.@{fa-css-prefix}-deafness:before,
+.@{fa-css-prefix}-hard-of-hearing:before,
+.@{fa-css-prefix}-deaf:before { content: @fa-var-deaf; }
+.@{fa-css-prefix}-glide:before { content: @fa-var-glide; }
+.@{fa-css-prefix}-glide-g:before { content: @fa-var-glide-g; }
+.@{fa-css-prefix}-signing:before,
+.@{fa-css-prefix}-sign-language:before { content: @fa-var-sign-language; }
+.@{fa-css-prefix}-low-vision:before { content: @fa-var-low-vision; }
+.@{fa-css-prefix}-viadeo:before { content: @fa-var-viadeo; }
+.@{fa-css-prefix}-viadeo-square:before { content: @fa-var-viadeo-square; }
+.@{fa-css-prefix}-snapchat:before { content: @fa-var-snapchat; }
+.@{fa-css-prefix}-snapchat-ghost:before { content: @fa-var-snapchat-ghost; }
+.@{fa-css-prefix}-snapchat-square:before { content: @fa-var-snapchat-square; }
diff --git a/stylesheets/font-awesome/less/mixins.less b/stylesheets/font-awesome/less/mixins.less
index d5a43a14..beef231d 100644
--- a/stylesheets/font-awesome/less/mixins.less
+++ b/stylesheets/font-awesome/less/mixins.less
@@ -12,15 +12,49 @@
 }
 
 .fa-icon-rotate(@degrees, @rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation})";
   -webkit-transform: rotate(@degrees);
       -ms-transform: rotate(@degrees);
           transform: rotate(@degrees);
 }
 
 .fa-icon-flip(@horiz, @vert, @rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation}, mirror=1)";
   -webkit-transform: scale(@horiz, @vert);
       -ms-transform: scale(@horiz, @vert);
           transform: scale(@horiz, @vert);
 }
+
+
+// Only display content to screen readers. A la Bootstrap 4.
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+.sr-only() {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+//
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+//
+// Credit: HTML5 Boilerplate
+
+.sr-only-focusable() {
+  &:active,
+  &:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
+}
diff --git a/stylesheets/font-awesome/less/path.less b/stylesheets/font-awesome/less/path.less
index 9211e665..835be41f 100644
--- a/stylesheets/font-awesome/less/path.less
+++ b/stylesheets/font-awesome/less/path.less
@@ -9,7 +9,7 @@
     url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
     url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
     url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
-//  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  // src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }
diff --git a/stylesheets/font-awesome/less/screen-reader.less b/stylesheets/font-awesome/less/screen-reader.less
new file mode 100644
index 00000000..11c18819
--- /dev/null
+++ b/stylesheets/font-awesome/less/screen-reader.less
@@ -0,0 +1,5 @@
+// Screen Readers
+// -------------------------
+
+.sr-only { .sr-only(); }
+.sr-only-focusable { .sr-only-focusable(); }
diff --git a/stylesheets/font-awesome/less/variables.less b/stylesheets/font-awesome/less/variables.less
index 00418e75..8118e8f7 100644
--- a/stylesheets/font-awesome/less/variables.less
+++ b/stylesheets/font-awesome/less/variables.less
@@ -4,9 +4,9 @@
 @fa-font-path:        "../fonts";
 @fa-font-size-base:   14px;
 @fa-line-height-base: 1;
-//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts"; // for referencing Bootstrap CDN font files directly
+//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.6.1/fonts"; // for referencing Bootstrap CDN font files directly
 @fa-css-prefix:       fa;
-@fa-version:          "4.4.0";
+@fa-version:          "4.6.1";
 @fa-border-color:     #eee;
 @fa-inverse:          #fff;
 @fa-li-width:         (30em / 14);
@@ -20,6 +20,7 @@
 @fa-var-align-right: "\f038";
 @fa-var-amazon: "\f270";
 @fa-var-ambulance: "\f0f9";
+@fa-var-american-sign-language-interpreting: "\f2a3";
 @fa-var-anchor: "\f13d";
 @fa-var-android: "\f17b";
 @fa-var-angellist: "\f209";
@@ -50,8 +51,11 @@
 @fa-var-arrows-alt: "\f0b2";
 @fa-var-arrows-h: "\f07e";
 @fa-var-arrows-v: "\f07d";
+@fa-var-asl-interpreting: "\f2a3";
+@fa-var-assistive-listening-systems: "\f2a2";
 @fa-var-asterisk: "\f069";
 @fa-var-at: "\f1fa";
+@fa-var-audio-description: "\f29e";
 @fa-var-automobile: "\f1b9";
 @fa-var-backward: "\f04a";
 @fa-var-balance-scale: "\f24e";
@@ -86,12 +90,16 @@
 @fa-var-bitbucket-square: "\f172";
 @fa-var-bitcoin: "\f15a";
 @fa-var-black-tie: "\f27e";
+@fa-var-blind: "\f29d";
+@fa-var-bluetooth: "\f293";
+@fa-var-bluetooth-b: "\f294";
 @fa-var-bold: "\f032";
 @fa-var-bolt: "\f0e7";
 @fa-var-bomb: "\f1e2";
 @fa-var-book: "\f02d";
 @fa-var-bookmark: "\f02e";
 @fa-var-bookmark-o: "\f097";
+@fa-var-braille: "\f2a1";
 @fa-var-briefcase: "\f0b1";
 @fa-var-btc: "\f15a";
 @fa-var-bug: "\f188";
@@ -164,6 +172,7 @@
 @fa-var-code: "\f121";
 @fa-var-code-fork: "\f126";
 @fa-var-codepen: "\f1cb";
+@fa-var-codiepie: "\f284";
 @fa-var-coffee: "\f0f4";
 @fa-var-cog: "\f013";
 @fa-var-cogs: "\f085";
@@ -182,6 +191,7 @@
 @fa-var-copyright: "\f1f9";
 @fa-var-creative-commons: "\f25e";
 @fa-var-credit-card: "\f09d";
+@fa-var-credit-card-alt: "\f283";
 @fa-var-crop: "\f125";
 @fa-var-crosshairs: "\f05b";
 @fa-var-css3: "\f13c";
@@ -192,6 +202,8 @@
 @fa-var-dashboard: "\f0e4";
 @fa-var-dashcube: "\f210";
 @fa-var-database: "\f1c0";
+@fa-var-deaf: "\f2a4";
+@fa-var-deafness: "\f2a4";
 @fa-var-dedent: "\f03b";
 @fa-var-delicious: "\f1a5";
 @fa-var-desktop: "\f108";
@@ -204,6 +216,7 @@
 @fa-var-dribbble: "\f17d";
 @fa-var-dropbox: "\f16b";
 @fa-var-drupal: "\f1a9";
+@fa-var-edge: "\f282";
 @fa-var-edit: "\f044";
 @fa-var-eject: "\f052";
 @fa-var-ellipsis-h: "\f141";
@@ -212,6 +225,7 @@
 @fa-var-envelope: "\f0e0";
 @fa-var-envelope-o: "\f003";
 @fa-var-envelope-square: "\f199";
+@fa-var-envira: "\f299";
 @fa-var-eraser: "\f12d";
 @fa-var-eur: "\f153";
 @fa-var-euro: "\f153";
@@ -273,6 +287,7 @@
 @fa-var-folder-open-o: "\f115";
 @fa-var-font: "\f031";
 @fa-var-fonticons: "\f280";
+@fa-var-fort-awesome: "\f286";
 @fa-var-forumbee: "\f211";
 @fa-var-forward: "\f04e";
 @fa-var-foursquare: "\f180";
@@ -294,8 +309,11 @@
 @fa-var-github: "\f09b";
 @fa-var-github-alt: "\f113";
 @fa-var-github-square: "\f092";
+@fa-var-gitlab: "\f296";
 @fa-var-gittip: "\f184";
 @fa-var-glass: "\f000";
+@fa-var-glide: "\f2a5";
+@fa-var-glide-g: "\f2a6";
 @fa-var-globe: "\f0ac";
 @fa-var-google: "\f1a0";
 @fa-var-google-plus: "\f0d5";
@@ -319,6 +337,8 @@
 @fa-var-hand-scissors-o: "\f257";
 @fa-var-hand-spock-o: "\f259";
 @fa-var-hand-stop-o: "\f256";
+@fa-var-hard-of-hearing: "\f2a4";
+@fa-var-hashtag: "\f292";
 @fa-var-hdd-o: "\f0a0";
 @fa-var-header: "\f1dc";
 @fa-var-headphones: "\f025";
@@ -390,6 +410,7 @@
 @fa-var-long-arrow-left: "\f177";
 @fa-var-long-arrow-right: "\f178";
 @fa-var-long-arrow-up: "\f176";
+@fa-var-low-vision: "\f2a8";
 @fa-var-magic: "\f0d0";
 @fa-var-magnet: "\f076";
 @fa-var-mail-forward: "\f064";
@@ -418,8 +439,10 @@
 @fa-var-minus-circle: "\f056";
 @fa-var-minus-square: "\f146";
 @fa-var-minus-square-o: "\f147";
+@fa-var-mixcloud: "\f289";
 @fa-var-mobile: "\f10b";
 @fa-var-mobile-phone: "\f10b";
+@fa-var-modx: "\f285";
 @fa-var-money: "\f0d6";
 @fa-var-moon-o: "\f186";
 @fa-var-mortar-board: "\f19d";
@@ -446,11 +469,14 @@
 @fa-var-paragraph: "\f1dd";
 @fa-var-paste: "\f0ea";
 @fa-var-pause: "\f04c";
+@fa-var-pause-circle: "\f28b";
+@fa-var-pause-circle-o: "\f28c";
 @fa-var-paw: "\f1b0";
 @fa-var-paypal: "\f1ed";
 @fa-var-pencil: "\f040";
 @fa-var-pencil-square: "\f14b";
 @fa-var-pencil-square-o: "\f044";
+@fa-var-percent: "\f295";
 @fa-var-phone: "\f095";
 @fa-var-phone-square: "\f098";
 @fa-var-photo: "\f03e";
@@ -472,11 +498,13 @@
 @fa-var-plus-square-o: "\f196";
 @fa-var-power-off: "\f011";
 @fa-var-print: "\f02f";
+@fa-var-product-hunt: "\f288";
 @fa-var-puzzle-piece: "\f12e";
 @fa-var-qq: "\f1d6";
 @fa-var-qrcode: "\f029";
 @fa-var-question: "\f128";
 @fa-var-question-circle: "\f059";
+@fa-var-question-circle-o: "\f29c";
 @fa-var-quote-left: "\f10d";
 @fa-var-quote-right: "\f10e";
 @fa-var-ra: "\f1d0";
@@ -484,6 +512,7 @@
 @fa-var-rebel: "\f1d0";
 @fa-var-recycle: "\f1b8";
 @fa-var-reddit: "\f1a1";
+@fa-var-reddit-alien: "\f281";
 @fa-var-reddit-square: "\f1a2";
 @fa-var-refresh: "\f021";
 @fa-var-registered: "\f25d";
@@ -508,6 +537,7 @@
 @fa-var-safari: "\f267";
 @fa-var-save: "\f0c7";
 @fa-var-scissors: "\f0c4";
+@fa-var-scribd: "\f28a";
 @fa-var-search: "\f002";
 @fa-var-search-minus: "\f010";
 @fa-var-search-plus: "\f00e";
@@ -525,10 +555,14 @@
 @fa-var-shield: "\f132";
 @fa-var-ship: "\f21a";
 @fa-var-shirtsinbulk: "\f214";
+@fa-var-shopping-bag: "\f290";
+@fa-var-shopping-basket: "\f291";
 @fa-var-shopping-cart: "\f07a";
 @fa-var-sign-in: "\f090";
+@fa-var-sign-language: "\f2a7";
 @fa-var-sign-out: "\f08b";
 @fa-var-signal: "\f012";
+@fa-var-signing: "\f2a7";
 @fa-var-simplybuilt: "\f215";
 @fa-var-sitemap: "\f0e8";
 @fa-var-skyatlas: "\f216";
@@ -537,6 +571,9 @@
 @fa-var-sliders: "\f1de";
 @fa-var-slideshare: "\f1e7";
 @fa-var-smile-o: "\f118";
+@fa-var-snapchat: "\f2ab";
+@fa-var-snapchat-ghost: "\f2ac";
+@fa-var-snapchat-square: "\f2ad";
 @fa-var-soccer-ball-o: "\f1e3";
 @fa-var-sort: "\f0dc";
 @fa-var-sort-alpha-asc: "\f15d";
@@ -572,6 +609,8 @@
 @fa-var-sticky-note: "\f249";
 @fa-var-sticky-note-o: "\f24a";
 @fa-var-stop: "\f04d";
+@fa-var-stop-circle: "\f28d";
+@fa-var-stop-circle-o: "\f28e";
 @fa-var-street-view: "\f21d";
 @fa-var-strikethrough: "\f0cc";
 @fa-var-stumbleupon: "\f1a4";
@@ -636,12 +675,14 @@
 @fa-var-umbrella: "\f0e9";
 @fa-var-underline: "\f0cd";
 @fa-var-undo: "\f0e2";
+@fa-var-universal-access: "\f29a";
 @fa-var-university: "\f19c";
 @fa-var-unlink: "\f127";
 @fa-var-unlock: "\f09c";
 @fa-var-unlock-alt: "\f13e";
 @fa-var-unsorted: "\f0dc";
 @fa-var-upload: "\f093";
+@fa-var-usb: "\f287";
 @fa-var-usd: "\f155";
 @fa-var-user: "\f007";
 @fa-var-user-md: "\f0f0";
@@ -653,11 +694,14 @@
 @fa-var-venus-double: "\f226";
 @fa-var-venus-mars: "\f228";
 @fa-var-viacoin: "\f237";
+@fa-var-viadeo: "\f2a9";
+@fa-var-viadeo-square: "\f2aa";
 @fa-var-video-camera: "\f03d";
 @fa-var-vimeo: "\f27d";
 @fa-var-vimeo-square: "\f194";
 @fa-var-vine: "\f1ca";
 @fa-var-vk: "\f189";
+@fa-var-volume-control-phone: "\f2a0";
 @fa-var-volume-down: "\f027";
 @fa-var-volume-off: "\f026";
 @fa-var-volume-up: "\f028";
@@ -667,11 +711,14 @@
 @fa-var-weixin: "\f1d7";
 @fa-var-whatsapp: "\f232";
 @fa-var-wheelchair: "\f193";
+@fa-var-wheelchair-alt: "\f29b";
 @fa-var-wifi: "\f1eb";
 @fa-var-wikipedia-w: "\f266";
 @fa-var-windows: "\f17a";
 @fa-var-won: "\f159";
 @fa-var-wordpress: "\f19a";
+@fa-var-wpbeginner: "\f297";
+@fa-var-wpforms: "\f298";
 @fa-var-wrench: "\f0ad";
 @fa-var-xing: "\f168";
 @fa-var-xing-square: "\f169";
diff --git a/stylesheets/font-awesome/scss/_icons.scss b/stylesheets/font-awesome/scss/_icons.scss
index 62d97677..b64017ae 100644
--- a/stylesheets/font-awesome/scss/_icons.scss
+++ b/stylesheets/font-awesome/scss/_icons.scss
@@ -675,3 +675,50 @@
 .#{$fa-css-prefix}-vimeo:before { content: $fa-var-vimeo; }
 .#{$fa-css-prefix}-black-tie:before { content: $fa-var-black-tie; }
 .#{$fa-css-prefix}-fonticons:before { content: $fa-var-fonticons; }
+.#{$fa-css-prefix}-reddit-alien:before { content: $fa-var-reddit-alien; }
+.#{$fa-css-prefix}-edge:before { content: $fa-var-edge; }
+.#{$fa-css-prefix}-credit-card-alt:before { content: $fa-var-credit-card-alt; }
+.#{$fa-css-prefix}-codiepie:before { content: $fa-var-codiepie; }
+.#{$fa-css-prefix}-modx:before { content: $fa-var-modx; }
+.#{$fa-css-prefix}-fort-awesome:before { content: $fa-var-fort-awesome; }
+.#{$fa-css-prefix}-usb:before { content: $fa-var-usb; }
+.#{$fa-css-prefix}-product-hunt:before { content: $fa-var-product-hunt; }
+.#{$fa-css-prefix}-mixcloud:before { content: $fa-var-mixcloud; }
+.#{$fa-css-prefix}-scribd:before { content: $fa-var-scribd; }
+.#{$fa-css-prefix}-pause-circle:before { content: $fa-var-pause-circle; }
+.#{$fa-css-prefix}-pause-circle-o:before { content: $fa-var-pause-circle-o; }
+.#{$fa-css-prefix}-stop-circle:before { content: $fa-var-stop-circle; }
+.#{$fa-css-prefix}-stop-circle-o:before { content: $fa-var-stop-circle-o; }
+.#{$fa-css-prefix}-shopping-bag:before { content: $fa-var-shopping-bag; }
+.#{$fa-css-prefix}-shopping-basket:before { content: $fa-var-shopping-basket; }
+.#{$fa-css-prefix}-hashtag:before { content: $fa-var-hashtag; }
+.#{$fa-css-prefix}-bluetooth:before { content: $fa-var-bluetooth; }
+.#{$fa-css-prefix}-bluetooth-b:before { content: $fa-var-bluetooth-b; }
+.#{$fa-css-prefix}-percent:before { content: $fa-var-percent; }
+.#{$fa-css-prefix}-gitlab:before { content: $fa-var-gitlab; }
+.#{$fa-css-prefix}-wpbeginner:before { content: $fa-var-wpbeginner; }
+.#{$fa-css-prefix}-wpforms:before { content: $fa-var-wpforms; }
+.#{$fa-css-prefix}-envira:before { content: $fa-var-envira; }
+.#{$fa-css-prefix}-universal-access:before { content: $fa-var-universal-access; }
+.#{$fa-css-prefix}-wheelchair-alt:before { content: $fa-var-wheelchair-alt; }
+.#{$fa-css-prefix}-question-circle-o:before { content: $fa-var-question-circle-o; }
+.#{$fa-css-prefix}-blind:before { content: $fa-var-blind; }
+.#{$fa-css-prefix}-audio-description:before { content: $fa-var-audio-description; }
+.#{$fa-css-prefix}-volume-control-phone:before { content: $fa-var-volume-control-phone; }
+.#{$fa-css-prefix}-braille:before { content: $fa-var-braille; }
+.#{$fa-css-prefix}-assistive-listening-systems:before { content: $fa-var-assistive-listening-systems; }
+.#{$fa-css-prefix}-asl-interpreting:before,
+.#{$fa-css-prefix}-american-sign-language-interpreting:before { content: $fa-var-american-sign-language-interpreting; }
+.#{$fa-css-prefix}-deafness:before,
+.#{$fa-css-prefix}-hard-of-hearing:before,
+.#{$fa-css-prefix}-deaf:before { content: $fa-var-deaf; }
+.#{$fa-css-prefix}-glide:before { content: $fa-var-glide; }
+.#{$fa-css-prefix}-glide-g:before { content: $fa-var-glide-g; }
+.#{$fa-css-prefix}-signing:before,
+.#{$fa-css-prefix}-sign-language:before { content: $fa-var-sign-language; }
+.#{$fa-css-prefix}-low-vision:before { content: $fa-var-low-vision; }
+.#{$fa-css-prefix}-viadeo:before { content: $fa-var-viadeo; }
+.#{$fa-css-prefix}-viadeo-square:before { content: $fa-var-viadeo-square; }
+.#{$fa-css-prefix}-snapchat:before { content: $fa-var-snapchat; }
+.#{$fa-css-prefix}-snapchat-ghost:before { content: $fa-var-snapchat-ghost; }
+.#{$fa-css-prefix}-snapchat-square:before { content: $fa-var-snapchat-square; }
diff --git a/stylesheets/font-awesome/scss/_mixins.scss b/stylesheets/font-awesome/scss/_mixins.scss
index f96719b6..c3bbd574 100644
--- a/stylesheets/font-awesome/scss/_mixins.scss
+++ b/stylesheets/font-awesome/scss/_mixins.scss
@@ -12,15 +12,49 @@
 }
 
 @mixin fa-icon-rotate($degrees, $rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})";
   -webkit-transform: rotate($degrees);
       -ms-transform: rotate($degrees);
           transform: rotate($degrees);
 }
 
 @mixin fa-icon-flip($horiz, $vert, $rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)";
   -webkit-transform: scale($horiz, $vert);
       -ms-transform: scale($horiz, $vert);
           transform: scale($horiz, $vert);
 }
+
+
+// Only display content to screen readers. A la Bootstrap 4.
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+@mixin sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+//
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+//
+// Credit: HTML5 Boilerplate
+
+@mixin sr-only-focusable {
+  &:active,
+  &:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
+}
diff --git a/stylesheets/font-awesome/scss/_screen-reader.scss b/stylesheets/font-awesome/scss/_screen-reader.scss
new file mode 100644
index 00000000..637426f0
--- /dev/null
+++ b/stylesheets/font-awesome/scss/_screen-reader.scss
@@ -0,0 +1,5 @@
+// Screen Readers
+// -------------------------
+
+.sr-only { @include sr-only(); }
+.sr-only-focusable { @include sr-only-focusable(); }
diff --git a/stylesheets/font-awesome/scss/_variables.scss b/stylesheets/font-awesome/scss/_variables.scss
index c10cd47f..1f374d6c 100644
--- a/stylesheets/font-awesome/scss/_variables.scss
+++ b/stylesheets/font-awesome/scss/_variables.scss
@@ -4,9 +4,9 @@
 $fa-font-path:        "../fonts" !default;
 $fa-font-size-base:   14px !default;
 $fa-line-height-base: 1 !default;
-//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts" !default; // for referencing Bootstrap CDN font files directly
+//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.6.1/fonts" !default; // for referencing Bootstrap CDN font files directly
 $fa-css-prefix:       fa !default;
-$fa-version:          "4.4.0" !default;
+$fa-version:          "4.6.1" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
 $fa-li-width:         (30em / 14) !default;
@@ -20,6 +20,7 @@ $fa-var-align-left: "\f036";
 $fa-var-align-right: "\f038";
 $fa-var-amazon: "\f270";
 $fa-var-ambulance: "\f0f9";
+$fa-var-american-sign-language-interpreting: "\f2a3";
 $fa-var-anchor: "\f13d";
 $fa-var-android: "\f17b";
 $fa-var-angellist: "\f209";
@@ -50,8 +51,11 @@ $fa-var-arrows: "\f047";
 $fa-var-arrows-alt: "\f0b2";
 $fa-var-arrows-h: "\f07e";
 $fa-var-arrows-v: "\f07d";
+$fa-var-asl-interpreting: "\f2a3";
+$fa-var-assistive-listening-systems: "\f2a2";
 $fa-var-asterisk: "\f069";
 $fa-var-at: "\f1fa";
+$fa-var-audio-description: "\f29e";
 $fa-var-automobile: "\f1b9";
 $fa-var-backward: "\f04a";
 $fa-var-balance-scale: "\f24e";
@@ -86,12 +90,16 @@ $fa-var-bitbucket: "\f171";
 $fa-var-bitbucket-square: "\f172";
 $fa-var-bitcoin: "\f15a";
 $fa-var-black-tie: "\f27e";
+$fa-var-blind: "\f29d";
+$fa-var-bluetooth: "\f293";
+$fa-var-bluetooth-b: "\f294";
 $fa-var-bold: "\f032";
 $fa-var-bolt: "\f0e7";
 $fa-var-bomb: "\f1e2";
 $fa-var-book: "\f02d";
 $fa-var-bookmark: "\f02e";
 $fa-var-bookmark-o: "\f097";
+$fa-var-braille: "\f2a1";
 $fa-var-briefcase: "\f0b1";
 $fa-var-btc: "\f15a";
 $fa-var-bug: "\f188";
@@ -164,6 +172,7 @@ $fa-var-cny: "\f157";
 $fa-var-code: "\f121";
 $fa-var-code-fork: "\f126";
 $fa-var-codepen: "\f1cb";
+$fa-var-codiepie: "\f284";
 $fa-var-coffee: "\f0f4";
 $fa-var-cog: "\f013";
 $fa-var-cogs: "\f085";
@@ -182,6 +191,7 @@ $fa-var-copy: "\f0c5";
 $fa-var-copyright: "\f1f9";
 $fa-var-creative-commons: "\f25e";
 $fa-var-credit-card: "\f09d";
+$fa-var-credit-card-alt: "\f283";
 $fa-var-crop: "\f125";
 $fa-var-crosshairs: "\f05b";
 $fa-var-css3: "\f13c";
@@ -192,6 +202,8 @@ $fa-var-cutlery: "\f0f5";
 $fa-var-dashboard: "\f0e4";
 $fa-var-dashcube: "\f210";
 $fa-var-database: "\f1c0";
+$fa-var-deaf: "\f2a4";
+$fa-var-deafness: "\f2a4";
 $fa-var-dedent: "\f03b";
 $fa-var-delicious: "\f1a5";
 $fa-var-desktop: "\f108";
@@ -204,6 +216,7 @@ $fa-var-download: "\f019";
 $fa-var-dribbble: "\f17d";
 $fa-var-dropbox: "\f16b";
 $fa-var-drupal: "\f1a9";
+$fa-var-edge: "\f282";
 $fa-var-edit: "\f044";
 $fa-var-eject: "\f052";
 $fa-var-ellipsis-h: "\f141";
@@ -212,6 +225,7 @@ $fa-var-empire: "\f1d1";
 $fa-var-envelope: "\f0e0";
 $fa-var-envelope-o: "\f003";
 $fa-var-envelope-square: "\f199";
+$fa-var-envira: "\f299";
 $fa-var-eraser: "\f12d";
 $fa-var-eur: "\f153";
 $fa-var-euro: "\f153";
@@ -273,6 +287,7 @@ $fa-var-folder-open: "\f07c";
 $fa-var-folder-open-o: "\f115";
 $fa-var-font: "\f031";
 $fa-var-fonticons: "\f280";
+$fa-var-fort-awesome: "\f286";
 $fa-var-forumbee: "\f211";
 $fa-var-forward: "\f04e";
 $fa-var-foursquare: "\f180";
@@ -294,8 +309,11 @@ $fa-var-git-square: "\f1d2";
 $fa-var-github: "\f09b";
 $fa-var-github-alt: "\f113";
 $fa-var-github-square: "\f092";
+$fa-var-gitlab: "\f296";
 $fa-var-gittip: "\f184";
 $fa-var-glass: "\f000";
+$fa-var-glide: "\f2a5";
+$fa-var-glide-g: "\f2a6";
 $fa-var-globe: "\f0ac";
 $fa-var-google: "\f1a0";
 $fa-var-google-plus: "\f0d5";
@@ -319,6 +337,8 @@ $fa-var-hand-rock-o: "\f255";
 $fa-var-hand-scissors-o: "\f257";
 $fa-var-hand-spock-o: "\f259";
 $fa-var-hand-stop-o: "\f256";
+$fa-var-hard-of-hearing: "\f2a4";
+$fa-var-hashtag: "\f292";
 $fa-var-hdd-o: "\f0a0";
 $fa-var-header: "\f1dc";
 $fa-var-headphones: "\f025";
@@ -390,6 +410,7 @@ $fa-var-long-arrow-down: "\f175";
 $fa-var-long-arrow-left: "\f177";
 $fa-var-long-arrow-right: "\f178";
 $fa-var-long-arrow-up: "\f176";
+$fa-var-low-vision: "\f2a8";
 $fa-var-magic: "\f0d0";
 $fa-var-magnet: "\f076";
 $fa-var-mail-forward: "\f064";
@@ -418,8 +439,10 @@ $fa-var-minus: "\f068";
 $fa-var-minus-circle: "\f056";
 $fa-var-minus-square: "\f146";
 $fa-var-minus-square-o: "\f147";
+$fa-var-mixcloud: "\f289";
 $fa-var-mobile: "\f10b";
 $fa-var-mobile-phone: "\f10b";
+$fa-var-modx: "\f285";
 $fa-var-money: "\f0d6";
 $fa-var-moon-o: "\f186";
 $fa-var-mortar-board: "\f19d";
@@ -446,11 +469,14 @@ $fa-var-paperclip: "\f0c6";
 $fa-var-paragraph: "\f1dd";
 $fa-var-paste: "\f0ea";
 $fa-var-pause: "\f04c";
+$fa-var-pause-circle: "\f28b";
+$fa-var-pause-circle-o: "\f28c";
 $fa-var-paw: "\f1b0";
 $fa-var-paypal: "\f1ed";
 $fa-var-pencil: "\f040";
 $fa-var-pencil-square: "\f14b";
 $fa-var-pencil-square-o: "\f044";
+$fa-var-percent: "\f295";
 $fa-var-phone: "\f095";
 $fa-var-phone-square: "\f098";
 $fa-var-photo: "\f03e";
@@ -472,11 +498,13 @@ $fa-var-plus-square: "\f0fe";
 $fa-var-plus-square-o: "\f196";
 $fa-var-power-off: "\f011";
 $fa-var-print: "\f02f";
+$fa-var-product-hunt: "\f288";
 $fa-var-puzzle-piece: "\f12e";
 $fa-var-qq: "\f1d6";
 $fa-var-qrcode: "\f029";
 $fa-var-question: "\f128";
 $fa-var-question-circle: "\f059";
+$fa-var-question-circle-o: "\f29c";
 $fa-var-quote-left: "\f10d";
 $fa-var-quote-right: "\f10e";
 $fa-var-ra: "\f1d0";
@@ -484,6 +512,7 @@ $fa-var-random: "\f074";
 $fa-var-rebel: "\f1d0";
 $fa-var-recycle: "\f1b8";
 $fa-var-reddit: "\f1a1";
+$fa-var-reddit-alien: "\f281";
 $fa-var-reddit-square: "\f1a2";
 $fa-var-refresh: "\f021";
 $fa-var-registered: "\f25d";
@@ -508,6 +537,7 @@ $fa-var-rupee: "\f156";
 $fa-var-safari: "\f267";
 $fa-var-save: "\f0c7";
 $fa-var-scissors: "\f0c4";
+$fa-var-scribd: "\f28a";
 $fa-var-search: "\f002";
 $fa-var-search-minus: "\f010";
 $fa-var-search-plus: "\f00e";
@@ -525,10 +555,14 @@ $fa-var-sheqel: "\f20b";
 $fa-var-shield: "\f132";
 $fa-var-ship: "\f21a";
 $fa-var-shirtsinbulk: "\f214";
+$fa-var-shopping-bag: "\f290";
+$fa-var-shopping-basket: "\f291";
 $fa-var-shopping-cart: "\f07a";
 $fa-var-sign-in: "\f090";
+$fa-var-sign-language: "\f2a7";
 $fa-var-sign-out: "\f08b";
 $fa-var-signal: "\f012";
+$fa-var-signing: "\f2a7";
 $fa-var-simplybuilt: "\f215";
 $fa-var-sitemap: "\f0e8";
 $fa-var-skyatlas: "\f216";
@@ -537,6 +571,9 @@ $fa-var-slack: "\f198";
 $fa-var-sliders: "\f1de";
 $fa-var-slideshare: "\f1e7";
 $fa-var-smile-o: "\f118";
+$fa-var-snapchat: "\f2ab";
+$fa-var-snapchat-ghost: "\f2ac";
+$fa-var-snapchat-square: "\f2ad";
 $fa-var-soccer-ball-o: "\f1e3";
 $fa-var-sort: "\f0dc";
 $fa-var-sort-alpha-asc: "\f15d";
@@ -572,6 +609,8 @@ $fa-var-stethoscope: "\f0f1";
 $fa-var-sticky-note: "\f249";
 $fa-var-sticky-note-o: "\f24a";
 $fa-var-stop: "\f04d";
+$fa-var-stop-circle: "\f28d";
+$fa-var-stop-circle-o: "\f28e";
 $fa-var-street-view: "\f21d";
 $fa-var-strikethrough: "\f0cc";
 $fa-var-stumbleupon: "\f1a4";
@@ -636,12 +675,14 @@ $fa-var-twitter-square: "\f081";
 $fa-var-umbrella: "\f0e9";
 $fa-var-underline: "\f0cd";
 $fa-var-undo: "\f0e2";
+$fa-var-universal-access: "\f29a";
 $fa-var-university: "\f19c";
 $fa-var-unlink: "\f127";
 $fa-var-unlock: "\f09c";
 $fa-var-unlock-alt: "\f13e";
 $fa-var-unsorted: "\f0dc";
 $fa-var-upload: "\f093";
+$fa-var-usb: "\f287";
 $fa-var-usd: "\f155";
 $fa-var-user: "\f007";
 $fa-var-user-md: "\f0f0";
@@ -653,11 +694,14 @@ $fa-var-venus: "\f221";
 $fa-var-venus-double: "\f226";
 $fa-var-venus-mars: "\f228";
 $fa-var-viacoin: "\f237";
+$fa-var-viadeo: "\f2a9";
+$fa-var-viadeo-square: "\f2aa";
 $fa-var-video-camera: "\f03d";
 $fa-var-vimeo: "\f27d";
 $fa-var-vimeo-square: "\f194";
 $fa-var-vine: "\f1ca";
 $fa-var-vk: "\f189";
+$fa-var-volume-control-phone: "\f2a0";
 $fa-var-volume-down: "\f027";
 $fa-var-volume-off: "\f026";
 $fa-var-volume-up: "\f028";
@@ -667,11 +711,14 @@ $fa-var-weibo: "\f18a";
 $fa-var-weixin: "\f1d7";
 $fa-var-whatsapp: "\f232";
 $fa-var-wheelchair: "\f193";
+$fa-var-wheelchair-alt: "\f29b";
 $fa-var-wifi: "\f1eb";
 $fa-var-wikipedia-w: "\f266";
 $fa-var-windows: "\f17a";
 $fa-var-won: "\f159";
 $fa-var-wordpress: "\f19a";
+$fa-var-wpbeginner: "\f297";
+$fa-var-wpforms: "\f298";
 $fa-var-wrench: "\f0ad";
 $fa-var-xing: "\f168";
 $fa-var-xing-square: "\f169";
diff --git a/stylesheets/font-awesome/scss/font-awesome.scss b/stylesheets/font-awesome/scss/font-awesome.scss
index ebd9646c..a19d664c 100644
--- a/stylesheets/font-awesome/scss/font-awesome.scss
+++ b/stylesheets/font-awesome/scss/font-awesome.scss
@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 
@@ -15,3 +15,4 @@
 @import "rotated-flipped";
 @import "stacked";
 @import "icons";
+@import "screen-reader";
-- 
cgit v1.3


From f7a47f1b9e681a7ad1d2401fb779447cdce2a341 Mon Sep 17 00:00:00 2001
From: 27chan <27chan@openmailbox.org>
Date: Fri, 29 Apr 2016 15:40:01 -0300
Subject: New theme northboard_cb

For circleboard by kotiakrobaatti
---
 stylesheets/northboard_cb.css | 249 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 249 insertions(+)
 create mode 100644 stylesheets/northboard_cb.css

diff --git a/stylesheets/northboard_cb.css b/stylesheets/northboard_cb.css
new file mode 100644
index 00000000..b665c569
--- /dev/null
+++ b/stylesheets/northboard_cb.css
@@ -0,0 +1,249 @@
+/**
+* northboard.css
+* for circleboard by kotiakrobaatti
+*/
+
+body {
+    background: #191919;
+    color: #d4d4d4;
+    font-size: 13px;
+    font: 12px/1.5em Verdana,"DejaVu Sans",Sans-serif;
+}
+
+a:link, a:visited, .intro a.email {
+    color: #60a0dc !important;
+    text-decoration: none;
+}
+
+a:link:hover {
+    outline: 0;
+    color: #82c2fe !important;
+}
+
+a.post_no, a.watchThread {
+    color: #60a0dc;
+}
+
+div.post.reply {
+    background: #343439;
+    border-color: #3070A9;
+    border-top: 1px solid #3070A9;
+    border-left: 1px solid #3070A9;
+    border-radius: 3px;
+    padding: 0px;
+}
+
+div.post.reply.highlighted {
+    background: #44444f;
+    border: 3px dashed #3070a9;
+}
+
+div.post.reply div.body a, .mentioned {
+    color: 60a0dc;
+    text-decoration: underline;
+}
+
+div.post.reply div.body a:hover {
+    color: #82c2fe !important;
+    text-decoration: underline !important;
+}
+
+div.body a:hover, a.watchThread:hover, a.email span.name:hover {
+    color: #82c2fe !important;
+}
+
+.intro span.subject {
+    color: #60a0dc !important;
+    font-weight: 700;
+    font-size: 1.4em;
+    line-height: 35px;
+    height: 35px;
+    padding: 0 5px;
+}
+
+form table tr th {
+    background: #333;
+    border: 1px solid #444;
+    color: #60a0dc;
+}
+
+div.ban h2 {
+    background: #333;
+    color: inherit;
+}
+
+div.ban {
+    border-color: #800;
+}
+
+div.ban p {
+    color: black;
+}
+
+div.pages {
+    background: #343439;
+    border: 1px solid #3070a9;
+    border-radius: 5px;
+}
+
+div.pages a.selected {
+    color: #ccc;
+}
+
+div.boardlist {
+    color: #aaa;
+}
+
+div.boardlist a {
+    color: #ccc;
+}
+
+table.modlog tr th {
+    background: #333;
+}
+
+/* options.js */
+
+#options_div, #alert_div {
+    background: #44444f;
+}
+
+.desktop-style div.boardlist:nth-child(1) {
+    background-color: #bbb;
+}
+
+span.name {
+    color: #93e3ff !important;
+}
+
+span.trip {
+    color: #ffffff;
+}
+
+span.quote {
+    color: green;
+}
+
+[id^=thread] {
+    background: #1C1C1C;
+    margin-bottom: 1em ;
+    padding: 1em 1em 0 1em ;
+    border: 1px solid #333333;
+}
+
+[id^=thread] hr {
+    display: none ;
+}
+
+html body hr {
+    border-color: #9B9B9B;
+    border-width: 1px;
+}
+
+p.intro {
+    background-color: #44444F;
+    padding-top: 5px;
+    padding-left: 5px;
+    padding-right: 5px;
+    margin-top: 0px!important;
+    display: box;
+    margin: intial;
+    border-bottom: 1px solid #1c1c1c;
+    box-shadow: 0 5px 5px -5px #1c1c1c;
+}
+
+div.post.op p.intro {
+    background-color: #252525;
+    min-height: 30px;
+}
+
+span.omitted {
+    color: #707070;
+    font-size: .9em;
+    margin: 5 5px 0px;
+}
+
+h1 {
+    font-size: 3em;
+    font-weight: 300;
+    margin: .3em 0;
+    color: #60a0dc;
+}
+
+div.subtitle {
+    font-style: oblique;
+    font-size: 1.25em!important;
+    font-weight: 400!important;
+    color: #ccc!important;
+}
+
+tr td input, #body {
+    background-color: #AAA;
+    border-color: #888;
+    border-width: 1px;
+    padding-top: 3px;
+    padding-right: 2px;
+    padding-bottom: 3px;
+    padding-left: 2px;
+}
+
+#upload_file {
+    color: #ccc;
+    background-color: transparent;
+}
+
+div.blotter {
+    color: #ccc!important;
+}
+
+div.banner, a.unimportant {
+    background-color: #60a0dc;
+    color: #000!important;
+    border-radius: 3px;
+    min-height: 25px;
+    padding-top: 5px;
+}
+
+div.thread:hover {
+    background: #44444f;
+    border-color: #1c1c1c;
+}
+
+span.heading {
+    color: red;
+    text-shadow: 0 0 3px #000, 0 0 3px #000;
+}
+
+#expand-all-images,
+#shrink-all-images,
+#treeview{
+  right: 1em !important;
+  position: absolute !important;
+}
+ 
+#expand-all-images{
+  margin-top: 4em !important;
+}
+ 
+#treeview{
+  margin-top: 5em !important;
+}
+ 
+#shrink-all-images{
+  margin-top: 6em !important;
+}
+ 
+#expand-all-images + hr,
+#shrink-all-images + hr{
+  opacity: 0 !important;
+  margin: 0 !important;
+}
+ 
+#treeview + hr{
+  opacity: 0 !important;
+  clear: both !important;
+}
+ 
+#options_handler{
+  margin-top: 3em !important;
+}
-- 
cgit v1.3


From 199931dc1a609503932848be9a276e1d2275d881 Mon Sep 17 00:00:00 2001
From: 27chan <27chan@openmailbox.org>
Date: Fri, 29 Apr 2016 18:00:33 -0300
Subject: Fix default theme and add Font Awesome Icons

---
 templates/themes/recent/recent.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html
index 31c839e7..75880484 100644
--- a/templates/themes/recent/recent.html
+++ b/templates/themes/recent/recent.html
@@ -7,6 +7,8 @@
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
 	<link rel="stylesheet" media="screen" href="{{ config.root }}{{ settings.css }}"/>
 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %}
+	{% 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>
 	{{ boardlist.top }}
-- 
cgit v1.3


From 7c3126866cd291d515ab5cc83d4635c3c95c6d85 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 06:43:22 +0200
Subject: ease the migration process for the previous security patch (by
 introducing another migration); restore php 5.4 compatibility (introducing a
 polyfill system)

---
 inc/functions.php |  2 ++
 inc/mod/auth.php  | 10 +++++-----
 inc/mod/pages.php | 18 +++++++++---------
 inc/polyfill.php  | 28 ++++++++++++++++++++++++++++
 install.php       |  4 +++-
 install.sql       |  2 +-
 6 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 inc/polyfill.php

diff --git a/inc/functions.php b/inc/functions.php
index 515e3e55..3f5ed3b0 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -18,6 +18,8 @@ require_once 'inc/template.php';
 require_once 'inc/database.php';
 require_once 'inc/events.php';
 require_once 'inc/api.php';
+require_once 'inc/polyfill.php';
+
 if (!extension_loaded('gettext')) {
 	require_once 'inc/lib/gettext/gettext.inc';
 }
diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index fa1a0f4f..d877b89f 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -76,20 +76,20 @@ function generate_salt() {
 function login($username, $password) {
 	global $mod, $config;
 	
-	$query = prepare("SELECT `id`, `type`, `boards`, `password`, `salt` FROM ``mods`` WHERE `username` = :username");
+	$query = prepare("SELECT `id`, `type`, `boards`, `password`, `version` FROM ``mods`` WHERE `username` = :username");
 	$query->bindValue(':username', $username);
 	$query->execute() or error(db_error($query));
 	
 	if ($user = $query->fetch(PDO::FETCH_ASSOC)) {
-		list($version, $ok) = test_password($user['password'], $user['salt'], $password);
+		list($version, $ok) = test_password($user['password'], $user['version'], $password);
 
 		if ($ok) {
 			if ($config['password_crypt_version'] > $version) {
 				// It's time to upgrade the password hashing method!
-				list ($user['salt'], $user['password']) = crypt_password($password);
-				$query = prepare("UPDATE ``mods`` SET `password` = :password, `salt` = :salt WHERE `id` = :id");
+				list ($user['version'], $user['password']) = crypt_password($password);
+				$query = prepare("UPDATE ``mods`` SET `password` = :password, `version` = :version WHERE `id` = :id");
 				$query->bindValue(':password', $user['password']);
-				$query->bindValue(':salt', $user['salt']);
+				$query->bindValue(':version', $user['version']);
 				$query->bindValue(':id', $user['id']);
 				$query->execute() or error(db_error($query));
 			}
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index a07de4c7..8b6f73c4 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1734,12 +1734,12 @@ function mod_user($uid) {
 		}
 		
 		if ($_POST['password'] != '') {
-			list($salt, $password) = crypt_password($_POST['password']);
+			list($version, $password) = crypt_password($_POST['password']);
 
-			$query = prepare('UPDATE ``mods`` SET `password` = :password, `salt` = :salt WHERE `id` = :id');
+			$query = prepare('UPDATE ``mods`` SET `password` = :password, `version` = :version WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
 			$query->bindValue(':password', $password);
-			$query->bindValue(':salt', $salt);
+			$query->bindValue(':version', $version);
 			$query->execute() or error(db_error($query));
 			
 			modLog('Changed password for ' . utf8tohtml($_POST['username']) . ' <small>(#' . $user['id'] . ')</small>');
@@ -1760,12 +1760,12 @@ function mod_user($uid) {
 	
 	if (hasPermission($config['mod']['change_password']) && $uid == $mod['id'] && isset($_POST['password'])) {
 		if ($_POST['password'] != '') {
-			list($salt, $password) = crypt_password($_POST['password']);
+			list($version, $password) = crypt_password($_POST['password']);
 
-			$query = prepare('UPDATE ``mods`` SET `password` = :password, `salt` = :salt WHERE `id` = :id');
+			$query = prepare('UPDATE ``mods`` SET `password` = :password, `version` = :version WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
 			$query->bindValue(':password', $password);
-			$query->bindValue(':salt', $salt);
+			$query->bindValue(':version', $version);
 			$query->execute() or error(db_error($query));
 			
 			modLog('Changed own password');
@@ -1832,12 +1832,12 @@ function mod_user_new() {
 		if (!isset($config['mod']['groups'][$type]) || $type == DISABLED)
 			error(sprintf($config['error']['invalidfield'], 'type'));
 		
-		list($salt, $password) = crypt_password($_POST['password']);
+		list($version, $password) = crypt_password($_POST['password']);
 		
-		$query = prepare('INSERT INTO ``mods`` VALUES (NULL, :username, :password, :salt, :type, :boards)');
+		$query = prepare('INSERT INTO ``mods`` VALUES (NULL, :username, :password, :version, :type, :boards)');
 		$query->bindValue(':username', $_POST['username']);
 		$query->bindValue(':password', $password);
-		$query->bindValue(':salt', $salt);
+		$query->bindValue(':version', $version);
 		$query->bindValue(':type', $type);
 		$query->bindValue(':boards', implode(',', $boards));
 		$query->execute() or error(db_error($query));
diff --git a/inc/polyfill.php b/inc/polyfill.php
new file mode 100644
index 00000000..ac40a00a
--- /dev/null
+++ b/inc/polyfill.php
@@ -0,0 +1,28 @@
+<?php
+
+// PHP 5.4
+
+if (!function_exists('hex2bin')) {
+	function hex2bin($data) {
+		return pack("H*" , $hex_string);
+	}
+}
+
+// PHP 5.6
+
+if (!function_exists('hash_equals')) {
+	function hash_equals($ours, $theirs) {
+		$ours = (string)$ours;
+		$theirs = (string)$theirs;
+
+		$tlen = strlen($theirs);
+		$olen = strlen($ours);
+
+		$answer = 0;
+		for ($i = 0; $i < $tlen; $i++) {
+			$answer |= ord($ours[$olen > $i ? $i : 0]) ^ ord($theirs[$i]);
+		}
+
+		return $answer === 0 && $olen === $tlen;
+	}
+}
diff --git a/install.php b/install.php
index 5a2d724a..968c41de 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', '5.0.0');
+define('VERSION', '5.0.1');
 
 require 'inc/functions.php';
 
@@ -556,6 +556,8 @@ if (file_exists($config['has_installed'])) {
                 case '4.9.93':
                         query('ALTER TABLE ``mods`` CHANGE `password` `password` VARCHAR(255) NOT NULL;') or error(db_error());
                         query('ALTER TABLE ``mods`` CHANGE `salt` `salt` VARCHAR(64) NOT NULL;') or error(db_error());
+		case '5.0.0':
+			query('ALTER TABLE ``mods`` CHANGE `salt` `version` VARCHAR(64) NOT NULL;') or error(db_error());
 		case false:
 			// TODO: enhance Tinyboard -> vichan upgrade path.
 			query("CREATE TABLE IF NOT EXISTS ``search_queries`` (  `ip` varchar(39) NOT NULL,  `time` int(11) NOT NULL,  `query` text NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8;") or error(db_error());
diff --git a/install.sql b/install.sql
index fbf220c1..7e661450 100644
--- a/install.sql
+++ b/install.sql
@@ -132,7 +132,7 @@ CREATE TABLE IF NOT EXISTS `mods` (
   `id` smallint(6) unsigned NOT NULL AUTO_INCREMENT,
   `username` varchar(30) NOT NULL,
   `password` varchar(256) CHARACTER SET ascii NOT NULL COMMENT 'SHA256',
-  `salt` varchar(64) CHARACTER SET ascii NOT NULL,
+  `version` varchar(64) CHARACTER SET ascii NOT NULL,
   `type` smallint(2) NOT NULL,
   `boards` text CHARACTER SET utf8 NOT NULL,
   PRIMARY KEY (`id`),
-- 
cgit v1.3


From 97681613274c35061bcbd8d14e03600d5fb18345 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 07:51:55 +0200
Subject: simplify the code a bit

---
 inc/display.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/inc/display.php b/inc/display.php
index 90cf3434..58cb4805 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -94,21 +94,16 @@ function error($message, $priority = true, $debug_stuff = false) {
 		$debug_stuff['backtrace'] = debug_backtrace();
 	}
 
-	// Return the bad request header, necessary for AJAX posts
-	// czaks: is it really so? the ajax errors only work when this is commented out
-	//		better yet use it when ajax is disabled
-	if (!isset ($_POST['json_response'])) {
-		header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
-	}
-	
-	// Is there a reason to disable this?
 	if (isset($_POST['json_response'])) {
 		header('Content-Type: text/json; charset=utf-8');
 		die(json_encode(array(
 			'error' => $message
 		)));
 	}
-	
+	else {
+		header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
+	}
+
 	$pw = $config['db']['password'];
 	$debug_callback = function(&$item) use (&$debug_callback, $pw) {
 		if (is_array($item)) {
-- 
cgit v1.3


From dcf5d699bd6ce5770ebd515cc14219f3015dd63a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 08:21:21 +0200
Subject: simplify the md5 execution logic

---
 inc/api.php    |  7 ++++++-
 inc/config.php |  4 ++--
 post.php       | 44 ++++++++++++++++++++++----------------------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/inc/api.php b/inc/api.php
index 57e4d367..9483200e 100644
--- a/inc/api.php
+++ b/inc/api.php
@@ -92,7 +92,12 @@ class Api {
 		$dotPos = strrpos($file->file, '.');
 		$apiPost['ext'] = substr($file->file, $dotPos);
 		$apiPost['tim'] = substr($file->file, 0, $dotPos);
-		$apiPost['md5'] = base64_encode(hex2bin($post->filehash));
+		if (isset ($file->hash) && $post->filehash) {
+			$apiPost['md5'] = base64_encode(hex2bin($file->hash));
+		}
+		else if (isset ($post->filehash) && $post->filehash) {
+			$apiPost['md5'] = base64_encode(hex2bin($post->filehash));
+		}
 	}
 
 	private function translatePost($post, $threadsPage = false) {
diff --git a/inc/config.php b/inc/config.php
index c0e967af..b92c4ac0 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -807,8 +807,8 @@
 	// Set this to true if you're using a BSD
 	$config['bsd_md5'] = false;
 
-	// Set this to true if you're having problems with image duplicated error and bsd_md5 doesn't help.
-	$config['php_md5'] = false;
+	// Set this to true if you're using Linux and you can execute `md5sum` binary.
+	$config['gnu_md5'] = false;
 
 	// Number of posts in a "View Last X Posts" page
 	$config['noko50_count'] = 50;
diff --git a/post.php b/post.php
index 729170a7..5c755a3c 100644
--- a/post.php
+++ b/post.php
@@ -572,7 +572,12 @@ if (isset($_POST['delete'])) {
 	
 	
 	if ($post['has_file']) {
-		$fnarray = array();
+		$md5cmd = false;
+		if ($config['bsd_md5'])  $md5cmd = 'md5 -r';
+		if ($config['gnu_md5'])  $md5cmd = 'md5sum';
+
+		$allhashes = '';
+
 		foreach ($post['files'] as $key => &$file) {
 			if ($post['op'] && $config['allowed_ext_op']) {
 				if (!in_array($file['extension'], $config['allowed_ext_op']))
@@ -586,34 +591,29 @@ if (isset($_POST['delete'])) {
 			// Truncate filename if it is too long
 			$file['filename'] = mb_substr($file['filename'], 0, $config['max_filename_len']);
 			
-			if (!isset($filenames)) {
-				$filenames = escapeshellarg($file['tmp_name']);
-			} else {
-				$filenames .= (' ' . escapeshellarg($file['tmp_name']));
-			}
-
-			$fnarray[] = $file['tmp_name'];
-
 			$upload = $file['tmp_name'];
 			
 			if (!is_readable($upload))
 				error($config['error']['nomove']);
+
+			if ($md5cmd) {
+				$output = shell_exec_error($md5cmd . " < " . escapeshellarg($upload));
+				$output = explode(' ', $output);
+				$hash = $output[0];
+			}
+			else {
+				$hash = md5_file($upload);
+			}
+
+			$file['hash'] = $hash;
+			$allhashes .= $hash;
 		}
-		
-		$md5cmd = $config['bsd_md5'] ? 'md5 -r' : 'md5sum';
 
-		if (!$config['php_md5'] && $output = shell_exec_error("cat $filenames | $md5cmd")) {
-			$explodedvar = explode(' ', $output);
-			$hash = $explodedvar[0];
+		if (count ($post['files']) == 1) {
 			$post['filehash'] = $hash;
-		} elseif ($config['max_images'] === 1) {
-			$post['filehash'] = md5_file($upload);
-		} else {
-			$str_to_hash = '';
-			foreach ($fnarray as $i => $f) {
-				$str_to_hash .= file_get_contents($f);
-			}
-			$post['filehash'] = md5($str_to_hash);
+		}
+		else {
+			$post['filehash'] = md5($allhashes);
 		}
 	}
 	
-- 
cgit v1.3


From 36b78e5f98302cb8fb3d4a00d4be61d6775d74a3 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 08:40:13 +0200
Subject: fix for editor highlighting

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

diff --git a/inc/functions.php b/inc/functions.php
index 3f5ed3b0..fd4c910d 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -138,7 +138,7 @@ function loadConfig() {
 				$configstr .= file_get_contents($board['dir'] . '/config.php');
 			}
 			$matches = array();
-			preg_match_all('/[^\/*#]\$config\s*\[\s*[\'"]locale[\'"]\s*\]\s*=\s*([\'"])(.*?)\1/', $configstr, $matches);
+			preg_match_all('/[^\/#*]\$config\s*\[\s*[\'"]locale[\'"]\s*\]\s*=\s*([\'"])(.*?)\1/', $configstr, $matches);
 			if ($matches && isset ($matches[2]) && $matches[2]) {
 				$matches = $matches[2];
 				$config['locale'] = $matches[count($matches)-1];
-- 
cgit v1.3


From a42256b296f14c5f82889f9e222d94a416aa1924 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 08:43:34 +0200
Subject: locale cache: fix a bug when perms are done wrong

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

diff --git a/inc/functions.php b/inc/functions.php
index fd4c910d..462bc173 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -127,7 +127,7 @@ function loadConfig() {
 		// So, we may store the locale in a tmp/ filesystem.
 
 		if (file_exists($fn = 'tmp/cache/locale_' . $boardsuffix ) ) {
-			$config['locale'] = file_get_contents($fn);
+			$config['locale'] = @file_get_contents($fn);
 		}
 		else {
 			$config['locale'] = 'en';
@@ -144,7 +144,7 @@ function loadConfig() {
 				$config['locale'] = $matches[count($matches)-1];
 			}
 
-			file_put_contents($fn, $config['locale']);
+			@file_put_contents($fn, $config['locale']);
 		}
 
 		if ($config['locale'] != $current_locale) {
-- 
cgit v1.3


From 8dac72e924d658e66c5efe3334aa8ab41d00daca Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 09:16:09 +0200
Subject: update installer

---
 install.php                     | 103 +++++++++++++++++++++++++++-------------
 templates/installer/config.html |   3 ++
 2 files changed, 73 insertions(+), 33 deletions(-)

diff --git a/install.php b/install.php
index 968c41de..7a146c8e 100644
--- a/install.php
+++ b/install.php
@@ -581,6 +581,25 @@ if (file_exists($config['has_installed'])) {
 	die(Element('page.html', $page));
 }
 
+function create_config_from_array(&$instance_config, &$array, $prefix = '') {
+	foreach ($array as $name => $value) {
+		if (is_array($value)) {
+			$instance_config .= "\n";
+			create_config_from_array($instance_config, $value, $prefix . '[\'' . addslashes($name) . '\']');
+			$instance_config .= "\n";
+		} else {
+			$instance_config .= '	$config' . $prefix . '[\'' . addslashes($name) . '\'] = ';
+
+			if (is_numeric($value))
+				$instance_config .= $value;
+			else
+				$instance_config .= "'" . addslashes($value) . "'";
+
+			$instance_config .= ";\n";
+		}
+	}
+}
+
 if ($step == 0) {
 	// Agreeement
 	$page['body'] = '
@@ -614,7 +633,7 @@ if ($step == 0) {
 			'installed' => extension_loaded('pdo'),
 			'required' => true
 		),
-		'PDO' => array(
+		'GD' => array(
 			'installed' => extension_loaded('gd'),
 			'required' => true
 		),
@@ -627,17 +646,17 @@ if ($step == 0) {
 	$tests = array(
 		array(
 			'category' => 'PHP',
-			'name' => 'PHP &ge; 5.3',
-			'result' => PHP_VERSION_ID >= 50300,
+			'name' => 'PHP &ge; 5.4',
+			'result' => PHP_VERSION_ID >= 50400,
 			'required' => true,
-			'message' => 'vichan requires PHP 5.3 or better.',
+			'message' => 'vichan requires PHP 5.4 or better.',
 		),
 		array(
 			'category' => 'PHP',
-			'name' => 'PHP &ge; 5.4',
-			'result' => PHP_VERSION_ID >= 50400,
+			'name' => 'PHP &ge; 5.6',
+			'result' => PHP_VERSION_ID >= 50600,
 			'required' => false,
-			'message' => 'vichan works best on PHP 5.4 or better.',
+			'message' => 'vichan works best on PHP 5.6 or better.',
 		),
 		array(
 			'category' => 'PHP',
@@ -694,6 +713,7 @@ if ($step == 0) {
 			'result' => $can_exec && shell_exec('which convert'),
 			'required' => false,
 			'message' => '(Optional) `convert` was not found or executable; command-line ImageMagick image processing cannot be enabled.',
+			'effect' => function (&$config) { $config['thumb_method'] = 'convert'; },
 		),
 		array(
 			'category' => 'Image processing',
@@ -708,6 +728,7 @@ if ($step == 0) {
 			'result' => $can_exec && shell_exec('which gm'),
 			'required' => false,
 			'message' => '(Optional) `gm` was not found or executable; command-line GraphicsMagick (faster than ImageMagick) cannot be enabled.',
+			'effect' => function (&$config) { $config['thumb_method'] = 'gm'; },
 		),
 		array(
 			'category' => 'Image processing',
@@ -715,13 +736,25 @@ if ($step == 0) {
 			'result' => $can_exec && shell_exec('which gifsicle'),
 			'required' => false,
 			'message' => '(Optional) `gifsicle` was not found or executable; you may not use `convert+gifsicle` for better animated GIF thumbnailing.',
+			'effect' => function (&$config) { if ($config['thumb_method'] == 'gm')      $config['thumb_method'] = 'gm+gifsicle';
+							  if ($config['thumb_method'] == 'convert') $config['thumb_method'] = 'convert+gifsicle'; },
 		),
 		array(
 			'category' => 'Image processing',
-			'name' => '`md5sum` (quick file hashing)',
+			'name' => '`md5sum` (quick file hashing on GNU/Linux)',
+			'prereq' => '',
 			'result' => $can_exec && shell_exec('echo "vichan" | md5sum') == "141225c362da02b5c359c45b665168de  -\n",
 			'required' => false,
-			'message' => '(Optional) `md5sum` was not found or executable; file hashing for multiple images will be slower.',
+			'message' => '(Optional) `md5sum` was not found or executable; file hashing for multiple images will be slower. Ignore if not using Linux.',
+			'effect' => function (&$config) { $config['gnu_md5'] = true; },
+		),
+		array(
+			'category' => 'Image processing',
+			'name' => '`/sbin/md5` (quick file hashing on BSDs)',
+			'result' => $can_exec && shell_exec('echo "vichan" | /sbin/md5 -r') == "141225c362da02b5c359c45b665168de\n",
+			'required' => false,
+			'message' => '(Optional) `/sbin/md5` was not found or executable; file hashing for multiple images will be slower. Ignore if not using BSD.',
+			'effect' => function (&$config) { $config['bsd_md5'] = true; },
 		),
 		array(
 			'category' => 'File permissions',
@@ -737,6 +770,13 @@ if ($step == 0) {
 			'required' => true,
 			'message' => 'You must give vichan permission to create (and write to) the <code>templates/cache</code> directory or performance will be drastically reduced.'
 		),
+		array(
+			'category' => 'File permissions',
+			'name' => getcwd() . '/tmp/cache',
+			'result' => is_dir('tmp/cache') && is_writable('tmp/cache'),
+			'required' => true,
+			'message' => 'You must give vichan permission to write to the <code>tmp/cache</code> directory.'
+		),
 		array(
 			'category' => 'File permissions',
 			'name' => getcwd() . '/inc/instance-config.php',
@@ -760,17 +800,27 @@ if ($step == 0) {
 			'message' => 'vichan is still beta software and it\'s not going to come out of beta any time soon. As there are often many months between releases yet changes and bug fixes are very frequent, it\'s recommended to use the git repository to maintain your vichan installation. Using git makes upgrading much easier.'
 		)
 	);
-	
+
 	$config['font_awesome'] = true;
 	
+	$additional_config = array();
+	foreach ($tests as $test) {
+		if ($test['result'] && $test['effect']) {
+			$test['effect']($additional_config);
+		}
+	}
+	$more = '';
+	create_config_from_array($more, $additional_config);
+	$_SESSION['more'] = $more;
+
 	echo Element('page.html', array(
 		'body' => Element('installer/check-requirements.html', array(
 			'extensions' => $extensions,
 			'tests' => $tests,
-			'config' => $config
+			'config' => $config,
 		)),
 		'title' => 'Checking environment',
-		'config' => $config
+		'config' => $config,
 	));
 } elseif ($step == 2) {
 	// Basic config
@@ -781,14 +831,18 @@ if ($step == 0) {
 	
 	echo Element('page.html', array(
 		'body' => Element('installer/config.html', array(
-			'config' => $config
+			'config' => $config,
+			'more' => $more,
 		)),
 		'title' => 'Configuration',
 		'config' => $config
 	));
 } elseif ($step == 3) {
+	$more = $_POST['more'];
+	unset($_POST['more']);
+
 	$instance_config = 
-'<?php
+'<'.'?php
 
 /*
 *  Instance Configuration
@@ -800,27 +854,10 @@ if ($step == 0) {
 
 ';
 	
-	function create_config_from_array(&$instance_config, &$array, $prefix = '') {
-		foreach ($array as $name => $value) {
-			if (is_array($value)) {
-				$instance_config .= "\n";
-				create_config_from_array($instance_config, $value, $prefix . '[\'' . addslashes($name) . '\']');
-				$instance_config .= "\n";
-			} else {
-				$instance_config .= '	$config' . $prefix . '[\'' . addslashes($name) . '\'] = ';
-				
-				if (is_numeric($value))
-					$instance_config .= $value;
-				else
-					$instance_config .= "'" . addslashes($value) . "'";
-					
-				$instance_config .= ";\n";
-			}
-		}
-	}
-	
 	create_config_from_array($instance_config, $_POST);
 	
+	$instance_config .= "\n";
+	$instance_config .= $more;
 	$instance_config .= "\n";
 	
 	if (@file_put_contents('inc/instance-config.php', $instance_config)) {
diff --git a/templates/installer/config.html b/templates/installer/config.html
index 193bb98b..973328f5 100644
--- a/templates/installer/config.html
+++ b/templates/installer/config.html
@@ -87,6 +87,9 @@
 	<legend>Miscellaneous</legend>
 		<label for="secure_trip_salt">Secure trip (##) salt:</label> 
 		<input type="text" id="secure_trip_salt" name="secure_trip_salt" value="{{ config.secure_trip_salt }}" size="40">
+
+		<label for="more">Additional configuration:</label>
+		<textarea id="more" name="more">{{ more }}</textarea>
 	</fieldset>
 
 	<p style="text-align:center">
-- 
cgit v1.3


From 985c113190f077ffe60abbf89642543851076eb9 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 09:18:36 +0200
Subject: ...

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

diff --git a/install.php b/install.php
index 7a146c8e..21c573d1 100644
--- a/install.php
+++ b/install.php
@@ -805,7 +805,7 @@ if ($step == 0) {
 	
 	$additional_config = array();
 	foreach ($tests as $test) {
-		if ($test['result'] && $test['effect']) {
+		if ($test['result'] && isset($test['effect'])) {
 			$test['effect']($additional_config);
 		}
 	}
-- 
cgit v1.3


From 89fe3db55608385cb4a7ba8d7ac693d6fe75ff0a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 09:25:47 +0200
Subject: ...

---
 install.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 21c573d1..3aa8f56f 100644
--- a/install.php
+++ b/install.php
@@ -600,6 +600,8 @@ function create_config_from_array(&$instance_config, &$array, $prefix = '') {
 	}
 }
 
+session_start();
+
 if ($step == 0) {
 	// Agreeement
 	$page['body'] = '
@@ -832,7 +834,7 @@ if ($step == 0) {
 	echo Element('page.html', array(
 		'body' => Element('installer/config.html', array(
 			'config' => $config,
-			'more' => $more,
+			'more' => $_SESSION['more'],
 		)),
 		'title' => 'Configuration',
 		'config' => $config
-- 
cgit v1.3


From 38bf3276e4ffd4b82c4a7bc9eb8e1cf692147bb2 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 09:39:23 +0200
Subject: update copyright years; remove a link to tinyboard (website is dead)

---
 templates/generic_page.html           | 8 ++++----
 templates/index.html                  | 8 ++++----
 templates/page.html                   | 8 ++++----
 templates/themes/basic/index.html     | 8 ++++----
 templates/themes/catalog/catalog.html | 8 ++++----
 templates/themes/categories/news.html | 8 ++++----
 templates/themes/frameset/news.html   | 8 ++++----
 templates/themes/recent/recent.html   | 8 ++++----
 templates/thread.html                 | 8 ++++----
 9 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/templates/generic_page.html b/templates/generic_page.html
index 965cbc2c..35b58df3 100644
--- a/templates/generic_page.html
+++ b/templates/generic_page.html
@@ -36,10 +36,10 @@
 	{% endfor %} {{ btn.next }}</div>
 	{{ boardlist.bottom }}
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+			<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+		<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}
diff --git a/templates/index.html b/templates/index.html
index fc3ded76..41e4867d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -76,10 +76,10 @@
 	{{ config.ad.bottom }}
 
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+			<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+		<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
 
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
diff --git a/templates/page.html b/templates/page.html
index cb35d76a..13753c03 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -22,10 +22,10 @@
 	{{ body }}
 	<hr>
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+			<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+		<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
 	</footer>
 </body>
 </html>
diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html
index 0804faf7..8cdaf182 100644
--- a/templates/themes/basic/index.html
+++ b/templates/themes/basic/index.html
@@ -38,10 +38,10 @@
 	
 	<hr/>
         <footer>
-                <p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-                        <a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-                <br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
-                <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+                <p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+                        <a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+                <br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
+                <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
         </footer>
 </body>
 </html>
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 381b1924..914825af 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -76,10 +76,10 @@
 	
 	<hr/>
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+			<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+		<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
 	</footer>
 	<script type="text/javascript">{% raw %}
 		var styles = {
diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 95b330b6..4ce65128 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -32,10 +32,10 @@
 	</div>
 	
         <footer>
-                <p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-                        <a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-                <br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
-                <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+                <p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+                        <a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+                <br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
+                <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
         </footer>
 </body>
 </html>
diff --git a/templates/themes/frameset/news.html b/templates/themes/frameset/news.html
index 9f779b74..320c64d3 100644
--- a/templates/themes/frameset/news.html
+++ b/templates/themes/frameset/news.html
@@ -31,10 +31,10 @@
 	</div>
 	
         <footer>
-                <p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-                        <a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-                <br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
-                <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+                <p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+                        <a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+                <br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
+                <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
         </footer>
 </body>
 </html>
diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html
index 75880484..208c1088 100644
--- a/templates/themes/recent/recent.html
+++ b/templates/themes/recent/recent.html
@@ -55,10 +55,10 @@
 	
 	<hr/>
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+			<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+		<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
 	</footer>
 </body>
 </html>
diff --git a/templates/thread.html b/templates/thread.html
index de0bf5e7..b7bb5f6b 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -55,10 +55,10 @@
 	{{ config.ad.bottom }}
 
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
-			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+			<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+		<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}
-- 
cgit v1.3


From 77176faececfceceb4c35eb4bfa80a99ed76a677 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 09:56:54 +0200
Subject: enable javascript in mod panel

---
 inc/functions.php   | 2 +-
 inc/mod/pages.php   | 4 ++--
 templates/page.html | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 462bc173..c50336ae 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -880,7 +880,7 @@ function displayBan($ban) {
 		Element('page.html', array(
 			'title' => _('Banned!'),
 			'config' => $config,
-			'nojavascript' => true,
+			'boardlist' => createBoardlist($mod),
 			'body' => Element('banned.html', array(
 				'config' => $config,
 				'ban' => $ban,
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 8b6f73c4..8380cfd3 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -15,7 +15,7 @@ function mod_page($title, $template, $args, $subtitle = false) {
 		'hide_dashboard_link' => $template == 'mod/dashboard.html',
 		'title' => $title,
 		'subtitle' => $subtitle,
-		'nojavascript' => true,
+		'boardlist' => createBoardlist($mod),
 		'body' => Element($template,
 				array_merge(
 					array('config' => $config, 'mod' => $mod), 
@@ -846,7 +846,7 @@ function mod_page_ip($ip) {
 	
 	$args['security_token'] = make_secure_link_token('IP/' . $ip);
 	
-	mod_page(sprintf('%s: %s', _('IP'), $ip), 'mod/view_ip.html', $args, $args['hostname']);
+	mod_page(sprintf('%s: %s', _('IP'), htmlspecialchars($ip)), 'mod/view_ip.html', $args, $args['hostname']);
 }
 
 function mod_ban() {
diff --git a/templates/page.html b/templates/page.html
index 13753c03..3522702f 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -9,6 +9,8 @@
 	<title>{{ title }}</title>
 </head>
 <body>
+        {{ 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 %}
 	<header>
 		<h1>{{ title }}</h1>
-- 
cgit v1.3


From c4b98e94cee5cb6bf89aea8dc36253ce754c6dcd Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 10:17:14 +0200
Subject: [SECURITY] harden for imagetragick (we aren`t hit by the bug, but we
 were passing uncommon filetypes, like JPEG2000, directly to imagemagick)

---
 post.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/post.php b/post.php
index 5c755a3c..dc303785 100644
--- a/post.php
+++ b/post.php
@@ -639,6 +639,9 @@ if (isset($_POST['delete'])) {
 			if (!$size = @getimagesize($file['tmp_name'])) {
 				error($config['error']['invalidimg']);
 			}
+			if (!in_array($size[2], array(IMAGETYPE_PNG, IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_BMP))) {
+				error($config['error']['invalidimg']);
+			}
 			if ($size[0] > $config['max_width'] || $size[1] > $config['max_height']) {
 				error($config['error']['maxsize']);
 			}
-- 
cgit v1.3


From 4c827cf1059513aadf01c7f82284bc6ce4d0cd61 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 10:22:34 +0200
Subject: fix some nonsense

---
 post.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/post.php b/post.php
index dc303785..b41b4b63 100644
--- a/post.php
+++ b/post.php
@@ -625,12 +625,14 @@ if (isset($_POST['delete'])) {
 	
 	if ($post['has_file']) {	
 		foreach ($post['files'] as $key => &$file) {
-		if ($file['is_an_image'] && $config['ie_mime_type_detection'] !== false) {
-			// Check IE MIME type detection XSS exploit
-			$buffer = file_get_contents($upload, null, null, null, 255);
-			if (preg_match($config['ie_mime_type_detection'], $buffer)) {
-				undoImage($post);
-				error($config['error']['mime_exploit']);
+		if ($file['is_an_image']) {
+			if ($config['ie_mime_type_detection'] !== false) {
+				// Check IE MIME type detection XSS exploit
+				$buffer = file_get_contents($upload, null, null, null, 255);
+				if (preg_match($config['ie_mime_type_detection'], $buffer)) {
+					undoImage($post);
+					error($config['error']['mime_exploit']);
+				}
 			}
 			
 			require_once 'inc/image.php';
-- 
cgit v1.3


From 19b70663d7e786fca0425b53eb79412fd5987255 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 10:29:13 +0200
Subject: remove magic_quotes check; it`s 2016 after all

---
 mod.php  | 10 ----------
 post.php | 12 +-----------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/mod.php b/mod.php
index 5697e2b5..c005dcb5 100644
--- a/mod.php
+++ b/mod.php
@@ -12,16 +12,6 @@ require_once 'inc/mod/auth.php';
 if ($config['debug'])
 	$parse_start_time = microtime(true);
 
-// Fix for magic quotes
-if (get_magic_quotes_gpc()) {
-	function strip_array($var) {
-		return is_array($var) ? array_map('strip_array', $var) : stripslashes($var);
-	}
-	
-	$_GET = strip_array($_GET);
-	$_POST = strip_array($_POST);
-}
-
 $query = isset($_SERVER['QUERY_STRING']) ? rawurldecode($_SERVER['QUERY_STRING']) : '';
 
 $pages = array(
diff --git a/post.php b/post.php
index b41b4b63..04665177 100644
--- a/post.php
+++ b/post.php
@@ -7,16 +7,6 @@ require_once 'inc/functions.php';
 require_once 'inc/anti-bot.php';
 require_once 'inc/bans.php';
 
-// Fix for magic quotes
-if (get_magic_quotes_gpc()) {
-	function strip_array($var) {
-		return is_array($var) ? array_map('strip_array', $var) : stripslashes($var);
-	}
-	
-	$_GET = strip_array($_GET);
-	$_POST = strip_array($_POST);
-}
-
 if ((!isset($_POST['mod']) || !$_POST['mod']) && $config['board_locked']) {
     error("Board is locked");
 }
@@ -447,7 +437,7 @@ if (isset($_POST['delete'])) {
 		$i = 0;
 		foreach ($_FILES as $key => $file) {
 			if ($file['size'] && $file['tmp_name']) {
-				$file['filename'] = urldecode(get_magic_quotes_gpc() ? stripslashes($file['name']) : $file['name']);
+				$file['filename'] = urldecode($file['name']);
 				$file['extension'] = strtolower(mb_substr($file['filename'], mb_strrpos($file['filename'], '.') + 1));
 				if (isset($config['filename_func']))
 					$file['file_id'] = $config['filename_func']($file);
-- 
cgit v1.3


From abe4bdd6aeb28566f3bca4385f110f6e7bf759d8 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 10:52:58 +0200
Subject: fixup

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

diff --git a/inc/api.php b/inc/api.php
index 9483200e..b2d8adec 100644
--- a/inc/api.php
+++ b/inc/api.php
@@ -92,7 +92,7 @@ class Api {
 		$dotPos = strrpos($file->file, '.');
 		$apiPost['ext'] = substr($file->file, $dotPos);
 		$apiPost['tim'] = substr($file->file, 0, $dotPos);
-		if (isset ($file->hash) && $post->filehash) {
+		if (isset ($file->hash) && $file->hash) {
 			$apiPost['md5'] = base64_encode(hex2bin($file->hash));
 		}
 		else if (isset ($post->filehash) && $post->filehash) {
-- 
cgit v1.3


From 186ad5ca86ae2255bbe0d6846a390963d63ae9e9 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 10:53:44 +0200
Subject: bsd fixup

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

diff --git a/post.php b/post.php
index 5c755a3c..4c944178 100644
--- a/post.php
+++ b/post.php
@@ -573,7 +573,7 @@ if (isset($_POST['delete'])) {
 	
 	if ($post['has_file']) {
 		$md5cmd = false;
-		if ($config['bsd_md5'])  $md5cmd = 'md5 -r';
+		if ($config['bsd_md5'])  $md5cmd = '/sbin/md5 -r';
 		if ($config['gnu_md5'])  $md5cmd = 'md5sum';
 
 		$allhashes = '';
-- 
cgit v1.3


From 93f748e6a83964cf40a22073acd0e2511eb4ca0b Mon Sep 17 00:00:00 2001
From: 8chan Admin <admin@8chan.co>
Date: Thu, 13 Feb 2014 01:04:32 +0000
Subject: Security: capitalization of mods username is significant

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

diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index d877b89f..7f98e8a9 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -76,7 +76,7 @@ function generate_salt() {
 function login($username, $password) {
 	global $mod, $config;
 	
-	$query = prepare("SELECT `id`, `type`, `boards`, `password`, `version` FROM ``mods`` WHERE `username` = :username");
+	$query = prepare("SELECT `id`, `type`, `boards`, `password`, `version` FROM ``mods`` WHERE BINARY `username` = :username");
 	$query->bindValue(':username', $username);
 	$query->execute() or error(db_error($query));
 	
-- 
cgit v1.3


From 3eb755ee7e0ec65d91377e13f0faf06657035e5a Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Wed, 31 Dec 2014 22:35:21 -0800
Subject: Move login check in inc/mod/auth.php to a function

This allows pages like create.php to not include inc/mod/pages.php while still being able to use the mod auth functions (like generating salts and passwords)
---
 inc/mod/auth.php | 79 +++++++++++++++++++++++++++++++++-----------------------
 mod.php          |  2 ++
 post.php         |  1 +
 3 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index 7f98e8a9..8bfaea8f 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -146,39 +146,6 @@ function modLog($action, $_board=null) {
 		_syslog(LOG_INFO, '[mod/' . $mod['username'] . ']: ' . $action);
 }
 
-// Validate session
-
-if (isset($_COOKIE[$config['cookies']['mod']])) {
-	// Should be username:hash:salt
-	$cookie = explode(':', $_COOKIE[$config['cookies']['mod']]);
-	if (count($cookie) != 3) {
-		// Malformed cookies
-		destroyCookies();
-		mod_login();
-		exit;
-	}
-	
-	$query = prepare("SELECT `id`, `type`, `boards`, `password` FROM ``mods`` WHERE `username` = :username");
-	$query->bindValue(':username', $cookie[0]);
-	$query->execute() or error(db_error($query));
-	$user = $query->fetch(PDO::FETCH_ASSOC);
-	
-	// validate password hash
-	if ($cookie[1] !== mkhash($cookie[0], $user['password'], $cookie[2])) {
-		// Malformed cookies
-		destroyCookies();
-		mod_login();
-		exit;
-	}
-	
-	$mod = array(
-		'id' => $user['id'],
-		'type' => $user['type'],
-		'username' => $cookie[0],
-		'boards' => explode(',', $user['boards'])
-	);
-}
-
 function create_pm_header() {
 	global $mod, $config;
 	
@@ -212,4 +179,50 @@ function make_secure_link_token($uri) {
 	return substr(sha1($config['cookies']['salt'] . '-' . $uri . '-' . $mod['id']), 0, 8);
 }
 
+function check_login($prompt = false) {
+	global $config, $mod;
+	// Validate session
+	if (isset($_COOKIE[$config['cookies']['mod']])) {
+		// Should be username:hash:salt
+		$cookie = explode(':', $_COOKIE[$config['cookies']['mod']]);
+		if (count($cookie) != 3) {
+			// Malformed cookies
+			destroyCookies();
+			if ($prompt) mod_login();
+			exit;
+		}
+		
+		$query = prepare("SELECT `id`, `type`, `boards`, `password` FROM ``mods`` WHERE `username` = :username");
+		$query->bindValue(':username', $cookie[0]);
+		$query->execute() or error(db_error($query));
+		$user = $query->fetch(PDO::FETCH_ASSOC);
+		
+		// validate password hash
+		if ($cookie[1] !== mkhash($cookie[0], $user['password'], $cookie[2])) {
+			// Malformed cookies
+			destroyCookies();
+			if ($prompt) mod_login();
+			exit;
+		}
+		
+		$mod = array(
+			'id' => $user['id'],
+			'type' => $user['type'],
+			'username' => $cookie[0],
+			'boards' => explode(',', $user['boards'])
+		);
+	}
+
+	if ($config['debug'])
+		$parse_start_time = microtime(true);
 
+	// Fix for magic quotes
+	if (get_magic_quotes_gpc()) {
+		function strip_array($var) {
+			return is_array($var) ? array_map('strip_array', $var) : stripslashes($var);
+		}
+		
+		$_GET = strip_array($_GET);
+		$_POST = strip_array($_POST);
+	}
+}
diff --git a/mod.php b/mod.php
index c005dcb5..022f5408 100644
--- a/mod.php
+++ b/mod.php
@@ -12,6 +12,8 @@ require_once 'inc/mod/auth.php';
 if ($config['debug'])
 	$parse_start_time = microtime(true);
 
+check_login(true);
+
 $query = isset($_SERVER['QUERY_STRING']) ? rawurldecode($_SERVER['QUERY_STRING']) : '';
 
 $pages = array(
diff --git a/post.php b/post.php
index 6e893747..1c511f9c 100644
--- a/post.php
+++ b/post.php
@@ -216,6 +216,7 @@ if (isset($_POST['delete'])) {
 
 	if ($post['mod'] = isset($_POST['mod']) && $_POST['mod']) {
 		require 'inc/mod/auth.php';
+		check_login(false);
 		if (!$mod) {
 			// Liar. You're not a mod.
 			error($config['error']['notamod']);
-- 
cgit v1.3


From cd01191072abc5dfe07245c768a39e3977d612bd Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 11:45:29 +0200
Subject: those parts are extraneous

---
 inc/mod/auth.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index 8bfaea8f..009e93ad 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -212,17 +212,4 @@ function check_login($prompt = false) {
 			'boards' => explode(',', $user['boards'])
 		);
 	}
-
-	if ($config['debug'])
-		$parse_start_time = microtime(true);
-
-	// Fix for magic quotes
-	if (get_magic_quotes_gpc()) {
-		function strip_array($var) {
-			return is_array($var) ? array_map('strip_array', $var) : stripslashes($var);
-		}
-		
-		$_GET = strip_array($_GET);
-		$_POST = strip_array($_POST);
-	}
 }
-- 
cgit v1.3


From e2016340e1948543d5ee9e08fe4945845c3f908e Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Tue, 21 Apr 2015 07:07:34 -0700
Subject: Fix expand-too-long error with new <p> markup

---
 js/expand-too-long.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/expand-too-long.js b/js/expand-too-long.js
index d6ea43af..bbadb5f1 100644
--- a/js/expand-too-long.js
+++ b/js/expand-too-long.js
@@ -17,7 +17,7 @@ $(function() {
 			e.preventDefault();
 
 			var url = $(this).attr('href');
-			var body = $(this).parent().parent();
+			var body = $(this).parents('.body');
 
 			$.ajax({
 				url: url,
-- 
cgit v1.3


From 4f96263e3b72124df7b152e5dd2b513683fda818 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Tue, 21 Oct 2014 21:06:34 -0700
Subject: Upgrade jQuery mixitup, preserve settings, no animations

---
 js/catalog.js                         |  25 +++++++-
 js/jquery.mixitup.min.js              | 106 +++++++++++++++++++++-------------
 templates/themes/catalog/catalog.html |  27 ++++-----
 3 files changed, 98 insertions(+), 60 deletions(-)

diff --git a/js/catalog.js b/js/catalog.js
index 768845f6..386557d9 100644
--- a/js/catalog.js
+++ b/js/catalog.js
@@ -1,8 +1,17 @@
 if (active_page == 'catalog') $(function(){
 
+	if (localStorage.catalog !== undefined) {
+		var catalog = JSON.parse(localStorage.catalog);
+	} else {
+		var catalog = {};
+		localStorage.catalog = JSON.stringify(catalog);
+	}
+
 	$("#sort_by").change(function(){
 		var value = this.value;
-		$("#sort-"+value).trigger("click");
+		$('#Grid').mixItUp('sort', value);
+		catalog.sort_by = value;
+		localStorage.catalog = JSON.stringify(catalog);
 	});
 
 	$("#image_size").change(function(){
@@ -11,9 +20,21 @@ if (active_page == 'catalog') $(function(){
 		$(".grid-li").removeClass("grid-size-small");
 		$(".grid-li").removeClass("grid-size-large");
 		$(".grid-li").addClass("grid-size-"+value);
+		catalog.image_size = value;
+		localStorage.catalog = JSON.stringify(catalog);
 	});
 
-	$('#Grid').mixitup({
+	$('#Grid').mixItUp({
+		animation: {
+			enable: false
+		},
 	});
 
+	if (catalog.sort_by !== undefined) {
+		$('#sort_by').val(catalog.sort_by).trigger('change');
+	}
+	if (catalog.image_size !== undefined) {
+		$('#image_size').val(catalog.image_size).trigger('change');
+	}
+
 });
diff --git a/js/jquery.mixitup.min.js b/js/jquery.mixitup.min.js
index 5b4e4ce0..719424a2 100644
--- a/js/jquery.mixitup.min.js
+++ b/js/jquery.mixitup.min.js
@@ -1,43 +1,67 @@
 /*
-* MIXITUP - A CSS3 and JQuery Filter & Sort Plugin
-* Version: 1.5.5
-* License: Creative Commons Attribution-NoDerivs 3.0 Unported - CC BY-ND 3.0
-* http://creativecommons.org/licenses/by-nd/3.0/
-* This software may be used freely on commercial and non-commercial projects with attribution to the author/copyright holder.
-* Author: Patrick Kunka
-* Copyright 2012-2013 Patrick Kunka, Barrel LLC, All Rights Reserved
-* 
-* http://mixitup.io
-*/
+ Copyright 2014 KunkaLabs Limited.
+ @author    KunkaLabs Limited.
+ @link      https://mixitup.kunkalabs.com
+
+ @license   Commercial use requires a commercial license.
+            https://mixitup.kunkalabs.com/licenses/
 
-(function(d){function r(e,c,l,b,a){function f(){n.unbind("webkitTransitionEnd transitionend otransitionend oTransitionEnd");c&&x(c,l,b,a);a.startOrder=[];a.newOrder=[];a.origSort=[];a.checkSort=[];v.removeStyle(a.prefix+"filter, filter, "+a.prefix+"transform, transform, opacity, display").css(a.clean).removeAttr("data-checksum");window.atob||v.css({display:"none",opacity:"0"});n.removeStyle(a.prefix+"transition, transition, "+a.prefix+"perspective, perspective, "+a.prefix+"perspective-origin, perspective-origin, "+
-(a.resizeContainer?"height":""));"list"==a.layoutMode?(p.css({display:a.targetDisplayList,opacity:"1"}),a.origDisplay=a.targetDisplayList):(p.css({display:a.targetDisplayGrid,opacity:"1"}),a.origDisplay=a.targetDisplayGrid);a.origLayout=a.layoutMode;setTimeout(function(){v.removeStyle(a.prefix+"transition, transition");a.mixing=!1;if("function"==typeof a.onMixEnd){var b=a.onMixEnd.call(this,a);a=b?b:a}})}clearInterval(a.failsafe);a.mixing=!0;a.filter=e;if("function"==typeof a.onMixStart){var g=a.onMixStart.call(this,
-a);a=g?g:a}for(var k=a.transitionSpeed,g=0;2>g;g++){var h=0==g?h=a.prefix:"";a.transition[h+"transition"]="all "+k+"ms linear";a.transition[h+"transform"]=h+"translate3d(0,0,0)";a.perspective[h+"perspective"]=a.perspectiveDistance+"px";a.perspective[h+"perspective-origin"]=a.perspectiveOrigin}var w=a.targetSelector,v=b.find(w);v.each(function(){this.data={}});var n=v.parent();n.css(a.perspective);a.easingFallback="ease-in-out";"smooth"==a.easing&&(a.easing="cubic-bezier(0.25, 0.46, 0.45, 0.94)");
-"snap"==a.easing&&(a.easing="cubic-bezier(0.77, 0, 0.175, 1)");"windback"==a.easing&&(a.easing="cubic-bezier(0.175, 0.885, 0.320, 1.275)",a.easingFallback="cubic-bezier(0.175, 0.885, 0.320, 1)");"windup"==a.easing&&(a.easing="cubic-bezier(0.6, -0.28, 0.735, 0.045)",a.easingFallback="cubic-bezier(0.6, 0.28, 0.735, 0.045)");g="list"==a.layoutMode&&null!=a.listEffects?a.listEffects:a.effects;Array.prototype.indexOf&&(a.fade=-1<g.indexOf("fade")?"0":"",a.scale=-1<g.indexOf("scale")?"scale(.01)":"",a.rotateZ=
--1<g.indexOf("rotateZ")?"rotate(180deg)":"",a.rotateY=-1<g.indexOf("rotateY")?"rotateY(90deg)":"",a.rotateX=-1<g.indexOf("rotateX")?"rotateX(90deg)":"",a.blur=-1<g.indexOf("blur")?"blur(8px)":"",a.grayscale=-1<g.indexOf("grayscale")?"grayscale(100%)":"");var p=d(),s=d(),t=[],r=!1;"string"===typeof e?t=z(e):(r=!0,d.each(e,function(a){t[a]=z(this)}));"or"==a.filterLogic?(""==t[0]&&t.shift(),1>t.length?s=s.add(b.find(w+":visible")):v.each(function(){var a=d(this);if(r){var b=0;d.each(t,function(d){this.length?
-a.is("."+this.join(", ."))&&b++:0<b&&b++});b==t.length?p=p.add(a):s=s.add(a)}else a.is("."+t.join(", ."))?p=p.add(a):s=s.add(a)})):(p=p.add(n.find(w+"."+t.join("."))),s=s.add(n.find(w+":not(."+t.join(".")+"):visible")));e=p.length;var u=d(),q=d(),m=d();s.each(function(){var a=d(this);"none"!=a.css("display")&&(u=u.add(a),m=m.add(a))});if(p.filter(":visible").length==e&&!u.length&&!c){if(a.origLayout==a.layoutMode)return f(),!1;if(1==p.length)return"list"==a.layoutMode?(b.addClass(a.listClass),b.removeClass(a.gridClass),
-m.css("display",a.targetDisplayList)):(b.addClass(a.gridClass),b.removeClass(a.listClass),m.css("display",a.targetDisplayGrid)),f(),!1}a.origHeight=n.height();if(p.length){b.removeClass(a.failClass);p.each(function(){var a=d(this);"none"==a.css("display")?q=q.add(a):m=m.add(a)});if(a.origLayout!=a.layoutMode&&!1==a.animateGridList)return"list"==a.layoutMode?(b.addClass(a.listClass),b.removeClass(a.gridClass),m.css("display",a.targetDisplayList)):(b.addClass(a.gridClass),b.removeClass(a.listClass),
-m.css("display",a.targetDisplayGrid)),f(),!1;if(!window.atob)return f(),!1;v.css(a.clean);m.each(function(){this.data.origPos=d(this).offset()});"list"==a.layoutMode?(b.addClass(a.listClass),b.removeClass(a.gridClass),q.css("display",a.targetDisplayList)):(b.addClass(a.gridClass),b.removeClass(a.listClass),q.css("display",a.targetDisplayGrid));q.each(function(){this.data.showInterPos=d(this).offset()});u.each(function(){this.data.hideInterPos=d(this).offset()});m.each(function(){this.data.preInterPos=
-d(this).offset()});"list"==a.layoutMode?m.css("display",a.targetDisplayList):m.css("display",a.targetDisplayGrid);c&&x(c,l,b,a);if(c&&A(a.origSort,a.checkSort))return f(),!1;u.hide();q.each(function(a){this.data.finalPos=d(this).offset()});m.each(function(){this.data.finalPrePos=d(this).offset()});a.newHeight=n.height();c&&x("reset",null,b,a);q.hide();m.css("display",a.origDisplay);"block"==a.origDisplay?(b.addClass(a.listClass),q.css("display",a.targetDisplayList)):(b.removeClass(a.listClass),q.css("display",
-a.targetDisplayGrid));a.resizeContainer&&n.css("height",a.origHeight+"px");e={};for(g=0;2>g;g++)h=0==g?h=a.prefix:"",e[h+"transform"]=a.scale+" "+a.rotateX+" "+a.rotateY+" "+a.rotateZ,e[h+"filter"]=a.blur+" "+a.grayscale;q.css(e);m.each(function(){var b=this.data,c=d(this);c.hasClass("mix_tohide")?(b.preTX=b.origPos.left-b.hideInterPos.left,b.preTY=b.origPos.top-b.hideInterPos.top):(b.preTX=b.origPos.left-b.preInterPos.left,b.preTY=b.origPos.top-b.preInterPos.top);for(var e={},k=0;2>k;k++){var h=
-0==k?h=a.prefix:"";e[h+"transform"]="translate("+b.preTX+"px,"+b.preTY+"px)"}c.css(e)});"list"==a.layoutMode?(b.addClass(a.listClass),b.removeClass(a.gridClass)):(b.addClass(a.gridClass),b.removeClass(a.listClass));setTimeout(function(){if(a.resizeContainer){for(var b={},c=0;2>c;c++){var e=0==c?e=a.prefix:"";b[e+"transition"]="all "+k+"ms ease-in-out";b.height=a.newHeight+"px"}n.css(b)}u.css("opacity",a.fade);q.css("opacity",1);q.each(function(){var b=this.data;b.tX=b.finalPos.left-b.showInterPos.left;
-b.tY=b.finalPos.top-b.showInterPos.top;for(var c={},e=0;2>e;e++){var h=0==e?h=a.prefix:"";c[h+"transition-property"]=h+"transform, "+h+"filter, opacity";c[h+"transition-timing-function"]=a.easing+", linear, linear";c[h+"transition-duration"]=k+"ms";c[h+"transition-delay"]="0";c[h+"transform"]="translate("+b.tX+"px,"+b.tY+"px)";c[h+"filter"]="none"}d(this).css("-webkit-transition","all "+k+"ms "+a.easingFallback).css(c)});m.each(function(){var b=this.data;b.tX=0!=b.finalPrePos.left?b.finalPrePos.left-
-b.preInterPos.left:0;b.tY=0!=b.finalPrePos.left?b.finalPrePos.top-b.preInterPos.top:0;for(var c={},e=0;2>e;e++){var h=0==e?h=a.prefix:"";c[h+"transition"]="all "+k+"ms "+a.easing;c[h+"transform"]="translate("+b.tX+"px,"+b.tY+"px)"}d(this).css("-webkit-transition","all "+k+"ms "+a.easingFallback).css(c)});b={};for(c=0;2>c;c++)e=0==c?e=a.prefix:"",b[e+"transition"]="all "+k+"ms "+a.easing+", "+e+"filter "+k+"ms linear, opacity "+k+"ms linear",b[e+"transform"]=a.scale+" "+a.rotateX+" "+a.rotateY+" "+
-a.rotateZ,b[e+"filter"]=a.blur+" "+a.grayscale,b.opacity=a.fade;u.css(b);n.bind("webkitTransitionEnd transitionend otransitionend oTransitionEnd",function(a){if(-1<a.originalEvent.propertyName.indexOf("transform")||-1<a.originalEvent.propertyName.indexOf("opacity"))-1<w.indexOf(".")?d(a.target).hasClass(w.replace(".",""))&&f():d(a.target).is(w)&&f()})},10);a.failsafe=setTimeout(function(){a.mixing&&f()},k+400)}else{a.resizeContainer&&n.css("height",a.origHeight+"px");if(!window.atob)return f(),!1;
-u=s;setTimeout(function(){n.css(a.perspective);if(a.resizeContainer){for(var c={},e=0;2>e;e++){var d=0==e?d=a.prefix:"";c[d+"transition"]="height "+k+"ms ease-in-out";c.height=a.minHeight+"px"}n.css(c)}v.css(a.transition);if(s.length){c={};for(e=0;2>e;e++)d=0==e?d=a.prefix:"",c[d+"transform"]=a.scale+" "+a.rotateX+" "+a.rotateY+" "+a.rotateZ,c[d+"filter"]=a.blur+" "+a.grayscale,c.opacity=a.fade;u.css(c);n.bind("webkitTransitionEnd transitionend otransitionend oTransitionEnd",function(c){if(-1<c.originalEvent.propertyName.indexOf("transform")||
--1<c.originalEvent.propertyName.indexOf("opacity"))b.addClass(a.failClass),f()})}else a.mixing=!1},10)}}function x(e,c,l,b){function a(a,b){var c=isNaN(1*a.attr(e))?a.attr(e).toLowerCase():1*a.attr(e),d=isNaN(1*b.attr(e))?b.attr(e).toLowerCase():1*b.attr(e);return c<d?-1:c>d?1:0}function f(a){"asc"==c?k.prepend(a).prepend(" "):k.append(a).append(" ")}function g(a){a=a.slice();for(var b=a.length,c=b;c--;){var e=parseInt(Math.random()*b),d=a[c];a[c]=a[e];a[e]=d}return a}l.find(b.targetSelector).wrapAll('<div class="mix_sorter"/>');
-var k=l.find(".mix_sorter");b.origSort.length||k.find(b.targetSelector+":visible").each(function(){d(this).wrap("<s/>");b.origSort.push(d(this).parent().html().replace(/\s+/g,""));d(this).unwrap()});k.empty();if("reset"==e)d.each(b.startOrder,function(){k.append(this).append(" ")});else if("default"==e)d.each(b.origOrder,function(){f(this)});else if("random"==e)b.newOrder.length||(b.newOrder=g(b.startOrder)),d.each(b.newOrder,function(){k.append(this).append(" ")});else if("custom"==e)d.each(c,function(){f(this)});
-else{if("undefined"===typeof b.origOrder[0].attr(e))return console.log("No such attribute found. Terminating"),!1;b.newOrder.length||(d.each(b.origOrder,function(){b.newOrder.push(d(this))}),b.newOrder.sort(a));d.each(b.newOrder,function(){f(this)})}b.checkSort=[];k.find(b.targetSelector+":visible").each(function(a){var c=d(this);0==a&&c.attr("data-checksum","1");c.wrap("<s/>");b.checkSort.push(c.parent().html().replace(/\s+/g,""));c.unwrap()});l.find(b.targetSelector).unwrap()}function B(e){for(var c=
-["Webkit","Moz","O","ms"],d=0;d<c.length;d++)if(c[d]+"Transition"in e.style)return c[d];return"transition"in e.style?"":!1}function A(e,c){if(e.length!=c.length)return!1;for(var d=0;d<c.length;d++)if(e[d].compare&&!e[d].compare(c[d])||e[d]!==c[d])return!1;return!0}function z(e){e=e.replace(/\s{2,}/g," ");var c=e.split(" ");d.each(c,function(d){"all"==this&&(c[d]="mix_all")});""==c[0]&&c.shift();return c}var y={init:function(e){return this.each(function(){var c=window.navigator.appVersion.match(/Chrome\/(\d+)\./),
-c=c?parseInt(c[1],10):!1,l=function(a){a=document.getElementById(a);var b=a.parentElement,c=document.createElement("div"),d=document.createDocumentFragment();b.insertBefore(c,a);d.appendChild(a);b.replaceChild(a,c)};(c&&31==c||32==c)&&l(this.id);var b={targetSelector:".mix",filterSelector:".filter",sortSelector:".sort",buttonEvent:"click",effects:["fade","scale"],listEffects:null,easing:"smooth",layoutMode:"grid",targetDisplayGrid:"inline-block",targetDisplayList:"block",listClass:"",gridClass:"",
-transitionSpeed:600,showOnLoad:"all",sortOnLoad:!1,multiFilter:!1,filterLogic:"or",resizeContainer:!0,minHeight:0,failClass:"fail",perspectiveDistance:"3000",perspectiveOrigin:"50% 50%",animateGridList:!0,onMixLoad:null,onMixStart:null,onMixEnd:null,container:null,origOrder:[],startOrder:[],newOrder:[],origSort:[],checkSort:[],filter:"",mixing:!1,origDisplay:"",origLayout:"",origHeight:0,newHeight:0,isTouch:!1,resetDelay:0,failsafe:null,prefix:"",easingFallback:"ease-in-out",transition:{},perspective:{},
-clean:{},fade:"1",scale:"",rotateX:"",rotateY:"",rotateZ:"",blur:"",grayscale:""};e&&d.extend(b,e);this.config=b;d.support.touch="ontouchend"in document;d.support.touch&&(b.isTouch=!0,b.resetDelay=350);b.container=d(this);var a=b.container;b.prefix=B(a[0]);b.prefix=b.prefix?"-"+b.prefix.toLowerCase()+"-":"";a.find(b.targetSelector).each(function(){b.origOrder.push(d(this))});if(b.sortOnLoad){var f;d.isArray(b.sortOnLoad)?(c=b.sortOnLoad[0],f=b.sortOnLoad[1],d(b.sortSelector+"[data-sort="+b.sortOnLoad[0]+
-"][data-order="+b.sortOnLoad[1]+"]").addClass("active")):(d(b.sortSelector+"[data-sort="+b.sortOnLoad+"]").addClass("active"),c=b.sortOnLoad,b.sortOnLoad="desc");x(c,f,a,b)}for(f=0;2>f;f++)c=0==f?c=b.prefix:"",b.transition[c+"transition"]="all "+b.transitionSpeed+"ms ease-in-out",b.perspective[c+"perspective"]=b.perspectiveDistance+"px",b.perspective[c+"perspective-origin"]=b.perspectiveOrigin;for(f=0;2>f;f++)c=0==f?c=b.prefix:"",b.clean[c+"transition"]="none";"list"==b.layoutMode?(a.addClass(b.listClass),
-b.origDisplay=b.targetDisplayList):(a.addClass(b.gridClass),b.origDisplay=b.targetDisplayGrid);b.origLayout=b.layoutMode;f=b.showOnLoad.split(" ");d.each(f,function(){d(b.filterSelector+'[data-filter="'+this+'"]').addClass("active")});a.find(b.targetSelector).addClass("mix_all");"all"==f[0]&&(f[0]="mix_all",b.showOnLoad="mix_all");var g=d();d.each(f,function(){g=g.add(d("."+this))});g.each(function(){var a=d(this);"list"==b.layoutMode?a.css("display",b.targetDisplayList):a.css("display",b.targetDisplayGrid);
-a.css(b.transition)});setTimeout(function(){b.mixing=!0;g.css("opacity","1");setTimeout(function(){"list"==b.layoutMode?g.removeStyle(b.prefix+"transition, transition").css({display:b.targetDisplayList,opacity:1}):g.removeStyle(b.prefix+"transition, transition").css({display:b.targetDisplayGrid,opacity:1});b.mixing=!1;if("function"==typeof b.onMixLoad){var a=b.onMixLoad.call(this,b);b=a?a:b}},b.transitionSpeed)},10);b.filter=b.showOnLoad;d(b.sortSelector).bind(b.buttonEvent,function(){if(!b.mixing){var c=
-d(this),e=c.attr("data-sort"),f=c.attr("data-order");if(!c.hasClass("active"))d(b.sortSelector).removeClass("active"),c.addClass("active");else if("random"!=e)return!1;a.find(b.targetSelector).each(function(){b.startOrder.push(d(this))});r(b.filter,e,f,a,b)}});d(b.filterSelector).bind(b.buttonEvent,function(){if(!b.mixing){var c=d(this);if(!1==b.multiFilter)d(b.filterSelector).removeClass("active"),c.addClass("active"),b.filter=c.attr("data-filter"),d(b.filterSelector+'[data-filter="'+b.filter+'"]').addClass("active");
-else{var e=c.attr("data-filter");c.hasClass("active")?(c.removeClass("active"),b.filter=b.filter.replace(RegExp("(\\s|^)"+e),"")):(c.addClass("active"),b.filter=b.filter+" "+e)}r(b.filter,null,null,a,b)}})})},toGrid:function(){return this.each(function(){var e=this.config;"grid"!=e.layoutMode&&(e.layoutMode="grid",r(e.filter,null,null,d(this),e))})},toList:function(){return this.each(function(){var e=this.config;"list"!=e.layoutMode&&(e.layoutMode="list",r(e.filter,null,null,d(this),e))})},filter:function(e){return this.each(function(){var c=
-this.config;c.mixing||(d(c.filterSelector).removeClass("active"),d(c.filterSelector+'[data-filter="'+e+'"]').addClass("active"),r(e,null,null,d(this),c))})},sort:function(e){return this.each(function(){var c=this.config,l=d(this);if(!c.mixing){d(c.sortSelector).removeClass("active");if(d.isArray(e)){var b=e[0],a=e[1];d(c.sortSelector+'[data-sort="'+e[0]+'"][data-order="'+e[1]+'"]').addClass("active")}else d(c.sortSelector+'[data-sort="'+e+'"]').addClass("active"),b=e,a="desc";l.find(c.targetSelector).each(function(){c.startOrder.push(d(this))});
-r(c.filter,b,a,l,c)}})},multimix:function(e){return this.each(function(){var c=this.config,l=d(this);multiOut={filter:c.filter,sort:null,order:"desc",layoutMode:c.layoutMode};d.extend(multiOut,e);c.mixing||(d(c.filterSelector).add(c.sortSelector).removeClass("active"),d(c.filterSelector+'[data-filter="'+multiOut.filter+'"]').addClass("active"),"undefined"!==typeof multiOut.sort&&(d(c.sortSelector+'[data-sort="'+multiOut.sort+'"][data-order="'+multiOut.order+'"]').addClass("active"),l.find(c.targetSelector).each(function(){c.startOrder.push(d(this))})),
-c.layoutMode=multiOut.layoutMode,r(multiOut.filter,multiOut.sort,multiOut.order,l,c))})},remix:function(e){return this.each(function(){var c=this.config,l=d(this);c.origOrder=[];l.find(c.targetSelector).each(function(){var b=d(this);b.addClass("mix_all");c.origOrder.push(b)});c.mixing||"undefined"===typeof e||(d(c.filterSelector).removeClass("active"),d(c.filterSelector+'[data-filter="'+e+'"]').addClass("active"),r(e,null,null,l,c))})}};d.fn.mixitup=function(d,c){if(y[d])return y[d].apply(this,Array.prototype.slice.call(arguments,
-1));if("object"===typeof d||!d)return y.init.apply(this,arguments)};d.fn.removeStyle=function(e){return this.each(function(){var c=d(this);e=e.replace(/\s+/g,"");var l=e.split(",");d.each(l,function(){var b=RegExp(this.toString()+"[^;]+;?","g");c.attr("style",function(a,c){if(c)return c.replace(b,"")})})})}})(jQuery);
\ No newline at end of file
+            Non-commercial use permitted under terms of CC-BY-NC license.
+            http://creativecommons.org/licenses/by-nc/3.0/
+*/
+(function(f,l){f.MixItUp=function(){this._execAction("_constructor",0);f.extend(this,{selectors:{target:".mix",filter:".filter",sort:".sort"},animation:{enable:!0,effects:"fade scale",duration:600,easing:"ease",perspectiveDistance:"3000",perspectiveOrigin:"50% 50%",queue:!0,queueLimit:1,animateChangeLayout:!1,animateResizeContainer:!0,animateResizeTargets:!1,staggerSequence:!1,reverseOut:!1},callbacks:{onMixLoad:!1,onMixStart:!1,onMixBusy:!1,onMixEnd:!1,onMixFail:!1,_user:!1},controls:{enable:!0,
+live:!1,toggleFilterButtons:!1,toggleLogic:"or",activeClass:"active"},layout:{display:"inline-block",containerClass:"",containerClassFail:"fail"},load:{filter:"all",sort:!1},_$body:null,_$container:null,_$targets:null,_$parent:null,_$sortButtons:null,_$filterButtons:null,_suckMode:!1,_mixing:!1,_sorting:!1,_clicking:!1,_loading:!0,_changingLayout:!1,_changingClass:!1,_changingDisplay:!1,_origOrder:[],_startOrder:[],_newOrder:[],_activeFilter:null,_toggleArray:[],_toggleString:"",_activeSort:"default:asc",
+_newSort:null,_startHeight:null,_newHeight:null,_incPadding:!0,_newDisplay:null,_newClass:null,_targetsBound:0,_targetsDone:0,_queue:[],_$show:f(),_$hide:f()});this._execAction("_constructor",1)};f.MixItUp.prototype={constructor:f.MixItUp,_instances:{},_handled:{_filter:{},_sort:{}},_bound:{_filter:{},_sort:{}},_actions:{},_filters:{},extend:function(a){for(var c in a)f.MixItUp.prototype[c]=a[c]},addAction:function(a,c,b,d){f.MixItUp.prototype._addHook("_actions",a,c,b,d)},addFilter:function(a,c,
+b,d){f.MixItUp.prototype._addHook("_filters",a,c,b,d)},_addHook:function(a,c,b,d,e){a=f.MixItUp.prototype[a];var g={};e=1===e||"post"===e?"post":"pre";g[c]={};g[c][e]={};g[c][e][b]=d;f.extend(!0,a,g)},_init:function(a,c){this._execAction("_init",0,arguments);c&&f.extend(!0,this,c);this._$body=f("body");this._domNode=a;this._$container=f(a);this._$container.addClass(this.layout.containerClass);this._id=a.id;this._platformDetect();this._brake=this._getPrefixedCSS("transition","none");this._refresh(!0);
+this._$parent=this._$targets.parent().length?this._$targets.parent():this._$container;this.load.sort&&(this._newSort=this._parseSort(this.load.sort),this._activeSort=this._newSortString=this.load.sort,this._sort(),this._printSort());this._activeFilter="all"===this.load.filter?this.selectors.target:"none"===this.load.filter?"":this.load.filter;this.controls.enable&&this._bindHandlers();if(this.controls.toggleFilterButtons){this._buildToggleArray();for(var b=0;b<this._toggleArray.length;b++)this._updateControls({filter:this._toggleArray[b],
+sort:this._activeSort},!0)}else this.controls.enable&&this._updateControls({filter:this._activeFilter,sort:this._activeSort});this._filter();this._init=!0;this._$container.data("mixItUp",this);this._execAction("_init",1,arguments);this._buildState();this._$targets.css(this._brake);this._goMix(this.animation.enable)},_platformDetect:function(){var a=["Webkit","Moz","O","ms"],c=["webkit","moz"],b=window.navigator.appVersion.match(/Chrome\/(\d+)\./)||!1,d="undefined"!==typeof InstallTrigger,e=function(b){for(var c=
+0;c<a.length;c++)if(a[c]+"Transition"in b.style)return{prefix:"-"+a[c].toLowerCase()+"-",vendor:a[c]};return"transition"in b.style?"":!1}(this._domNode);this._execAction("_platformDetect",0);this._chrome=b?parseInt(b[1],10):!1;this._ff=d?parseInt(window.navigator.userAgent.match(/rv:([^)]+)\)/)[1]):!1;this._prefix=e.prefix;this._vendor=e.vendor;(this._suckMode=window.atob&&this._prefix?!1:!0)&&(this.animation.enable=!1);this._ff&&4>=this._ff&&(this.animation.enable=!1);for(b=0;b<c.length&&!window.requestAnimationFrame;b++)window.requestAnimationFrame=
+window[c[b]+"RequestAnimationFrame"];"function"!==typeof Object.getPrototypeOf&&(Object.getPrototypeOf="object"===typeof"test".__proto__?function(a){return a.__proto__}:function(a){return a.constructor.prototype});this._domNode.nextElementSibling===l&&Object.defineProperty(Element.prototype,"nextElementSibling",{get:function(){for(var a=this.nextSibling;a;){if(1===a.nodeType)return a;a=a.nextSibling}return null}});this._execAction("_platformDetect",1)},_refresh:function(a,c){this._execAction("_refresh",
+0,arguments);this._$targets=this._$container.find(this.selectors.target);for(var b=0;b<this._$targets.length;b++){var d=this._$targets[b];if(d.dataset===l||c){d.dataset={};for(var e=0;e<d.attributes.length;e++){var g=d.attributes[e],k=g.name,g=g.value;-1<k.indexOf("data-")&&(k=this._helpers._camelCase(k.substring(5,k.length)),d.dataset[k]=g)}}d.mixParent===l&&(d.mixParent=this._id)}if(this._$targets.length&&a||!this._origOrder.length&&this._$targets.length)for(this._origOrder=[],b=0;b<this._$targets.length;b++)d=
+this._$targets[b],this._origOrder.push(d);this._execAction("_refresh",1,arguments)},_bindHandlers:function(){var a=this,c=f.MixItUp.prototype._bound._filter,b=f.MixItUp.prototype._bound._sort;a._execAction("_bindHandlers",0);if(a.controls.live)a._$body.on("click.mixItUp."+a._id,a.selectors.sort,function(){a._processClick(f(this),"sort")}).on("click.mixItUp."+a._id,a.selectors.filter,function(){a._processClick(f(this),"filter")});else a._$sortButtons=f(a.selectors.sort),a._$filterButtons=f(a.selectors.filter),
+a._$sortButtons.on("click.mixItUp."+a._id,function(){a._processClick(f(this),"sort")}),a._$filterButtons.on("click.mixItUp."+a._id,function(){a._processClick(f(this),"filter")});c[a.selectors.filter]=c[a.selectors.filter]===l?1:c[a.selectors.filter]+1;b[a.selectors.sort]=b[a.selectors.sort]===l?1:b[a.selectors.sort]+1;a._execAction("_bindHandlers",1)},_processClick:function(a,c){var b=this,d=function(a,c,d){var e=f.MixItUp.prototype;e._handled["_"+c][b.selectors[c]]=e._handled["_"+c][b.selectors[c]]===
+l?1:e._handled["_"+c][b.selectors[c]]+1;e._handled["_"+c][b.selectors[c]]===e._bound["_"+c][b.selectors[c]]&&(a[(d?"remove":"add")+"Class"](b.controls.activeClass),delete e._handled["_"+c][b.selectors[c]])};b._execAction("_processClick",0,arguments);if(!b._mixing||b.animation.queue&&b._queue.length<b.animation.queueLimit){b._clicking=!0;if("sort"===c){var e=a.attr("data-sort");if(!a.hasClass(b.controls.activeClass)||-1<e.indexOf("random"))f(b.selectors.sort).removeClass(b.controls.activeClass),d(a,
+c),b.sort(e)}if("filter"===c){var g=a.attr("data-filter"),e="or"===b.controls.toggleLogic?",":"";b.controls.toggleFilterButtons?(b._buildToggleArray(),a.hasClass(b.controls.activeClass)?(d(a,c,!0),d=b._toggleArray.indexOf(g),b._toggleArray.splice(d,1)):(d(a,c),b._toggleArray.push(g)),b._toggleArray=f.grep(b._toggleArray,function(a){return a}),b._toggleString=b._toggleArray.join(e),b.filter(b._toggleString)):a.hasClass(b.controls.activeClass)||(f(b.selectors.filter).removeClass(b.controls.activeClass),
+d(a,c),b.filter(g))}b._execAction("_processClick",1,arguments)}else"function"===typeof b.callbacks.onMixBusy&&b.callbacks.onMixBusy.call(b._domNode,b._state,b),b._execAction("_processClickBusy",1,arguments)},_buildToggleArray:function(){var a=this._activeFilter.replace(/\s/g,"");this._execAction("_buildToggleArray",0,arguments);if("or"===this.controls.toggleLogic)this._toggleArray=a.split(",");else{this._toggleArray=a.split(".");!this._toggleArray[0]&&this._toggleArray.shift();for(var a=0,c;c=this._toggleArray[a];a++)this._toggleArray[a]=
+"."+c}this._execAction("_buildToggleArray",1,arguments)},_updateControls:function(a,c){var b={filter:a.filter,sort:a.sort},d="filter",e=null;this._execAction("_updateControls",0,arguments);a.filter===l&&(b.filter=this._activeFilter);a.sort===l&&(b.sort=this._activeSort);b.filter===this.selectors.target&&(b.filter="all");for(var g=0;2>g;g++){if(e=this.controls.live?f(this.selectors[d]):this["_$"+d+"Buttons"]){var k="[data-"+d+'="'+b[d]+'"]';c&&"filter"===d&&"none"!==b.filter&&""!==b.filter?e.filter(k).addClass(this.controls.activeClass):
+e.removeClass(this.controls.activeClass).filter(k).addClass(this.controls.activeClass)}d="sort"}this._execAction("_updateControls",1,arguments)},_filter:function(){this._execAction("_filter",0);for(var a=0;a<this._$targets.length;a++){var c=f(this._$targets[a]);c.is(this._activeFilter)?this._$show=this._$show.add(c):this._$hide=this._$hide.add(c)}this._execAction("_filter",1)},_sort:function(){var a=this,c=function(a){a=a.slice();for(var b=a.length,c=b;c--;){var f=parseInt(Math.random()*b),h=a[c];
+a[c]=a[f];a[f]=h}return a};a._execAction("_sort",0);a._startOrder=[];for(var b=0;b<a._$targets.length;b++)a._startOrder.push(a._$targets[b]);switch(a._newSort[0].sortBy){case "default":a._newOrder=a._origOrder;break;case "random":a._newOrder=c(a._startOrder);break;case "custom":a._newOrder=a._newSort[0].order;break;default:a._newOrder=a._startOrder.concat().sort(function(b,c){return a._compare(b,c)})}a._execAction("_sort",1)},_compare:function(a,c,b){b=b?b:0;var d=this,e=d._newSort[b].order,g=function(a){return a.dataset[d._newSort[b].sortBy]||
+0},f=isNaN(1*g(a))?g(a).toLowerCase():1*g(a),g=isNaN(1*g(c))?g(c).toLowerCase():1*g(c);return f<g?"asc"===e?-1:1:f>g?"asc"===e?1:-1:f===g&&d._newSort.length>b+1?d._compare(a,c,b+1):0},_printSort:function(a){var c=a?this._startOrder:this._newOrder,b=this._$parent[0].querySelectorAll(this.selectors.target),d=b.length?b[b.length-1].nextElementSibling:null,e=document.createDocumentFragment();this._execAction("_printSort",0,arguments);for(var g=0;g<b.length;g++){var f=b[g],h=f.nextSibling;"absolute"!==
+f.style.position&&(h&&"#text"===h.nodeName&&this._$parent[0].removeChild(h),this._$parent[0].removeChild(f))}for(g=0;g<c.length;g++)b=c[g],"default"!==this._newSort[0].sortBy||"desc"!==this._newSort[0].order||a?(e.appendChild(b),e.appendChild(document.createTextNode(" "))):(e.insertBefore(b,e.firstChild),e.insertBefore(document.createTextNode(" "),b));d?this._$parent[0].insertBefore(e,d):this._$parent[0].appendChild(e);this._execAction("_printSort",1,arguments)},_parseSort:function(a){for(var c="string"===
+typeof a?a.split(" "):[a],b=[],d=0;d<c.length;d++){var e="string"===typeof a?c[d].split(":"):["custom",c[d]],e={sortBy:this._helpers._camelCase(e[0]),order:e[1]||"asc"};b.push(e);if("default"===e.sortBy||"random"===e.sortBy)break}return this._execFilter("_parseSort",b,arguments)},_parseEffects:function(){var a=this,c={opacity:"",transformIn:"",transformOut:"",filter:""},b=function(b,c,d){return-1<a.animation.effects.indexOf(b)?c&&(b=a.animation.effects.indexOf(b+"("),-1<b)?(b=a.animation.effects.substring(b),
+{val:/\(([^)]+)\)/.exec(b)[1]}):!0:!1},d=function(a,d){for(var f=[["scale",".01"],["translateX","20px"],["translateY","20px"],["translateZ","20px"],["rotateX","90deg"],["rotateY","90deg"],["rotateZ","180deg"]],h=0;h<f.length;h++){var m=f[h][0],l=f[h][1],p=d&&"scale"!==m,q=c[a],n;b(m)?(n=m+"(",m=b(m,!0).val||l,p=p?"-"===m.charAt(0)?m.substr(1,m.length):"-"+m:m,n=n+p+") "):n="";c[a]=q+n}};c.opacity=b("fade")?b("fade",!0).val||"0":"1";d("transformIn");a.animation.reverseOut?d("transformOut",!0):c.transformOut=
+c.transformIn;c.transition={};c.transition=a._getPrefixedCSS("transition","all "+a.animation.duration+"ms "+a.animation.easing+", opacity "+a.animation.duration+"ms linear");a.animation.stagger=b("stagger")?!0:!1;a.animation.staggerDuration=parseInt(b("stagger")?b("stagger",!0).val?b("stagger",!0).val:100:100);return a._execFilter("_parseEffects",c)},_buildState:function(a){var c={};this._execAction("_buildState",0);c={activeFilter:""===this._activeFilter?"none":this._activeFilter,activeSort:a&&this._newSortString?
+this._newSortString:this._activeSort,fail:!this._$show.length&&""!==this._activeFilter,$targets:this._$targets,$show:this._$show,$hide:this._$hide,totalTargets:this._$targets.length,totalShow:this._$show.length,totalHide:this._$hide.length,display:a&&this._newDisplay?this._newDisplay:this.layout.display};if(a)return this._execFilter("_buildState",c);this._state=c;this._execAction("_buildState",1)},_goMix:function(a){var c=this,b=function(){if(c._chrome&&31===c._chrome){var a=c._$parent[0],b=a.parentElement,
+e=document.createElement("div"),f=document.createDocumentFragment();b.insertBefore(e,a);f.appendChild(a);b.replaceChild(a,e)}c._setInter();d()},d=function(){var a=window.pageYOffset,b=window.pageXOffset;c._getInterMixData();c._setFinal();c._getFinalMixData();window.pageYOffset!==a&&window.scrollTo(b,a);c._prepTargets();window.requestAnimationFrame?requestAnimationFrame(e):setTimeout(function(){e()},20)},e=function(){c._animateTargets();0===c._targetsBound&&c._cleanUp()},f=c._buildState(!0);c._execAction("_goMix",
+0,arguments);!c.animation.duration&&(a=!1);c._mixing=!0;c._$container.removeClass(c.layout.containerClassFail);"function"===typeof c.callbacks.onMixStart&&c.callbacks.onMixStart.call(c._domNode,c._state,f,c);c._$container.trigger("mixStart",[c._state,f,c]);c._getOrigMixData();a&&!c._suckMode?window.requestAnimationFrame?requestAnimationFrame(b):b():c._cleanUp();c._execAction("_goMix",1,arguments)},_getTargetData:function(a,c){var b;a.dataset[c+"PosX"]=a.offsetLeft;a.dataset[c+"PosY"]=a.offsetTop;
+this.animation.animateResizeTargets&&(b=window.getComputedStyle(a),a.dataset[c+"MarginBottom"]=parseInt(b.marginBottom),a.dataset[c+"MarginRight"]=parseInt(b.marginRight),a.dataset[c+"Width"]=a.offsetWidth,a.dataset[c+"Height"]=a.offsetHeight)},_getOrigMixData:function(){var a=this._suckMode?{boxSizing:""}:window.getComputedStyle(this._$parent[0]);this._incPadding="border-box"===(a.boxSizing||a[this._vendor+"BoxSizing"]);this._execAction("_getOrigMixData",0);!this._suckMode&&(this.effects=this._parseEffects());
+this._$toHide=this._$hide.filter(":visible");this._$toShow=this._$show.filter(":hidden");this._$pre=this._$targets.filter(":visible");this._startHeight=this._incPadding?this._$parent.outerHeight():this._$parent.height();for(a=0;a<this._$pre.length;a++)this._getTargetData(this._$pre[a],"orig");this._execAction("_getOrigMixData",1)},_setInter:function(){this._execAction("_setInter",0);this._changingLayout&&this.animation.animateChangeLayout?(this._$toShow.css("display",this._newDisplay),this._changingClass&&
+this._$container.removeClass(this.layout.containerClass).addClass(this._newClass)):this._$toShow.css("display",this.layout.display);this._execAction("_setInter",1)},_getInterMixData:function(){this._execAction("_getInterMixData",0);for(var a=0;a<this._$toShow.length;a++){var c=this._$toShow[a];this._getTargetData(c,"inter")}for(a=0;a<this._$pre.length;a++)c=this._$pre[a],this._getTargetData(c,"inter");this._execAction("_getInterMixData",1)},_setFinal:function(){this._execAction("_setFinal",0);this._sorting&&
+this._printSort();this._$toHide.removeStyle("display");this._changingLayout&&this.animation.animateChangeLayout&&this._$pre.css("display",this._newDisplay);this._execAction("_setFinal",1)},_getFinalMixData:function(){this._execAction("_getFinalMixData",0);for(var a=0;a<this._$toShow.length;a++){var c=this._$toShow[a];this._getTargetData(c,"final")}for(a=0;a<this._$pre.length;a++)c=this._$pre[a],this._getTargetData(c,"final");this._newHeight=this._incPadding?this._$parent.outerHeight():this._$parent.height();
+this._sorting&&this._printSort(!0);this._$toShow.removeStyle("display");this._$pre.css("display",this.layout.display);this._changingClass&&this.animation.animateChangeLayout&&this._$container.removeClass(this._newClass).addClass(this.layout.containerClass);this._execAction("_getFinalMixData",1)},_prepTargets:function(){var a={_in:this._getPrefixedCSS("transform",this.effects.transformIn),_out:this._getPrefixedCSS("transform",this.effects.transformOut)};this._execAction("_prepTargets",0);this.animation.animateResizeContainer&&
+this._$parent.css("height",this._startHeight+"px");for(var c=0;c<this._$toShow.length;c++){var b=this._$toShow[c],d=f(b);b.style.opacity=this.effects.opacity;b.style.display=this._changingLayout&&this.animation.animateChangeLayout?this._newDisplay:this.layout.display;d.css(a._in);this.animation.animateResizeTargets&&(b.style.width=b.dataset.finalWidth+"px",b.style.height=b.dataset.finalHeight+"px",b.style.marginRight=-(b.dataset.finalWidth-b.dataset.interWidth)+1*b.dataset.finalMarginRight+"px",b.style.marginBottom=
+-(b.dataset.finalHeight-b.dataset.interHeight)+1*b.dataset.finalMarginBottom+"px")}for(c=0;c<this._$pre.length;c++)b=this._$pre[c],d=f(b),a=this._getPrefixedCSS("transform","translate("+(b.dataset.origPosX-b.dataset.interPosX)+"px,"+(b.dataset.origPosY-b.dataset.interPosY)+"px)"),d.css(a),this.animation.animateResizeTargets&&(b.style.width=b.dataset.origWidth+"px",b.style.height=b.dataset.origHeight+"px",b.dataset.origWidth-b.dataset.finalWidth&&(b.style.marginRight=-(b.dataset.origWidth-b.dataset.interWidth)+
+1*b.dataset.origMarginRight+"px"),b.dataset.origHeight-b.dataset.finalHeight&&(b.style.marginBottom=-(b.dataset.origHeight-b.dataset.interHeight)+1*b.dataset.origMarginBottom+"px"));this._execAction("_prepTargets",1)},_animateTargets:function(){var a,c;this._execAction("_animateTargets",0);this._targetsBound=this._targetsDone=0;this._$parent.css(this._getPrefixedCSS("perspective",this.animation.perspectiveDistance+"px")).css(this._getPrefixedCSS("perspective-origin",this.animation.perspectiveOrigin));
+this.animation.animateResizeContainer&&this._$parent.css(this._getPrefixedCSS("transition","height "+this.animation.duration+"ms ease")).css("height",this._newHeight+"px");for(var b=0;b<this._$toShow.length;b++){var d=this._$toShow[b],e=f(d);a=d.dataset.finalPosX-d.dataset.interPosX;c=d.dataset.finalPosY-d.dataset.interPosY;var g=this._getDelay(b),k={};d.style.opacity="";for(d=0;2>d;d++){var h=0===d?h=this._prefix:"";this._ff&&20>=this._ff&&(k[h+"transition-property"]="all",k[h+"transition-timing-function"]=
+this.animation.easing+"ms",k[h+"transition-duration"]=this.animation.duration+"ms");k[h+"transition-delay"]=g+"ms";k[h+"transform"]="translate("+a+"px,"+c+"px)"}(this.effects.transform||this.effects.opacity)&&this._bindTargetDone(e);this._ff&&20>=this._ff?e.css(k):e.css(this.effects.transition).css(k)}for(b=0;b<this._$pre.length;b++)d=this._$pre[b],e=f(d),a=d.dataset.finalPosX-d.dataset.interPosX,c=d.dataset.finalPosY-d.dataset.interPosY,g=this._getDelay(b),d.dataset.finalPosX===d.dataset.origPosX&&
+d.dataset.finalPosY===d.dataset.origPosY||this._bindTargetDone(e),e.css(this._getPrefixedCSS("transition","all "+this.animation.duration+"ms "+this.animation.easing+" "+g+"ms")),e.css(this._getPrefixedCSS("transform","translate("+a+"px,"+c+"px)")),this.animation.animateResizeTargets&&(d.dataset.origWidth-d.dataset.finalWidth&&1*d.dataset.finalWidth&&(d.style.width=d.dataset.finalWidth+"px",d.style.marginRight=-(d.dataset.finalWidth-d.dataset.interWidth)+1*d.dataset.finalMarginRight+"px"),d.dataset.origHeight-
+d.dataset.finalHeight&&1*d.dataset.finalHeight&&(d.style.height=d.dataset.finalHeight+"px",d.style.marginBottom=-(d.dataset.finalHeight-d.dataset.interHeight)+1*d.dataset.finalMarginBottom+"px"));this._changingClass&&this._$container.removeClass(this.layout.containerClass).addClass(this._newClass);for(b=0;b<this._$toHide.length;b++){d=this._$toHide[b];e=f(d);g=this._getDelay(b);a={};for(d=0;2>d;d++)h=0===d?h=this._prefix:"",a[h+"transition-delay"]=g+"ms",a[h+"transform"]=this.effects.transformOut,
+a.opacity=this.effects.opacity;e.css(this.effects.transition).css(a);(this.effects.transform||this.effects.opacity)&&this._bindTargetDone(e)}this._execAction("_animateTargets",1)},_bindTargetDone:function(a){var c=this,b=a[0];c._execAction("_bindTargetDone",0,arguments);b.dataset.bound||(b.dataset.bound=!0,c._targetsBound++,a.on("webkitTransitionEnd.mixItUp transitionend.mixItUp",function(d){(-1<d.originalEvent.propertyName.indexOf("transform")||-1<d.originalEvent.propertyName.indexOf("opacity"))&&
+f(d.originalEvent.target).is(c.selectors.target)&&(a.off(".mixItUp"),delete b.dataset.bound,c._targetDone())}));c._execAction("_bindTargetDone",1,arguments)},_targetDone:function(){this._execAction("_targetDone",0);this._targetsDone++;this._targetsDone===this._targetsBound&&this._cleanUp();this._execAction("_targetDone",1)},_cleanUp:function(){var a=this,c=a.animation.animateResizeTargets?"transform opacity width height margin-bottom margin-right":"transform opacity";unBrake=function(){a._$targets.removeStyle("transition",
+a._prefix)};a._execAction("_cleanUp",0);a._changingLayout?a._$show.css("display",a._newDisplay):a._$show.css("display",a.layout.display);a._$targets.css(a._brake);a._$targets.removeStyle(c,a._prefix).removeAttr("data-inter-pos-x data-inter-pos-y data-final-pos-x data-final-pos-y data-orig-pos-x data-orig-pos-y data-orig-height data-orig-width data-final-height data-final-width data-inter-width data-inter-height data-orig-margin-right data-orig-margin-bottom data-inter-margin-right data-inter-margin-bottom data-final-margin-right data-final-margin-bottom");
+a._$hide.removeStyle("display");a._$parent.removeStyle("height transition perspective-distance perspective perspective-origin-x perspective-origin-y perspective-origin perspectiveOrigin",a._prefix);a._sorting&&(a._printSort(),a._activeSort=a._newSortString,a._sorting=!1);a._changingLayout&&(a._changingDisplay&&(a.layout.display=a._newDisplay,a._changingDisplay=!1),a._changingClass&&(a._$parent.removeClass(a.layout.containerClass).addClass(a._newClass),a.layout.containerClass=a._newClass,a._changingClass=
+!1),a._changingLayout=!1);a._refresh();a._buildState();a._state.fail&&a._$container.addClass(a.layout.containerClassFail);a._$show=f();a._$hide=f();window.requestAnimationFrame&&requestAnimationFrame(unBrake);a._mixing=!1;"function"===typeof a.callbacks._user&&a.callbacks._user.call(a._domNode,a._state,a);"function"===typeof a.callbacks.onMixEnd&&a.callbacks.onMixEnd.call(a._domNode,a._state,a);a._$container.trigger("mixEnd",[a._state,a]);a._state.fail&&("function"===typeof a.callbacks.onMixFail&&
+a.callbacks.onMixFail.call(a._domNode,a._state,a),a._$container.trigger("mixFail",[a._state,a]));a._loading&&("function"===typeof a.callbacks.onMixLoad&&a.callbacks.onMixLoad.call(a._domNode,a._state,a),a._$container.trigger("mixLoad",[a._state,a]));a._queue.length&&(a._execAction("_queue",0),a.multiMix(a._queue[0][0],a._queue[0][1],a._queue[0][2]),a._queue.splice(0,1));a._execAction("_cleanUp",1);a._loading=!1},_getPrefixedCSS:function(a,c,b){var d={};for(i=0;2>i;i++){var e=0===i?this._prefix:"";
+b?d[e+a]=e+c:d[e+a]=c}return this._execFilter("_getPrefixedCSS",d,arguments)},_getDelay:function(a){var c="function"===typeof this.animation.staggerSequence?this.animation.staggerSequence.call(this._domNode,a,this._state):a;return this._execFilter("_getDelay",this.animation.stagger?c*this.animation.staggerDuration:0,arguments)},_parseMultiMixArgs:function(a){for(var c={command:null,animate:this.animation.enable,callback:null},b=0;b<a.length;b++){var d=a[b];null!==d&&("object"===typeof d||"string"===
+typeof d?c.command=d:"boolean"===typeof d?c.animate=d:"function"===typeof d&&(c.callback=d))}return this._execFilter("_parseMultiMixArgs",c,arguments)},_parseInsertArgs:function(a){for(var c={index:0,$object:f(),multiMix:{filter:this._state.activeFilter},callback:null},b=0;b<a.length;b++){var d=a[b];"number"===typeof d?c.index=d:"object"===typeof d&&d instanceof f?c.$object=d:"object"===typeof d&&this._helpers._isElement(d)?c.$object=f(d):"object"===typeof d&&null!==d?c.multiMix=d:"boolean"!==typeof d||
+d?"function"===typeof d&&(c.callback=d):c.multiMix=!1}return this._execFilter("_parseInsertArgs",c,arguments)},_execAction:function(a,c,b){c=c?"post":"pre";if(!this._actions.isEmptyObject&&this._actions.hasOwnProperty(a))for(var d in this._actions[a][c])this._actions[a][c][d].call(this,b)},_execFilter:function(a,c,b){if(!this._filters.isEmptyObject&&this._filters.hasOwnProperty(a))for(var d in this._filters[a])return this._filters[a][d].call(this,b);else return c},_helpers:{_camelCase:function(a){return a.replace(/-([a-z])/g,
+function(a){return a[1].toUpperCase()})},_isElement:function(a){return window.HTMLElement?a instanceof HTMLElement:null!==a&&1===a.nodeType&&"string"===a.nodeName}},isMixing:function(){return this._execFilter("isMixing",this._mixing)},filter:function(){var a=this._parseMultiMixArgs(arguments);this._clicking&&(this._toggleString="");this.multiMix({filter:a.command},a.animate,a.callback)},sort:function(){var a=this._parseMultiMixArgs(arguments);this.multiMix({sort:a.command},a.animate,a.callback)},
+changeLayout:function(){var a=this._parseMultiMixArgs(arguments);this.multiMix({changeLayout:a.command},a.animate,a.callback)},multiMix:function(){var a=this._parseMultiMixArgs(arguments);this._execAction("multiMix",0,arguments);if(this._mixing)this.animation.queue&&this._queue.length<this.animation.queueLimit?(this._queue.push(arguments),this.controls.enable&&!this._clicking&&this._updateControls(a.command),this._execAction("multiMixQueue",1,arguments)):("function"===typeof this.callbacks.onMixBusy&&
+this.callbacks.onMixBusy.call(this._domNode,this._state,this),this._$container.trigger("mixBusy",[this._state,this]),this._execAction("multiMixBusy",1,arguments));else{this.controls.enable&&!this._clicking&&(this.controls.toggleFilterButtons&&this._buildToggleArray(),this._updateControls(a.command,this.controls.toggleFilterButtons));2>this._queue.length&&(this._clicking=!1);delete this.callbacks._user;a.callback&&(this.callbacks._user=a.callback);var c=a.command.sort,b=a.command.filter,d=a.command.changeLayout;
+this._refresh();c&&(this._newSort=this._parseSort(c),this._newSortString=c,this._sorting=!0,this._sort());b!==l&&(this._activeFilter=b="all"===b?this.selectors.target:b);this._filter();d&&(this._newDisplay="string"===typeof d?d:d.display||this.layout.display,this._newClass=d.containerClass||"",this._newDisplay!==this.layout.display||this._newClass!==this.layout.containerClass)&&(this._changingLayout=!0,this._changingClass=this._newClass!==this.layout.containerClass,this._changingDisplay=this._newDisplay!==
+this.layout.display);this._$targets.css(this._brake);this._goMix(a.animate^this.animation.enable?a.animate:this.animation.enable);this._execAction("multiMix",1,arguments)}},insert:function(){var a=this._parseInsertArgs(arguments),c="function"===typeof a.callback?a.callback:null,b=document.createDocumentFragment(),d;this._refresh();d=this._$targets.length?a.index<this._$targets.length||!this._$targets.length?this._$targets[a.index]:this._$targets[this._$targets.length-1].nextElementSibling:this._$parent[0].children[0];
+this._execAction("insert",0,arguments);if(a.$object){for(var e=0;e<a.$object.length;e++)b.appendChild(a.$object[e]),b.appendChild(document.createTextNode(" "));this._$parent[0].insertBefore(b,d)}this._execAction("insert",1,arguments);"object"===typeof a.multiMix&&this.multiMix(a.multiMix,c)},prepend:function(){var a=this._parseInsertArgs(arguments);this.insert(0,a.$object,a.multiMix,a.callback)},append:function(){var a=this._parseInsertArgs(arguments);this.insert(this._state.totalTargets,a.$object,
+a.multiMix,a.callback)},getOption:function(a){var c=function(a,c){for(var e=c.split("."),f=e.pop(),k=e.length,h=1,m=e[0]||c;(a=a[m])&&h<k;)m=e[h],h++;if(a!==l)return a[f]!==l?a[f]:a};return a?this._execFilter("getOption",c(this,a),arguments):this},setOptions:function(a){this._execAction("setOptions",0,arguments);"object"===typeof a&&f.extend(!0,this,a);this._execAction("setOptions",1,arguments)},getState:function(){return this._execFilter("getState",this._state,this)},forceRefresh:function(){this._refresh(!1,
+!0)},destroy:function(a){this._execAction("destroy",0,arguments);this._$body.add(f(this.selectors.sort)).add(f(this.selectors.filter)).off(".mixItUp");for(var c=0;c<this._$targets.length;c++){var b=this._$targets[c];a&&(b.style.display="");delete b.mixParent}this._execAction("destroy",1,arguments);delete f.MixItUp.prototype._instances[this._id]}};f.fn.mixItUp=function(){var a=arguments,c=[],b,d=function(a,b){var c=new f.MixItUp;c._execAction("_instantiate",0,arguments);a.id=a.id?a.id:"MixItUp"+("00000"+
+(16777216*Math.random()<<0).toString(16)).substr(-6).toUpperCase();c._instances[a.id]||(c._instances[a.id]=c,c._init(a,b));c._execAction("_instantiate",1,arguments)};b=this.each(function(){if(a&&"string"===typeof a[0]){var b=f.MixItUp.prototype._instances[this.id];"isLoaded"===a[0]?c.push(b?!0:!1):(b=b[a[0]](a[1],a[2],a[3]),b!==l&&c.push(b))}else d(this,a[0])});return c.length?1<c.length?c:c[0]:b};f.fn.removeStyle=function(a,c){c=c?c:"";return this.each(function(){for(var b=a.split(" "),d=0;d<b.length;d++)for(var e=
+0;4>e;e++){switch(e){case 0:var g=b[d];break;case 1:g=f.MixItUp.prototype._helpers._camelCase(g);break;case 2:g=c+b[d];break;case 3:g=f.MixItUp.prototype._helpers._camelCase(c+b[d])}this.style[g]!==l&&"unknown"!==typeof this.style[g]&&0<this.style[g].length&&(this.style[g]="");if(!c&&1===e)break}this.attributes&&this.attributes.style&&this.attributes.style!==l&&""===this.attributes.style.value&&this.attributes.removeNamedItem("style")})}})(jQuery);
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 914825af..6aa577a1 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -16,19 +16,12 @@
 		<div class="subtitle">{{ settings.subtitle }}</div>
 	</header>
 
-        <ul style="display: none">
-                <li id="sort-bump-order" class="sort" data-sort="data-bump" data-order="asc">{% trans 'Bump order' %}</li>
-                <li id="sort-creation-date" class="sort" data-sort="data-time" data-order="asc">{% trans 'Creation date' %}</li>
-                <li id="sort-reply-count" class="sort" data-sort="data-reply" data-order="asc">{% trans 'Reply count' %}</li>
-                <li id="sort-random" class="sort" data-sort="random">{% trans 'Random' %}</li>
-        </ul>
- 
         <span>{% trans 'Sort by' %}: </span>
         <select id="sort_by" style="display: inline-block">
-                <option selected value="bump-order">{% trans 'Bump order' %}</option>
-                <option value="creation-date">{% trans 'Creation date' %}</option>
-                <option value="reply-count">{% trans 'Reply count' %}</option>
-                <option value="random">{% trans 'Random' %}</option>
+                <option selected value="bump:desc">{% trans 'Bump order' %}</option>
+                <option value="time:desc">{% trans 'Creation date' %}</option>
+                <option value="reply:desc">{% trans 'Reply count' %}</option>
+                <option value="random:desc">{% trans 'Random' %}</option>
         </select>
  
         <span>{% trans 'Image size' %}: </span>
@@ -38,12 +31,12 @@
                 <option value="large">{% trans 'Large' %}</option>
         </select>
         <div class="threads">
-                <ul id="Grid">
+                <div id="Grid">
                 {% for post in recent_posts %}
-                        <li class="mix"
+                        <div class="mix"
 				data-reply="{{ post.reply_count }}"
-				data-bump="{{ post.bump }}"
-				data-time="{{ post.time }}"
+				 data-bump="{{ post.bump }}"
+				 data-time="{{ post.time }}"
 			>
                                 <div class="thread grid-li grid-size-small">  
                                         <a href="{{post.link}}">  
@@ -69,9 +62,9 @@
 								{{ post.body }}
                                                 </div>
                                 </div>
-                        </li>
+                        </div>
                 {% endfor %}
-                </ul>
+                </div>
         </div>
 	
 	<hr/>
-- 
cgit v1.3


From b056124e499082328f932a34997fc90ca3538233 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Mon, 5 Jan 2015 04:39:08 -0800
Subject: Catalog: don't show hidden threads

---
 js/catalog.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/js/catalog.js b/js/catalog.js
index 386557d9..5a236b8b 100644
--- a/js/catalog.js
+++ b/js/catalog.js
@@ -7,6 +7,16 @@ if (active_page == 'catalog') $(function(){
 		localStorage.catalog = JSON.stringify(catalog);
 	}
 
+	if (localStorage.hiddenthreads) {
+		var hidden_data = JSON.parse(localStorage.hiddenthreads);
+
+		if (hidden_data[board_name]) {
+			$.each(hidden_data[board_name], function(k, v) {
+				$('a[href*="'+k+'"]').parents('.mix').remove();
+			});
+		}
+	}
+
 	$("#sort_by").change(function(){
 		var value = this.value;
 		$('#Grid').mixItUp('sort', value);
-- 
cgit v1.3


From 01207dfcbb1750441a274538591a1a861698dda2 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Fri, 23 Jan 2015 02:24:04 -0800
Subject: Catalog script fix for hiding threads with short IDs

---
 js/catalog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/catalog.js b/js/catalog.js
index 5a236b8b..801c86bc 100644
--- a/js/catalog.js
+++ b/js/catalog.js
@@ -10,9 +10,9 @@ if (active_page == 'catalog') $(function(){
 	if (localStorage.hiddenthreads) {
 		var hidden_data = JSON.parse(localStorage.hiddenthreads);
 
-		if (hidden_data[board_name]) {
+		if (hidden_data[board_name] && !$.isEmptyObject(hidden_data[board_name])) {
 			$.each(hidden_data[board_name], function(k, v) {
-				$('a[href*="'+k+'"]').parents('.mix').remove();
+				$('a[href$="/'+k+'.html"]').parents('.mix').remove();
 			});
 		}
 	}
-- 
cgit v1.3


From e8b530a78369fffff024f1d26696605c3f1130c2 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sat, 31 Jan 2015 23:30:59 -0800
Subject: Shift-click to hide threads in catalog

---
 js/catalog.js                         | 12 ++++++++++--
 templates/themes/catalog/catalog.html |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/js/catalog.js b/js/catalog.js
index 801c86bc..38382096 100644
--- a/js/catalog.js
+++ b/js/catalog.js
@@ -1,5 +1,4 @@
 if (active_page == 'catalog') $(function(){
-
 	if (localStorage.catalog !== undefined) {
 		var catalog = JSON.parse(localStorage.catalog);
 	} else {
@@ -15,8 +14,18 @@ if (active_page == 'catalog') $(function(){
 				$('a[href$="/'+k+'.html"]').parents('.mix').remove();
 			});
 		}
+	} else {
+		hidden_data = {};
 	}
 
+	$(document).on('click', '.mix', function(e) {
+		if (e.shiftKey) {
+			hidden_data[board_name][$(this).data('id')] = Math.round(Date.now() / 1000);
+			$(this).remove();
+			localStorage.hiddenthreads = JSON.stringify(hidden_data);
+		}
+	});
+
 	$("#sort_by").change(function(){
 		var value = this.value;
 		$('#Grid').mixItUp('sort', value);
@@ -46,5 +55,4 @@ if (active_page == 'catalog') $(function(){
 	if (catalog.image_size !== undefined) {
 		$('#image_size').val(catalog.image_size).trigger('change');
 	}
-
 });
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 6aa577a1..2ca66089 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -37,6 +37,7 @@
 				data-reply="{{ post.reply_count }}"
 				 data-bump="{{ post.bump }}"
 				 data-time="{{ post.time }}"
+				 data-id="{{ post.id }}"
 			>
                                 <div class="thread grid-li grid-size-small">  
                                         <a href="{{post.link}}">  
-- 
cgit v1.3


From dd27026618ab200253ab6fcd6e58e247f8cc6711 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Fri, 6 Mar 2015 02:01:53 -0800
Subject: Show stickies at top of catalog

---
 js/catalog.js                         | 4 ++--
 templates/themes/catalog/catalog.html | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/js/catalog.js b/js/catalog.js
index 38382096..18da6d6b 100644
--- a/js/catalog.js
+++ b/js/catalog.js
@@ -28,7 +28,7 @@ if (active_page == 'catalog') $(function(){
 
 	$("#sort_by").change(function(){
 		var value = this.value;
-		$('#Grid').mixItUp('sort', value);
+		$('#Grid').mixItUp('sort', (value == "random" ? value : "sticky:desc " + value));
 		catalog.sort_by = value;
 		localStorage.catalog = JSON.stringify(catalog);
 	});
@@ -46,7 +46,7 @@ if (active_page == 'catalog') $(function(){
 	$('#Grid').mixItUp({
 		animation: {
 			enable: false
-		},
+		}
 	});
 
 	if (catalog.sort_by !== undefined) {
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 2ca66089..1011fdaf 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -38,6 +38,8 @@
 				 data-bump="{{ post.bump }}"
 				 data-time="{{ post.time }}"
 				 data-id="{{ post.id }}"
+				 data-sticky="{% if post.sticky %}true{% else %}false{% endif %}"
+				 data-locked="{% if post.locked %}true{% else %}false{% endif %}"
 			>
                                 <div class="thread grid-li grid-size-small">  
                                         <a href="{{post.link}}">  
@@ -49,7 +51,7 @@
                                                  id="img-{{ post.id }}" data-subject="{% if post.subject %}{{ post.subject|e }}{% endif %}" data-name="{{ post.name|e }}" data-muhdifference="{{ post.muhdifference }}" class="{{post.board}} thread-image" title="{{post.bump|date('%b %d %H:%M')}}">
                                         </a>
                                                 <div class="replies">
-                                                        <strong>R: {{ post.reply_count }} / I: {{ post.image_count }}</strong>
+                                                        <strong>R: {{ post.reply_count }} / I: {{ post.image_count }}{% if post.sticky %} (sticky){% endif %}</strong>
                                                         {% if post.subject %}
 								<p class="intro">
 									<span class="subject">
-- 
cgit v1.3


From 2808b1b8b2afe30126c26cd3dc35a5a81e765668 Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Tue, 17 Feb 2015 14:40:04 +0800
Subject: post-filter

Adds a dropdown menu to each post that allows for filtering by:
- post
- post and all replies to it
- poster ID
- poster ID and all replies to it
- name
- tripcode

In the options panel, adds a new tab for adding/removing name and
tripcode filters.
---
 js/post-filter.js | 755 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 755 insertions(+)
 create mode 100644 js/post-filter.js

diff --git a/js/post-filter.js b/js/post-filter.js
new file mode 100644
index 00000000..151a6f5d
--- /dev/null
+++ b/js/post-filter.js
@@ -0,0 +1,755 @@
+if (active_page === 'thread' || active_page === 'index') {
+	$(document).ready(function () {
+		'use strict';
+		// returns blacklist object from storage
+		function getList() {
+			return JSON.parse(localStorage.postFilter);
+		}
+
+		// stores blacklist into storage and reruns the filter
+		function setList(blacklist) {
+			localStorage.postFilter = JSON.stringify(blacklist);
+			$(document).trigger('filter_page');
+		}
+
+		// unit: seconds
+		function timestamp() {
+			return Math.floor((new Date()).getTime() / 1000);
+		}
+
+		function initList(list, boardId, threadId) {
+			if (typeof list.postFilter[boardId] == 'undefined')
+				list.postFilter[boardId] = {};
+				list.nextPurge[boardId] = {};
+			if (typeof list.postFilter[boardId][threadId] == 'undefined') {
+				list.postFilter[boardId][threadId] = [];
+				list.nextPurge[boardId][threadId] = {timestamp: timestamp(), interval: 86400};  // 86400 seconds == 1 day
+			}
+		}
+
+		var blacklist = {
+			add: {
+				name: function (posterName) {
+					var list = getList();
+					var filter = list.nameFilter;
+
+					for (var i in filter) {
+						if (filter[i].name == posterName) return;
+					}
+					filter.push({
+						name: posterName
+					});
+					setList(list);
+					drawFilterList();
+				},
+				trip: function (posterTrip) {
+					var list = getList();
+					var filter = list.nameFilter;
+
+					for (var i in filter) {
+						if (filter[i].trip == posterTrip) return;
+					}
+					filter.push({
+						trip: posterTrip
+					});
+					setList(list);
+					drawFilterList();
+				},
+				post: function (boardId, threadId, postId, hideReplies) {
+					var list = getList();
+					var filter = list.postFilter;
+
+					initList(list, boardId, threadId);
+
+					for (var i in filter[boardId][threadId]) {
+						if (filter[boardId][threadId][i].post == postId) return;
+					}
+					filter[boardId][threadId].push({
+						post: postId,
+						hideReplies: hideReplies
+					});
+					setList(list);
+				},
+				uid: function (boardId, threadId, uniqueId, hideReplies) {
+					var list = getList();
+					var filter = list.postFilter;
+
+					initList(list, boardId, threadId);
+
+					for (var i in filter[boardId][threadId]) {
+						if (filter[boardId][threadId][i].uid == uniqueId) return;
+					}
+					filter[boardId][threadId].push({
+						uid: uniqueId,
+						hideReplies: hideReplies
+					});
+					setList(list);
+				}
+			},
+			remove: {
+				name: function (posterName) {
+					var list = getList();
+					var filter = list.nameFilter;
+
+					for (var i=0; i<filter.length; i++) {
+						if (filter[i].name == posterName) {
+							filter.splice(i, 1);
+							break;
+						}
+					}
+					setList(list);
+					drawFilterList();
+				},
+				trip: function (posterTrip) {
+					var list = getList();
+					var filter = list.nameFilter;
+
+					for (var i=0; i<filter.length; i++) {
+						if (filter[i].trip == posterTrip) {
+							filter.splice(i, 1);
+							break;
+						}
+					}
+					setList(list);
+					drawFilterList();
+				},
+				post: function (boardId, threadId, postId) {
+					var list = getList();
+					var filter = list.postFilter;
+
+					// thread already pruned
+					if (typeof filter[boardId] == 'undefined' || typeof filter[boardId][threadId] == 'undefined')
+						return;
+
+					for (var i=0; i<filter[boardId][threadId].length; i++) {
+						if (filter[boardId][threadId][i].post == postId) {
+							filter[boardId][threadId].splice(i, 1);
+							break;
+						}
+					}
+					setList(list);
+				},
+				uid: function (boardId, threadId, uniqueId) {
+					var list = getList();
+					var filter = list.postFilter;
+
+					// thread already pruned
+					if (typeof filter[boardId] == 'undefined' || typeof filter[boardId][threadId] == 'undefined')
+						return;
+
+					for (var i=0; i<filter[boardId][threadId].length; i++) {
+						if (filter[boardId][threadId][i].uid == uniqueId) {
+							filter[boardId][threadId].splice(i, 1);
+							break;
+						}
+					}
+					setList(list);
+				}
+			}
+		};
+
+		/* 
+		 *  hide/show the specified thread/post
+		 */
+		function hide(ele) {
+			var $ele = $(ele);
+
+			if (ele.dataset.hidden == '1')
+				return;
+
+			ele.dataset.hidden = '1';
+			if ($ele.hasClass('op')) {
+				$ele.parent().find('.body, .files, .video-container').not($ele.children('.reply').children()).hide();
+
+				// hide thread replies on index view
+				if (active_page == 'index') $ele.parent().find('.omitted, .reply:not(.hidden), post_no, .mentioned, br').hide();
+			} else {
+				// normal posts
+				$ele.children('.body, .files, .video-container').hide();
+			}
+		}
+		function show(ele) {
+			var $ele = $(ele);
+
+			ele.dataset.hidden = '0';
+			if ($ele.hasClass('op')) {
+				$ele.parent().find('.body, .files, .video-container').show();
+				if (active_page == 'index') $ele.parent().find('.omitted, .reply:not(.hidden), post_no, .mentioned, br').show();
+			} else {
+				// normal posts
+				$ele.children('.body, .files, .video-container').show();
+			}
+		}
+
+		/* 
+		 *  create filter menu when the button is clicked
+		 */
+		function addMenu(e, ele, threadId, pageData) {
+
+			var $ele = $(ele);
+			var $buffer;
+
+			var postId = $ele.find('.post_no').not('[id]').text();
+			if (pageData.hasUID) {
+				var postUid = $ele.find('.poster_id').text();
+			}
+			var postName;
+			var postTrip = '';
+			if (!pageData.forcedAnon) {
+				postName = (typeof $ele.find('.name').contents()[0] == 'undefined') ? '' : $ele.find('.name').contents()[0].nodeValue.trim();
+				postTrip = $ele.find('.trip').text();
+			}
+
+			//  get the button's position
+			var pos = $(e.target).offset();
+
+			$buffer = $('<div class="filter-menu"></div>').append(
+				$('<ul>').append(
+					$('<li>', {id: 'filter-menu-unhide'}).text('Unhide post'),
+					$('<li>', {id: 'filter-menu-add'}).append(
+						$('<ul>').append(
+							$('<li>', {class: 'filter-post'}).text('Post'),
+							$('<li>', {class: 'filter-post-plus', title: 'Hide post and all replies'}).text('Post +'),
+							$('<li>', {class: 'filter-id'}).text('ID'),
+							$('<li>', {class: 'filter-id-plus', title: 'Hide ID and all replies'}).text('ID +'),
+							$('<li>', {class: 'filter-name'}).text('Name'),
+							$('<li>', {class: 'filter-trip'}).text('Tripcode')
+						),
+						'Add filter',
+						$('<span>', {class: 'filter-menu-arrow'}).append('»')
+					),
+					$('<li>', {id: 'filter-menu-remove'}).append(
+						$('<ul>').append(
+							$('<li>', {class: 'filter-id'}).text('ID'),
+							$('<li>', {class: 'filter-name'}).text('Name'),
+							$('<li>', {class: 'filter-trip'}).text('Tripcode')
+						),
+						'Remove filter',
+						$('<span>', {class: 'filter-menu-arrow'}).append('»')
+					)
+				)
+			);
+
+			/*  display logic and bind click handlers
+			 */
+
+			 // unhide button
+			if (ele.dataset.hidden == '1' && ele.dataset.hiddenByUid == '0' &&
+				ele.dataset.hiddenByName == '0' && ele.dataset.hiddenByTrip == '0') {
+				$buffer.find('#filter-menu-unhide').click(function () {
+					//  if hidden due to post id, remove it from blacklist
+					//  otherwise just show this post
+					blacklist.remove.post(pageData.boardId, threadId, postId);
+					show(ele);
+				});
+			} else {
+				$buffer.find('#filter-menu-unhide').addClass('hidden');
+			}
+
+			//  post id
+			if (ele.dataset.hiddenByPost == '0') {
+				$buffer.find('#filter-menu-add .filter-post').click(function () {
+					blacklist.add.post(pageData.boardId, threadId, postId, false);
+				});
+				$buffer.find('#filter-menu-add .filter-post-plus').click(function () {
+					blacklist.add.post(pageData.boardId, threadId, postId, true);
+				});
+			} else {
+				$buffer.find('#filter-menu-add .filter-post').addClass('hidden');
+				$buffer.find('#filter-menu-add .filter-post-plus').addClass('hidden');
+			}
+
+			// UID
+			if (pageData.hasUID && ele.dataset.hiddenByUid == '0') {
+				$buffer.find('#filter-menu-add .filter-id').click(function () {
+					blacklist.add.uid(pageData.boardId, threadId, postUid, false);
+				});
+				$buffer.find('#filter-menu-add .filter-id-plus').click(function () {
+					blacklist.add.uid(pageData.boardId, threadId, postUid, true);
+				});
+
+				$buffer.find('#filter-menu-remove .filter-id').addClass('hidden');
+			} else  if (pageData.hasUID) {
+				$buffer.find('#filter-menu-remove .filter-id').click(function () {
+					blacklist.remove.uid(pageData.boardId, threadId, postUid);
+				});
+
+				$buffer.find('#filter-menu-add .filter-id').addClass('hidden');
+				$buffer.find('#filter-menu-add .filter-id-plus').addClass('hidden');
+			} else {
+				// board doesn't use UID
+				$buffer.find('#filter-menu-add .filter-id').addClass('hidden');
+				$buffer.find('#filter-menu-add .filter-id-plus').addClass('hidden');
+				$buffer.find('#filter-menu-remove .filter-id').addClass('hidden');
+			}
+
+			//  name
+			if (!pageData.forcedAnon && ele.dataset.hiddenByName == '0') {
+				$buffer.find('#filter-menu-add .filter-name').click(function () {
+					blacklist.add.name(postName);
+				});
+
+				$buffer.find('#filter-menu-remove .filter-name').addClass('hidden');
+			} else if (!pageData.forcedAnon) {
+				$buffer.find('#filter-menu-remove .filter-name').click(function () {
+					blacklist.remove.name(postName);
+				});
+
+				$buffer.find('#filter-menu-add .filter-name').addClass('hidden');
+			} else {
+				// board has forced anon
+				$buffer.find('#filter-menu-remove .filter-name').addClass('hidden');
+				$buffer.find('#filter-menu-add .filter-name').addClass('hidden');
+			}
+
+			//  tripcode
+			if (!pageData.forcedAnon && ele.dataset.hiddenByTrip == '0' && postTrip !== '') {
+				$buffer.find('#filter-menu-add .filter-trip').click(function () {
+					blacklist.add.trip(postTrip);
+				});
+
+				$buffer.find('#filter-menu-remove .filter-trip').addClass('hidden');
+			} else if (!pageData.forcedAnon && postTrip !== '') {
+				$buffer.find('#filter-menu-remove .filter-trip').click(function () {
+					blacklist.remove.trip(postTrip);
+				});
+
+				$buffer.find('#filter-menu-add .filter-trip').addClass('hidden');
+			} else {
+				// board has forced anon
+				$buffer.find('#filter-menu-remove .filter-trip').addClass('hidden');
+				$buffer.find('#filter-menu-add .filter-trip').addClass('hidden');
+			}
+
+			/*  hide sub menus if all items are hidden
+			 */
+			if (!$buffer.find('#filter-menu-remove > ul').children().not('.hidden').length) {
+				$buffer.find('#filter-menu-remove').addClass('hidden');
+			}
+			if (!$buffer.find('#filter-menu-add > ul').children().not('.hidden').length) {
+				$buffer.find('#filter-menu-add').addClass('hidden');
+			}
+
+			/*  set menu position
+			 */
+			 $buffer.css({top: pos.top + 20, left: pos.left});
+
+			/*  finally append to page
+			 */
+			$('body').append($buffer);
+		}
+
+		/* 
+		 *  add menu button to the thread/post
+		 */
+		function addMenuButton(ele, threadId, pageData) {
+			if ($(ele).find('.filter-btn').length)
+				$('.filter-btn').remove();
+
+			$(ele).find('.intro')
+				.append(
+					$('<a>', {href: '#', class: 'filter-btn', title: 'Filter menu'})
+						.text('▶')
+						.click(function (e) {
+							//  button toggle
+							e.preventDefault();
+							//  remove existing menu
+							$('.filter-menu').remove();
+
+							if ($(e.target).hasClass('filter-btn-open')) {
+								$('.filter-btn-open').removeClass('filter-btn-open');
+							} else {
+								//  close previous button
+								$('.filter-btn-open').removeClass('filter-btn-open');
+								//  mark the menu button as open
+								$(ele).find('.filter-btn').addClass('filter-btn-open');
+								addMenu(e, ele, threadId, pageData);
+							}
+						})
+				);
+		}
+
+		/*
+		 *  determine whether the reply post should be hidden
+		 *   - applies to all posts on page load or filtering rule change
+		 *   - apply to new posts on thread updates
+		 *   - must explicitly set the state of each attributes because filter will reapply to all posts after filtering rule change
+		 */
+		function filter(post, threadId, pageData) {
+			var $post = $(post);
+			var list = getList();
+			var postId = $post.find('.post_no').not('[id]').text();
+			var name, trip, uid;
+			var i, array;  // temp variables
+
+			var boardId     = pageData.boardId;
+			var localList   = pageData.localList;
+			var noReplyList = pageData.noReplyList;
+			var hasUID      = pageData.hasUID;
+			var forcedAnon  = pageData.forcedAnon;
+
+			post.dataset.hidden = '0';
+			post.dataset.hiddenByUid = '0';
+			post.dataset.hiddenByPost = '0';
+			post.dataset.hiddenByName = '0';
+			post.dataset.hiddenByTrip = '0';
+
+			// add post with matched UID to localList
+			if (hasUID &&
+				typeof list.postFilter[boardId] != 'undefined' &&
+				typeof list.postFilter[boardId][threadId] != 'undefined') {
+				uid = $post.find('.poster_id').text();
+				array = list.postFilter[boardId][threadId];
+
+				for (i=0; i<array.length; i++) {
+					if (array[i].uid == uid) {
+						post.dataset.hiddenByUid = '1';
+						localList.push(postId);
+						if (array[i].hideReplies) noReplyList.push(postId);
+						break;
+					}
+				}
+			}
+
+			// match localList
+			if (localList.length) {
+				if ($.inArray(postId, localList) != -1) {
+					if (post.dataset.hiddenByUid != '1') post.dataset.hiddenByPost = '1';
+					hide(post);
+				}
+			}
+
+			// match poster name and tripcode
+			if (!forcedAnon) {
+				name = (typeof $post.find('.name').contents()[0] == 'undefined') ? '' : $post.find('.name').contents()[0].nodeValue.trim();
+				if ($(list.nameFilter).filter(function(){if (this.name == name) return true;}).length) {
+					post.dataset.hiddenByName = '1';
+					hide(post);
+				}
+				if ($post.find('.trip').length) {
+					trip = $post.find('.trip').text();
+					if ($(list.nameFilter).filter(function(){if (this.trip == trip) return true;}).length) {
+						post.dataset.hiddenByTrip = '1';
+						hide(post);
+					}
+				}
+			}
+
+			// check for link to filtered posts
+			$post.find('.body a').not('[rel="nofollow"]').each(function () {
+				var replyId = $(this).text().match(/^>>(\d+)$/);
+
+				if (!replyId)
+					return;
+
+				replyId = replyId[1];
+				if ($.inArray(replyId, noReplyList) != -1) {
+					hide(post);
+				}
+			});
+
+			// post didn't match any filters
+			if ((typeof post.dataset.hidden == 'undefined' || post.dataset.hidden == '0') &&
+				post.dataset.hiddenByUid == '0' &&
+				post.dataset.hiddenByUid == post.dataset.hiddenByPost == post.dataset.hiddenByName == post.dataset.hiddenByTrip) {
+				show(post);
+			}
+		}
+		/*  (re)runs the filter on the entire page
+		 */
+		 function filterPage(pageData) {
+			var list = getList();
+
+			// empty the local and no-reply list
+			pageData.localList = [];
+			pageData.noReplyList = [];
+
+			$('.thread').each(function () {
+				var $thread = $(this);
+				// disregard the hidden threads constructed by post-hover.js
+				if ($thread.css('display') == 'none')
+					return;
+
+				var threadId = $thread.attr('id').replace('thread_', '');
+				var op = $thread.children('.op')[0];
+				var i, array;  // temp variables
+
+				// add posts to localList and noReplyList
+				if (typeof list.postFilter[pageData.boardId] != 'undefined') {
+					array = list.postFilter[pageData.boardId][threadId];
+					if (typeof array != 'undefined') {
+						for (i=0; i<array.length; i++) {
+							if ( typeof array[i].post == 'undefined')
+								continue;
+
+							pageData.localList.push(array[i].post);
+							if (array[i].hideReplies) pageData.noReplyList.push(array[i].post);
+						}
+					}
+				}
+				// run filter on OP
+				filter(op, threadId, pageData);
+				addMenuButton(op, threadId, pageData);
+
+				// iterate filter over each post
+				if (op.dataset.hidden != '1' || active_page == 'thread') {
+					$thread.find('.reply').not('.hidden').each(function () {
+						filter(this, threadId, pageData);
+						addMenuButton(this, threadId, pageData);
+					});
+				}
+
+			});
+		 }
+
+		/* 
+		 *  
+		 */
+		function initStyle() {
+			var $ele, cssStyle, cssString;
+
+			$ele = $('<div>').addClass('post reply').hide().appendTo('body');
+			cssStyle = $ele.css(['background-color', 'border-color']);
+			cssStyle.hoverBg = $('body').css('background-color');
+			$ele.remove();
+
+			cssString =
+				'\n/*** Generated by post-filter ***/\n' +
+				'.filter-menu {position: absolute; font-size: 12px; line-height: 1.3em;}\n' +
+				'.filter-menu ul {\n' +
+				'    background-color: '+ cssStyle['background-color'] +'; border: 1px solid '+ cssStyle['border-color'] +'; border-right-width: 2px;\n' +
+				'    list-style: none; padding: 0; margin: 0; white-space: nowrap;\n}\n' +
+				'.filter-menu li {cursor: pointer; position: relative; padding: 4px 4px; vertical-align: middle; border-bottom: 1px solid '+ cssStyle['border-color'] +';}\n' +
+				'.filter-menu li:hover {background-color: '+ cssStyle.hoverBg +';}\n' +
+				'.filter-menu ul ul {display: none; position: absolute;}\n' +
+				'.filter-menu li:hover ul {display: block; left: 100%; margin-top: -3px;}\n' +
+				'.filter-menu-arrow {float: right; margin-left: 10px;}\n' +
+				'.filter-menu.hidden, .filter-menu .hidden {display: none;}\n' +
+				'.filter-btn {transition: transform 0.1s; width: 15px; text-align: center; font-size: 12pt; opacity: 0.8; text-decoration: none; margin: -6px 0px; display: inline-block;}\n' +
+				'.filter-btn:hover {opacity: 1;}\n' +
+				'.filter-btn-open {transform: rotate(90deg);}\n';
+			cssString +=
+				'#filter-control #clear {float: right;}\n' +
+				'#filter-container {margin-top: 20px; border: 1px solid; height: 270px; overflow: auto;}\n' +
+				'#filter-list {width: 100%; border-collapse: collapse;}\n' +
+				'#filter-list th {text-align: center; height: 20px; font-size: 14px; border-bottom: 1px solid;}\n' +
+				'#filter-list th:nth-child(1) {text-align: center; width: 70px;}\n' +
+				'#filter-list th:nth-child(2) {text-align: left;}\n' +
+				'#filter-list th:nth-child(3) {text-align: center; width: 58px;}\n' +
+				'#filter-list tr:not(#header) {height: 22px;}\n' +
+				'#filter-list tr:nth-child(even) {background-color:rgba(255, 255, 255, 0.5);}\n' +
+				'#filter-list td:nth-child(1) {text-align: center; width: 70px;}\n' +
+				'#filter-list td:nth-child(3) {text-align: center; width: 58px;}\n' +
+				'#confirm {text-align: right; margin-bottom: -18px; padding-top: 2px; font-size: 14px; color: #FF0000;}';
+
+			if (!$('style.generated-css').length) $('<style class="generated-css">').appendTo('head');
+			$('style.generated-css').html($('style.generated-css').html() + cssString);
+		}
+
+		function drawFilterList() {
+			var list = getList().nameFilter;
+			var $ele = $('#filter-list');
+			var $row;
+			var type, val;
+			var i, length, obj;
+
+			$ele.empty();
+
+			$ele.append('<tr id="header"><th>Type</th><th>Content</th><th>Remove</th></tr>');
+			for (i = 0, length = list.length; i < length; i++) {
+				obj = list[i];
+				for (type in obj) {
+					val = obj[type];
+					$row = $('<tr>');
+					$row.append(
+								'<td>'+ type +'</td>',
+								'<td>'+ val +'</td>',
+								$('<td>').append(
+									$('<a>').html('X')
+										.addClass('del-btn')
+										.attr('href', '#')
+										.attr('data-type', type)
+										.attr('data-val', val)
+								)
+							);
+					$ele.append($row);
+				}
+			}
+		}
+
+		function initOptionsPanel() {
+			if (window.Options && !Options.get_tab('filter')) {
+				Options.add_tab('filter', 'list', 'Filters');
+				Options.extend_tab('filter',
+					'<div id="filter-control">' +
+						'<input id="input" type="text"></input>' +
+						'<button id="name">Add Name</button>' +
+						'<button id="trip">Add Tripcode</button>' +
+						'<button id="clear">Clear all filters</button>' +
+						'<div id="confirm" class="hidden">' +
+							'This will clear all filtering rules including hidden posts. <a id="confirm-y" href="#">yes</a> | <a id="confirm-n" href="#">no</a>' +
+						'</div>' +
+					'</div>' +
+					'<div id="filter-container"><table id="filter-list"></table></div>'
+				);
+				drawFilterList();
+
+				// control buttons
+				$('#filter-control').on('click', '#name', function () {
+					var str = $('#filter-control #input').val().trim();
+					$('#filter-control #input').val('');
+					blacklist.add.name(str);
+				});
+				$('#filter-control').on('click', '#trip', function () {
+					var str = $('#filter-control #input').val().trim();
+					$('#filter-control #input').val('');
+					blacklist.add.trip(str);
+				});
+				$('#filter-control').on('click', '#clear', function () {
+					$('#filter-control #clear').addClass('hidden');
+					$('#filter-control #confirm').removeClass('hidden');
+				});
+				$('#filter-control').on('click', '#confirm-y', function (e) {
+					e.preventDefault();
+
+					$('#filter-control #clear').removeClass('hidden');
+					$('#filter-control #confirm').addClass('hidden');
+					setList({
+						nameFilter: [],
+						postFilter: {},
+						nextPurge: {},
+						lastPurge: timestamp()
+					});
+					drawFilterList();
+				});
+				$('#filter-control').on('click', '#confirm-n', function (e) {
+					e.preventDefault();
+
+					$('#filter-control #clear').removeClass('hidden');
+					$('#filter-control #confirm').addClass('hidden');
+				});
+
+
+				// remove button
+				$('#filter-list').on('click', '.del-btn', function (e) {
+					e.preventDefault();
+
+					var $ele = $(e.target);
+					var type = $ele.attr('data-type');
+					var val = $ele.attr('data-val');
+					blacklist.remove[type](val);
+				});
+			}
+		}
+
+		/* 
+		 *  clear out pruned threads
+		 */
+		function purge() {
+			var list = getList();
+			var board, thread, boardId, threadId;
+			var deferred;
+			var requestArray = [];
+
+			var successHandler = function (boardId, threadId) {
+				return function () {
+					// thread still alive, keep it in the list and increase the time between checks.
+					var list = getList();
+					var thread = list.nextPurge[boardId][threadId];
+
+					thread.timestamp = timestamp();
+					thread.interval = Math.floor(thread.interval * 1.5);
+					setList(list);
+				};
+			};
+			var errorHandler = function (boardId, threadId) {
+				return function (xhr) {
+					if (xhr.status == 404) {
+						var list = getList();
+
+						delete list.nextPurge[boardId][threadId];
+						delete list.postFilter[boardId][threadId];
+						if ($.isEmptyObject(list.nextPurge[boardId])) delete list.nextPurge[boardId];
+						if ($.isEmptyObject(list.postFilter[boardId])) delete list.postFilter[boardId];
+						setList(list);
+					}
+				};
+			};
+
+			if ((timestamp() - list.lastPurge) < 86400)  // less than 1 day
+				return;
+			
+			for (boardId in list.nextPurge) {
+				board = list.nextPurge[boardId];
+				for (threadId in board) {
+					thread = board[threadId];
+					if (timestamp() > (thread.timestamp + thread.interval)) {
+						// check if thread is pruned
+						deferred = $.ajax({
+							cache: false,
+							url: '/'+ boardId +'/res/'+ threadId +'.json',
+							success: successHandler(boardId, threadId),
+							error: errorHandler(boardId, threadId)
+						});
+						requestArray.push(deferred);
+					}
+				}
+			}
+
+			// when all requests complete
+			$.when.apply($, requestArray).always(function () {
+				var list = getList();
+				list.lastPurge = timestamp();
+				setList(list);
+			});
+		}
+
+		function init() {
+			if (typeof localStorage.postFilter === 'undefined') {
+				localStorage.postFilter = JSON.stringify({
+					nameFilter: [],
+					postFilter: {},
+					nextPurge: {},
+					lastPurge: timestamp()
+				});
+			}
+
+			var pageData = {
+				boardId: board_name,  // get the id from the global variable
+				localList: [],  // all the blacklisted post IDs or UIDs that apply to the current page
+				noReplyList: [],  // any posts that replies to the contents of this list shall be hidden
+				hasUID: (document.getElementsByClassName('poster_id').length > 0),
+				forcedAnon: ($('th:contains(Name)').length === 0)  // tests by looking for the Name label on the reply form
+			};
+
+			initStyle();
+			initOptionsPanel();
+			filterPage(pageData);
+
+			// menu close click handler
+			$(document).on('click', function (e){
+				if ($(e.target).hasClass('filter-btn'))
+					return;
+
+				$('.filter-menu').remove();
+				$('.filter-btn-open').removeClass('filter-btn-open');
+			});
+
+			// on new posts
+			$(document).on('new_post', function (e, post) {
+				var threadId = $(post).parent().attr('id').replace('thread_', '');
+
+				filter(post, threadId, pageData);
+				addMenuButton(post, threadId, pageData);
+			});
+
+			$(document).on('filter_page', function () {
+				filterPage(pageData);
+			});
+
+			// clear out the old threads
+			purge();
+		}
+		init();
+	});
+}
-- 
cgit v1.3


From 709a248d10111254b8e5e011c2ccbf30e6a265d8 Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Wed, 18 Feb 2015 14:03:06 +0800
Subject: Clear empty thread/board from filter list

---
 js/post-filter.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/js/post-filter.js b/js/post-filter.js
index 151a6f5d..87e03ea9 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -127,6 +127,16 @@ if (active_page === 'thread' || active_page === 'index') {
 							break;
 						}
 					}
+
+					if ($.isEmptyObject(filter[boardId][threadId])) {
+						delete filter[boardId][threadId];
+						delete list.nextPurge[boardId][threadId];
+
+						if ($.isEmptyObject(filter[boardId])) {
+							delete filter[boardId];
+							delete list.nextPurge[boardId];
+						}
+					}
 					setList(list);
 				},
 				uid: function (boardId, threadId, uniqueId) {
@@ -143,6 +153,16 @@ if (active_page === 'thread' || active_page === 'index') {
 							break;
 						}
 					}
+
+					if ($.isEmptyObject(filter[boardId][threadId])) {
+						delete filter[boardId][threadId];
+						delete list.nextPurge[boardId][threadId];
+
+						if ($.isEmptyObject(filter[boardId])) {
+							delete filter[boardId];
+							delete list.nextPurge[boardId];
+						}
+					}
 					setList(list);
 				}
 			}
-- 
cgit v1.3


From c8eaebce9a875cd00a629b2bd4a681d77255aa1d Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Wed, 18 Feb 2015 14:04:09 +0800
Subject: reset thread timer on new filter

---
 js/post-filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 87e03ea9..4d9e0618 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -23,8 +23,8 @@ if (active_page === 'thread' || active_page === 'index') {
 				list.nextPurge[boardId] = {};
 			if (typeof list.postFilter[boardId][threadId] == 'undefined') {
 				list.postFilter[boardId][threadId] = [];
-				list.nextPurge[boardId][threadId] = {timestamp: timestamp(), interval: 86400};  // 86400 seconds == 1 day
 			}
+			list.nextPurge[boardId][threadId] = {timestamp: timestamp(), interval: 86400};  // 86400 seconds == 1 day
 		}
 
 		var blacklist = {
-- 
cgit v1.3


From 26130c43eaaa660c292ecbf5cbc99f34a5f07be1 Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Wed, 18 Feb 2015 14:47:43 +0800
Subject: fix menu UI for Firefox

---
 js/post-filter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 4d9e0618..d5225f45 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -539,10 +539,11 @@ if (active_page === 'thread' || active_page === 'index') {
 				'.filter-menu ul {\n' +
 				'    background-color: '+ cssStyle['background-color'] +'; border: 1px solid '+ cssStyle['border-color'] +'; border-right-width: 2px;\n' +
 				'    list-style: none; padding: 0; margin: 0; white-space: nowrap;\n}\n' +
-				'.filter-menu li {cursor: pointer; position: relative; padding: 4px 4px; vertical-align: middle; border-bottom: 1px solid '+ cssStyle['border-color'] +';}\n' +
+				'.filter-menu li {cursor: pointer; position: relative; padding: 4px 4px; vertical-align: middle; border-bottom: 1px solid '+ cssStyle['border-color'] +'; white-space: normal; width: 90px;}\n' +
 				'.filter-menu li:hover {background-color: '+ cssStyle.hoverBg +';}\n' +
 				'.filter-menu ul ul {display: none; position: absolute;}\n' +
 				'.filter-menu li:hover ul {display: block; left: 100%; margin-top: -3px;}\n' +
+				'.filter-menu li ul li {white-space: nowrap; width: auto;}\n' +
 				'.filter-menu-arrow {float: right; margin-left: 10px;}\n' +
 				'.filter-menu.hidden, .filter-menu .hidden {display: none;}\n' +
 				'.filter-btn {transition: transform 0.1s; width: 15px; text-align: center; font-size: 12pt; opacity: 0.8; text-decoration: none; margin: -6px 0px; display: inline-block;}\n' +
-- 
cgit v1.3


From a723ff8e66e88f0e98b893275b8f7b1bbc990514 Mon Sep 17 00:00:00 2001
From: Markerov <mark.taiwan@gmail.com>
Date: Mon, 27 Oct 2014 16:49:17 +0800
Subject: Display inline image when it starts loading,

Rewrote inline-expanding.js to display full image as soon as it starts
loading.
Modified expand-all-images.js to work with the new change
Moved max-width to style.css
---
 js/expand-all-images.js |  2 +-
 js/inline-expanding.js  | 51 ++++++++++++++++++++++++++++---------------------
 stylesheets/style.css   |  4 ++++
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/js/expand-all-images.js b/js/expand-all-images.js
index 5545045c..82ea6340 100644
--- a/js/expand-all-images.js
+++ b/js/expand-all-images.js
@@ -34,7 +34,7 @@ onready(function(){
 			$('div#shrink-all-images a')
 				.text(_('Shrink all images'))
 				.click(function(){
-					$('a img.post-image').each(function() {
+					$('a img.full-image').each(function() {
 						if ($(this).parent()[0].dataset.expanded)
 							$(this).parent().click();
 					});
diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 4d0cb03d..6692e8a1 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -18,13 +18,23 @@ onready(function(){
 
 		for (var i = 0; i < link.length; i++) {
 			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].childNodes[0].className.match(/post-image/) && !link[i].className.match(/file/)) {
-				link[i].childNodes[0].style.maxWidth = '98%';
 				link[i].onclick = function(e) {
+					var img;
+					var loadImage = function(img, thumb) {
+						if (img.naturalWidth) {
+							thumb.style.display = 'none';
+							img.style.display = '';
+						}
+						else {
+							return thumb.parentNode.timeout = setTimeout(loadImage, 30, img, thumb);
+						}
+					};
+
 					if (this.childNodes[0].className == 'hidden')
 						return false;
-					if (e.which == 2 || e.metaKey)
+					if (e.which == 2 || e.ctrlKey) //open in new tab
 						return true;
-					if (!this.dataset.src) {
+					if (!this.dataset.expanded) {
 						this.parentNode.removeAttribute('style');
 						this.dataset.expanded = 'true';
 
@@ -33,29 +43,26 @@ onready(function(){
 							this.childNodes[0].style.display = 'block';
 						}
 
-						this.dataset.src= this.childNodes[0].src;
-						this.dataset.width = this.childNodes[0].style.width;
-						this.dataset.height = this.childNodes[0].style.height;
-						
-
-						this.childNodes[0].src = this.href;
-						this.childNodes[0].style.width = 'auto';
-						this.childNodes[0].style.height = 'auto';
 						this.childNodes[0].style.opacity = '0.4';
 						this.childNodes[0].style.filter = 'alpha(opacity=40)';
-						this.childNodes[0].onload = function() {
-							this.style.opacity = '';
-							delete this.style.filter;
-						}
+
+						img = document.createElement('img');
+						img.className = 'full-image';
+						img.setAttribute('src', this.href);
+						img.setAttribute('alt', 'Fullsized image');
+						img.style.display = 'none';
+						this.appendChild(img);
+
+						this.timeout = loadImage(img, this.childNodes[0]);
 					} else {
+						clearTimeout(this.timeout);
 						if (~this.parentNode.className.indexOf('multifile'))
 							this.parentNode.style.width = (parseInt(this.dataset.width)+40)+'px';
-						this.childNodes[0].src = this.dataset.src;
-						this.childNodes[0].style.width = this.dataset.width;
-						this.childNodes[0].style.height = this.dataset.height;
+
+						this.childNodes[0].style.opacity = '';
+						this.childNodes[0].style.display = '';
+						this.removeChild(this.childNodes[1]);
 						delete this.dataset.expanded;
-						delete this.dataset.src;
-						delete this.childNodes[0].style.opacity;
 						delete this.childNodes[0].style.filter;
 
 						if (localStorage.no_animated_gif === 'true' && typeof unanimate_gif === 'function') {
@@ -63,10 +70,10 @@ onready(function(){
 						}
 					}
 					return false;
-				}
+				};
 			}
 		}
-	}
+	};
 
 	if (window.jQuery) {
 		$('div[id^="thread_"]').each(inline_expand_post);
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 9925ccaa..ec07fe0a 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -194,6 +194,10 @@ img.banner,img.board_image {
   border: none;
 }
 
+.full-image {
+  max-width: 98%;
+}
+
 div.post .post-image {
   padding: 5px;
   margin: 0 20px 0 0;
-- 
cgit v1.3


From 99ee2e36bac6a30ab2be43c4ce38606de3f8466e Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sat, 20 Dec 2014 14:02:03 -0800
Subject: Don't expand webm or YouTube videos on js/expand-all-images.js

---
 js/expand-all-images.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/js/expand-all-images.js b/js/expand-all-images.js
index 82ea6340..6d7b4ca0 100644
--- a/js/expand-all-images.js
+++ b/js/expand-all-images.js
@@ -23,6 +23,14 @@ onready(function(){
 		.text(_('Expand all images'))
 		.click(function() {
 			$('a img.post-image').each(function() {
+				// Don't expand YouTube embeds
+				if ($(this).parent().parent().hasClass('video-container'))
+					return;
+
+				// or WEBM
+				if (/^\/player\.php\?/.test($(this).parent().attr('href')))
+					return;
+
 				if (!$(this).parent()[0].dataset.expanded)
 					$(this).parent().click();
 			});
-- 
cgit v1.3


From 4767a6317899ab627eec72bfadcd4252a9277a54 Mon Sep 17 00:00:00 2001
From: Markerov <mark.taiwan@gmail.com>
Date: Mon, 27 Oct 2014 16:57:03 +0800
Subject: renamed 'this.childNodes[0]' to thumb

---
 js/inline-expanding.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 6692e8a1..c19937ed 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -20,6 +20,7 @@ onready(function(){
 			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].childNodes[0].className.match(/post-image/) && !link[i].className.match(/file/)) {
 				link[i].onclick = function(e) {
 					var img;
+					var thumb = this.childNodes[0];
 					var loadImage = function(img, thumb) {
 						if (img.naturalWidth) {
 							thumb.style.display = 'none';
@@ -30,7 +31,7 @@ onready(function(){
 						}
 					};
 
-					if (this.childNodes[0].className == 'hidden')
+					if (thumb.className == 'hidden')
 						return false;
 					if (e.which == 2 || e.ctrlKey) //open in new tab
 						return true;
@@ -38,13 +39,13 @@ onready(function(){
 						this.parentNode.removeAttribute('style');
 						this.dataset.expanded = 'true';
 
-						if (this.childNodes[0].tagName === 'CANVAS') {
-							this.removeChild(this.childNodes[0]);
-							this.childNodes[0].style.display = 'block';
+						if (thumb.tagName === 'CANVAS') {
+							this.removeChild(thumb);
+							thumb.style.display = 'block';
 						}
 
-						this.childNodes[0].style.opacity = '0.4';
-						this.childNodes[0].style.filter = 'alpha(opacity=40)';
+						thumb.style.opacity = '0.4';
+						thumb.style.filter = 'alpha(opacity=40)';
 
 						img = document.createElement('img');
 						img.className = 'full-image';
@@ -53,20 +54,20 @@ onready(function(){
 						img.style.display = 'none';
 						this.appendChild(img);
 
-						this.timeout = loadImage(img, this.childNodes[0]);
+						this.timeout = loadImage(img, thumb);
 					} else {
 						clearTimeout(this.timeout);
 						if (~this.parentNode.className.indexOf('multifile'))
 							this.parentNode.style.width = (parseInt(this.dataset.width)+40)+'px';
 
-						this.childNodes[0].style.opacity = '';
-						this.childNodes[0].style.display = '';
-						this.removeChild(this.childNodes[1]);
+						thumb.style.opacity = '';
+						thumb.style.display = '';
+						this.removeChild(thumb.nextSibling);
 						delete this.dataset.expanded;
-						delete this.childNodes[0].style.filter;
+						delete thumb.style.filter;
 
 						if (localStorage.no_animated_gif === 'true' && typeof unanimate_gif === 'function') {
-							unanimate_gif(this.childNodes[0]);
+							unanimate_gif(thumb);
 						}
 					}
 					return false;
-- 
cgit v1.3


From bc2257be087ff037c9d84f685df6f064a26efff7 Mon Sep 17 00:00:00 2001
From: Markerov <mark.taiwan@gmail.com>
Date: Tue, 28 Oct 2014 23:35:58 +0800
Subject: scroll to thumb

scroll up to image if its top is out of view when shrunk.
Requires jQuery
---
 js/inline-expanding.js | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index c19937ed..cf8cab81 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -7,7 +7,7 @@
  * Copyright (c) 2013-2014 Marcin Łabanowski <marcin@6irc.net>
  *
  * Usage:
- *   // $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/inline-expanding.js';
  *
  */
@@ -19,8 +19,11 @@ onready(function(){
 		for (var i = 0; i < link.length; i++) {
 			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].childNodes[0].className.match(/post-image/) && !link[i].className.match(/file/)) {
 				link[i].onclick = function(e) {
-					var img;
+					var img, post_body, still_open;
 					var thumb = this.childNodes[0];
+					var padding = 5;
+					var boardlist = $('.boardlist')[0];
+					
 					var loadImage = function(img, thumb) {
 						if (img.naturalWidth) {
 							thumb.style.display = 'none';
@@ -57,6 +60,25 @@ onready(function(){
 						this.timeout = loadImage(img, thumb);
 					} else {
 						clearTimeout(this.timeout);
+
+						//scroll to thumb if not triggered by 'shrink all image'
+						if (e.target.className == 'full-image') {
+							post_body = $(e.target).parentsUntil('form > div').last();
+							still_open = post_body.find('.post-image').filter(function(){return $(this).parent().attr('data-expanded') == 'true'}).length;
+
+							//deal with differnt boards' menu styles
+							if ($(boardlist).css('position') == 'fixed')
+								padding += boardlist.getBoundingClientRect().height;
+
+							if (still_open > 1) {
+								if (e.target.getBoundingClientRect().top - padding < 0)
+									$('body').scrollTop($(e.target).parent().parent().offset().top - padding);
+							} else {
+								if (post_body[0].getBoundingClientRect().top - padding < 0)
+									$('body').scrollTop(post_body.offset().top - padding);
+							}
+						}
+
 						if (~this.parentNode.className.indexOf('multifile'))
 							this.parentNode.style.width = (parseInt(this.dataset.width)+40)+'px';
 
-- 
cgit v1.3


From fd2b41c1f0d1a2d091f8ee66880b230301b823cc Mon Sep 17 00:00:00 2001
From: Markerov <mark.taiwan@gmail.com>
Date: Sat, 29 Nov 2014 11:01:30 +0800
Subject: Fix bug with inline expansion with Unanimate Gif

Issue #273
---
 js/inline-expanding.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index cf8cab81..8da66898 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -19,7 +19,7 @@ onready(function(){
 		for (var i = 0; i < link.length; i++) {
 			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].childNodes[0].className.match(/post-image/) && !link[i].className.match(/file/)) {
 				link[i].onclick = function(e) {
-					var img, post_body, still_open;
+					var img, post_body, still_open, canvas;
 					var thumb = this.childNodes[0];
 					var padding = 5;
 					var boardlist = $('.boardlist')[0];
@@ -43,8 +43,10 @@ onready(function(){
 						this.dataset.expanded = 'true';
 
 						if (thumb.tagName === 'CANVAS') {
-							this.removeChild(thumb);
-							thumb.style.display = 'block';
+							canvas = thumb;
+							thumb = thumb.nextSibling;
+							this.removeChild(canvas);
+							canvas.style.display = 'block';
 						}
 
 						thumb.style.opacity = '0.4';
-- 
cgit v1.3


From 63491b0b9a4a9325bb8f68d0c5763ac3cda68c89 Mon Sep 17 00:00:00 2001
From: topkek <topkek@users.noreply.github.com>
Date: Tue, 9 Dec 2014 02:04:53 +0000
Subject: Scroll to thumbnail when shrinking an expanded image

---
 js/inline-expanding.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 8da66898..05300138 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -74,10 +74,10 @@ onready(function(){
 
 							if (still_open > 1) {
 								if (e.target.getBoundingClientRect().top - padding < 0)
-									$('body').scrollTop($(e.target).parent().parent().offset().top - padding);
+									$(document).scrollTop($(e.target).parent().parent().offset().top - padding);
 							} else {
 								if (post_body[0].getBoundingClientRect().top - padding < 0)
-									$('body').scrollTop(post_body.offset().top - padding);
+									$(document).scrollTop(post_body.offset().top - padding);
 							}
 						}
 
-- 
cgit v1.3


From c3146e17948a422f1d40537bb021a7ef53e78c6b Mon Sep 17 00:00:00 2001
From: Markerov <mark.taiwan@gmail.com>
Date: Mon, 12 Jan 2015 11:41:54 +0800
Subject: image throttler

initial commit
---
 js/inline-expanding.js | 164 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 132 insertions(+), 32 deletions(-)

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 05300138..74fe6c5a 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -13,30 +13,104 @@
  */
 
 onready(function(){
+	'use strict';
+
+	var DEFAULT_MAX = 5;  // default maximum image loads
 	var inline_expand_post = function() {
 		var link = this.getElementsByTagName('a');
 
+		var loadingQueue = (function () {
+			var MAX_IMAGES = localStorage.inline_expand_max || DEFAULT_MAX;   // maximum number of images to load concurrently, 0 to disable
+			var loading = 0;                                                  // number of images that is currently loading
+			var waiting = [];                                                 // waiting queue
+
+			var enqueue = function (ele) {
+				waiting.push(ele);
+			};
+			var dequeue = function () {
+				return waiting.shift();
+			};
+			var update = function() {
+				var ele;
+				while (loading < MAX_IMAGES || MAX_IMAGES === 0) {
+					ele = dequeue();
+					if (ele) {
+						++loading;
+						ele.deferred.resolve();
+					} else {
+						return;
+					}
+				}
+			};
+			return {
+				remove: function (ele) {
+					var i = waiting.indexOf(ele);
+					if (i > -1) {
+						waiting.splice(i, 1);
+					}
+					if (ele.dataset.imageLoading === 'true') {
+						ele.dataset.imageLoading = 'false';
+						clearTimeout(ele.timeout);
+						--loading;
+					}
+				},
+				add: function (ele) {
+					ele.deferred = $.Deferred();
+					ele.deferred.done(function () {
+						var $loadstart = $.Deferred();
+						var thumb = ele.childNodes[0];
+						var img = ele.childNodes[1];
+
+						var onLoadStart = function (img) {
+							if (img.naturalWidth) {
+								$loadstart.resolve(img, thumb);
+							} else {
+								return (ele.timeout = setTimeout(onLoadStart, 30, img));
+							}
+						};
+
+						$(img).one('load', function () {
+							$.when($loadstart).done(function () {
+								//  once fully loaded, update the waiting queue
+								--loading;
+								ele.dataset.imageLoading = 'false';
+								update();
+							});
+						});
+						$loadstart.done(function (img, thumb) {
+							thumb.style.display = 'none';
+							img.style.display = '';
+						});
+
+						img.setAttribute('src', ele.href);
+						ele.dataset.imageLoading = 'true';
+						ele.timeout = onLoadStart(img);
+					});
+
+					if (loading < MAX_IMAGES || MAX_IMAGES === 0) {
+						++loading;
+						ele.deferred.resolve();
+					} else {
+						enqueue(ele);
+					}
+
+				}
+			};
+		})();
+
 		for (var i = 0; i < link.length; i++) {
-			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].childNodes[0].className.match(/post-image/) && !link[i].className.match(/file/)) {
+			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' &&
+					link[i].childNodes[0].src && link[i].childNodes[0].className.match(/post-image/) && !link[i].className.match(/file/)) {
 				link[i].onclick = function(e) {
-					var img, post_body, still_open, canvas;
+					var img, post_body, still_open, canvas, scroll;
 					var thumb = this.childNodes[0];
 					var padding = 5;
 					var boardlist = $('.boardlist')[0];
 					
-					var loadImage = function(img, thumb) {
-						if (img.naturalWidth) {
-							thumb.style.display = 'none';
-							img.style.display = '';
-						}
-						else {
-							return thumb.parentNode.timeout = setTimeout(loadImage, 30, img, thumb);
-						}
-					};
 
 					if (thumb.className == 'hidden')
 						return false;
-					if (e.which == 2 || e.ctrlKey) //open in new tab
+					if (e.which == 2 || e.ctrlKey) //  open in new tab
 						return true;
 					if (!this.dataset.expanded) {
 						this.parentNode.removeAttribute('style');
@@ -54,31 +128,19 @@ onready(function(){
 
 						img = document.createElement('img');
 						img.className = 'full-image';
-						img.setAttribute('src', this.href);
-						img.setAttribute('alt', 'Fullsized image');
 						img.style.display = 'none';
+						img.setAttribute('alt', 'Fullsized image');
 						this.appendChild(img);
 
-						this.timeout = loadImage(img, thumb);
+						loadingQueue.add(this);
 					} else {
-						clearTimeout(this.timeout);
+						loadingQueue.remove(this);
 
-						//scroll to thumb if not triggered by 'shrink all image'
-						if (e.target.className == 'full-image') {
-							post_body = $(e.target).parentsUntil('form > div').last();
-							still_open = post_body.find('.post-image').filter(function(){return $(this).parent().attr('data-expanded') == 'true'}).length;
-
-							//deal with differnt boards' menu styles
-							if ($(boardlist).css('position') == 'fixed')
-								padding += boardlist.getBoundingClientRect().height;
+						scroll = false;
 
-							if (still_open > 1) {
-								if (e.target.getBoundingClientRect().top - padding < 0)
-									$(document).scrollTop($(e.target).parent().parent().offset().top - padding);
-							} else {
-								if (post_body[0].getBoundingClientRect().top - padding < 0)
-									$(document).scrollTop(post_body.offset().top - padding);
-							}
+						//  scroll to thumb if not triggered by 'shrink all image'
+						if (e.target.className == 'full-image') {
+							scroll = true;
 						}
 
 						if (~this.parentNode.className.indexOf('multifile'))
@@ -86,10 +148,32 @@ onready(function(){
 
 						thumb.style.opacity = '';
 						thumb.style.display = '';
-						this.removeChild(thumb.nextSibling);
+						if (thumb.nextSibling) this.removeChild(thumb.nextSibling);  //full image loaded or loading
 						delete this.dataset.expanded;
 						delete thumb.style.filter;
 
+						//  do the scrolling after page reflow
+						if (scroll) {
+							post_body = $(thumb).parentsUntil('form > div').last();
+
+							//  on multifile posts, determin how many other images are still expanded
+							still_open = post_body.find('.post-image').filter(function(){
+								return $(this).parent().attr('data-expanded') == 'true';
+							}).length;
+
+							//  deal with differnt boards' menu styles
+							if ($(boardlist).css('position') == 'fixed')
+								padding += boardlist.getBoundingClientRect().height;
+
+							if (still_open > 0) {
+								if (thumb.getBoundingClientRect().top - padding < 0)
+									$(document).scrollTop($(thumb).parent().parent().offset().top - padding);
+							} else {
+								if (post_body[0].getBoundingClientRect().top - padding < 0)
+									$(document).scrollTop(post_body.offset().top - padding);
+							}
+						}
+
 						if (localStorage.no_animated_gif === 'true' && typeof unanimate_gif === 'function') {
 							unanimate_gif(thumb);
 						}
@@ -100,6 +184,22 @@ onready(function(){
 		}
 	};
 
+	//  setting up user option
+	if (window.Options && Options.get_tab('general')) {
+		Options.extend_tab('general', '<span id="inline-expand-max">'+ _('Number of simultaneous image downloads (0 to disable): ') + 
+										'<input type="number" step="1" min="0" size="4"></span>');
+		$('#inline-expand-max input')
+			.css('width', '50px')
+			.val(localStorage.inline_expand_max || DEFAULT_MAX)
+			.on('change', function (e) {
+				// validation in case some fucktard tries to enter a negative floating point number
+				var n = parseInt(e.target.value);
+				var val = (n<0) ? 0 : n;
+
+				localStorage.inline_expand_max = val;
+			});
+	}
+
 	if (window.jQuery) {
 		$('div[id^="thread_"]').each(inline_expand_post);
 
-- 
cgit v1.3


From 7160cd650ee9f83ffac25aea8f042f5f1b4b9523 Mon Sep 17 00:00:00 2001
From: Markerov <mark.taiwan@gmail.com>
Date: Thu, 1 Jan 2015 14:10:26 +0800
Subject: merge relative-time into local-time

---
 js/local-time.js | 78 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 65 insertions(+), 13 deletions(-)

diff --git a/js/local-time.js b/js/local-time.js
index a4e25d6d..ac67673c 100644
--- a/js/local-time.js
+++ b/js/local-time.js
@@ -14,6 +14,8 @@
  */
 
 onready(function(){
+	'use strict';
+
 	var iso8601 = function(s) {
 		s = s.replace(/\.\d\d\d+/,""); // remove milliseconds
 		s = s.replace(/-/,"/").replace(/-/,"/");
@@ -36,28 +38,78 @@ onready(function(){
 		return strftime(window.post_date, t, datelocale);
 	};
 
+	function timeDifference(current, previous) {
+
+		var msPerMinute = 60 * 1000;
+		var msPerHour = msPerMinute * 60;
+		var msPerDay = msPerHour * 24;
+		var msPerMonth = msPerDay * 30;
+		var msPerYear = msPerDay * 365;
+
+		var elapsed = current - previous;
+
+		if (elapsed < msPerMinute) {
+			return 'Just now';
+		} else if (elapsed < msPerHour) {
+			return Math.round(elapsed/msPerMinute) + (Math.round(elapsed/msPerMinute)<=1 ? ' minute ago':' minutes ago');
+		} else if (elapsed < msPerDay ) {
+			return Math.round(elapsed/msPerHour ) + (Math.round(elapsed/msPerHour)<=1 ? ' hour ago':' hours ago');
+		} else if (elapsed < msPerMonth) {
+			return Math.round(elapsed/msPerDay) + (Math.round(elapsed/msPerDay)<=1 ? ' day ago':' days ago');
+		} else if (elapsed < msPerYear) {
+			return Math.round(elapsed/msPerMonth) + (Math.round(elapsed/msPerMonth)<=1 ? ' month ago':' months ago');
+		} else {
+			return Math.round(elapsed/msPerYear ) + (Math.round(elapsed/msPerYear)<=1 ? ' year ago':' years ago');
+		}
+	}
+
 	var do_localtime = function(elem) {	
 		var times = elem.getElementsByTagName('time');
-	
+		var currentTime = Date.now();
+
 		for(var i = 0; i < times.length; i++) {
-			if(typeof times[i].getAttribute('data-local') == 'undefined')
-				continue;
-		
-			var t = iso8601(times[i].getAttribute('datetime'));
-		
-		
+			var t = times[i].getAttribute('datetime');
+			var postTime = new Date(t);
+
 			times[i].setAttribute('data-local', 'true');
-			times[i].innerHTML = dateformat(t);
-		};
+
+			if (!localStorage.show_relative_time || localStorage.show_relative_time === 'false') {
+				times[i].innerHTML = dateformat(iso8601(t));
+				times[i].setAttribute('title', timeDifference(currentTime, postTime.getTime()));
+			} else {
+				times[i].innerHTML = timeDifference(currentTime, postTime.getTime());
+				times[i].setAttribute('title', dateformat(iso8601(t)));
+			}
+		
+		}
 	};
 
-	do_localtime(document);
-	
-	if (window.jQuery) {
+	if (window.Options && Options.get_tab('general') && window.jQuery) {
+		var interval_id;
+		Options.extend_tab('general', '<label id="show-relative-time"><input type="checkbox">' + _('Show relative time') + '</label>');
+
+		$('#show-relative-time>input').on('change', function() {
+			if (localStorage.show_relative_time === 'true') {
+				localStorage.show_relative_time = 'false';
+				clearInterval(interval_id);
+			} else {
+				localStorage.show_relative_time = 'true';
+				interval_id = setInterval(do_localtime, 30000, document);
+			}
+			// no need to refresh page
+			do_localtime(document);
+		});
+
+		if (localStorage.show_relative_time === 'true') {
+			$('#show-relative-time>input').attr('checked','checked');
+			interval_id = setInterval(do_localtime, 30000, document);
+		}
+
 		// allow to work with auto-reload.js, etc.
 		$(document).on('new_post', function(e, post) {
 			do_localtime(post);
 		});
 	}
-});
 
+	do_localtime(document);
+});
-- 
cgit v1.3


From 88f6088a429fb73d12805377b43c6b567d03a5db Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Fri, 23 Jan 2015 00:03:37 +0800
Subject: fix Relative Time and Image Throttler

---
 js/inline-expanding.js | 2 +-
 js/local-time.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 74fe6c5a..92069689 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -12,7 +12,7 @@
  *
  */
 
-onready(function(){
+$(document).ready(function(){
 	'use strict';
 
 	var DEFAULT_MAX = 5;  // default maximum image loads
diff --git a/js/local-time.js b/js/local-time.js
index ac67673c..a821579f 100644
--- a/js/local-time.js
+++ b/js/local-time.js
@@ -13,7 +13,7 @@
  *
  */
 
-onready(function(){
+$(document).ready(function(){
 	'use strict';
 
 	var iso8601 = function(s) {
-- 
cgit v1.3


From 5176377045d25ab00ed4653f980e9a95a17b0e31 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Fri, 20 Feb 2015 01:51:06 -0800
Subject: Fix many features for Internet Explorer 9 and 10

Please don't use "dataset" in scripts anymore, it doesn't work in IE9 or 10. Instead use $.data
---
 js/catalog-search.js    | 12 ++++++------
 js/expand-all-images.js |  4 ++--
 js/hide-images.js       |  2 +-
 js/id_colors.js         | 10 +++++-----
 js/inline-expanding.js  | 16 ++++++++--------
 js/post-filter.js       | 44 ++++++++++++++++++++++----------------------
 js/toggle-images.js     |  2 +-
 7 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/js/catalog-search.js b/js/catalog-search.js
index 17a8edac..ff9af785 100644
--- a/js/catalog-search.js
+++ b/js/catalog-search.js
@@ -34,16 +34,16 @@ if (active_page == 'catalog') {
 		}
 
 		function searchToggle() {
-			var button = $('#catalog_search_button')[0];
+			var button = $('#catalog_search_button');
 
-			if (!button.dataset.expanded) {
-				button.dataset.expanded = '1';
-				button.innerText = 'Close';
+			if (!button.data('expanded')) {
+				button.data('expanded', '1');
+				button.text('Close');
 				$('.catalog_search').append(' <input id="search_field" style="border: inset 1px;">');
 				$('#search_field').focus();
 			} else {
-				delete button.dataset.expanded;
-				button.innerText = 'Search';
+				button.removeData('expanded');
+				button.text('Search');
 				$('.catalog_search').children().last().remove();
 				$('div[id="Grid"]>.mix').each(function () { $(this).css('display', 'inline-block'); });
 			}
diff --git a/js/expand-all-images.js b/js/expand-all-images.js
index 6d7b4ca0..c110f51c 100644
--- a/js/expand-all-images.js
+++ b/js/expand-all-images.js
@@ -31,7 +31,7 @@ onready(function(){
 				if (/^\/player\.php\?/.test($(this).parent().attr('href')))
 					return;
 
-				if (!$(this).parent()[0].dataset.expanded)
+				if (!$(this).parent().data('expanded'))
 					$(this).parent().click();
 			});
 
@@ -43,7 +43,7 @@ onready(function(){
 				.text(_('Shrink all images'))
 				.click(function(){
 					$('a img.full-image').each(function() {
-						if ($(this).parent()[0].dataset.expanded)
+						if ($(this).parent().data('expanded'))
 							$(this).parent().click();
 					});
 					$(this).parent().remove();
diff --git a/js/hide-images.js b/js/hide-images.js
index 323a1a1f..4fdad891 100644
--- a/js/hide-images.js
+++ b/js/hide-images.js
@@ -77,7 +77,7 @@ $(document).ready(function(){
 			
 			$(this).hide().after(show_link);
 			
-			if ($(img).parent()[0].dataset.expanded == 'true') {
+			if ($(img).parent().data('expanded') == 'true') {
 				$(img).parent().click();
 			}
 		
diff --git a/js/id_colors.js b/js/id_colors.js
index 17f8b4d9..6335f960 100644
--- a/js/id_colors.js
+++ b/js/id_colors.js
@@ -1,18 +1,18 @@
 if (active_page == 'thread' || active_page == 'index') {
 	$(document).ready(function(){
 		if (window.Options && Options.get_tab('general')) {
-			selector = '#color-ids>input';
-			event = 'change';
+			var selector = '#color-ids>input';
+			var e = 'change';
 			Options.extend_tab("general", "<label id='color-ids'><input type='checkbox' /> "+_('Color IDs')+"</label>");
 		}
 
 		else {
-			selector = '#color-ids';
-			event = 'click';
+			var selector = '#color-ids';
+			var e = 'click';
 			$('hr:first').before('<div id="color-ids" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+_('Color IDs')+'</a></div>')
 		}
 
-		$(selector).on(event, function() {
+		$(selector).on(e, function() {
 			if (localStorage.color_ids === 'true') {
 				localStorage.color_ids = 'false';
 			} else {
diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 92069689..e316fbb7 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -48,8 +48,8 @@ $(document).ready(function(){
 					if (i > -1) {
 						waiting.splice(i, 1);
 					}
-					if (ele.dataset.imageLoading === 'true') {
-						ele.dataset.imageLoading = 'false';
+					if ($(ele).data('imageLoading') === 'true') {
+						$(ele).data('imageLoading', 'false');
 						clearTimeout(ele.timeout);
 						--loading;
 					}
@@ -73,7 +73,7 @@ $(document).ready(function(){
 							$.when($loadstart).done(function () {
 								//  once fully loaded, update the waiting queue
 								--loading;
-								ele.dataset.imageLoading = 'false';
+								$(ele).data('imageLoading', 'false');
 								update();
 							});
 						});
@@ -83,7 +83,7 @@ $(document).ready(function(){
 						});
 
 						img.setAttribute('src', ele.href);
-						ele.dataset.imageLoading = 'true';
+						$(ele).data('imageLoading', 'true');
 						ele.timeout = onLoadStart(img);
 					});
 
@@ -112,9 +112,9 @@ $(document).ready(function(){
 						return false;
 					if (e.which == 2 || e.ctrlKey) //  open in new tab
 						return true;
-					if (!this.dataset.expanded) {
+					if (!$(this).data('expanded')) {
 						this.parentNode.removeAttribute('style');
-						this.dataset.expanded = 'true';
+						$(this).data('expanded', 'true');
 
 						if (thumb.tagName === 'CANVAS') {
 							canvas = thumb;
@@ -144,12 +144,12 @@ $(document).ready(function(){
 						}
 
 						if (~this.parentNode.className.indexOf('multifile'))
-							this.parentNode.style.width = (parseInt(this.dataset.width)+40)+'px';
+							this.parentNode.style.width = (parseInt($(this).data('width'))+40)+'px';
 
 						thumb.style.opacity = '';
 						thumb.style.display = '';
 						if (thumb.nextSibling) this.removeChild(thumb.nextSibling);  //full image loaded or loading
-						delete this.dataset.expanded;
+						$(this).removeData('expanded');
 						delete thumb.style.filter;
 
 						//  do the scrolling after page reflow
diff --git a/js/post-filter.js b/js/post-filter.js
index d5225f45..b3f633f7 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -174,10 +174,10 @@ if (active_page === 'thread' || active_page === 'index') {
 		function hide(ele) {
 			var $ele = $(ele);
 
-			if (ele.dataset.hidden == '1')
+			if ($(ele).data('hidden') === '1')
 				return;
 
-			ele.dataset.hidden = '1';
+			$(ele).data('hidden', '1');
 			if ($ele.hasClass('op')) {
 				$ele.parent().find('.body, .files, .video-container').not($ele.children('.reply').children()).hide();
 
@@ -191,7 +191,7 @@ if (active_page === 'thread' || active_page === 'index') {
 		function show(ele) {
 			var $ele = $(ele);
 
-			ele.dataset.hidden = '0';
+			$(ele).data('hidden', '0');
 			if ($ele.hasClass('op')) {
 				$ele.parent().find('.body, .files, .video-container').show();
 				if (active_page == 'index') $ele.parent().find('.omitted, .reply:not(.hidden), post_no, .mentioned, br').show();
@@ -254,8 +254,8 @@ if (active_page === 'thread' || active_page === 'index') {
 			 */
 
 			 // unhide button
-			if (ele.dataset.hidden == '1' && ele.dataset.hiddenByUid == '0' &&
-				ele.dataset.hiddenByName == '0' && ele.dataset.hiddenByTrip == '0') {
+			if ($(ele).data('hidden') == '1' && $(ele).data('hiddenByUid') == '0' &&
+				$(ele).data('hiddenByName') == '0' && $(ele).data('hiddenByTrip') == '0') {
 				$buffer.find('#filter-menu-unhide').click(function () {
 					//  if hidden due to post id, remove it from blacklist
 					//  otherwise just show this post
@@ -267,7 +267,7 @@ if (active_page === 'thread' || active_page === 'index') {
 			}
 
 			//  post id
-			if (ele.dataset.hiddenByPost == '0') {
+			if ($(ele).data('hiddenByPost') == '0') {
 				$buffer.find('#filter-menu-add .filter-post').click(function () {
 					blacklist.add.post(pageData.boardId, threadId, postId, false);
 				});
@@ -280,7 +280,7 @@ if (active_page === 'thread' || active_page === 'index') {
 			}
 
 			// UID
-			if (pageData.hasUID && ele.dataset.hiddenByUid == '0') {
+			if (pageData.hasUID && $(ele).data('hiddenByUid') == '0') {
 				$buffer.find('#filter-menu-add .filter-id').click(function () {
 					blacklist.add.uid(pageData.boardId, threadId, postUid, false);
 				});
@@ -304,7 +304,7 @@ if (active_page === 'thread' || active_page === 'index') {
 			}
 
 			//  name
-			if (!pageData.forcedAnon && ele.dataset.hiddenByName == '0') {
+			if (!pageData.forcedAnon && $(ele).data('hiddenByName') == '0') {
 				$buffer.find('#filter-menu-add .filter-name').click(function () {
 					blacklist.add.name(postName);
 				});
@@ -323,7 +323,7 @@ if (active_page === 'thread' || active_page === 'index') {
 			}
 
 			//  tripcode
-			if (!pageData.forcedAnon && ele.dataset.hiddenByTrip == '0' && postTrip !== '') {
+			if (!pageData.forcedAnon && $(ele).data('hiddenByTrip') == '0' && postTrip !== '') {
 				$buffer.find('#filter-menu-add .filter-trip').click(function () {
 					blacklist.add.trip(postTrip);
 				});
@@ -408,11 +408,11 @@ if (active_page === 'thread' || active_page === 'index') {
 			var hasUID      = pageData.hasUID;
 			var forcedAnon  = pageData.forcedAnon;
 
-			post.dataset.hidden = '0';
-			post.dataset.hiddenByUid = '0';
-			post.dataset.hiddenByPost = '0';
-			post.dataset.hiddenByName = '0';
-			post.dataset.hiddenByTrip = '0';
+			$post.data('hidden', '0');
+			$post.data('hiddenByUid', '0');
+			$post.data('hiddenByPost', '0');
+			$post.data('hiddenByName', '0');
+			$post.data('hiddenByTrip', '0');
 
 			// add post with matched UID to localList
 			if (hasUID &&
@@ -423,7 +423,7 @@ if (active_page === 'thread' || active_page === 'index') {
 
 				for (i=0; i<array.length; i++) {
 					if (array[i].uid == uid) {
-						post.dataset.hiddenByUid = '1';
+						$post.data('hiddenByUid', '1');
 						localList.push(postId);
 						if (array[i].hideReplies) noReplyList.push(postId);
 						break;
@@ -434,7 +434,7 @@ if (active_page === 'thread' || active_page === 'index') {
 			// match localList
 			if (localList.length) {
 				if ($.inArray(postId, localList) != -1) {
-					if (post.dataset.hiddenByUid != '1') post.dataset.hiddenByPost = '1';
+					if ($post.data('hiddenByUid') != '1') $post.data('hiddenByPost', '1');
 					hide(post);
 				}
 			}
@@ -443,13 +443,13 @@ if (active_page === 'thread' || active_page === 'index') {
 			if (!forcedAnon) {
 				name = (typeof $post.find('.name').contents()[0] == 'undefined') ? '' : $post.find('.name').contents()[0].nodeValue.trim();
 				if ($(list.nameFilter).filter(function(){if (this.name == name) return true;}).length) {
-					post.dataset.hiddenByName = '1';
+					$post.data('hiddenByName', '1');
 					hide(post);
 				}
 				if ($post.find('.trip').length) {
 					trip = $post.find('.trip').text();
 					if ($(list.nameFilter).filter(function(){if (this.trip == trip) return true;}).length) {
-						post.dataset.hiddenByTrip = '1';
+						$post.data('hiddenByTrip', '1');
 						hide(post);
 					}
 				}
@@ -469,9 +469,9 @@ if (active_page === 'thread' || active_page === 'index') {
 			});
 
 			// post didn't match any filters
-			if ((typeof post.dataset.hidden == 'undefined' || post.dataset.hidden == '0') &&
-				post.dataset.hiddenByUid == '0' &&
-				post.dataset.hiddenByUid == post.dataset.hiddenByPost == post.dataset.hiddenByName == post.dataset.hiddenByTrip) {
+			if ((typeof $post.data('hidden') == 'undefined' || $post.data('hidden') == '0') &&
+				$post.data('hiddenByUid') === '0' &&
+				$post.data('hiddenByUid') == $post.data('hiddenByPost') == $post.data('hiddenByName') == $post.data('hiddenByTrip')) {
 				show(post);
 			}
 		}
@@ -512,7 +512,7 @@ if (active_page === 'thread' || active_page === 'index') {
 				addMenuButton(op, threadId, pageData);
 
 				// iterate filter over each post
-				if (op.dataset.hidden != '1' || active_page == 'thread') {
+				if ($(op).data('hidden') != '1' || active_page == 'thread') {
 					$thread.find('.reply').not('.hidden').each(function () {
 						filter(this, threadId, pageData);
 						addMenuButton(this, threadId, pageData);
diff --git a/js/toggle-images.js b/js/toggle-images.js
index b8940252..c3636d29 100644
--- a/js/toggle-images.js
+++ b/js/toggle-images.js
@@ -20,7 +20,7 @@ $(document).ready(function(){
 	$('<style type="text/css"> img.hidden{ opacity: 0.1; background: grey; border: 1px solid #000; } </style>').appendTo($('head'));
 
 	var hideImage = function() {
-		if ($(this).parent()[0].dataset.expanded == 'true') {
+		if ($(this).parent().data('expanded') == 'true') {
 			$(this).parent().click();
 		}
 		$(this)
-- 
cgit v1.3


From deefe7225d1992b67912a267cb2bba7ec93d1698 Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Tue, 24 Feb 2015 20:34:13 +0800
Subject: Bugfix: scroll to thumbnail on multipost close

Indroduced in 7364e85
---
 js/inline-expanding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index e316fbb7..8405ee6a 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -158,7 +158,7 @@ $(document).ready(function(){
 
 							//  on multifile posts, determin how many other images are still expanded
 							still_open = post_body.find('.post-image').filter(function(){
-								return $(this).parent().attr('data-expanded') == 'true';
+								return $(this).parent().data('expanded') == 'true';
 							}).length;
 
 							//  deal with differnt boards' menu styles
-- 
cgit v1.3


From 3e579ee1d483e3a5b26b980762c7ccbd9e33850a Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Fri, 6 Mar 2015 20:59:47 +0800
Subject: Bugfix: reset multifile container width

#371
---
 js/inline-expanding.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 8405ee6a..78e5dc68 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -113,6 +113,10 @@ $(document).ready(function(){
 					if (e.which == 2 || e.ctrlKey) //  open in new tab
 						return true;
 					if (!$(this).data('expanded')) {
+
+						if (~this.parentNode.className.indexOf('multifile'))
+							$(this).data('width') = this.parentNode.style.width;
+
 						this.parentNode.removeAttribute('style');
 						$(this).data('expanded', 'true');
 
@@ -144,7 +148,7 @@ $(document).ready(function(){
 						}
 
 						if (~this.parentNode.className.indexOf('multifile'))
-							this.parentNode.style.width = (parseInt($(this).data('width'))+40)+'px';
+							this.parentNode.style.width = $(this).data('width');
 
 						thumb.style.opacity = '';
 						thumb.style.display = '';
-- 
cgit v1.3


From 84bc3b0f7b7b60ee905167ee6390d4f7d241ca8e Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Sun, 8 Mar 2015 13:06:52 +0800
Subject: I forgot how to jQuery

---
 js/inline-expanding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 78e5dc68..5db95c09 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -115,7 +115,7 @@ $(document).ready(function(){
 					if (!$(this).data('expanded')) {
 
 						if (~this.parentNode.className.indexOf('multifile'))
-							$(this).data('width') = this.parentNode.style.width;
+							$(this).data('width', this.parentNode.style.width);
 
 						this.parentNode.removeAttribute('style');
 						$(this).data('expanded', 'true');
-- 
cgit v1.3


From e3dbca561601e39ca9235575ae55f5f7075d3fd9 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Fri, 20 Feb 2015 17:16:29 -0800
Subject: Add one click [-]/[+] to post-filter.js

---
 js/post-filter.js | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index b3f633f7..c2c5a764 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -365,6 +365,8 @@ if (active_page === 'thread' || active_page === 'index') {
 		function addMenuButton(ele, threadId, pageData) {
 			if ($(ele).find('.filter-btn').length)
 				$('.filter-btn').remove();
+			/*if ($(ele).find('.hide-thread-link').length)
+				$('.hide-thread-link').remove();*/
 
 			$(ele).find('.intro')
 				.append(
@@ -387,6 +389,23 @@ if (active_page === 'thread' || active_page === 'index') {
 							}
 						})
 				);
+
+			if ($(ele).hasClass('op') && !$(ele).find('.hide-thread-link').length) {
+				$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[' + ($(ele).data('hidden') == '1' ? '+' : '&ndash;') + ']</a>')
+					.insertBefore($(ele).find(':not(h2,h2 *):first'))
+					.click(function() {
+						var postId = $(ele).find('.post_no').not('[id]').text();
+						var hidden = ($(ele).data('hidden') == '1');
+					
+						if (hidden) {
+							blacklist.remove.post(pageData.boardId, threadId, postId, false);
+							$(this).html('[&ndash;]');
+						} else {
+							blacklist.add.post(pageData.boardId, threadId, postId, false);
+							$(this).text('[+]');
+						}
+					});
+			}
 		}
 
 		/*
@@ -758,7 +777,11 @@ if (active_page === 'thread' || active_page === 'index') {
 
 			// on new posts
 			$(document).on('new_post', function (e, post) {
-				var threadId = $(post).parent().attr('id').replace('thread_', '');
+				if ($(post).hasClass('reply')) {
+					var threadId = $(post).parent().attr('id').replace('thread_', '');
+				} else {
+					var threadId = $(post).attr('id').replace('thread_', '');
+				}
 
 				filter(post, threadId, pageData);
 				addMenuButton(post, threadId, pageData);
-- 
cgit v1.3


From af91ddf63737fb368c77860d9762cc062690c713 Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Tue, 24 Feb 2015 16:04:00 +0800
Subject: Split post menu into own function

---
 js/post-filter.js | 330 ++++++++++++++++++++++--------------------------------
 js/post-menu.js   | 209 ++++++++++++++++++++++++++++++++++
 2 files changed, 340 insertions(+), 199 deletions(-)
 create mode 100644 js/post-menu.js

diff --git a/js/post-filter.js b/js/post-filter.js
index c2c5a764..83684176 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -204,192 +204,150 @@ if (active_page === 'thread' || active_page === 'index') {
 		/* 
 		 *  create filter menu when the button is clicked
 		 */
-		function addMenu(e, ele, threadId, pageData) {
-
-			var $ele = $(ele);
-			var $buffer;
-
-			var postId = $ele.find('.post_no').not('[id]').text();
-			if (pageData.hasUID) {
-				var postUid = $ele.find('.poster_id').text();
-			}
-			var postName;
-			var postTrip = '';
-			if (!pageData.forcedAnon) {
-				postName = (typeof $ele.find('.name').contents()[0] == 'undefined') ? '' : $ele.find('.name').contents()[0].nodeValue.trim();
-				postTrip = $ele.find('.trip').text();
-			}
-
-			//  get the button's position
-			var pos = $(e.target).offset();
-
-			$buffer = $('<div class="filter-menu"></div>').append(
-				$('<ul>').append(
-					$('<li>', {id: 'filter-menu-unhide'}).text('Unhide post'),
-					$('<li>', {id: 'filter-menu-add'}).append(
-						$('<ul>').append(
-							$('<li>', {class: 'filter-post'}).text('Post'),
-							$('<li>', {class: 'filter-post-plus', title: 'Hide post and all replies'}).text('Post +'),
-							$('<li>', {class: 'filter-id'}).text('ID'),
-							$('<li>', {class: 'filter-id-plus', title: 'Hide ID and all replies'}).text('ID +'),
-							$('<li>', {class: 'filter-name'}).text('Name'),
-							$('<li>', {class: 'filter-trip'}).text('Tripcode')
-						),
-						'Add filter',
-						$('<span>', {class: 'filter-menu-arrow'}).append('»')
-					),
-					$('<li>', {id: 'filter-menu-remove'}).append(
-						$('<ul>').append(
-							$('<li>', {class: 'filter-id'}).text('ID'),
-							$('<li>', {class: 'filter-name'}).text('Name'),
-							$('<li>', {class: 'filter-trip'}).text('Tripcode')
-						),
-						'Remove filter',
-						$('<span>', {class: 'filter-menu-arrow'}).append('»')
-					)
-				)
-			);
-
-			/*  display logic and bind click handlers
-			 */
-
-			 // unhide button
-			if ($(ele).data('hidden') == '1' && $(ele).data('hiddenByUid') == '0' &&
-				$(ele).data('hiddenByName') == '0' && $(ele).data('hiddenByTrip') == '0') {
-				$buffer.find('#filter-menu-unhide').click(function () {
-					//  if hidden due to post id, remove it from blacklist
-					//  otherwise just show this post
-					blacklist.remove.post(pageData.boardId, threadId, postId);
-					show(ele);
-				});
-			} else {
-				$buffer.find('#filter-menu-unhide').addClass('hidden');
-			}
+		function initPostMenu(pageData) {
+
+			var submenu;
+			Menu.add_item('filter-menu-hide', 'Hide post');
+			Menu.add_item('filter-menu-unhide', 'Unhide post');
+
+			submenu = Menu.add_submenu('filter-menu-add', 'Add filter');
+				submenu.add_item('filter-add-post-plus', 'Post +', 'Hide post and all replies');
+				submenu.add_item('filter-add-id', 'ID');
+				submenu.add_item('filter-add-id-plus', 'ID +', 'Hide ID and all replies');
+				submenu.add_item('filter-add-name', 'Name');
+				submenu.add_item('filter-add-trip', 'Tripcode');
+
+			submenu = Menu.add_submenu('filter-menu-remove', 'Remove filter');
+				submenu.add_item('filter-remove-id', 'ID');
+				submenu.add_item('filter-remove-name', 'Name');
+				submenu.add_item('filter-remove-trip', 'Tripcode');
+
+			Menu.onclick(function (e, $buffer) {
+				var ele = e.target.parentElement.parentElement;
+				var $ele = $(ele);
+
+				var threadId = $ele.parent().attr('id').replace('thread_', '');
+				var postId = $ele.find('.post_no').not('[id]').text();
+				if (pageData.hasUID) {
+					var postUid = $ele.find('.poster_id').text();
+				}
 
-			//  post id
-			if ($(ele).data('hiddenByPost') == '0') {
-				$buffer.find('#filter-menu-add .filter-post').click(function () {
-					blacklist.add.post(pageData.boardId, threadId, postId, false);
-				});
-				$buffer.find('#filter-menu-add .filter-post-plus').click(function () {
-					blacklist.add.post(pageData.boardId, threadId, postId, true);
-				});
-			} else {
-				$buffer.find('#filter-menu-add .filter-post').addClass('hidden');
-				$buffer.find('#filter-menu-add .filter-post-plus').addClass('hidden');
-			}
+				var postName;
+				var postTrip = '';
+				if (!pageData.forcedAnon) {
+					postName = (typeof $ele.find('.name').contents()[0] == 'undefined') ? '' : $ele.find('.name').contents()[0].nodeValue.trim();
+					postTrip = $ele.find('.trip').text();
+				}
 
-			// UID
-			if (pageData.hasUID && $(ele).data('hiddenByUid') == '0') {
-				$buffer.find('#filter-menu-add .filter-id').click(function () {
-					blacklist.add.uid(pageData.boardId, threadId, postUid, false);
-				});
-				$buffer.find('#filter-menu-add .filter-id-plus').click(function () {
-					blacklist.add.uid(pageData.boardId, threadId, postUid, true);
-				});
+				/*  display logic and bind click handlers
+				 */
+
+				 // unhide button
+				if ($ele.data('hidden') == '1' && $ele.data('hiddenByUid') == '0' &&
+					$ele.data('hiddenByName') == '0' && $ele.data('hiddenByTrip') == '0') {
+					$buffer.find('#filter-menu-unhide').click(function () {
+						//  if hidden due to post id, remove it from blacklist
+						//  otherwise just show this post
+						blacklist.remove.post(pageData.boardId, threadId, postId);
+						show(ele);
+					});
+				} else {
+					$buffer.find('#filter-menu-unhide').addClass('hidden');
+				}
 
-				$buffer.find('#filter-menu-remove .filter-id').addClass('hidden');
-			} else  if (pageData.hasUID) {
-				$buffer.find('#filter-menu-remove .filter-id').click(function () {
-					blacklist.remove.uid(pageData.boardId, threadId, postUid);
-				});
+				//  post id
+				if ($ele.data('hiddenByPost') == '0') {
+					$buffer.find('#filter-menu-hide').click(function () {
+						blacklist.add.post(pageData.boardId, threadId, postId, false);
+					});
+					$buffer.find('#filter-add-post-plus').click(function () {
+						blacklist.add.post(pageData.boardId, threadId, postId, true);
+					});
+				} else {
+					$buffer.find('#filter-menu-hide').addClass('hidden');
+					$buffer.find('#filter-add-post-plus').addClass('hidden');
+				}
 
-				$buffer.find('#filter-menu-add .filter-id').addClass('hidden');
-				$buffer.find('#filter-menu-add .filter-id-plus').addClass('hidden');
-			} else {
-				// board doesn't use UID
-				$buffer.find('#filter-menu-add .filter-id').addClass('hidden');
-				$buffer.find('#filter-menu-add .filter-id-plus').addClass('hidden');
-				$buffer.find('#filter-menu-remove .filter-id').addClass('hidden');
-			}
+				// UID
+				if (pageData.hasUID && $ele.data('hiddenByUid') == '0') {
+					$buffer.find('#filter-add-id').click(function () {
+						blacklist.add.uid(pageData.boardId, threadId, postUid, false);
+					});
+					$buffer.find('#filter-add-id-plus').click(function () {
+						blacklist.add.uid(pageData.boardId, threadId, postUid, true);
+					});
 
-			//  name
-			if (!pageData.forcedAnon && $(ele).data('hiddenByName') == '0') {
-				$buffer.find('#filter-menu-add .filter-name').click(function () {
-					blacklist.add.name(postName);
-				});
+					$buffer.find('#filter-remove-id').addClass('hidden');
+				} else  if (pageData.hasUID) {
+					$buffer.find('#filter-remove-id').click(function () {
+						blacklist.remove.uid(pageData.boardId, threadId, postUid);
+					});
 
-				$buffer.find('#filter-menu-remove .filter-name').addClass('hidden');
-			} else if (!pageData.forcedAnon) {
-				$buffer.find('#filter-menu-remove .filter-name').click(function () {
-					blacklist.remove.name(postName);
-				});
+					$buffer.find('#filter-add-id').addClass('hidden');
+					$buffer.find('#filter-add-id-plus').addClass('hidden');
+				} else {
+					// board doesn't use UID
+					$buffer.find('#filter-add-id').addClass('hidden');
+					$buffer.find('#filter-add-id-plus').addClass('hidden');
+					$buffer.find('#filter-remove-id').addClass('hidden');
+				}
 
-				$buffer.find('#filter-menu-add .filter-name').addClass('hidden');
-			} else {
-				// board has forced anon
-				$buffer.find('#filter-menu-remove .filter-name').addClass('hidden');
-				$buffer.find('#filter-menu-add .filter-name').addClass('hidden');
-			}
+				//  name
+				if (!pageData.forcedAnon && $ele.data('hiddenByName') == '0') {
+					$buffer.find('#filter-add-name').click(function () {
+						blacklist.add.name(postName);
+					});
 
-			//  tripcode
-			if (!pageData.forcedAnon && $(ele).data('hiddenByTrip') == '0' && postTrip !== '') {
-				$buffer.find('#filter-menu-add .filter-trip').click(function () {
-					blacklist.add.trip(postTrip);
-				});
+					$buffer.find('#filter-remove-name').addClass('hidden');
+				} else if (!pageData.forcedAnon) {
+					$buffer.find('#filter-remove-name').click(function () {
+						blacklist.remove.name(postName);
+					});
 
-				$buffer.find('#filter-menu-remove .filter-trip').addClass('hidden');
-			} else if (!pageData.forcedAnon && postTrip !== '') {
-				$buffer.find('#filter-menu-remove .filter-trip').click(function () {
-					blacklist.remove.trip(postTrip);
-				});
+					$buffer.find('#filter-add-name').addClass('hidden');
+				} else {
+					// board has forced anon
+					$buffer.find('#filter-remove-name').addClass('hidden');
+					$buffer.find('#filter-add-name').addClass('hidden');
+				}
 
-				$buffer.find('#filter-menu-add .filter-trip').addClass('hidden');
-			} else {
-				// board has forced anon
-				$buffer.find('#filter-menu-remove .filter-trip').addClass('hidden');
-				$buffer.find('#filter-menu-add .filter-trip').addClass('hidden');
-			}
+				//  tripcode
+				if (!pageData.forcedAnon && $ele.data('hiddenByTrip') == '0' && postTrip !== '') {
+					$buffer.find('#filter-add-trip').click(function () {
+						blacklist.add.trip(postTrip);
+					});
 
-			/*  hide sub menus if all items are hidden
-			 */
-			if (!$buffer.find('#filter-menu-remove > ul').children().not('.hidden').length) {
-				$buffer.find('#filter-menu-remove').addClass('hidden');
-			}
-			if (!$buffer.find('#filter-menu-add > ul').children().not('.hidden').length) {
-				$buffer.find('#filter-menu-add').addClass('hidden');
-			}
+					$buffer.find('#filter-remove-trip').addClass('hidden');
+				} else if (!pageData.forcedAnon && postTrip !== '') {
+					$buffer.find('#filter-remove-trip').click(function () {
+						blacklist.remove.trip(postTrip);
+					});
 
-			/*  set menu position
-			 */
-			 $buffer.css({top: pos.top + 20, left: pos.left});
+					$buffer.find('#filter-add-trip').addClass('hidden');
+				} else {
+					// board has forced anon
+					$buffer.find('#filter-remove-trip').addClass('hidden');
+					$buffer.find('#filter-add-trip').addClass('hidden');
+				}
 
-			/*  finally append to page
-			 */
-			$('body').append($buffer);
+				/*  hide sub menus if all items are hidden
+				 */
+				if (!$buffer.find('#filter-menu-remove > ul').children().not('.hidden').length) {
+					$buffer.find('#filter-menu-remove').addClass('hidden');
+				}
+				if (!$buffer.find('#filter-menu-add > ul').children().not('.hidden').length) {
+					$buffer.find('#filter-menu-add').addClass('hidden');
+				}
+			});
 		}
 
 		/* 
 		 *  add menu button to the thread/post
 		 */
-		function addMenuButton(ele, threadId, pageData) {
-			if ($(ele).find('.filter-btn').length)
-				$('.filter-btn').remove();
+		function quickToggle(ele, threadId, pageData) {
 			/*if ($(ele).find('.hide-thread-link').length)
 				$('.hide-thread-link').remove();*/
 
-			$(ele).find('.intro')
-				.append(
-					$('<a>', {href: '#', class: 'filter-btn', title: 'Filter menu'})
-						.text('▶')
-						.click(function (e) {
-							//  button toggle
-							e.preventDefault();
-							//  remove existing menu
-							$('.filter-menu').remove();
-
-							if ($(e.target).hasClass('filter-btn-open')) {
-								$('.filter-btn-open').removeClass('filter-btn-open');
-							} else {
-								//  close previous button
-								$('.filter-btn-open').removeClass('filter-btn-open');
-								//  mark the menu button as open
-								$(ele).find('.filter-btn').addClass('filter-btn-open');
-								addMenu(e, ele, threadId, pageData);
-							}
-						})
-				);
-
 			if ($(ele).hasClass('op') && !$(ele).find('.hide-thread-link').length) {
 				$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[' + ($(ele).data('hidden') == '1' ? '+' : '&ndash;') + ']</a>')
 					.insertBefore($(ele).find(':not(h2,h2 *):first'))
@@ -528,22 +486,18 @@ if (active_page === 'thread' || active_page === 'index') {
 				}
 				// run filter on OP
 				filter(op, threadId, pageData);
-				addMenuButton(op, threadId, pageData);
+				quickToggle(op, threadId, pageData);
 
 				// iterate filter over each post
 				if ($(op).data('hidden') != '1' || active_page == 'thread') {
 					$thread.find('.reply').not('.hidden').each(function () {
 						filter(this, threadId, pageData);
-						addMenuButton(this, threadId, pageData);
 					});
 				}
 
 			});
 		 }
 
-		/* 
-		 *  
-		 */
 		function initStyle() {
 			var $ele, cssStyle, cssString;
 
@@ -552,23 +506,7 @@ if (active_page === 'thread' || active_page === 'index') {
 			cssStyle.hoverBg = $('body').css('background-color');
 			$ele.remove();
 
-			cssString =
-				'\n/*** Generated by post-filter ***/\n' +
-				'.filter-menu {position: absolute; font-size: 12px; line-height: 1.3em;}\n' +
-				'.filter-menu ul {\n' +
-				'    background-color: '+ cssStyle['background-color'] +'; border: 1px solid '+ cssStyle['border-color'] +'; border-right-width: 2px;\n' +
-				'    list-style: none; padding: 0; margin: 0; white-space: nowrap;\n}\n' +
-				'.filter-menu li {cursor: pointer; position: relative; padding: 4px 4px; vertical-align: middle; border-bottom: 1px solid '+ cssStyle['border-color'] +'; white-space: normal; width: 90px;}\n' +
-				'.filter-menu li:hover {background-color: '+ cssStyle.hoverBg +';}\n' +
-				'.filter-menu ul ul {display: none; position: absolute;}\n' +
-				'.filter-menu li:hover ul {display: block; left: 100%; margin-top: -3px;}\n' +
-				'.filter-menu li ul li {white-space: nowrap; width: auto;}\n' +
-				'.filter-menu-arrow {float: right; margin-left: 10px;}\n' +
-				'.filter-menu.hidden, .filter-menu .hidden {display: none;}\n' +
-				'.filter-btn {transition: transform 0.1s; width: 15px; text-align: center; font-size: 12pt; opacity: 0.8; text-decoration: none; margin: -6px 0px; display: inline-block;}\n' +
-				'.filter-btn:hover {opacity: 1;}\n' +
-				'.filter-btn-open {transform: rotate(90deg);}\n';
-			cssString +=
+			cssString = '\n/*** Generated by post-filter ***/\n' +
 				'#filter-control #clear {float: right;}\n' +
 				'#filter-container {margin-top: 20px; border: 1px solid; height: 270px; overflow: auto;}\n' +
 				'#filter-list {width: 100%; border-collapse: collapse;}\n' +
@@ -764,27 +702,21 @@ if (active_page === 'thread' || active_page === 'index') {
 
 			initStyle();
 			initOptionsPanel();
+			initPostMenu(pageData);
 			filterPage(pageData);
 
-			// menu close click handler
-			$(document).on('click', function (e){
-				if ($(e.target).hasClass('filter-btn'))
-					return;
-
-				$('.filter-menu').remove();
-				$('.filter-btn-open').removeClass('filter-btn-open');
-			});
-
 			// on new posts
 			$(document).on('new_post', function (e, post) {
+				var threadId;
+
 				if ($(post).hasClass('reply')) {
-					var threadId = $(post).parent().attr('id').replace('thread_', '');
+					threadId = $(post).parent().attr('id').replace('thread_', '');
 				} else {
-					var threadId = $(post).attr('id').replace('thread_', '');
+					threadId = $(post).attr('id').replace('thread_', '');
 				}
 
 				filter(post, threadId, pageData);
-				addMenuButton(post, threadId, pageData);
+				quickToggle(post, threadId, pageData);
 			});
 
 			$(document).on('filter_page', function () {
diff --git a/js/post-menu.js b/js/post-menu.js
new file mode 100644
index 00000000..edf66ebb
--- /dev/null
+++ b/js/post-menu.js
@@ -0,0 +1,209 @@
+/*
+ * post-menu.js - adds dropdown menu to posts
+ *
+ * Creates a global Menu object with four public methods:
+ *
+ *   Menu.onclick(fnc)
+ *     registers a function to be executed after button click, before the menu is displayed
+ *   Menu.add_item(id, text[, title])
+ *     adds an item to the top level of menu
+ *   Menu.add_submenu(id, text)
+ *     creates and returns a List object through which to manipulate the content of the submenu
+ *   Menu.get_submenu(id)
+ *     returns the submenu with the specified id from the top level menu
+ *
+ *   The List object contains all the methods from Menu except onclick()
+ *
+ *   Example usage:
+ *     Menu.add_item('filter-menu-hide', 'Hide post');
+ *     Menu.add_item('filter-menu-unhide', 'Unhide post');
+ *
+ *     submenu = Menu.add_submenu('filter-menu-add', 'Add filter');
+ *         submenu.add_item('filter-add-post-plus', 'Post +', 'Hide post and all replies');
+ *         submenu.add_item('filter-add-id', 'ID');
+ *  
+ * Usage:
+ *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/post-menu.js';
+ */
+(function () {
+
+var List = function (menuId, text) {
+	this.id = menuId;
+	this.text = text;
+	this.items = [];
+
+	this.add_item = function (itemId, text, title) {
+		this.items.push(new Item(itemId, text, title));
+	};
+	this.list_items = function () {
+		var array = [];
+		var i, length, obj, $ele;
+
+		if ($.isEmptyObject(this.items))
+			return;
+
+		length = this.items.length;
+		for (i = 0; i < length; i++) {
+			obj = this.items[i];
+
+			$ele = $('<li>', {id: obj.id}).text(obj.text);
+			if ('title' in obj) $ele.attr('title', obj.title);
+
+			if (obj instanceof Item) {
+				$ele.addClass('post-item');
+			} else {
+				$ele.addClass('post-submenu');
+
+				$ele.prepend(obj.list_items());
+				$ele.append($('<span>', {class: 'post-menu-arrow'}).text('»'));
+			}
+
+			array.push($ele);
+		}
+
+		return $('<ul>').append(array);
+	};
+	this.add_submenu = function (menuId, text) {
+		var ele = new List(menuId, text);
+		this.items.push(ele);
+		return ele;
+	};
+	this.get_submenu = function (menuId) {
+		for (var i = 0; i < this.items.length; i++) {
+			if ((this.items[i] instanceof Item) || this.items[i].id != menuId) continue;
+			return this.items[i];
+		}
+	};
+};
+
+var Item = function (itemId, text, title) {
+	this.id = itemId;
+	this.text = text;
+
+	// optional
+	if (typeof title != 'undefined') this.title = title;
+};
+
+function buildMenu(e) {
+	var pos = $(e.target).offset();
+	var i, length;
+
+	var $menu = $('<div class="post-menu"></div>').append(mainMenu.list_items());
+
+	//  execute registered click handlers
+	length = onclick_callbacks.length;
+	for (i = 0; i < length; i++) {
+		onclick_callbacks[i](e, $menu);
+	}
+
+	//  set menu position and append to page
+	 $menu.css({top: pos.top, left: pos.left + 20});
+	 $('body').append($menu);
+}
+
+function addButton(post) {
+	var $ele = $(post);
+	$ele.find('input.delete').after(
+		$('<a>', {href: '#', class: 'post-btn', title: 'Post menu'}).text('▶')
+	);
+}
+
+
+/* * * * * * * * * *
+    Public methods
+ * * * * * * * * * */
+var Menu = {};
+var mainMenu = new List();
+var onclick_callbacks = [];
+
+Menu.onclick = function (fnc) {
+	onclick_callbacks.push(fnc);
+};
+
+Menu.add_item = function (itemId, text, title) {
+	mainMenu.add_item(itemId, text, title);
+};
+
+Menu.add_submenu = function (menuId, text) {
+	return mainMenu.add_submenu(menuId, text);
+};
+
+Menu.get_submenu = function (id) {
+	return mainMenu.get_submenu(id);
+};
+
+
+/* * * * * * * *
+    Initialize
+ * * * * * * * */
+
+/*  Styling
+ */
+var $ele, cssStyle, cssString;
+
+$ele = $('<div>').addClass('post reply').hide().appendTo('body');
+cssStyle = $ele.css(['border-top-color']);
+cssStyle.hoverBg = $('body').css('background-color');
+$ele.remove();
+
+cssString =
+	'\n/*** Generated by post-menu ***/\n' +
+	'.post-menu {position: absolute; font-size: 12px; line-height: 1.3em;}\n' +
+	'.post-menu ul {\n' +
+	'    background-color: '+ cssStyle['border-top-color'] +'; border: 1px solid #666;\n' +
+	'    list-style: none; padding: 0; margin: 0; white-space: nowrap;\n}\n' +
+	'.post-menu .post-submenu{white-space: normal; width: 90px;}' +
+	'.post-menu .post-submenu>ul{white-space: nowrap; width: auto;}' +
+	'.post-menu li {cursor: pointer; position: relative; padding: 4px 4px; vertical-align: middle;}\n' +
+	'.post-menu li:hover {background-color: '+ cssStyle.hoverBg +';}\n' +
+	'.post-menu ul ul {display: none; position: absolute;}\n' +
+	'.post-menu li:hover>ul {display: block; left: 100%; margin-top: -3px;}\n' +
+	'.post-menu-arrow {float: right; margin-left: 10px;}\n' +
+	'.post-menu.hidden, .post-menu .hidden {display: none;}\n' +
+	'.post-btn {transition: transform 0.1s; width: 15px; text-align: center; font-size: 10pt; opacity: 0.8; text-decoration: none; margin: -6px 0px 0px -5px !important; display: inline-block;}\n' +
+	'.post-btn:hover {opacity: 1;}\n' +
+	'.post-btn-open {transform: rotate(90deg);}\n';
+
+if (!$('style.generated-css').length) $('<style class="generated-css">').appendTo('head');
+$('style.generated-css').html($('style.generated-css').html() + cssString);
+
+/*  Add buttons
+ */
+$('.reply:not(.hidden), .thread>.op').each(function () {
+	addButton(this);
+ });
+
+ /*  event handlers
+  */
+$('form[name=postcontrols]').on('click', '.post-btn', function (e) {
+	e.preventDefault();
+	var post = e.target.parentElement.parentElement;
+	$('.post-menu').remove();
+
+	if ($(e.target).hasClass('post-btn-open')) {
+		$('.post-btn-open').removeClass('post-btn-open');
+	} else {
+		//  close previous button
+		$('.post-btn-open').removeClass('post-btn-open');
+		$(post).find('.post-btn').addClass('post-btn-open');
+
+		buildMenu(e);
+	}
+});
+
+$(document).on('click', function (e){
+	if ($(e.target).hasClass('post-btn') || $(e.target).hasClass('post-submenu'))
+		return;
+
+	$('.post-menu').remove();
+	$('.post-btn-open').removeClass('post-btn-open');
+});
+
+// on new posts
+$(document).on('new_post', function (e, post) {
+	addButton(post);
+});
+
+window.Menu = Menu;
+})();
-- 
cgit v1.3


From b46985512639503ba1f18288eab65e3cdde1aa96 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sat, 28 Feb 2015 05:09:37 -0800
Subject: use onready in post-menu.js

---
 js/post-menu.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/post-menu.js b/js/post-menu.js
index edf66ebb..7d83709a 100644
--- a/js/post-menu.js
+++ b/js/post-menu.js
@@ -26,7 +26,7 @@
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/post-menu.js';
  */
-(function () {
+onready(function () {
 
 var List = function (menuId, text) {
 	this.id = menuId;
@@ -206,4 +206,4 @@ $(document).on('new_post', function (e, post) {
 });
 
 window.Menu = Menu;
-})();
+});
-- 
cgit v1.3


From f84d0b90276055d896740e9de02deda29d1d5ac3 Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Tue, 24 Feb 2015 16:30:51 +0800
Subject: Changed 'hide post' button behavior

---
 js/post-filter.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 83684176..57c37c9b 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -243,28 +243,27 @@ if (active_page === 'thread' || active_page === 'index') {
 				 */
 
 				 // unhide button
-				if ($ele.data('hidden') == '1' && $ele.data('hiddenByUid') == '0' &&
-					$ele.data('hiddenByName') == '0' && $ele.data('hiddenByTrip') == '0') {
+				if ($ele.data('hidden') == '1') {
 					$buffer.find('#filter-menu-unhide').click(function () {
 						//  if hidden due to post id, remove it from blacklist
 						//  otherwise just show this post
 						blacklist.remove.post(pageData.boardId, threadId, postId);
 						show(ele);
 					});
+					$buffer.find('#filter-menu-hide').addClass('hidden');
 				} else {
 					$buffer.find('#filter-menu-unhide').addClass('hidden');
+					$buffer.find('#filter-menu-hide').click(function () {
+						blacklist.add.post(pageData.boardId, threadId, postId, false);
+					});
 				}
 
 				//  post id
 				if ($ele.data('hiddenByPost') == '0') {
-					$buffer.find('#filter-menu-hide').click(function () {
-						blacklist.add.post(pageData.boardId, threadId, postId, false);
-					});
 					$buffer.find('#filter-add-post-plus').click(function () {
 						blacklist.add.post(pageData.boardId, threadId, postId, true);
 					});
 				} else {
-					$buffer.find('#filter-menu-hide').addClass('hidden');
 					$buffer.find('#filter-add-post-plus').addClass('hidden');
 				}
 
-- 
cgit v1.3


From 8f6ea6dd94cfd62eeee366b4f70b4cda907affb9 Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Thu, 26 Feb 2015 00:05:43 +0800
Subject: post-filter.js restructure

- Changed how filters are stored. Have included code to migrate from
previous version
- Added support for 'subject' and 'comment' in the options panel
- Added regex support in the options panel
---
 js/post-filter.js | 363 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 226 insertions(+), 137 deletions(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 57c37c9b..154a5c32 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -27,34 +27,42 @@ if (active_page === 'thread' || active_page === 'index') {
 			list.nextPurge[boardId][threadId] = {timestamp: timestamp(), interval: 86400};  // 86400 seconds == 1 day
 		}
 
-		var blacklist = {
-			add: {
-				name: function (posterName) {
-					var list = getList();
-					var filter = list.nameFilter;
+		function addFilter(type, value, useRegex) {
+			var list = getList();
+			var filter = list.generalFilter;
+			var obj = {
+				type: type,
+				value: value,
+				regex: useRegex
+			};
 
-					for (var i in filter) {
-						if (filter[i].name == posterName) return;
-					}
-					filter.push({
-						name: posterName
-					});
-					setList(list);
-					drawFilterList();
-				},
-				trip: function (posterTrip) {
-					var list = getList();
-					var filter = list.nameFilter;
+			for (var i=0; i<filter.length; i++) {
+				if (filter[i].type == type && filter[i].value == value && filter[i].regex == useRegex)
+					return;
+			}
 
-					for (var i in filter) {
-						if (filter[i].trip == posterTrip) return;
-					}
-					filter.push({
-						trip: posterTrip
-					});
-					setList(list);
-					drawFilterList();
-				},
+			filter.push(obj);
+			setList(list);
+			drawFilterList();
+		}
+
+		function removeFilter(type, value, useRegex) {
+			var list = getList();
+			var filter = list.generalFilter;
+
+			for (var i=0; i<filter.length; i++) {
+				if (filter[i].type == type && filter[i].value == value && filter[i].regex == useRegex) {
+					filter.splice(i, 1);
+					break;
+				}
+			}
+
+			setList(list);
+			drawFilterList();
+		}
+
+		var blacklist = {
+			add: {
 				post: function (boardId, threadId, postId, hideReplies) {
 					var list = getList();
 					var filter = list.postFilter;
@@ -87,32 +95,6 @@ if (active_page === 'thread' || active_page === 'index') {
 				}
 			},
 			remove: {
-				name: function (posterName) {
-					var list = getList();
-					var filter = list.nameFilter;
-
-					for (var i=0; i<filter.length; i++) {
-						if (filter[i].name == posterName) {
-							filter.splice(i, 1);
-							break;
-						}
-					}
-					setList(list);
-					drawFilterList();
-				},
-				trip: function (posterTrip) {
-					var list = getList();
-					var filter = list.nameFilter;
-
-					for (var i=0; i<filter.length; i++) {
-						if (filter[i].trip == posterTrip) {
-							filter.splice(i, 1);
-							break;
-						}
-					}
-					setList(list);
-					drawFilterList();
-				},
 				post: function (boardId, threadId, postId) {
 					var list = getList();
 					var filter = list.postFilter;
@@ -174,10 +156,10 @@ if (active_page === 'thread' || active_page === 'index') {
 		function hide(ele) {
 			var $ele = $(ele);
 
-			if ($(ele).data('hidden') === '1')
+			if ($(ele).data('hidden'))
 				return;
 
-			$(ele).data('hidden', '1');
+			$(ele).data('hidden', true);
 			if ($ele.hasClass('op')) {
 				$ele.parent().find('.body, .files, .video-container').not($ele.children('.reply').children()).hide();
 
@@ -191,7 +173,7 @@ if (active_page === 'thread' || active_page === 'index') {
 		function show(ele) {
 			var $ele = $(ele);
 
-			$(ele).data('hidden', '0');
+			$(ele).data('hidden', false);
 			if ($ele.hasClass('op')) {
 				$ele.parent().find('.body, .files, .video-container').show();
 				if (active_page == 'index') $ele.parent().find('.omitted, .reply:not(.hidden), post_no, .mentioned, br').show();
@@ -243,7 +225,7 @@ if (active_page === 'thread' || active_page === 'index') {
 				 */
 
 				 // unhide button
-				if ($ele.data('hidden') == '1') {
+				if ($ele.data('hidden')) {
 					$buffer.find('#filter-menu-unhide').click(function () {
 						//  if hidden due to post id, remove it from blacklist
 						//  otherwise just show this post
@@ -259,7 +241,7 @@ if (active_page === 'thread' || active_page === 'index') {
 				}
 
 				//  post id
-				if ($ele.data('hiddenByPost') == '0') {
+				if (!$ele.data('hiddenByPost')) {
 					$buffer.find('#filter-add-post-plus').click(function () {
 						blacklist.add.post(pageData.boardId, threadId, postId, true);
 					});
@@ -268,7 +250,7 @@ if (active_page === 'thread' || active_page === 'index') {
 				}
 
 				// UID
-				if (pageData.hasUID && $ele.data('hiddenByUid') == '0') {
+				if (pageData.hasUID && !$ele.data('hiddenByUid')) {
 					$buffer.find('#filter-add-id').click(function () {
 						blacklist.add.uid(pageData.boardId, threadId, postUid, false);
 					});
@@ -277,7 +259,7 @@ if (active_page === 'thread' || active_page === 'index') {
 					});
 
 					$buffer.find('#filter-remove-id').addClass('hidden');
-				} else  if (pageData.hasUID) {
+				} else if (pageData.hasUID) {
 					$buffer.find('#filter-remove-id').click(function () {
 						blacklist.remove.uid(pageData.boardId, threadId, postUid);
 					});
@@ -292,15 +274,15 @@ if (active_page === 'thread' || active_page === 'index') {
 				}
 
 				//  name
-				if (!pageData.forcedAnon && $ele.data('hiddenByName') == '0') {
+				if (!pageData.forcedAnon && !$ele.data('hiddenByName')) {
 					$buffer.find('#filter-add-name').click(function () {
-						blacklist.add.name(postName);
+						addFilter('name', postName, false);
 					});
 
 					$buffer.find('#filter-remove-name').addClass('hidden');
 				} else if (!pageData.forcedAnon) {
 					$buffer.find('#filter-remove-name').click(function () {
-						blacklist.remove.name(postName);
+						removeFilter('name', postName, false);
 					});
 
 					$buffer.find('#filter-add-name').addClass('hidden');
@@ -311,15 +293,15 @@ if (active_page === 'thread' || active_page === 'index') {
 				}
 
 				//  tripcode
-				if (!pageData.forcedAnon && $ele.data('hiddenByTrip') == '0' && postTrip !== '') {
+				if (!pageData.forcedAnon && !$ele.data('hiddenByTrip') && postTrip !== '') {
 					$buffer.find('#filter-add-trip').click(function () {
-						blacklist.add.trip(postTrip);
+						addFilter('trip', postTrip, false);
 					});
 
 					$buffer.find('#filter-remove-trip').addClass('hidden');
 				} else if (!pageData.forcedAnon && postTrip !== '') {
 					$buffer.find('#filter-remove-trip').click(function () {
-						blacklist.remove.trip(postTrip);
+						removeFilter('trip', postTrip, false);
 					});
 
 					$buffer.find('#filter-add-trip').addClass('hidden');
@@ -341,18 +323,18 @@ if (active_page === 'thread' || active_page === 'index') {
 		}
 
 		/* 
-		 *  add menu button to the thread/post
+		 *  hide/unhide thread on index view
 		 */
 		function quickToggle(ele, threadId, pageData) {
 			/*if ($(ele).find('.hide-thread-link').length)
 				$('.hide-thread-link').remove();*/
 
 			if ($(ele).hasClass('op') && !$(ele).find('.hide-thread-link').length) {
-				$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[' + ($(ele).data('hidden') == '1' ? '+' : '&ndash;') + ']</a>')
+				$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[' + ($(ele).data('hidden') ? '+' : '&ndash;') + ']</a>')
 					.insertBefore($(ele).find(':not(h2,h2 *):first'))
 					.click(function() {
 						var postId = $(ele).find('.post_no').not('[id]').text();
-						var hidden = ($(ele).data('hidden') == '1');
+						var hidden = $(ele).data('hidden');
 					
 						if (hidden) {
 							blacklist.remove.post(pageData.boardId, threadId, postId, false);
@@ -375,8 +357,8 @@ if (active_page === 'thread' || active_page === 'index') {
 			var $post = $(post);
 			var list = getList();
 			var postId = $post.find('.post_no').not('[id]').text();
-			var name, trip, uid;
-			var i, array;  // temp variables
+			var name, trip, uid, subject, comment;
+			var i, length, array, rule, pattern;  // temp variables
 
 			var boardId     = pageData.boardId;
 			var localList   = pageData.localList;
@@ -384,11 +366,16 @@ if (active_page === 'thread' || active_page === 'index') {
 			var hasUID      = pageData.hasUID;
 			var forcedAnon  = pageData.forcedAnon;
 
-			$post.data('hidden', '0');
-			$post.data('hiddenByUid', '0');
-			$post.data('hiddenByPost', '0');
-			$post.data('hiddenByName', '0');
-			$post.data('hiddenByTrip', '0');
+			var hasTrip = ($post.find('.trip').length > 0);
+			var hasSub = ($post.find('.subject').length > 0);
+
+			$post.data('hidden', false);
+			$post.data('hiddenByUid', false);
+			$post.data('hiddenByPost', false);
+			$post.data('hiddenByName', false);
+			$post.data('hiddenByTrip', false);
+			$post.data('hiddenBySubject', false);
+			$post.data('hiddenByComment', false);
 
 			// add post with matched UID to localList
 			if (hasUID &&
@@ -399,7 +386,7 @@ if (active_page === 'thread' || active_page === 'index') {
 
 				for (i=0; i<array.length; i++) {
 					if (array[i].uid == uid) {
-						$post.data('hiddenByUid', '1');
+						$post.data('hiddenByUid', true);
 						localList.push(postId);
 						if (array[i].hideReplies) noReplyList.push(postId);
 						break;
@@ -410,23 +397,83 @@ if (active_page === 'thread' || active_page === 'index') {
 			// match localList
 			if (localList.length) {
 				if ($.inArray(postId, localList) != -1) {
-					if ($post.data('hiddenByUid') != '1') $post.data('hiddenByPost', '1');
+					if ($post.data('hiddenByUid') !== true) $post.data('hiddenByPost', true);
 					hide(post);
 				}
 			}
 
-			// match poster name and tripcode
-			if (!forcedAnon) {
+			// matches generalFilter
+			if (!forcedAnon)
 				name = (typeof $post.find('.name').contents()[0] == 'undefined') ? '' : $post.find('.name').contents()[0].nodeValue.trim();
-				if ($(list.nameFilter).filter(function(){if (this.name == name) return true;}).length) {
-					$post.data('hiddenByName', '1');
-					hide(post);
-				}
-				if ($post.find('.trip').length) {
-					trip = $post.find('.trip').text();
-					if ($(list.nameFilter).filter(function(){if (this.trip == trip) return true;}).length) {
-						$post.data('hiddenByTrip', '1');
-						hide(post);
+			if (!forcedAnon && hasTrip)
+				trip = $post.find('.trip').text();
+			if (hasSub)
+				subject = ' '+ $post.find('.subject').text() +' ';
+
+			array = $post.find('.body').contents().filter(function () {if ($(this).text() !== '') return true;}).toArray();
+			array = $.map(array, function (ele) {
+				return $(ele).text();
+			});
+			comment = ' '+ array.join(' ') +' ';
+
+
+			for (i = 0, length = list.generalFilter.length; i < length; i++) {
+				rule = list.generalFilter[i];
+
+				if (rule.regex) {
+					pattern = new RegExp(rule.value);
+					switch (rule.type) {
+						case 'name':
+							if (!forcedAnon && pattern.test(name)) {
+								$post.data('hiddenByName', true);
+								hide(post);
+							}
+							break;
+						case 'trip':
+							if (!forcedAnon && pattern.test(trip)) {
+								$post.data('hiddenByTrip', true);
+								hide(post);
+							}
+							break;
+						case 'sub':
+							if (hasSub && pattern.test(subject)) {
+								$post.data('hiddenBySubject', true);
+								hide(post);
+							}
+							break;
+						case 'com':
+							if (pattern.test(comment)) {
+								$post.data('hiddenByComment', true);
+								hide(post);
+							}
+							break;
+					}
+				} else {
+					switch (rule.type) {
+						case 'name':
+							if (!forcedAnon && rule.value == name) {
+								$post.data('hiddenByName', true);
+								hide(post);
+							}
+							break;
+						case 'trip':
+							if (!forcedAnon && hasTrip && rule.value == trip) {
+								$post.data('hiddenByTrip', true);
+								hide(post);
+							}
+							break;
+						case 'sub':
+							if (hasSub && subject.indexOf(' '+ rule.value +' ') != -1) {
+								$post.data('hiddenBySubject', true);
+								hide(post);
+							}
+							break;
+						case 'com':
+							if (comment.indexOf(' '+ rule.value +' ') != -1) {
+								$post.data('hiddenByComment', true);
+								hide(post);
+							}
+							break;
 					}
 				}
 			}
@@ -445,12 +492,11 @@ if (active_page === 'thread' || active_page === 'index') {
 			});
 
 			// post didn't match any filters
-			if ((typeof $post.data('hidden') == 'undefined' || $post.data('hidden') == '0') &&
-				$post.data('hiddenByUid') === '0' &&
-				$post.data('hiddenByUid') == $post.data('hiddenByPost') == $post.data('hiddenByName') == $post.data('hiddenByTrip')) {
+			if (!$post.data('hidden')) {
 				show(post);
 			}
 		}
+
 		/*  (re)runs the filter on the entire page
 		 */
 		 function filterPage(pageData) {
@@ -471,16 +517,14 @@ if (active_page === 'thread' || active_page === 'index') {
 				var i, array;  // temp variables
 
 				// add posts to localList and noReplyList
-				if (typeof list.postFilter[pageData.boardId] != 'undefined') {
+				if (typeof list.postFilter[pageData.boardId] != 'undefined' && typeof list.postFilter[pageData.boardId][threadId] != 'undefined') {
 					array = list.postFilter[pageData.boardId][threadId];
-					if (typeof array != 'undefined') {
-						for (i=0; i<array.length; i++) {
-							if ( typeof array[i].post == 'undefined')
-								continue;
+					for (i=0; i<array.length; i++) {
+						if ( typeof array[i].post == 'undefined')
+							continue;
 
-							pageData.localList.push(array[i].post);
-							if (array[i].hideReplies) pageData.noReplyList.push(array[i].post);
-						}
+						pageData.localList.push(array[i].post);
+						if (array[i].hideReplies) pageData.noReplyList.push(array[i].post);
 					}
 				}
 				// run filter on OP
@@ -488,7 +532,7 @@ if (active_page === 'thread' || active_page === 'index') {
 				quickToggle(op, threadId, pageData);
 
 				// iterate filter over each post
-				if ($(op).data('hidden') != '1' || active_page == 'thread') {
+				if (!$(op).data('hidden') || active_page == 'thread') {
 					$thread.find('.reply').not('.hidden').each(function () {
 						filter(this, threadId, pageData);
 					});
@@ -506,6 +550,8 @@ if (active_page === 'thread' || active_page === 'index') {
 			$ele.remove();
 
 			cssString = '\n/*** Generated by post-filter ***/\n' +
+				'#filter-control input[type=text] {width: 130px;}' +
+				'#filter-control input[type=checkbox] {vertical-align: middle;}' +
 				'#filter-control #clear {float: right;}\n' +
 				'#filter-container {margin-top: 20px; border: 1px solid; height: 270px; overflow: auto;}\n' +
 				'#filter-list {width: 100%; border-collapse: collapse;}\n' +
@@ -524,33 +570,40 @@ if (active_page === 'thread' || active_page === 'index') {
 		}
 
 		function drawFilterList() {
-			var list = getList().nameFilter;
+			var list = getList().generalFilter;
 			var $ele = $('#filter-list');
-			var $row;
-			var type, val;
-			var i, length, obj;
+			var $row, i, length, obj, val;
+
+			var typeName = {
+				name: 'name',
+				trip: 'tripcode',
+				sub: 'subject',
+				com: 'comment'
+			};
 
 			$ele.empty();
 
 			$ele.append('<tr id="header"><th>Type</th><th>Content</th><th>Remove</th></tr>');
 			for (i = 0, length = list.length; i < length; i++) {
 				obj = list[i];
-				for (type in obj) {
-					val = obj[type];
-					$row = $('<tr>');
-					$row.append(
-								'<td>'+ type +'</td>',
-								'<td>'+ val +'</td>',
-								$('<td>').append(
-									$('<a>').html('X')
-										.addClass('del-btn')
-										.attr('href', '#')
-										.attr('data-type', type)
-										.attr('data-val', val)
-								)
-							);
-					$ele.append($row);
-				}
+
+				// display formatting
+				val = (obj.regex) ? '/'+ obj.value +'/' : obj.value;
+
+				$row = $('<tr>');
+				$row.append(
+							'<td>'+ typeName[obj.type] +'</td>',
+							'<td>'+ val +'</td>',
+							$('<td>').append(
+								$('<a>').html('X')
+									.addClass('del-btn')
+									.attr('href', '#')
+									.data('type', obj.type)
+									.data('val', obj.value)
+									.data('useRegex', obj.regex)
+							)
+						);
+				$ele.append($row);
 			}
 		}
 
@@ -559,9 +612,15 @@ if (active_page === 'thread' || active_page === 'index') {
 				Options.add_tab('filter', 'list', 'Filters');
 				Options.extend_tab('filter',
 					'<div id="filter-control">' +
-						'<input id="input" type="text"></input>' +
-						'<button id="name">Add Name</button>' +
-						'<button id="trip">Add Tripcode</button>' +
+						'<select>' +
+							'<option value="name">Name</option>' +
+							'<option value="trip">Tripcode</option>' +
+							'<option value="sub">Subject</option>' +
+							'<option value="com">Comment</option>' +
+						'</select>' +
+						'<input type="text"></input>' +
+						'<input type="checkbox">regex</input>' +
+						'<button id="set-filter">Add</button>' +
 						'<button id="clear">Clear all filters</button>' +
 						'<div id="confirm" class="hidden">' +
 							'This will clear all filtering rules including hidden posts. <a id="confirm-y" href="#">yes</a> | <a id="confirm-n" href="#">no</a>' +
@@ -572,15 +631,16 @@ if (active_page === 'thread' || active_page === 'index') {
 				drawFilterList();
 
 				// control buttons
-				$('#filter-control').on('click', '#name', function () {
-					var str = $('#filter-control #input').val().trim();
-					$('#filter-control #input').val('');
-					blacklist.add.name(str);
-				});
-				$('#filter-control').on('click', '#trip', function () {
-					var str = $('#filter-control #input').val().trim();
-					$('#filter-control #input').val('');
-					blacklist.add.trip(str);
+				$('#filter-control').on('click', '#set-filter', function () {
+					var type = $('#filter-control select option:selected').val();
+					var value = $('#filter-control input[type=text]').val();
+					var useRegex = $('#filter-control input[type=checkbox]').prop('checked');
+
+					//clear the input form
+					$('#filter-control input[type=text]').val('');
+
+					addFilter(type, value, useRegex);
+					drawFilterList();
 				});
 				$('#filter-control').on('click', '#clear', function () {
 					$('#filter-control #clear').addClass('hidden');
@@ -592,7 +652,7 @@ if (active_page === 'thread' || active_page === 'index') {
 					$('#filter-control #clear').removeClass('hidden');
 					$('#filter-control #confirm').addClass('hidden');
 					setList({
-						nameFilter: [],
+						generalFilter: [],
 						postFilter: {},
 						nextPurge: {},
 						lastPurge: timestamp()
@@ -612,9 +672,11 @@ if (active_page === 'thread' || active_page === 'index') {
 					e.preventDefault();
 
 					var $ele = $(e.target);
-					var type = $ele.attr('data-type');
-					var val = $ele.attr('data-val');
-					blacklist.remove[type](val);
+					var type = $ele.data('type');
+					var val = $ele.data('val');
+					var useRegex = $ele.data('useRegex');
+
+					removeFilter(type, val, useRegex);
 				});
 			}
 		}
@@ -684,13 +746,40 @@ if (active_page === 'thread' || active_page === 'index') {
 		function init() {
 			if (typeof localStorage.postFilter === 'undefined') {
 				localStorage.postFilter = JSON.stringify({
-					nameFilter: [],
+					generalFilter: [],
 					postFilter: {},
 					nextPurge: {},
 					lastPurge: timestamp()
 				});
 			}
 
+			/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+			 *  Migrate from previous version of post filter
+			 *  Remember to remove next time anyone touches this file
+			 */
+			(function () {
+				var list = getList();
+				if (typeof list.nameFilter != 'undefined') {
+					var filter = list.nameFilter;
+					list.generalFilter = [];
+
+					for (var i = 0; i < filter.length; i++) {
+						var obj = filter[i];
+						for (var key in obj) {
+							list.generalFilter.push({
+								type: key,
+								value: obj[key],
+								regex: false
+							});
+						}
+					}
+
+					delete list.nameFilter;
+					localStorage.postFilter = JSON.stringify(list);
+				}
+			})();
+			/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 			var pageData = {
 				boardId: board_name,  // get the id from the global variable
 				localList: [],  // all the blacklisted post IDs or UIDs that apply to the current page
-- 
cgit v1.3


From dc725641c35184e7d1854900f9adb71d0c543ee5 Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Thu, 26 Feb 2015 02:39:34 +0800
Subject: minor options template adjustment

---
 js/post-filter.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 154a5c32..9ec28262 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -618,8 +618,9 @@ if (active_page === 'thread' || active_page === 'index') {
 							'<option value="sub">Subject</option>' +
 							'<option value="com">Comment</option>' +
 						'</select>' +
-						'<input type="text"></input>' +
-						'<input type="checkbox">regex</input>' +
+						'<input type="text">' +
+						'<input type="checkbox">' +
+						'regex ' +
 						'<button id="set-filter">Add</button>' +
 						'<button id="clear">Clear all filters</button>' +
 						'<div id="confirm" class="hidden">' +
-- 
cgit v1.3


From 513c8f7b68ba17bbd3356af4301d8e5f3342187e Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Fri, 6 Mar 2015 16:15:49 +0800
Subject: post-filter.js catalog support

Removes hidden threads from catalog page
Shift click on catalog to hide thread
Improved word matching for simple comment and subject filter.
---
 js/catalog.js     |  20 -------
 js/post-filter.js | 156 ++++++++++++++++++++++++++++--------------------------
 2 files changed, 81 insertions(+), 95 deletions(-)

diff --git a/js/catalog.js b/js/catalog.js
index 18da6d6b..065fba7b 100644
--- a/js/catalog.js
+++ b/js/catalog.js
@@ -6,26 +6,6 @@ if (active_page == 'catalog') $(function(){
 		localStorage.catalog = JSON.stringify(catalog);
 	}
 
-	if (localStorage.hiddenthreads) {
-		var hidden_data = JSON.parse(localStorage.hiddenthreads);
-
-		if (hidden_data[board_name] && !$.isEmptyObject(hidden_data[board_name])) {
-			$.each(hidden_data[board_name], function(k, v) {
-				$('a[href$="/'+k+'.html"]').parents('.mix').remove();
-			});
-		}
-	} else {
-		hidden_data = {};
-	}
-
-	$(document).on('click', '.mix', function(e) {
-		if (e.shiftKey) {
-			hidden_data[board_name][$(this).data('id')] = Math.round(Date.now() / 1000);
-			$(this).remove();
-			localStorage.hiddenthreads = JSON.stringify(hidden_data);
-		}
-	});
-
 	$("#sort_by").change(function(){
 		var value = this.value;
 		$('#Grid').mixItUp('sort', (value == "random" ? value : "sticky:desc " + value));
diff --git a/js/post-filter.js b/js/post-filter.js
index 9ec28262..28e02f78 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -1,4 +1,4 @@
-if (active_page === 'thread' || active_page === 'index') {
+if (active_page === 'thread' || active_page === 'index' || active_page === 'catalog') {
 	$(document).ready(function () {
 		'use strict';
 		// returns blacklist object from storage
@@ -408,13 +408,13 @@ if (active_page === 'thread' || active_page === 'index') {
 			if (!forcedAnon && hasTrip)
 				trip = $post.find('.trip').text();
 			if (hasSub)
-				subject = ' '+ $post.find('.subject').text() +' ';
+				subject = $post.find('.subject').text();
 
 			array = $post.find('.body').contents().filter(function () {if ($(this).text() !== '') return true;}).toArray();
 			array = $.map(array, function (ele) {
 				return $(ele).text();
 			});
-			comment = ' '+ array.join(' ') +' ';
+			comment = array.join(' ');
 
 
 			for (i = 0, length = list.generalFilter.length; i < length; i++) {
@@ -430,7 +430,7 @@ if (active_page === 'thread' || active_page === 'index') {
 							}
 							break;
 						case 'trip':
-							if (!forcedAnon && pattern.test(trip)) {
+							if (!forcedAnon && hasTrip && pattern.test(trip)) {
 								$post.data('hiddenByTrip', true);
 								hide(post);
 							}
@@ -463,13 +463,15 @@ if (active_page === 'thread' || active_page === 'index') {
 							}
 							break;
 						case 'sub':
-							if (hasSub && subject.indexOf(' '+ rule.value +' ') != -1) {
+							pattern = new RegExp('\\b'+ rule.value+ '\\b');
+							if (hasSub && pattern.test(subject)) {
 								$post.data('hiddenBySubject', true);
 								hide(post);
 							}
 							break;
 						case 'com':
-							if (comment.indexOf(' '+ rule.value +' ') != -1) {
+							pattern = new RegExp('\\b'+ rule.value+ '\\b');
+							if (pattern.test(comment)) {
 								$post.data('hiddenByComment', true);
 								hide(post);
 							}
@@ -502,43 +504,63 @@ if (active_page === 'thread' || active_page === 'index') {
 		 function filterPage(pageData) {
 			var list = getList();
 
-			// empty the local and no-reply list
-			pageData.localList = [];
-			pageData.noReplyList = [];
+			if (active_page != 'catalog') {
 
-			$('.thread').each(function () {
-				var $thread = $(this);
-				// disregard the hidden threads constructed by post-hover.js
-				if ($thread.css('display') == 'none')
-					return;
+				// empty the local and no-reply list
+				pageData.localList = [];
+				pageData.noReplyList = [];
+
+				$('.thread').each(function () {
+					var $thread = $(this);
+					// disregard the hidden threads constructed by post-hover.js
+					if ($thread.css('display') == 'none')
+						return;
 
-				var threadId = $thread.attr('id').replace('thread_', '');
-				var op = $thread.children('.op')[0];
-				var i, array;  // temp variables
+					var threadId = $thread.attr('id').replace('thread_', '');
+					var op = $thread.children('.op')[0];
+					var i, array;  // temp variables
 
-				// add posts to localList and noReplyList
-				if (typeof list.postFilter[pageData.boardId] != 'undefined' && typeof list.postFilter[pageData.boardId][threadId] != 'undefined') {
-					array = list.postFilter[pageData.boardId][threadId];
-					for (i=0; i<array.length; i++) {
-						if ( typeof array[i].post == 'undefined')
-							continue;
+					// add posts to localList and noReplyList
+					if (typeof list.postFilter[pageData.boardId] != 'undefined' && typeof list.postFilter[pageData.boardId][threadId] != 'undefined') {
+						array = list.postFilter[pageData.boardId][threadId];
+						for (i=0; i<array.length; i++) {
+							if ( typeof array[i].post == 'undefined')
+								continue;
 
-						pageData.localList.push(array[i].post);
-						if (array[i].hideReplies) pageData.noReplyList.push(array[i].post);
+							pageData.localList.push(array[i].post);
+							if (array[i].hideReplies) pageData.noReplyList.push(array[i].post);
+						}
+					}
+					// run filter on OP
+					filter(op, threadId, pageData);
+					quickToggle(op, threadId, pageData);
+
+					// iterate filter over each post
+					if (!$(op).data('hidden') || active_page == 'thread') {
+						$thread.find('.reply').not('.hidden').each(function () {
+							filter(this, threadId, pageData);
+						});
 					}
-				}
-				// run filter on OP
-				filter(op, threadId, pageData);
-				quickToggle(op, threadId, pageData);
-
-				// iterate filter over each post
-				if (!$(op).data('hidden') || active_page == 'thread') {
-					$thread.find('.reply').not('.hidden').each(function () {
-						filter(this, threadId, pageData);
-					});
-				}
 
-			});
+				});
+			} else {
+				var postFilter = list.postFilter[pageData.boardId];
+				var $collection = $('.mix');
+
+				if ($.isEmptyObject(postFilter))
+					return;
+
+				// for each thread that has filtering rules
+				// check if filter contains thread OP and remove the thread from catalog
+				$.each(postFilter, function (key, thread) {
+					var threadId = key;
+					$.each(thread, function () {
+						if (this.post == threadId) {
+							$collection.filter('[data-id='+ threadId +']').remove();
+						}
+					});
+				});
+			}
 		 }
 
 		function initStyle() {
@@ -592,17 +614,17 @@ if (active_page === 'thread' || active_page === 'index') {
 
 				$row = $('<tr>');
 				$row.append(
-							'<td>'+ typeName[obj.type] +'</td>',
-							'<td>'+ val +'</td>',
-							$('<td>').append(
-								$('<a>').html('X')
-									.addClass('del-btn')
-									.attr('href', '#')
-									.data('type', obj.type)
-									.data('val', obj.value)
-									.data('useRegex', obj.regex)
-							)
-						);
+					'<td>'+ typeName[obj.type] +'</td>',
+					'<td>'+ val +'</td>',
+					$('<td>').append(
+						$('<a>').html('X')
+							.addClass('del-btn')
+							.attr('href', '#')
+							.data('type', obj.type)
+							.data('val', obj.value)
+							.data('useRegex', obj.regex)
+					)
+				);
 				$ele.append($row);
 			}
 		}
@@ -754,33 +776,6 @@ if (active_page === 'thread' || active_page === 'index') {
 				});
 			}
 
-			/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-			 *  Migrate from previous version of post filter
-			 *  Remember to remove next time anyone touches this file
-			 */
-			(function () {
-				var list = getList();
-				if (typeof list.nameFilter != 'undefined') {
-					var filter = list.nameFilter;
-					list.generalFilter = [];
-
-					for (var i = 0; i < filter.length; i++) {
-						var obj = filter[i];
-						for (var key in obj) {
-							list.generalFilter.push({
-								type: key,
-								value: obj[key],
-								regex: false
-							});
-						}
-					}
-
-					delete list.nameFilter;
-					localStorage.postFilter = JSON.stringify(list);
-				}
-			})();
-			/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
 			var pageData = {
 				boardId: board_name,  // get the id from the global variable
 				localList: [],  // all the blacklisted post IDs or UIDs that apply to the current page
@@ -812,6 +807,17 @@ if (active_page === 'thread' || active_page === 'index') {
 				filterPage(pageData);
 			});
 
+			// shift+click on catalog to hide thread
+			if (active_page == 'catalog') {
+				$(document).on('click', '.mix', function(e) {
+					if (e.shiftKey) {
+						var threadId = $(this).data('id');
+						var postId = threadId;
+						blacklist.add.post(pageData.boardId, threadId, postId, false);
+					}
+				});
+			}
+
 			// clear out the old threads
 			purge();
 		}
-- 
cgit v1.3


From a9b29c723236d46c2e767c8696a536abab26a900 Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Fri, 6 Mar 2015 20:04:35 +0800
Subject: Bugfix: convert it to string

---
 js/post-filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 28e02f78..229fbad9 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -811,7 +811,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 			if (active_page == 'catalog') {
 				$(document).on('click', '.mix', function(e) {
 					if (e.shiftKey) {
-						var threadId = $(this).data('id');
+						var threadId = $(this).data('id').toString();
 						var postId = threadId;
 						blacklist.add.post(pageData.boardId, threadId, postId, false);
 					}
-- 
cgit v1.3


From 4e271121472e97e37ff914a549a8ed1dfc2ea055 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Mon, 9 Mar 2015 02:32:02 -0700
Subject: Fix filter for users with emoji in thier names

---
 js/post-filter.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 229fbad9..518e38bb 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -61,6 +61,19 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 			drawFilterList();
 		}
 
+		function nameSpanToString(el) {
+			var s = ''; 
+
+			$.each($(el).contents(), function(k,v) {
+				if (v.nodeName === 'IMG')
+					s=s+$(v).attr('alt')
+				
+				if (v.nodeName === '#text')
+					s=s+v.nodeValue
+			});
+			return s.trim();
+		}
+
 		var blacklist = {
 			add: {
 				post: function (boardId, threadId, postId, hideReplies) {
@@ -217,7 +230,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 				var postName;
 				var postTrip = '';
 				if (!pageData.forcedAnon) {
-					postName = (typeof $ele.find('.name').contents()[0] == 'undefined') ? '' : $ele.find('.name').contents()[0].nodeValue.trim();
+					postName = (typeof $ele.find('.name').contents()[0] == 'undefined') ? '' : nameSpanToString($ele.find('.name')[0]);
 					postTrip = $ele.find('.trip').text();
 				}
 
@@ -404,7 +417,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 
 			// matches generalFilter
 			if (!forcedAnon)
-				name = (typeof $post.find('.name').contents()[0] == 'undefined') ? '' : $post.find('.name').contents()[0].nodeValue.trim();
+				name = (typeof $post.find('.name').contents()[0] == 'undefined') ? '' : nameSpanToString($post.find('.name')[0]);
 			if (!forcedAnon && hasTrip)
 				trip = $post.find('.trip').text();
 			if (hasSub)
-- 
cgit v1.3


From 59ee8a990f67298326628f2bf6a9e65fb1bb3cea Mon Sep 17 00:00:00 2001
From: marktaiwan <mark.taiwan@gmail.com>
Date: Mon, 16 Mar 2015 22:36:26 +0800
Subject: post-filter.js: prevent extra space characters

prevent extra spaces in comment caused by joining strings with leading
or trailing space.
---
 js/post-filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 518e38bb..8eb3ab7d 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -425,7 +425,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 
 			array = $post.find('.body').contents().filter(function () {if ($(this).text() !== '') return true;}).toArray();
 			array = $.map(array, function (ele) {
-				return $(ele).text();
+				return $(ele).text().trim();
 			});
 			comment = array.join(' ');
 
-- 
cgit v1.3


From 9265ebea43fe1aa6036a9106f115e5bb1420d301 Mon Sep 17 00:00:00 2001
From: Markerov <mark.taiwan@gmail.com>
Date: Thu, 30 Oct 2014 20:26:27 +0800
Subject: initial commit

---
 js/comment-toolbar.js | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 260 insertions(+)
 create mode 100644 js/comment-toolbar.js

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
new file mode 100644
index 00000000..7ae11a73
--- /dev/null
+++ b/js/comment-toolbar.js
@@ -0,0 +1,260 @@
+/*
+ * comment-toolbar.js
+ *   - Adds a toolbar above the commenting area containing most of 8Chan's formatting options
+ *   - Press Esc to close quick-reply window when it's in focus
+ * 
+ * Usage:
+ *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/comment-toolbar.js';
+ */
+if (active_page == 'thread' || active_page == 'index') {
+	$(document).ready(function () {
+		'use strict';
+		var formats = {
+			bold: {
+				displayText: 'B',
+				altText: 'bold',
+				styleCSS: 'font-weight: bold;',
+				options: {
+					prefix: "'''",
+					suffix: "'''"
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 'b'
+			},
+			italics: {
+				displayText: 'i',
+				altText: 'italics',
+				styleCSS: 'font-style: italic;',
+				options: {
+					prefix: "''",
+					suffix: "''"
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 'i'
+			},
+			under: {
+				displayText: 'U',
+				altText: 'underline',
+				styleCSS: 'text-decoration: underline;',
+				options: {
+					prefix: '__',
+					suffix: '__'
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 'u'
+			},
+			spoiler: {
+				displayText: 'spoiler',
+				altText: 'mark as spoiler',
+				styleCSS: '',
+				options: {
+					prefix: '[spoiler]',
+					suffix: '[/spoiler]'
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 's'
+			},
+			code: {
+				displayText: 'code',
+				altText: "code formatting",
+				styleCSS: 'font-family: "Courier New", Courier, monospace;',
+				options: {
+					prefix: '[code]',
+					suffix: '[/code]',
+					multiline: true
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 'd'
+			},
+			strike: {
+				displayText: 'strike',
+				altText: 'strikethrough',
+				styleCSS: 'text-decoration: line-through;',
+				options: {
+					prefix: '~~',
+					suffix: '~~'
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				}
+			},
+			heading: {
+				displayText: 'heading',
+				altText: 'redtext',
+				styleCSS: 'color: #AF0A0F; font-weight: bold;',
+				options: {
+					prefix: '==',
+					suffix: '==',
+					exclusiveLine: true
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				}
+			}
+		};
+
+		var key, name, altText, ele;
+		var strBuilder = [];
+		var subStr = '';
+		var styleRules = '';
+
+		//not exactly mine
+		var wrapSelection = function (box, options) {
+			if (box == null) {
+				return;
+			}
+			var prefix = options.prefix;
+			var suffix = options.suffix;
+			var multiline = options.multiline || false;
+			var exclusiveLine = options.exclusiveLine || false;
+
+			//record scroll top to restore it later.
+			var scrollTop = box.scrollTop;
+			var selectionStart = box.selectionStart;
+			var selectionEnd = box.selectionEnd;
+			var text = box.value;
+			var beforeSelection = text.substring(0, selectionStart);
+			var selectedText = text.substring(selectionStart, selectionEnd);
+			var afterSelection = text.substring(selectionEnd);
+
+			var breakSpace = ["\r","\n"];
+			var trailingSpace = "";
+			var cursor = selectedText.length - 1;
+
+			//remove trailing space
+			while (cursor > 0 && selectedText[cursor] === " ") {
+				trailingSpace += " ";
+				cursor--;
+			}
+			selectedText = selectedText.substring(0, cursor + 1);
+
+			if (!multiline)
+				selectedText = selectedText.replace(/(\r|\n|\r\n)/g, suffix +"$1"+ prefix);
+
+			if (exclusiveLine) {
+				// buffer the begining of the selection until a linebreak
+				cursor = beforeSelection.length -1;
+				while (cursor >= 0 && breakSpace.indexOf(beforeSelection.charAt(cursor)) == -1) {
+					cursor--;
+				}
+				selectedText = beforeSelection.substring(cursor +1) + selectedText;
+				beforeSelection = beforeSelection.substring(0, cursor +1);
+				
+				// buffer the end of the selection until a linebreak
+				cursor = 0;
+				while (cursor < afterSelection.length && breakSpace.indexOf(afterSelection.charAt(cursor)) == -1) {
+					cursor++;
+				}
+				selectedText += afterSelection.substring(0, cursor);
+				afterSelection = afterSelection.substring(cursor);
+			}
+
+			box.value = beforeSelection + prefix + selectedText + suffix + trailingSpace + afterSelection;
+
+			box.selectionEnd = beforeSelection.length + prefix.length + selectedText.length;
+			if (selectionStart === selectionEnd) {
+				box.selectionStart = box.selectionEnd;
+			} else {
+				box.selectionStart = beforeSelection.length + prefix.length;
+			}
+			box.scrollTop = scrollTop;
+		};
+
+		/*	Generate the HTML for the toolbar
+		 */
+		for (ele in formats) {
+			if (formats.hasOwnProperty(ele) && formats[ele].displayText != null) {
+				name = formats[ele].displayText;
+				altText = formats[ele].altText || '';
+				key = formats[ele].shortcutKey;
+
+				//add tooltip text
+				if (altText) {
+					if (key) {
+						altText += ' (ctrl+'+ key +')';
+					}
+					altText = 'title="'+ altText +'"';
+				}
+
+				subStr = '<a href="javascript:void(0)" '+ altText +' id="tf-'+ ele +'">'+ name +'</a>';
+				strBuilder.push(subStr);
+			} else {
+				continue;
+			}
+		}
+
+		$( 'textarea[name="body"]' ).before( '<div class="tf-toolbar"></div>' );
+		$( '.tf-toolbar' ).html( strBuilder.join(' | ') );
+
+		/*	Sets the CSS style
+		 */
+		styleRules = '\n/* generated by 8chan Formatting Tools */'+
+					 '\n.tf-toolbar {padding: 0px 5px 1px 5px;}'+
+					 '\n.tf-toolbar :link {text-decoration: none;}';
+			for (ele in formats) {
+				if (formats.hasOwnProperty(ele) && formats[ele].styleCSS) {
+					styleRules += ' \n#tf-' + ele + ' {' + formats[ele].styleCSS + '}';
+				}
+			}
+			//add CSS rule to user's custom CSS if it exist
+			if ($( '.user-css' ).length !== 0) {
+				$( '.user-css' ).append( styleRules );
+			} else {
+				$( 'body' ).append( '<style>'+ styleRules +'\n</style>' );
+			}
+
+		/*  Attach event listeners
+		 */
+		$( 'body' ).on( 'keydown', 'textarea[name="body"]', {formats: formats}, function (e) {
+			//shortcuts
+			if (e.ctrlKey) {
+				var ch = String.fromCharCode(e.which).toLowerCase();
+				var box = e.target;
+				var formats = e.data.formats;
+				for (var ele in formats) {
+					if (formats.hasOwnProperty(ele) && (ch === formats[ele].shortcutKey)) {
+						formats[ele].edit(box, formats[ele].options);
+						e.preventDefault();
+					}
+				}
+			}
+		});
+		$( 'body' ).on( 'keydown', '#quick-reply textarea[name="body"]', {formats: formats}, function (e) {
+			//close quick reply when esc is prssed
+			if (e.which === 27) {
+				$( '.close-btn' ).trigger( 'click' );
+			}
+		});
+		$( 'body' ).on( 'click', '.tf-toolbar a[id]', {formats: formats}, function (e) {
+			//toolbar buttons
+			var formats = e.data.formats;
+			var box = $(e.target).parent().next()[0];
+
+			for (var ele in formats) {
+				if (formats.hasOwnProperty(ele) && (e.target.id === 'tf-' + ele)) {
+					formats[ele].edit(box, formats[ele].options);
+				}
+			}
+		});
+		// $( 'body' ).on( 'keydown', function (e) {
+		// 	if (e.which === 67 &&
+		// 		e.target.nodeName !== 'INPUT' &&         //The C, the whole C, and nothing but the C
+		// 		e.target.nodeName !== 'TEXTAREA' &&
+		// 		!(e.ctrlKey || e.altKey || e.shiftKey)) {
+		// 			document.location.href = '//'+ document.location.host +'/'+ board_name +'/catalog.html';
+		// 		}
+		// });
+	
+	});
+}
-- 
cgit v1.3


From 86ddb4ecbbca36739da1993497376fb309c6b79f Mon Sep 17 00:00:00 2001
From: ForklessAnon <REDACTED@gmail.com>
Date: Fri, 31 Oct 2014 21:53:02 -0500
Subject: Update formatting toolbar to include user definable settings and
 customized options.

---
 js/comment-toolbar.js | 516 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 310 insertions(+), 206 deletions(-)

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
index 7ae11a73..2c8b9ca8 100644
--- a/js/comment-toolbar.js
+++ b/js/comment-toolbar.js
@@ -8,253 +8,357 @@
  *   $config['additional_javascript'][] = 'js/comment-toolbar.js';
  */
 if (active_page == 'thread' || active_page == 'index') {
-	$(document).ready(function () {
-		'use strict';
-		var formats = {
-			bold: {
-				displayText: 'B',
-				altText: 'bold',
-				styleCSS: 'font-weight: bold;',
-				options: {
-					prefix: "'''",
-					suffix: "'''"
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 'b'
+	var formatText = (function($){
+		"use strict";
+		var self = {};
+		self.rules = {
+			spoiler: {
+				text: 'Spoiler',
+				key: 's',
+				multiline: false, 
+				exclusiveline: false, 
+				prefix:'**',
+				suffix:'**'
 			},
 			italics: {
-				displayText: 'i',
-				altText: 'italics',
-				styleCSS: 'font-style: italic;',
-				options: {
-					prefix: "''",
-					suffix: "''"
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 'i'
+				text: 'Italics',
+				key: 'i',
+				multiline: false, 
+				exclusiveline: false, 
+				prefix: "''",
+				suffix: "''"
 			},
-			under: {
-				displayText: 'U',
-				altText: 'underline',
-				styleCSS: 'text-decoration: underline;',
-				options: {
-					prefix: '__',
-					suffix: '__'
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 'u'
+			bold: {
+				text: 'Bold',
+				key: 'b',
+				multiline: false, 
+				exclusiveline: false, 
+				prefix: "'''",
+				suffix: "'''"
 			},
-			spoiler: {
-				displayText: 'spoiler',
-				altText: 'mark as spoiler',
-				styleCSS: '',
-				options: {
-					prefix: '[spoiler]',
-					suffix: '[/spoiler]'
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 's'
+			underline: {
+				text: 'Underline',
+				key: 'u',
+				multiline: false, 
+				exclusiveline: false, 
+				prefix:'__',
+				suffix:'__'
 			},
 			code: {
-				displayText: 'code',
-				altText: "code formatting",
-				styleCSS: 'font-family: "Courier New", Courier, monospace;',
-				options: {
-					prefix: '[code]',
-					suffix: '[/code]',
-					multiline: true
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 'd'
+				text: 'Code',
+				key: 'f',
+				multiline: true, 
+				exclusiveline: false, 
+				prefix: '[code]',
+				suffix: '[/code]'
 			},
 			strike: {
-				displayText: 'strike',
-				altText: 'strikethrough',
-				styleCSS: 'text-decoration: line-through;',
-				options: {
-					prefix: '~~',
-					suffix: '~~'
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				}
+				text: 'Strike',
+				key: 'd',
+				multiline:false, 
+				exclusiveline:false, 
+				prefix:'~~',
+				suffix:'~~'
 			},
 			heading: {
-				displayText: 'heading',
-				altText: 'redtext',
-				styleCSS: 'color: #AF0A0F; font-weight: bold;',
-				options: {
-					prefix: '==',
-					suffix: '==',
-					exclusiveLine: true
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				}
+				text: 'Heading',
+				key: 'r',
+				multiline:false, 
+				exclusiveline:true, 
+				prefix:'==',
+				suffix:'=='
 			}
 		};
-
-		var key, name, altText, ele;
-		var strBuilder = [];
-		var subStr = '';
-		var styleRules = '';
-
-		//not exactly mine
-		var wrapSelection = function (box, options) {
-			if (box == null) {
-				return;
+		
+		self.toolbar_wrap = function(node) {
+			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
+			var parent = $(node).parents('form[name="post"]');
+			self.wrap(parent.find('#body')[0],'textarea[name="body"]', parent.find('.format-text > select')[0].value, false);
+		};
+	
+		self.wrap = function(ref, target, option, expandedwrap) {
+			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
+			// clean and validate arguments
+			if (ref == null) return;
+			var settings = {multiline: false, exclusiveline: false, prefix:'', suffix: null};
+			$.extend(settings,JSON.parse(localStorage.formatText_rules)[option]);
+			
+			// resolve targets into array of proper node elements
+			// yea, this is overly verbose, oh well.
+			var res = [];
+			if (target instanceof Array) {
+				for (var indexa in target) {
+					if (target.hasOwnProperty(indexa)) {
+						if (typeof target[indexa] == 'string') {
+							var nodes = $(target[indexa]);
+							for (var indexb in nodes) {
+								if (indexa.hasOwnProperty(indexb)) res.push(nodes[indexb]);
+							}
+						} else {
+							res.push(target[indexa]);
+						}
+					}
+				}
+			} else {
+				if (typeof target == 'string') {
+					var nodes = $(target);
+					for (var index in nodes) {
+						if (nodes.hasOwnProperty(index)) res.push(nodes[index]);
+					}
+				} else {
+					res.push(target);
+				}
 			}
-			var prefix = options.prefix;
-			var suffix = options.suffix;
-			var multiline = options.multiline || false;
-			var exclusiveLine = options.exclusiveLine || false;
-
+			target = res;
 			//record scroll top to restore it later.
-			var scrollTop = box.scrollTop;
-			var selectionStart = box.selectionStart;
-			var selectionEnd = box.selectionEnd;
-			var text = box.value;
-			var beforeSelection = text.substring(0, selectionStart);
-			var selectedText = text.substring(selectionStart, selectionEnd);
-			var afterSelection = text.substring(selectionEnd);
+			var scrollTop = ref.scrollTop;
 
-			var breakSpace = ["\r","\n"];
-			var trailingSpace = "";
-			var cursor = selectedText.length - 1;
+			//We will restore the selection later, so record the current selection
+			var selectionStart = ref.selectionStart;
+			var selectionEnd = ref.selectionEnd;
 
-			//remove trailing space
-			while (cursor > 0 && selectedText[cursor] === " ") {
-				trailingSpace += " ";
-				cursor--;
-			}
-			selectedText = selectedText.substring(0, cursor + 1);
-
-			if (!multiline)
-				selectedText = selectedText.replace(/(\r|\n|\r\n)/g, suffix +"$1"+ prefix);
-
-			if (exclusiveLine) {
+			var text = ref.value;
+			var before = text.substring(0, selectionStart);
+			var selected = text.substring(selectionStart, selectionEnd);
+			var after = text.substring(selectionEnd);
+			var whiteSpace = [" ","\t"];
+			var breakSpace = ["\r","\n"];
+			var cursor;
+			
+			// handles multiline selections on formatting that doesn't support spanning over multiple lines
+			if (!settings.multiline) selected = selected.replace(/(\r|\n|\r\n)/g,settings.suffix +"$1"+ settings.prefix);
+			
+			// handles formatting that requires it to be on it's own line OR if the user wishes to expand the wrap to the nearest linebreak
+			if (settings.exclusiveline || expandedwrap) {
 				// buffer the begining of the selection until a linebreak
-				cursor = beforeSelection.length -1;
-				while (cursor >= 0 && breakSpace.indexOf(beforeSelection.charAt(cursor)) == -1) {
+				cursor = before.length -1;
+				while (cursor >= 0 && breakSpace.indexOf(before.charAt(cursor)) == -1) {
 					cursor--;
 				}
-				selectedText = beforeSelection.substring(cursor +1) + selectedText;
-				beforeSelection = beforeSelection.substring(0, cursor +1);
+				selected = before.substring(cursor +1) + selected;
+				before = before.substring(0, cursor +1);
 				
 				// buffer the end of the selection until a linebreak
 				cursor = 0;
-				while (cursor < afterSelection.length && breakSpace.indexOf(afterSelection.charAt(cursor)) == -1) {
+				while (cursor < after.length && breakSpace.indexOf(after.charAt(cursor)) == -1) {
 					cursor++;
 				}
-				selectedText += afterSelection.substring(0, cursor);
-				afterSelection = afterSelection.substring(cursor);
+				selected += after.substring(0, cursor);
+				after = after.substring(cursor);
 			}
-
-			box.value = beforeSelection + prefix + selectedText + suffix + trailingSpace + afterSelection;
-
-			box.selectionEnd = beforeSelection.length + prefix.length + selectedText.length;
+			
+			// set values
+			var res = before + settings.prefix + selected + settings.suffix + after;
+			$(target).val(res);
+			
+			// restore the selection area and scroll of the reference
+			ref.selectionEnd = before.length + settings.prefix.length + selected.length;
 			if (selectionStart === selectionEnd) {
-				box.selectionStart = box.selectionEnd;
+				ref.selectionStart = ref.selectionEnd;
 			} else {
-				box.selectionStart = beforeSelection.length + prefix.length;
+				ref.selectionStart = before.length + settings.prefix.length;
 			}
-			box.scrollTop = scrollTop;
+			ref.scrollTop = scrollTop;
 		};
+		
+		self.build_toolbars = function(){
+			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
+			if (localStorage.formatText_toolbar == 'true'){
+				// remove existing toolbars
+				if ($('.format-text').length > 0) $('.format-text').remove();
+				
+				// Place toolbar above each textarea input
+				var name, options = '', rules = JSON.parse(localStorage.formatText_rules);
+				for (var index in rules) {
+					if (!rules.hasOwnProperty(index)) continue;
+					name = rules[index].text;
 
-		/*	Generate the HTML for the toolbar
-		 */
-		for (ele in formats) {
-			if (formats.hasOwnProperty(ele) && formats[ele].displayText != null) {
-				name = formats[ele].displayText;
-				altText = formats[ele].altText || '';
-				key = formats[ele].shortcutKey;
-
-				//add tooltip text
-				if (altText) {
-					if (key) {
-						altText += ' (ctrl+'+ key +')';
+					//add hint if key exists
+					if (rules[index].key) {
+						name += ' (CTRL + '+ rules[index].key.toUpperCase() +')';
 					}
-					altText = 'title="'+ altText +'"';
+					options += '<option value="'+ index +'">'+ name +'</option>';
 				}
-
-				subStr = '<a href="javascript:void(0)" '+ altText +' id="tf-'+ ele +'">'+ name +'</a>';
-				strBuilder.push(subStr);
-			} else {
-				continue;
+				$('[name="body"]').before('<div class="format-text"><a href="javascript:;" onclick="formatText.toolbar_wrap(this);">Wrap</a><select>'+ options +'</select></div>');
+				$('body').append('<style>#quick-reply .format-text>a{width:15%;display:inline-block;text-align:center;}#quick-reply .format-text>select{width:85%;};</style>');
 			}
-		}
-
-		$( 'textarea[name="body"]' ).before( '<div class="tf-toolbar"></div>' );
-		$( '.tf-toolbar' ).html( strBuilder.join(' | ') );
-
-		/*	Sets the CSS style
-		 */
-		styleRules = '\n/* generated by 8chan Formatting Tools */'+
-					 '\n.tf-toolbar {padding: 0px 5px 1px 5px;}'+
-					 '\n.tf-toolbar :link {text-decoration: none;}';
-			for (ele in formats) {
-				if (formats.hasOwnProperty(ele) && formats[ele].styleCSS) {
-					styleRules += ' \n#tf-' + ele + ' {' + formats[ele].styleCSS + '}';
-				}
+		};
+		
+		self.add_rule = function(rule, index){
+			if (rule === undefined) rule = {
+				text: 'New Rule',
+				key: '',
+				multiline:false, 
+				exclusiveline:false, 
+				prefix:'',
+				suffix:''
 			}
-			//add CSS rule to user's custom CSS if it exist
-			if ($( '.user-css' ).length !== 0) {
-				$( '.user-css' ).append( styleRules );
-			} else {
-				$( 'body' ).append( '<style>'+ styleRules +'\n</style>' );
+			
+			// generate an id for the rule
+			if (index === undefined) {
+				var rules = JSON.parse(localStorage.formatText_rules);
+				while (rules[index] || index === undefined) {
+					index = ''
+					index +='abcdefghijklmnopqrstuvwxyz'.substr(Math.floor(Math.random()*26),1);
+					index +='abcdefghijklmnopqrstuvwxyz'.substr(Math.floor(Math.random()*26),1);
+					index +='abcdefghijklmnopqrstuvwxyz'.substr(Math.floor(Math.random()*26),1);
+				}
 			}
-
-		/*  Attach event listeners
-		 */
-		$( 'body' ).on( 'keydown', 'textarea[name="body"]', {formats: formats}, function (e) {
-			//shortcuts
-			if (e.ctrlKey) {
-				var ch = String.fromCharCode(e.which).toLowerCase();
-				var box = e.target;
-				var formats = e.data.formats;
-				for (var ele in formats) {
-					if (formats.hasOwnProperty(ele) && (ch === formats[ele].shortcutKey)) {
-						formats[ele].edit(box, formats[ele].options);
-						e.preventDefault();
-					}
+			if (window.Options && Options.get_tab('formatting')){
+				var html = $('<div class="format_rule" name="'+ index +'"></div>').html('\
+				<input type="text" name="text" class="format_option" size="10" value=\"'+ rule.text.replace(/"/g, '&quot;') +'\">\
+				<input type="checkbox" name="multiline" class="format_option" '+ (rule.multiline ? 'checked' : '') +'>\
+				<input type="checkbox" name="exclusiveline" class="format_option" '+ (rule.exclusiveline ? 'checked' : '') +'>\
+				<input type="text" name="prefix" class="format_option" size="8" value=\"'+ (rule.prefix ? rule.prefix.replace(/"/g, '&quot;') : '') +'\">\
+				<input type="text" name="suffix" class="format_option" size="8" value=\"'+ (rule.suffix ? rule.suffix.replace(/"/g, '&quot;') : '') +'\">\
+				<input type="text" name="key" class="format_option" size="2" maxlength="1" value=\"'+ rule.key +'\">\
+				<input type="button" value="X" onclick="if(confirm(\'Do you wish to remove the '+ rule.text +' formatting rule?\'))$(this).parent().remove();">\
+				');
+				
+				if ($('.format_rule').length > 0) {
+					$('.format_rule').last().after(html);
+				} else {
+					Options.extend_tab('formatting', html);
 				}
 			}
-		});
-		$( 'body' ).on( 'keydown', '#quick-reply textarea[name="body"]', {formats: formats}, function (e) {
-			//close quick reply when esc is prssed
-			if (e.which === 27) {
-				$( '.close-btn' ).trigger( 'click' );
+		};
+		
+		self.save_rules = function(){
+			var newrules = {}, rules = $('.format_rule');
+			for (var index=0;rules[index];index++) {
+				console.log(rules[index]);
+				newrules[$(rules[index]).attr('name')] = {
+					text: $(rules[index]).find('[name="text"]').val(),
+					key: $(rules[index]).find('[name="key"]').val(),
+					prefix: $(rules[index]).find('[name="prefix"]').val(),
+					suffix: $(rules[index]).find('[name="suffix"]').val(),
+					multiline: $(rules[index]).find('[name="multiline"]').is(':checked'),
+					exclusiveline: $(rules[index]).find('[name="exclusiveline"]').is(':checked')
+				};
+			}
+			console.log(newrules);
+			localStorage.formatText_rules = JSON.stringify(newrules);
+			self.build_toolbars();
+		};
+		
+		self.reset_rules = function() {
+			localStorage.formatText_rules = JSON.stringify(self.rules);
+		};
+		
+		// store default rules for customizing
+		if (!localStorage.formatText_rules) self.reset_rules();
+		
+		// Add settings to Options panel general tab
+		if (window.Options && Options.get_tab('general')) {
+			var s1 = '#formatText_enable>input', s2 = '#formatText_toolbar>input', e = 'change';
+			Options.extend_tab('general', '<label id="formatText_enable"><input type="checkbox" checked="checked" id="formatText_enable">' + _('Enable post formatting') + '</label>');
+			Options.extend_tab('general', '<label id="formatText_toolbar"><input type="checkbox" checked="checked" id="formatText_toolbar">' + _('Show formatting toolbar') + '</label>');
+		} else {
+			var s1 = '#formatText_enable', s2 = '#formatText_toolbar', e = 'click';
+			$('hr:first').before('<div id="formatText_enable" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable post formatting') +'</a></div>');
+			$('hr:first').before('<div id="formatText_toolbar" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Show formatting toolbar') +'</a></div>');
+		}
+		
+		// setting for enableing text formatting
+		$(s1).on(e, function(e) {
+			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') {
+				localStorage.formatText_enable = 'true';
+				if (window.Options && Options.get_tab('general')) e.target.checked = true;
+			} else {
+				localStorage.formatText_enable = 'false';
+				if (window.Options && Options.get_tab('general')) e.target.checked = false;
 			}
 		});
-		$( 'body' ).on( 'click', '.tf-toolbar a[id]', {formats: formats}, function (e) {
-			//toolbar buttons
-			var formats = e.data.formats;
-			var box = $(e.target).parent().next()[0];
-
-			for (var ele in formats) {
-				if (formats.hasOwnProperty(ele) && (e.target.id === 'tf-' + ele)) {
-					formats[ele].edit(box, formats[ele].options);
-				}
+		
+	  // setting for toolbar injection
+		$(s2).on(e, function(e) {
+			if (!localStorage.formatText_toolbar || localStorage.formatText_toolbar == 'false') {
+				localStorage.formatText_toolbar = 'true';
+				if (window.Options && Options.get_tab('general')) e.target.checked = true;
+				formatText.build_toolbars();
+			} else {
+				localStorage.formatText_toolbar = 'false';
+				if (window.Options && Options.get_tab('general')) e.target.checked = false;
+				$('.format-text').remove();
 			}
 		});
-		// $( 'body' ).on( 'keydown', function (e) {
-		// 	if (e.which === 67 &&
-		// 		e.target.nodeName !== 'INPUT' &&         //The C, the whole C, and nothing but the C
-		// 		e.target.nodeName !== 'TEXTAREA' &&
-		// 		!(e.ctrlKey || e.altKey || e.shiftKey)) {
-		// 			document.location.href = '//'+ document.location.host +'/'+ board_name +'/catalog.html';
-		// 		}
-		// });
+		
+		// make sure the tab settings are switch properly at loadup
+		if (window.Options && Options.get_tab('general')) {
+			if (localStorage.formatText_enable == 'true') $(s1)[0].checked = true;
+			else $(s1)[0].checked = false;
+			if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true;
+			else $(s2)[0].checked = false;
+		}
+		
+		// add the tab for customizing the format settings
+		if (window.Options && !Options.get_tab('formatting')) {
+			Options.add_tab('formatting', 'angle-right', 'Customize Formatting');
+			Options.extend_tab('formatting', '\
+			<style>\
+				.format_option{\
+					margin-right:5px;\
+					overflow:initial;\
+					font-size:15px;\
+				}\
+				.format_option[type="text"]{\
+					text-align:center;\
+					padding-bottom: 2px;\
+					padding-top: 2px;\
+				}\
+				.format_option:last-child{\
+					margin-right:0;\
+				}\
+			</style>\
+			');
+			
+			// Data control row
+			Options.extend_tab('formatting', '\
+			<button onclick="formatText.add_rule();">Add Rule</button>\
+			<button onclick="formatText.save_rules();">Save Rules</button>\
+			<button onclick="formatText.reset_rules();">Reset Rules to Default</button>\
+			');
+			
+			// Descriptor row
+			Options.extend_tab('formatting', '\
+				<span class="format_option" style="margin-left:25px;">Name</span>\
+				<span class="format_option" style="margin-left:45px;" title="Multi-line: Allow formatted area to contain linebreaks.">ML</span>\
+				<span class="format_option" style="margin-left:0px;" title="Exclusive-line: Require formatted area to start after and end before a linebreak.">EL</span>\
+				<span class="format_option" style="margin-left:25px;" title="Text injected at the start of a format area.">Prefix</span>\
+				<span class="format_option" style="margin-left:60px;" title="Text injected at the end of a format area.">Suffix</span>\
+				<span class="format_option" style="margin-left:40px;" title="Optional keybind value to allow keyboard shortcut access.">Key</span>\
+			');
+			
+			// Rule rows
+			var rules = JSON.parse(localStorage.formatText_rules);
+			for (var index in rules){
+				if (!rules.hasOwnProperty(index)) continue;
+				self.add_rule(rules[index], index);
+			}
+		}
+		
+		return self;
+    })(jQuery);
+	
+	// run initial toolbar injection
+	formatText.build_toolbars();
 	
+	//attach listeners to <body> so it also works on quick-reply box
+	$('body').on('keydown', '#body, #quick-reply #body', function(e) {
+		if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
+		var key = String.fromCharCode(e.which).toLowerCase();
+		var rules = JSON.parse(localStorage.formatText_rules);
+		for (var index in rules) {
+			if (!rules.hasOwnProperty(index)) continue;
+			if (key === rules[index].key && e.ctrlKey) {
+				e.preventDefault();
+				if (e.shiftKey) {
+					formatText.wrap(e.target, 'textarea[name="body"]', index, true);
+				} else {
+					formatText.wrap(e.target, 'textarea[name="body"]', index, false);
+				}
+			}
+		}
 	});
+	$(document).trigger('formatText');
 }
-- 
cgit v1.3


From 69a6631742c2c2b464c5beca289619dca5760e45 Mon Sep 17 00:00:00 2001
From: ForklessAnon <REDACTED@gmail.com>
Date: Sat, 1 Nov 2014 16:49:34 -0500
Subject: Added option to disable/ignore keybinds.

---
 js/comment-toolbar.js | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
index 2c8b9ca8..74654868 100644
--- a/js/comment-toolbar.js
+++ b/js/comment-toolbar.js
@@ -226,7 +226,6 @@ if (active_page == 'thread' || active_page == 'index') {
 		self.save_rules = function(){
 			var newrules = {}, rules = $('.format_rule');
 			for (var index=0;rules[index];index++) {
-				console.log(rules[index]);
 				newrules[$(rules[index]).attr('name')] = {
 					text: $(rules[index]).find('[name="text"]').val(),
 					key: $(rules[index]).find('[name="key"]').val(),
@@ -236,7 +235,6 @@ if (active_page == 'thread' || active_page == 'index') {
 					exclusiveline: $(rules[index]).find('[name="exclusiveline"]').is(':checked')
 				};
 			}
-			console.log(newrules);
 			localStorage.formatText_rules = JSON.stringify(newrules);
 			self.build_toolbars();
 		};
@@ -250,12 +248,19 @@ if (active_page == 'thread' || active_page == 'index') {
 		
 		// Add settings to Options panel general tab
 		if (window.Options && Options.get_tab('general')) {
-			var s1 = '#formatText_enable>input', s2 = '#formatText_toolbar>input', e = 'change';
-			Options.extend_tab('general', '<label id="formatText_enable"><input type="checkbox" checked="checked" id="formatText_enable">' + _('Enable post formatting') + '</label>');
-			Options.extend_tab('general', '<label id="formatText_toolbar"><input type="checkbox" checked="checked" id="formatText_toolbar">' + _('Show formatting toolbar') + '</label>');
+			var s1 = '#formatText_enable>input', s2 = '#formatText_keybinds>input', s3 = '#formatText_toolbar>input', e = 'change';
+			Options.extend_tab('general', '\
+				<fieldset>\
+					<legend>Formatting Options</legend>\
+					<label id="formatText_enable"><input type="checkbox" checked="checked" id="formatText_enable">' + _('Enable post formatting') + '</label>\
+					<label id="formatText_keybinds"><input type="checkbox" checked="checked" id="formatText_keybinds">' + _('Enable formatting keybinds') + '</label>\
+					<label id="formatText_toolbar"><input type="checkbox" checked="checked" id="formatText_toolbar">' + _('Show formatting toolbar') + '</label>\
+				</fieldset>\
+			');
 		} else {
-			var s1 = '#formatText_enable', s2 = '#formatText_toolbar', e = 'click';
+			var s1 = '#formatText_enable', s2 = '#formatText_keybinds', s3 = '#formatText_toolbar', e = 'click';
 			$('hr:first').before('<div id="formatText_enable" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable post formatting') +'</a></div>');
+			$('hr:first').before('<div id="formatText_keybinds" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable formatting keybinds') +'</a></div>');
 			$('hr:first').before('<div id="formatText_toolbar" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Show formatting toolbar') +'</a></div>');
 		}
 		
@@ -270,8 +275,19 @@ if (active_page == 'thread' || active_page == 'index') {
 			}
 		});
 		
-	  // setting for toolbar injection
+	  // setting for enableing formatting keybinds
 		$(s2).on(e, function(e) {
+			if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') {
+				localStorage.formatText_keybinds = 'true';
+				if (window.Options && Options.get_tab('general')) e.target.checked = true;
+			} else {
+				localStorage.formatText_keybinds = 'false';
+				if (window.Options && Options.get_tab('general')) e.target.checked = false;
+			}
+		});
+		
+	  // setting for toolbar injection
+		$(s3).on(e, function(e) {
 			if (!localStorage.formatText_toolbar || localStorage.formatText_toolbar == 'false') {
 				localStorage.formatText_toolbar = 'true';
 				if (window.Options && Options.get_tab('general')) e.target.checked = true;
@@ -287,8 +303,10 @@ if (active_page == 'thread' || active_page == 'index') {
 		if (window.Options && Options.get_tab('general')) {
 			if (localStorage.formatText_enable == 'true') $(s1)[0].checked = true;
 			else $(s1)[0].checked = false;
-			if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true;
+			if (localStorage.formatText_keybinds == 'true') $(s2)[0].checked = true;
 			else $(s2)[0].checked = false;
+			if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true;
+			else $(s3)[0].checked = false;
 		}
 		
 		// add the tab for customizing the format settings
@@ -309,6 +327,9 @@ if (active_page == 'thread' || active_page == 'index') {
 				.format_option:last-child{\
 					margin-right:0;\
 				}\
+				fieldset{\
+					margin-top:5px;\
+				}\
 			</style>\
 			');
 			
@@ -346,6 +367,7 @@ if (active_page == 'thread' || active_page == 'index') {
 	//attach listeners to <body> so it also works on quick-reply box
 	$('body').on('keydown', '#body, #quick-reply #body', function(e) {
 		if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
+		if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') return;
 		var key = String.fromCharCode(e.which).toLowerCase();
 		var rules = JSON.parse(localStorage.formatText_rules);
 		for (var index in rules) {
@@ -361,4 +383,4 @@ if (active_page == 'thread' || active_page == 'index') {
 		}
 	});
 	$(document).trigger('formatText');
-}
+}
\ No newline at end of file
-- 
cgit v1.3


From 1b0f5fd24cf363d88460b0483f5b3d26c763b8ed Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Sun, 2 Nov 2014 07:08:01 +0800
Subject: Revert "Comment toolbar update and Thread stats addition"

---
 js/comment-toolbar.js | 538 +++++++++++++++++++-------------------------------
 stylesheets/style.css |   1 -
 2 files changed, 206 insertions(+), 333 deletions(-)

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
index 74654868..7ae11a73 100644
--- a/js/comment-toolbar.js
+++ b/js/comment-toolbar.js
@@ -8,379 +8,253 @@
  *   $config['additional_javascript'][] = 'js/comment-toolbar.js';
  */
 if (active_page == 'thread' || active_page == 'index') {
-	var formatText = (function($){
-		"use strict";
-		var self = {};
-		self.rules = {
-			spoiler: {
-				text: 'Spoiler',
-				key: 's',
-				multiline: false, 
-				exclusiveline: false, 
-				prefix:'**',
-				suffix:'**'
+	$(document).ready(function () {
+		'use strict';
+		var formats = {
+			bold: {
+				displayText: 'B',
+				altText: 'bold',
+				styleCSS: 'font-weight: bold;',
+				options: {
+					prefix: "'''",
+					suffix: "'''"
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 'b'
 			},
 			italics: {
-				text: 'Italics',
-				key: 'i',
-				multiline: false, 
-				exclusiveline: false, 
-				prefix: "''",
-				suffix: "''"
+				displayText: 'i',
+				altText: 'italics',
+				styleCSS: 'font-style: italic;',
+				options: {
+					prefix: "''",
+					suffix: "''"
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 'i'
 			},
-			bold: {
-				text: 'Bold',
-				key: 'b',
-				multiline: false, 
-				exclusiveline: false, 
-				prefix: "'''",
-				suffix: "'''"
+			under: {
+				displayText: 'U',
+				altText: 'underline',
+				styleCSS: 'text-decoration: underline;',
+				options: {
+					prefix: '__',
+					suffix: '__'
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 'u'
 			},
-			underline: {
-				text: 'Underline',
-				key: 'u',
-				multiline: false, 
-				exclusiveline: false, 
-				prefix:'__',
-				suffix:'__'
+			spoiler: {
+				displayText: 'spoiler',
+				altText: 'mark as spoiler',
+				styleCSS: '',
+				options: {
+					prefix: '[spoiler]',
+					suffix: '[/spoiler]'
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 's'
 			},
 			code: {
-				text: 'Code',
-				key: 'f',
-				multiline: true, 
-				exclusiveline: false, 
-				prefix: '[code]',
-				suffix: '[/code]'
+				displayText: 'code',
+				altText: "code formatting",
+				styleCSS: 'font-family: "Courier New", Courier, monospace;',
+				options: {
+					prefix: '[code]',
+					suffix: '[/code]',
+					multiline: true
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				},
+				shortcutKey: 'd'
 			},
 			strike: {
-				text: 'Strike',
-				key: 'd',
-				multiline:false, 
-				exclusiveline:false, 
-				prefix:'~~',
-				suffix:'~~'
+				displayText: 'strike',
+				altText: 'strikethrough',
+				styleCSS: 'text-decoration: line-through;',
+				options: {
+					prefix: '~~',
+					suffix: '~~'
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				}
 			},
 			heading: {
-				text: 'Heading',
-				key: 'r',
-				multiline:false, 
-				exclusiveline:true, 
-				prefix:'==',
-				suffix:'=='
+				displayText: 'heading',
+				altText: 'redtext',
+				styleCSS: 'color: #AF0A0F; font-weight: bold;',
+				options: {
+					prefix: '==',
+					suffix: '==',
+					exclusiveLine: true
+				},
+				edit: function (box, options) {
+					wrapSelection(box, options);
+				}
 			}
 		};
-		
-		self.toolbar_wrap = function(node) {
-			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
-			var parent = $(node).parents('form[name="post"]');
-			self.wrap(parent.find('#body')[0],'textarea[name="body"]', parent.find('.format-text > select')[0].value, false);
-		};
-	
-		self.wrap = function(ref, target, option, expandedwrap) {
-			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
-			// clean and validate arguments
-			if (ref == null) return;
-			var settings = {multiline: false, exclusiveline: false, prefix:'', suffix: null};
-			$.extend(settings,JSON.parse(localStorage.formatText_rules)[option]);
-			
-			// resolve targets into array of proper node elements
-			// yea, this is overly verbose, oh well.
-			var res = [];
-			if (target instanceof Array) {
-				for (var indexa in target) {
-					if (target.hasOwnProperty(indexa)) {
-						if (typeof target[indexa] == 'string') {
-							var nodes = $(target[indexa]);
-							for (var indexb in nodes) {
-								if (indexa.hasOwnProperty(indexb)) res.push(nodes[indexb]);
-							}
-						} else {
-							res.push(target[indexa]);
-						}
-					}
-				}
-			} else {
-				if (typeof target == 'string') {
-					var nodes = $(target);
-					for (var index in nodes) {
-						if (nodes.hasOwnProperty(index)) res.push(nodes[index]);
-					}
-				} else {
-					res.push(target);
-				}
+
+		var key, name, altText, ele;
+		var strBuilder = [];
+		var subStr = '';
+		var styleRules = '';
+
+		//not exactly mine
+		var wrapSelection = function (box, options) {
+			if (box == null) {
+				return;
 			}
-			target = res;
-			//record scroll top to restore it later.
-			var scrollTop = ref.scrollTop;
+			var prefix = options.prefix;
+			var suffix = options.suffix;
+			var multiline = options.multiline || false;
+			var exclusiveLine = options.exclusiveLine || false;
 
-			//We will restore the selection later, so record the current selection
-			var selectionStart = ref.selectionStart;
-			var selectionEnd = ref.selectionEnd;
+			//record scroll top to restore it later.
+			var scrollTop = box.scrollTop;
+			var selectionStart = box.selectionStart;
+			var selectionEnd = box.selectionEnd;
+			var text = box.value;
+			var beforeSelection = text.substring(0, selectionStart);
+			var selectedText = text.substring(selectionStart, selectionEnd);
+			var afterSelection = text.substring(selectionEnd);
 
-			var text = ref.value;
-			var before = text.substring(0, selectionStart);
-			var selected = text.substring(selectionStart, selectionEnd);
-			var after = text.substring(selectionEnd);
-			var whiteSpace = [" ","\t"];
 			var breakSpace = ["\r","\n"];
-			var cursor;
-			
-			// handles multiline selections on formatting that doesn't support spanning over multiple lines
-			if (!settings.multiline) selected = selected.replace(/(\r|\n|\r\n)/g,settings.suffix +"$1"+ settings.prefix);
-			
-			// handles formatting that requires it to be on it's own line OR if the user wishes to expand the wrap to the nearest linebreak
-			if (settings.exclusiveline || expandedwrap) {
+			var trailingSpace = "";
+			var cursor = selectedText.length - 1;
+
+			//remove trailing space
+			while (cursor > 0 && selectedText[cursor] === " ") {
+				trailingSpace += " ";
+				cursor--;
+			}
+			selectedText = selectedText.substring(0, cursor + 1);
+
+			if (!multiline)
+				selectedText = selectedText.replace(/(\r|\n|\r\n)/g, suffix +"$1"+ prefix);
+
+			if (exclusiveLine) {
 				// buffer the begining of the selection until a linebreak
-				cursor = before.length -1;
-				while (cursor >= 0 && breakSpace.indexOf(before.charAt(cursor)) == -1) {
+				cursor = beforeSelection.length -1;
+				while (cursor >= 0 && breakSpace.indexOf(beforeSelection.charAt(cursor)) == -1) {
 					cursor--;
 				}
-				selected = before.substring(cursor +1) + selected;
-				before = before.substring(0, cursor +1);
+				selectedText = beforeSelection.substring(cursor +1) + selectedText;
+				beforeSelection = beforeSelection.substring(0, cursor +1);
 				
 				// buffer the end of the selection until a linebreak
 				cursor = 0;
-				while (cursor < after.length && breakSpace.indexOf(after.charAt(cursor)) == -1) {
+				while (cursor < afterSelection.length && breakSpace.indexOf(afterSelection.charAt(cursor)) == -1) {
 					cursor++;
 				}
-				selected += after.substring(0, cursor);
-				after = after.substring(cursor);
+				selectedText += afterSelection.substring(0, cursor);
+				afterSelection = afterSelection.substring(cursor);
 			}
-			
-			// set values
-			var res = before + settings.prefix + selected + settings.suffix + after;
-			$(target).val(res);
-			
-			// restore the selection area and scroll of the reference
-			ref.selectionEnd = before.length + settings.prefix.length + selected.length;
+
+			box.value = beforeSelection + prefix + selectedText + suffix + trailingSpace + afterSelection;
+
+			box.selectionEnd = beforeSelection.length + prefix.length + selectedText.length;
 			if (selectionStart === selectionEnd) {
-				ref.selectionStart = ref.selectionEnd;
+				box.selectionStart = box.selectionEnd;
 			} else {
-				ref.selectionStart = before.length + settings.prefix.length;
+				box.selectionStart = beforeSelection.length + prefix.length;
 			}
-			ref.scrollTop = scrollTop;
+			box.scrollTop = scrollTop;
 		};
-		
-		self.build_toolbars = function(){
-			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
-			if (localStorage.formatText_toolbar == 'true'){
-				// remove existing toolbars
-				if ($('.format-text').length > 0) $('.format-text').remove();
-				
-				// Place toolbar above each textarea input
-				var name, options = '', rules = JSON.parse(localStorage.formatText_rules);
-				for (var index in rules) {
-					if (!rules.hasOwnProperty(index)) continue;
-					name = rules[index].text;
 
-					//add hint if key exists
-					if (rules[index].key) {
-						name += ' (CTRL + '+ rules[index].key.toUpperCase() +')';
+		/*	Generate the HTML for the toolbar
+		 */
+		for (ele in formats) {
+			if (formats.hasOwnProperty(ele) && formats[ele].displayText != null) {
+				name = formats[ele].displayText;
+				altText = formats[ele].altText || '';
+				key = formats[ele].shortcutKey;
+
+				//add tooltip text
+				if (altText) {
+					if (key) {
+						altText += ' (ctrl+'+ key +')';
 					}
-					options += '<option value="'+ index +'">'+ name +'</option>';
-				}
-				$('[name="body"]').before('<div class="format-text"><a href="javascript:;" onclick="formatText.toolbar_wrap(this);">Wrap</a><select>'+ options +'</select></div>');
-				$('body').append('<style>#quick-reply .format-text>a{width:15%;display:inline-block;text-align:center;}#quick-reply .format-text>select{width:85%;};</style>');
-			}
-		};
-		
-		self.add_rule = function(rule, index){
-			if (rule === undefined) rule = {
-				text: 'New Rule',
-				key: '',
-				multiline:false, 
-				exclusiveline:false, 
-				prefix:'',
-				suffix:''
-			}
-			
-			// generate an id for the rule
-			if (index === undefined) {
-				var rules = JSON.parse(localStorage.formatText_rules);
-				while (rules[index] || index === undefined) {
-					index = ''
-					index +='abcdefghijklmnopqrstuvwxyz'.substr(Math.floor(Math.random()*26),1);
-					index +='abcdefghijklmnopqrstuvwxyz'.substr(Math.floor(Math.random()*26),1);
-					index +='abcdefghijklmnopqrstuvwxyz'.substr(Math.floor(Math.random()*26),1);
+					altText = 'title="'+ altText +'"';
 				}
+
+				subStr = '<a href="javascript:void(0)" '+ altText +' id="tf-'+ ele +'">'+ name +'</a>';
+				strBuilder.push(subStr);
+			} else {
+				continue;
 			}
-			if (window.Options && Options.get_tab('formatting')){
-				var html = $('<div class="format_rule" name="'+ index +'"></div>').html('\
-				<input type="text" name="text" class="format_option" size="10" value=\"'+ rule.text.replace(/"/g, '&quot;') +'\">\
-				<input type="checkbox" name="multiline" class="format_option" '+ (rule.multiline ? 'checked' : '') +'>\
-				<input type="checkbox" name="exclusiveline" class="format_option" '+ (rule.exclusiveline ? 'checked' : '') +'>\
-				<input type="text" name="prefix" class="format_option" size="8" value=\"'+ (rule.prefix ? rule.prefix.replace(/"/g, '&quot;') : '') +'\">\
-				<input type="text" name="suffix" class="format_option" size="8" value=\"'+ (rule.suffix ? rule.suffix.replace(/"/g, '&quot;') : '') +'\">\
-				<input type="text" name="key" class="format_option" size="2" maxlength="1" value=\"'+ rule.key +'\">\
-				<input type="button" value="X" onclick="if(confirm(\'Do you wish to remove the '+ rule.text +' formatting rule?\'))$(this).parent().remove();">\
-				');
-				
-				if ($('.format_rule').length > 0) {
-					$('.format_rule').last().after(html);
-				} else {
-					Options.extend_tab('formatting', html);
+		}
+
+		$( 'textarea[name="body"]' ).before( '<div class="tf-toolbar"></div>' );
+		$( '.tf-toolbar' ).html( strBuilder.join(' | ') );
+
+		/*	Sets the CSS style
+		 */
+		styleRules = '\n/* generated by 8chan Formatting Tools */'+
+					 '\n.tf-toolbar {padding: 0px 5px 1px 5px;}'+
+					 '\n.tf-toolbar :link {text-decoration: none;}';
+			for (ele in formats) {
+				if (formats.hasOwnProperty(ele) && formats[ele].styleCSS) {
+					styleRules += ' \n#tf-' + ele + ' {' + formats[ele].styleCSS + '}';
 				}
 			}
-		};
-		
-		self.save_rules = function(){
-			var newrules = {}, rules = $('.format_rule');
-			for (var index=0;rules[index];index++) {
-				newrules[$(rules[index]).attr('name')] = {
-					text: $(rules[index]).find('[name="text"]').val(),
-					key: $(rules[index]).find('[name="key"]').val(),
-					prefix: $(rules[index]).find('[name="prefix"]').val(),
-					suffix: $(rules[index]).find('[name="suffix"]').val(),
-					multiline: $(rules[index]).find('[name="multiline"]').is(':checked'),
-					exclusiveline: $(rules[index]).find('[name="exclusiveline"]').is(':checked')
-				};
-			}
-			localStorage.formatText_rules = JSON.stringify(newrules);
-			self.build_toolbars();
-		};
-		
-		self.reset_rules = function() {
-			localStorage.formatText_rules = JSON.stringify(self.rules);
-		};
-		
-		// store default rules for customizing
-		if (!localStorage.formatText_rules) self.reset_rules();
-		
-		// Add settings to Options panel general tab
-		if (window.Options && Options.get_tab('general')) {
-			var s1 = '#formatText_enable>input', s2 = '#formatText_keybinds>input', s3 = '#formatText_toolbar>input', e = 'change';
-			Options.extend_tab('general', '\
-				<fieldset>\
-					<legend>Formatting Options</legend>\
-					<label id="formatText_enable"><input type="checkbox" checked="checked" id="formatText_enable">' + _('Enable post formatting') + '</label>\
-					<label id="formatText_keybinds"><input type="checkbox" checked="checked" id="formatText_keybinds">' + _('Enable formatting keybinds') + '</label>\
-					<label id="formatText_toolbar"><input type="checkbox" checked="checked" id="formatText_toolbar">' + _('Show formatting toolbar') + '</label>\
-				</fieldset>\
-			');
-		} else {
-			var s1 = '#formatText_enable', s2 = '#formatText_keybinds', s3 = '#formatText_toolbar', e = 'click';
-			$('hr:first').before('<div id="formatText_enable" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable post formatting') +'</a></div>');
-			$('hr:first').before('<div id="formatText_keybinds" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable formatting keybinds') +'</a></div>');
-			$('hr:first').before('<div id="formatText_toolbar" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Show formatting toolbar') +'</a></div>');
-		}
-		
-		// setting for enableing text formatting
-		$(s1).on(e, function(e) {
-			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') {
-				localStorage.formatText_enable = 'true';
-				if (window.Options && Options.get_tab('general')) e.target.checked = true;
+			//add CSS rule to user's custom CSS if it exist
+			if ($( '.user-css' ).length !== 0) {
+				$( '.user-css' ).append( styleRules );
 			} else {
-				localStorage.formatText_enable = 'false';
-				if (window.Options && Options.get_tab('general')) e.target.checked = false;
+				$( 'body' ).append( '<style>'+ styleRules +'\n</style>' );
 			}
-		});
-		
-	  // setting for enableing formatting keybinds
-		$(s2).on(e, function(e) {
-			if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') {
-				localStorage.formatText_keybinds = 'true';
-				if (window.Options && Options.get_tab('general')) e.target.checked = true;
-			} else {
-				localStorage.formatText_keybinds = 'false';
-				if (window.Options && Options.get_tab('general')) e.target.checked = false;
+
+		/*  Attach event listeners
+		 */
+		$( 'body' ).on( 'keydown', 'textarea[name="body"]', {formats: formats}, function (e) {
+			//shortcuts
+			if (e.ctrlKey) {
+				var ch = String.fromCharCode(e.which).toLowerCase();
+				var box = e.target;
+				var formats = e.data.formats;
+				for (var ele in formats) {
+					if (formats.hasOwnProperty(ele) && (ch === formats[ele].shortcutKey)) {
+						formats[ele].edit(box, formats[ele].options);
+						e.preventDefault();
+					}
+				}
 			}
 		});
-		
-	  // setting for toolbar injection
-		$(s3).on(e, function(e) {
-			if (!localStorage.formatText_toolbar || localStorage.formatText_toolbar == 'false') {
-				localStorage.formatText_toolbar = 'true';
-				if (window.Options && Options.get_tab('general')) e.target.checked = true;
-				formatText.build_toolbars();
-			} else {
-				localStorage.formatText_toolbar = 'false';
-				if (window.Options && Options.get_tab('general')) e.target.checked = false;
-				$('.format-text').remove();
+		$( 'body' ).on( 'keydown', '#quick-reply textarea[name="body"]', {formats: formats}, function (e) {
+			//close quick reply when esc is prssed
+			if (e.which === 27) {
+				$( '.close-btn' ).trigger( 'click' );
 			}
 		});
-		
-		// make sure the tab settings are switch properly at loadup
-		if (window.Options && Options.get_tab('general')) {
-			if (localStorage.formatText_enable == 'true') $(s1)[0].checked = true;
-			else $(s1)[0].checked = false;
-			if (localStorage.formatText_keybinds == 'true') $(s2)[0].checked = true;
-			else $(s2)[0].checked = false;
-			if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true;
-			else $(s3)[0].checked = false;
-		}
-		
-		// add the tab for customizing the format settings
-		if (window.Options && !Options.get_tab('formatting')) {
-			Options.add_tab('formatting', 'angle-right', 'Customize Formatting');
-			Options.extend_tab('formatting', '\
-			<style>\
-				.format_option{\
-					margin-right:5px;\
-					overflow:initial;\
-					font-size:15px;\
-				}\
-				.format_option[type="text"]{\
-					text-align:center;\
-					padding-bottom: 2px;\
-					padding-top: 2px;\
-				}\
-				.format_option:last-child{\
-					margin-right:0;\
-				}\
-				fieldset{\
-					margin-top:5px;\
-				}\
-			</style>\
-			');
-			
-			// Data control row
-			Options.extend_tab('formatting', '\
-			<button onclick="formatText.add_rule();">Add Rule</button>\
-			<button onclick="formatText.save_rules();">Save Rules</button>\
-			<button onclick="formatText.reset_rules();">Reset Rules to Default</button>\
-			');
-			
-			// Descriptor row
-			Options.extend_tab('formatting', '\
-				<span class="format_option" style="margin-left:25px;">Name</span>\
-				<span class="format_option" style="margin-left:45px;" title="Multi-line: Allow formatted area to contain linebreaks.">ML</span>\
-				<span class="format_option" style="margin-left:0px;" title="Exclusive-line: Require formatted area to start after and end before a linebreak.">EL</span>\
-				<span class="format_option" style="margin-left:25px;" title="Text injected at the start of a format area.">Prefix</span>\
-				<span class="format_option" style="margin-left:60px;" title="Text injected at the end of a format area.">Suffix</span>\
-				<span class="format_option" style="margin-left:40px;" title="Optional keybind value to allow keyboard shortcut access.">Key</span>\
-			');
-			
-			// Rule rows
-			var rules = JSON.parse(localStorage.formatText_rules);
-			for (var index in rules){
-				if (!rules.hasOwnProperty(index)) continue;
-				self.add_rule(rules[index], index);
-			}
-		}
-		
-		return self;
-    })(jQuery);
-	
-	// run initial toolbar injection
-	formatText.build_toolbars();
-	
-	//attach listeners to <body> so it also works on quick-reply box
-	$('body').on('keydown', '#body, #quick-reply #body', function(e) {
-		if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
-		if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') return;
-		var key = String.fromCharCode(e.which).toLowerCase();
-		var rules = JSON.parse(localStorage.formatText_rules);
-		for (var index in rules) {
-			if (!rules.hasOwnProperty(index)) continue;
-			if (key === rules[index].key && e.ctrlKey) {
-				e.preventDefault();
-				if (e.shiftKey) {
-					formatText.wrap(e.target, 'textarea[name="body"]', index, true);
-				} else {
-					formatText.wrap(e.target, 'textarea[name="body"]', index, false);
+		$( 'body' ).on( 'click', '.tf-toolbar a[id]', {formats: formats}, function (e) {
+			//toolbar buttons
+			var formats = e.data.formats;
+			var box = $(e.target).parent().next()[0];
+
+			for (var ele in formats) {
+				if (formats.hasOwnProperty(ele) && (e.target.id === 'tf-' + ele)) {
+					formats[ele].edit(box, formats[ele].options);
 				}
 			}
-		}
+		});
+		// $( 'body' ).on( 'keydown', function (e) {
+		// 	if (e.which === 67 &&
+		// 		e.target.nodeName !== 'INPUT' &&         //The C, the whole C, and nothing but the C
+		// 		e.target.nodeName !== 'TEXTAREA' &&
+		// 		!(e.ctrlKey || e.altKey || e.shiftKey)) {
+		// 			document.location.href = '//'+ document.location.host +'/'+ board_name +'/catalog.html';
+		// 		}
+		// });
+	
 	});
-	$(document).trigger('formatText');
-}
\ No newline at end of file
+}
diff --git a/stylesheets/style.css b/stylesheets/style.css
index ec07fe0a..0e56f442 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -896,7 +896,6 @@ div.thread:hover {
   right: 0px;
   text-align: left;
   font-size: 12px;
-  overflow-y: auto;
 }
 
 .options_tab h2 {
-- 
cgit v1.3


From 1663efcf9d0dd85a49526d21e761bf3ee4a675d8 Mon Sep 17 00:00:00 2001
From: Forkless <REDACTED@gmail.com>
Date: Sat, 1 Nov 2014 22:28:16 -0500
Subject: Fix for update to comment toolbar (should work now)

---
 js/comment-toolbar.js  | 549 ++++++++++++++++++++++++++++++-------------------
 js/options/user-css.js |   2 +-
 js/options/user-js.js  |   2 +-
 3 files changed, 344 insertions(+), 209 deletions(-)

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
index 7ae11a73..be58c1f6 100644
--- a/js/comment-toolbar.js
+++ b/js/comment-toolbar.js
@@ -8,253 +8,388 @@
  *   $config['additional_javascript'][] = 'js/comment-toolbar.js';
  */
 if (active_page == 'thread' || active_page == 'index') {
-	$(document).ready(function () {
-		'use strict';
-		var formats = {
-			bold: {
-				displayText: 'B',
-				altText: 'bold',
-				styleCSS: 'font-weight: bold;',
-				options: {
-					prefix: "'''",
-					suffix: "'''"
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 'b'
+	var formatText = (function($){
+		"use strict";
+		var self = {};
+		self.rules = {
+			spoiler: {
+				text: 'Spoiler',
+				key: 's',
+				multiline: false, 
+				exclusiveline: false, 
+				prefix:'**',
+				suffix:'**'
 			},
 			italics: {
-				displayText: 'i',
-				altText: 'italics',
-				styleCSS: 'font-style: italic;',
-				options: {
-					prefix: "''",
-					suffix: "''"
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 'i'
-			},
-			under: {
-				displayText: 'U',
-				altText: 'underline',
-				styleCSS: 'text-decoration: underline;',
-				options: {
-					prefix: '__',
-					suffix: '__'
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 'u'
+				text: 'Italics',
+				key: 'i',
+				multiline: false, 
+				exclusiveline: false, 
+				prefix: "''",
+				suffix: "''"
+			}, 
+			bold: {
+				text: 'Bold',
+				key: 'b',
+				multiline: false, 
+				exclusiveline: false, 
+				prefix: "'''",
+				suffix: "'''"
 			},
-			spoiler: {
-				displayText: 'spoiler',
-				altText: 'mark as spoiler',
-				styleCSS: '',
-				options: {
-					prefix: '[spoiler]',
-					suffix: '[/spoiler]'
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 's'
+			underline: {
+				text: 'Underline',
+				key: 'u',
+				multiline: false, 
+				exclusiveline: false, 
+				prefix:'__',
+				suffix:'__'
 			},
 			code: {
-				displayText: 'code',
-				altText: "code formatting",
-				styleCSS: 'font-family: "Courier New", Courier, monospace;',
-				options: {
-					prefix: '[code]',
-					suffix: '[/code]',
-					multiline: true
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				},
-				shortcutKey: 'd'
+				text: 'Code',
+				key: 'f',
+				multiline: true, 
+				exclusiveline: false, 
+				prefix: '[code]',
+				suffix: '[/code]'
 			},
 			strike: {
-				displayText: 'strike',
-				altText: 'strikethrough',
-				styleCSS: 'text-decoration: line-through;',
-				options: {
-					prefix: '~~',
-					suffix: '~~'
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				}
+				text: 'Strike',
+				key: 'd',
+				multiline:false, 
+				exclusiveline:false, 
+				prefix:'~~',
+				suffix:'~~'
 			},
 			heading: {
-				displayText: 'heading',
-				altText: 'redtext',
-				styleCSS: 'color: #AF0A0F; font-weight: bold;',
-				options: {
-					prefix: '==',
-					suffix: '==',
-					exclusiveLine: true
-				},
-				edit: function (box, options) {
-					wrapSelection(box, options);
-				}
+				text: 'Heading',
+				key: 'r',
+				multiline:false, 
+				exclusiveline:true, 
+				prefix:'==',
+				suffix:'=='
 			}
 		};
-
-		var key, name, altText, ele;
-		var strBuilder = [];
-		var subStr = '';
-		var styleRules = '';
-
-		//not exactly mine
-		var wrapSelection = function (box, options) {
-			if (box == null) {
-				return;
+		
+		self.toolbar_wrap = function(node) {
+			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
+			var parent = $(node).parents('form[name="post"]');
+			self.wrap(parent.find('#body')[0],'textarea[name="body"]', parent.find('.format-text > select')[0].value, false);
+		};
+	
+		self.wrap = function(ref, target, option, expandedwrap) {
+			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
+			// clean and validate arguments
+			if (ref == null) return;
+			var settings = {multiline: false, exclusiveline: false, prefix:'', suffix: null};
+			$.extend(settings,JSON.parse(localStorage.formatText_rules)[option]);
+			
+			// resolve targets into array of proper node elements
+			// yea, this is overly verbose, oh well.
+			var res = [];
+			if (target instanceof Array) {
+				for (var indexa in target) {
+					if (target.hasOwnProperty(indexa)) {
+						if (typeof target[indexa] == 'string') {
+							var nodes = $(target[indexa]);
+							for (var indexb in nodes) {
+								if (indexa.hasOwnProperty(indexb)) res.push(nodes[indexb]);
+							}
+						} else {
+							res.push(target[indexa]);
+						}
+					}
+				}
+			} else {
+				if (typeof target == 'string') {
+					var nodes = $(target);
+					for (var index in nodes) {
+						if (nodes.hasOwnProperty(index)) res.push(nodes[index]);
+					}
+				} else {
+					res.push(target);
+				}
 			}
-			var prefix = options.prefix;
-			var suffix = options.suffix;
-			var multiline = options.multiline || false;
-			var exclusiveLine = options.exclusiveLine || false;
-
+			target = res;
 			//record scroll top to restore it later.
-			var scrollTop = box.scrollTop;
-			var selectionStart = box.selectionStart;
-			var selectionEnd = box.selectionEnd;
-			var text = box.value;
-			var beforeSelection = text.substring(0, selectionStart);
-			var selectedText = text.substring(selectionStart, selectionEnd);
-			var afterSelection = text.substring(selectionEnd);
+			var scrollTop = ref.scrollTop;
 
-			var breakSpace = ["\r","\n"];
-			var trailingSpace = "";
-			var cursor = selectedText.length - 1;
+			//We will restore the selection later, so record the current selection
+			var selectionStart = ref.selectionStart;
+			var selectionEnd = ref.selectionEnd;
 
-			//remove trailing space
-			while (cursor > 0 && selectedText[cursor] === " ") {
-				trailingSpace += " ";
-				cursor--;
-			}
-			selectedText = selectedText.substring(0, cursor + 1);
-
-			if (!multiline)
-				selectedText = selectedText.replace(/(\r|\n|\r\n)/g, suffix +"$1"+ prefix);
-
-			if (exclusiveLine) {
+			var text = ref.value;
+			var before = text.substring(0, selectionStart);
+			var selected = text.substring(selectionStart, selectionEnd);
+			var after = text.substring(selectionEnd);
+			var whiteSpace = [" ","\t"];
+			var breakSpace = ["\r","\n"];
+			var cursor;
+			
+			// handles multiline selections on formatting that doesn't support spanning over multiple lines
+			if (!settings.multiline) selected = selected.replace(/(\r|\n|\r\n)/g,settings.suffix +"$1"+ settings.prefix);
+			
+			// handles formatting that requires it to be on it's own line OR if the user wishes to expand the wrap to the nearest linebreak
+			if (settings.exclusiveline || expandedwrap) {
 				// buffer the begining of the selection until a linebreak
-				cursor = beforeSelection.length -1;
-				while (cursor >= 0 && breakSpace.indexOf(beforeSelection.charAt(cursor)) == -1) {
+				cursor = before.length -1;
+				while (cursor >= 0 && breakSpace.indexOf(before.charAt(cursor)) == -1) {
 					cursor--;
 				}
-				selectedText = beforeSelection.substring(cursor +1) + selectedText;
-				beforeSelection = beforeSelection.substring(0, cursor +1);
+				selected = before.substring(cursor +1) + selected;
+				before = before.substring(0, cursor +1);
 				
 				// buffer the end of the selection until a linebreak
 				cursor = 0;
-				while (cursor < afterSelection.length && breakSpace.indexOf(afterSelection.charAt(cursor)) == -1) {
+				while (cursor < after.length && breakSpace.indexOf(after.charAt(cursor)) == -1) {
 					cursor++;
 				}
-				selectedText += afterSelection.substring(0, cursor);
-				afterSelection = afterSelection.substring(cursor);
+				selected += after.substring(0, cursor);
+				after = after.substring(cursor);
 			}
-
-			box.value = beforeSelection + prefix + selectedText + suffix + trailingSpace + afterSelection;
-
-			box.selectionEnd = beforeSelection.length + prefix.length + selectedText.length;
+			
+			// set values
+			var res = before + settings.prefix + selected + settings.suffix + after;
+			$(target).val(res);
+			
+			// restore the selection area and scroll of the reference
+			ref.selectionEnd = before.length + settings.prefix.length + selected.length;
 			if (selectionStart === selectionEnd) {
-				box.selectionStart = box.selectionEnd;
+				ref.selectionStart = ref.selectionEnd;
 			} else {
-				box.selectionStart = beforeSelection.length + prefix.length;
+				ref.selectionStart = before.length + settings.prefix.length;
 			}
-			box.scrollTop = scrollTop;
+			ref.scrollTop = scrollTop;
 		};
+		
+		self.build_toolbars = function(){
+			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
+			if (localStorage.formatText_toolbar == 'true'){
+				// remove existing toolbars
+				if ($('.format-text').length > 0) $('.format-text').remove();
+				
+				// Place toolbar above each textarea input
+				var name, options = '', rules = JSON.parse(localStorage.formatText_rules);
+				for (var index in rules) {
+					if (!rules.hasOwnProperty(index)) continue;
+					name = rules[index].text;
 
-		/*	Generate the HTML for the toolbar
-		 */
-		for (ele in formats) {
-			if (formats.hasOwnProperty(ele) && formats[ele].displayText != null) {
-				name = formats[ele].displayText;
-				altText = formats[ele].altText || '';
-				key = formats[ele].shortcutKey;
-
-				//add tooltip text
-				if (altText) {
-					if (key) {
-						altText += ' (ctrl+'+ key +')';
+					//add hint if key exists
+					if (rules[index].key) {
+						name += ' (CTRL + '+ rules[index].key.toUpperCase() +')';
 					}
-					altText = 'title="'+ altText +'"';
+					options += '<option value="'+ index +'">'+ name +'</option>';
 				}
-
-				subStr = '<a href="javascript:void(0)" '+ altText +' id="tf-'+ ele +'">'+ name +'</a>';
-				strBuilder.push(subStr);
-			} else {
-				continue;
+				$('[name="body"]').before('<div class="format-text"><a href="javascript:;" onclick="formatText.toolbar_wrap(this);">Wrap</a><select>'+ options +'</select></div>');
+				$('body').append('<style>#quick-reply .format-text>a{width:15%;display:inline-block;text-align:center;}#quick-reply .format-text>select{width:85%;};</style>');
 			}
-		}
-
-		$( 'textarea[name="body"]' ).before( '<div class="tf-toolbar"></div>' );
-		$( '.tf-toolbar' ).html( strBuilder.join(' | ') );
-
-		/*	Sets the CSS style
-		 */
-		styleRules = '\n/* generated by 8chan Formatting Tools */'+
-					 '\n.tf-toolbar {padding: 0px 5px 1px 5px;}'+
-					 '\n.tf-toolbar :link {text-decoration: none;}';
-			for (ele in formats) {
-				if (formats.hasOwnProperty(ele) && formats[ele].styleCSS) {
-					styleRules += ' \n#tf-' + ele + ' {' + formats[ele].styleCSS + '}';
-				}
+		};
+		
+		self.add_rule = function(rule, index){
+			if (rule === undefined) rule = {
+				text: 'New Rule',
+				key: '',
+				multiline:false, 
+				exclusiveline:false, 
+				prefix:'',
+				suffix:''
 			}
-			//add CSS rule to user's custom CSS if it exist
-			if ($( '.user-css' ).length !== 0) {
-				$( '.user-css' ).append( styleRules );
-			} else {
-				$( 'body' ).append( '<style>'+ styleRules +'\n</style>' );
+			
+			// generate an id for the rule
+			if (index === undefined) {
+				var rules = JSON.parse(localStorage.formatText_rules);
+				while (rules[index] || index === undefined) {
+					index = ''
+					index +='abcdefghijklmnopqrstuvwxyz'.substr(Math.floor(Math.random()*26),1);
+					index +='abcdefghijklmnopqrstuvwxyz'.substr(Math.floor(Math.random()*26),1);
+					index +='abcdefghijklmnopqrstuvwxyz'.substr(Math.floor(Math.random()*26),1);
+				}
 			}
-
-		/*  Attach event listeners
-		 */
-		$( 'body' ).on( 'keydown', 'textarea[name="body"]', {formats: formats}, function (e) {
-			//shortcuts
-			if (e.ctrlKey) {
-				var ch = String.fromCharCode(e.which).toLowerCase();
-				var box = e.target;
-				var formats = e.data.formats;
-				for (var ele in formats) {
-					if (formats.hasOwnProperty(ele) && (ch === formats[ele].shortcutKey)) {
-						formats[ele].edit(box, formats[ele].options);
-						e.preventDefault();
-					}
+			if (window.Options && Options.get_tab('formatting')){
+				var html = $('<div class="format_rule" name="'+ index +'"></div>').html('\
+				<input type="text" name="text" class="format_option" size="10" value=\"'+ rule.text.replace(/"/g, '&quot;') +'\">\
+				<input type="checkbox" name="multiline" class="format_option" '+ (rule.multiline ? 'checked' : '') +'>\
+				<input type="checkbox" name="exclusiveline" class="format_option" '+ (rule.exclusiveline ? 'checked' : '') +'>\
+				<input type="text" name="prefix" class="format_option" size="8" value=\"'+ (rule.prefix ? rule.prefix.replace(/"/g, '&quot;') : '') +'\">\
+				<input type="text" name="suffix" class="format_option" size="8" value=\"'+ (rule.suffix ? rule.suffix.replace(/"/g, '&quot;') : '') +'\">\
+				<input type="text" name="key" class="format_option" size="2" maxlength="1" value=\"'+ rule.key +'\">\
+				<input type="button" value="X" onclick="if(confirm(\'Do you wish to remove the '+ rule.text +' formatting rule?\'))$(this).parent().remove();">\
+				');
+				
+				if ($('.format_rule').length > 0) {
+					$('.format_rule').last().after(html);
+				} else {
+					Options.extend_tab('formatting', html);
 				}
 			}
+		};
+		
+		self.save_rules = function(){
+			var rule, newrules = {}, rules = $('.format_rule');
+			for (var index=0;rules[index];index++) {
+				rule = $(rules[index]);
+				newrules[rule.attr('name')] = {
+					text: rule.find('[name="text"]').val(),
+					key: rule.find('[name="key"]').val(),
+					prefix: rule.find('[name="prefix"]').val(),
+					suffix: rule.find('[name="suffix"]').val(),
+					multiline: rule.find('[name="multiline"]').is(':checked'),
+					exclusiveline: rule.find('[name="exclusiveline"]').is(':checked')
+				};
+			}
+			localStorage.formatText_rules = JSON.stringify(newrules);
+			self.build_toolbars();
+		};
+		
+		self.reset_rules = function(to_default) {
+			$('.format_rule').remove();
+			var rules;
+			if (to_default) rules = self.rules;
+			else rules = JSON.parse(localStorage.formatText_rules);
+			for (var index in rules){
+				if (!rules.hasOwnProperty(index)) continue;
+				self.add_rule(rules[index], index);
+			}
+		};
+		
+		// setup default rules for customizing
+		if (!localStorage.formatText_rules) localStorage.formatText_rules = JSON.stringify(self.rules);
+		
+		// Add settings to Options panel general tab
+		if (window.Options && Options.get_tab('general')) {
+			var s1 = '#formatText_enable>input', s2 = '#formatText_keybinds>input', s3 = '#formatText_toolbar>input', e = 'change';
+			Options.extend_tab('general', '\
+				<fieldset>\
+					<legend>Formatting Options</legend>\
+					<label id="formatText_enable"><input type="checkbox" checked="checked" id="formatText_enable">' + _('Enable post formatting') + '</label>\
+					<label id="formatText_keybinds"><input type="checkbox" checked="checked" id="formatText_keybinds">' + _('Enable formatting keybinds') + '</label>\
+					<label id="formatText_toolbar"><input type="checkbox" checked="checked" id="formatText_toolbar">' + _('Show formatting toolbar') + '</label>\
+				</fieldset>\
+			');
+		} else {
+			var s1 = '#formatText_enable', s2 = '#formatText_keybinds', s3 = '#formatText_toolbar', e = 'click';
+			$('hr:first').before('<div id="formatText_enable" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable post formatting') +'</a></div>');
+			$('hr:first').before('<div id="formatText_keybinds" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable formatting keybinds') +'</a></div>');
+			$('hr:first').before('<div id="formatText_toolbar" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Show formatting toolbar') +'</a></div>');
+		}
+		
+		// setting for enableing text formatting
+		$(s1).on(e, function(e) {
+			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') {
+				localStorage.formatText_enable = 'true';
+				if (window.Options && Options.get_tab('general')) e.target.checked = true;
+			} else {
+				localStorage.formatText_enable = 'false';
+				if (window.Options && Options.get_tab('general')) e.target.checked = false;
+			}
 		});
-		$( 'body' ).on( 'keydown', '#quick-reply textarea[name="body"]', {formats: formats}, function (e) {
-			//close quick reply when esc is prssed
-			if (e.which === 27) {
-				$( '.close-btn' ).trigger( 'click' );
+		
+	  // setting for enableing formatting keybinds
+		$(s2).on(e, function(e) {
+			if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') {
+				localStorage.formatText_keybinds = 'true';
+				if (window.Options && Options.get_tab('general')) e.target.checked = true;
+			} else {
+				localStorage.formatText_keybinds = 'false';
+				if (window.Options && Options.get_tab('general')) e.target.checked = false;
 			}
 		});
-		$( 'body' ).on( 'click', '.tf-toolbar a[id]', {formats: formats}, function (e) {
-			//toolbar buttons
-			var formats = e.data.formats;
-			var box = $(e.target).parent().next()[0];
-
-			for (var ele in formats) {
-				if (formats.hasOwnProperty(ele) && (e.target.id === 'tf-' + ele)) {
-					formats[ele].edit(box, formats[ele].options);
-				}
+		
+	  // setting for toolbar injection
+		$(s3).on(e, function(e) {
+			if (!localStorage.formatText_toolbar || localStorage.formatText_toolbar == 'false') {
+				localStorage.formatText_toolbar = 'true';
+				if (window.Options && Options.get_tab('general')) e.target.checked = true;
+				formatText.build_toolbars();
+			} else {
+				localStorage.formatText_toolbar = 'false';
+				if (window.Options && Options.get_tab('general')) e.target.checked = false;
+				$('.format-text').remove();
 			}
 		});
-		// $( 'body' ).on( 'keydown', function (e) {
-		// 	if (e.which === 67 &&
-		// 		e.target.nodeName !== 'INPUT' &&         //The C, the whole C, and nothing but the C
-		// 		e.target.nodeName !== 'TEXTAREA' &&
-		// 		!(e.ctrlKey || e.altKey || e.shiftKey)) {
-		// 			document.location.href = '//'+ document.location.host +'/'+ board_name +'/catalog.html';
-		// 		}
-		// });
+		
+		// make sure the tab settings are switch properly at loadup
+		if (window.Options && Options.get_tab('general')) {
+			if (localStorage.formatText_enable == 'true') $(s1)[0].checked = true;
+			else $(s1)[0].checked = false;
+			if (localStorage.formatText_keybinds == 'true') $(s2)[0].checked = true;
+			else $(s2)[0].checked = false;
+			if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true;
+			else $(s3)[0].checked = false;
+		}
+		
+		// add the tab for customizing the format settings
+		if (window.Options && !Options.get_tab('formatting')) {
+			Options.add_tab('formatting', 'angle-right', 'Customize Formatting');
+			Options.extend_tab('formatting', '\
+			<style>\
+				.format_option{\
+					margin-right:5px;\
+					overflow:initial;\
+					font-size:15px;\
+				}\
+				.format_option[type="text"]{\
+					text-align:center;\
+					padding-bottom: 2px;\
+					padding-top: 2px;\
+				}\
+				.format_option:last-child{\
+					margin-right:0;\
+				}\
+				fieldset{\
+					margin-top:5px;\
+				}\
+			</style>\
+			');
+			
+			// Data control row
+			Options.extend_tab('formatting', '\
+			<button onclick="formatText.add_rule();">Add Rule</button>\
+			<button onclick="formatText.save_rules();">Save Rules</button>\
+			<button onclick="formatText.reset_rules(false);">Revert</button>\
+			<button onclick="formatText.reset_rules(true);">Reset to Default</button>\
+			');
+			
+			// Descriptor row
+			Options.extend_tab('formatting', '\
+				<span class="format_option" style="margin-left:25px;">Name</span>\
+				<span class="format_option" style="margin-left:45px;" title="Multi-line: Allow formatted area to contain linebreaks.">ML</span>\
+				<span class="format_option" style="margin-left:0px;" title="Exclusive-line: Require formatted area to start after and end before a linebreak.">EL</span>\
+				<span class="format_option" style="margin-left:25px;" title="Text injected at the start of a format area.">Prefix</span>\
+				<span class="format_option" style="margin-left:60px;" title="Text injected at the end of a format area.">Suffix</span>\
+				<span class="format_option" style="margin-left:40px;" title="Optional keybind value to allow keyboard shortcut access.">Key</span>\
+			');
+			
+			// Rule rows
+			var rules = JSON.parse(localStorage.formatText_rules);
+			for (var index in rules){
+				if (!rules.hasOwnProperty(index)) continue;
+				self.add_rule(rules[index], index);
+			}
+		}
+		
+		return self;
+    })(jQuery);
+	
+	// run initial toolbar injection
+	formatText.build_toolbars();
 	
+	//attach listeners to <body> so it also works on quick-reply box
+	$('body').on('keydown', '#body, #quick-reply #body', function(e) {
+		if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
+		if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') return;
+		var key = String.fromCharCode(e.which).toLowerCase();
+		var rules = JSON.parse(localStorage.formatText_rules);
+		for (var index in rules) {
+			if (!rules.hasOwnProperty(index)) continue;
+			if (key === rules[index].key && e.ctrlKey) {
+				e.preventDefault();
+				if (e.shiftKey) {
+					formatText.wrap(e.target, 'textarea[name="body"]', index, true);
+				} else {
+					formatText.wrap(e.target, 'textarea[name="body"]', index, false);
+				}
+			}
+		}
 	});
-}
+	$(document).trigger('formatText');
+}
\ No newline at end of file
diff --git a/js/options/user-css.js b/js/options/user-css.js
index 840bcd1f..fed91ab3 100644
--- a/js/options/user-css.js
+++ b/js/options/user-css.js
@@ -17,7 +17,7 @@ var textarea = $("<textarea></textarea>").css({
   "font-size": 12,
   position: "absolute",
   top: 35, bottom: 35,
-  width: "calc(100% - 12px)", margin: 0, padding: 0, border: "1px solid black",
+  width: "calc(100% - 20px)", margin: 0, padding: "4px", border: "1px solid black",
   left: 5, right: 5
 }).appendTo(tab.content);
 var submit = $("<input type='button' value='"+_("Update custom CSS")+"'>").css({
diff --git a/js/options/user-js.js b/js/options/user-js.js
index 0b7d140f..0ba9b1d0 100644
--- a/js/options/user-js.js
+++ b/js/options/user-js.js
@@ -17,7 +17,7 @@ var textarea = $("<textarea></textarea>").css({
   "font-size": 12,
   position: "absolute",
   top: 35, bottom: 35,
-  width: "calc(100% - 12px)", margin: 0, padding: 0, border: "1px solid black",
+  width: "calc(100% - 20px)", margin: 0, padding: "4px", border: "1px solid black",
   left: 5, right: 5
 }).appendTo(tab.content);
 var submit = $("<input type='button' value='"+_("Update custom Javascript")+"'>").css({
-- 
cgit v1.3


From f6b4b2ac182fa1e155eff5697d8f5352de3385ab Mon Sep 17 00:00:00 2001
From: Forkless <REDACTED@gmail.com>
Date: Thu, 6 Nov 2014 06:29:59 -0600
Subject: Removed redundant setting. Bugfix.

---
 js/comment-toolbar.js | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
index be58c1f6..ab9e3eb1 100644
--- a/js/comment-toolbar.js
+++ b/js/comment-toolbar.js
@@ -27,7 +27,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				exclusiveline: false, 
 				prefix: "''",
 				suffix: "''"
-			}, 
+			},
 			bold: {
 				text: 'Bold',
 				key: 'b',
@@ -71,13 +71,11 @@ if (active_page == 'thread' || active_page == 'index') {
 		};
 		
 		self.toolbar_wrap = function(node) {
-			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
 			var parent = $(node).parents('form[name="post"]');
 			self.wrap(parent.find('#body')[0],'textarea[name="body"]', parent.find('.format-text > select')[0].value, false);
 		};
 	
 		self.wrap = function(ref, target, option, expandedwrap) {
-			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
 			// clean and validate arguments
 			if (ref == null) return;
 			var settings = {multiline: false, exclusiveline: false, prefix:'', suffix: null};
@@ -162,7 +160,6 @@ if (active_page == 'thread' || active_page == 'index') {
 		};
 		
 		self.build_toolbars = function(){
-			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
 			if (localStorage.formatText_toolbar == 'true'){
 				// remove existing toolbars
 				if ($('.format-text').length > 0) $('.format-text').remove();
@@ -256,35 +253,23 @@ if (active_page == 'thread' || active_page == 'index') {
 		
 		// Add settings to Options panel general tab
 		if (window.Options && Options.get_tab('general')) {
-			var s1 = '#formatText_enable>input', s2 = '#formatText_keybinds>input', s3 = '#formatText_toolbar>input', e = 'change';
+			var s1 = '#formatText_keybinds>input', s2 = '#formatText_toolbar>input', e = 'change';
 			Options.extend_tab('general', '\
 				<fieldset>\
 					<legend>Formatting Options</legend>\
-					<label id="formatText_enable"><input type="checkbox" checked="checked" id="formatText_enable">' + _('Enable post formatting') + '</label>\
 					<label id="formatText_keybinds"><input type="checkbox" checked="checked" id="formatText_keybinds">' + _('Enable formatting keybinds') + '</label>\
 					<label id="formatText_toolbar"><input type="checkbox" checked="checked" id="formatText_toolbar">' + _('Show formatting toolbar') + '</label>\
 				</fieldset>\
 			');
 		} else {
-			var s1 = '#formatText_enable', s2 = '#formatText_keybinds', s3 = '#formatText_toolbar', e = 'click';
-			$('hr:first').before('<div id="formatText_enable" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable post formatting') +'</a></div>');
+			var s1 = '#formatText_keybinds', s2 = '#formatText_toolbar', e = 'click';
 			$('hr:first').before('<div id="formatText_keybinds" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable formatting keybinds') +'</a></div>');
 			$('hr:first').before('<div id="formatText_toolbar" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Show formatting toolbar') +'</a></div>');
 		}
 		
-		// setting for enableing text formatting
-		$(s1).on(e, function(e) {
-			if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') {
-				localStorage.formatText_enable = 'true';
-				if (window.Options && Options.get_tab('general')) e.target.checked = true;
-			} else {
-				localStorage.formatText_enable = 'false';
-				if (window.Options && Options.get_tab('general')) e.target.checked = false;
-			}
-		});
 		
 	  // setting for enableing formatting keybinds
-		$(s2).on(e, function(e) {
+		$(s1).on(e, function(e) {
 			if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') {
 				localStorage.formatText_keybinds = 'true';
 				if (window.Options && Options.get_tab('general')) e.target.checked = true;
@@ -295,7 +280,7 @@ if (active_page == 'thread' || active_page == 'index') {
 		});
 		
 	  // setting for toolbar injection
-		$(s3).on(e, function(e) {
+		$(s2).on(e, function(e) {
 			if (!localStorage.formatText_toolbar || localStorage.formatText_toolbar == 'false') {
 				localStorage.formatText_toolbar = 'true';
 				if (window.Options && Options.get_tab('general')) e.target.checked = true;
@@ -309,12 +294,10 @@ if (active_page == 'thread' || active_page == 'index') {
 		
 		// make sure the tab settings are switch properly at loadup
 		if (window.Options && Options.get_tab('general')) {
-			if (localStorage.formatText_enable == 'true') $(s1)[0].checked = true;
+			if (localStorage.formatText_keybinds == 'true') $(s1)[0].checked = true;
 			else $(s1)[0].checked = false;
-			if (localStorage.formatText_keybinds == 'true') $(s2)[0].checked = true;
-			else $(s2)[0].checked = false;
 			if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true;
-			else $(s3)[0].checked = false;
+			else $(s2)[0].checked = false;
 		}
 		
 		// add the tab for customizing the format settings
@@ -375,7 +358,6 @@ if (active_page == 'thread' || active_page == 'index') {
 	
 	//attach listeners to <body> so it also works on quick-reply box
 	$('body').on('keydown', '#body, #quick-reply #body', function(e) {
-		if (!localStorage.formatText_enable || localStorage.formatText_enable == 'false') return;
 		if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') return;
 		var key = String.fromCharCode(e.which).toLowerCase();
 		var rules = JSON.parse(localStorage.formatText_rules);
-- 
cgit v1.3


From 81daf934fb4d1740583220694083b292bc697206 Mon Sep 17 00:00:00 2001
From: Forkless <REDACTED@gmail.com>
Date: Sat, 8 Nov 2014 14:25:54 -0600
Subject: Fix for the js being shitty inside the compiled main.js.

---
 js/comment-toolbar.js | 118 ++++++++++++++++++++++++++------------------------
 1 file changed, 62 insertions(+), 56 deletions(-)

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
index ab9e3eb1..80993cb0 100644
--- a/js/comment-toolbar.js
+++ b/js/comment-toolbar.js
@@ -257,8 +257,8 @@ if (active_page == 'thread' || active_page == 'index') {
 			Options.extend_tab('general', '\
 				<fieldset>\
 					<legend>Formatting Options</legend>\
-					<label id="formatText_keybinds"><input type="checkbox" checked="checked" id="formatText_keybinds">' + _('Enable formatting keybinds') + '</label>\
-					<label id="formatText_toolbar"><input type="checkbox" checked="checked" id="formatText_toolbar">' + _('Show formatting toolbar') + '</label>\
+					<label id="formatText_keybinds"><input type="checkbox">' + _('Enable formatting keybinds') + '</label>\
+					<label id="formatText_toolbar"><input type="checkbox">' + _('Show formatting toolbar') + '</label>\
 				</fieldset>\
 			');
 		} else {
@@ -267,39 +267,6 @@ if (active_page == 'thread' || active_page == 'index') {
 			$('hr:first').before('<div id="formatText_toolbar" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Show formatting toolbar') +'</a></div>');
 		}
 		
-		
-	  // setting for enableing formatting keybinds
-		$(s1).on(e, function(e) {
-			if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') {
-				localStorage.formatText_keybinds = 'true';
-				if (window.Options && Options.get_tab('general')) e.target.checked = true;
-			} else {
-				localStorage.formatText_keybinds = 'false';
-				if (window.Options && Options.get_tab('general')) e.target.checked = false;
-			}
-		});
-		
-	  // setting for toolbar injection
-		$(s2).on(e, function(e) {
-			if (!localStorage.formatText_toolbar || localStorage.formatText_toolbar == 'false') {
-				localStorage.formatText_toolbar = 'true';
-				if (window.Options && Options.get_tab('general')) e.target.checked = true;
-				formatText.build_toolbars();
-			} else {
-				localStorage.formatText_toolbar = 'false';
-				if (window.Options && Options.get_tab('general')) e.target.checked = false;
-				$('.format-text').remove();
-			}
-		});
-		
-		// make sure the tab settings are switch properly at loadup
-		if (window.Options && Options.get_tab('general')) {
-			if (localStorage.formatText_keybinds == 'true') $(s1)[0].checked = true;
-			else $(s1)[0].checked = false;
-			if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true;
-			else $(s2)[0].checked = false;
-		}
-		
 		// add the tab for customizing the format settings
 		if (window.Options && !Options.get_tab('formatting')) {
 			Options.add_tab('formatting', 'angle-right', 'Customize Formatting');
@@ -350,28 +317,67 @@ if (active_page == 'thread' || active_page == 'index') {
 			}
 		}
 		
-		return self;
-    })(jQuery);
-	
-	// run initial toolbar injection
-	formatText.build_toolbars();
-	
-	//attach listeners to <body> so it also works on quick-reply box
-	$('body').on('keydown', '#body, #quick-reply #body', function(e) {
-		if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') return;
-		var key = String.fromCharCode(e.which).toLowerCase();
-		var rules = JSON.parse(localStorage.formatText_rules);
-		for (var index in rules) {
-			if (!rules.hasOwnProperty(index)) continue;
-			if (key === rules[index].key && e.ctrlKey) {
-				e.preventDefault();
-				if (e.shiftKey) {
-					formatText.wrap(e.target, 'textarea[name="body"]', index, true);
+		// setup code to be ran when page is ready (work around for main.js compilation).
+		$(document).ready(function(){
+			// setting for enabling formatting keybinds
+			$(s1).on(e, function(e) {
+				console.log('Keybind');
+				if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') {
+					localStorage.formatText_keybinds = 'true';
+					if (window.Options && Options.get_tab('general')) e.target.checked = true;
 				} else {
-					formatText.wrap(e.target, 'textarea[name="body"]', index, false);
+					localStorage.formatText_keybinds = 'false';
+					if (window.Options && Options.get_tab('general')) e.target.checked = false;
 				}
+			});
+			
+			// setting for toolbar injection
+			$(s2).on(e, function(e) {
+				console.log('Toolbar');
+				if (!localStorage.formatText_toolbar || localStorage.formatText_toolbar == 'false') {
+					localStorage.formatText_toolbar = 'true';
+					if (window.Options && Options.get_tab('general')) e.target.checked = true;
+					formatText.build_toolbars();
+				} else {
+					localStorage.formatText_toolbar = 'false';
+					if (window.Options && Options.get_tab('general')) e.target.checked = false;
+					$('.format-text').remove();
+				}
+			});
+			
+			// make sure the tab settings are switch properly at loadup
+			if (window.Options && Options.get_tab('general')) {
+				if (localStorage.formatText_keybinds == 'true') $(s1)[0].checked = true;
+				else $(s1)[0].checked = false;
+				if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true;
+				else $(s2)[0].checked = false;
 			}
-		}
-	});
-	$(document).trigger('formatText');
+			
+			// Initial toolbar injection
+			formatText.build_toolbars();
+			
+			//attach listener to <body> so it also works on quick-reply box
+			$('body').on('keydown', '[name="body"]', function(e) {
+				if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') return;
+				var key = String.fromCharCode(e.which).toLowerCase();
+				var rules = JSON.parse(localStorage.formatText_rules);
+				for (var index in rules) {
+					if (!rules.hasOwnProperty(index)) continue;
+					if (key === rules[index].key && e.ctrlKey) {
+						e.preventDefault();
+						if (e.shiftKey) {
+							formatText.wrap(e.target, 'textarea[name="body"]', index, true);
+						} else {
+							formatText.wrap(e.target, 'textarea[name="body"]', index, false);
+						}
+					}
+				}
+			});
+			
+			// Signal that comment-toolbar loading has completed.
+			$(document).trigger('formatText');
+		});
+		
+		return self;
+    })(jQuery);
 }
\ No newline at end of file
-- 
cgit v1.3


From 4e39262223eb255904fcd86532058e810e244b79 Mon Sep 17 00:00:00 2001
From: Forkless <REDACTED@gmail.com>
Date: Sat, 8 Nov 2014 22:17:33 -0600
Subject: Moved the Options tab stuff to be setup after the document is ready.

---
 js/comment-toolbar.js | 130 +++++++++++++++++++++++++-------------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
index 80993cb0..65bdc529 100644
--- a/js/comment-toolbar.js
+++ b/js/comment-toolbar.js
@@ -251,74 +251,74 @@ if (active_page == 'thread' || active_page == 'index') {
 		// setup default rules for customizing
 		if (!localStorage.formatText_rules) localStorage.formatText_rules = JSON.stringify(self.rules);
 		
-		// Add settings to Options panel general tab
-		if (window.Options && Options.get_tab('general')) {
-			var s1 = '#formatText_keybinds>input', s2 = '#formatText_toolbar>input', e = 'change';
-			Options.extend_tab('general', '\
-				<fieldset>\
-					<legend>Formatting Options</legend>\
-					<label id="formatText_keybinds"><input type="checkbox">' + _('Enable formatting keybinds') + '</label>\
-					<label id="formatText_toolbar"><input type="checkbox">' + _('Show formatting toolbar') + '</label>\
-				</fieldset>\
-			');
-		} else {
-			var s1 = '#formatText_keybinds', s2 = '#formatText_toolbar', e = 'click';
-			$('hr:first').before('<div id="formatText_keybinds" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable formatting keybinds') +'</a></div>');
-			$('hr:first').before('<div id="formatText_toolbar" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Show formatting toolbar') +'</a></div>');
-		}
-		
-		// add the tab for customizing the format settings
-		if (window.Options && !Options.get_tab('formatting')) {
-			Options.add_tab('formatting', 'angle-right', 'Customize Formatting');
-			Options.extend_tab('formatting', '\
-			<style>\
-				.format_option{\
-					margin-right:5px;\
-					overflow:initial;\
-					font-size:15px;\
-				}\
-				.format_option[type="text"]{\
-					text-align:center;\
-					padding-bottom: 2px;\
-					padding-top: 2px;\
-				}\
-				.format_option:last-child{\
-					margin-right:0;\
-				}\
-				fieldset{\
-					margin-top:5px;\
-				}\
-			</style>\
-			');
-			
-			// Data control row
-			Options.extend_tab('formatting', '\
-			<button onclick="formatText.add_rule();">Add Rule</button>\
-			<button onclick="formatText.save_rules();">Save Rules</button>\
-			<button onclick="formatText.reset_rules(false);">Revert</button>\
-			<button onclick="formatText.reset_rules(true);">Reset to Default</button>\
-			');
-			
-			// Descriptor row
-			Options.extend_tab('formatting', '\
-				<span class="format_option" style="margin-left:25px;">Name</span>\
-				<span class="format_option" style="margin-left:45px;" title="Multi-line: Allow formatted area to contain linebreaks.">ML</span>\
-				<span class="format_option" style="margin-left:0px;" title="Exclusive-line: Require formatted area to start after and end before a linebreak.">EL</span>\
-				<span class="format_option" style="margin-left:25px;" title="Text injected at the start of a format area.">Prefix</span>\
-				<span class="format_option" style="margin-left:60px;" title="Text injected at the end of a format area.">Suffix</span>\
-				<span class="format_option" style="margin-left:40px;" title="Optional keybind value to allow keyboard shortcut access.">Key</span>\
-			');
+		// setup code to be ran when page is ready (work around for main.js compilation).
+		$(document).ready(function(){
+			// Add settings to Options panel general tab
+			if (window.Options && Options.get_tab('general')) {
+				var s1 = '#formatText_keybinds>input', s2 = '#formatText_toolbar>input', e = 'change';
+				Options.extend_tab('general', '\
+					<fieldset>\
+						<legend>Formatting Options</legend>\
+						<label id="formatText_keybinds"><input type="checkbox">' + _('Enable formatting keybinds') + '</label>\
+						<label id="formatText_toolbar"><input type="checkbox">' + _('Show formatting toolbar') + '</label>\
+					</fieldset>\
+				');
+			} else {
+				var s1 = '#formatText_keybinds', s2 = '#formatText_toolbar', e = 'click';
+				$('hr:first').before('<div id="formatText_keybinds" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Enable formatting keybinds') +'</a></div>');
+				$('hr:first').before('<div id="formatText_toolbar" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+ _('Show formatting toolbar') +'</a></div>');
+			}
 			
-			// Rule rows
-			var rules = JSON.parse(localStorage.formatText_rules);
-			for (var index in rules){
-				if (!rules.hasOwnProperty(index)) continue;
-				self.add_rule(rules[index], index);
+			// add the tab for customizing the format settings
+			if (window.Options && !Options.get_tab('formatting')) {
+				Options.add_tab('formatting', 'angle-right', 'Customize Formatting');
+				Options.extend_tab('formatting', '\
+				<style>\
+					.format_option{\
+						margin-right:5px;\
+						overflow:initial;\
+						font-size:15px;\
+					}\
+					.format_option[type="text"]{\
+						text-align:center;\
+						padding-bottom: 2px;\
+						padding-top: 2px;\
+					}\
+					.format_option:last-child{\
+						margin-right:0;\
+					}\
+					fieldset{\
+						margin-top:5px;\
+					}\
+				</style>\
+				');
+				
+				// Data control row
+				Options.extend_tab('formatting', '\
+				<button onclick="formatText.add_rule();">Add Rule</button>\
+				<button onclick="formatText.save_rules();">Save Rules</button>\
+				<button onclick="formatText.reset_rules(false);">Revert</button>\
+				<button onclick="formatText.reset_rules(true);">Reset to Default</button>\
+				');
+				
+				// Descriptor row
+				Options.extend_tab('formatting', '\
+					<span class="format_option" style="margin-left:25px;">Name</span>\
+					<span class="format_option" style="margin-left:45px;" title="Multi-line: Allow formatted area to contain linebreaks.">ML</span>\
+					<span class="format_option" style="margin-left:0px;" title="Exclusive-line: Require formatted area to start after and end before a linebreak.">EL</span>\
+					<span class="format_option" style="margin-left:25px;" title="Text injected at the start of a format area.">Prefix</span>\
+					<span class="format_option" style="margin-left:60px;" title="Text injected at the end of a format area.">Suffix</span>\
+					<span class="format_option" style="margin-left:40px;" title="Optional keybind value to allow keyboard shortcut access.">Key</span>\
+				');
+				
+				// Rule rows
+				var rules = JSON.parse(localStorage.formatText_rules);
+				for (var index in rules){
+					if (!rules.hasOwnProperty(index)) continue;
+					self.add_rule(rules[index], index);
+				}
 			}
-		}
 		
-		// setup code to be ran when page is ready (work around for main.js compilation).
-		$(document).ready(function(){
 			// setting for enabling formatting keybinds
 			$(s1).on(e, function(e) {
 				console.log('Keybind');
-- 
cgit v1.3


From 95a9b7b72bde0a3b529154fc1f25d64dabd51ddb Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sat, 28 Feb 2015 05:06:50 -0800
Subject: Completely rewrite fix-report-delete-submit.js, add report/delete to
 menu

---
 js/fix-report-delete-submit.js | 64 ++++++++++++++++++++++++++++++++++--------
 templates/main.js              | 41 ++++++++++++++++++---------
 2 files changed, 81 insertions(+), 24 deletions(-)

diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index 73b6dd9c..71c97f74 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -1,26 +1,68 @@
 /*
  * fix-report-delete-submit.js
- * https://github.com/savetheinternet/Tinyboard/blob/master/js/fix-report-delete-submit.js
- *
- * Fixes a known bug regarding the delete/report submit buttons.
- *
- * Released under the MIT license
- * Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
  *
  * Usage:
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/post-menu.js';
  *   $config['additional_javascript'][] = 'js/fix-report-delete-submit.js';
  *
  */
 
+if (active_page == 'thread' || active_page == 'index') {
 $(document).ready(function(){
-	$('form[name="postcontrols"] div.delete input:not([type="checkbox"]):not([type="submit"]):not([type="hidden"])').keypress(function(e) {
-		if(e.which == 13) {
+
+if ($('.delete #password').length) {
+	Menu.add_item("delete_post_menu", "Delete post");
+	Menu.add_item("delete_file_menu", "Delete file");
+	Menu.onclick(function(e, $buf) {
+		var ele = e.target.parentElement.parentElement;
+		var $ele = $(ele);
+		var threadId = $ele.parent().attr('id').replace('thread_', '');
+		var postId = $ele.find('.post_no').not('[id]').text();
+
+		$buf.find('#delete_post_menu,#delete_file_menu').click(function(e) {
 			e.preventDefault();
-			$(this).next().click();
-			return false;
+			$('#delete_'+postId).prop('checked', 'checked');
+		
+			if ($(this).attr('id') === 'delete_file_menu') {
+				$('#delete_file').prop('checked', 'checked');
+			} else {
+				$('#delete_file').prop('checked', '');
+			}
+			$('input[name=delete][type=submit]').click();
+		});
+	});
+}
+
+Menu.add_item("report_menu", "Report");
+Menu.add_item("global_report_menu", "Global report");
+Menu.onclick(function(e, $buf) {
+	var ele = e.target.parentElement.parentElement;
+	var $ele = $(ele);
+	var threadId = $ele.parent().attr('id').replace('thread_', '');
+	var postId = $ele.find('.post_no').not('[id]').text();
+
+	$buf.find('#report_menu,#global_report_menu').click(function(e) {
+		$('#delete_'+postId).prop('checked', 'checked');
+		if ($(this).attr('id') === 'global_report_menu') {
+			header = "<div><h1>Attention!</h1><p>This form is only for reporting <strong>child pornography</strong>, <strong>bot spam</strong> and <strong>credit card numbers, social security numbers or banking information</strong>. DMCA requests and all other deletion requests <em>MUST</em> be sent via email to admin@8chan.co.</p><p>8chan is unmoderated and allows posts without collecting <em>ANY</em> information from the poster less the details of their post. Furthermore, all boards on 8chan are user created and not actively monitored by anyone but the board creator.</p><p>8chan has a small volunteer staff to handle this queue, please do not waste their time by filling it with nonsense! <em>If you made a report with this tool and the post was not deleted, <strong>do not make the report again!</strong> Email admin@8chan.co instead.</em> Abuse of the global report system could lead to address blocks against your IP from 8chan.</p><p>Again, 8chan's global volunteers <em>do not</em> handle board specific issues. You most likely want to click \"Report\" instead to reach the creator and volunteers he assigned to this board.</p>";
+			$('#global_report').prop('checked', 'checked');
+		} else {
+			header = "";
+			$('#global_report').prop('checked', '');
 		}
-		return true;
+		alert(header+"Enter reason below...<br/><input type='text' id='alert_reason'>", true, function(){
+			$('#reason').val($('#alert_reason').val());
+			$('input[name=report][type=submit]').click();
+		});
+
 	});
 });
 
+$(document).on('new_post', function(){
+	$('div.delete').hide();
+	$('input.delete').hide();
+});
+$('div.delete').hide();
+$('input.delete').hide();
+})}
diff --git a/templates/main.js b/templates/main.js
index 59a632d7..b3aebcfb 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -71,25 +71,40 @@ var datelocale =
 
 
 function alert(a) {
-  var handler, div;
-  var close = function() {
-    handler.fadeOut(400, function() { handler.remove(); });
-    return false;
-  };
+function alert(a, do_confirm, confirm_ok_action, confirm_cancel_action) {
+      var handler, div, bg, closebtn, okbtn;
+      var close = function() {
+              handler.fadeOut(400, function() { handler.remove(); });
+              return false;
+      };
 
-  handler = $("<div id='alert_handler'></div>").hide().appendTo('body');
+      handler = $("<div id='alert_handler'></div>").hide().appendTo('body');
 
-  $("<div id='alert_background'></div>").click(close).appendTo(handler);
+      bg = $("<div id='alert_background'></div>").appendTo(handler);
 
-  div = $("<div id='alert_div'></div>").appendTo(handler);
-  $("<a id='alert_close' href='javascript:void(0)'><i class='fa fa-times'></i></div>")
-  .click(close).appendTo(div);
+      div = $("<div id='alert_div'></div>").appendTo(handler);
+      closebtn = $("<a id='alert_close' href='javascript:void(0)'><i class='fa fa-times'></i></div>")
+              .appendTo(div);
 
-  $("<div id='alert_message'></div>").html(a).appendTo(div);
+      $("<div id='alert_message'></div>").html(a).appendTo(div);
 
-  $("<button class='button alert_button'>"+_("OK")+"</button>").click(close).appendTo(div);
+      okbtn = $("<button class='button alert_button'>"+_("OK")+"</button>").appendTo(div);
 
-  handler.fadeIn(400);
+      if (do_confirm) {
+              confirm_ok_action = (typeof confirm_ok_action !== "function") ? function(){} : confirm_ok_action;
+              confirm_cancel_action = (typeof confirm_cancel_action !== "function") ? function(){} : confirm_cancel_action;
+              okbtn.click(confirm_ok_action);
+              $("<button class='button alert_button'>"+_("Cancel")+"</button>").click(confirm_cancel_action).click(close).appendTo(div);
+              bg.click(confirm_cancel_action);
+              okbtn.click(confirm_cancel_action);
+              closebtn.click(confirm_cancel_action);
+      }
+
+      bg.click(close);
+      okbtn.click(close);
+      closebtn.click(close);
+
+      handler.fadeIn(400);
 }
 
 var saved = {};
-- 
cgit v1.3


From 8943bb0bb378b629e0b1cf34f66094eb61f8453e Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Fri, 13 Mar 2015 12:45:57 +0800
Subject: Rewrite report system due to flooding

---
 inc/config.php                 |  3 +++
 js/fix-report-delete-submit.js | 15 ++++-----------
 post.php                       | 20 +++++++++++++++++++-
 templates/report.html          | 17 +++++++++++++++++
 4 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 templates/report.html

diff --git a/inc/config.php b/inc/config.php
index b92c4ac0..ad659343 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1687,3 +1687,6 @@
 	// If set to 0, it won't upgrade hashes using old password encryption schema, only create new.
 	// You can set it to a higher value, to further migrate to other password hashing function.
 	$config['password_crypt_version'] = 1;
+
+	// Use CAPTCHA for reports?
+	$config['report_captcha'] = false;
diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index 71c97f74..0b1ff840 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -43,19 +43,12 @@ Menu.onclick(function(e, $buf) {
 	var postId = $ele.find('.post_no').not('[id]').text();
 
 	$buf.find('#report_menu,#global_report_menu').click(function(e) {
-		$('#delete_'+postId).prop('checked', 'checked');
-		if ($(this).attr('id') === 'global_report_menu') {
-			header = "<div><h1>Attention!</h1><p>This form is only for reporting <strong>child pornography</strong>, <strong>bot spam</strong> and <strong>credit card numbers, social security numbers or banking information</strong>. DMCA requests and all other deletion requests <em>MUST</em> be sent via email to admin@8chan.co.</p><p>8chan is unmoderated and allows posts without collecting <em>ANY</em> information from the poster less the details of their post. Furthermore, all boards on 8chan are user created and not actively monitored by anyone but the board creator.</p><p>8chan has a small volunteer staff to handle this queue, please do not waste their time by filling it with nonsense! <em>If you made a report with this tool and the post was not deleted, <strong>do not make the report again!</strong> Email admin@8chan.co instead.</em> Abuse of the global report system could lead to address blocks against your IP from 8chan.</p><p>Again, 8chan's global volunteers <em>do not</em> handle board specific issues. You most likely want to click \"Report\" instead to reach the creator and volunteers he assigned to this board.</p>";
-			$('#global_report').prop('checked', 'checked');
+		if ($(this).attr('id') === "global_report_menu") {
+			var global = '&global';
 		} else {
-			header = "";
-			$('#global_report').prop('checked', '');
+			var global = '';
 		}
-		alert(header+"Enter reason below...<br/><input type='text' id='alert_reason'>", true, function(){
-			$('#reason').val($('#alert_reason').val());
-			$('input[name=report][type=submit]').click();
-		});
-
+		window.open(configRoot+'report.php?board='+board_name+'&post=delete_'+postId+global, "", (global?"width=600, height=575":"width=500, height=275"));
 	});
 });
 
diff --git a/post.php b/post.php
index 1c511f9c..3b4f3311 100644
--- a/post.php
+++ b/post.php
@@ -124,6 +124,23 @@ if (isset($_POST['delete'])) {
 	
 	if (count($report) > $config['report_limit'])
 		error($config['error']['toomanyreports']);
+
+	if ($config['report_captcha'] && !isset($_POST['captcha_text'], $_POST['captcha_cookie'])) {
+		error($config['error']['bot']);
+	}
+
+	if ($config['report_captcha']) {
+		$resp = file_get_contents($config['captcha']['provider_check'] . "?" . http_build_query([
+			'mode' => 'check',
+			'text' => $_POST['captcha_text'],
+			'extra' => $config['captcha']['extra'],
+			'cookie' => $_POST['captcha_cookie']
+		]));
+
+		if ($resp !== '1') {
+                        error($config['error']['captcha']);
+		}
+	}
 	
 	$reason = escape_markup_modifiers($_POST['reason']);
 	markup($reason);
@@ -153,7 +170,8 @@ if (isset($_POST['delete'])) {
 	$root = $is_mod ? $config['root'] . $config['file_mod'] . '?/' : $config['root'];
 	
 	if (!isset($_POST['json_response'])) {
-		header('Location: ' . $root . $board['dir'] . $config['file_index'], true, $config['redirect_http']);
+		$index = $root . $board['dir'] . $config['file_index'];
+		echo Element('page.html', array('config' => $config, 'body' => '<div style="text-align:center"><a href="javascript:window.close()">[ ' . _('Close window') ." ]</a> <a href='$index'>[ " . _('Return') . ' ]</a></div>', 'title' => _('Report submitted!')));
 	} else {
 		header('Content-Type: text/json');
 		echo json_encode(array('success' => true));
diff --git a/templates/report.html b/templates/report.html
new file mode 100644
index 00000000..291f9313
--- /dev/null
+++ b/templates/report.html
@@ -0,0 +1,17 @@
+<form action="{{ config.post_url }}" method="post" id="report_form">
+	<input type="hidden" name="board" value="{{ board.uri }}">
+	<input type="hidden" name="{{ post|e }}" value="1">
+	{% if global %}
+		<input type="hidden" name="global" value="1">
+		<div><h1>Attention!</h1><p>This form is only for reporting <strong>child pornography</strong>, <strong>bot spam</strong> and <strong>credit card numbers, social security numbers or banking information</strong>. DMCA requests and all other deletion requests <em>MUST</em> be sent via email to admin@8chan.co.</p><p>8chan is unmoderated and allows posts without collecting <em>ANY</em> information from the poster less the details of their post. Furthermore, all boards on 8chan are user created and not actively monitored by anyone but the board creator.</p><p>8chan has a small volunteer staff to handle this queue, please do not waste their time by filling it with nonsense! <em>If you made a report with this tool and the post was not deleted, <strong>do not make the report again!</strong> Email admin@8chan.co instead.</em> Abuse of the global report system could lead to address blocks against your IP from 8chan.</p><p>Again, 8chan's global volunteers <em>do not</em> handle board specific issues. You most likely want to click "Report" instead to reach the creator and volunteers he assigned to this board.</p>
+	{% endif %}
+	<p>{% trans %}Enter reason below...{% endtrans %}</p>
+	<input type="text" id="reason" name="reason">
+	{% if config.report_captcha %}
+		<p>{% trans %}To submit your report, please fill out the CAPTCHA below.{% endtrans %}</p>
+		{{ captcha['html'] }}<br/>
+		<input class="captcha_text" name="captcha_text" size="25" maxlength="6" autocomplete="off" type="text">
+		<input class="captcha_cookie" name="captcha_cookie" type="hidden" autocomplete="off" value="{{ captcha['cookie']|e }}"><br/>
+	{% endif %}
+	<input name="report" value="{% trans %}Submit{% endtrans %}" type="submit">
+</form>
-- 
cgit v1.3


From 0b1c67574adc0bab830d0929539ad87a813251f3 Mon Sep 17 00:00:00 2001
From: 7185 <7185@users.noreply.github.com>
Date: Mon, 27 Oct 2014 19:13:30 +0100
Subject: Fix selector in inline.js

Should make >>>/crossboard/links (and expanding links) work again
---
 js/inline.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/inline.js b/js/inline.js
index 4f8c9a72..53865d90 100644
--- a/js/inline.js
+++ b/js/inline.js
@@ -138,8 +138,8 @@ $(document).ready(function() {
   // don't attach to outbound links
 
   if (App.options.get('useInlining')) {
-    var assign_inline = function() { 
-        $('.body a:not([rel]), .mentioned a')
+    var assign_inline = function() {
+        $('.body a[href*="'+location.pathname+'"]:not([rel]):not(.toolong a), .mentioned a')
           .attr('onclick', null)// XXX disable highlightReply
           .off('click')
           .click(inline)
-- 
cgit v1.3


From 6f301505e33c42a37fbc7159f3144f41922c7dc6 Mon Sep 17 00:00:00 2001
From: Pashe <pashe@users.noreply.github.com>
Date: Sun, 19 Oct 2014 21:30:59 -0500
Subject: thread-watcher.js: change display format

---
 js/thread-watcher.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 22656e48..52b8142e 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -28,10 +28,10 @@ watchlist.render = function(reset) {
 	JSON.parse(localStorage.watchlist).forEach(function(e, i) {
 		//look at line 69, that's what (e) is here.
 		threads.push('<div class="watchlist-inner" id="watchlist-'+i+'">' +
-		'<span>Board: '+e[0]+'</span>&nbsp' +
-		'<span>Thread: '+'<a href="'+e[3]+'">'+e[1]+'</a></span>&nbsp' +
-		'<span>Replies: '+e[2]+'</span>&nbsp' +
-		'<a class="watchlist-remove">[Unwatch]</a>'+
+		'<span>/'+e[0]+'/ - ' +
+		'<a href="'+e[3]+'">'+e[1].replace("thread_", "Thread #")+'</a>' +
+		' ('+e[2]+') </span>' +
+		'<a class="watchlist-remove">X</a>'+
 	'</div>');
 	});
 	if ($('#watchlist').length) {
-- 
cgit v1.3


From 01446aad124291f88d5fab8f400321307dffebe7 Mon Sep 17 00:00:00 2001
From: Pashe <pashe@users.noreply.github.com>
Date: Mon, 20 Oct 2014 16:44:19 -0500
Subject: thread-watcher.js: fix background and border

---
 js/thread-watcher.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 52b8142e..625e95e0 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -40,6 +40,7 @@ watchlist.render = function(reset) {
 		$('#watchlist').append(threads.join(''));
 	} else {
 		//If the watchlist has not yet been rendered, create it.
+		var menuStyle = getComputedStyle($('.boardlist')[0]);
 		$('form[name="post"]').before(
 			$('<div id="watchlist">'+
 					'<div class="watchlist-controls">'+
@@ -47,10 +48,7 @@ watchlist.render = function(reset) {
 						'<span><a id="clearGhosts">[Clear Ghosts]</a></span>'+
 					'</div>'+
 					threads.join('')+
-				'</div>').css({
-			background: $('.reply').css('background'),
-			borderColor : $('.reply').css('border-color')
-		}));
+				'</div>').css("background-color", menuStyle.backgroundColor).css("border", menuStyle.borderBottomWidth+" "+menuStyle.borderBottomStyle+" "+menuStyle.borderBottomColor));
 	}
 	return this;
 };
-- 
cgit v1.3


From fd2e9df30cfd14b6c03d109c02e48ec966101aa1 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sat, 8 Nov 2014 16:58:02 -0800
Subject: This script was breaking boards.html

---
 js/thread-watcher.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 625e95e0..b66dc657 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -142,6 +142,10 @@ watchlist.exists = function(sel) {
 };
 
 $(document).ready(function(){
+	if (!(active_page == 'thread' || active_page == 'index')) {
+		return;
+	}
+
 	//Append the watchlist toggle button.
 	$('.boardlist').append('<span>[ <a id="watchlist-toggle">watchlist</a> ]</span>');
 	//Append a watch thread button after every OP.
-- 
cgit v1.3


From 5267098cb822b489a1634cb2e5b7620b49a4f4ae Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Fri, 21 Nov 2014 23:34:03 -0800
Subject: Make bottom watchlist-toggle work

---
 js/thread-watcher.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index b66dc657..7f20e028 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -147,15 +147,16 @@ $(document).ready(function(){
 	}
 
 	//Append the watchlist toggle button.
-	$('.boardlist').append('<span>[ <a id="watchlist-toggle">watchlist</a> ]</span>');
+	$('.boardlist').append('<span>[ <a class="watchlist-toggle" href="#">watchlist</a> ]</span>');
 	//Append a watch thread button after every OP.
-	$('.op>.intro').append('<a class="watchThread">[Watch Thread]</a>');
+	$('.op>.intro').append('<a class="watchThread" href="#">[Watch Thread]</a>');
 
 	//Draw the watchlist, hidden.
 	watchlist.render();
 
 	//Show or hide the watchlist.
-	$('#watchlist-toggle').on('click', function(e) {
+	$('.watchlist-toggle').on('click', function(e) {
+		e.preventDefault();
 		//if ctrl+click, reset the watchlist.
 		if (e.ctrlKey) {
 			watchlist.render(true);
@@ -169,7 +170,8 @@ $(document).ready(function(){
 
 	//Trigger the watchlist add function.
 	//The selector is passed as an argument in case the page is not a thread.
-	$('.watchThread').on('click', function() {
+	$('.watchThread').on('click', function(e) {
+		e.preventDefault();
 		watchlist.add(this).render();
 	});
 
-- 
cgit v1.3


From cac428b30ccc2815264b15797e6397d6942b7adc Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Fri, 20 Mar 2015 16:09:21 +0800
Subject: Add some missing i18n tags

---
 js/comment-toolbar.js          | 26 +++++++++++++-------------
 js/fix-report-delete-submit.js |  8 ++++----
 js/inline.js                   |  4 ++--
 js/post-filter.js              | 40 ++++++++++++++++++++--------------------
 js/thread-watcher.js           | 12 ++++++------
 5 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/js/comment-toolbar.js b/js/comment-toolbar.js
index 65bdc529..51aa9808 100644
--- a/js/comment-toolbar.js
+++ b/js/comment-toolbar.js
@@ -13,7 +13,7 @@ if (active_page == 'thread' || active_page == 'index') {
 		var self = {};
 		self.rules = {
 			spoiler: {
-				text: 'Spoiler',
+				text: _('Spoiler'),
 				key: 's',
 				multiline: false, 
 				exclusiveline: false, 
@@ -21,7 +21,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix:'**'
 			},
 			italics: {
-				text: 'Italics',
+				text: _('Italics'),
 				key: 'i',
 				multiline: false, 
 				exclusiveline: false, 
@@ -29,7 +29,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix: "''"
 			},
 			bold: {
-				text: 'Bold',
+				text: _('Bold'),
 				key: 'b',
 				multiline: false, 
 				exclusiveline: false, 
@@ -37,7 +37,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix: "'''"
 			},
 			underline: {
-				text: 'Underline',
+				text: _('Underline'),
 				key: 'u',
 				multiline: false, 
 				exclusiveline: false, 
@@ -45,7 +45,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix:'__'
 			},
 			code: {
-				text: 'Code',
+				text: _('Code'),
 				key: 'f',
 				multiline: true, 
 				exclusiveline: false, 
@@ -53,7 +53,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix: '[/code]'
 			},
 			strike: {
-				text: 'Strike',
+				text: _('Strike'),
 				key: 'd',
 				multiline:false, 
 				exclusiveline:false, 
@@ -61,7 +61,7 @@ if (active_page == 'thread' || active_page == 'index') {
 				suffix:'~~'
 			},
 			heading: {
-				text: 'Heading',
+				text: _('Heading'),
 				key: 'r',
 				multiline:false, 
 				exclusiveline:true, 
@@ -271,7 +271,7 @@ if (active_page == 'thread' || active_page == 'index') {
 			
 			// add the tab for customizing the format settings
 			if (window.Options && !Options.get_tab('formatting')) {
-				Options.add_tab('formatting', 'angle-right', 'Customize Formatting');
+				Options.add_tab('formatting', 'angle-right', _('Customize Formatting'));
 				Options.extend_tab('formatting', '\
 				<style>\
 					.format_option{\
@@ -295,10 +295,10 @@ if (active_page == 'thread' || active_page == 'index') {
 				
 				// Data control row
 				Options.extend_tab('formatting', '\
-				<button onclick="formatText.add_rule();">Add Rule</button>\
-				<button onclick="formatText.save_rules();">Save Rules</button>\
-				<button onclick="formatText.reset_rules(false);">Revert</button>\
-				<button onclick="formatText.reset_rules(true);">Reset to Default</button>\
+				<button onclick="formatText.add_rule();">'+_('Add Rule')+'</button>\
+				<button onclick="formatText.save_rules();">'+_('Save Rules')+'</button>\
+				<button onclick="formatText.reset_rules(false);">'+_('Revert')+'</button>\
+				<button onclick="formatText.reset_rules(true);">'+_('Reset to Default')+'</button>\
 				');
 				
 				// Descriptor row
@@ -380,4 +380,4 @@ if (active_page == 'thread' || active_page == 'index') {
 		
 		return self;
     })(jQuery);
-}
\ No newline at end of file
+}
diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index 0b1ff840..c6122db7 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -12,8 +12,8 @@ if (active_page == 'thread' || active_page == 'index') {
 $(document).ready(function(){
 
 if ($('.delete #password').length) {
-	Menu.add_item("delete_post_menu", "Delete post");
-	Menu.add_item("delete_file_menu", "Delete file");
+	Menu.add_item("delete_post_menu", _("Delete post"));
+	Menu.add_item("delete_file_menu", _("Delete file"));
 	Menu.onclick(function(e, $buf) {
 		var ele = e.target.parentElement.parentElement;
 		var $ele = $(ele);
@@ -34,8 +34,8 @@ if ($('.delete #password').length) {
 	});
 }
 
-Menu.add_item("report_menu", "Report");
-Menu.add_item("global_report_menu", "Global report");
+Menu.add_item("report_menu", _("Report"));
+Menu.add_item("global_report_menu", _("Global report"));
 Menu.onclick(function(e, $buf) {
 	var ele = e.target.parentElement.parentElement;
 	var $ele = $(ele);
diff --git a/js/inline.js b/js/inline.js
index 53865d90..686a540a 100644
--- a/js/inline.js
+++ b/js/inline.js
@@ -123,8 +123,8 @@ $(document).ready(function() {
     $clone.insertAfter(link.node)
   }
 
-  App.options.add('useInlining', 'Enable inlining')
-  App.options.add('hidePost', 'Hide inlined backlinked posts')
+  App.options.add('useInlining', _('Enable inlining'))
+  App.options.add('hidePost', _('Hide inlined backlinked posts'))
 
   $('head').append(
     '<style>' +
diff --git a/js/post-filter.js b/js/post-filter.js
index 8eb3ab7d..aaab4d0e 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -202,20 +202,20 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 		function initPostMenu(pageData) {
 
 			var submenu;
-			Menu.add_item('filter-menu-hide', 'Hide post');
-			Menu.add_item('filter-menu-unhide', 'Unhide post');
+			Menu.add_item('filter-menu-hide', _('Hide post'));
+			Menu.add_item('filter-menu-unhide', _('Unhide post'));
 
-			submenu = Menu.add_submenu('filter-menu-add', 'Add filter');
-				submenu.add_item('filter-add-post-plus', 'Post +', 'Hide post and all replies');
-				submenu.add_item('filter-add-id', 'ID');
-				submenu.add_item('filter-add-id-plus', 'ID +', 'Hide ID and all replies');
-				submenu.add_item('filter-add-name', 'Name');
-				submenu.add_item('filter-add-trip', 'Tripcode');
+			submenu = Menu.add_submenu('filter-menu-add', _('Add filter'));
+				submenu.add_item('filter-add-post-plus', _('Post +'), _('Hide post and all replies'));
+				submenu.add_item('filter-add-id', _('ID'));
+				submenu.add_item('filter-add-id-plus', _('ID +'), _('Hide ID and all replies'));
+				submenu.add_item('filter-add-name', _('Name'));
+				submenu.add_item('filter-add-trip', _('Tripcode'));
 
-			submenu = Menu.add_submenu('filter-menu-remove', 'Remove filter');
-				submenu.add_item('filter-remove-id', 'ID');
-				submenu.add_item('filter-remove-name', 'Name');
-				submenu.add_item('filter-remove-trip', 'Tripcode');
+			submenu = Menu.add_submenu('filter-menu-remove', _('Remove filter'));
+				submenu.add_item('filter-remove-id', _('ID'));
+				submenu.add_item('filter-remove-name', _('Name'));
+				submenu.add_item('filter-remove-trip', _('Tripcode'));
 
 			Menu.onclick(function (e, $buffer) {
 				var ele = e.target.parentElement.parentElement;
@@ -644,22 +644,22 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 
 		function initOptionsPanel() {
 			if (window.Options && !Options.get_tab('filter')) {
-				Options.add_tab('filter', 'list', 'Filters');
+				Options.add_tab('filter', 'list', _('Filters'));
 				Options.extend_tab('filter',
 					'<div id="filter-control">' +
 						'<select>' +
-							'<option value="name">Name</option>' +
-							'<option value="trip">Tripcode</option>' +
-							'<option value="sub">Subject</option>' +
-							'<option value="com">Comment</option>' +
+							'<option value="name">'+_('Name')+'</option>' +
+							'<option value="trip">'+_('Tripcode')+'</option>' +
+							'<option value="sub">'+_('Subject')+'</option>' +
+							'<option value="com">'+_('Comment')+'</option>' +
 						'</select>' +
 						'<input type="text">' +
 						'<input type="checkbox">' +
 						'regex ' +
-						'<button id="set-filter">Add</button>' +
-						'<button id="clear">Clear all filters</button>' +
+						'<button id="set-filter">'+_('Add')+'</button>' +
+						'<button id="clear">'+_('Clear all filters')+'</button>' +
 						'<div id="confirm" class="hidden">' +
-							'This will clear all filtering rules including hidden posts. <a id="confirm-y" href="#">yes</a> | <a id="confirm-n" href="#">no</a>' +
+							_('This will clear all filtering rules including hidden posts.')+' <a id="confirm-y" href="#">'+_('yes')+'</a> | <a id="confirm-n" href="#">'+_('no')+'</a>' +
 						'</div>' +
 					'</div>' +
 					'<div id="filter-container"><table id="filter-list"></table></div>'
diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 7f20e028..960aa59f 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -29,7 +29,7 @@ watchlist.render = function(reset) {
 		//look at line 69, that's what (e) is here.
 		threads.push('<div class="watchlist-inner" id="watchlist-'+i+'">' +
 		'<span>/'+e[0]+'/ - ' +
-		'<a href="'+e[3]+'">'+e[1].replace("thread_", "Thread #")+'</a>' +
+		'<a href="'+e[3]+'">'+e[1].replace("thread_", _("Thread #"))+'</a>' +
 		' ('+e[2]+') </span>' +
 		'<a class="watchlist-remove">X</a>'+
 	'</div>');
@@ -44,8 +44,8 @@ watchlist.render = function(reset) {
 		$('form[name="post"]').before(
 			$('<div id="watchlist">'+
 					'<div class="watchlist-controls">'+
-						'<span><a id="clearList">[Clear List]</a></span>&nbsp'+
-						'<span><a id="clearGhosts">[Clear Ghosts]</a></span>'+
+						'<span><a id="clearList">['+_('Clear List')+']</a></span>&nbsp'+
+						'<span><a id="clearGhosts">['+_('Clear Ghosts')+']</a></span>'+
 					'</div>'+
 					threads.join('')+
 				'</div>').css("background-color", menuStyle.backgroundColor).css("border", menuStyle.borderBottomWidth+" "+menuStyle.borderBottomStyle+" "+menuStyle.borderBottomColor));
@@ -80,7 +80,7 @@ watchlist.add = function(sel) {
 			postCount = $(sel).parents('.op').siblings('.post').length+1;
 		}
 		//Grab the reply link.
-		var threadLink = $(sel).siblings('a:contains("[Reply]")').attr('href');
+		var threadLink = $(sel).siblings('a:contains("['+_('Reply')+']")').attr('href');
 		//Figure out the thread name. If anon, use the thread id.
 		if ($(sel).parent().find('.subject').length) {
 			threadName = $(sel).parent().find('.subject').text().substring(0,20);
@@ -147,9 +147,9 @@ $(document).ready(function(){
 	}
 
 	//Append the watchlist toggle button.
-	$('.boardlist').append('<span>[ <a class="watchlist-toggle" href="#">watchlist</a> ]</span>');
+	$('.boardlist').append('<span>[ <a class="watchlist-toggle" href="#">'+_('watchlist')+'</a> ]</span>');
 	//Append a watch thread button after every OP.
-	$('.op>.intro').append('<a class="watchThread" href="#">[Watch Thread]</a>');
+	$('.op>.intro').append('<a class="watchThread" href="#">['+_('Watch Thread')+']</a>');
 
 	//Draw the watchlist, hidden.
 	watchlist.render();
-- 
cgit v1.3


From f02226449a542b846f12b687b27415f9e11d557e Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Tue, 21 Oct 2014 21:08:17 -0700
Subject: Fix own post (You)

---
 js/show-own-posts.js  | 2 +-
 stylesheets/style.css | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/js/show-own-posts.js b/js/show-own-posts.js
index 8b83f4cd..e26f5abd 100644
--- a/js/show-own-posts.js
+++ b/js/show-own-posts.js
@@ -33,7 +33,7 @@ var update_own = function() {
 
   if (posts[board] && posts[board].indexOf(id) !== -1) { // Own post!
     $(this).addClass('you');
-    $(this).find('span.name').first().append(' '+_('(You)'));
+    $(this).find('span.name').first().append(' <span class="own_post">'+_('(You)')+'</span>');
   }
 
   // Update references
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 0e56f442..6a9f1a9a 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -966,6 +966,7 @@ span.pln {
 #watchlist-toggle, .watchThread, .watchlist-remove, #clearList, #clearGhosts {
 	cursor: pointer;
 }
+<<<<<<< HEAD
 
 #youtube-size input {
 	width: 50px;
@@ -1118,3 +1119,11 @@ table.fileboard .intro a {
   max-height: 100%;
   position: absolute;
 }
+.own_post {
+	font-style: italic;
+	font-weight: normal;
+	opacity: .666;
+}
+div.mix {
+	display: inline-block;
+}
-- 
cgit v1.3


From 4e635229b493cb2494f136cf4a58dc94b23f0e05 Mon Sep 17 00:00:00 2001
From: Ringstaart <jan@ringstaart.nl>
Date: Tue, 17 Mar 2015 10:22:35 +0100
Subject: Replace capital X by clearly superior ASCII ×
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There's no reason to use a malformed letter when an ASCII character of a proper cross is available. This is an important issue, and I care about it very much.
---
 js/quick-reply.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/quick-reply.js b/js/quick-reply.js
index 12cca366..408de410 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -286,7 +286,7 @@
 		$postForm.find('br').remove();
 		$postForm.find('table').prepend('<tr><th colspan="2">\
 			<span class="handle">\
-				<a class="close-btn" href="javascript:void(0)">X</a>\
+				<a class="close-btn" href="javascript:void(0)">×</a>\
 				' + _('Quick Reply') + '\
 			</span>\
 			</th></tr>');
-- 
cgit v1.3


From 8412299fa58ed3156c6af11fae80afac723e5321 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Fri, 21 Nov 2014 23:33:05 -0800
Subject: Fix hide-threads.js interaction in no-animated-gif.js

---
 js/no-animated-gif.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/no-animated-gif.js b/js/no-animated-gif.js
index a10a6497..7036323c 100644
--- a/js/no-animated-gif.js
+++ b/js/no-animated-gif.js
@@ -13,6 +13,8 @@
  */
 
 function unanimate_gif(e) {
+	if ($(e).closest('.thread').children('.thread-hidden').length > 0) return;
+
 	if (active_page === "catalog")
 		var c = $('<canvas class="thread-image"></canvas>');
 	else
-- 
cgit v1.3


From 5f10badee90cadee42e051a10dbefb2a54045d5d Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Mon, 5 Jan 2015 04:38:35 -0800
Subject: Make no-animated-gif.js trigger on new_post

---
 js/no-animated-gif.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/js/no-animated-gif.js b/js/no-animated-gif.js
index 7036323c..42c841ab 100644
--- a/js/no-animated-gif.js
+++ b/js/no-animated-gif.js
@@ -11,7 +11,6 @@
  *   //$config['additional_javascript'][] = 'js/options/general.js';
  *   $config['additional_javascript'][] = 'js/no-animated-gif.js';
  */
-
 function unanimate_gif(e) {
 	if ($(e).closest('.thread').children('.thread-hidden').length > 0) return;
 
@@ -36,13 +35,19 @@ function unanimate_gif(e) {
 	$(e).addClass("unanimated").hide();
 }
 
+$(function(){
+
+var gif_finder = 'img.post-image[src$=".gif"], img.thread-image[src$=".gif"]';
+
 function no_animated_gif() {
-	var anim_gifs = $('img.post-image[src$=".gif"], img.thread-image[src$=".gif"]');
+	var anim_gifs = $(gif_finder);
 	localStorage.no_animated_gif = true;
 	$('#no-animated-gif>a').text(_('Animate GIFs'));
 	$('#no-animated-gif>input').prop('checked', true);
 
 	$.each(anim_gifs, function(i, e) {unanimate_gif(e)} );
+
+	$(document).on('new_post', new_post_handler);
 }
 
 function animated_gif() {
@@ -51,10 +56,17 @@ function animated_gif() {
 	localStorage.no_animated_gif = false;
 	$('#no-animated-gif>a').text(_('Unanimate GIFs'));
 	$('#no-animated-gif>input').prop('checked', false);	
+
+	$(document).off('new_post', new_post_handler);
+}
+
+function new_post_handler(e, post) {
+	$(post).find(gif_finder).each(function(k, v) {
+		unanimate_gif(v);
+	});
 }
 
 if (active_page == 'thread' || active_page == 'index' || active_page == 'ukko' || active_page == 'catalog') {
-	$(function(){
 		var selector, event;
 		if (window.Options && Options.get_tab('general')) {
 			selector = '#no-animated-gif>input';
@@ -77,5 +89,6 @@ if (active_page == 'thread' || active_page == 'index' || active_page == 'ukko' |
 
 		if (localStorage.no_animated_gif === 'true')
 			no_animated_gif();
-	});
 }
+
+});
-- 
cgit v1.3


From 6b04b3c671fdcaa85be97c14336219217b193cc5 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Mon, 20 Apr 2015 04:20:17 -0700
Subject: Fix post deletion

---
 inc/functions.php              | 2 ++
 js/fix-report-delete-submit.js | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index c50336ae..c46807bb 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1130,6 +1130,8 @@ function deleteFile($id, $remove_entirely_if_already=true, $file=null) {
 	$files = json_decode($post['files']);
 	$file_to_delete = $file !== false ? $files[(int)$file] : (object)array('file' => false);
 
+	if (!$files[0]) error(_('That post has no files.'));
+
 	if ($files[0]->file == 'deleted' && $post['num_files'] == 1 && !$post['thread'])
 		return; // Can't delete OP's image completely.
 
diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index c6122db7..47a04f16 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -11,7 +11,7 @@
 if (active_page == 'thread' || active_page == 'index') {
 $(document).ready(function(){
 
-if ($('.delete #password').length) {
+if ($('#delete-fields #password').length) {
 	Menu.add_item("delete_post_menu", _("Delete post"));
 	Menu.add_item("delete_file_menu", _("Delete file"));
 	Menu.onclick(function(e, $buf) {
@@ -53,9 +53,8 @@ Menu.onclick(function(e, $buf) {
 });
 
 $(document).on('new_post', function(){
-	$('div.delete').hide();
 	$('input.delete').hide();
 });
-$('div.delete').hide();
 $('input.delete').hide();
+$('#post-moderation-fields').hide();
 })}
-- 
cgit v1.3


From e64b01b6903c5b1f1498627db919a50c4e0ff88c Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Tue, 21 Apr 2015 01:39:44 +1000
Subject: Javascript ammendments, dio_ on Windows.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 js/fix-report-delete-submit.js | 12 ++++--
 js/infinite-scroll.js          | 89 +++++++++++++++++++++---------------------
 js/post-filter.js              |  9 ++++-
 js/post-menu.js                |  6 ++-
 stylesheets/style.css          | 13 +++---
 5 files changed, 72 insertions(+), 57 deletions(-)

diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index 47a04f16..01785974 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -9,9 +9,10 @@
  */
 
 if (active_page == 'thread' || active_page == 'index') {
-$(document).ready(function(){
-
+$(document).on('menu_ready', function(){
+	
 if ($('#delete-fields #password').length) {
+	var Menu = window.Menu;
 	Menu.add_item("delete_post_menu", _("Delete post"));
 	Menu.add_item("delete_file_menu", _("Delete file"));
 	Menu.onclick(function(e, $buf) {
@@ -57,4 +58,9 @@ $(document).on('new_post', function(){
 });
 $('input.delete').hide();
 $('#post-moderation-fields').hide();
-})}
+});
+
+if (typeof window.Menu !== "undefined") {
+	$(document).trigger('menu_ready');
+}
+}
diff --git a/js/infinite-scroll.js b/js/infinite-scroll.js
index e212f9d6..b3c5c7ae 100644
--- a/js/infinite-scroll.js
+++ b/js/infinite-scroll.js
@@ -21,7 +21,7 @@ var activate = function() {
   if (document.location.hash != '#all') return false;
 
   $(window).on("scroll", function() {
-    scrolltest();
+	scrolltest();
   });
   scrolltest();
 
@@ -30,53 +30,54 @@ var activate = function() {
 
 var scrolltest = function() {
   if ($(window).scrollTop() + $(window).height() + 1000 > $(document).height() && !loading) {
-    load_next_page();
+	load_next_page();
   }
 };
 
 var load_next_page = function() {
-  if (loading) return;
-  loading = true;
-
-  var this_page = $(".pages a.selected:last");
-  var next_page = this_page.next();
-
-  var href = next_page.prop("href");
-  if (!href) return;
-
-  var boardheader = $('<h2>'+_('Page')+' '+next_page.html()+'</h2>');
-  var loading_ind = $('<h2>'+_('Loading...')+'</h2>').insertBefore('form[name="postcontrols"]>.delete:first');
-
-  $.get(href, function(data) {
-    var doc = $(data);
-    
-    loading_ind.remove();
-    boardheader.insertBefore('form[name="postcontrols"]>.delete:first');
-
-    var i = 0;
-
-    doc.find('div[id*="thread_"]').each(function() {
-      var checkout = $(this).attr('id').replace('thread_', '');
-      var $this = this;
-
-      if ($('div#thread_' + checkout).length == 0) {
-        // Delay DOM insertion to lessen the lag.
-        setTimeout(function() {
-          $($this).insertBefore('form[name="postcontrols"]>.delete:first');
-          $(document).trigger('new_post', $this);
-	  $($this).hide().slideDown();
-        }, 500*i);
-        i++;
-      }
-    });
-    setTimeout(function() {
-      loading = false;
-      scrolltest();        
-    }, 500*(i+1));
-
-    next_page.addClass('selected');
-  });
-
+	if (loading) return;
+	loading = true;
+	
+	var this_page = $(".pages a.selected:last");
+	var next_page = this_page.next();
+	
+	var href = next_page.prop("href");
+	if (!href) return;
+	
+	var boardheader = $('<h2>'+_('Page')+' '+next_page.html()+'</h2>');
+	var loading_ind = $('<h2>'+_('Loading...')+'</h2>').insertBefore('#post-moderation-fields');
+	
+	$.get(href, function(data) {
+		var doc = $(data);
+		
+		loading_ind.remove();
+		boardheader.insertBefore('#post-moderation-fields');
+		
+		var i = 0;
+		
+		doc.find('div[id*="thread_"]').each(function() {
+			var checkout = $(this).attr('id').replace('thread_', '');
+			var $this = this;
+			
+			if ($('div#thread_' + checkout).length == 0) {
+				// Delay DOM insertion to lessen the lag.
+				setTimeout(function() {
+					$($this).insertBefore('#post-moderation-fields');
+					$(document).trigger('new_post', $this);
+					$($this).hide().slideDown();
+				}, 500*i);
+				
+				i++;
+			}
+		});
+		
+		setTimeout(function() {
+			loading = false;
+			scrolltest();
+		}, 500*(i+1));
+		
+		next_page.addClass('selected');
+	});
 };
 
 var button = $("<a href='#all'>"+_("All")+" </a>").prependTo(".pages");
diff --git a/js/post-filter.js b/js/post-filter.js
index aaab4d0e..023b54e4 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -1,6 +1,7 @@
 if (active_page === 'thread' || active_page === 'index' || active_page === 'catalog') {
-	$(document).ready(function () {
+	$(document).on('menu_ready', function () {
 		'use strict';
+		
 		// returns blacklist object from storage
 		function getList() {
 			return JSON.parse(localStorage.postFilter);
@@ -200,7 +201,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 		 *  create filter menu when the button is clicked
 		 */
 		function initPostMenu(pageData) {
-
+			var Menu = window.Menu;
 			var submenu;
 			Menu.add_item('filter-menu-hide', _('Hide post'));
 			Menu.add_item('filter-menu-unhide', _('Unhide post'));
@@ -836,4 +837,8 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 		}
 		init();
 	});
+	
+	if (typeof window.Menu !== "undefined") {
+		$(document).trigger('menu_ready');
+	}
 }
diff --git a/js/post-menu.js b/js/post-menu.js
index 7d83709a..6018dfdb 100644
--- a/js/post-menu.js
+++ b/js/post-menu.js
@@ -26,7 +26,7 @@
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/post-menu.js';
  */
-onready(function () {
+$(document).ready(function () {
 
 var List = function (menuId, text) {
 	this.id = menuId;
@@ -133,6 +133,8 @@ Menu.get_submenu = function (id) {
 	return mainMenu.get_submenu(id);
 };
 
+window.Menu = Menu;
+
 
 /* * * * * * * *
     Initialize
@@ -205,5 +207,5 @@ $(document).on('new_post', function (e, post) {
 	addButton(post);
 });
 
-window.Menu = Menu;
+$(document).trigger('menu_ready');
 });
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 6a9f1a9a..6b4b19d9 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -416,12 +416,13 @@ fieldset label {
 }
 
 div.pages {
-  color: #89A;
-  background: #D6DAF0;
-  display: inline;
-  padding: 8px;
-  border-right: 1px solid #B7C5D9;
-  border-bottom: 1px solid #B7C5D9;
+	color: #89A;
+	background: #D6DAF0;
+	display: inline-block;
+	padding: 8px;
+	margin: 8px 0 4px 0;
+	border-right: 1px solid #B7C5D9;
+	border-bottom: 1px solid #B7C5D9;
 }
 
 div.pages.top {
-- 
cgit v1.3


From 7cf3fccda5546a7f134916fcec458af48af42373 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Tue, 21 Apr 2015 07:07:51 -0700
Subject: Fix menu brokenness if user post deletion disabled

---
 js/fix-report-delete-submit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index 01785974..2bf7a70b 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -10,9 +10,9 @@
 
 if (active_page == 'thread' || active_page == 'index') {
 $(document).on('menu_ready', function(){
+var Menu = window.Menu;
 	
 if ($('#delete-fields #password').length) {
-	var Menu = window.Menu;
 	Menu.add_item("delete_post_menu", _("Delete post"));
 	Menu.add_item("delete_file_menu", _("Delete file"));
 	Menu.onclick(function(e, $buf) {
-- 
cgit v1.3


From c2e3ff162f7c94d27b85b5056e0acf72724edcd4 Mon Sep 17 00:00:00 2001
From: Mark Taiwan <mark.taiwan@gmail.com>
Date: Sun, 13 Sep 2015 16:10:32 +0800
Subject: Added missing curly brackets in post-filter.js

---
 js/post-filter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 023b54e4..950f43ab 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -19,9 +19,10 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 		}
 
 		function initList(list, boardId, threadId) {
-			if (typeof list.postFilter[boardId] == 'undefined')
+			if (typeof list.postFilter[boardId] == 'undefined') {
 				list.postFilter[boardId] = {};
 				list.nextPurge[boardId] = {};
+			}
 			if (typeof list.postFilter[boardId][threadId] == 'undefined') {
 				list.postFilter[boardId][threadId] = [];
 			}
-- 
cgit v1.3


From 71fde3593878073eca6137af0d03046c746ce292 Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Fri, 13 Mar 2015 12:53:27 +0800
Subject: Oops forgot a file

---
 report.php            | 19 +++++++++++++++++++
 templates/report.html |  9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 report.php

diff --git a/report.php b/report.php
new file mode 100644
index 00000000..e09b1075
--- /dev/null
+++ b/report.php
@@ -0,0 +1,19 @@
+<?php
+include 'inc/functions.php';
+$global = isset($_GET['global']);
+$post = (isset($_GET['post']) ? $_GET['post'] : false);
+$board = (isset($_GET['board']) ? $_GET['board'] : false);
+
+if (!$post || !preg_match('/^delete_\d+$/', $post) || !$board || !openBoard($board)) {
+	header('HTTP/1.1 400 Bad Request');
+	error(_('Bad request.'));
+}
+
+if ($config['report_captcha']) {
+	$captcha = generate_captcha($config['captcha']['extra']);
+} else {
+	$captcha = null;
+}
+
+$body = Element('report.html', ['global' => $global, 'post' => $post, 'board' => $board, 'captcha' => $captcha, 'config' => $config]);
+echo Element('page.html', ['config' => $config, 'body' => $body]);
diff --git a/templates/report.html b/templates/report.html
index 291f9313..b34f7430 100644
--- a/templates/report.html
+++ b/templates/report.html
@@ -1,4 +1,9 @@
 <form action="{{ config.post_url }}" method="post" id="report_form">
+	{% if error %}
+		<div class="error">
+			<strong>{{ error|e }}</strong>
+		</div>
+	{% endif %}
 	<input type="hidden" name="board" value="{{ board.uri }}">
 	<input type="hidden" name="{{ post|e }}" value="1">
 	{% if global %}
@@ -6,11 +11,11 @@
 		<div><h1>Attention!</h1><p>This form is only for reporting <strong>child pornography</strong>, <strong>bot spam</strong> and <strong>credit card numbers, social security numbers or banking information</strong>. DMCA requests and all other deletion requests <em>MUST</em> be sent via email to admin@8chan.co.</p><p>8chan is unmoderated and allows posts without collecting <em>ANY</em> information from the poster less the details of their post. Furthermore, all boards on 8chan are user created and not actively monitored by anyone but the board creator.</p><p>8chan has a small volunteer staff to handle this queue, please do not waste their time by filling it with nonsense! <em>If you made a report with this tool and the post was not deleted, <strong>do not make the report again!</strong> Email admin@8chan.co instead.</em> Abuse of the global report system could lead to address blocks against your IP from 8chan.</p><p>Again, 8chan's global volunteers <em>do not</em> handle board specific issues. You most likely want to click "Report" instead to reach the creator and volunteers he assigned to this board.</p>
 	{% endif %}
 	<p>{% trans %}Enter reason below...{% endtrans %}</p>
-	<input type="text" id="reason" name="reason">
+	<input type="text" id="reason" name="reason" value="{{ reason_prefill|e|addslashes }}">
 	{% if config.report_captcha %}
 		<p>{% trans %}To submit your report, please fill out the CAPTCHA below.{% endtrans %}</p>
 		{{ captcha['html'] }}<br/>
-		<input class="captcha_text" name="captcha_text" size="25" maxlength="6" autocomplete="off" type="text">
+		<input class="captcha_text" name="captcha_text" size="25" maxlength="6" autocomplete="off" type="text" value="">
 		<input class="captcha_cookie" name="captcha_cookie" type="hidden" autocomplete="off" value="{{ captcha['cookie']|e }}"><br/>
 	{% endif %}
 	<input name="report" value="{% trans %}Submit{% endtrans %}" type="submit">
-- 
cgit v1.3


From 6cb3039b71c30ad9db03847f512b898d9a5224b5 Mon Sep 17 00:00:00 2001
From: Harry Hackett <elderyrrah@gmail.com>
Date: Wed, 11 Mar 2015 20:15:45 +1300
Subject: Create fav.js

---
 js/options/fav.js | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 js/options/fav.js

diff --git a/js/options/fav.js b/js/options/fav.js
new file mode 100644
index 00000000..f8d12bf3
--- /dev/null
+++ b/js/options/fav.js
@@ -0,0 +1,94 @@
+//Setting global variables
+var favorites = JSON.parse(localStorage.favorites);
+Options.add_tab('fav-tab','star',_("Favorites"));
+
+//Creating functions
+var generateList = function(){
+	var favStor = [];
+  	for(var i=1; i<favorites.length+1; i++){
+  		favStor.push($("#sortable > div:nth-child("+i+")").html());
+  	}
+	return JSON.stringify(favStor);
+} //This will generate a list of boards based off of the list on the screen
+function removeBoard(boardNumber){
+	favorites.splice(boardNumber, 1);
+	localStorage.favorites = JSON.stringify(favorites);
+	$("#sortable > div:nth-child("+(boardNumber+1)+")").remove();
+	$("#minusList > div:nth-child("+(favorites.length+1)+")").remove();
+} //This removes a board from favorites, localStorage.favorites and the page
+function addBoard(){
+	$("#sortable").append("<div>"+($("#plusBox").val())+"</div>");
+	$("#minusList").append("<div onclick=\"removeBoard("+favorites.length+")\" style=\"cursor: pointer; margin-left: 5px\">-</div>");
+	favorites.push($("#plusBox").val());
+	localStorage.favorites = JSON.stringify(favorites);
+	$("#space").remove();
+	$("#plusBox").remove(); //Refreshing the last 3 elements to move the box down
+	$("#plus").remove();
+	$("#submitFavorites").remove();
+	$("<br id=\"space\"></br>").appendTo(Options.get_tab('fav-tab').content);
+	$("<input id=\"plusBox\" type=\"text\">").appendTo(Options.get_tab('fav-tab').content);
+	$("#plusBox").keydown(function( event ) {
+ 		if(event.keyCode == 13){
+ 			$("#plus").click();
+ 		}
+	}); //Adding enter to submit
+	document.getElementById("plusBox").value = ""; //Removing text from textbox
+	$("#plusBox").focus(); //Moving cursor into text box again after refresh
+	$("<div id=\"plus\" onclick=\"addBoard()\">+</div>").css({
+		cursor: "pointer",
+		color: "#0000FF"
+	}).appendTo(Options.get_tab('fav-tab').content); //Adding the plus to the tab
+	$("<input id=\"submitFavorites\" onclick=\"localStorage.favorites=generateList();document.location.reload();\" type=\"button\" value=\""+_("Refresh")+"\">").css({
+		height: 25, bottom: 5,
+		width: "calc(100% - 10px)",
+		left: 5, right: 5
+	}).appendTo(Options.get_tab('fav-tab').content); //Adding button to the tab
+} //This adds the text inside the textbox to favorites, localStorage.favorites and the page
+
+//Making as many functions and variables non-global
+$(document).ready(function(){
+
+//Pregenerating list of boards 
+var favList = ['<div id="sortable" style="cursor: pointer; float: left;display: inline-block">'];
+for(var i=0; i<favorites.length; i++){
+    favList += '<div>'+favorites[i]+'</div>';
+} 
+favList += '</div>';
+
+//Creating list of minus symbols to remove unwanted boards
+var minusList = ['<div id="minusList" style="color: #0000FF;display: inline-block">'];
+for(var i=0; i<favorites.length; i++){
+    minusList += '<div onclick="removeBoard('+i+')" style="cursor: pointer; margin-left: 5px">-</div>';
+} 
+minusList += "</div>"; 
+
+//Help message so people understand how sorting boards works
+$("<span>Drag the boards to sort them.</span><br></br>").appendTo(Options.get_tab('fav-tab').content);
+
+//Adding list of boards and minus symbols to remove boards with
+$(favList).appendTo(Options.get_tab('fav-tab').content);  //Adding the list of favorite boards to the tab
+$(minusList).appendTo(Options.get_tab('fav-tab').content); //Adding the list of minus symbols to the tab
+
+//Adding spacing and text box to right boards into
+$("<br id=\"space\"></br>").appendTo(Options.get_tab('fav-tab').content);
+$("<input id=\"plusBox\" type=\"text\">").appendTo(Options.get_tab('fav-tab').content);
+$("#plusBox").keydown(function( event ) {
+	if(event.keyCode == 13){
+		$("#plus").click();
+	}
+});
+
+//Adding plus symbol to use to add board
+$("<div id=\"plus\" onclick=\"addBoard()\">+</div>").css({
+	cursor: "pointer",
+	color: "#0000FF"
+}).appendTo(Options.get_tab('fav-tab').content); //Adding the plus button
+$("<input id=\"submitFavorites\" onclick=\"localStorage.favorites=generateList();document.location.reload();\" type=\"button\" value=\""+_("Submit")+"\">").css({
+	height: 25, bottom: 5,
+	width: "calc(100% - 10px)",
+	left: 5, right: 5
+}).appendTo(Options.get_tab('fav-tab').content); //Adding submit button to the tab
+
+$("#sortable").sortable(); //Making boards with sortable id use the sortable jquery function
+
+});
-- 
cgit v1.3


From 2712235f1519da3d4e7ba9a54931806c15adb0af Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Sun, 15 Mar 2015 19:56:28 +0800
Subject: Make js/options/favs.js actually usable

I pretty much had to rework this completely to get it into a usable state

Reference ctrlcctrlv/infinity#424
---
 js/options/fav.js | 76 ++++++++++++++++++++-----------------------------------
 1 file changed, 27 insertions(+), 49 deletions(-)

diff --git a/js/options/fav.js b/js/options/fav.js
index f8d12bf3..17ccb337 100644
--- a/js/options/fav.js
+++ b/js/options/fav.js
@@ -1,94 +1,72 @@
-//Setting global variables
-var favorites = JSON.parse(localStorage.favorites);
-Options.add_tab('fav-tab','star',_("Favorites"));
-
+$(document).ready(function(){
 //Creating functions
 var generateList = function(){
 	var favStor = [];
   	for(var i=1; i<favorites.length+1; i++){
   		favStor.push($("#sortable > div:nth-child("+i+")").html());
   	}
-	return JSON.stringify(favStor);
+	return favStor;
 } //This will generate a list of boards based off of the list on the screen
 function removeBoard(boardNumber){
 	favorites.splice(boardNumber, 1);
 	localStorage.favorites = JSON.stringify(favorites);
 	$("#sortable > div:nth-child("+(boardNumber+1)+")").remove();
 	$("#minusList > div:nth-child("+(favorites.length+1)+")").remove();
+	add_favorites();
 } //This removes a board from favorites, localStorage.favorites and the page
 function addBoard(){
 	$("#sortable").append("<div>"+($("#plusBox").val())+"</div>");
-	$("#minusList").append("<div onclick=\"removeBoard("+favorites.length+")\" style=\"cursor: pointer; margin-left: 5px\">-</div>");
+	$("#minusList").append( $('<div data-board="'+favorites.length+'" style="cursor: pointer; margin-right: 5px">-</div>').on('click', function(e){removeBoard($(this).data('board'));}) );
 	favorites.push($("#plusBox").val());
 	localStorage.favorites = JSON.stringify(favorites);
-	$("#space").remove();
-	$("#plusBox").remove(); //Refreshing the last 3 elements to move the box down
-	$("#plus").remove();
-	$("#submitFavorites").remove();
-	$("<br id=\"space\"></br>").appendTo(Options.get_tab('fav-tab').content);
-	$("<input id=\"plusBox\" type=\"text\">").appendTo(Options.get_tab('fav-tab').content);
-	$("#plusBox").keydown(function( event ) {
- 		if(event.keyCode == 13){
- 			$("#plus").click();
- 		}
-	}); //Adding enter to submit
-	document.getElementById("plusBox").value = ""; //Removing text from textbox
-	$("#plusBox").focus(); //Moving cursor into text box again after refresh
-	$("<div id=\"plus\" onclick=\"addBoard()\">+</div>").css({
-		cursor: "pointer",
-		color: "#0000FF"
-	}).appendTo(Options.get_tab('fav-tab').content); //Adding the plus to the tab
-	$("<input id=\"submitFavorites\" onclick=\"localStorage.favorites=generateList();document.location.reload();\" type=\"button\" value=\""+_("Refresh")+"\">").css({
-		height: 25, bottom: 5,
-		width: "calc(100% - 10px)",
-		left: 5, right: 5
-	}).appendTo(Options.get_tab('fav-tab').content); //Adding button to the tab
+	$("#plusBox").val(""); //Removing text from textbox
+	add_favorites();
 } //This adds the text inside the textbox to favorites, localStorage.favorites and the page
 
-//Making as many functions and variables non-global
-$(document).ready(function(){
+var favorites = JSON.parse(localStorage.favorites);
+Options.add_tab('fav-tab','star',_("Favorites"));
 
 //Pregenerating list of boards 
-var favList = ['<div id="sortable" style="cursor: pointer; float: left;display: inline-block">'];
+var favList = $('<div id="sortable" style="cursor: pointer; display: inline-block">');
 for(var i=0; i<favorites.length; i++){
-    favList += '<div>'+favorites[i]+'</div>';
+    favList.append( $('<div>'+favorites[i]+'</div>') );
 } 
-favList += '</div>';
 
 //Creating list of minus symbols to remove unwanted boards
-var minusList = ['<div id="minusList" style="color: #0000FF;display: inline-block">'];
+var minusList = $('<div id="minusList" style="color: #0000FF; display: inline-block">');
 for(var i=0; i<favorites.length; i++){
-    minusList += '<div onclick="removeBoard('+i+')" style="cursor: pointer; margin-left: 5px">-</div>';
+    minusList.append( $('<div data-board="'+i+'" style="cursor: pointer; margin-right: 5px">-</div>').on('click', function(e){removeBoard($(this).data('board'));}) );
 } 
-minusList += "</div>"; 
 
 //Help message so people understand how sorting boards works
-$("<span>Drag the boards to sort them.</span><br></br>").appendTo(Options.get_tab('fav-tab').content);
+$("<span>"+_("Drag the boards to sort them.")+"</span><br><br>").appendTo(Options.get_tab('fav-tab').content);
 
 //Adding list of boards and minus symbols to remove boards with
-$(favList).appendTo(Options.get_tab('fav-tab').content);  //Adding the list of favorite boards to the tab
 $(minusList).appendTo(Options.get_tab('fav-tab').content); //Adding the list of minus symbols to the tab
+$(favList).appendTo(Options.get_tab('fav-tab').content);  //Adding the list of favorite boards to the tab
 
 //Adding spacing and text box to right boards into
-$("<br id=\"space\"></br>").appendTo(Options.get_tab('fav-tab').content);
-$("<input id=\"plusBox\" type=\"text\">").appendTo(Options.get_tab('fav-tab').content);
-$("#plusBox").keydown(function( event ) {
+var addDiv = $("<div id='favs-add-board'>");
+
+var plusBox = $("<input id=\"plusBox\" type=\"text\">").appendTo(addDiv);
+plusBox.keydown(function( event ) {
 	if(event.keyCode == 13){
 		$("#plus").click();
 	}
 });
 
 //Adding plus symbol to use to add board
-$("<div id=\"plus\" onclick=\"addBoard()\">+</div>").css({
+$("<div id=\"plus\">+</div>").css({
 	cursor: "pointer",
 	color: "#0000FF"
-}).appendTo(Options.get_tab('fav-tab').content); //Adding the plus button
-$("<input id=\"submitFavorites\" onclick=\"localStorage.favorites=generateList();document.location.reload();\" type=\"button\" value=\""+_("Submit")+"\">").css({
-	height: 25, bottom: 5,
-	width: "calc(100% - 10px)",
-	left: 5, right: 5
-}).appendTo(Options.get_tab('fav-tab').content); //Adding submit button to the tab
+}).on('click', function(e){addBoard()}).appendTo(addDiv);
 
-$("#sortable").sortable(); //Making boards with sortable id use the sortable jquery function
+addDiv.appendTo(Options.get_tab('fav-tab').content); //Adding the plus button
 
+favList.sortable(); //Making boards with sortable id use the sortable jquery function
+favList.on('sortstop', function() {
+	favorites = generateList();	
+	localStorage.favorites = JSON.stringify(favorites);
+	add_favorites();
+});
 });
-- 
cgit v1.3


From 130b32d08be1b3cf9f1f8ad2228451a845da03be Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 13:42:38 +0200
Subject: remove image hover, so we can import the whole 8chan history of that
 file

---
 js/image-hover.js | 182 ------------------------------------------------------
 1 file changed, 182 deletions(-)
 delete mode 100644 js/image-hover.js

diff --git a/js/image-hover.js b/js/image-hover.js
deleted file mode 100644
index 93d61702..00000000
--- a/js/image-hover.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/* image-hover.js 
- * This script is copied almost verbatim from https://github.com/Pashe/8chanX/blob/2-0/8chan-x.user.js
- * All I did was remove the sprintf dependency and integrate it into 8chan's Options as opposed to Pashe's.
- * I also changed initHover() to also bind on new_post.
- * Thanks Pashe for using WTFPL.
- */
-
-if (active_page === "catalog" || active_page === "thread" || active_page === "index") {
-$(document).on('ready', function(){
-
-if (window.Options && Options.get_tab('general')) {
-	Options.extend_tab("general", 
-	"<fieldset><legend>Image hover</legend>"
-	+ ("<label class='image-hover' id='imageHover'><input type='checkbox' /> "+_('Image hover')+"</label>")
-	+ ("<label class='image-hover' id='catalogImageHover'><input type='checkbox' /> "+_('Image hover on catalog')+"</label>")
-	+ ("<label class='image-hover' id='imageHoverFollowCursor'><input type='checkbox' /> "+_('Image hover should follow cursor')+"</label>")
-	+ "</fieldset>");
-}
-
-$('.image-hover').on('change', function(){
-	var setting = $(this).attr('id');
-
-	localStorage[setting] = $(this).children('input').is(':checked');
-});
-
-if (!localStorage.imageHover || !localStorage.catalogImageHover || !localStorage.imageHoverFollowCursor) {
-	localStorage.imageHover = 'false';
-	localStorage.catalogImageHover = 'false';
-	localStorage.imageHoverFollowCursor = 'false';
-}
-
-if (getSetting('imageHover')) $('#imageHover>input').prop('checked', 'checked');
-if (getSetting('catalogImageHover')) $('#catalogImageHover>input').prop('checked', 'checked');
-if (getSetting('imageHoverFollowCursor')) $('#imageHoverFollowCursor>input').prop('checked', 'checked');
-
-function getFileExtension(filename) { //Pashe, WTFPL
-	if (filename.match(/\.([a-z0-9]+)(&loop.*)?$/i) !== null) {
-		return filename.match(/\.([a-z0-9]+)(&loop.*)?$/i)[1];
-	} else if (filename.match(/https?:\/\/(www\.)?youtube.com/)) {
-		return 'Youtube';
-	} else {
-		return "unknown: " + filename;
-	}
-}
-
-function isImage(fileExtension) { //Pashe, WTFPL
-	return ($.inArray(fileExtension, ["jpg", "jpeg", "gif", "png"]) !== -1);
-}
-
-function isVideo(fileExtension) { //Pashe, WTFPL
-	return ($.inArray(fileExtension, ["webm", "mp4"]) !== -1);
-}
-
-function isOnCatalog() {
-	return window.active_page === "catalog";
-}
-
-function isOnThread() {
-	return window.active_page === "thread";
-}
-
-function getSetting(key) {
-	return (localStorage[key] == 'true');
-}
-
-function initImageHover() { //Pashe, influenced by tux, et al, WTFPL
-	if (!getSetting("imageHover") && !getSetting("catalogImageHover")) {return;}
-	
-	var selectors = [];
-	
-	if (getSetting("imageHover")) {selectors.push("img.post-image", "canvas.post-image");}
-	if (getSetting("catalogImageHover") && isOnCatalog()) {
-		selectors.push(".thread-image");
-		$(".theme-catalog div.thread").css("position", "inherit");
-	}
-	
-	function bindEvents(el) {
-		$(el).find(selectors.join(", ")).each(function () {
-			if ($(this).parent().data("expanded")) {return;}
-			
-			var $this = $(this);
-			
-			$this.on("mousemove", imageHoverStart);
-			$this.on("mouseout",  imageHoverEnd);
-			$this.on("click",     imageHoverEnd);
-		});
-	}
-
-	bindEvents(document.body);
-	$(document).on('new_post', function(e, post) {
-		bindEvents(post);
-	});
-}
-
-function imageHoverStart(e) { //Pashe, anonish, WTFPL
-	var hoverImage = $("#chx_hoverImage");
-	
-	if (hoverImage.length) {
-		if (getSetting("imageHoverFollowCursor")) {
-			var scrollTop = $(window).scrollTop();
-			var imgY = e.pageY;
-			var imgTop = imgY;
-			var windowWidth = $(window).width();
-			var imgWidth = hoverImage.width() + e.pageX;
-			
-			if (imgY < scrollTop + 15) {
-				imgTop = scrollTop;
-			} else if (imgY > scrollTop + $(window).height() - hoverImage.height() - 15) {
-				imgTop = scrollTop + $(window).height() - hoverImage.height() - 15;
-			}
-			
-			if (imgWidth > windowWidth) {
-				hoverImage.css({
-					'left': (e.pageX + (windowWidth - imgWidth)),
-					'top' : imgTop,
-				});
-			} else {
-				hoverImage.css({
-					'left': e.pageX,
-					'top' : imgTop,
-				});
-			}
-			
-			hoverImage.appendTo($("body"));
-		}
-		
-		return;
-	}
-	
-	var $this = $(this);
-	
-	var fullUrl;
-	if ($this.parent().attr("href").match("src")) {
-		fullUrl = $this.parent().attr("href");
-	} else if (isOnCatalog()) {
-		fullUrl = $this.attr("data-fullimage");
-		if (!isImage(getFileExtension(fullUrl))) {fullUrl = $this.attr("src");}
-	}
-	
-	if (isVideo(getFileExtension(fullUrl))) {return;}
-	
-	hoverImage = $('<img id="chx_hoverImage" src="'+fullUrl+'" />');
-
-	if (getSetting("imageHoverFollowCursor")) {
-		var size = $this.parents('.file').find('.unimportant').text().match(/\b(\d+)x(\d+)\b/),
-			maxWidth = $(window).width(),
-			maxHeight = $(window).height();
-
-		var scale = Math.min(1, maxWidth / size[1], maxHeight / size[2]);
-		hoverImage.css({
-			"position"      : "absolute",
-			"z-index"       : 101,
-			"pointer-events": "none",
-			"width"         : size[1] + "px",
-			"height"        : size[2] + "px",
-			"max-width"     : (size[1] * scale) + "px",
-			"max-height"    : (size[2] * scale) + "px",
-			'left'          : e.pageX,
-			'top'           : imgTop,
-		});
-	} else {
-		hoverImage.css({
-			"position"      : "fixed",
-			"top"           : 0,
-			"right"         : 0,
-			"z-index"       : 101,
-			"pointer-events": "none",
-			"max-width"     : "100%",
-			"max-height"    : "100%",
-		});
-	}
-	hoverImage.appendTo($("body"));
-	if (isOnThread()) {$this.css("cursor", "none");}
-}
-
-function imageHoverEnd() { //Pashe, WTFPL
-	$("#chx_hoverImage").remove();
-}
-
-initImageHover();
-});
-}
-- 
cgit v1.3


From 913420e040e9dbfdbd8302ca40093036ca39a14c Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Fri, 20 Feb 2015 12:10:04 +0000
Subject: Image hover backported from 8chan X

---
 js/image-hover.js | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 186 insertions(+)
 create mode 100644 js/image-hover.js

diff --git a/js/image-hover.js b/js/image-hover.js
new file mode 100644
index 00000000..801b8dff
--- /dev/null
+++ b/js/image-hover.js
@@ -0,0 +1,186 @@
+/* image-hover.js 
+ * This script is copied almost verbatim from https://github.com/Pashe/8chanX/blob/2-0/8chan-x.user.js
+ * All I did was remove the sprintf dependency and integrate it into 8chan's Options as opposed to Pashe's.
+ * I also changed initHover() to also bind on new_post.
+ * Thanks Pashe for using WTFPL.
+ */
+
+if (active_page === "catalog" || active_page === "thread" || active_page === "index") {
+$(document).on('ready', function(){
+
+if (window.Options && Options.get_tab('general')) {
+	Options.extend_tab("general", 
+	"<fieldset><legend>Image hover</legend>"
+	+ ("<label class='image-hover' id='imageHover'><input type='checkbox' /> "+_('Image hover')+"</label>")
+	+ ("<label class='image-hover' id='catalogImageHover'><input type='checkbox' /> "+_('Image hover on catalog')+"</label>")
+	+ ("<label class='image-hover' id='imageHoverFollowCursor'><input type='checkbox' /> "+_('Image hover should follow cursor')+"</label>")
+	+ "</fieldset>");
+}
+
+$('.image-hover').on('change', function(){
+	var setting = $(this).attr('id');
+
+	localStorage[setting] = $(this).children('input').is(':checked');
+});
+
+if (!localStorage.imageHover || !localStorage.catalogImageHover || !localStorage.imageHoverFollowCursor) {
+	localStorage.imageHover = 'false';
+	localStorage.catalogImageHover = 'false';
+	localStorage.imageHoverFollowCursor = 'false';
+}
+
+if (getSetting('imageHover')) $('#imageHover>input').prop('checked', 'checked');
+if (getSetting('catalogImageHover')) $('#catalogImageHover>input').prop('checked', 'checked');
+if (getSetting('imageHoverFollowCursor')) $('#imageHoverFollowCursor>input').prop('checked', 'checked');
+
+function getFileExtension(filename) { //Pashe, WTFPL
+	if (filename.match(/\.([a-z0-9]+)(&loop.*)?$/i) !== null) {
+		return filename.match(/\.([a-z0-9]+)(&loop.*)?$/i)[1];
+	} else if (filename.match(/https?:\/\/(www\.)?youtube.com/)) {
+		return 'Youtube';
+	} else {
+		return "unknown: " + filename;
+	}
+}
+
+function isImage(fileExtension) { //Pashe, WTFPL
+	return ($.inArray(fileExtension, ["jpg", "jpeg", "gif", "png"]) !== -1);
+}
+
+function isVideo(fileExtension) { //Pashe, WTFPL
+	return ($.inArray(fileExtension, ["webm", "mp4"]) !== -1);
+}
+
+function isOnCatalog() {
+	return window.active_page === "catalog";
+}
+
+function isOnThread() {
+	return window.active_page === "thread";
+}
+
+function getSetting(key) {
+	return (localStorage[key] == 'true');
+}
+
+function initImageHover() { //Pashe, influenced by tux, et al, WTFPL
+	if (!getSetting("imageHover") && !getSetting("catalogImageHover")) {return;}
+	
+	var selectors = [];
+	
+	if (getSetting("imageHover")) {selectors.push("img.post-image", "canvas.post-image");}
+	if (getSetting("catalogImageHover") && isOnCatalog()) {
+		selectors.push(".thread-image");
+		$(".theme-catalog div.thread").css("position", "inherit");
+	}
+	
+	function bindEvents(el) {
+		$(el).find(selectors.join(", ")).each(function () {
+			if ($(this).parent().data("expanded")) {return;}
+			
+			var $this = $(this);
+			
+			$this.on("mousemove", imageHoverStart);
+			$this.on("mouseout",  imageHoverEnd);
+			$this.on("click",     imageHoverEnd);
+		});
+	}
+
+	bindEvents(document.body);
+	$(document).on('new_post', function(e, post) {
+		bindEvents(post);
+	});
+}
+
+function imageHoverStart(e) { //Pashe, anonish, WTFPL
+	var hoverImage = $("#chx_hoverImage");
+	
+	if (hoverImage.length) {
+		if (getSetting("imageHoverFollowCursor")) {
+			var scrollTop = $(window).scrollTop();
+			var imgY = e.pageY;
+			var imgTop = imgY;
+			var windowWidth = $(window).width();
+			var imgWidth = hoverImage.width() + e.pageX;
+			
+			if (imgY < scrollTop + 15) {
+				imgTop = scrollTop;
+			} else if (imgY > scrollTop + $(window).height() - hoverImage.height() - 15) {
+				imgTop = scrollTop + $(window).height() - hoverImage.height() - 15;
+			}
+			
+			if (imgWidth > windowWidth) {
+				hoverImage.css({
+					'left': (e.pageX + (windowWidth - imgWidth)),
+					'top' : imgTop,
+				});
+			} else {
+				hoverImage.css({
+					'left': e.pageX,
+					'top' : imgTop,
+				});
+			}
+			
+			hoverImage.appendTo($("body"));
+		}
+		
+		return;
+	}
+	
+	var $this = $(this);
+	
+	var fullUrl;
+	if ($this.parent().attr("href").match("src")) {
+		fullUrl = $this.parent().attr("href");
+	} else if (isOnCatalog()) {
+		$this.css("cursor", "progress");
+		fullUrl = $this.attr("src");
+		$.ajax(($this.parent().attr("href").replace(/\.html$/, ".json")), {
+			success: function (result) {
+				$this.css("cursor", "unset");
+				fullUrl = result.posts[0].tim + result.posts[0].ext;
+				if (!isImage(getFileExtension(fullUrl))) {return;}
+				$("#chx_hoverImage").attr("src", "/" + thisBoard + "/" + fullUrl);
+				$("#chx_hoverImage").on("load", function() {$this.css("cursor", "none")});
+			},
+			async: true,
+			cache: true
+		});
+	}
+	
+	if (isVideo(getFileExtension(fullUrl))) {return;}
+	
+	hoverImage = $('<img id="chx_hoverImage" src="'+fullUrl+'" />');
+	if (getSetting("imageHoverFollowCursor")) {
+		hoverImage.css({
+			"position"      : "absolute",
+			"z-index"       : 101,
+			"pointer-events": "none",
+			"max-width"     : $(window).width(),
+			"max-height"    : $(window).height(),
+			'left'          : e.pageX,
+			'top'           : imgTop,
+		});
+	} else {
+		hoverImage.css({
+			"position"      : "fixed",
+			"top"           : 0,
+			"right"         : 0,
+			"z-index"       : 101,
+			"pointer-events": "none",
+			"max-width"     : "100%",
+			"max-height"    : "100%",
+		});
+	}
+	hoverImage.appendTo($("body"));
+	if (isOnThread()) {$this.css("cursor", "none");}
+}
+
+function imageHoverEnd() { //Pashe, WTFPL
+	$("#chx_hoverImage").remove();
+}
+
+initImageHover();
+});
+}
+
-- 
cgit v1.3


From 5f043d0a29efd6b14d3b453955af15df8630d88b Mon Sep 17 00:00:00 2001
From: Pashe <pashe@users.noreply.github.com>
Date: Tue, 24 Feb 2015 03:17:35 -0600
Subject: Have image-hover.js use data-fullimage instead of the API

---
 js/image-hover.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/js/image-hover.js b/js/image-hover.js
index 801b8dff..ac175ff4 100644
--- a/js/image-hover.js
+++ b/js/image-hover.js
@@ -133,19 +133,8 @@ function imageHoverStart(e) { //Pashe, anonish, WTFPL
 	if ($this.parent().attr("href").match("src")) {
 		fullUrl = $this.parent().attr("href");
 	} else if (isOnCatalog()) {
-		$this.css("cursor", "progress");
-		fullUrl = $this.attr("src");
-		$.ajax(($this.parent().attr("href").replace(/\.html$/, ".json")), {
-			success: function (result) {
-				$this.css("cursor", "unset");
-				fullUrl = result.posts[0].tim + result.posts[0].ext;
-				if (!isImage(getFileExtension(fullUrl))) {return;}
-				$("#chx_hoverImage").attr("src", "/" + thisBoard + "/" + fullUrl);
-				$("#chx_hoverImage").on("load", function() {$this.css("cursor", "none")});
-			},
-			async: true,
-			cache: true
-		});
+		fullUrl = $this.attr("data-fullimage");
+		if (!isImage(getFileExtension(fullUrl))) {fullUrl = $this.attr("src");}
 	}
 	
 	if (isVideo(getFileExtension(fullUrl))) {return;}
-- 
cgit v1.3


From cad8019068cf94a1e28e8ebfcc50af56914703b8 Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Wed, 18 Mar 2015 20:48:02 -0700
Subject: Prevent images from hovering off-page

This entirely affects the "imageHoverFollowCursor" option.
---
 js/image-hover.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/js/image-hover.js b/js/image-hover.js
index ac175ff4..3e4ec0c4 100644
--- a/js/image-hover.js
+++ b/js/image-hover.js
@@ -140,13 +140,21 @@ function imageHoverStart(e) { //Pashe, anonish, WTFPL
 	if (isVideo(getFileExtension(fullUrl))) {return;}
 	
 	hoverImage = $('<img id="chx_hoverImage" src="'+fullUrl+'" />');
+
 	if (getSetting("imageHoverFollowCursor")) {
+		var size = $this.parents('.file').find('.unimportant').text().match(/\b(\d+)x(\d+)\b/),
+			maxWidth = $(window).width(),
+			maxHeight = $(window).height(),
+
+		var scale = Math.min(1, maxWidth / size[1], maxHeight / size[2]);
 		hoverImage.css({
 			"position"      : "absolute",
 			"z-index"       : 101,
 			"pointer-events": "none",
-			"max-width"     : $(window).width(),
-			"max-height"    : $(window).height(),
+			"width"         : size[1] + "px",
+			"height"        : size[2] + "px",
+			"max-width"     : (size[1] * scale) + "px",
+			"max-height"    : (size[2] * scale) + "px",
 			'left'          : e.pageX,
 			'top'           : imgTop,
 		});
-- 
cgit v1.3


From 633c223282c568f187158c942de5817f49282c50 Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Wed, 18 Mar 2015 20:50:41 -0700
Subject: Fix trailing comma

---
 js/image-hover.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/image-hover.js b/js/image-hover.js
index 3e4ec0c4..66e908d7 100644
--- a/js/image-hover.js
+++ b/js/image-hover.js
@@ -144,7 +144,7 @@ function imageHoverStart(e) { //Pashe, anonish, WTFPL
 	if (getSetting("imageHoverFollowCursor")) {
 		var size = $this.parents('.file').find('.unimportant').text().match(/\b(\d+)x(\d+)\b/),
 			maxWidth = $(window).width(),
-			maxHeight = $(window).height(),
+			maxHeight = $(window).height();
 
 		var scale = Math.min(1, maxWidth / size[1], maxHeight / size[2]);
 		hoverImage.css({
-- 
cgit v1.3


From 129eb154b3c74289e0b21f6ff11a0034e232a59d Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Thu, 26 Feb 2015 02:07:22 +0000
Subject: Merge

---
 js/auto-scroll.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 js/auto-scroll.js

diff --git a/js/auto-scroll.js b/js/auto-scroll.js
new file mode 100644
index 00000000..b8343f5e
--- /dev/null
+++ b/js/auto-scroll.js
@@ -0,0 +1,27 @@
+$('document').ready(function () {
+	var autoScroll = localStorage['autoScroll'] ? true : false;
+	if (window.Options && Options.get_tab('general')){
+		Options.extend_tab('general','<label id=\'autoScroll\'><input type=\'checkbox\' />' + ' Scroll to new posts' + '</label>');
+		$('#autoScroll').find('input').prop('checked', autoScroll);
+	}
+	$('#autoScroll').on('change', function() {
+		if(autoScroll) {
+			delete localStorage.autoScroll;
+		} else {
+			localStorage.autoScroll = true;
+		}
+		autoScroll =! autoScroll
+		if(active_page == 'thread')
+			$('input.auto-scroll').prop('checked', autoScroll);
+	});
+	if (active_page == 'thread') {
+		$('span[id="updater"]').children('a').after(' (<input class="auto-scroll" type="checkbox"></input> Scroll to New posts)');
+		$('input.auto-scroll').prop('checked', autoScroll);
+		$(document).on('new_post', function (e, post) {
+			if ($('input.auto-scroll').prop('checked')) 
+			{
+				scrollTo(0, $(post).offset().top - window.innerHeight + $(post).outerHeight(true)); 
+			}
+		});
+	}
+});
-- 
cgit v1.3


From 6991ca270eb7ecd879a06971cc9df0334aab7687 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 13:53:52 +0200
Subject: fix bad merge

---
 templates/main.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/main.js b/templates/main.js
index b3aebcfb..7e3b2dc1 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -70,7 +70,6 @@ var datelocale =
         };
 
 
-function alert(a) {
 function alert(a, do_confirm, confirm_ok_action, confirm_cancel_action) {
       var handler, div, bg, closebtn, okbtn;
       var close = function() {
-- 
cgit v1.3


From 02c3c28a16127511a785e428547f8a4dc60abaf7 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 14:38:24 +0200
Subject: main.js: a bit more sane code

---
 js/thread-watcher.js                  |  4 ++--
 templates/index.html                  |  6 ++++--
 templates/main.js                     | 11 ++++-------
 templates/page.html                   |  2 +-
 templates/themes/catalog/catalog.html |  3 ++-
 templates/thread.html                 |  4 +++-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 960aa59f..c31a6e74 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -79,8 +79,8 @@ watchlist.add = function(sel) {
 		} else {
 			postCount = $(sel).parents('.op').siblings('.post').length+1;
 		}
-		//Grab the reply link.
-		var threadLink = $(sel).siblings('a:contains("['+_('Reply')+']")').attr('href');
+		//Grab the reply link.;
+		var threadLink = $(sel).siblings('a:not(.watchThread)').last().attr('href');
 		//Figure out the thread name. If anon, use the thread id.
 		if ($(sel).parent().find('.subject').length) {
 			threadName = $(sel).parent().find('.subject').text().substring(0,20);
diff --git a/templates/index.html b/templates/index.html
index 41e4867d..d4c56707 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,10 +4,12 @@
 	<meta charset="utf-8">
 
         <script type="text/javascript">
+	  var
           {% if not no_post_form %}
-            var active_page = "index";
+              active_page = "index"
+            , board_name = "{{ board.uri }}";
 	  {% else %}
-            var active_page = "ukko";
+              active_page = "ukko";
           {% endif %}
         </script>
 
diff --git a/templates/main.js b/templates/main.js
index 7e3b2dc1..c2a6f6c0 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -115,7 +115,10 @@ var styles = {
 	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
 	{% endraw %}{% endfor %}{% raw %}
 };
-var board_name = false;
+
+if (typeof board_name === 'undefined') {
+	var board_name = false;
+}
 
 function changeStyle(styleName, link) {
 	{% endraw %}
@@ -159,13 +162,7 @@ function changeStyle(styleName, link) {
 
 {% endraw %}
 {% if config.stylesheets_board %}
-	{# This is such an unacceptable mess. There needs to be an easier way. #}
-	{# Needs fix for slugify #}
-	var matches = document.URL.match(/\/(\w+)\/($|{{ config.dir.res|replace({'/': '\\/'}) }}{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }}|{{ config.file_index|replace({'.': '\\.'}) }}|{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }})/);
 	{% raw %}
-	if (matches) {
-		board_name = matches[1];
-	}
 	
 	if (!localStorage.board_stylesheets) {
 		localStorage.board_stylesheets = '{}';
diff --git a/templates/page.html b/templates/page.html
index 3522702f..816bb72b 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<script type="text/javascript">
-		active_page = "page";
+		var active_page = "page";
 	</script>
 	{% include 'header.html' %}
 	<title>{{ title }}</title>
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 1011fdaf..1f5e8b05 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -4,7 +4,8 @@
 <head>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 	<script type='text/javascript'>
-		active_page = "catalog";
+		var active_page = "catalog"
+		  , board_name = "{{ board }}";
 	</script>
 	{% include 'header.html' %}
 	<title>{{ settings.title }}</title>
diff --git a/templates/thread.html b/templates/thread.html
index b7bb5f6b..506b9cc2 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -4,7 +4,9 @@
 	<meta charset="utf-8">
 
         <script type="text/javascript">
-          var active_page = "thread";
+          var active_page = "thread"
+	    , board_name = "{{ board.uri }}"
+	    , thread_id = "{{ thread.id }}";
 	</script>
 
 	{% include 'header.html' %}
-- 
cgit v1.3


From d46bf4e2f2209a38e11dad436b0abb5d89ef4448 Mon Sep 17 00:00:00 2001
From: Bui <bui@bui.pm>
Date: Fri, 3 Oct 2014 00:12:15 +0900
Subject: add id to thread links

---
 templates/thread.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/thread.html b/templates/thread.html
index 506b9cc2..0899c414 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -49,8 +49,12 @@
 	{{ body }}
 	{% include 'report_delete.html' %}
 	</form>
-	<a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-        <a href="#" id="bottom" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
+	
+	<span id="thread-links">
+		<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
+    	<a id="thread-top" href="#" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
+    	<a id="thread-catalog" style="padding-left: 10px" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+    </span>
 
 	{{ boardlist.bottom }}
 
-- 
cgit v1.3


From 6c334a3b4494a9b1b3e9f801dab45e6e027dceed Mon Sep 17 00:00:00 2001
From: Bui <bui@bui.pm>
Date: Fri, 3 Oct 2014 00:16:41 +0900
Subject: lol spaces

---
 templates/thread.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/thread.html b/templates/thread.html
index 0899c414..c909f843 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -52,9 +52,9 @@
 	
 	<span id="thread-links">
 		<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-    	<a id="thread-top" href="#" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
-    	<a id="thread-catalog" style="padding-left: 10px" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
-    </span>
+		<a id="thread-top" href="#" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
+		<a id="thread-catalog" style="padding-left: 10px" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+	</span>
 
 	{{ boardlist.bottom }}
 
-- 
cgit v1.3


From 293543878a10e1ef93990acb373f8f22ca655f64 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 12:10:50 +0200
Subject: backport parts of 2d6d449bd2d72, in particular html classes

---
 stylesheets/style.css             | 2 +-
 templates/generic_page.html       | 2 +-
 templates/index.html              | 2 +-
 templates/page.html               | 2 +-
 templates/post_thread.html        | 2 +-
 templates/themes/basic/index.html | 2 +-
 templates/thread.html             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 6b4b19d9..2c5663bd 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -666,7 +666,7 @@ pre {
   margin-left: -20px;
 }
 
-div.thread:hover {
+.theme-catalog div.thread:hover {
   background: #D6DAF0;
   border-color: #B7C5D9;
 }
diff --git a/templates/generic_page.html b/templates/generic_page.html
index 35b58df3..fbfc3c50 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 vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ 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 d4c56707..1eea6e6b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -16,7 +16,7 @@
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.title|e }}</title>
 </head>
-<body>	
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ 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/page.html b/templates/page.html
index 816bb72b..296b517e 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -8,7 +8,7 @@
 	{% include 'header.html' %}
 	<title>{{ title }}</title>
 </head>
-<body>
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ 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/post_thread.html b/templates/post_thread.html
index 61146491..72ca2998 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 8cdaf182..9d7a2c41 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 vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ 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 c909f843..425394bb 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -12,7 +12,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 vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ 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 }}" {% 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 %}
-- 
cgit v1.3


From b6f3d440809f87a803632cefe66a861c8e20bd9b Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sun, 9 Nov 2014 23:24:00 -0800
Subject: Go to bottom link

---
 templates/thread.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/thread.html b/templates/thread.html
index 425394bb..7f8668a3 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -32,7 +32,8 @@
 
 	{% include 'attention_bar.html' %}
 
-	<div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a></div>
+	<div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a> <a class="unimportant" href="javascript:window.scrollTo(0,document.body.scrollHeight);
+">[{% trans %}Go to bottom {% endtrans %}]</a></div>
 
 	{{ config.ad.top }}
 
-- 
cgit v1.3


From aa0d3395b181671907800cd7110c00e35d8a8a13 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sat, 20 Dec 2014 07:02:42 -0800
Subject: Show first 256 chars of body in <title>

---
 templates/thread.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/thread.html b/templates/thread.html
index 7f8668a3..335cd610 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -10,7 +10,7 @@
 	</script>
 
 	{% include 'header.html' %}
-	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
+	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ thread.body_nomarkup[:256]|e }}{% endif %}</title>
 </head>
 <body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	{{ boardlist.top }}
-- 
cgit v1.3


From ce62673a2cf1dd4667b75756c80c44cc5746a63b Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Mon, 16 Feb 2015 16:31:15 -0800
Subject: OpenGraph information in thread pages
 https://en.wikipedia.org/wiki/Facebook_Platform#Open_Graph_protocol

---
 templates/thread.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/templates/thread.html b/templates/thread.html
index 335cd610..9051d8e0 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -10,7 +10,18 @@
 	</script>
 
 	{% include 'header.html' %}
-	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ thread.body_nomarkup[:256]|e }}{% endif %}</title>
+
+	{% set meta_subject %}{% if config.thread_subject_in_title and thread.subject %}{{ thread.subject|e }}{% else %}{{ thread.body_nomarkup[:256]|e }}{% endif %}{% endset %}
+
+	<meta name="description" content="8chan /{{ board.uri }}/ - {{ board.title|e }} - {{ meta_subject }}" />
+	<meta name="twitter:card" value="summary">
+	<meta property="og:title" content="{{ meta_subject }}" />
+	<meta property="og:type" content="article" />
+	<meta property="og:url" content="https://8ch.net/{{ board.uri }}/{{ config.dir.res }}{{ thread.id }}.html" />
+	{% if thread.files.0.thumb %}<meta property="og:image" content="https://8ch.net/{{ board.uri }}/{{ config.dir.thumb }}{{ thread.files.0.thumb }}" />{% endif %}
+	<meta property="og:description" content="{{ thread.body_nomarkup|e }}" />
+
+	<title>{{ board.url }} - {{ meta_subject }}</title>
 </head>
 <body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	{{ boardlist.top }}
-- 
cgit v1.3


From 3f29170f1bebba532c73e4188b15cdc7e4335c15 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 12:23:18 +0200
Subject: debrand 8chan; btw. the previous commit was [SECURITY] i think?

---
 templates/thread.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/thread.html b/templates/thread.html
index 9051d8e0..4314fa5e 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -13,12 +13,12 @@
 
 	{% set meta_subject %}{% if config.thread_subject_in_title and thread.subject %}{{ thread.subject|e }}{% else %}{{ thread.body_nomarkup[:256]|e }}{% endif %}{% endset %}
 
-	<meta name="description" content="8chan /{{ board.uri }}/ - {{ board.title|e }} - {{ meta_subject }}" />
+	<meta name="description" content="{{ board.url }} - {{ board.title|e }} - {{ meta_subject }}" />
 	<meta name="twitter:card" value="summary">
 	<meta property="og:title" content="{{ meta_subject }}" />
 	<meta property="og:type" content="article" />
-	<meta property="og:url" content="https://8ch.net/{{ board.uri }}/{{ config.dir.res }}{{ thread.id }}.html" />
-	{% if thread.files.0.thumb %}<meta property="og:image" content="https://8ch.net/{{ board.uri }}/{{ config.dir.thumb }}{{ thread.files.0.thumb }}" />{% endif %}
+	<meta property="og:url" content="{{ config.domain }}/{{ board.uri }}/{{ config.dir.res }}{{ thread.id }}.html" />
+	{% if thread.files.0.thumb %}<meta property="og:image" content="{{ config.domain }}/{{ board.uri }}/{{ config.dir.thumb }}{{ thread.files.0.thumb }}" />{% endif %}
 	<meta property="og:description" content="{{ thread.body_nomarkup|e }}" />
 
 	<title>{{ board.url }} - {{ meta_subject }}</title>
-- 
cgit v1.3


From cb97029d0d95e54d7e78e46b26b366060fb7e547 Mon Sep 17 00:00:00 2001
From: anonfagola <anonfagola@users.noreply.github.com>
Date: Sun, 28 Sep 2014 10:01:17 -0700
Subject: Update catalog.html

Changed title from being - "Catalog /board/" to "/board/ - Catalog"
---
 templates/themes/catalog/catalog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 1f5e8b05..226c00d3 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -8,7 +8,7 @@
 		  , board_name = "{{ board }}";
 	</script>
 	{% include 'header.html' %}
-	<title>{{ settings.title }}</title>
+	<title>{{ board }} - Catalog</title>
 </head>
 <body class="theme-catalog">
 	{{ boardlist.top }}
-- 
cgit v1.3


From 632d0a76d0afc5bd7a8cc90e6625a74fe432065a Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Wed, 31 Dec 2014 22:37:19 -0800
Subject: Display placeholder if no file in catalog/theme.php; czaks: fix the
 code a bit

---
 inc/config.php                     | 2 +-
 templates/themes/catalog/theme.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/config.php b/inc/config.php
index ad659343..21f7b5cc 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -766,7 +766,7 @@
 	// Location of thumbnail to use for spoiler images.
 	$config['spoiler_image'] = 'static/spoiler.png';
 	// Location of thumbnail to use for deleted images.
-	// $config['image_deleted'] = 'static/deleted.png';
+	$config['image_deleted'] = 'static/deleted.png';
 
 	// When a thumbnailed image is going to be the same (in dimension), just copy the entire file and use
 	// that as a thumbnail instead of resizing/redrawing.
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 34b28e48..c7a8ee95 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -88,6 +88,8 @@
 							$post['file'] = $config['uri_thumb'] . $files[0]->thumb;
 						}
 					}
+				} else {
+					$post['file'] = $config['root'] . $config['image_deleted'];
 				}
 
 				if (empty($post['image_count'])) $post['image_count'] = 0;
-- 
cgit v1.3


From ae4eb4d3d9c390d4c203a468313154aa59809e59 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Mon, 9 Mar 2015 02:31:08 -0700
Subject: RSS

---
 templates/themes/catalog/index.rss | 19 +++++++++++++++++++
 templates/themes/catalog/theme.php |  7 +++++++
 2 files changed, 26 insertions(+)
 create mode 100644 templates/themes/catalog/index.rss

diff --git a/templates/themes/catalog/index.rss b/templates/themes/catalog/index.rss
new file mode 100644
index 00000000..c187e45a
--- /dev/null
+++ b/templates/themes/catalog/index.rss
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
+<channel>
+	<title>/{{ board.uri }}/ - {{ board.title|e }}</title>
+	<link>https://8ch.net/{{ board.uri }}/</link>
+	<description>Live feed of new threads on the 8chan board /{{ board.uri }}/ - {{ board.title|e }}.</description>
+	<atom:link href="https://8ch.net/{{ board.uri }}/index.rss" rel="self" type="application/rss+xml"/>
+	{% for post in recent_posts %}
+	<item>
+		<title>{% if post.subject %}{{ post.subject|e }}{% else %}{{ post.body_nomarkup[:256]|e }}{% endif %}</title>
+		<link>https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html</link>
+		<guid>https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html</guid>
+		<comments>https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html</comments>
+		<pubDate>{{ post.pubdate }}</pubDate>
+		<description><![CDATA[ <a href='https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html' target=_blank><img style='float:left;margin:8px' border=0 src='{% if not config.uri_thumb %}https://8ch.net/{% endif %}{{ post.file }}'></a> {{ post.body }} ]]></description>
+	</item>
+	{% endfor %}
+</channel>
+</rss>
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index c7a8ee95..239d4dff 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -93,6 +93,7 @@
 				}
 
 				if (empty($post['image_count'])) $post['image_count'] = 0;
+				$post['pubdate'] = date('r', $post['time']);
 				$recent_posts[] = $post;
 			}
 			
@@ -113,5 +114,11 @@
 				'board' => $board_name,
 				'link' => $config['root'] . $board['dir']
 			)));
+
+			file_write($config['dir']['home'] . $board_name . '/index.rss', Element('themes/catalog/index.rss', Array(
+				'config' => $config,
+				'recent_posts' => $recent_posts,
+				'board' => $board
+			)));
 		}
 	};
-- 
cgit v1.3


From 6da7f4d25aed8daf14f705e2acabbac8f755fe01 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sat, 14 Mar 2015 22:03:08 -0700
Subject: No more country flags in <title>

---
 inc/lib/Twig/Extensions/Extension/Tinyboard.php | 1 +
 templates/themes/catalog/index.rss              | 2 +-
 templates/thread.html                           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index 028db438..3d964c71 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -17,6 +17,7 @@ class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
 			new Twig_SimpleFilter('extension', 'twig_extension_filter'),
 			new Twig_SimpleFilter('sprintf', 'sprintf'),
 			new Twig_SimpleFilter('capcode', 'capcode'),
+			new Twig_SimpleFilter('remove_modifiers', 'remove_modifiers'),
 			new Twig_SimpleFilter('hasPermission', 'twig_hasPermission_filter'),
 			new Twig_SimpleFilter('date', 'twig_date_filter'),
 			new Twig_SimpleFilter('poster_id', 'poster_id'),
diff --git a/templates/themes/catalog/index.rss b/templates/themes/catalog/index.rss
index c187e45a..248b494a 100644
--- a/templates/themes/catalog/index.rss
+++ b/templates/themes/catalog/index.rss
@@ -7,7 +7,7 @@
 	<atom:link href="https://8ch.net/{{ board.uri }}/index.rss" rel="self" type="application/rss+xml"/>
 	{% for post in recent_posts %}
 	<item>
-		<title>{% if post.subject %}{{ post.subject|e }}{% else %}{{ post.body_nomarkup[:256]|e }}{% endif %}</title>
+		<title>{% if post.subject %}{{ post.subject|e }}{% else %}{{ post.body_nomarkup[:256]|remove_modifiers|e }}{% endif %}</title>
 		<link>https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html</link>
 		<guid>https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html</guid>
 		<comments>https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html</comments>
diff --git a/templates/thread.html b/templates/thread.html
index 4314fa5e..2ca81e2e 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -11,7 +11,7 @@
 
 	{% include 'header.html' %}
 
-	{% set meta_subject %}{% if config.thread_subject_in_title and thread.subject %}{{ thread.subject|e }}{% else %}{{ thread.body_nomarkup[:256]|e }}{% endif %}{% endset %}
+	{% set meta_subject %}{% if config.thread_subject_in_title and thread.subject %}{{ thread.subject|e }}{% else %}{{ thread.body_nomarkup[:256]|remove_modifiers|e }}{% endif %}{% endset %}
 
 	<meta name="description" content="{{ board.url }} - {{ board.title|e }} - {{ meta_subject }}" />
 	<meta name="twitter:card" value="summary">
-- 
cgit v1.3


From 7a7574bdcace8ca5526ed10fe675cbbabced6ecd Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Wed, 24 Dec 2014 06:08:19 -0800
Subject: SECURITY / XSS : ?/edit allowed arbitrary HTML to be added by any
 user thru addition of <tinyboard raw html>1</tinyboard>

This allowed ANY user with ?/edit privilege to also have raw_html regardless of whether they had $config['mod']['rawhtml']

Now, any changes to <tinyboard> markup modifiers via ?/edit are not allowed. They are removed at read time, and before write they are removed again and the ones in the database (which should be clean...) are inserted instead.

Please immediately apply this patch to your instance if you are running any version of 8chan/infinity.
---
 inc/functions.php |  6 +++++-
 inc/mod/pages.php | 20 +++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index c46807bb..85b61b2e 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1849,7 +1849,11 @@ function extract_modifiers($body) {
 	return $modifiers;
 }
 
-function markup(&$body, $track_cites = false) {
+function remove_modifiers($body) {
+	return preg_replace('@<tinyboard ([\w\s]+)>(.+?)</tinyboard>@usm', '', $body);
+}
+
+function markup(&$body, $track_cites = false, $op = false) {
 	global $board, $config, $markup_urls;
 	
 	$modifiers = extract_modifiers($body);
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 8380cfd3..a90fbbd6 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1473,6 +1473,15 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 		error($config['error']['404']);
 	
 	if (isset($_POST['name'], $_POST['email'], $_POST['subject'], $_POST['body'])) {
+		// Remove any modifiers they may have put in
+		$_POST['body'] = remove_modifiers($_POST['body']);
+
+		// Add back modifiers in the original post
+		$modifiers = extract_modifiers($post['body_nomarkup']);
+		foreach ($modifiers as $key => $value) {
+			$_POST['body'] .= "<tinyboard $key>$value</tinyboard>";
+		}
+
 		if ($edit_raw_html)
 			$query = prepare(sprintf('UPDATE ``posts_%s`` SET `name` = :name, `email` = :email, `subject` = :subject, `body` = :body, `body_nomarkup` = :body_nomarkup WHERE `id` = :id', $board));
 		else
@@ -1501,15 +1510,20 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 		
 		header('Location: ?/' . sprintf($config['board_path'], $board) . $config['dir']['res'] . link_for($post) . '#' . $postID, true, $config['redirect_http']);
 	} else {
+		// Remove modifiers
+		$post['body_nomarkup'] = remove_modifiers($post['body_nomarkup']);
+				
+		$post['body_nomarkup'] = utf8tohtml($post['body_nomarkup']);
+		$post['body'] = utf8tohtml($post['body']);
 		if ($config['minify_html']) {
-			$post['body_nomarkup'] = str_replace("\n", '&#010;', utf8tohtml($post['body_nomarkup']));
-			$post['body'] = str_replace("\n", '&#010;', utf8tohtml($post['body']));
+			$post['body_nomarkup'] = str_replace("\n", '&#010;', $post['body_nomarkup']);
+			$post['body'] = str_replace("\n", '&#010;', $post['body']);
 			$post['body_nomarkup'] = str_replace("\r", '', $post['body_nomarkup']);
 			$post['body'] = str_replace("\r", '', $post['body']);
 			$post['body_nomarkup'] = str_replace("\t", '&#09;', $post['body_nomarkup']);
 			$post['body'] = str_replace("\t", '&#09;', $post['body']);
 		}
-				
+
 		mod_page(_('Edit post'), 'mod/edit_post_form.html', array('token' => $security_token, 'board' => $board, 'raw' => $edit_raw_html, 'post' => $post));
 	}
 }
-- 
cgit v1.3


From 6644ff666a1c794c6536c895e322dbcb50710134 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Sat, 18 Apr 2015 04:39:50 +1000
Subject: Also improved some CSS and HTML aspects of the thread layout.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
 stylesheets/style.css        | 86 ++++++++++++++++++++++++++++++++++++--------
 templates/report_delete.html | 21 ++++++-----
 templates/thread.html        | 31 ++++++++++------
 3 files changed, 105 insertions(+), 33 deletions(-)

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 2c5663bd..bb7c2634 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -468,20 +468,6 @@ hr {
   clear: left;
 }
 
-div.boardlist {
-  color: #89A;
-  font-size: 9pt;
-  margin-top: 3px;
-}
-
-div.boardlist.bottom {
-  margin-top: 20px;
-}
-
-div.boardlist a {
-  text-decoration: none;
-}
-
 div.report {
   color: #333;
 }
@@ -944,6 +930,78 @@ span.pln {
   }
 }
 
+.clearfix {
+	display: block;
+	clear: both;
+	visibility: hidden;
+	overflow: hidden;
+	
+	font-size: 0px;
+	line-height: 0px;
+	
+	box-sizing: border-box;
+	border: none;
+	height: 0;
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	zoom: 1;
+}
+
+/* === SPECIFIC PAGES & FEATURES === */
+
+/* Board List */
+div.boardlist {
+	margin-top: 3px;
+	
+	color: #89A;
+	font-size: 9pt;
+}
+div.boardlist.bottom {
+	margin-top: 12px;
+	clear: both;
+}
+div.boardlist a {
+	text-decoration: none;
+}
+
+/* Threads */
+/* Thread Footer */
+#thread-interactions {
+	margin: 8px 0;
+	clear: both;
+}
+#thread-links {
+	float: left;
+}
+#thread-links > a {
+	padding-left: none;
+	padding-right: 10px;
+}
+#thread-quick-reply {
+	display: none;
+	position: absolute;
+	left: 50%;
+	right: 50%;
+	text-align: center;
+	width: 100px;
+	margin-left: -50px;
+}
+#thread_stats {
+	float: right;
+}
+
+#post-moderation-fields {
+	float: right;
+	text-align: right;
+}
+#delete-fields {
+}
+#report-fields {
+}
+
+
+
 /* threadwatcher */
 
 #watchlist {
diff --git a/templates/report_delete.html b/templates/report_delete.html
index 2fcb7259..e246da9e 100644
--- a/templates/report_delete.html
+++ b/templates/report_delete.html
@@ -1,13 +1,16 @@
-{% if config.allow_delete %}
-<div class="delete">
-	{% trans %}Delete Post{% endtrans %} [<input title="Delete file only" type="checkbox" name="file" id="delete_file" />
-	 <label for="delete_file">{% trans %}File{% endtrans %}</label>] <label for="password">{% trans %}Password{% endtrans %}</label> 
+<div id="post-moderation-fields">
+	{% if config.allow_delete %}
+	<div id="delete-fields">
+		{% trans %}Delete Post{% endtrans %} [<input title="Delete file only" type="checkbox" name="file" id="delete_file" />
+		 <label for="delete_file">{% trans %}File{% endtrans %}</label>] <label for="password">{% trans %}Password{% endtrans %}</label> 
 		<input id="password" type="password" name="password" size="12" maxlength="18" />
 		<input type="submit" name="delete" value="{% trans %}Delete{% endtrans %}" />
-</div>
-{% endif %}
-<div class="delete" style="clear:both">
-	<label for="reason">{% trans %}Reason{% endtrans %}</label> 
+	</div>
+	{% endif %}
+	
+	<div id="report-fields">
+		<label for="reason">{% trans %}Reason{% endtrans %}</label> 
 		<input id="reason" type="text" name="reason" size="20" maxlength="30" />
 		<input type="submit" name="report" value="{% trans %}Report{% endtrans %}" />
-</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/thread.html b/templates/thread.html
index 2ca81e2e..1cbb6d20 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -24,6 +24,7 @@
 	<title>{{ board.url }} - {{ meta_subject }}</title>
 </head>
 <body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
+	<a name="top"></a> 
 	{{ boardlist.top }}
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}" {% 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 %}
@@ -56,18 +57,28 @@
 	<a href="#bottom" style="padding-left: 10px">[{% trans %}Go to bottom{% endtrans %}]</a>
 	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
-	<input type="hidden" name="board" value="{{ board.uri }}" />
-	{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
-	{{ body }}
-	{% include 'report_delete.html' %}
+		<input type="hidden" name="board" value="{{ board.uri }}" />
+		{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
+		
+		{{ body }}
+		
+		<div id="thread-interactions">
+			<span id="thread-links">
+				<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
+				<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
+				<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+			</span>
+			
+			<span id="thread-quick-reply">
+				<a id="link-quick-reply" href="#">[{% trans %}Post a Reply{% endtrans %}]</a>
+			</span>
+			
+			{% include 'report_delete.html' %}
+		</div>
+		
+		<div class="clearfix"></div>
 	</form>
 	
-	<span id="thread-links">
-		<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-		<a id="thread-top" href="#" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
-		<a id="thread-catalog" style="padding-left: 10px" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
-	</span>
-
 	{{ boardlist.bottom }}
 
 	{{ config.ad.bottom }}
-- 
cgit v1.3


From 33ef1d2123749db43bba372cbc0aa7ab3df4839a Mon Sep 17 00:00:00 2001
From: Bui <bui@bui.pm>
Date: Sat, 26 Sep 2015 00:17:05 +0900
Subject: add active page classes to body; czaks: go to bottom @ thread: fixes

---
 templates/index.html                  | 2 +-
 templates/page.html                   | 2 +-
 templates/themes/catalog/catalog.html | 2 +-
 templates/thread.html                 | 8 ++------
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 1eea6e6b..d1871fc8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -16,7 +16,7 @@
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.title|e }}</title>
 </head>
-<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">	
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} active-{% if not no_post_form %}index{% else %}ukko{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ 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/page.html b/templates/page.html
index 296b517e..027ed3b9 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -8,7 +8,7 @@
 	{% include 'header.html' %}
 	<title>{{ title }}</title>
 </head>
-<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} active-page" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ 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/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 226c00d3..0626b376 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -10,7 +10,7 @@
 	{% include 'header.html' %}
 	<title>{{ board }} - Catalog</title>
 </head>
-<body class="theme-catalog">
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} theme-catalog active-catalog" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	{{ boardlist.top }}
 	<header>
 		<h1>{{ settings.title }} (<a href="{{link}}">/{{ board }}/</a>)</h1>
diff --git a/templates/thread.html b/templates/thread.html
index 1cbb6d20..2d4ae262 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -23,7 +23,7 @@
 
 	<title>{{ board.url }} - {{ meta_subject }}</title>
 </head>
-<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
+<body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} active-thread" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	<a name="top"></a> 
 	{{ boardlist.top }}
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
@@ -44,8 +44,7 @@
 
 	{% include 'attention_bar.html' %}
 
-	<div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a> <a class="unimportant" href="javascript:window.scrollTo(0,document.body.scrollHeight);
-">[{% trans %}Go to bottom {% endtrans %}]</a></div>
+	<div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a> <a class="unimportant" href="#bottom">[{% trans %}Go to bottom {% endtrans %}]</a></div>
 
 	{{ config.ad.top }}
 
@@ -53,9 +52,6 @@
 
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
-	<a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-	<a href="#bottom" style="padding-left: 10px">[{% trans %}Go to bottom{% endtrans %}]</a>
-	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
 		<input type="hidden" name="board" value="{{ board.uri }}" />
 		{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
-- 
cgit v1.3


From 33ef3f9b013f9848a39df6aaa2ed092a3478fd11 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 14:14:22 +0200
Subject: synchronize catalog_link

---
 inc/config.php        | 4 ++--
 templates/thread.html | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 21f7b5cc..a3087162 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -931,8 +931,8 @@
 	// Show page navigation links at the top as well.
 	$config['page_nav_top'] = false;
 
-	// Show "Catalog" link in page navigation. Use with the Catalog theme.
-	// $config['catalog_link'] = 'catalog.html';
+	// Show "Catalog" link in page navigation. Use with the Catalog theme. Set to false to disable.
+	$config['catalog_link'] = 'catalog.html';
 
 	// Board categories. Only used in the "Categories" theme.
 	// $config['categories'] = array(
diff --git a/templates/thread.html b/templates/thread.html
index 2d4ae262..3ddb5b1f 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -62,7 +62,9 @@
 			<span id="thread-links">
 				<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
 				<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
-				<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+                		{% if config.catalog_link %}
+					<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+		                {% endif %}
 			</span>
 			
 			<span id="thread-quick-reply">
-- 
cgit v1.3


From d069a4c9fd9efb995fffa1d705dd201c09b7d13e Mon Sep 17 00:00:00 2001
From: Forkless <REDACTED@gmail.com>
Date: Mon, 3 Nov 2014 02:28:04 -0600
Subject: Added option for hiding IDs.

---
 js/forced-anon.js             | 72 ++++++++++++++++++++++++++++---------------
 stylesheets/style.css         |  8 +++++
 templates/post/poster_id.html |  4 +--
 3 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/js/forced-anon.js b/js/forced-anon.js
index 11327ec9..26d0cb4f 100644
--- a/js/forced-anon.js
+++ b/js/forced-anon.js
@@ -18,10 +18,10 @@
 if (active_page == 'ukko' || active_page == 'thread' || active_page == 'index' || (window.Options && Options.get_tab('general')))
 $(document).ready(function() {
 	var force_anon = function() {
-		if($(this).children('a.capcode').length == 0) {
+		if ($(this).children('a.capcode').length == 0) {
 			var id = $(this).parent().children('a.post_no:eq(1)').text();
 			
-			if($(this).children('a.email').length != 0)
+			if ($(this).children('a.email').length != 0)
 				var p = $(this).children('a.email');
 			else
 				var p = $(this);
@@ -29,7 +29,7 @@ $(document).ready(function() {
 			old_info[id] = {'name': p.children('span.name').text(), 'trip': p.children('span.trip').text()};
 			
 			p.children('span.name').text('Anonymous');
-			if(p.children('span.trip').length != 0)
+			if (p.children('span.trip').length != 0)
 				p.children('span.trip').text('');
 		}
 	};
@@ -40,44 +40,60 @@ $(document).ready(function() {
 	
 	var disable_fa = function() {
 		$('p.intro label').each(function() {
-			if($(this).children('a.capcode').length == 0) {
+			if ($(this).children('a.capcode').length == 0) {
 				var id = $(this).parent().children('a.post_no:eq(1)').text();
 				
 				if(old_info[id]) {
-					if($(this).children('a.email').length != 0)
+					if ($(this).children('a.email').length != 0)
 						var p = $(this).children('a.email');
 					else
 						var p = $(this);
 					
 					p.children('span.name').text(old_info[id]['name']);
-					if(p.children('span.trip').length != 0)
+					if (p.children('span.trip').length != 0)
 						p.children('span.trip').text(old_info[id]['trip']);
 				}
 			}
 		});
 	};
 	
+	var toggle_id = function() {
+		if (localStorage.hideids == 'true'){
+			$(this).addClass('hidden');
+		} else {
+			$(this).removeClass('hidden');
+		}
+	};
+	
 	old_info = {};
 	forced_anon = localStorage['forcedanon'] ? true : false;
 
-	var selector, event;
-        if (window.Options && Options.get_tab('general')) {
-                selector = '#forced-anon';
-                event = 'change';
-                Options.extend_tab("general", "<label id='forced-anon'><input type='checkbox' />"+_('Forced anonymity')+"</label>");
-        }
-        else {
-                selector = '#forced-anon';
-                event = 'click';
+	if (window.Options && Options.get_tab('general')) {
+		var s1 = '#hide-ids', s2 = '#forced-anon', e = 'change';
+		Options.extend_tab("general", "<label id='hide-ids'><input type='checkbox' /> "+_('Hide IDs')+"</label>");
+		Options.extend_tab("general", "<label id='forced-anon'><input type='checkbox' /> "+_('Forced anonymity')+"</label>");
+	}
+	else {
+		var s1 = '#hide-ids', s2 = '#forced-anon', e = 'click';
+		$('hr:first').before('<div id="hide-ids" style="text-align:right"><a class="unimportant" href="javascript:void(0)">Hide IDs</a></div>');
 		$('hr:first').before('<div id="forced-anon" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
 		$('div#forced-anon a').text(_('Forced anonymity')+' (' + (forced_anon ? _('enabled') : _('disabled')) + ')');
-        }
+	}
 	
+	$(s1).on(e, function(e) {
+		if (!localStorage.hideids || localStorage.hideids == 'false') {
+			localStorage.hideids = 'true';
+			if (window.Options && Options.get_tab('general')) e.target.checked = true;
+		} else {
+			localStorage.hideids = 'false';
+			if (window.Options && Options.get_tab('general')) e.target.checked = false;
+		}
+		$('.poster_id').each(toggle_id);
+	});
 	
-	$(selector).on(event, function() {
+	$(s2).on(e, function() {
 		forced_anon = !forced_anon;
-		
-		if(forced_anon) {
+		if (forced_anon) {
 			$('div#forced-anon a').text(_('Forced anonymity')+' ('+_('enabled')+')');
 			localStorage.forcedanon = true;
 			enable_fa();
@@ -86,21 +102,27 @@ $(document).ready(function() {
 			delete localStorage.forcedanon;
 			disable_fa();
 		}
-		
 		return false;
 	});
 	
+	// initial option setup on script load
+	if (localStorage.hideids == 'true'){
+		if (window.Options && Options.get_tab('general')) $('#hide-ids>input').prop('checked',true);
+		$('.poster_id').each(toggle_id);
+	}
+	
 	if(forced_anon) {
 		enable_fa();
-
-                if (window.Options && Options.get_tab('general')) {
-                        $('#toggle-locked-threads>input').prop('checked', true);
-                }
+		if (window.Options && Options.get_tab('general')) {
+			$('#toggle-locked-threads>input').prop('checked', true);
+		}
 	}
 	
 	$(document).on('new_post', function(e, post) {
-		if(forced_anon)
+		if (forced_anon)
 			$(post).find('p.intro label').each(force_anon);
+		if (localStorage.hideids == 'true') 
+			$(post).find('.poster_id').each(toggle_id);
 	});
 });
 
diff --git a/stylesheets/style.css b/stylesheets/style.css
index bb7c2634..e54faf93 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -8,6 +8,10 @@ body {
   padding-right: 4px;
 }
 
+.hidden {
+  display:none;
+}
+
 a,a:visited {
   text-decoration: underline;
   color: #34345C;
@@ -905,6 +909,10 @@ pre {
   cursor: pointer;
 }
 
+.poster_id::before {
+  content: " ID: ";
+}
+
 pre {
 /* Better code tags */
   max-width:inherit;
diff --git a/templates/post/poster_id.html b/templates/post/poster_id.html
index 4efc56ff..51f0624f 100644
--- a/templates/post/poster_id.html
+++ b/templates/post/poster_id.html
@@ -1,7 +1,7 @@
 {% if config.poster_ids %}
 	{% if post.thread %}
-		 ID: <span class="poster_id">{{ post.ip|poster_id(post.thread) }}</span>
+		 <span class="poster_id">{{ post.ip|poster_id(post.thread) }}</span>
 	{% else %}
-		 ID: <span class="poster_id">{{ post.ip|poster_id(post.id) }}</span>
+		 <span class="poster_id">{{ post.ip|poster_id(post.id) }}</span>
 	{% endif %}
 {% endif %}
-- 
cgit v1.3


From 126ee42b9dffe262457177c5dbb7ffa2db170763 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 14:34:42 +0200
Subject: better rules for stripping combined chars, based on 45c0d327619 by
 @ctrlcctrlv

---
 inc/functions.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 85b61b2e..d28d018d 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2152,16 +2152,7 @@ function strip_combining_chars($str) {
 		$o = 0;
 		$ord = ordutf8($char, $o);
 
-		if ($ord >= 768 && $ord <= 879)
-			continue;
-
-		if ($ord >= 7616 && $ord <= 7679)
-			continue;
-
-		if ($ord >= 8400 && $ord <= 8447)
-			continue;
-
-		if ($ord >= 65056 && $ord <= 65071)
+		if ( ($ord >= 768 && $ord <= 879) || ($ord >= 1536 && $ord <= 1791) || ($ord >= 3655 && $ord <= 3659) || ($ord >= 7616 && $ord <= 7679) || ($ord >= 8400 && $ord <= 8447) || ($ord >= 65056 && $ord <= 65071))
 			continue;
 
 		$str .= $char;
-- 
cgit v1.3


From aa98ca337e327fb1d8e77e124bf49922190246c4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 14:36:14 +0200
Subject: i think this lump of code deserves a version bump; v5.1.0 here

---
 install.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 3aa8f56f..c5bbdf36 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', '5.0.1');
+define('VERSION', '5.1.0');
 
 require 'inc/functions.php';
 
@@ -558,6 +558,7 @@ if (file_exists($config['has_installed'])) {
                         query('ALTER TABLE ``mods`` CHANGE `salt` `salt` VARCHAR(64) NOT NULL;') or error(db_error());
 		case '5.0.0':
 			query('ALTER TABLE ``mods`` CHANGE `salt` `version` VARCHAR(64) NOT NULL;') or error(db_error());
+		case '5.0.1':
 		case false:
 			// TODO: enhance Tinyboard -> vichan upgrade path.
 			query("CREATE TABLE IF NOT EXISTS ``search_queries`` (  `ip` varchar(39) NOT NULL,  `time` int(11) NOT NULL,  `query` text NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8;") or error(db_error());
-- 
cgit v1.3


From 3515fdabe713fc9143a833d0f6a889ce150142aa Mon Sep 17 00:00:00 2001
From: sourcerect <hypershadsy@gmail.com>
Date: Thu, 4 Jun 2015 04:19:04 -0400
Subject: Fix tab freeze when inlining

Fixes ctrlcctrlv/infinity#451
---
 js/inline.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/inline.js b/js/inline.js
index 686a540a..e581b79d 100644
--- a/js/inline.js
+++ b/js/inline.js
@@ -139,7 +139,7 @@ $(document).ready(function() {
 
   if (App.options.get('useInlining')) {
     var assign_inline = function() {
-        $('.body a[href*="'+location.pathname+'"]:not([rel]):not(.toolong a), .mentioned a')
+        $('.body a[href*="'+location.pathname+'"]').not('[rel]').not('.toolong > a').add('.mentioned a')
           .attr('onclick', null)// XXX disable highlightReply
           .off('click')
           .click(inline)
-- 
cgit v1.3


From 65ea7b78c50ab3da60a541237f73b13cd2e7e6d8 Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Sun, 10 May 2015 12:51:35 +0800
Subject: Catalog: click to scroll thread

---
 js/catalog.js         | 10 ++++++++++
 stylesheets/style.css |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/js/catalog.js b/js/catalog.js
index 065fba7b..9adaeaef 100644
--- a/js/catalog.js
+++ b/js/catalog.js
@@ -35,4 +35,14 @@ if (active_page == 'catalog') $(function(){
 	if (catalog.image_size !== undefined) {
 		$('#image_size').val(catalog.image_size).trigger('change');
 	}
+
+	$('div.thread').on('click', function(e) {
+		if ($(this).css('overflow-y') === 'hidden') {
+			$(this).css('overflow-y', 'auto');
+			$(this).css('width', '100%');
+		} else {
+			$(this).css('overflow-y', 'hidden');
+			$(this).css('width', 'auto');
+		}
+	});
 });
diff --git a/stylesheets/style.css b/stylesheets/style.css
index e54faf93..b36a9de9 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1033,7 +1033,6 @@ div.boardlist a {
 #watchlist-toggle, .watchThread, .watchlist-remove, #clearList, #clearGhosts {
 	cursor: pointer;
 }
-<<<<<<< HEAD
 
 #youtube-size input {
 	width: 50px;
-- 
cgit v1.3


From 8496b021a959af16682f8e846737020c53848bca Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 14:57:07 +0200
Subject: comment out global reports

---
 js/fix-report-delete-submit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index 2bf7a70b..abed4d06 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -36,7 +36,7 @@ if ($('#delete-fields #password').length) {
 }
 
 Menu.add_item("report_menu", _("Report"));
-Menu.add_item("global_report_menu", _("Global report"));
+//Menu.add_item("global_report_menu", _("Global report"));
 Menu.onclick(function(e, $buf) {
 	var ele = e.target.parentElement.parentElement;
 	var $ele = $(ele);
-- 
cgit v1.3


From 6e33de568d21e87f64bc7b890b9438b061aa15a9 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 15:03:53 +0200
Subject: hide-threads.js: add div.file to fields to hide; thanks fpdl

---
 js/hide-threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 175018ed..47417d39 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -36,7 +36,7 @@ $(document).ready(function(){
 		}
 	}
 
-	var fields_to_hide = 'div.post,div.video-container,video,iframe,img:not(.unanimated),canvas,p.fileinfo,a.hide-thread-link,div.new-posts,br';
+	var fields_to_hide = 'div.file,div.post,div.video-container,video,iframe,img:not(.unanimated),canvas,p.fileinfo,a.hide-thread-link,div.new-posts,br';
 	
 	var do_hide_threads = function() {
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
-- 
cgit v1.3


From 2fa37278db9ad0e802a2b4c6a54c5d179ce6df35 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 15:09:25 +0200
Subject: boardlist goes before #top

---
 templates/thread.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/thread.html b/templates/thread.html
index 3ddb5b1f..88e6ec6d 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -24,8 +24,8 @@
 	<title>{{ board.url }} - {{ meta_subject }}</title>
 </head>
 <body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} active-thread" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
-	<a name="top"></a> 
 	{{ boardlist.top }}
+	<a name="top"></a>
 	{% 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 }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
 	<header>
-- 
cgit v1.3


From b476b660073adbe827836a7e7860b0fb3a061ff0 Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Sun, 23 Aug 2015 09:04:37 +0800
Subject: [BUG] Image reject repost board option now also affects YT embeds

---
 inc/functions.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 post.php          | 28 +++++++++++++++++++++++++++-
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/inc/functions.php b/inc/functions.php
index d28d018d..cbe0bc62 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2438,6 +2438,53 @@ function getPostByHashInThread($hash, $thread) {
 	return false;
 }
 
+function getPostByEmbed($embed) {
+	global $board, $config;
+	$matches = array();
+	foreach ($config['embedding'] as &$e) {
+		if (preg_match($e[0], $embed, $matches) && isset($matches[1]) && !empty($matches[1])) {
+			$embed = '%'.$matches[1].'%';
+			break;
+		}
+	}
+
+	if (!isset($embed)) return false;
+
+	$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `embed` LIKE :embed", $board['uri']));
+	$query->bindValue(':embed', $embed, PDO::PARAM_STR);
+	$query->execute() or error(db_error($query));
+
+	if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+		return $post;
+	}
+
+	return false;
+}
+
+function getPostByEmbedInThread($embed, $thread) {
+	global $board, $config;
+	$matches = array();
+	foreach ($config['embedding'] as &$e) {
+		if (preg_match($e[0], $embed, $matches) && isset($matches[1]) && !empty($matches[1])) {
+			$embed = '%'.$matches[1].'%';
+			break;
+		}
+	}
+
+	if (!isset($embed)) return false;
+
+	$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `embed` = :embed AND ( `thread` = :thread OR `id` = :thread )", $board['uri']));
+	$query->bindValue(':embed', $embed, PDO::PARAM_STR);
+	$query->bindValue(':thread', $thread, PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
+
+	if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+		return $post;
+	}
+
+	return false;
+}
+
 function undoImage(array $post) {
 	if (!$post['has_file'] || !isset($post['files']))
 		return;
diff --git a/post.php b/post.php
index 3b4f3311..06a9dc74 100644
--- a/post.php
+++ b/post.php
@@ -294,6 +294,32 @@ if (isset($_POST['delete'])) {
 		if (!isset($post['embed'])) {
 			error($config['error']['invalid_embed']);
 		}
+
+		if ($config['image_reject_repost']) {
+			if ($p = getPostByEmbed($post['embed'])) {
+				error(sprintf($config['error']['fileexists'], 
+					($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
+					($board['dir'] . $config['dir']['res'] .
+						($p['thread'] ?
+							$p['thread'] . '.html#' . $p['id']
+						:
+							$p['id'] . '.html'
+						))
+				));
+			}
+		} else if (!$post['op'] && $config['image_reject_repost_in_thread']) {
+			if ($p = getPostByEmbedInThread($post['embed'], $post['thread'])) {
+				error(sprintf($config['error']['fileexistsinthread'], 
+					($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
+					($board['dir'] . $config['dir']['res'] .
+						($p['thread'] ?
+							$p['thread'] . '.html#' . $p['id']
+						:
+							$p['id'] . '.html'
+						))
+				));
+			}
+		}
 	}
 	
 	if (!hasPermission($config['mod']['bypass_field_disable'], $board['uri'])) {
@@ -798,7 +824,7 @@ if (isset($_POST['delete'])) {
 				));
 			}
 		}
-		}
+	}
 	
 	if (!hasPermission($config['mod']['postunoriginal'], $board['uri']) && $config['robot_enable'] && checkRobot($post['body_nomarkup'])) {
 		undoImage($post);
-- 
cgit v1.3


From 7831da83fc09ff90a0f99641bde5e2d8c08e84c5 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Mon, 16 Feb 2015 16:21:30 -0800
Subject: New event: rebuildpost, allows you to bind events to ?/edit

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

diff --git a/inc/functions.php b/inc/functions.php
index cbe0bc62..4746b034 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1166,19 +1166,22 @@ function deleteFile($id, $remove_entirely_if_already=true, $file=null) {
 
 // rebuild post (markup)
 function rebuildPost($id) {
-	global $board;
+	global $board, $mod;
 
-	$query = prepare(sprintf("SELECT `body_nomarkup`, `thread` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
+	$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 
 	if ((!$post = $query->fetch(PDO::FETCH_ASSOC)) || !$post['body_nomarkup'])
 		return false;
 
-	markup($body = &$post['body_nomarkup']);
+	markup($post['body'] = &$post['body_nomarkup']);
+	$post = (object)$post;
+	event('rebuildpost', $post);
+	$post = (array)$post;
 
 	$query = prepare(sprintf("UPDATE ``posts_%s`` SET `body` = :body WHERE `id` = :id", $board['uri']));
-	$query->bindValue(':body', $body);
+	$query->bindValue(':body', $post['body']);
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 
-- 
cgit v1.3


From ce3ce4f1b65198083c232897c169313640f23038 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Mon, 16 Feb 2015 16:24:54 -0800
Subject: Fix *0 secure tripcodes caused by accidentally feeding + signs to
 crypt()

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

diff --git a/inc/functions.php b/inc/functions.php
index 4746b034..6a34e7a8 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2374,7 +2374,7 @@ function generate_tripcode($name) {
 		if (isset($config['custom_tripcode']["##{$trip}"]))
 			$trip = $config['custom_tripcode']["##{$trip}"];
 		else
-			$trip = '!!' . substr(crypt($trip, '_..A.' . substr(base64_encode(sha1($trip . $config['secure_trip_salt'], true)), 0, 4)), -10);
+			$trip = '!!' . substr(crypt($trip, str_replace('+', '.', '_..A.' . substr(base64_encode(sha1($trip . $config['secure_trip_salt'], true)), 0, 4))), -10);
 	} else {
 		if (isset($config['custom_tripcode']["#{$trip}"]))
 			$trip = $config['custom_tripcode']["#{$trip}"];
-- 
cgit v1.3


From 6dd1420f91410531bb2dac506f821d959bf74d0a Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Wed, 18 Feb 2015 16:55:03 -0800
Subject: Add event to quote backlinks

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

diff --git a/inc/functions.php b/inc/functions.php
index 6a34e7a8..8f650828 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1952,7 +1952,7 @@ function markup(&$body, $track_cites = false, $op = false) {
 			}
 
 			if (isset($cited_posts[$cite])) {
-				$replacement = '<a onclick="highlightReply(\''.$cite.'\');" href="' .
+				$replacement = '<a onclick="highlightReply(\''.$cite.'\', event);" href="' .
 					$config['root'] . $board['dir'] . $config['dir']['res'] .
 					link_for(array('id' => $cite, 'thread' => $cited_posts[$cite])) . '#' . $cite . '">' .
 					'&gt;&gt;' . $cite .
@@ -2051,7 +2051,7 @@ function markup(&$body, $track_cites = false, $op = false) {
 					
 					$replacement = '<a ' .
 						($_board == $board['uri'] ?
-							'onclick="highlightReply(\''.$cite.'\');" '
+							'onclick="highlightReply(\''.$cite.'\', event);" '
 						: '') . 'href="' . $link . '">' .
 						'&gt;&gt;&gt;/' . $_board . '/' . $cite .
 						'</a>';
-- 
cgit v1.3


From 7911c374e86ef8fa69c4545867b9d9d3de12d5c6 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Wed, 25 Feb 2015 17:21:49 -0800
Subject: Public action logs commit (log.php)

Note: In a previous commit, I began making inc/mod/auth.php more modular with the check_login() function. Including it does NOT check mod login by default anymore like it does on vichan. You have to call check_login(). I've finally included it in inc/functions.php. If you have any custom pages that use inc/mod/auth.php, just including functions.php is enough now.

===================================
Also: backports 351375185e5 (early 404)
---
 inc/config.php         | 22 +++++++++++++++++-----
 inc/functions.php      | 22 ++++++++++++++++++++--
 inc/mod/auth.php       |  2 +-
 inc/mod/pages.php      | 36 ++++++++++++++++++++++++++++++++++++
 install.sql            |  1 +
 log.php                | 24 ++++++++++++++++++++++++
 mod.php                |  6 +++---
 post.php               |  5 +++--
 templates/mod/log.html | 16 ++++++++++++++--
 tools/inc/cli.php      |  1 -
 10 files changed, 119 insertions(+), 16 deletions(-)
 create mode 100644 log.php

diff --git a/inc/config.php b/inc/config.php
index a3087162..b6bc3b69 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -511,6 +511,13 @@
 	// The timeout for the above, in seconds.
 	$config['upload_by_url_timeout'] = 15;
 
+	// Enable early 404? With default settings, a thread would 404 if it was to leave page 3, if it had less
+	// than 3 replies.
+	$config['early_404'] = false;
+
+	$config['early_404_page'] = 3;
+	$config['early_404_replies'] = 5;
+
 	// A wordfilter (sometimes referred to as just a "filter" or "censor") automatically scans users’ posts
 	// as they are submitted and changes or censors particular words or phrases.
 
@@ -1537,25 +1544,30 @@
 
 /*
  * ====================
- *  Public post search
+ *  Public pages
  * ====================
  */
+
+	// Public post search settings
 	$config['search'] = array();
 
 	// Enable the search form
 	$config['search']['enable'] = false;
 
 	// Maximal number of queries per IP address per minutes
-    $config['search']['queries_per_minutes'] = Array(15, 2);
+	$config['search']['queries_per_minutes'] = Array(15, 2);
 
 	// Global maximal number of queries per minutes
-    $config['search']['queries_per_minutes_all'] = Array(50, 2);
+	$config['search']['queries_per_minutes_all'] = Array(50, 2);
 
 	// Limit of search results
-    $config['search']['search_limit'] = 100;
+	$config['search']['search_limit'] = 100;
 		
 	// Boards for searching
-    //$config['search']['boards'] = array('a', 'b', 'c', 'd', 'e');
+	//$config['search']['boards'] = array('a', 'b', 'c', 'd', 'e');
+
+	// Enable public logs? 0: NO, 1: YES, 2: YES, but drop names
+	$config['public_logs'] = 0;
 
 /*
  * ====================
diff --git a/inc/functions.php b/inc/functions.php
index 8f650828..378e40b3 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -18,6 +18,7 @@ require_once 'inc/template.php';
 require_once 'inc/database.php';
 require_once 'inc/events.php';
 require_once 'inc/api.php';
+require_once 'inc/mod/auth.php';
 require_once 'inc/polyfill.php';
 
 if (!extension_loaded('gettext')) {
@@ -524,7 +525,8 @@ function setupBoard($array) {
 	$board = array(
 		'uri' => $array['uri'],
 		'title' => $array['title'],
-		'subtitle' => $array['subtitle']
+		'subtitle' => $array['subtitle'],
+		#'indexed' => $array['indexed'],
 	);
 
 	// older versions
@@ -1270,7 +1272,7 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 	return true;
 }
 
-function clean() {
+function clean($pid = false) {
 	global $board, $config;
 	$offset = round($config['max_pages']*$config['threads_per_page']);
 
@@ -1281,6 +1283,22 @@ function clean() {
 	$query->execute() or error(db_error($query));
 	while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 		deletePost($post['id'], false, false);
+		if ($pid) modLog("Automatically deleting thread #{$post['id']} due to new thread #{$pid}");
+	}
+
+	// Bump off threads with X replies earlier, spam prevention method
+	if ($config['early_404']) {
+		$offset = round($config['early_404_page']*$config['threads_per_page']);
+		$query = prepare(sprintf("SELECT `id` AS `thread_id`, (SELECT COUNT(`id`) FROM ``posts_%s`` WHERE `thread` = `thread_id`) AS `reply_count` FROM ``posts_%s`` WHERE `thread` IS NULL ORDER BY `sticky` DESC, `bump` DESC LIMIT :offset, 9001", $board['uri'], $board['uri']));
+		$query->bindValue(':offset', $offset, PDO::PARAM_INT);
+		$query->execute() or error(db_error($query));
+		
+		while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+			if ($post['reply_count'] < $config['early_404_replies']) {
+				deletePost($post['thread_id'], false, false);
+				if ($pid) modLog("Automatically deleting thread #{$post['thread_id']} due to new thread #{$pid} (early 404 is set, #{$post['thread_id']} had {$post['reply_count']} replies)");
+			}
+		}
 	}
 }
 
diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index 009e93ad..42f34196 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -130,7 +130,7 @@ function destroyCookies() {
 function modLog($action, $_board=null) {
 	global $mod, $board, $config;
 	$query = prepare("INSERT INTO ``modlogs`` VALUES (:id, :ip, :board, :time, :text)");
-	$query->bindValue(':id', $mod['id'], PDO::PARAM_INT);
+	$query->bindValue(':id', (isset($mod['id']) ? $mod['id'] : -1), PDO::PARAM_INT);
 	$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 	$query->bindValue(':time', time(), PDO::PARAM_INT);
 	$query->bindValue(':text', $action);
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index a90fbbd6..ca12eaf1 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -698,6 +698,42 @@ function mod_user_log($username, $page_no = 1) {
 	mod_page(_('Moderation log'), 'mod/log.html', array('logs' => $logs, 'count' => $count, 'username' => $username));
 }
 
+function mod_board_log($board, $page_no = 1, $hide_names = false, $public = false) {
+	global $config;
+	
+	if ($page_no < 1)
+		error($config['error']['404']);
+	
+	if (!hasPermission($config['mod']['mod_board_log'], $board) && !$public)
+		error($config['error']['noaccess']);
+	
+	$query = prepare("SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM ``modlogs`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE `board` = :board ORDER BY `time` DESC LIMIT :offset, :limit");
+	$query->bindValue(':board', $board);
+	$query->bindValue(':limit', $config['mod']['modlog_page'], PDO::PARAM_INT);
+	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['modlog_page'], PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
+	$logs = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	if (empty($logs) && $page_no > 1)
+		error($config['error']['404']);
+
+	if (!hasPermission($config['mod']['show_ip'])) {
+		// Supports ipv4 only!
+		foreach ($logs as $i => &$log) {
+			$log['text'] = preg_replace_callback('/(?:<a href="\?\/IP\/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}">)?(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(?:<\/a>)?/', function($matches) {
+				return "xxxx";//less_ip($matches[1]);
+			}, $log['text']);
+		}
+	}
+	
+	$query = prepare("SELECT COUNT(*) FROM ``modlogs`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE `board` = :board");
+	$query->bindValue(':board', $board);
+	$query->execute() or error(db_error($query));
+	$count = $query->fetchColumn();
+	
+	mod_page(_('Board log'), 'mod/log.html', array('logs' => $logs, 'count' => $count, 'board' => $board, 'hide_names' => $hide_names, 'public' => $public));
+}
+
 function mod_view_board($boardName, $page_no = 1) {
 	global $config, $mod;
 	
diff --git a/install.sql b/install.sql
index 7e661450..024cb349 100644
--- a/install.sql
+++ b/install.sql
@@ -65,6 +65,7 @@ CREATE TABLE IF NOT EXISTS `boards` (
   `uri` varchar(58) CHARACTER SET utf8 NOT NULL,
   `title` tinytext NOT NULL,
   `subtitle` tinytext,
+  -- `indexed` boolean default true,
   PRIMARY KEY (`uri`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
diff --git a/log.php b/log.php
new file mode 100644
index 00000000..1a660c4c
--- /dev/null
+++ b/log.php
@@ -0,0 +1,24 @@
+<?php
+include 'inc/functions.php';
+include 'inc/mod/pages.php';
+
+if (!isset($_GET['board']) || !preg_match("/{$config['board_regex']}/u", $_GET['board'])) {
+	http_response_code(400);
+	error('Bad board.');
+}
+if (!openBoard($_GET['board'])) {
+	http_response_code(404);
+	error('No board.');
+}
+
+if ($config['public_logs'] == 0) error('This board has public logs disabled. Ask the board owner to enable it.');
+if ($config['public_logs'] == 1) $hide_names = false;
+if ($config['public_logs'] == 2) $hide_names = true;
+
+if (!isset($_GET['page'])) {
+	$page = 1;
+} else {
+	$page = (int)$_GET['page'];
+};
+
+mod_board_log($board['uri'], $page, $hide_names, true);
diff --git a/mod.php b/mod.php
index 022f5408..a6ff00cf 100644
--- a/mod.php
+++ b/mod.php
@@ -5,13 +5,13 @@
  */
 
 require_once 'inc/functions.php';
-require_once 'inc/bans.php';
-require_once 'inc/mod/pages.php';
-require_once 'inc/mod/auth.php';
 
 if ($config['debug'])
 	$parse_start_time = microtime(true);
 
+require_once 'inc/bans.php';
+require_once 'inc/mod/pages.php';
+
 check_login(true);
 
 $query = isset($_SERVER['QUERY_STRING']) ? rawurldecode($_SERVER['QUERY_STRING']) : '';
diff --git a/post.php b/post.php
index 06a9dc74..0d3292bb 100644
--- a/post.php
+++ b/post.php
@@ -70,9 +70,11 @@ if (isset($_POST['delete'])) {
 			if (isset($_POST['file'])) {
 				// Delete just the file
 				deleteFile($id);
+				modLog("User deleted file from his own post #$id");
 			} else {
 				// Delete entire post
 				deletePost($id);
+				modLog("User deleted his own post #$id");
 			}
 			
 			_syslog(LOG_INFO, 'Deleted post: ' .
@@ -233,7 +235,6 @@ if (isset($_POST['delete'])) {
 	checkBan($board['uri']);
 
 	if ($post['mod'] = isset($_POST['mod']) && $_POST['mod']) {
-		require 'inc/mod/auth.php';
 		check_login(false);
 		if (!$mod) {
 			// Liar. You're not a mod.
@@ -945,7 +946,7 @@ if (isset($_POST['delete'])) {
 		$build_pages = range(1, $config['max_pages']);
 	
 	if ($post['op'])
-		clean();
+		clean($pid);
 	
 	event('post-after', $post);
 	
diff --git a/templates/mod/log.html b/templates/mod/log.html
index 0aa3f110..a38b4af5 100644
--- a/templates/mod/log.html
+++ b/templates/mod/log.html
@@ -10,7 +10,15 @@
 		<tr>
 			<td class="minimal">
 				{% if log.username %}
-					<a href="?/log:{{ log.username|e }}">{{ log.username|e }}</a>
+					{% if hide_names %}
+						<em>hidden</em>
+					{% else %}
+						{% if not mod|hasPermission(config.mod.modlog) %}
+							<a href="?/new_PM/{{ log.username|e }}">{{ log.username|e }}</a>
+						{% else %}
+							<a href="?/log:{{ log.username|e }}">{{ log.username|e }}</a>
+						{% endif %}
+					{% endif %}
 				{% elseif log.mod == -1 %}
 					<em>system</em>
 				{% else %}
@@ -44,7 +52,11 @@
 {% if count > logs|count %}
 	<p class="unimportant" style="text-align:center;word-wrap:break-word">
 		{% for i in range(0, (count - 1) / config.mod.modlog_page) %}
-			<a href="?/log{% if username %}:{{ username }}{% endif %}/{{ i + 1 }}">[{{ i + 1 }}]</a> 
+			{% if public %}
+				<a href="?page={{ i + 1 }}&amp;board={{ board|url_encode }}">[{{ i + 1 }}]</a> 
+			{% else %}
+				<a href="?/log{% if username %}:{{ username }}{% elseif board %}:b:{{ board }}{% endif %}/{{ i + 1 }}">[{{ i + 1 }}]</a> 
+			{% endif %}
 		{% endfor %}
 	</p>
 {% endif %}
diff --git a/tools/inc/cli.php b/tools/inc/cli.php
index f3e8824f..95d51573 100644
--- a/tools/inc/cli.php
+++ b/tools/inc/cli.php
@@ -39,7 +39,6 @@ if(!getenv('TINYBOARD_PATH')) {
 putenv('TINYBOARD_PATH=' . getcwd());
 
 require 'inc/functions.php';
-require 'inc/mod/auth.php';
 
 $mod = Array(
 	'id' => -1,
-- 
cgit v1.3


From 95b1e103cb9f349d7d82dca071636d5cde855ead Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Sun, 29 Mar 2015 09:18:14 +0800
Subject: Edit static pages commit

---
 .gitmodules                  |   6 ++
 inc/config.php               |   6 ++
 inc/functions.php            |  43 ++++++++++++
 inc/mod/pages.php            | 162 +++++++++++++++++++++++++++++++++++++++++++
 install.sql                  |  20 +++++-
 mod.php                      |  18 +++--
 templates/mod/edit_page.html |  29 ++++++++
 templates/mod/pages.html     |  34 +++++++++
 tools/import_rules.php       |  16 +++++
 9 files changed, 328 insertions(+), 6 deletions(-)
 create mode 100644 templates/mod/edit_page.html
 create mode 100644 templates/mod/pages.html
 create mode 100644 tools/import_rules.php

diff --git a/.gitmodules b/.gitmodules
index 73f90e0a..df07fdf3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "js/wPaint"]
 	path = js/wPaint
 	url = https://github.com/vichan-devel/wPaint.git
+	branch = master
+
+[submodule "inc/lib/parsedown"]
+	path = inc/lib/parsedown
+	url = https://github.com/vichan-devel/parsedown
+	branch = master
diff --git a/inc/config.php b/inc/config.php
index b6bc3b69..3fdb8d2f 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1498,6 +1498,9 @@
 	$config['mod']['ban_appeals'] = MOD;
 	// View the recent posts page
 	$config['mod']['recent'] = MOD;
+	// Create pages
+	$config['mod']['edit_pages'] = MOD;
+	$config['pages_max'] = 10;
 
 	// Config editor permissions
 	$config['mod']['config'] = array();
@@ -1702,3 +1705,6 @@
 
 	// Use CAPTCHA for reports?
 	$config['report_captcha'] = false;
+
+	// Allowed HTML tags in ?/edit_pages.
+	$config['allowed_html'] = 'a[href|title],p,br,li,ol,ul,strong,em,u,h2,b,i,tt,div,img[src|alt|title],hr';
diff --git a/inc/functions.php b/inc/functions.php
index 378e40b3..7970d05a 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -20,6 +20,7 @@ require_once 'inc/events.php';
 require_once 'inc/api.php';
 require_once 'inc/mod/auth.php';
 require_once 'inc/polyfill.php';
+//require_once 'inc/lib/parsedown/Parsedown.php'; // we don't need that right now, do we?
 
 if (!extension_loaded('gettext')) {
 	require_once 'inc/lib/gettext/gettext.inc';
@@ -2739,3 +2740,45 @@ function link_for($post, $page50 = false, $foreignlink = false, $thread = false)
 
 	return sprintf($tpl, $id, $slug);
 }
+
+function prettify_textarea($s){
+	return str_replace("\t", '&#09;', str_replace("\n", '&#13;&#10;', htmlentities($s)));
+}
+
+class HTMLPurifier_URIFilter_NoExternalImages extends HTMLPurifier_URIFilter {
+	public $name = 'NoExternalImages';
+	public function filter(&$uri, $c, $context) {
+		global $config;
+		$ct = $context->get('CurrentToken');
+
+		if (!$ct || $ct->name !== 'img') return true;
+
+		if (!isset($uri->host) && !isset($uri->scheme)) return true;
+
+		if (!in_array($uri->scheme . '://' . $uri->host . '/', $config['allowed_offsite_urls'])) {
+			error('No off-site links in board announcement images.');
+		}
+
+		return true;
+	}
+}
+
+function purify_html($s) {
+	global $config;
+
+	$c = HTMLPurifier_Config::createDefault();
+	$c->set('HTML.Allowed', $config['allowed_html']);
+	$uri = $c->getDefinition('URI');
+	$uri->addFilter(new HTMLPurifier_URIFilter_NoExternalImages(), $c);
+	$purifier = new HTMLPurifier($c);
+	$clean_html = $purifier->purify($s);
+	return $clean_html;
+}
+
+function markdown($s) {
+	$pd = new Parsedown();
+	$pd->setMarkupEscaped(true);
+	$pd->setimagesEnabled(false);
+
+	return $pd->text($s);
+}
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index ca12eaf1..328380d8 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -2628,6 +2628,167 @@ function mod_theme_rebuild($theme_name) {
 	));
 }
 
+// This needs to be done for `secure` CSRF prevention compatibility, otherwise the $board will be read in as the token if editing global pages.
+function delete_page_base($page = '', $board = false) {
+	global $config, $mod;
+
+	if (empty($board))
+		$board = false;
+
+	if (!$board && $mod['boards'][0] !== '*')
+		error($config['error']['noaccess']);
+
+	if (!hasPermission($config['mod']['edit_pages'], $board))
+		error($config['error']['noaccess']);
+
+	if ($board !== FALSE && !openBoard($board))
+		error($config['error']['noboard']);
+
+	if ($board) {
+		$query = prepare('DELETE FROM ``pages`` WHERE `board` = :board AND `name` = :name');
+		$query->bindValue(':board', ($board ? $board : NULL));
+	} else {
+		$query = prepare('DELETE FROM ``pages`` WHERE `board` IS NULL AND `name` = :name');
+	}
+	$query->bindValue(':name', $page);
+	$query->execute() or error(db_error($query));
+
+	header('Location: ?/edit_pages' . ($board ? ('/' . $board) : ''), true, $config['redirect_http']);
+}
+
+function mod_delete_page($page = '') {
+	delete_page_base($page);
+}
+
+function mod_delete_page_board($page = '', $board = false) {
+	delete_page_base($page, $board);
+}
+
+function mod_edit_page($id) {
+	global $config, $mod, $board;
+
+	$query = prepare('SELECT * FROM ``pages`` WHERE `id` = :id');
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	$page = $query->fetch();
+	
+	if (!$page)
+		error(_('Could not find the page you are trying to edit.'));
+
+	if (!$page['board'] && $mod['boards'][0] !== '*')
+		error($config['error']['noaccess']);
+
+	if (!hasPermission($config['mod']['edit_pages'], $page['board']))
+		error($config['error']['noaccess']);
+
+	if ($page['board'] && !openBoard($page['board']))
+		error($config['error']['noboard']);
+
+	if (isset($_POST['method'], $_POST['content'])) {
+		$content = $_POST['content'];
+		$method = $_POST['method'];
+		$page['type'] = $method;
+			
+		if (!in_array($method, array('markdown', 'html', 'infinity')))
+			error(_('Unrecognized page markup method.'));
+	
+		switch ($method) {
+			case 'markdown': 
+				$write = markdown($content);
+				break;
+			case 'html':
+				if (hasPermission($config['mod']['rawhtml'])) {
+					$write = $content;
+				} else {
+					$write = purify_html($content);
+				}
+				break;
+			case 'infinity':
+				$c = $content;
+				markup($content);
+				$write = $content;
+				$content = $c;
+		}
+
+		if (!isset($write) or !$write)
+			error(_('Failed to mark up your input for some reason...'));
+
+		$query = prepare('UPDATE ``pages`` SET `type` = :method, `content` = :content WHERE `id` = :id');
+		$query->bindValue(':method', $method);
+		$query->bindValue(':content', $content);
+		$query->bindValue(':id', $id);
+		$query->execute() or error(db_error($query));
+
+		$fn = ($board['uri'] ? ($board['uri'] . '/') : '') . $page['name'] . '.html';
+		$body = "<div class='ban'>$write</div>";
+		$html = Element('page.html', array('config' => $config, 'body' => $body, 'title' => utf8tohtml($page['title'])));
+		file_write($fn, $html);
+	}
+
+	if (!isset($content)) {
+		$query = prepare('SELECT `content` FROM ``pages`` WHERE `id` = :id');
+		$query->bindValue(':id', $id);
+		$query->execute() or error(db_error($query));
+		$content = $query->fetchColumn();
+	}
+	
+	mod_page(sprintf(_('Editing static page: %s'), $page['name']), 'mod/edit_page.html', array('page' => $page, 'token' => make_secure_link_token("edit_page/$id"), 'content' => prettify_textarea($content), 'board' => $board));
+}
+
+function mod_pages($board = false) {
+	global $config, $mod, $pdo;
+
+	if (empty($board))
+		$board = false;
+
+	if (!$board && $mod['boards'][0] !== '*')
+		error($config['error']['noaccess']);
+
+	if (!hasPermission($config['mod']['edit_pages'], $board))
+		error($config['error']['noaccess']);
+
+	if ($board !== FALSE && !openBoard($board))
+		error($config['error']['noboard']);
+
+	if ($board) {
+		$query = prepare('SELECT * FROM ``pages`` WHERE `board` = :board');
+		$query->bindValue(':board', $board);
+	} else {
+		$query = query('SELECT * FROM ``pages`` WHERE `board` IS NULL');
+	}
+	$query->execute() or error(db_error($query));
+	$pages = $query->fetchAll(PDO::FETCH_ASSOC);
+
+	if (isset($_POST['page'])) {
+		if ($board and sizeof($pages) > $config['pages_max'])
+			error(sprintf(_('Sorry, this site only allows %d pages per board.'), $config['pages_max']));
+
+		if (!preg_match('/^[a-z0-9]{1,255}$/', $_POST['page']))
+			error(_('Page names must be < 255 chars and may only contain lowercase letters A-Z and digits 1-9.'));
+
+		foreach ($pages as $i => $p) {
+			if ($_POST['page'] === $p['name'])
+				error(_('Refusing to create a new page with the same name as an existing one.'));
+		}
+
+		$title = ($_POST['title'] ? $_POST['title'] : NULL);
+
+		$query = prepare('INSERT INTO ``pages``(board, title, name) VALUES(:board, :title, :name)');
+		$query->bindValue(':board', ($board ? $board : NULL));
+		$query->bindValue(':title', $title);
+		$query->bindValue(':name', $_POST['page']);
+		$query->execute() or error(db_error($query));
+
+		$pages[] = array('id' => $pdo->lastInsertId(), 'name' => $_POST['page'], 'board' => $board, 'title' => $title);
+	}
+
+	foreach ($pages as $i => &$p) {
+		$p['delete_token'] = make_secure_link_token('edit_pages/delete/' . $p['name'] . ($board ? ('/' . $board) : ''));
+	}
+
+	mod_page(_('Pages'), 'mod/pages.html', array('pages' => $pages, 'token' => make_secure_link_token('edit_pages' . ($board ? ('/' . $board) : '')), 'board' => $board));
+}
+
 function mod_debug_antispam() {
 	global $pdo, $config;
 	
@@ -2744,3 +2905,4 @@ function mod_debug_apc() {
 	
 	mod_page(_('Debug: APC'), 'mod/debug/apc.html', array('cached_vars' => $cached_vars));
 }
+
diff --git a/install.sql b/install.sql
index 024cb349..720e4ed5 100644
--- a/install.sql
+++ b/install.sql
@@ -245,7 +245,7 @@ CREATE TABLE IF NOT EXISTS `search_queries` (
   `ip` varchar(39) NOT NULL,
   `time` int(11) NOT NULL,
   `query` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 -- --------------------------------------------------------
 
@@ -297,6 +297,24 @@ CREATE TABLE IF NOT EXISTS `ban_appeals` (
   KEY `ban_id` (`ban_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1 ;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `pages`
+--
+
+CREATE TABLE `pages` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `board` varchar(255) DEFAULT NULL,
+  `name` varchar(255) NOT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `type` varchar(255) DEFAULT NULL,
+  `content` text,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `u_pages` (`name`,`board`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+>>>>>>> 12fa8ec... Edit static pages commit
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/mod.php b/mod.php
index a6ff00cf..fbe679ac 100644
--- a/mod.php
+++ b/mod.php
@@ -33,11 +33,19 @@ $pages = array(
 	
 	'/log'					=> 'log',			// modlog
 	'/log/(\d+)'				=> 'log',			// modlog
-	'/log:([^/]+)'				=> 'user_log',			// modlog
-	'/log:([^/]+)/(\d+)'			=> 'user_log',			// modlog
-	'/news'					=> 'secure_POST news',		// view news
-	'/news/(\d+)'				=> 'secure_POST news',		// view news
-	'/news/delete/(\d+)'			=> 'secure news_delete',	// delete from news
+	'/log:([^/:]+)'				=> 'user_log',			// modlog
+	'/log:([^/:]+)/(\d+)'			=> 'user_log',			// modlog
+	'/log:b:([^/]+)'			=> 'board_log',			// modlog
+	'/log:b:([^/]+)/(\d+)'			=> 'board_log',			// modlog
+
+	'/edit_news'				=> 'secure_POST news',		// view news
+	'/edit_news/(\d+)'			=> 'secure_POST news',		// view news
+	'/edit_news/delete/(\d+)'		=> 'secure news_delete',	// delete from news
+
+	'/edit_pages(?:/?(\%b)?)'		=> 'secure_POST pages',
+	'/edit_page/(\d+)'			=> 'secure_POST edit_page',
+	'/edit_pages/delete/([a-z0-9]+)'	=> 'secure delete_page',
+	'/edit_pages/delete/([a-z0-9]+)/(\%b)'	=> 'secure delete_page_board',
 	
 	'/noticeboard'				=> 'secure_POST noticeboard',	// view noticeboard
 	'/noticeboard/(\d+)'			=> 'secure_POST noticeboard',	// view noticeboard
diff --git a/templates/mod/edit_page.html b/templates/mod/edit_page.html
new file mode 100644
index 00000000..3d132767
--- /dev/null
+++ b/templates/mod/edit_page.html
@@ -0,0 +1,29 @@
+<div style="text-align:center">
+<form method="POST">
+	<input name="token" value="{{ token }}" type="hidden">
+	<table>
+		<tr>
+		<th>{% trans %}Markup method{% endtrans %}
+			{% set allowed_html = config.allowed_html %}
+			{% trans %}<p class="unimportant">"markdown" is provided by <a href="http://parsedown.org/">parsedown</a>. Note: images disabled.</p>
+			<p class="unimportant">"html" allows the following tags:<br/>{{ allowed_html }}</p>
+			<p class="unimportant">"infinity" is the same as what is used in posts.</p>
+			<p class="unimportant">This page will not convert between formats,<br/>choose it once or do the conversion yourself!</p>{% endtrans %}
+		</th>
+		<td>
+			<select name="method">
+				{% for markup in ['markdown', 'html', 'infinity'] %}
+				<option value="{{ markup }}" {% if page.type == markup %}selected{% endif %}>{{ markup }}</option>
+				{% endfor %}
+			</select>
+		</td></tr>
+		<tr><th>{% trans %}Page content{% endtrans %}
+		<br/>
+		<span class="unimportant">{% trans %}Page will appear at:{% endtrans %} 
+		{% if board %} <a href="/{{ board.uri }}/{{ page.name }}.html">{{ config.domain }}/{{ board.uri }}/{{ page.name }}.html</a>
+		{% else %} <a href="/{{ page.name }}.html">{{ config.site }}/{{ page.name }}.html</a>
+		{% endif %}</span></th><td><textarea name="content" style="height:500px;width:500px">{{content}}</textarea></td><tr>
+	</table>
+	<input type="submit" value="Save page">
+</form>
+</div>
diff --git a/templates/mod/pages.html b/templates/mod/pages.html
new file mode 100644
index 00000000..c2395c02
--- /dev/null
+++ b/templates/mod/pages.html
@@ -0,0 +1,34 @@
+<script type="text/javascript" src="js/jquery.min.js"></script>
+<div style="text-align:center">
+<p class="unimportant">
+{% if board %}
+{% set page_max = config.pages_max %}
+{% trans %}This page allows you to create static pages for your board. The limit is {{ page_max }} pages per board. You will still have to link to your pages somewhere in your board, for example in a sticky or in the board's announcement. To make links in the board's announcement, use &lt;a&gt; HTML tags.{% endtrans %}
+{% else %}
+{% trans %}This page allows you to create static pages for your imageboard.{% endtrans %}
+{% endif %}
+<h2>{% trans %}Existing pages{% endtrans %}</h2>
+{% if pages %}
+<form>
+<table style="margin:auto">
+<tr><th>{% trans %}URL{% endtrans %}</th><th>{% trans %}Title{% endtrans %}</th><th>{% trans %}Edit{% endtrans %}</th><th>{% trans %}Delete{% endtrans %}</tr>
+{% for page in pages %}
+<tr><td>{{ page.name }}</td><td>{{ page.title }}</td><td><a href="?/edit_page/{{ page.id }}">{% trans %}Edit{% endtrans %}</a></td><td><a href="?/edit_pages/delete/{{ page.name }}{% if board %}/{{ board }}{% endif %}/{{ page.delete_token }}">{% trans %}Delete{% endtrans %}</a></td>
+{% endfor %}
+{% else %}
+<em>No pages yet!</em>
+{% endif %}
+</table>
+</form>
+<hr/>
+<h2>{% trans %}Create a new page{% endtrans %}</h2>
+<form method="POST">
+	<input type="hidden" name="token" value="{{ token }}">
+<table>
+<tr><th>{% trans %}URL{% endtrans %}</th><th>{% trans %}Title{% endtrans %}</th></tr>
+<tr><td><input type="text" name="page"></td><td><input type="text" name="title"></td>
+</table>	
+<input type="submit" value="{% trans %}Create{% endtrans %}">
+</form>
+
+</div>
diff --git a/tools/import_rules.php b/tools/import_rules.php
new file mode 100644
index 00000000..f583f035
--- /dev/null
+++ b/tools/import_rules.php
@@ -0,0 +1,16 @@
+<?php
+// This script imports rules.txt files from the old system into the new ``pages`` table.
+
+require dirname(__FILE__) . '/inc/cli.php';
+
+$boards = listBoards(TRUE);
+
+foreach ($boards as $i => $b) {
+	$rules = @file_get_contents($b.'/rules.txt');
+	if ($rules && !empty(trim($rules))) {
+		$query = prepare('INSERT INTO ``pages``(name, title, type, board, content) VALUES("rules", "Rules", "html", :board, :content)');
+		$query->bindValue(':board', $b);
+		$query->bindValue(':content', $rules);
+		$query->execute() or error(db_error($query));
+	} 
+}
-- 
cgit v1.3


From d726eaf195a18a35c44fe0b08aa0960e4a79e272 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 16:07:21 +0200
Subject: we don't have a htmlpurifier yet ;_;

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

diff --git a/inc/functions.php b/inc/functions.php
index 7970d05a..845c4cb3 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2745,7 +2745,7 @@ function prettify_textarea($s){
 	return str_replace("\t", '&#09;', str_replace("\n", '&#13;&#10;', htmlentities($s)));
 }
 
-class HTMLPurifier_URIFilter_NoExternalImages extends HTMLPurifier_URIFilter {
+/*class HTMLPurifier_URIFilter_NoExternalImages extends HTMLPurifier_URIFilter {
 	public $name = 'NoExternalImages';
 	public function filter(&$uri, $c, $context) {
 		global $config;
@@ -2761,7 +2761,7 @@ class HTMLPurifier_URIFilter_NoExternalImages extends HTMLPurifier_URIFilter {
 
 		return true;
 	}
-}
+}*/
 
 function purify_html($s) {
 	global $config;
-- 
cgit v1.3


From 91c02c3ec41e5c7fa28e70ec4c9b4194ec941620 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 16:21:30 +0200
Subject: board pages: add a migration

---
 install.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/install.php b/install.php
index c5bbdf36..5a6512ba 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', '5.1.0');
+define('VERSION', '5.1.1');
 
 require 'inc/functions.php';
 
@@ -559,6 +559,17 @@ if (file_exists($config['has_installed'])) {
 		case '5.0.0':
 			query('ALTER TABLE ``mods`` CHANGE `salt` `version` VARCHAR(64) NOT NULL;') or error(db_error());
 		case '5.0.1':
+		case '5.1.0':
+			query('CREATE TABLE ``pages`` (
+			  `id` int(11) NOT NULL AUTO_INCREMENT,
+			  `board` varchar(255) DEFAULT NULL,
+			  `name` varchar(255) NOT NULL,
+			  `title` varchar(255) DEFAULT NULL,
+			  `type` varchar(255) DEFAULT NULL,
+			  `content` text,
+			  PRIMARY KEY (`id`),
+			  UNIQUE KEY `u_pages` (`name`,`board`)
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8;') or error(db_error());
 		case false:
 			// TODO: enhance Tinyboard -> vichan upgrade path.
 			query("CREATE TABLE IF NOT EXISTS ``search_queries`` (  `ip` varchar(39) NOT NULL,  `time` int(11) NOT NULL,  `query` text NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8;") or error(db_error());
-- 
cgit v1.3


From d788131202604a32986c4ba2bfca841c844ff010 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sun, 14 Dec 2014 03:27:26 -0800
Subject: Allow a board called news to exist

---
 inc/mod/pages.php            | 8 ++++----
 templates/mod/dashboard.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 328380d8..6d1e20b4 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -608,7 +608,7 @@ function mod_news($page_no = 1) {
 		
 		rebuildThemes('news');
 		
-		header('Location: ?/news#' . $pdo->lastInsertId(), true, $config['redirect_http']);
+		header('Location: ?/edit_news#' . $pdo->lastInsertId(), true, $config['redirect_http']);
 	}
 	
 	$query = prepare("SELECT * FROM ``news`` ORDER BY `id` DESC LIMIT :offset, :limit");
@@ -621,14 +621,14 @@ function mod_news($page_no = 1) {
 		error($config['error']['404']);
 	
 	foreach ($news as &$entry) {
-		$entry['delete_token'] = make_secure_link_token('news/delete/' . $entry['id']);
+		$entry['delete_token'] = make_secure_link_token('edit_news/delete/' . $entry['id']);
 	}
 	
 	$query = prepare("SELECT COUNT(*) FROM ``news``");
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn();
 	
-	mod_page(_('News'), 'mod/news.html', array('news' => $news, 'count' => $count, 'token' => make_secure_link_token('news')));
+	mod_page(_('News'), 'mod/news.html', array('news' => $news, 'count' => $count, 'token' => make_secure_link_token('edit_news')));
 }
 
 function mod_news_delete($id) {
@@ -643,7 +643,7 @@ function mod_news_delete($id) {
 	
 	modLog('Deleted a news entry');
 	
-	header('Location: ?/news', true, $config['redirect_http']);
+	header('Location: ?/edit_news', true, $config['redirect_http']);
 }
 
 function mod_log($page_no = 1) {
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 7e25555b..5c44a522 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -62,7 +62,7 @@
 			{% endif %}
 			<li><a href="?/noticeboard">{% trans 'View all noticeboard entries' %}</a></li>
 		{% endif %}
-		<li><a href="?/news">{% trans 'News' %}</a></li>
+		<li><a href="?/edit_news">{% trans 'News' %}</a></li>
 		<li>
 			<a href="?/inbox">
 				{% trans 'PM inbox' %} 
-- 
cgit v1.3


From ab02a4272514410fc053ced9c17a26bc0c8f1cf4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 16:27:43 +0200
Subject: maybe we can try to load Parsedown, after all we can silence the
 error

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

diff --git a/inc/functions.php b/inc/functions.php
index 845c4cb3..e9692d56 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -20,7 +20,7 @@ require_once 'inc/events.php';
 require_once 'inc/api.php';
 require_once 'inc/mod/auth.php';
 require_once 'inc/polyfill.php';
-//require_once 'inc/lib/parsedown/Parsedown.php'; // we don't need that right now, do we?
+@include_once 'inc/lib/parsedown/Parsedown.php'; // fail silently, this isn't a critical piece of code
 
 if (!extension_loaded('gettext')) {
 	require_once 'inc/lib/gettext/gettext.inc';
-- 
cgit v1.3


From 505adffcdca1c1141b7b46f862b7939f2f4acf45 Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Fri, 3 Apr 2015 14:56:28 +0800
Subject: Cyclical threads ♺
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/api.php                       |  1 +
 inc/config.php                    |  5 +++++
 inc/functions.php                 |  8 +++++++-
 inc/mod/pages.php                 | 22 ++++++++++++++++++++++
 install.php                       |  7 ++++++-
 mod.php                           |  1 +
 post.php                          | 11 ++++++++++-
 templates/post/post_controls.html |  8 +++++++-
 templates/post_thread.html        | 13 ++++++++++---
 templates/posts.sql               |  1 +
 10 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/inc/api.php b/inc/api.php
index b2d8adec..b280c25b 100644
--- a/inc/api.php
+++ b/inc/api.php
@@ -32,6 +32,7 @@ class Api {
 			'images' => 'images',
 			'sticky' => 'sticky',
 			'locked' => 'locked',
+			'cycle' => 'cyclical',
 			'bump' => 'last_modified',
 			'embed' => 'embed',
 		);
diff --git a/inc/config.php b/inc/config.php
index 3fdb8d2f..82fdc882 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1245,6 +1245,8 @@
 	$config['mod']['link_bumpunlock'] = '[-Sage]';
 	$config['mod']['link_editpost'] = '[Edit]';
 	$config['mod']['link_move'] = '[Move]';
+	$config['mod']['link_cycle'] = '[Cycle]';
+	$config['mod']['link_uncycle'] = '[-Cycle]';
 
 	// Moderator capcodes.
 	$config['capcode'] = ' <span class="capcode">## %s</span>';
@@ -1388,6 +1390,9 @@
 	$config['mod']['deletebyip_global'] = ADMIN;
 	// Sticky a thread
 	$config['mod']['sticky'] = MOD;
+	// Cycle a thread
+	$config['mod']['cycle'] = MOD;
+	$config['cycle_limit'] = &$config['reply_limit'];
 	// Lock a thread
 	$config['mod']['lock'] = MOD;
 	// Post in a locked thread
diff --git a/inc/functions.php b/inc/functions.php
index e9692d56..1bd1f32f 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1021,7 +1021,7 @@ function insertFloodPost(array $post) {
 
 function post(array $post) {
 	global $pdo, $board;
-	$query = prepare(sprintf("INSERT INTO ``posts_%s`` VALUES ( NULL, :thread, :subject, :email, :name, :trip, :capcode, :body, :body_nomarkup, :time, :time, :files, :num_files, :filehash, :password, :ip, :sticky, :locked, 0, :embed, :slug)", $board['uri']));
+	$query = prepare(sprintf("INSERT INTO ``posts_%s`` VALUES ( NULL, :thread, :subject, :email, :name, :trip, :capcode, :body, :body_nomarkup, :time, :time, :files, :num_files, :filehash, :password, :ip, :sticky, :locked, :cycle, 0, :embed, :slug)", $board['uri']));
 
 	// Basic stuff
 	if (!empty($post['subject'])) {
@@ -1061,6 +1061,12 @@ function post(array $post) {
 		$query->bindValue(':locked', false, PDO::PARAM_INT);
 	}
 
+	if ($post['op'] && $post['mod'] && isset($post['cycle']) && $post['cycle']) {
+		$query->bindValue(':cycle', true, PDO::PARAM_INT);
+	} else {
+		$query->bindValue(':cycle', false, PDO::PARAM_INT);
+	}
+
 	if ($post['mod'] && isset($post['capcode']) && $post['capcode']) {
 		$query->bindValue(':capcode', $post['capcode'], PDO::PARAM_INT);
 	} else {
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 6d1e20b4..303fa3dd 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1089,6 +1089,28 @@ function mod_sticky($board, $unsticky, $post) {
 	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
 }
 
+function mod_cycle($board, $uncycle, $post) {
+	global $config;
+	
+	if (!openBoard($board))
+		error($config['error']['noboard']);
+	
+	if (!hasPermission($config['mod']['cycle'], $board))
+		error($config['error']['noaccess']);
+	
+	$query = prepare(sprintf('UPDATE ``posts_%s`` SET `cycle` = :cycle WHERE `id` = :id AND `thread` IS NULL', $board));
+	$query->bindValue(':id', $post);
+	$query->bindValue(':cycle', $uncycle ? 0 : 1);
+	$query->execute() or error(db_error($query));
+	if ($query->rowCount()) {
+		modLog(($uncycle ? 'Made not cyclical' : 'Made cyclical') . " thread #{$post}");
+		buildThread($post);
+		buildIndex();
+	}
+	
+	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+}
+
 function mod_bumplock($board, $unbumplock, $post) {
 	global $config;
 	
diff --git a/install.php b/install.php
index 5a6512ba..de4d3dd0 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', '5.1.1');
+define('VERSION', '5.1.2');
 
 require 'inc/functions.php';
 
@@ -570,6 +570,11 @@ if (file_exists($config['has_installed'])) {
 			  PRIMARY KEY (`id`),
 			  UNIQUE KEY `u_pages` (`name`,`board`)
 			) ENGINE=InnoDB DEFAULT CHARSET=utf8;') or error(db_error());
+		case '5.1.1':
+                        foreach ($boards as &$board) {
+                                query(sprintf("ALTER TABLE ``posts_%s`` ADD `cycle` int(1) NOT NULL AFTER `locked`", $board['uri'])) or error(db_error());
+                        }
+
 		case false:
 			// TODO: enhance Tinyboard -> vichan upgrade path.
 			query("CREATE TABLE IF NOT EXISTS ``search_queries`` (  `ip` varchar(39) NOT NULL,  `time` int(11) NOT NULL,  `query` text NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8;") or error(db_error());
diff --git a/mod.php b/mod.php
index fbe679ac..0378d55c 100644
--- a/mod.php
+++ b/mod.php
@@ -82,6 +82,7 @@ $pages = array(
 	'/(\%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)/(un)?cycle/(\d+)'                         => 'secure cycle',          // cycle thread
 	'/(\%b)/bump(un)?lock/(\d+)'		=> 'secure bumplock',		// "bumplock" thread
 	
 	'/themes'				=> 'themes_list',		// manage themes
diff --git a/post.php b/post.php
index 0d3292bb..98aefe05 100644
--- a/post.php
+++ b/post.php
@@ -265,7 +265,7 @@ if (isset($_POST['delete'])) {
 	
 	//Check if thread exists
 	if (!$post['op']) {
-		$query = prepare(sprintf("SELECT `sticky`,`locked`,`sage`,`slug` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
+		$query = prepare(sprintf("SELECT `sticky`,`locked`,`cycle`,`sage`,`slug` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
 		$query->bindValue(':id', $post['thread'], PDO::PARAM_INT);
 		$query->execute() or error(db_error());
 		
@@ -867,6 +867,15 @@ if (isset($_POST['delete'])) {
 	$post['slug'] = slugify($post);
 	
 	insertFloodPost($post);
+
+	// Handle cyclical threads
+	if (!$post['op'] && isset($thread['cycle']) && $thread['cycle']) {
+		// Query is a bit weird due to "This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery'" (MariaDB Ver 15.1 Distrib 10.0.17-MariaDB, for Linux (x86_64))
+		$query = prepare(sprintf('DELETE FROM ``posts_%s`` WHERE `thread` = :thread AND `id` NOT IN (SELECT `id` FROM (SELECT `id` FROM ``posts_%s`` WHERE `thread` = :thread ORDER BY `id` DESC LIMIT :limit) i)', $board['uri'], $board['uri']));
+		$query->bindValue(':thread', $post['thread']);
+		$query->bindValue(':limit', $config['cycle_limit'], PDO::PARAM_INT);
+		$query->execute() or error(db_error($query));
+	}
 	
 	if (isset($post['antispam_hash'])) {
 		incrementSpamHash($post['antispam_hash']);
diff --git a/templates/post/post_controls.html b/templates/post/post_controls.html
index 99a8484c..60dc6fc4 100644
--- a/templates/post/post_controls.html
+++ b/templates/post/post_controls.html
@@ -41,7 +41,6 @@
 {% endif %}
 
 {% endif %}
-
 {% if mod|hasPermission(config.mod.move, board.uri) %}
 	{% if not post.thread %}
 		<a title="{% trans %}Move thread to another board{% endtrans %}" href="?/{{ board.dir }}move/{{ post.id }}">{{ config.mod.link_move }}</a>&nbsp;
@@ -49,6 +48,13 @@
 		<a title="{% trans %}Move reply to another board{% endtrans %}" href="?/{{ board.dir }}move_reply/{{ post.id }}">{{ config.mod.link_move }}</a>&nbsp;
 	{% endif %}
 {% endif %}
+{% if mod|hasPermission(config.mod.cycle, board.uri) %}
+	{% if post.cycle %}
+	<a title="{% trans %}Make thread not cycle{% endtrans %}" href="?/{{ secure_link(board.dir ~ 'uncycle/' ~ post.id) }}">{{ config.mod.link_uncycle }}</a>&nbsp;
+	{% else %}
+	<a title="{% trans %}Make thread cycle{% endtrans %}" href="?/{{ secure_link(board.dir ~ 'cycle/' ~ post.id) }}">{{ config.mod.link_cycle }}</a>&nbsp;
+	{% endif %}
+{% endif %}
 {% if mod|hasPermission(config.mod.editpost, board.uri) %}
 	<a title="{% trans %}Edit post{% endtrans %}" href="?/{{ board.dir }}edit{% if config.mod.raw_html_default %}_raw{% endif %}/{{ post.id }}">{{ config.mod.link_editpost }}</a>&nbsp;
 {% endif %}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 72ca2998..125d5f78 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -19,25 +19,32 @@
 	<a class="post_no" onclick="citeReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('q', '50') }}{% else %}{{ post.link('q') }}{% endif %}">{{ post.id }}</a>
 	{% if post.sticky %}
 		{% if config.font_awesome %}
-			<i class="fa fa-thumb-tack"></i>
+			<i class="fa fa-thumb-tack" title="Sticky"></i>
 		{% else %}
 			<img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" />
 		{% endif %}
 	{% endif %}
 	{% if post.locked %}
 		{% if config.font_awesome %}
-			<i class="fa fa-lock"></i>
+			<i class="fa fa-lock" title="Locked"></i>
 		{% else %}
 			<img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" />
 		{% endif %}
 	{% endif %}
 	{% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %}
 		{% if config.font_awesome %}
-			<i class="fa fa-anchor"></i>
+			<i class="fa fa-anchor" title="Bumplocked"></i>
 		{% else %}
 			<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
 		{% endif %}
 	{% endif %}
+	{% if post.cycle %}
+		{% if config.font_awesome %}
+			<i class="fa fa-refresh" title="Cyclical"></i>
+		{% else %}
+			<img class="icon" title="Cyclical" src="{{ config.image_sticky }}" alt="Cyclical" />
+		{% endif %}
+	{% endif %}
 	{% if index %}
 		<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ link_for(post) }}">[{% trans %}Reply{% endtrans %}]</a>
 	{% endif %}
diff --git a/templates/posts.sql b/templates/posts.sql
index 6b2249ef..070e687b 100644
--- a/templates/posts.sql
+++ b/templates/posts.sql
@@ -17,6 +17,7 @@ CREATE TABLE IF NOT EXISTS ``posts_{{ board }}`` (
    `ip` varchar(39) CHARACTER SET ascii NOT NULL,
    `sticky` int(1) NOT NULL,
    `locked` int(1) NOT NULL,
+   `cycle` int(1) NOT NULL,
    `sage` int(1) NOT NULL,
    `embed` text,
    `slug` varchar(256) DEFAULT NULL,
-- 
cgit v1.3


From a5bd39dc4ab2394db7f87d80a01480b22e4a74e1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 16:49:35 +0200
Subject: mod dashboard html: link to page editor

---
 templates/mod/dashboard.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 5c44a522..d13bf7f2 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -19,6 +19,9 @@
 				{% if mod|hasPermission(config.mod.manageboards) %}
 					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
 				{% endif %}
+				{% if mod|hasPermission(config.mod.edit_pages) %}
+					 <a href="?/edit_pages/{{ board.uri }}"><small>[{% trans 'pages' %}]</small></a>
+				{% endif %}
 			</li>
 		{% endfor %}
 		
@@ -100,6 +103,9 @@
 		{% if mod|hasPermission(config.mod.modlog) %}
 			<li><a href="?/log">{% trans 'Moderation log' %}</a></li>
 		{% endif %}
+		{% if mod|hasPermission(config.mod.edit_pages) %}
+			<li><a href="?/edit_pages">{% trans 'Global static pages' %}</a></li>
+		{% endif %}
 		{% if mod|hasPermission(config.mod.recent) %}
 			<li><a href="?/recent/25">{% trans 'Recent posts' %}</a></li>
 		{% endif %}
-- 
cgit v1.3


From 3571670b98b2e6293e429f3e629510ab9f38e70a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 16:51:34 +0200
Subject: fix catalog link someone?

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index d1871fc8..1be614e3 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -69,7 +69,7 @@
 		 [<a {% if page.selected %}class="selected"{% endif %}{% if not page.selected %}href="{{ page.link }}"{% endif %}>{{ page.num }}</a>]{% if loop.last %} {% endif %}
 		{% endfor %} {{ btn.next }}
 		{% if config.catalog_link %}
-			 | <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">Catalog</a>
+			 | <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">{% trans %}Catalog{% endtrans %}</a>
 		{% endif %}
 	</div>
 	
-- 
cgit v1.3


From 3f405b3484ae6b621ca1fdacbf20e1ef9f3b553a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 16:53:28 +0200
Subject: what if IP address contained bad characters? (highly local)

---
 templates/mod/ban_form.html | 2 +-
 templates/mod/view_ip.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/mod/ban_form.html b/templates/mod/ban_form.html
index 6c7560ad..98cc34b2 100644
--- a/templates/mod/ban_form.html
+++ b/templates/mod/ban_form.html
@@ -21,7 +21,7 @@
 			</th>
 			<td>
 				{% if not hide_ip %}
-					<input type="text" name="ip" id="ip" size="30" maxlength="40" value="{{ ip }}">
+					<input type="text" name="ip" id="ip" size="30" maxlength="40" value="{{ ip|e }}">
 				{% else %}
 					<em>{% trans 'hidden' %}</em>
 				{% endif %}
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index 1c1c7fa6..4bacc7f6 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -45,7 +45,7 @@
 						</td>
 						{% if mod|hasPermission(config.mod.remove_notes) %}
 							<td class="minimal">
-								<a href="?/IP/{{ ip }}/remove_note/{{ note.id }}">
+								<a href="?/IP/{{ ip|url_encode(true) }}/remove_note/{{ note.id }}">
 									<small>[{% trans 'remove' %}]</small>
 								</a>
 							</td>
-- 
cgit v1.3


From ce9f9eec252c435bfc1a9d637ae23c5178f9c1e4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 17:11:12 +0200
Subject: settings dialog refinements: now you can resize it

---
 stylesheets/style.css | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/stylesheets/style.css b/stylesheets/style.css
index b36a9de9..39d1fd04 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -819,10 +819,14 @@ pre {
 }
 
 #options_div {
-  width: 600px;
-  height: 320px;
+  width: 620px;
+  height: 400px;
+  resize: both;
+  overflow: auto;
 }
 
+
+
 #alert_div {
   width: 500px;
 }
@@ -853,7 +857,7 @@ pre {
 #options_tablist {
   padding: 0px 5px;
   left: 0px;
-  width: 70px;
+  width: 90px;
   top: 0px;
   bottom: 0px;
   height: 100%;
@@ -882,11 +886,12 @@ pre {
   padding: 10px;
   position: absolute;
   top: 0px;
-  bottom: 0px;
-  left: 81px;
+  bottom: 10px;
+  left: 101px;
   right: 0px;
   text-align: left;
   font-size: 12px;
+  overflow-y: auto;
 }
 
 .options_tab h2 {
-- 
cgit v1.3


From deef54fe13c181181b62f8e7e5ec8953e62a6f72 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 6 May 2016 18:42:33 +0200
Subject: introduce smart_build_helper

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

diff --git a/smart_build.php b/smart_build.php
index 31d8110a..e287a31a 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -1,8 +1,8 @@
 <?php
 require_once("inc/functions.php");
 
-if (!$config['smart_build']) {
-  die('You need to enable $config["smart_build"]');
+if (!$config['smart_build'] && !$config["smart_build_helper"]) {
+  die('You need to enable $config["smart_build"] or $config["smart_build_helper"]');
 }
 
 $config['smart_build'] = false; // Let's disable it, so we can build the page for real
@@ -44,7 +44,7 @@ function sb_thread($b, $thread, $slugcheck = false) { global $config; $thread =
   $query->bindValue(':id', $thread);
   
   if (!$query->execute() || !$query->fetch(PDO::FETCH_ASSOC) ) {
-    Cache::set("thread_exists_".$b."_".$thread, "no");
+    Cache::set("thread_exists_".$b."_".$thread, "no", 3600);
     return false;
   }
 
-- 
cgit v1.3


From a5e22f6d637365042c53f5e9552e8e8444549d6f Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 8 May 2016 02:50:44 +0200
Subject: split route and controller parts from smart build

---
 inc/controller.php | 108 +++++++++++++++++++++++++++++++++++++
 inc/route.php      |  62 ++++++++++++++++++++++
 smart_build.php    | 153 ++++-------------------------------------------------
 3 files changed, 179 insertions(+), 144 deletions(-)
 create mode 100644 inc/controller.php
 create mode 100644 inc/route.php

diff --git a/inc/controller.php b/inc/controller.php
new file mode 100644
index 00000000..02e33443
--- /dev/null
+++ b/inc/controller.php
@@ -0,0 +1,108 @@
+<?php
+
+// This file contains the controller part of vichan
+
+// don't bother with that unless you use smart build or advanced build
+// you can use those parts for your own implementations though :^)
+
+defined('TINYBOARD') or exit;
+
+function sb_board($b, $page = 1) { global $config, $build_pages; $page = (int)$page;
+  if ($page < 1) return false;
+  if (!openBoard($b)) return false;
+  if ($page > $config['max_pages']) return false;
+  $config['try_smarter'] = true;
+  $build_pages = array($page);
+  buildIndex("skip");
+  return true;
+}
+
+function sb_api_board($b, $page = 0) { $page = (int)$page;
+  return sb_board($b, $page + 1);
+}
+
+function sb_thread($b, $thread, $slugcheck = false) { global $config; $thread = (int)$thread;
+  if ($thread < 1) return false;
+
+  if (!preg_match('/^'.$config['board_regex'].'$/u', $b)) return false;
+
+  if (Cache::get("thread_exists_".$b."_".$thread) == "no") return false;
+
+  $query = prepare(sprintf("SELECT MAX(`id`) AS `max` FROM ``posts_%s``", $b));
+  if (!$query->execute()) return false;
+
+  $s = $query->fetch(PDO::FETCH_ASSOC);
+  $max = $s['max'];
+
+  if ($thread > $max) return false;
+
+  $query = prepare(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL", $b));
+  $query->bindValue(':id', $thread);
+  
+  if (!$query->execute() || !$query->fetch(PDO::FETCH_ASSOC) ) {
+    Cache::set("thread_exists_".$b."_".$thread, "no", 3600);
+    return false;
+  }
+
+  if ($slugcheck && $config['slugify']) {
+    global $request;
+
+    $link = link_for(array("id" => $thread), $slugcheck === 50, array("uri" => $b));
+    $link = "/".$b."/".$config['dir']['res'].$link;
+
+    if ($link != $request) {
+      header("Location: $link", true, 301);
+      die();
+    }
+  }
+
+  if ($slugcheck == 50) { // Should we really generate +50 page? Maybe there are not enough posts anyway
+    global $request;
+    $r = str_replace("+50", "", $request);
+    $r = substr($r, 1); // Cut the slash
+
+    if (file_exists($r)) return false;
+  }
+  
+  if (!openBoard($b)) return false;
+  buildThread($thread);
+  return true;
+}
+
+function sb_thread_slugcheck($b, $thread) {
+  return sb_thread($b, $thread, true);
+}
+function sb_thread_slugcheck50($b, $thread) {
+  return sb_thread($b, $thread, 50);
+}
+
+function sb_api($b) { global $config, $build_pages;
+  if (!openBoard($b)) return false;
+  $config['try_smarter'] = true;
+  $build_pages = array(-1);
+  buildIndex();
+  return true;
+}
+
+function sb_ukko() {
+  rebuildTheme("ukko", "post-thread");
+  return true;
+}
+
+function sb_catalog($b) {
+  if (!openBoard($b)) return false;
+
+  rebuildTheme("catalog", "post-thread", $b); 
+  return true;
+}
+
+function sb_recent() {
+  rebuildTheme("recent", "post-thread");
+  return true;
+}
+
+function sb_sitemap() {
+  rebuildTheme("sitemap", "all");
+  return true;
+}
+
diff --git a/inc/route.php b/inc/route.php
new file mode 100644
index 00000000..66602d77
--- /dev/null
+++ b/inc/route.php
@@ -0,0 +1,62 @@
+<?php
+
+// vichan's routing mechanism
+
+// don't bother with that unless you use smart build or advanced build
+// you can use those parts for your own implementations though :^)
+
+defined('TINYBOARD') or exit;
+
+function route($path) {
+  $entrypoints = array();
+
+  $entrypoints['/%b/']                       = 'sb_board';
+  $entrypoints['/%b/'.$config['file_index']] = 'sb_board';
+  $entrypoints['/%b/'.$config['file_page']]  = 'sb_board';
+  $entrypoints['/%b/%d.json']                = 'sb_api_board';
+  if ($config['api']['enabled']) {
+    $entrypoints['/%b/threads.json']         = 'sb_api';
+    $entrypoints['/%b/catalog.json']         = 'sb_api';
+  }
+
+  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page']]          = 'sb_thread_slugcheck';
+  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page50']]        = 'sb_thread_slugcheck50';
+  if ($config['slugify']) {
+    $entrypoints['/%b/'.$config['dir']['res'].$config['file_page_slug']]   = 'sb_thread_slugcheck';
+    $entrypoints['/%b/'.$config['dir']['res'].$config['file_page50_slug']] = 'sb_thread_slugcheck50';
+  }
+  if ($config['api']['enabled']) {
+    $entrypoints['/%b/'.$config['dir']['res'].'%d.json']                   = 'sb_thread';
+  }
+
+  $entrypoints['/*/']              = 'sb_ukko';
+  $entrypoints['/*/index.html']    = 'sb_ukko';
+  $entrypoints['/recent.html']     = 'sb_recent';
+  $entrypoints['/%b/catalog.html'] = 'sb_catalog';
+  $entrypoints['/sitemap.xml']     = 'sb_sitemap';
+
+  $reached = false;
+
+  list($request) = explode('?', $path);
+
+  foreach ($entrypoints as $id => $fun) {
+    $id = '@^' . preg_quote($id, '@') . '$@u'; 
+
+    $id = str_replace('%b', '('.$config['board_regex'].')', $id);
+    $id = str_replace('%d', '([0-9]+)',                     $id);
+    $id = str_replace('%s', '[a-zA-Z0-9-]+',                $id);
+
+    $matches = null;
+
+    if (preg_match ($id, $request, $matches)) {
+      array_shift($matches);
+
+      $reached = array($fun, $matches);
+
+      break;
+    }
+  }
+
+  return $reached;
+}
+
diff --git a/smart_build.php b/smart_build.php
index e287a31a..58596055 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -1,5 +1,7 @@
 <?php
 require_once("inc/functions.php");
+require_once("inc/route.php");
+require_once("inc/controller.php");
 
 if (!$config['smart_build'] && !$config["smart_build_helper"]) {
   die('You need to enable $config["smart_build"] or $config["smart_build_helper"]');
@@ -11,153 +13,16 @@ function after_open_board() { global $config;
   $config['smart_build'] = false;
 };
 
-function sb_board($b, $page = 1) { global $config, $build_pages; $page = (int)$page;
-  if ($page < 1) return false;
-  if (!openBoard($b)) return false;
-  if ($page > $config['max_pages']) return false;
-  $config['try_smarter'] = true;
-  $build_pages = array($page);
-  buildIndex("skip");
-  return true;
-}
-
-function sb_api_board($b, $page = 0) { $page = (int)$page;
-  return sb_board($b, $page + 1);
-}
-
-function sb_thread($b, $thread, $slugcheck = false) { global $config; $thread = (int)$thread;
-  if ($thread < 1) return false;
-
-  if (!preg_match('/^'.$config['board_regex'].'$/u', $b)) return false;
-
-  if (Cache::get("thread_exists_".$b."_".$thread) == "no") return false;
-
-  $query = prepare(sprintf("SELECT MAX(`id`) AS `max` FROM ``posts_%s``", $b));
-  if (!$query->execute()) return false;
-
-  $s = $query->fetch(PDO::FETCH_ASSOC);
-  $max = $s['max'];
-
-  if ($thread > $max) return false;
-
-  $query = prepare(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL", $b));
-  $query->bindValue(':id', $thread);
-  
-  if (!$query->execute() || !$query->fetch(PDO::FETCH_ASSOC) ) {
-    Cache::set("thread_exists_".$b."_".$thread, "no", 3600);
-    return false;
-  }
-
-  if ($slugcheck && $config['slugify']) {
-    global $request;
-
-    $link = link_for(array("id" => $thread), $slugcheck === 50, array("uri" => $b));
-    $link = "/".$b."/".$config['dir']['res'].$link;
-
-    if ($link != $request) {
-      header("Location: $link", true, 301);
-      die();
-    }
-  }
-
-  if ($slugcheck == 50) { // Should we really generate +50 page? Maybe there are not enough posts anyway
-    global $request;
-    $r = str_replace("+50", "", $request);
-    $r = substr($r, 1); // Cut the slash
-
-    if (file_exists($r)) return false;
-  }
-  
-  if (!openBoard($b)) return false;
-  buildThread($thread);
-  return true;
-}
-
-function sb_thread_slugcheck($b, $thread) {
-  return sb_thread($b, $thread, true);
-}
-function sb_thread_slugcheck50($b, $thread) {
-  return sb_thread($b, $thread, 50);
-}
-
-function sb_api($b) { global $config, $build_pages;
-  if (!openBoard($b)) return false;
-  $config['try_smarter'] = true;
-  $build_pages = array(-1);
-  buildIndex();
-  return true;
-}
-
-function sb_ukko() {
-  rebuildTheme("ukko", "post-thread");
-  return true;
-}
-
-function sb_catalog($b) {
-  if (!openBoard($b)) return false;
-
-  rebuildTheme("catalog", "post-thread", $b); 
-  return true;
-}
-
-function sb_recent() {
-  rebuildTheme("recent", "post-thread");
-  return true;
-}
-
-function sb_sitemap() {
-  rebuildTheme("sitemap", "all");
-  return true;
-}
-
-$entrypoints = array();
-
-$entrypoints['/%b/']                       = 'sb_board';
-$entrypoints['/%b/'.$config['file_index']] = 'sb_board';
-$entrypoints['/%b/'.$config['file_page']]  = 'sb_board';
-$entrypoints['/%b/%d.json']                = 'sb_api_board';
-if ($config['api']['enabled']) {
-  $entrypoints['/%b/threads.json']         = 'sb_api';
-  $entrypoints['/%b/catalog.json']         = 'sb_api';
-}
-
-$entrypoints['/%b/'.$config['dir']['res'].$config['file_page']]          = 'sb_thread_slugcheck';
-$entrypoints['/%b/'.$config['dir']['res'].$config['file_page50']]        = 'sb_thread_slugcheck50';
-if ($config['slugify']) {
-  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page_slug']]   = 'sb_thread_slugcheck';
-  $entrypoints['/%b/'.$config['dir']['res'].$config['file_page50_slug']] = 'sb_thread_slugcheck50';
-}
-if ($config['api']['enabled']) {
-  $entrypoints['/%b/'.$config['dir']['res'].'%d.json']                   = 'sb_thread';
-}
-
-$entrypoints['/*/']              = 'sb_ukko';
-$entrypoints['/*/index.html']    = 'sb_ukko';
-$entrypoints['/recent.html']     = 'sb_recent';
-$entrypoints['/%b/catalog.html'] = 'sb_catalog';
-$entrypoints['/sitemap.xml']     = 'sb_sitemap';
-
-$reached = false;
-
 $request = $_SERVER['REQUEST_URI'];
-list($request) = explode('?', $request);
-
-foreach ($entrypoints as $id => $fun) {
-  $id = '@^' . preg_quote($id, '@') . '$@u'; 
 
-  $id = str_replace('%b', '('.$config['board_regex'].')', $id);
-  $id = str_replace('%d', '([0-9]+)',                     $id);
-  $id = str_replace('%s', '[a-zA-Z0-9-]+',                $id);
+$route = route($request);
 
-  $matches = null;
-
-  if (preg_match ($id, $request, $matches)) {
-    array_shift($matches);
-
-    $reached = call_user_func_array($fun, $matches);
-
-    break;
-  }
+if (!$route) {
+  $reached = false;
+}
+else {
+  list ($fun, $args) = $route;
+  $reached = call_user_func_array($route);
 }
 
 function die_404() { global $config;
-- 
cgit v1.3


From 644f227ab33f247dc82e0208fe2125d5d002f4f4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 8 May 2016 03:09:20 +0200
Subject: fix "Undefined variable: pid"; thanks fpdl and MrFreeman

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

diff --git a/post.php b/post.php
index 98aefe05..4ea08ce3 100644
--- a/post.php
+++ b/post.php
@@ -955,7 +955,7 @@ if (isset($_POST['delete'])) {
 		$build_pages = range(1, $config['max_pages']);
 	
 	if ($post['op'])
-		clean($pid);
+		clean($id);
 	
 	event('post-after', $post);
 	
-- 
cgit v1.3


From b6f0317bde1b6d9a9ac5d81a660865a7aa9ad13d Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 8 May 2016 10:54:30 +0200
Subject: advanced build (1/2): a small refactor of index generating procedure;
 generation strategies

---
 inc/config.php                     |  70 ++++++++++++++++++++++---
 inc/functions.php                  | 102 +++++++++++++++++++++++++++----------
 inc/route.php                      |   5 +-
 smart_build.php                    |   9 +++-
 templates/themes/catalog/theme.php |  13 +++--
 templates/themes/recent/theme.php  |   5 +-
 templates/themes/sitemap/theme.php |   6 ++-
 templates/themes/ukko/theme.php    |   6 ++-
 8 files changed, 169 insertions(+), 47 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 82fdc882..91804429 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1203,16 +1203,74 @@
 	// Try not to build pages when we shouldn't have to.
 	$config['try_smarter'] = true;
 
-	// EXPERIMENTAL: Defer static HTML building to a moment, when a given file is actually accessed.
-	// Warning: This option won't run out of the box. You need to tell your webserver, that a file
-	// for serving 403 and 404 pages is /smart_build.php. Also, you need to turn off indexes.
+/*
+ * ====================
+ *  Advanced build
+ * ====================
+ */
+
+	// Strategies for file generation. Also known as an "advanced build". If you don't have performance
+	// issues, you can safely ignore that part, because it's hard to configure and won't even work on
+	// your free webhosting.
+	//
+	// A strategy is a function, that given the PHP environment and ($fun, $array) variable pair, returns
+	// an $action array or false.
+	//
+	// $fun - a controller function name, see inc/controller.php. This is named after functions, so that
+	//        we can generate the files in daemon.
+	//
+	// $array - arguments to be passed
+	//
+	// $action - action to be taken. It's an array, and the first element of it is one of the following:
+	//   * "immediate" - generate the page immediately
+	//   * "defer" - defer page generation to a moment a worker daemon gets to build it (serving a stale
+	//               page in the meantime). The remaining arguments are daemon-specific. Daemon isn't
+	//               implemented yet :DDDD inb4 while(true) { generate(Queue::Get()) }; (which is probably it).
+	//   * "build_on_load" - defer page generation to a moment, when the user actually accesses the page.
+	//                       This is a smart_build behaviour. You shouldn't use this one too much, if you
+	//                       use it for active boards, the server may choke due to a possible race condition.
+	//                       See my blog post: https://engine.vichan.net/blog/res/2.html
+	//
+	// So, let's assume we want to build a thread 1324 on board /b/, because a new post appeared there.
+	// We try the first strategy, giving it arguments: 'sb_thread', array('b', 1324). The strategy will
+	// now return a value $action, denoting an action to do. If $action is false, we try another strategy.
+	//
+	// As I said, configuration isn't easy.
+	//
+	// 1. chmod 0777 directories: tmp/locks/ and tmp/queue/.
+	// 2. serve 403 and 404 requests to go thru smart_build.php
+	//    for nginx, this blog post contains config snippets: https://engine.vichan.net/blog/res/2.html
+	// 3. disable indexes in your webserver
+	// 4. launch any number of daemons (eg. twice your number of threads?) using the command:
+	//    $ tools/worker.php
+	//    You don't need to do that step if you are not going to use the "defer" option.
+	// 5. enable smart_build_helper (see below)
+	// 6. edit the strategies (see inc/functions.php for the builtin ones). You can use lambdas. I will test
+	//    various ones and include one that works best for me.
+	$config['generation_strategies'] = array();
+	// Add a sane strategy. It forces to immediately generate a page user is about to land on. Otherwise,
+	// it has no opinion, so it needs a fallback strategy.
+	$config['generation_strategies'][] = 'strategy_sane';
+	// Add an immediate catch-all strategy. This is the default function of imageboards: generate all pages
+	// on post time.
+	$config['generation_strategies'][] = 'strategy_immediate';
+	// NOT RECOMMENDED: Instead of an all-"immediate" strategy, you can use an all-"build_on_load" one (used
+	// to be initialized using $config['smart_build']; ) for all pages instead of those to be build
+	// immediately. A rebuild done in this mode should remove all your static files
+	// $config['generation_strategies'][1] = 'strategy_smart_build';
+
+	// Deprecated. Leave it false. See above.
 	$config['smart_build'] = false;
 
-	// Smart build related: when a file doesn't exist, where should we redirect?
+	// Use smart_build.php for dispatching missing requests. It may be useful without smart_build or advanced
+	// build, for example it will regenerate the missing files.
+	$config['smart_build_helper'] = true;
+
+	// smart_build.php: when a file doesn't exist, where should we redirect?
 	$config['page_404'] = '/404.html';
 
-	// Smart build related: extra entrypoints.
-	$config['smart_build_entrypoints'] = array();
+	// Extra controller entrypoints. Controller is used only by smart_build and advanced build.
+	$config['controller_entrypoints'] = array();
 
 /*
  * ====================
diff --git a/inc/functions.php b/inc/functions.php
index 1bd1f32f..2957c680 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1319,7 +1319,8 @@ function thread_find_page($thread) {
 	return floor(($config['threads_per_page'] + $index) / $config['threads_per_page']);
 }
 
-function index($page, $mod=false) {
+// $brief means that we won't need to generate anything yet
+function index($page, $mod=false, $brief = false) {
 	global $board, $config, $debug;
 
 	$body = '';
@@ -1350,6 +1351,7 @@ function index($page, $mod=false) {
 				unset($cached);
 			}
 		}
+
 		if (!isset($cached)) {
 			$posts = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $board['uri']));
 			$posts->bindValue(':id', $th['id']);
@@ -1389,7 +1391,10 @@ function index($page, $mod=false) {
 		}
 		
 		$threads[] = $thread;
-		$body .= $thread->build(true);
+
+		if (!$brief) {
+			$body .= $thread->build(true);
+		}
 	}
 
 	if ($config['file_board']) {
@@ -1610,27 +1615,28 @@ function checkMute() {
 function buildIndex($global_api = "yes") {
 	global $board, $config, $build_pages;
 
-	if (!$config['smart_build']) {
-		$pages = getPages();
-		if (!$config['try_smarter'])
-			$antibot = create_antibot($board['uri']);
+	$catalog_api_action = generation_strategy('sb_api', array($board['uri']));
 
-		if ($config['api']['enabled']) {
-			$api = new Api();
-			$catalog = array();
-		}
+	$pages = null;
+	$antibot = null;
+
+	if ($config['api']['enabled']) {
+		$api = new Api();
+		$catalog = array();
 	}
 
 	for ($page = 1; $page <= $config['max_pages']; $page++) {
 		$filename = $board['dir'] . ($page == 1 ? $config['file_index'] : sprintf($config['file_page'], $page));
 		$jsonFilename = $board['dir'] . ($page - 1) . '.json'; // pages should start from 0
 
-		if ((!$config['api']['enabled'] || $global_api == "skip" || $config['smart_build']) && $config['try_smarter']
-			 && isset($build_pages) && !empty($build_pages) && !in_array($page, $build_pages) )
+		$wont_build_this_page = $config['try_smarter'] && isset($build_pages) && !empty($build_pages) && !in_array($page, $build_pages);
+
+		if ((!$config['api']['enabled'] || $global_api == "skip") && $wont_build_this_page)
 			continue;
 
-		if (!$config['smart_build']) {
-			$content = index($page);
+		$action = generation_strategy('sb_board', array($board['uri'], $page));
+		if ($action == 'rebuild' || $catalog_api_action == 'rebuild') {
+			$content = index($page, false, $wont_build_this_page);
 			if (!$content)
 				break;
 
@@ -1641,17 +1647,21 @@ function buildIndex($global_api = "yes") {
 				file_write($jsonFilename, $json);
 
 				$catalog[$page-1] = $threads;
-			}
 
-			if ($config['api']['enabled'] && $global_api != "skip" && $config['try_smarter'] && isset($build_pages)
-				&& !empty($build_pages) && !in_array($page, $build_pages) )
-				continue;
+				if ($wont_build_this_page) continue;
+			}
 
 			if ($config['try_smarter']) {
 				$antibot = create_antibot($board['uri'], 0 - $page);
 				$content['current_page'] = $page;
 			}
+			elseif (!$antibot) {
+				create_antibot($board['uri']);
+			}
 			$antibot->reset();
+			if (!$pages) {
+				$pages = getPages();
+			}
 			$content['pages'] = $pages;
 			$content['pages'][$page-1]['selected'] = true;
 			$content['btn'] = getPageButtons($content['pages']);
@@ -1659,13 +1669,14 @@ function buildIndex($global_api = "yes") {
 
 			file_write($filename, Element('index.html', $content));
 		}
-		else {
+		elseif ($action == 'delete' || $catalog_api_action == 'delete') {
 			file_unlink($filename);
 			file_unlink($jsonFilename);
 		}
 	}
 
-	if (!$config['smart_build'] && $page < $config['max_pages']) {
+	// $action is an action for our last page
+	if (($catalog_api_action == 'rebuild' || $action == 'rebuild' || $action == 'delete') && $page < $config['max_pages']) {
 		for (;$page<=$config['max_pages'];$page++) {
 			$filename = $board['dir'] . ($page==1 ? $config['file_index'] : sprintf($config['file_page'], $page));
 			file_unlink($filename);
@@ -1679,13 +1690,13 @@ function buildIndex($global_api = "yes") {
 
 	// json api catalog
 	if ($config['api']['enabled'] && $global_api != "skip") {
-		if ($config['smart_build']) {
+		if ($catalog_api_action == 'delete') {
 			$jsonFilename = $board['dir'] . 'catalog.json';
 			file_unlink($jsonFilename);
 			$jsonFilename = $board['dir'] . 'threads.json';
 			file_unlink($jsonFilename);
 		}
-		else {
+		elseif ($catalog_api_action == 'rebuild') {
 			$json = json_encode($api->translateCatalog($catalog));
 			$jsonFilename = $board['dir'] . 'catalog.json';
 			file_write($jsonFilename, $json);
@@ -2204,7 +2215,9 @@ function buildThread($id, $return = false, $mod = false) {
 	if ($config['try_smarter'] && !$mod)
 		$build_pages[] = thread_find_page($id);
 
-	if (!$config['smart_build'] || $return || $mod) {
+	$action = generation_strategy('sb_thread', array($board['uri'], $id));
+
+	if ($action == 'rebuild' || $return || $mod) {
 		$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id`", $board['uri']));
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
@@ -2239,26 +2252,26 @@ function buildThread($id, $return = false, $mod = false) {
 		));
 
 		// json api
-		if ($config['api']['enabled']) {
+		if ($config['api']['enabled'] && !$mod) {
 			$api = new Api();
 			$json = json_encode($api->translateThread($thread));
 			$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . '.json';
 			file_write($jsonFilename, $json);
 		}
 	}
-	else {
+	elseif($action == 'delete') {
 		$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . '.json';
 		file_unlink($jsonFilename);
 	}
 
-	if ($config['smart_build'] && !$return && !$mod) {
+	if ($action == 'delete' && !$return && !$mod) {
 		$noko50fn = $board['dir'] . $config['dir']['res'] . link_for(array('id' => $id), true);
 		file_unlink($noko50fn);
 
 		file_unlink($board['dir'] . $config['dir']['res'] . link_for(array('id' => $id)));
-	} else if ($return) {
+	} elseif ($return) {
 		return $body;
-	} else {
+	} elseif ($action == 'rebuild') {
 		$noko50fn = $board['dir'] . $config['dir']['res'] . link_for($thread, true);
 		if ($hasnoko50 || file_exists($noko50fn)) {
 			buildThread50($id, $return, $mod, $thread, $antibot);
@@ -2788,3 +2801,36 @@ function markdown($s) {
 
 	return $pd->text($s);
 }
+
+function generation_strategy($fun, $array=array()) { global $config;
+	$action = false;
+
+	foreach ($config['generation_strategies'] as $s) {
+		if ($strategy = $s($fun, $array)) {
+			break;
+		}
+	}
+
+	switch ($strategy[0]) {
+		case 'immediate':
+			return 'rebuild';
+		case 'defer':
+			// Ok, it gets interesting here :)
+			Queue::add(serialize(array('build', $fun, $array)));
+			return 'ignore';
+		case 'build_on_load':
+			return 'delete';
+	}
+}
+
+function strategy_immediate($fun, $array) {
+	return array('immediate');
+}
+
+function strategy_smart_build($fun, $array) {
+	return array('build_on_load');
+}
+
+function strategy_sane($fun, $array) { global $config;
+	return false;
+}
diff --git a/inc/route.php b/inc/route.php
index 66602d77..2a5c1732 100644
--- a/inc/route.php
+++ b/inc/route.php
@@ -7,7 +7,7 @@
 
 defined('TINYBOARD') or exit;
 
-function route($path) {
+function route($path) { global $config;
   $entrypoints = array();
 
   $entrypoints['/%b/']                       = 'sb_board';
@@ -33,8 +33,11 @@ function route($path) {
   $entrypoints['/*/index.html']    = 'sb_ukko';
   $entrypoints['/recent.html']     = 'sb_recent';
   $entrypoints['/%b/catalog.html'] = 'sb_catalog';
+  $entrypoints['/%b/index.rss']    = 'sb_catalog';
   $entrypoints['/sitemap.xml']     = 'sb_sitemap';
 
+  $entrypoints = array_merge($entrypoints, $config['controller_entrypoints']);
+
   $reached = false;
 
   list($request) = explode('?', $path);
diff --git a/smart_build.php b/smart_build.php
index 58596055..7ca5fcbf 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -3,14 +3,16 @@ require_once("inc/functions.php");
 require_once("inc/route.php");
 require_once("inc/controller.php");
 
-if (!$config['smart_build'] && !$config["smart_build_helper"]) {
-  die('You need to enable $config["smart_build"] or $config["smart_build_helper"]');
+if (!$config["smart_build_helper"]) {
+  die('You need to enable $config["smart_build_helper"]');
 }
 
 $config['smart_build'] = false; // Let's disable it, so we can build the page for real
+$config['generation_strategies'] = array('strategy_immediate');
 
 function after_open_board() { global $config;
   $config['smart_build'] = false;
+  $config['generation_strategies'] = array('strategy_immediate');
 };
 
 $request = $_SERVER['REQUEST_URI'];
@@ -59,6 +61,9 @@ if ($reached) {
   elseif (preg_match('/\.xml$/', $request)) {
     header("Content-Type", "application/xml");
   }
+  elseif (preg_match('/\.rss$/', $request)) {
+    header("Content-Type", "application/rss+xml");
+  }
   else {
     header("Content-Type", "text/html; charset=utf-8");
   }
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 239d4dff..4f512c03 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -16,20 +16,25 @@
 		if ($action == 'all') {
 			foreach ($boards as $board) {
 				$b = new Catalog();
-				if ($config['smart_build']) {
+
+				$action = generation_strategy("sb_catalog", array($board));
+				if ($action == 'delete') {
 					file_unlink($config['dir']['home'] . $board . '/catalog.html');
+					file_unlink($config['dir']['home'] . $board . '/index.rss');
 				}
-				else {
+				elseif ($action == 'rebuild') {
 					$b->build($settings, $board);
 				}
 			}
 		} elseif ($action == 'post-thread' || ($settings['update_on_posts'] && $action == 'post') || ($settings['update_on_posts'] && $action == 'post-delete') && in_array($board, $boards)) {
 			$b = new Catalog();
 
-			if ($config['smart_build']) {
+			$action = generation_strategy("sb_catalog", array($board));
+			if ($action == 'delete') {
 				file_unlink($config['dir']['home'] . $board . '/catalog.html');
+				file_unlink($config['dir']['home'] . $board . '/index.rss');
 			}
-			else {
+			elseif ($action == 'rebuild') {
 				$b->build($settings, $board);
 			}
 		}
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index f44e2529..95921c35 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -25,10 +25,11 @@
 			$this->excluded = explode(' ', $settings['exclude']);
 			
 			if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete') {
-				if ($config['smart_build']) {
+				$action = generation_strategy('sb_recent', array());
+				if ($action == 'delete') {
 					file_unlink($config['dir']['home'] . $settings['html']);
 				}
-				else {
+				elseif ($action == 'rebuild') {
 					file_write($config['dir']['home'] . $settings['html'], $this->homepage($settings));
 				}
 			}
diff --git a/templates/themes/sitemap/theme.php b/templates/themes/sitemap/theme.php
index 52779d53..6bc035bb 100644
--- a/templates/themes/sitemap/theme.php
+++ b/templates/themes/sitemap/theme.php
@@ -23,10 +23,12 @@
 			}
 		}
 
-		if ($config['smart_build']) {
+		$action = generation_strategy('sb_sitemap', array());
+
+		if ($action == 'delete') {
 			file_unlink($settings['path']);
 		}
-		else {		
+		elseif ($action == 'rebuild') {
 			$boards = explode(' ', $settings['boards']);
 		
 			$threads = array();
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index d6fc303c..e572c467 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -11,10 +11,12 @@
 			return;
 		}
 
-		if ($config['smart_build']) {
+		$action = generation_strategy('sb_ukko', array());
+
+		if ($action == 'delete') {
 			file_unlink($settings['uri'] . '/index.html');
 		}
-		else {
+		elseif ($action == 'rebuild') {
 			file_write($settings['uri'] . '/index.html', $ukko->build());
 		}
 	}
-- 
cgit v1.3


From e2653754750917035b79e62b07d286b3a56cf9ca Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 8 May 2016 10:59:36 +0200
Subject: fixup

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

diff --git a/inc/functions.php b/inc/functions.php
index 2957c680..8329e774 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1656,7 +1656,7 @@ function buildIndex($global_api = "yes") {
 				$content['current_page'] = $page;
 			}
 			elseif (!$antibot) {
-				create_antibot($board['uri']);
+				$antibot = create_antibot($board['uri']);
 			}
 			$antibot->reset();
 			if (!$pages) {
-- 
cgit v1.3


From 12e6aba5d4a2965591b3df76e4f6c19e35475700 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 8 May 2016 13:20:00 +0200
Subject: (2/2) advanced build. implement a daemon that will build static
 pages.

implement a queue and a lock. fix notice in bans. and it even works!

the daemon is basic right now, it could work in a mode that it will defer building certain
pages until a certain time.
---
 inc/bans.php                |  2 +-
 inc/config.php              |  9 ++++++++-
 inc/functions.php           | 40 +++++++++++++++++++++++++++++++++++-----
 smart_build.php             |  2 +-
 tmp/queue/generate/.gitkeep |  0
 tools/worker.php            | 31 +++++++++++++++++++++++++++++++
 6 files changed, 76 insertions(+), 8 deletions(-)
 create mode 100644 tmp/queue/generate/.gitkeep
 create mode 100755 tools/worker.php

diff --git a/inc/bans.php b/inc/bans.php
index 87e06e28..c468eb64 100644
--- a/inc/bans.php
+++ b/inc/bans.php
@@ -166,7 +166,7 @@ class Bans {
 
 			if ($ban['post']) {
 				$post = json_decode($ban['post']);
-				$ban['message'] = $post->body;
+				$ban['message'] = isset($post->body) ? $post->body : 0;
 			}
 			unset($ban['ipstart'], $ban['ipend'], $ban['post'], $ban['creator']);
 
diff --git a/inc/config.php b/inc/config.php
index 91804429..5926eb1d 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -103,7 +103,7 @@
 
 /*
  * ====================
- *  Cache settings
+ *  Cache, lock and queue settings
  * ====================
  */
 
@@ -120,6 +120,7 @@
 	// $config['cache']['enabled'] = 'apc';
 	// $config['cache']['enabled'] = 'memcached';
 	// $config['cache']['enabled'] = 'redis';
+	// $config['cache']['enabled'] = 'fs';
 
 	// Timeout for cached objects such as posts and HTML.
 	$config['cache']['timeout'] = 60 * 60 * 48; // 48 hours
@@ -142,6 +143,12 @@
 	// (this file will be explicitly loaded during cache hit, but not during cache miss).
 	$config['cache_config'] = false;
 
+	// Define a lock driver.
+	$config['lock']['enabled'] = 'fs';
+
+	// Define a queue driver.
+	$config['queue']['enabled'] = 'fs'; // xD
+
 /*
  * ====================
  *  Cookie settings
diff --git a/inc/functions.php b/inc/functions.php
index 8329e774..0cfdb72f 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -19,6 +19,8 @@ require_once 'inc/database.php';
 require_once 'inc/events.php';
 require_once 'inc/api.php';
 require_once 'inc/mod/auth.php';
+require_once 'inc/lock.php';
+require_once 'inc/queue.php';
 require_once 'inc/polyfill.php';
 @include_once 'inc/lib/parsedown/Parsedown.php'; // fail silently, this isn't a critical piece of code
 
@@ -93,6 +95,8 @@ function loadConfig() {
 			'db',
 			'api',
 			'cache',
+			'lock',
+			'queue',
 			'cookies',
 			'error',
 			'dir',
@@ -1749,7 +1753,6 @@ function buildJavascript() {
 function checkDNSBL() {
 	global $config;
 
-
 	if (isIPv6())
 		return; // No IPv6 support yet.
 
@@ -2806,17 +2809,17 @@ function generation_strategy($fun, $array=array()) { global $config;
 	$action = false;
 
 	foreach ($config['generation_strategies'] as $s) {
-		if ($strategy = $s($fun, $array)) {
+		if ($action = $s($fun, $array)) {
 			break;
 		}
 	}
 
-	switch ($strategy[0]) {
+	switch ($action[0]) {
 		case 'immediate':
 			return 'rebuild';
 		case 'defer':
 			// Ok, it gets interesting here :)
-			Queue::add(serialize(array('build', $fun, $array)));
+			get_queue('generate')->push(serialize(array('build', $fun, $array, $action)));
 			return 'ignore';
 		case 'build_on_load':
 			return 'delete';
@@ -2832,5 +2835,32 @@ function strategy_smart_build($fun, $array) {
 }
 
 function strategy_sane($fun, $array) { global $config;
-	return false;
+	// Well, ideally a sane strategy would involve a more stringent checking,
+	// but let's at least have something to get the ball rolling :^)
+
+	if (php_sapi_name() == 'cli') return false;
+	else if (isset($_POST['mod']) || isset($_POST['json_response'])) return false;
+	else if ($fun == 'sb_thread' || ($fun == 'sb_board' && $array[1] == 1)) return array('immediate');
+	else return false;
+}
+
+// My first, test strategy.
+function strategy_first($fun, $array) {
+	switch ($fun) {
+	case 'sb_thread':
+		return array('defer');
+	case 'sb_board':
+		if ($array[1] > 8) return array('build_on_load');
+		else return array('defer');
+	case 'sb_api':
+		return array('defer');
+	case 'sb_catalog':
+		return array('defer');
+	case 'sb_recent':
+		return array('build_on_load');
+	case 'sb_sitemap':
+		return array('build_on_load');
+	case 'sb_ukko':
+		return array('defer');
+	}
 }
diff --git a/smart_build.php b/smart_build.php
index 7ca5fcbf..cfac446a 100644
--- a/smart_build.php
+++ b/smart_build.php
@@ -24,7 +24,7 @@ if (!$route) {
 }
 else {
   list ($fun, $args) = $route;
-  $reached = call_user_func_array($route);
+  $reached = call_user_func_array($fun, $args);
 }
 
 function die_404() { global $config;
diff --git a/tmp/queue/generate/.gitkeep b/tmp/queue/generate/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/tools/worker.php b/tools/worker.php
new file mode 100755
index 00000000..e19fe1c6
--- /dev/null
+++ b/tools/worker.php
@@ -0,0 +1,31 @@
+#!/usr/bin/php
+<?php
+/* worker.php - part of advanced build vichan feature */
+
+require dirname(__FILE__) . '/inc/cli.php';
+require_once 'inc/controller.php';
+
+$config['smart_build'] = false; // Let's disable it, so we can build the page for real
+$config['generation_strategies'] = array('strategy_immediate');
+
+function after_open_board() { global $config;
+  $config['smart_build'] = false;
+  $config['generation_strategies'] = array('strategy_immediate');
+};
+
+echo "Hello world!\n";
+
+$queue = get_queue('generate');
+
+while (true) {
+  $q = $queue->pop(2);
+  foreach ($q as $v) {
+    list($__, $func, $ary, $action) = unserialize($v);
+    echo "Starting to generate $func ".implode(" ", $ary)."... ";
+
+    call_user_func_array($func, $ary);
+
+    echo "done!\n";
+  }
+  if (!$q) usleep(20000); // 0.02s
+}
-- 
cgit v1.3


From f24e0f98143528c7b2cd5c504899c5492f5d75fd Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 8 May 2016 14:01:55 +0200
Subject: optimize out openboard when we don`t need it. a big performance
 improvement too 🏎
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

also, don't call dnsbl for local ip addresses
---
 inc/functions.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 0cfdb72f..35be56b9 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -556,14 +556,19 @@ function setupBoard($array) {
 }
 
 function openBoard($uri) {
-	global $config, $build_pages;
+	global $config, $build_pages, $board;
 
 	if ($config['try_smarter'])
 		$build_pages = array();
 
-	$board = getBoardInfo($uri);
-	if ($board) {
-		setupBoard($board);
+	// And what if we don't really need to change a board we have opened?
+	if (isset ($board) && isset ($board['uri']) && $board['uri'] == $uri) {
+		return true;
+	}
+
+	$b = getBoardInfo($uri);
+	if ($b) {
+		setupBoard($b);
 
 		if (function_exists('after_open_board')) {
 			after_open_board();
@@ -1759,6 +1764,9 @@ function checkDNSBL() {
 	if (!isset($_SERVER['REMOTE_ADDR']))
 		return; // Fix your web server configuration
 
+	if (preg_match("/^(::(ffff:)?)?(127\.|192\.168\.|10\.|172\.(1[6-9]|2[0-9]|3[0-1])\.|0\.|255\.)/", $_SERVER['REMOTE_ADDR']))
+		return; // It's pointless to check for local IP addresses in dnsbls, isn't it?
+
 	if (in_array($_SERVER['REMOTE_ADDR'], $config['dnsbl_exceptions']))
 		return;
 
-- 
cgit v1.3


From bb9aaad899c47e4eec49cbd444573e78d48a146a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 8 May 2016 15:37:49 +0200
Subject: i forgot about a queue and a lock implementation

---
 inc/lock.php  | 39 +++++++++++++++++++++++++++++++++++++++
 inc/queue.php | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 inc/lock.php
 create mode 100644 inc/queue.php

diff --git a/inc/lock.php b/inc/lock.php
new file mode 100644
index 00000000..4fb2f5df
--- /dev/null
+++ b/inc/lock.php
@@ -0,0 +1,39 @@
+<?php
+class Lock {
+  function __construct($key) { global $config;
+    if ($config['lock']['enabled'] == 'fs') {
+      $key = str_replace('/', '::', $key);
+      $key = str_replace("\0", '', $key);
+
+      $this->f = fopen("tmp/locks/$key", "w");
+    }
+  }
+
+  // Get a shared lock
+  function get($nonblock = false) { global $config;
+    if ($config['lock']['enabled'] == 'fs') {
+      $wouldblock = false;
+      flock($this->f, LOCK_SH | ($nonblock ? LOCK_NB : 0), $wouldblock);
+      if ($nonblock && $wouldblock) return false;
+    }
+    return $this;
+  }
+
+  // Get an exclusive lock
+  function get_ex($nonblock = false) { global $config;
+    if ($config['lock']['enabled'] == 'fs') {
+      $wouldblock = false;
+      flock($this->f, LOCK_EX | ($nonblock ? LOCK_NB : 0), $wouldblock);
+      if ($nonblock && $wouldblock) return false;
+    }
+    return $this;
+  }
+
+  // Free a lock
+  function free() { global $config;
+    if ($config['lock']['enabled'] == 'fs') {
+      flock($this->f, LOCK_UN);
+    }
+    return $this;
+  }
+}
diff --git a/inc/queue.php b/inc/queue.php
new file mode 100644
index 00000000..66305b3b
--- /dev/null
+++ b/inc/queue.php
@@ -0,0 +1,49 @@
+<?php
+
+class Queue {
+  function __construct($key) { global $config;
+    if ($config['queue']['enabled'] == 'fs') {
+      $this->lock = new Lock($key);
+      $key = str_replace('/', '::', $key);
+      $key = str_replace("\0", '', $key);
+      $this->key = "tmp/queue/$key/";
+    }
+  }
+
+  function push($str) { global $config;
+    if ($config['queue']['enabled'] == 'fs') {
+      $this->lock->get_ex();
+      file_put_contents($this->key.microtime(true), $str);
+      $this->lock->free();
+    }
+    return $this;
+  }
+
+  function pop($n = 1) { global $config;
+    if ($config['queue']['enabled'] == 'fs') {
+      $this->lock->get_ex();
+      $dir = opendir($this->key);
+      $paths = array();
+      while ($n > 0) {
+        $path = readdir($dir);
+        if ($path === FALSE) break;
+        elseif ($path == '.' || $path == '..') continue;
+        else { $paths[] = $path; $n--; }
+      }
+      $out = array();
+      foreach ($paths as $v) {
+        $out []= file_get_contents($this->key.$v);
+        unlink($this->key.$v);
+      }
+      $this->lock->free();
+      return $out;
+    }
+  }
+}
+
+// Don't use the constructor. Use the get_queue function.
+$queues = array();
+
+function get_queue($name) { global $queues;
+  return $queues[$name] = isset ($queues[$name]) ? $queues[$name] : new Queue($name);
+}
-- 
cgit v1.3


From ccc9cff23dfdcfb758d635438b0ff8f9fd476496 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 9 May 2016 10:59:50 +0200
Subject: ukko: post filters and reporting

---
 js/fix-report-delete-submit.js | 2 +-
 js/post-filter.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index abed4d06..61c127ab 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -8,7 +8,7 @@
  *
  */
 
-if (active_page == 'thread' || active_page == 'index') {
+if (active_page == 'thread' || active_page == 'index' || active_page == 'ukko') {
 $(document).on('menu_ready', function(){
 var Menu = window.Menu;
 	
diff --git a/js/post-filter.js b/js/post-filter.js
index 950f43ab..0b2589f0 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -1,4 +1,4 @@
-if (active_page === 'thread' || active_page === 'index' || active_page === 'catalog') {
+if (active_page === 'thread' || active_page === 'index' || active_page === 'catalog' || active_page === 'ukko') {
 	$(document).on('menu_ready', function () {
 		'use strict';
 		
-- 
cgit v1.3


From 1cff10fd953373abb546dd93f53acaee2eec19cd Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 9 May 2016 11:08:24 +0200
Subject: ukko & fix-re-de-su: fix reporting and deleting from ukko actually

---
 js/fix-report-delete-submit.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js
index 61c127ab..f5cda9ad 100644
--- a/js/fix-report-delete-submit.js
+++ b/js/fix-report-delete-submit.js
@@ -20,6 +20,7 @@ if ($('#delete-fields #password').length) {
 		var $ele = $(ele);
 		var threadId = $ele.parent().attr('id').replace('thread_', '');
 		var postId = $ele.find('.post_no').not('[id]').text();
+		var board_name = $ele.parent().data('board');
 
 		$buf.find('#delete_post_menu,#delete_file_menu').click(function(e) {
 			e.preventDefault();
@@ -30,6 +31,7 @@ if ($('#delete-fields #password').length) {
 			} else {
 				$('#delete_file').prop('checked', '');
 			}
+			$('input[type="hidden"][name="board"]').val(board_name);
 			$('input[name=delete][type=submit]').click();
 		});
 	});
@@ -42,6 +44,7 @@ Menu.onclick(function(e, $buf) {
 	var $ele = $(ele);
 	var threadId = $ele.parent().attr('id').replace('thread_', '');
 	var postId = $ele.find('.post_no').not('[id]').text();
+	var board_name = $ele.parent().data('board');
 
 	$buf.find('#report_menu,#global_report_menu').click(function(e) {
 		if ($(this).attr('id') === "global_report_menu") {
-- 
cgit v1.3


From 4479fc7681d55afeeed90f9ddc4d892741bd6e53 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 9 May 2016 11:18:27 +0200
Subject: thread-watcher and favorites in catalog and ukko

---
 js/favorites.js      | 2 +-
 js/thread-watcher.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/favorites.js b/js/favorites.js
index daf7b732..027dc243 100644
--- a/js/favorites.js
+++ b/js/favorites.js
@@ -50,7 +50,7 @@ function add_favorites() {
 	$('.boardlist').append(boards);
 };
 
-if (active_page == 'thread' || active_page == 'index') {
+if (active_page == 'thread' || active_page == 'index' || active_page == 'catalog' || active_page == 'ukko') {
 	$(document).ready(function(){
 		var favorites = JSON.parse(localStorage.favorites);
 		var is_board_favorite = ~$.inArray(board_name, favorites);
diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index c31a6e74..0796193b 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -41,7 +41,7 @@ watchlist.render = function(reset) {
 	} else {
 		//If the watchlist has not yet been rendered, create it.
 		var menuStyle = getComputedStyle($('.boardlist')[0]);
-		$('form[name="post"]').before(
+		$((active_page == 'ukko') ? 'hr:first' : (active_page == 'catalog') ? 'body>span:first' : 'form[name="post"]').before(
 			$('<div id="watchlist">'+
 					'<div class="watchlist-controls">'+
 						'<span><a id="clearList">['+_('Clear List')+']</a></span>&nbsp'+
@@ -60,6 +60,8 @@ watchlist.render = function(reset) {
 watchlist.add = function(sel) {
 	var threadName, threadInfo;
 
+	var board_name = $(sel).parents('.thread').data('board');
+
 	if (active_page === 'thread') {
 		if ($('.subject').length){
 			//If a subject is given, use the first 20 characters as the thread name.
@@ -70,7 +72,7 @@ watchlist.add = function(sel) {
 		//board name, thread name as defined above, current amount of posts, thread url
 		threadInfo = [board_name, threadName, $('.post').length, location.href];
 
-	} else if (active_page === 'index') {
+	} else if (active_page === 'index' || active_page === 'ukko') {
 
 		var postCount;
 		//Figure out the post count.
@@ -142,7 +144,7 @@ watchlist.exists = function(sel) {
 };
 
 $(document).ready(function(){
-	if (!(active_page == 'thread' || active_page == 'index')) {
+	if (!(active_page == 'thread' || active_page == 'index' || active_page == 'catalog' || active_page == 'ukko')) {
 		return;
 	}
 
-- 
cgit v1.3


From 018dd48a66ec7734bad48105a32a2ae9a5f51017 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 9 May 2016 11:58:46 +0200
Subject: post-filter + ukko fixes

---
 js/post-filter.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 0b2589f0..3f2358e4 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -224,6 +224,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 				var $ele = $(ele);
 
 				var threadId = $ele.parent().attr('id').replace('thread_', '');
+				var boardId = $ele.parent().data('board');
 				var postId = $ele.find('.post_no').not('[id]').text();
 				if (pageData.hasUID) {
 					var postUid = $ele.find('.poster_id').text();
@@ -244,21 +245,21 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 					$buffer.find('#filter-menu-unhide').click(function () {
 						//  if hidden due to post id, remove it from blacklist
 						//  otherwise just show this post
-						blacklist.remove.post(pageData.boardId, threadId, postId);
+						blacklist.remove.post(boardId, threadId, postId);
 						show(ele);
 					});
 					$buffer.find('#filter-menu-hide').addClass('hidden');
 				} else {
 					$buffer.find('#filter-menu-unhide').addClass('hidden');
 					$buffer.find('#filter-menu-hide').click(function () {
-						blacklist.add.post(pageData.boardId, threadId, postId, false);
+						blacklist.add.post(boardId, threadId, postId, false);
 					});
 				}
 
 				//  post id
 				if (!$ele.data('hiddenByPost')) {
 					$buffer.find('#filter-add-post-plus').click(function () {
-						blacklist.add.post(pageData.boardId, threadId, postId, true);
+						blacklist.add.post(boardId, threadId, postId, true);
 					});
 				} else {
 					$buffer.find('#filter-add-post-plus').addClass('hidden');
@@ -267,16 +268,16 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 				// UID
 				if (pageData.hasUID && !$ele.data('hiddenByUid')) {
 					$buffer.find('#filter-add-id').click(function () {
-						blacklist.add.uid(pageData.boardId, threadId, postUid, false);
+						blacklist.add.uid(boardId, threadId, postUid, false);
 					});
 					$buffer.find('#filter-add-id-plus').click(function () {
-						blacklist.add.uid(pageData.boardId, threadId, postUid, true);
+						blacklist.add.uid(boardId, threadId, postUid, true);
 					});
 
 					$buffer.find('#filter-remove-id').addClass('hidden');
 				} else if (pageData.hasUID) {
 					$buffer.find('#filter-remove-id').click(function () {
-						blacklist.remove.uid(pageData.boardId, threadId, postUid);
+						blacklist.remove.uid(boardId, threadId, postUid);
 					});
 
 					$buffer.find('#filter-add-id').addClass('hidden');
@@ -350,12 +351,13 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 					.click(function() {
 						var postId = $(ele).find('.post_no').not('[id]').text();
 						var hidden = $(ele).data('hidden');
+						var boardId = $(ele).parents('.thread').data('board');
 					
 						if (hidden) {
-							blacklist.remove.post(pageData.boardId, threadId, postId, false);
+							blacklist.remove.post(boardId, threadId, postId, false);
 							$(this).html('[&ndash;]');
 						} else {
-							blacklist.add.post(pageData.boardId, threadId, postId, false);
+							blacklist.add.post(boardId, threadId, postId, false);
 							$(this).text('[+]');
 						}
 					});
@@ -375,7 +377,9 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 			var name, trip, uid, subject, comment;
 			var i, length, array, rule, pattern;  // temp variables
 
-			var boardId     = pageData.boardId;
+			var boardId	      = $post.data('board');
+			if (!boardId) boardId = $post.parents('.thread').data('board');
+
 			var localList   = pageData.localList;
 			var noReplyList = pageData.noReplyList;
 			var hasUID      = pageData.hasUID;
@@ -532,12 +536,13 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 						return;
 
 					var threadId = $thread.attr('id').replace('thread_', '');
+					var boardId = $thread.data('board');
 					var op = $thread.children('.op')[0];
 					var i, array;  // temp variables
 
 					// add posts to localList and noReplyList
-					if (typeof list.postFilter[pageData.boardId] != 'undefined' && typeof list.postFilter[pageData.boardId][threadId] != 'undefined') {
-						array = list.postFilter[pageData.boardId][threadId];
+					if (typeof list.postFilter[boardId] != 'undefined' && typeof list.postFilter[boardId][threadId] != 'undefined') {
+						array = list.postFilter[boardId][threadId];
 						for (i=0; i<array.length; i++) {
 							if ( typeof array[i].post == 'undefined')
 								continue;
-- 
cgit v1.3


From 4fe2da2fcdae3203d72a31fad75780c256ccc02c Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 9 May 2016 13:02:21 +0200
Subject: post-filter & ukko: final solution i think

---
 js/post-filter.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/post-filter.js b/js/post-filter.js
index 3f2358e4..3bf55a51 100644
--- a/js/post-filter.js
+++ b/js/post-filter.js
@@ -179,7 +179,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 				$ele.parent().find('.body, .files, .video-container').not($ele.children('.reply').children()).hide();
 
 				// hide thread replies on index view
-				if (active_page == 'index') $ele.parent().find('.omitted, .reply:not(.hidden), post_no, .mentioned, br').hide();
+				if (active_page == 'index' || active_page == 'ukko') $ele.parent().find('.omitted, .reply:not(.hidden), post_no, .mentioned, br').hide();
 			} else {
 				// normal posts
 				$ele.children('.body, .files, .video-container').hide();
@@ -372,6 +372,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 		 */
 		function filter(post, threadId, pageData) {
 			var $post = $(post);
+
 			var list = getList();
 			var postId = $post.find('.post_no').not('[id]').text();
 			var name, trip, uid, subject, comment;
@@ -814,9 +815,10 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
 				var threadId;
 
 				if ($(post).hasClass('reply')) {
-					threadId = $(post).parent().attr('id').replace('thread_', '');
+					threadId = $(post).parents('.thread').attr('id').replace('thread_', '');
 				} else {
 					threadId = $(post).attr('id').replace('thread_', '');
+					post = $(post).children('.op')[0];
 				}
 
 				filter(post, threadId, pageData);
-- 
cgit v1.3


From 52fe9bc873e2950606afefad82cd102ad0a4db5c Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 15 May 2016 15:52:41 +0200
Subject: fix sane_strategy for advanced build. should fix the ajax.js problem.

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

diff --git a/inc/functions.php b/inc/functions.php
index 35be56b9..154386b0 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2843,12 +2843,10 @@ function strategy_smart_build($fun, $array) {
 }
 
 function strategy_sane($fun, $array) { global $config;
-	// Well, ideally a sane strategy would involve a more stringent checking,
-	// but let's at least have something to get the ball rolling :^)
-
 	if (php_sapi_name() == 'cli') return false;
-	else if (isset($_POST['mod']) || isset($_POST['json_response'])) return false;
-	else if ($fun == 'sb_thread' || ($fun == 'sb_board' && $array[1] == 1)) return array('immediate');
+	else if (isset($_POST['mod'])) return false;
+	// Thread needs to be done instantly. Same with a board page, but only if posting a new thread.
+	else if ($fun == 'sb_thread' || ($fun == 'sb_board' && $array[1] == 1 && isset ($_POST['page']))) return array('immediate');
 	else return false;
 }
 
-- 
cgit v1.3


From d285a796674f170b0e7a71ffa0cc7bbee2d5421a Mon Sep 17 00:00:00 2001
From: fatchan <admin@fatpeople.lol>
Date: Tue, 31 May 2016 23:28:55 +1000
Subject: Move the 'Go back and rebuild again' to the top of the rebuilt page
 so you dont have to scroll

---
 templates/mod/rebuilt.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/mod/rebuilt.html b/templates/mod/rebuilt.html
index 57d16fff..f27cdf56 100644
--- a/templates/mod/rebuilt.html
+++ b/templates/mod/rebuilt.html
@@ -1,12 +1,12 @@
 <div class="ban">
 	<h2>{% trans 'Rebuilt' %}</h2>
+	<p>
+		<a href="?/rebuild">{% trans 'Go back and rebuild again' %}</a>.
+	</p>
 	<ul>
 		{% for log in logs %}
 			<li>{{ log }}</li>
 		{% endfor %}
 	</ul>
-	<p>
-		<a href="?/rebuild">{% trans 'Go back and rebuild again' %}</a>.
-	</p>
 </div>
 
-- 
cgit v1.3


From 94c91db097c034c46f66b27d16eb84a4ea814bb6 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 9 Jun 2016 04:51:05 +0200
Subject: fix news deletion; thanks MrFreeman

---
 templates/mod/news.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mod/news.html b/templates/mod/news.html
index 510d60ce..57058291 100644
--- a/templates/mod/news.html
+++ b/templates/mod/news.html
@@ -40,7 +40,7 @@
 	<div class="ban">
 		{% if mod|hasPermission(config.mod.news_delete) %}
 			<span style="float:right;padding:2px">
-				<a class="unimportant" href="?/news/delete/{{ post.id }}/{{ post.delete_token }}">[{% trans 'delete' %}]</a>
+				<a class="unimportant" href="?/edit_news/delete/{{ post.id }}/{{ post.delete_token }}">[{% trans 'delete' %}]</a>
 			</span>
 		{% endif %}
 		<h2 id="{{ post.id }}">
-- 
cgit v1.3


From 8a46c7a0d54864d7f640e1972a23e78018368cc2 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 9 Jun 2016 11:08:29 +0200
Subject: tesseract OCR support for spamfilters

---
 inc/config.php         | 13 +++++++++++++
 inc/functions.php      |  2 +-
 post.php               | 43 ++++++++++++++++++++++++++++++++++++++-----
 tmp/tesseract/.gitkeep |  0
 4 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 tmp/tesseract/.gitkeep

diff --git a/inc/config.php b/inc/config.php
index 5926eb1d..ebe17572 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -824,6 +824,15 @@
 	// Set this to true if you're using Linux and you can execute `md5sum` binary.
 	$config['gnu_md5'] = false;
 
+	// Use Tesseract OCR to retrieve text from images, so you can use it as a spamfilter.
+	$config['tesseract_ocr'] = false;
+
+	// Tesseract parameters
+	$config['tesseract_params'] = '';
+
+	// Tesseract preprocess command
+	$config['tesseract_preprocess_command'] = 'convert -monochrome %s -';
+
 	// Number of posts in a "View Last X Posts" page
 	$config['noko50_count'] = 50;
 	// Number of posts a thread needs before it gets a "View Last X Posts" page.
@@ -1015,6 +1024,10 @@
 	// Minify Javascript using http://code.google.com/p/minify/.
 	$config['minify_js'] = false;
 
+	// Dispatch thumbnail loading and image configuration with JavaScript. It will need a certain javascript
+	// code to work.
+	$config['javascript_image_dispatch'] = false;
+
 /*
  * ====================
  *  Video embedding
diff --git a/inc/functions.php b/inc/functions.php
index 154386b0..5a8f6000 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2695,7 +2695,7 @@ function slugify($post) {
 	elseif (isset ($post['body_nomarkup']) && $post['body_nomarkup'])
 		$slug = $post['body_nomarkup'];
 	elseif (isset ($post['body']) && $post['body'])
-		$slug = strip_html($post['body']);
+		$slug = strip_tags($post['body']);
 
 	// Fix UTF-8 first
 	$slug = mb_convert_encoding($slug, "UTF-8", "UTF-8");
diff --git a/post.php b/post.php
index 4ea08ce3..bf723e01 100644
--- a/post.php
+++ b/post.php
@@ -652,14 +652,14 @@ if (isset($_POST['delete'])) {
 			$post['filehash'] = md5($allhashes);
 		}
 	}
-	
+
 	if (!hasPermission($config['mod']['bypass_filters'], $board['uri'])) {
-		require_once 'inc/filters.php';	
-		
+		require_once 'inc/filters.php';
+
 		do_filters($post);
 	}
-	
-	if ($post['has_file']) {	
+
+	if ($post['has_file']) {
 		foreach ($post['files'] as $key => &$file) {
 		if ($file['is_an_image']) {
 			if ($config['ie_mime_type_detection'] !== false) {
@@ -787,6 +787,34 @@ if (isset($_POST['delete'])) {
 			$file['thumbwidth'] = $size[0];
 			$file['thumbheight'] = $size[1];
 		}
+
+		if ($config['tesseract_ocr']) { // Let's OCR it!
+			$fname = $file['tmp_name'];
+
+			if ($file['height'] > 500 || $file['width'] > 500) {
+				$fname = $file['thumb'];
+			}
+
+			if ($fname == 'spoiler') { // We don't have that much CPU time, do we?
+			}
+			else {
+				$tmpname = "tmp/tesseract/".rand(0,10000000);
+
+				// Preprocess command is an ImageMagick b/w quantization
+				$error = shell_exec_error(sprintf($config['tesseract_preprocess_command'], escapeshellarg($fname)) . " | " .
+                                                          'tesseract stdin '.escapeshellarg($tmpname).' '.$config['tesseract_params']);
+				$tmpname .= ".txt";
+
+				$value = @file_get_contents($tmpname);
+				@unlink($tmpname);
+
+				if ($value && trim($value)) {
+					// This one has an effect, that the body is appended to a post body. So you can write a correct
+					// spamfilter.
+					$post['body_nomarkup'] .= "<tinyboard ocr image $key>".htmlspecialchars($value)."</tinyboard>";
+				}
+			}
+		}
 		
 		if (!isset($dont_copy_file) || !$dont_copy_file) {
 			if (isset($file['file_tmp'])) {
@@ -827,6 +855,11 @@ if (isset($_POST['delete'])) {
 		}
 	}
 	
+	// Do filters again if OCRing
+	if ($config['tesseract_ocr'] && !hasPermission($config['mod']['bypass_filters'], $board['uri'])) {
+		do_filters($post);
+	}
+
 	if (!hasPermission($config['mod']['postunoriginal'], $board['uri']) && $config['robot_enable'] && checkRobot($post['body_nomarkup'])) {
 		undoImage($post);
 		if ($config['robot_mute']) {
diff --git a/tmp/tesseract/.gitkeep b/tmp/tesseract/.gitkeep
new file mode 100644
index 00000000..e69de29b
-- 
cgit v1.3


From d2bb4a776f681ad47a8b44bc271c8f0b502ef1f1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 17 May 2016 09:53:09 +0200
Subject: fail gracefully on no thumbnail

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

diff --git a/inc/functions.php b/inc/functions.php
index 5a8f6000..e576cf99 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1161,8 +1161,10 @@ function deleteFile($id, $remove_entirely_if_already=true, $file=null) {
 		foreach ($files as $i => $f) {
 			if (($file !== false && $i == $file) || $file === null) {
 				// Delete thumbnail
-				file_unlink($board['dir'] . $config['dir']['thumb'] . $f->thumb);
-				unset($files[$i]->thumb);
+				if (isset ($f->thumb) && $f->thumb) {
+					file_unlink($board['dir'] . $config['dir']['thumb'] . $f->thumb);
+					unset($files[$i]->thumb);
+				}
 
 				// Delete file
 				file_unlink($board['dir'] . $config['dir']['img'] . $f->file);
-- 
cgit v1.3


From cdd963e79e0ffc5a7bcd69c9cd79d41c8ad74f52 Mon Sep 17 00:00:00 2001
From: fatchan <admin@fatpeople.lol>
Date: Wed, 1 Jun 2016 00:20:20 +1000
Subject: fix flag spacing

---
 templates/post/flag.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/post/flag.html b/templates/post/flag.html
index 61622368..481e40ae 100644
--- a/templates/post/flag.html
+++ b/templates/post/flag.html
@@ -1,5 +1,5 @@
 {% if config.display_flags and post.modifiers.flag %}
-	<img
+	 <img
 		{% if config.country_flags_condensed %}
 			 class="flag flag-{{ post.modifiers.flag }}" src="{{ config.image_blank }}"
 		{% else %}
-- 
cgit v1.3


From 04f42b3802631a825d8ef112b153e66e962a0e66 Mon Sep 17 00:00:00 2001
From: fatchan <admin@fatpeople.lol>
Date: Wed, 1 Jun 2016 19:51:21 +1000
Subject: CSS hover instead of javascript mouseover. Need to use important
 because the dark/light text determined by IDToRGB is added inline and takes
 priority over stylesheets.

---
 js/id_colors.js       | 6 ------
 stylesheets/style.css | 4 +++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/js/id_colors.js b/js/id_colors.js
index 6335f960..55454476 100644
--- a/js/id_colors.js
+++ b/js/id_colors.js
@@ -50,12 +50,6 @@ if (active_page == 'thread' || active_page == 'index') {
 				"border-radius": "8px",
 				"color": ft
 			});
-
-			$(el).mouseover(function() {
-				$(this).css('color', '#800000'); // how about a CSS :hover rule instead?
-			}).mouseout(function() {
-				$(this).css('color', ft);
-			});
 		}
 
 		$(".poster_id").each(function(k, v){
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 39d1fd04..7bedfe14 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -913,7 +913,9 @@ pre {
 .poster_id {
   cursor: pointer;
 }
-
+.poster_id:hover {
+  color: #800000!important;
+}
 .poster_id::before {
   content: " ID: ";
 }
-- 
cgit v1.3


From aa0d92a2b413e268ecf60211cf2132248c3c72ad Mon Sep 17 00:00:00 2001
From: fatchan <admin@fatpeople.lol>
Date: Wed, 1 Jun 2016 20:35:17 +1000
Subject: Force post-hover.js to show OP's on hover.

---
 js/post-hover.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/js/post-hover.js b/js/post-hover.js
index 0becfb70..780f8cff 100644
--- a/js/post-hover.js
+++ b/js/post-hover.js
@@ -54,10 +54,7 @@ onready(function(){
 			hovered_at = {'x': e.pageX, 'y': e.pageY};
 			
 			var start_hover = function($link) {
-				if($.contains($post[0], $link[0])) {
-					// link links to itself or to op; ignore
-				}
-				else if($post.is(':visible') &&
+				if ($post.is(':visible') &&
 						$post.offset().top >= $(window).scrollTop() &&
 						$post.offset().top + $post.height() <= $(window).scrollTop() + $(window).height()) {
 					// post is in view
-- 
cgit v1.3


From f27c26907d37c9d04f848f5594022a79a34624ee Mon Sep 17 00:00:00 2001
From: fatchan <admin@fatpeople.lol>
Date: Tue, 7 Jun 2016 23:20:38 +1000
Subject: Remove hardcoded 8chan links in catalog RSS

---
 templates/themes/catalog/index.rss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/themes/catalog/index.rss b/templates/themes/catalog/index.rss
index 248b494a..7add8869 100644
--- a/templates/themes/catalog/index.rss
+++ b/templates/themes/catalog/index.rss
@@ -2,17 +2,17 @@
 <rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
 <channel>
 	<title>/{{ board.uri }}/ - {{ board.title|e }}</title>
-	<link>https://8ch.net/{{ board.uri }}/</link>
+	<link>{{ config.root }}{{ board.uri }}/</link>
 	<description>Live feed of new threads on the 8chan board /{{ board.uri }}/ - {{ board.title|e }}.</description>
-	<atom:link href="https://8ch.net/{{ board.uri }}/index.rss" rel="self" type="application/rss+xml"/>
+	<atom:link href="{{ config.root }}{{ board.uri }}/index.rss" rel="self" type="application/rss+xml"/>
 	{% for post in recent_posts %}
 	<item>
 		<title>{% if post.subject %}{{ post.subject|e }}{% else %}{{ post.body_nomarkup[:256]|remove_modifiers|e }}{% endif %}</title>
-		<link>https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html</link>
-		<guid>https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html</guid>
-		<comments>https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html</comments>
+		<link>{{ config.root }}{{ board.uri }}/res/{{ post.id }}.html</link>
+		<guid>{{ config.root }}{{ board.uri }}/res/{{ post.id }}.html</guid>
+		<comments>{{ config.root }}{{ board.uri }}/res/{{ post.id }}.html</comments>
 		<pubDate>{{ post.pubdate }}</pubDate>
-		<description><![CDATA[ <a href='https://8ch.net/{{ board.uri }}/res/{{ post.id }}.html' target=_blank><img style='float:left;margin:8px' border=0 src='{% if not config.uri_thumb %}https://8ch.net/{% endif %}{{ post.file }}'></a> {{ post.body }} ]]></description>
+		<description><![CDATA[ <a href='{{ config.root }}{{ board.uri }}/res/{{ post.id }}.html' target=_blank><img style='float:left;margin:8px' border=0 src='{% if not config.uri_thumb %}{{ config.root }}{% endif %}{{ post.file }}'></a> {{ post.body }} ]]></description>
 	</item>
 	{% endfor %}
 </channel>
-- 
cgit v1.3


From 4f3cc7f316d18b159ed5aef3878a9d30d1717d4e Mon Sep 17 00:00:00 2001
From: fatchan <admin@fatpeople.lol>
Date: Tue, 7 Jun 2016 23:29:19 +1000
Subject: Whoops

---
 templates/themes/catalog/index.rss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/themes/catalog/index.rss b/templates/themes/catalog/index.rss
index 7add8869..e6576ffc 100644
--- a/templates/themes/catalog/index.rss
+++ b/templates/themes/catalog/index.rss
@@ -3,7 +3,7 @@
 <channel>
 	<title>/{{ board.uri }}/ - {{ board.title|e }}</title>
 	<link>{{ config.root }}{{ board.uri }}/</link>
-	<description>Live feed of new threads on the 8chan board /{{ board.uri }}/ - {{ board.title|e }}.</description>
+	<description>Live feed of new threads on the board /{{ board.uri }}/ - {{ board.title|e }}.</description>
 	<atom:link href="{{ config.root }}{{ board.uri }}/index.rss" rel="self" type="application/rss+xml"/>
 	{% for post in recent_posts %}
 	<item>
-- 
cgit v1.3


From f23d11be60dd03039b04320dc0ea83f563332c9c Mon Sep 17 00:00:00 2001
From: Duane Moody <duane_moody@yahoo.com>
Date: Thu, 22 Oct 2015 10:50:59 -0700
Subject: Prevent poster IDs from wordwrapping

Poster IDs still linebreak between "ID:" and the ID, this corrects that without having to replace the space inbetween with an &nbsp; nonbreaking space.
---
 stylesheets/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 7bedfe14..abd94973 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -912,6 +912,7 @@ pre {
 
 .poster_id {
   cursor: pointer;
+  white-space:nowrap;
 }
 .poster_id:hover {
   color: #800000!important;
-- 
cgit v1.3


From c9ef21bff98698902cf5c89b3baf29a17864fd7a Mon Sep 17 00:00:00 2001
From: fatchan <admin@fatpeople.lol>
Date: Wed, 8 Jun 2016 00:03:50 +1000
Subject: Better solution to prevent ID wrapping. Also no longer
 text-selectable. Much cleaner.

---
 stylesheets/style.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/stylesheets/style.css b/stylesheets/style.css
index abd94973..23d3ad7d 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -912,7 +912,12 @@ pre {
 
 .poster_id {
   cursor: pointer;
-  white-space:nowrap;
+  display: inline-block;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -o-user-select: none;
+  user-select: none;
 }
 .poster_id:hover {
   color: #800000!important;
-- 
cgit v1.3


From e230f1472cdd9fe5d416196d51e905eac22ce70e Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 10 Jun 2016 12:41:53 +0200
Subject: don`t ocr non-images

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

diff --git a/post.php b/post.php
index bf723e01..383154fb 100644
--- a/post.php
+++ b/post.php
@@ -788,7 +788,7 @@ if (isset($_POST['delete'])) {
 			$file['thumbheight'] = $size[1];
 		}
 
-		if ($config['tesseract_ocr']) { // Let's OCR it!
+		if ($config['tesseract_ocr'] && $file['thumb'] != 'file') { // Let's OCR it!
 			$fname = $file['tmp_name'];
 
 			if ($file['height'] > 500 || $file['width'] > 500) {
-- 
cgit v1.3


From 356f46237c3281b09d1fcc1df4e19cb12947063e Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 19 Jun 2016 02:15:49 +0200
Subject: fix install.sql after a bad merge

---
 install.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install.sql b/install.sql
index 720e4ed5..bf9b92bf 100644
--- a/install.sql
+++ b/install.sql
@@ -314,7 +314,6 @@ CREATE TABLE `pages` (
   UNIQUE KEY `u_pages` (`name`,`board`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
->>>>>>> 12fa8ec... Edit static pages commit
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-- 
cgit v1.3


From fed9065cf1fe759e20ec10baf0aba1309ee6f8ab Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 19 Jun 2016 02:23:24 +0200
Subject: skip non-image files in recent themes; fixes vichan-devel/vichan#185

---
 templates/themes/recent/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index 95921c35..a826048f 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -65,7 +65,7 @@
 				if (isset($post['files']))
 					$files = json_decode($post['files']);
 
-                if ($files[0]->file == 'deleted') continue;
+                if ($files[0]->file == 'deleted' || $files[0]->thumb == 'file') continue;
 				
 				// board settings won't be available in the template file, so generate links now
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res']
-- 
cgit v1.3


From 8f4aa2732900afc837d5154f518dc3a683f58bd1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 19 Jun 2016 02:40:24 +0200
Subject: fix file-selector.js dependencies

---
 js/file-selector.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/file-selector.js b/js/file-selector.js
index 207a5ae9..c2b5381b 100644
--- a/js/file-selector.js
+++ b/js/file-selector.js
@@ -1,8 +1,9 @@
 /*
- * file-selector.js - Add support for drag and drop file selection, and paste from clipbboard on supported browsers.
+ * file-selector.js - Add support for drag and drop file selection, and paste from clipboard on supported browsers.
  *
  * Usage:
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/ajax.js';
  *   $config['additional_javascript'][] = 'js/file-selector.js';
  */
 function init_file_selector(max_images) {
-- 
cgit v1.3


From 11cecf8452d724b1a61e82292cff1cc16a5403e7 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 21 Jun 2016 05:03:44 +0200
Subject: Revert "[BUG] Image reject repost board option now also affects YT
 embeds"

This reverts commit b476b660073adbe827836a7e7860b0fb3a061ff0.
---
 inc/functions.php | 47 -----------------------------------------------
 post.php          | 28 +---------------------------
 2 files changed, 1 insertion(+), 74 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index e576cf99..043d4de7 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2492,53 +2492,6 @@ function getPostByHashInThread($hash, $thread) {
 	return false;
 }
 
-function getPostByEmbed($embed) {
-	global $board, $config;
-	$matches = array();
-	foreach ($config['embedding'] as &$e) {
-		if (preg_match($e[0], $embed, $matches) && isset($matches[1]) && !empty($matches[1])) {
-			$embed = '%'.$matches[1].'%';
-			break;
-		}
-	}
-
-	if (!isset($embed)) return false;
-
-	$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `embed` LIKE :embed", $board['uri']));
-	$query->bindValue(':embed', $embed, PDO::PARAM_STR);
-	$query->execute() or error(db_error($query));
-
-	if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
-		return $post;
-	}
-
-	return false;
-}
-
-function getPostByEmbedInThread($embed, $thread) {
-	global $board, $config;
-	$matches = array();
-	foreach ($config['embedding'] as &$e) {
-		if (preg_match($e[0], $embed, $matches) && isset($matches[1]) && !empty($matches[1])) {
-			$embed = '%'.$matches[1].'%';
-			break;
-		}
-	}
-
-	if (!isset($embed)) return false;
-
-	$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `embed` = :embed AND ( `thread` = :thread OR `id` = :thread )", $board['uri']));
-	$query->bindValue(':embed', $embed, PDO::PARAM_STR);
-	$query->bindValue(':thread', $thread, PDO::PARAM_INT);
-	$query->execute() or error(db_error($query));
-
-	if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
-		return $post;
-	}
-
-	return false;
-}
-
 function undoImage(array $post) {
 	if (!$post['has_file'] || !isset($post['files']))
 		return;
diff --git a/post.php b/post.php
index 383154fb..aa1b8235 100644
--- a/post.php
+++ b/post.php
@@ -295,32 +295,6 @@ if (isset($_POST['delete'])) {
 		if (!isset($post['embed'])) {
 			error($config['error']['invalid_embed']);
 		}
-
-		if ($config['image_reject_repost']) {
-			if ($p = getPostByEmbed($post['embed'])) {
-				error(sprintf($config['error']['fileexists'], 
-					($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
-					($board['dir'] . $config['dir']['res'] .
-						($p['thread'] ?
-							$p['thread'] . '.html#' . $p['id']
-						:
-							$p['id'] . '.html'
-						))
-				));
-			}
-		} else if (!$post['op'] && $config['image_reject_repost_in_thread']) {
-			if ($p = getPostByEmbedInThread($post['embed'], $post['thread'])) {
-				error(sprintf($config['error']['fileexistsinthread'], 
-					($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
-					($board['dir'] . $config['dir']['res'] .
-						($p['thread'] ?
-							$p['thread'] . '.html#' . $p['id']
-						:
-							$p['id'] . '.html'
-						))
-				));
-			}
-		}
 	}
 	
 	if (!hasPermission($config['mod']['bypass_field_disable'], $board['uri'])) {
@@ -853,7 +827,7 @@ if (isset($_POST['delete'])) {
 				));
 			}
 		}
-	}
+		}
 	
 	// Do filters again if OCRing
 	if ($config['tesseract_ocr'] && !hasPermission($config['mod']['bypass_filters'], $board['uri'])) {
-- 
cgit v1.3


From a55760299c6777fc841a9990fa9b590b17663bb8 Mon Sep 17 00:00:00 2001
From: nekomiko482 <nekomiko482@yandex.ru>
Date: Thu, 7 Jul 2016 12:53:40 +0300
Subject: Fixes incompatibility with BSD's md5 output format.

fixes #190
---
 post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/post.php b/post.php
index aa1b8235..753d2006 100644
--- a/post.php
+++ b/post.php
@@ -607,7 +607,7 @@ if (isset($_POST['delete'])) {
 				error($config['error']['nomove']);
 
 			if ($md5cmd) {
-				$output = shell_exec_error($md5cmd . " < " . escapeshellarg($upload));
+				$output = shell_exec_error($md5cmd . " " . escapeshellarg($upload));
 				$output = explode(' ', $output);
 				$hash = $output[0];
 			}
-- 
cgit v1.3


From 8548a4ff703acd5a77e4ce678eeb88e4261a1aa6 Mon Sep 17 00:00:00 2001
From: ptchan-foss <admin@ptchan.net>
Date: Fri, 12 Aug 2016 18:18:54 +0100
Subject: Fixed report syslog message

---
 post.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/post.php b/post.php
index 753d2006..0f58dd4c 100644
--- a/post.php
+++ b/post.php
@@ -148,15 +148,15 @@ 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(sprintf("SELECT `id`, `thread` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
-		$thread = $query->fetchColumn();
+		$post = $query->fetch(PDO::FETCH_ASSOC);
 		
 		if ($config['syslog'])
 			_syslog(LOG_INFO, 'Reported post: ' .
-				'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($thread ? '#' . $id : '') .
+				'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($post['thread'] ? '#' . $id : '') .
 				' for "' . $reason . '"'
 			);
 		$query = prepare("INSERT INTO ``reports`` VALUES (NULL, :time, :ip, :board, :post, :reason)");
-- 
cgit v1.3


From 5e335a8564a76f0449d47f0767b4baa8d2cb9e91 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 14 Aug 2016 16:24:17 +0200
Subject: preliminary inbound nntpchan support

---
 inc/config.php |  17 +++
 install.php    |  15 ++-
 install.sql    |  19 +++
 post.php       | 359 +++++++++++++++++++++++++++++++++++++++++++--------------
 4 files changed, 322 insertions(+), 88 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index ebe17572..a8afdf7a 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1689,6 +1689,23 @@
 	// Example: Adding the pre-markup post body to the API as "com_nomarkup".
 	// $config['api']['extra_fields'] = array('body_nomarkup' => 'com_nomarkup');
 
+/*
+ * ==================
+ *  NNTPChan settings
+ * ==================
+ */
+
+	$config['nntpchan'] = array();
+
+	// Enable NNTPChan integration
+	$config['nntpchan']['enabled'] = false;
+
+	// NNTP server
+	$config['nntpchan']['server'] = "localhost:1119";
+
+	// Global dispatch array. Add your boards to it to enable them.
+	$config['nntpchan']['dispatch'] = array(); // 'overchan.test' => 'test'
+
 /*
  * ====================
  *  Other/uncategorized
diff --git a/install.php b/install.php
index de4d3dd0..6f1617a8 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', '5.1.2');
+define('VERSION', '5.1.3');
 
 require 'inc/functions.php';
 
@@ -574,6 +574,19 @@ if (file_exists($config['has_installed'])) {
                         foreach ($boards as &$board) {
                                 query(sprintf("ALTER TABLE ``posts_%s`` ADD `cycle` int(1) NOT NULL AFTER `locked`", $board['uri'])) or error(db_error());
                         }
+		case '5.1.2':
+			query('CREATE TABLE ``nntp_references`` (
+				  `board` varchar(60) NOT NULL,
+				  `id` int(11) unsigned NOT NULL,
+				  `message_id` varchar(255) CHARACTER SET ascii NOT NULL,
+				  `message_id_digest` varchar(40) CHARACTER SET ascii NOT NULL,
+				  `own` tinyint(1) NOT NULL,
+				  `headers` text,
+				  PRIMARY KEY (`message_id_digest`),
+				  UNIQUE KEY `message_id` (`message_id`),
+				  UNIQUE KEY `u_board_id` (`board`, `id`)
+				) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+			') or error(db_error());
 
 		case false:
 			// TODO: enhance Tinyboard -> vichan upgrade path.
diff --git a/install.sql b/install.sql
index bf9b92bf..3b390645 100644
--- a/install.sql
+++ b/install.sql
@@ -314,6 +314,25 @@ CREATE TABLE `pages` (
   UNIQUE KEY `u_pages` (`name`,`board`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `nntp_references`
+--
+
+CREATE TABLE `nntp_references` (
+  `board` varchar(60) NOT NULL,
+  `id` int(11) unsigned NOT NULL,
+  `message_id` varchar(255) CHARACTER SET ascii NOT NULL,
+  `message_id_digest` varchar(40) CHARACTER SET ascii NOT NULL,
+  `own` tinyint(1) NOT NULL,
+  `headers` text,
+  PRIMARY KEY (`message_id_digest`),
+  UNIQUE KEY `message_id` (`message_id`),
+  UNIQUE KEY `u_board_id` (`board`, `id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/post.php b/post.php
index aa1b8235..4af09928 100644
--- a/post.php
+++ b/post.php
@@ -11,6 +11,160 @@ if ((!isset($_POST['mod']) || !$_POST['mod']) && $config['board_locked']) {
     error("Board is locked");
 }
 
+$dropped_post = false;
+
+if (isset($_GET['Newsgroups']) && $config['nntpchan']['enabled']) {
+	$_POST = array();
+	$_POST['json_response'] = true;
+
+	$headers = json_encode($_GET);
+
+	if (!isset ($_GET['Message-Id'])) {
+		if (!isset ($_GET['Message-ID'])) {
+			error("NNTPChan: No message ID");
+		}
+		else $msgid = $_GET['Message-ID'];
+	}
+	else $msgid = $_GET['Message-Id'];
+
+	$groups = preg_split("/,\s*/", $_GET['Newsgroups']);
+	if (count($groups) != 1) {
+		error("NNTPChan: Messages can go to only one newsgroup");
+	}
+	$group = $groups[0];
+
+	if (!isset($config['nntpchan']['dispatch'][$group])) {
+		error("NNTPChan: We don't synchronize $group");
+	}
+	$xboard = $config['nntpchan']['dispatch'][$group];
+
+	$ref = null;
+	if (isset ($_GET['References'])) {
+		$refs = preg_split("/,\s*/", $_GET['References']);
+
+		if (count($refs) > 1) {
+			error("NNTPChan: We don't support multiple references");
+		}
+
+		$ref = $refs[0];
+
+		$query = prepare("SELECT `board`,`id` FROM ``nntp_references`` WHERE `message_id` = :ref");
+                $query->bindValue(':ref', $ref);
+                $query->execute() or error(db_error($query));
+
+		$ary = $query->fetchAll(PDO::FETCH_ASSOC);
+
+		if (count($ary) == 0) {
+			error("NNTPChan: We don't have $ref that $msgid references");
+		}
+
+		$p_id = $ary[0]['id'];
+		$p_board = $ary[0]['board'];
+
+		if ($p_board != $xboard) {
+			error("NNTPChan: Cross board references not allowed. Tried to reference $p_board on $xboard");
+		}
+
+		$_POST['thread'] = $p_id;
+	}
+
+	$date = isset($_GET['Date']) ? strtotime($_GET['Date']) : time();
+
+	list($ct) = explode('; ', $_GET['Content-Type']);
+
+	$query = prepare("SELECT COUNT(*) AS `c` FROM ``nntp_references`` WHERE `message_id` = :msgid");
+	$query->bindValue(":msgid", $msgid);
+	$query->execute() or error(db_error($query));
+
+	$a = $query->fetch(PDO::FETCH_ASSOC);
+	if ($a['c'] > 0) {
+		error("NNTPChan: We already have this post. Post discarded.");
+	}
+
+	if ($ct == 'text/plain') {
+		$content = file_get_contents("php://input");
+	}
+	elseif ($ct == 'multipart/mixed' || $ct == 'multipart/form-data') {
+		_syslog(LOG_INFO, "MM: Files: ".print_r($GLOBALS, true));
+		$content = '';
+
+		$tmpfiles = $_FILES['attachment'];
+		foreach ($tmpfiles as $id => $file) {
+			if ($file['type'] == 'text/plain') {
+				$content .= file_get_contents($file['tmp_name']);
+				unset($_FILES['attachment'][$id]);
+			}
+			elseif ($file['type'] == 'message/rfc822') { // Signed message, ignore for now
+				unset($_FILES['attachment'][$id]);
+			}
+			else { // A real attachment :^)
+			}
+		}
+
+		$_FILES = $_FILES['attachment'];
+
+
+	}
+	else {
+		error("NNTPChan: Wrong mime type: $ct");
+	}
+
+	$_POST['subject'] = isset($_GET['Subject']) ? $_GET['Subject'] : '';
+	$_POST['board'] = $xboard;
+
+	if (isset ($_GET['From'])) {
+		list($name, $mail) = explode(" <", $_GET['From'], 2);
+		$mail = preg_replace('/>\s+$/', '', $mail);
+
+		$_POST['name'] = $name;
+		//$_POST['email'] = $mail;
+		$_POST['email'] = '';
+	}
+
+	if (isset ($_GET['X_Sage'])) {
+		$_POST['email'] = 'sage';
+	}
+
+	$content = preg_replace_callback('/>>([0-9a-fA-F]{6,})/', function($id) use ($xboard) {
+		$id = $id[1];
+
+		$query = prepare("SELECT `board`,`id` FROM ``nntp_references`` WHERE `message_id_digest` LIKE :rule");
+		$idx = $id . "%";
+                $query->bindValue(':rule', $idx);
+                $query->execute() or error(db_error($query));
+		
+		$ary = $query->fetchAll(PDO::FETCH_ASSOC);
+		if (count($ary) == 0) {
+			return ">>>>$id";
+		}
+		else {
+			$ret = array();
+			foreach ($ary as $v) {
+				if ($v['board'] != $xboard) {
+					$ret[] = ">>>/".$v['board']."/".$v['id'];
+				}
+				else {
+					$ret[] = ">>".$v['id'];
+				}
+			}
+			return implode($ret, ", ");
+		}
+	}, $content);
+
+	$_POST['body'] = $content;
+
+	$dropped_post = array(
+		'date' => $date,
+		'board' => $xboard,
+		'msgid' => $msgid,
+		'headers' => $headers,
+		'from_nntp' => true,
+	);
+}
+elseif (isset($_GET['Newsgroups'])) {
+	error("NNTPChan: NNTPChan support is disabled");
+}
+
 if (isset($_POST['delete'])) {
 	// Delete
 	
@@ -178,8 +332,8 @@ if (isset($_POST['delete'])) {
 		header('Content-Type: text/json');
 		echo json_encode(array('success' => true));
 	}
-} elseif (isset($_POST['post'])) {
-	if (!isset($_POST['body'], $_POST['board']))
+} elseif (isset($_POST['post']) || $dropped_post) {
+	if (!isset($_POST['body'], $_POST['board']) && !$dropped_post)
 		error($config['error']['bot']);
 
 	$post = array('board' => $_POST['board'], 'files' => array());
@@ -206,61 +360,67 @@ if (isset($_POST['delete'])) {
 	} else
 		$post['op'] = true;
 
-	// Check for CAPTCHA right after opening the board so the "return" link is in there
-	if ($config['recaptcha']) {
-		if (!isset($_POST['recaptcha_challenge_field']) || !isset($_POST['recaptcha_response_field']))
-			error($config['error']['bot']);
-		// Check what reCAPTCHA has to say...
-		$resp = recaptcha_check_answer($config['recaptcha_private'],
-			$_SERVER['REMOTE_ADDR'],
-			$_POST['recaptcha_challenge_field'],
-			$_POST['recaptcha_response_field']);
-		if (!$resp->is_valid) {
-			error($config['error']['captcha']);
+
+	if (!$dropped_post) {
+		// Check for CAPTCHA right after opening the board so the "return" link is in there
+		if ($config['recaptcha']) {
+			if (!isset($_POST['recaptcha_challenge_field']) || !isset($_POST['recaptcha_response_field']))
+				error($config['error']['bot']);	
+				// Check what reCAPTCHA has to say...
+				$resp = recaptcha_check_answer($config['recaptcha_private'],
+				$_SERVER['REMOTE_ADDR'],
+				$_POST['recaptcha_challenge_field'],
+				$_POST['recaptcha_response_field']);
+			if (!$resp->is_valid) {
+				error($config['error']['captcha']);
+			}
 		}
-	}
 
-	if (!(($post['op'] && $_POST['post'] == $config['button_newtopic']) ||
-		(!$post['op'] && $_POST['post'] == $config['button_reply'])))
-		error($config['error']['bot']);
+		if (!(($post['op'] && $_POST['post'] == $config['button_newtopic']) ||
+			(!$post['op'] && $_POST['post'] == $config['button_reply'])))
+			error($config['error']['bot']);
 	
-	// Check the referrer
-	if ($config['referer_match'] !== false &&
-		(!isset($_SERVER['HTTP_REFERER']) || !preg_match($config['referer_match'], rawurldecode($_SERVER['HTTP_REFERER']))))
-		error($config['error']['referer']);
+		// Check the referrer
+		if ($config['referer_match'] !== false &&
+			(!isset($_SERVER['HTTP_REFERER']) || !preg_match($config['referer_match'], rawurldecode($_SERVER['HTTP_REFERER']))))
+			error($config['error']['referer']);
 	
-	checkDNSBL();
+		checkDNSBL();
 		
-	// Check if banned
-	checkBan($board['uri']);
+		// Check if banned
+		checkBan($board['uri']);
 
-	if ($post['mod'] = isset($_POST['mod']) && $_POST['mod']) {
-		check_login(false);
-		if (!$mod) {
-			// Liar. You're not a mod.
-			error($config['error']['notamod']);
-		}
+		if ($post['mod'] = isset($_POST['mod']) && $_POST['mod']) {
+			check_login(false);
+			if (!$mod) {
+				// Liar. You're not a mod.
+				error($config['error']['notamod']);
+			}
 		
-		$post['sticky'] = $post['op'] && isset($_POST['sticky']);
-		$post['locked'] = $post['op'] && isset($_POST['lock']);
-		$post['raw'] = isset($_POST['raw']);
+			$post['sticky'] = $post['op'] && isset($_POST['sticky']);
+			$post['locked'] = $post['op'] && isset($_POST['lock']);
+			$post['raw'] = isset($_POST['raw']);
 		
-		if ($post['sticky'] && !hasPermission($config['mod']['sticky'], $board['uri']))
-			error($config['error']['noaccess']);
-		if ($post['locked'] && !hasPermission($config['mod']['lock'], $board['uri']))
-			error($config['error']['noaccess']);
-		if ($post['raw'] && !hasPermission($config['mod']['rawhtml'], $board['uri']))
-			error($config['error']['noaccess']);
-	}
+			if ($post['sticky'] && !hasPermission($config['mod']['sticky'], $board['uri']))
+				error($config['error']['noaccess']);
+			if ($post['locked'] && !hasPermission($config['mod']['lock'], $board['uri']))
+				error($config['error']['noaccess']);
+			if ($post['raw'] && !hasPermission($config['mod']['rawhtml'], $board['uri']))
+				error($config['error']['noaccess']);
+		}
+		
+		if (!$post['mod']) {
+			$post['antispam_hash'] = checkSpam(array($board['uri'], isset($post['thread']) ? $post['thread'] : ($config['try_smarter'] && isset($_POST['page']) ? 0 - (int)$_POST['page'] : null)));
+			if ($post['antispam_hash'] === true)
+				error($config['error']['spam']);
+		}
 	
-	if (!$post['mod']) {
-		$post['antispam_hash'] = checkSpam(array($board['uri'], isset($post['thread']) ? $post['thread'] : ($config['try_smarter'] && isset($_POST['page']) ? 0 - (int)$_POST['page'] : null)));
-		if ($post['antispam_hash'] === true)
-			error($config['error']['spam']);
+		if ($config['robot_enable'] && $config['robot_mute']) {
+			checkMute();
+		}
 	}
-	
-	if ($config['robot_enable'] && $config['robot_mute']) {
-		checkMute();
+	else {
+		$mod = $post['mod'] = false;
 	}
 	
 	//Check if thread exists
@@ -371,28 +531,36 @@ if (isset($_POST['delete'])) {
 	$post['email'] = str_replace(' ', '%20', htmlspecialchars($_POST['email']));
 	$post['body'] = $_POST['body'];
 	$post['password'] = $_POST['password'];
-	$post['has_file'] = (!isset($post['embed']) && (($post['op'] && !isset($post['no_longer_require_an_image_for_op']) && $config['force_image_op']) || !empty($_FILES['file']['name'])));
+	$post['has_file'] = (!isset($post['embed']) && (($post['op'] && !isset($post['no_longer_require_an_image_for_op']) && $config['force_image_op']) || count($_FILES) > 0));
 	
-	if (!($post['has_file'] || isset($post['embed'])) || (($post['op'] && $config['force_body_op']) || (!$post['op'] && $config['force_body']))) {
-		$stripped_whitespace = preg_replace('/[\s]/u', '', $post['body']);
-		if ($stripped_whitespace == '') {
-			error($config['error']['tooshort_body']);
+	if (!$dropped_post) {
+
+		if (!($post['has_file'] || isset($post['embed'])) || (($post['op'] && $config['force_body_op']) || (!$post['op'] && $config['force_body']))) {
+			$stripped_whitespace = preg_replace('/[\s]/u', '', $post['body']);
+			if ($stripped_whitespace == '') {
+				error($config['error']['tooshort_body']);
+			}
 		}
-	}
 	
-	if (!$post['op']) {
-		// Check if thread is locked
-		// but allow mods to post
-		if ($thread['locked'] && !hasPermission($config['mod']['postinlocked'], $board['uri']))
-			error($config['error']['locked']);
+		if (!$post['op']) {
+			// Check if thread is locked
+			// but allow mods to post
+			if ($thread['locked'] && !hasPermission($config['mod']['postinlocked'], $board['uri']))
+				error($config['error']['locked']);
 		
-		$numposts = numPosts($post['thread']);
+			$numposts = numPosts($post['thread']);
 		
-		if ($config['reply_hard_limit'] != 0 && $config['reply_hard_limit'] <= $numposts['replies'])
-			error($config['error']['reply_hard_limit']);
+			if ($config['reply_hard_limit'] != 0 && $config['reply_hard_limit'] <= $numposts['replies'])
+				error($config['error']['reply_hard_limit']);
 		
-		if ($post['has_file'] && $config['image_hard_limit'] != 0 && $config['image_hard_limit'] <= $numposts['images'])
-			error($config['error']['image_hard_limit']);
+			if ($post['has_file'] && $config['image_hard_limit'] != 0 && $config['image_hard_limit'] <= $numposts['images'])
+				error($config['error']['image_hard_limit']);
+		}
+	}
+	else {
+		if (!$post['op']) {
+                        $numposts = numPosts($post['thread']);
+		}
 	}
 		
 	if ($post['has_file']) {
@@ -442,7 +610,7 @@ if (isset($_POST['delete'])) {
 	
 	$trip = generate_tripcode($post['name']);
 	$post['name'] = $trip[0];
-	$post['trip'] = isset($trip[1]) ? $trip[1] : '';
+	$post['trip'] = isset($trip[1]) ? $trip[1] : ''; // XX: Dropped posts and tripcodes
 	
 	$noko = false;
 	if (strtolower($post['email']) == 'noko') {
@@ -477,15 +645,17 @@ if (isset($_POST['delete'])) {
 
 	if (empty($post['files'])) $post['has_file'] = false;
 
-	// Check for a file
-	if ($post['op'] && !isset($post['no_longer_require_an_image_for_op'])) {
-		if (!$post['has_file'] && $config['force_image_op'])
-			error($config['error']['noimage']);
-	}
+	if (!$dropped_post) {
+		// Check for a file
+		if ($post['op'] && !isset($post['no_longer_require_an_image_for_op'])) {
+			if (!$post['has_file'] && $config['force_image_op'])
+				error($config['error']['noimage']);
+		}
 
-	// Check for too many files
-	if (sizeof($post['files']) > $config['max_images'])
-		error($config['error']['toomanyimages']);
+		// Check for too many files
+		if (sizeof($post['files']) > $config['max_images'])
+			error($config['error']['toomanyimages']);
+	}
 
 	if ($config['strip_combining_chars']) {
 		$post['name'] = strip_combining_chars($post['name']);
@@ -494,18 +664,19 @@ if (isset($_POST['delete'])) {
 		$post['body'] = strip_combining_chars($post['body']);
 	}
 	
-	// Check string lengths
-	if (mb_strlen($post['name']) > 35)
-		error(sprintf($config['error']['toolong'], 'name'));	
-	if (mb_strlen($post['email']) > 40)
-		error(sprintf($config['error']['toolong'], 'email'));
-	if (mb_strlen($post['subject']) > 100)
-		error(sprintf($config['error']['toolong'], 'subject'));
-	if (!$mod && mb_strlen($post['body']) > $config['max_body'])
-		error($config['error']['toolong_body']);
-	if (mb_strlen($post['password']) > 20)
-		error(sprintf($config['error']['toolong'], 'password'));
-		
+	if (!$dropped_post) {
+		// Check string lengths
+		if (mb_strlen($post['name']) > 35)
+			error(sprintf($config['error']['toolong'], 'name'));	
+		if (mb_strlen($post['email']) > 40)
+			error(sprintf($config['error']['toolong'], 'email'));
+		if (mb_strlen($post['subject']) > 100)
+			error(sprintf($config['error']['toolong'], 'subject'));
+		if (!$mod && mb_strlen($post['body']) > $config['max_body'])
+			error($config['error']['toolong_body']);
+		if (mb_strlen($post['password']) > 20)
+			error(sprintf($config['error']['toolong'], 'password'));
+	}
 	wordfilters($post['body']);
 	
 	$post['body'] = escape_markup_modifiers($post['body']);
@@ -514,6 +685,7 @@ if (isset($_POST['delete'])) {
 		$post['body'] .= "\n<tinyboard raw html>1</tinyboard>";
 	}
 	
+	if (!$dropped_post)
 	if (($config['country_flags'] && !$config['allow_no_country']) || ($config['country_flags'] && $config['allow_no_country'] && !isset($_POST['no_country']))) {
 		require 'inc/lib/geoip/geoip.inc';
 		$gi=geoip\geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD);
@@ -555,6 +727,7 @@ if (isset($_POST['delete'])) {
 		$post['body'] .= "\n<tinyboard tag>" . $_POST['tag'] . "</tinyboard>";
 	}
 
+	if (!$dropped_post)
         if ($config['proxy_save'] && isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
 		$proxy = preg_replace("/[^0-9a-fA-F.,: ]/", '', $_SERVER['HTTP_X_FORWARDED_FOR']);
 		$post['body'] .= "\n<tinyboard proxy>".$proxy."</tinyboard>";
@@ -627,7 +800,7 @@ if (isset($_POST['delete'])) {
 		}
 	}
 
-	if (!hasPermission($config['mod']['bypass_filters'], $board['uri'])) {
+	if (!hasPermission($config['mod']['bypass_filters'], $board['uri']) && !$dropped_post) {
 		require_once 'inc/filters.php';
 
 		do_filters($post);
@@ -830,11 +1003,11 @@ if (isset($_POST['delete'])) {
 		}
 	
 	// Do filters again if OCRing
-	if ($config['tesseract_ocr'] && !hasPermission($config['mod']['bypass_filters'], $board['uri'])) {
+	if ($config['tesseract_ocr'] && !hasPermission($config['mod']['bypass_filters'], $board['uri']) && !$dropped_post) {
 		do_filters($post);
 	}
 
-	if (!hasPermission($config['mod']['postunoriginal'], $board['uri']) && $config['robot_enable'] && checkRobot($post['body_nomarkup'])) {
+	if (!hasPermission($config['mod']['postunoriginal'], $board['uri']) && $config['robot_enable'] && checkRobot($post['body_nomarkup']) && !$dropped_post) {
 		undoImage($post);
 		if ($config['robot_mute']) {
 			error(sprintf($config['error']['muted'], mute()));
@@ -873,6 +1046,18 @@ if (isset($_POST['delete'])) {
 	$post['id'] = $id = post($post);
 	$post['slug'] = slugify($post);
 	
+
+	if ($dropped_post && $dropped_post['from_nntp']) {
+	        $query = prepare("INSERT INTO ``nntp_references`` (`board`, `id`, `message_id`, `message_id_digest`, `own`, `headers`) VALUES ".
+	                                                         "(:board , :id , :message_id , :message_id_digest , false, :headers)");
+
+		$query->bindValue(':board', $dropped_post['board']);
+		$query->bindValue(':id', $id);
+		$query->bindValue(':message_id', $dropped_post['msgid']);
+		$query->bindValue(':message_id_digest', sha1($dropped_post['msgid']));
+		$query->bindValue(':headers', $dropped_post['headers']);
+		$query->execute() or error(db_error($query));
+	}
 	insertFloodPost($post);
 
 	// Handle cyclical threads
-- 
cgit v1.3


From a779b96370d3353c8409d64b70c724fa783ad219 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 15 Aug 2016 00:56:06 +0200
Subject: second iteration of nntpchan implementation

---
 inc/config.php            |  24 +++++++-
 inc/nntpchan/nntpchan.php | 149 ++++++++++++++++++++++++++++++++++++++++++++++
 inc/nntpchan/tests.php    |  30 ++++++++++
 post.php                  |  29 +++++++++
 4 files changed, 231 insertions(+), 1 deletion(-)
 create mode 100644 inc/nntpchan/nntpchan.php
 create mode 100644 inc/nntpchan/tests.php

diff --git a/inc/config.php b/inc/config.php
index a8afdf7a..bfb774a8 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1693,6 +1693,11 @@
  * ==================
  *  NNTPChan settings
  * ==================
+ */
+
+/*
+ * Please keep in mind that NNTPChan support in vichan isn't finished yet / is in an experimental
+ * state. Please join #nntpchan on Rizon in order to peer with someone.
  */
 
 	$config['nntpchan'] = array();
@@ -1703,9 +1708,26 @@
 	// NNTP server
 	$config['nntpchan']['server'] = "localhost:1119";
 
-	// Global dispatch array. Add your boards to it to enable them.
+	// Global dispatch array. Add your boards to it to enable them. Please make
+	// sure that this setting is set in a global context.
 	$config['nntpchan']['dispatch'] = array(); // 'overchan.test' => 'test'
 
+	// Trusted peer - an IP address of your NNTPChan instance. This peer will have
+	// increased capabilities, eg.: will evade spamfilter.
+	$config['nntpchan']['trusted_peer'] = '127.0.0.1';
+
+	// Salt for message ID generation. Keep it long and secure.
+	$config['nntpchan']['salt'] = 'change_me+please';
+
+	// A local message ID domain. Make sure to change it.
+	$config['nntpchan']['domain'] = 'example.vichan.net';
+
+	// An NNTPChan group name.
+	// Please set this setting in your board/config.php, not globally.
+	$config['nntpchan']['group'] = false; // eg. 'overchan.test'
+
+
+
 /*
  * ====================
  *  Other/uncategorized
diff --git a/inc/nntpchan/nntpchan.php b/inc/nntpchan/nntpchan.php
new file mode 100644
index 00000000..25215e94
--- /dev/null
+++ b/inc/nntpchan/nntpchan.php
@@ -0,0 +1,149 @@
+<?php
+/*
+ *  Copyright (c) 2016 vichan-devel
+ */
+
+defined('TINYBOARD') or exit;
+
+function gen_msgid($board, $id) {
+	global $config;
+
+	$b = preg_replace("/[^0-9a-zA-Z$]/", 'x', $board);
+	$salt = sha1($board . "|" . $id . "|" . $config['nntpchan']['salt']);
+	$salt = substr($salt, 0, 7);
+	$salt = base_convert($salt, 16, 36);
+
+	return "<$b.$id.$salt@".$config['nntpchan']['domain'].">";
+}
+
+
+function gen_nntp($headers, $files) {
+	if (count($files) == 0) {
+	}
+	else if (count($files) == 1 && $files[0]['type'] == 'text/plain') {
+		$content = $files[0]['text'] . "\r\n";
+		$headers['Content-Type'] = "text/plain; charset=UTF-8";
+	}
+	else {
+		$boundary = sha1($headers['Message-Id']);
+		$content = "";
+		$headers['Content-Type'] = "multipart/mixed; boundary=$boundary";
+		foreach ($files as $file) {
+			$content .= "--$boundary\r\n";
+			if (isset($file['name'])) {
+				$file['name'] = preg_replace('/[\r\n\0"]/', '', $file['name']);
+				$content .= "Content-Disposition: form-data; filename=\"$file[name]\"; name=\"attachment\"\r\n";
+			}
+			$type = explode('/', $file['type'])[0];
+			if ($type == 'text') {
+				$file['type'] .= '; charset=UTF-8';
+			}
+			$content .= "Content-Type: $file[type]\r\n";
+			if ($type != 'text' && $type != 'message') {
+				$file['text'] = base64_encode($file['text']);
+				$content .= "Content-Transfer-Encoding: base64\r\n";
+			}
+			$content .= "\r\n";
+			$content .= $file['text'];
+			$content .= "\r\n";
+		}
+		$content .= "--$boundary--\r\n";
+
+		$headers['Mime-Version'] = '1.0';
+	}
+	//$headers['Content-Length'] = strlen($content);
+	$headers['Date'] = date('r', $headers['Date']);
+	$out = "";
+	foreach ($headers as $id => $val) {
+		$val = str_replace("\n", "\n\t", $val);
+		$out .= "$id: $val\r\n";
+	}
+	$out .= "\r\n";
+	$out .= $content;
+	return $out;
+}
+
+function nntp_publish($msg, $id) {
+	$s = fsockopen("tcp://localhost:1119");
+	fgets($s);
+	fputs($s, "MODE STREAM\r\n");
+	fgets($s);
+	fputs($s, "TAKETHIS $id\r\n");
+	fputs($s, $msg);
+	fputs($s, "\r\n.\r\n");
+	fgets($s);
+	fclose($s);
+}
+
+function post2nntp($post, $msgid) {
+	global $config;
+
+	$headers = array();
+	$files = array();
+
+	$headers['Message-Id'] = $msgid;
+	$headers['Newsgroups'] = $config['nntpchan']['group'];
+	$headers['Date'] = time();
+	$headers['Subject'] = $post['subject'] ? $post['subject'] : "None";
+	$headers['From'] = $post['name'] . " <poster@" . $config['nntpchan']['domain'] . ">";
+
+	if ($post['email'] == 'sage') {
+		$headers['X-Sage'] = true;
+	}
+
+	if (!$post['op']) {
+		// Get muh parent
+		$query = prepare("SELECT `message_id` FROM ``nntp_references`` WHERE `board` = :board AND `id` = :id");
+		$query->bindValue(':board', $post['board']);
+		$query->bindValue(':id', $post['thread']);
+		$query->execute() or error(db_error($query));
+
+		if ($result = $query->fetch(PDO::FETCH_ASSOC)) {
+			$headers['References'] = $result['message_id'];
+		}
+		else {
+			return false; // We don't have OP. Discarding.
+		}
+        }
+
+	// Let's parse the body a bit.
+	$body = trim($post['body_nomarkup']);
+	$body = preg_replace('/\r?\n/', "\r\n", $body);
+	$body = preg_replace_callback('@>>(>/([a-zA-Z0-9_+-]+)/)?([0-9]+)@', function($o) use ($post) {
+		if ($o[1]) {
+			$board = $o[2];
+		}
+		else {
+			$board = $post['board'];
+		}
+		$id = $o[3];
+
+		$query = prepare("SELECT `message_id_digest` FROM ``nntp_references`` WHERE `board` = :board AND `id` = :id");
+                $query->bindValue(':board', $board);
+                $query->bindValue(':id', $id);
+                $query->execute() or error(db_error($query));
+
+                if ($result = $query->fetch(PDO::FETCH_ASSOC)) {
+			return ">>".substr($result['message_id_digest'], 0, 16);
+		}
+		else {
+			return $o[0]; // Should send URL imo
+		}
+	}, $body);
+	$body = preg_replace('/>>>>([0-9a-fA-F])+/', '>>\1', $body);
+
+
+	$files[] = array('type' => 'text/plain', 'text' => $body);
+
+	foreach ($post['files'] as $id => $file) {
+		$fc = array();
+
+		$fc['type'] = $file['type'];
+		$fc['text'] = file_get_contents($file['file_path']);
+		$fc['name'] = $file['name'];
+
+		$files[] = $fc;
+	}
+
+	return array($headers, $files);
+}
diff --git a/inc/nntpchan/tests.php b/inc/nntpchan/tests.php
new file mode 100644
index 00000000..a63789d7
--- /dev/null
+++ b/inc/nntpchan/tests.php
@@ -0,0 +1,30 @@
+<?php
+define('TINYBOARD', 'fuck yeah');
+require_once('nntpchan.php');
+
+
+die();
+
+$time = time();
+echo "\n@@@@ Thread:\n";
+echo $m0 = gennntp(["From" => "czaks <marcin@6irc.net>", "Message-Id" => "<1234.0000.".$time."@example.vichan.net>", "Newsgroups" => "overchan.test", "Date" => time(), "Subject" => "None"],
+[['type' => 'text/plain', 'text' => "THIS IS A NEW TEST THREAD"]]);
+echo "\n@@@@ Single msg:\n";
+echo $m1 = gennntp(["From" => "czaks <marcin@6irc.net>", "Message-Id" => "<1234.1234.".$time."@example.vichan.net>", "Newsgroups" => "overchan.test", "Date" => time(), "Subject" => "None", "References" => "<1234.0000.".$time."@example.vichan.net>"],
+[['type' => 'text/plain', 'text' => "hello world, with no image :("]]);
+echo "\n@@@@ Single msg and pseudoimage:\n";
+echo $m2 = gennntp(["From" => "czaks <marcin@6irc.net>", "Message-Id" => "<1234.2137.".$time."@example.vichan.net>", "Newsgroups" => "overchan.test", "Date" => time(), "Subject" => "None", "References" => "<1234.0000.".$time."@example.vichan.net>"],
+[['type' => 'text/plain', 'text' => "hello world, now with an image!"],
+ ['type' => 'image/gif', 'text' => base64_decode("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), 'name' => "urgif.gif"]]);
+echo "\n@@@@ Single msg and two pseudoimages:\n";
+echo $m3 = gennntp(["From" => "czaks <marcin@6irc.net>", "Message-Id" => "<1234.1488.".$time."@example.vichan.net>", "Newsgroups" => "overchan.test", "Date" => time(), "Subject" => "None", "References" => "<1234.0000.".$time."@example.vichan.net>"],
+[['type' => 'text/plain', 'text' => "hello world, now WITH TWO IMAGES!!!"],
+ ['type' => 'image/gif', 'text' => base64_decode("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), 'name' => "urgif.gif"],
+ ['type' => 'image/gif', 'text' => base64_decode("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), 'name' => "urgif2.gif"]]);
+shoveitup($m0, "<1234.0000.".$time."@example.vichan.net>");
+sleep(1);
+shoveitup($m1, "<1234.1234.".$time."@example.vichan.net>");
+sleep(1);
+shoveitup($m2, "<1234.2137.".$time."@example.vichan.net>");
+shoveitup($m3, "<1234.1488.".$time."@example.vichan.net>");
+
diff --git a/post.php b/post.php
index 4590a534..1e4edcee 100644
--- a/post.php
+++ b/post.php
@@ -13,7 +13,12 @@ if ((!isset($_POST['mod']) || !$_POST['mod']) && $config['board_locked']) {
 
 $dropped_post = false;
 
+// Is it a post coming from NNTP? Let's extract it and pretend it's a normal post.
 if (isset($_GET['Newsgroups']) && $config['nntpchan']['enabled']) {
+	if ($_SERVER['REMOTE_ADDR'] != $config['nntpchan']['trusted_peer']) {
+		error("NNTPChan: Forbidden. $_SERVER[REMOTE_ADDR] is not a trusted peer");
+	}
+
 	$_POST = array();
 	$_POST['json_response'] = true;
 
@@ -1057,7 +1062,31 @@ if (isset($_POST['delete'])) {
 		$query->bindValue(':message_id_digest', sha1($dropped_post['msgid']));
 		$query->bindValue(':headers', $dropped_post['headers']);
 		$query->execute() or error(db_error($query));
+	}	// ^^^^^ For inbound posts  ^^^^^
+	elseif ($config['nntpchan']['enabled'] && $config['nntpchan']['group']) {
+		// vvvvv For outbound posts vvvvv
+
+		require_once('inc/nntpchan/nntpchan.php');
+		$msgid = gen_msgid($post['board'], $post['id']);
+
+		list($headers, $files) = post2nntp($post, $msgid);
+
+		$message = gen_nntp($headers, $files);
+
+	        $query = prepare("INSERT INTO ``nntp_references`` (`board`, `id`, `message_id`, `message_id_digest`, `own`, `headers`) VALUES ".
+	                                                         "(:board , :id , :message_id , :message_id_digest , true , :headers)");
+
+		$query->bindValue(':board', $post['board']);
+                $query->bindValue(':id', $post['id']);
+                $query->bindValue(':message_id', $msgid);
+                $query->bindValue(':message_id_digest', sha1($msgid));
+                $query->bindValue(':headers', json_encode($headers));
+                $query->execute() or error(db_error($query));
+
+		// Let's broadcast it!
+		nntp_publish($message, $msgid);
 	}
+
 	insertFloodPost($post);
 
 	// Handle cyclical threads
-- 
cgit v1.3


From 0b19051891e3a45a913cef38f0921cf781a0817b Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 15 Aug 2016 04:13:26 +0200
Subject: fix a notice; increase waiting time for dns

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

diff --git a/inc/functions.php b/inc/functions.php
index 043d4de7..1b336e12 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -892,7 +892,7 @@ function displayBan($ban) {
 		Element('page.html', array(
 			'title' => _('Banned!'),
 			'config' => $config,
-			'boardlist' => createBoardlist($mod),
+			'boardlist' => createBoardlist(isset($mod) ? $mod : false),
 			'body' => Element('banned.html', array(
 				'config' => $config,
 				'ban' => $ban,
@@ -2514,7 +2514,7 @@ function rDNS($ip_addr) {
 	if (!$config['dns_system']) {
 		$host = gethostbyaddr($ip_addr);
 	} else {
-		$resp = shell_exec_error('host -W 1 ' . $ip_addr);
+		$resp = shell_exec_error('host -W 3 ' . $ip_addr);
 		if (preg_match('/domain name pointer ([^\s]+)$/', $resp, $m))
 			$host = $m[1];
 		else
-- 
cgit v1.3


From 1c3e6e590aca050802f271d157f0d274c8217d4d Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Fri, 19 Aug 2016 16:05:50 -0400
Subject: patch for nntpchan stream

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

diff --git a/inc/nntpchan/nntpchan.php b/inc/nntpchan/nntpchan.php
index 25215e94..f21fdd2d 100644
--- a/inc/nntpchan/nntpchan.php
+++ b/inc/nntpchan/nntpchan.php
@@ -64,7 +64,9 @@ function gen_nntp($headers, $files) {
 }
 
 function nntp_publish($msg, $id) {
-	$s = fsockopen("tcp://localhost:1119");
+	global $config;
+	$server = $config["nntpchan"]["server"];
+	$s = fsockopen("tcp://$server");
 	fgets($s);
 	fputs($s, "MODE STREAM\r\n");
 	fgets($s);
@@ -72,6 +74,7 @@ function nntp_publish($msg, $id) {
 	fputs($s, $msg);
 	fputs($s, "\r\n.\r\n");
 	fgets($s);
+	fputs($s, "QUIT\r\n");
 	fclose($s);
 }
 
-- 
cgit v1.3


From a5e7b3da6f8ee764ab831d3c1b2df6c17a5e78ca Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 19 Aug 2016 23:15:08 +0200
Subject: nntpchan: work around php nonsense

---
 inc/nntpchan/nntpchan.php |  2 +-
 post.php                  | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/inc/nntpchan/nntpchan.php b/inc/nntpchan/nntpchan.php
index 25215e94..8a2fba44 100644
--- a/inc/nntpchan/nntpchan.php
+++ b/inc/nntpchan/nntpchan.php
@@ -124,7 +124,7 @@ function post2nntp($post, $msgid) {
                 $query->execute() or error(db_error($query));
 
                 if ($result = $query->fetch(PDO::FETCH_ASSOC)) {
-			return ">>".substr($result['message_id_digest'], 0, 16);
+			return ">>".substr($result['message_id_digest'], 0, 18);
 		}
 		else {
 			return $o[0]; // Should send URL imo
diff --git a/post.php b/post.php
index 1e4edcee..47c5f0ef 100644
--- a/post.php
+++ b/post.php
@@ -90,31 +90,36 @@ if (isset($_GET['Newsgroups']) && $config['nntpchan']['enabled']) {
 		$content = file_get_contents("php://input");
 	}
 	elseif ($ct == 'multipart/mixed' || $ct == 'multipart/form-data') {
-		_syslog(LOG_INFO, "MM: Files: ".print_r($GLOBALS, true));
+		_syslog(LOG_INFO, "MM: Files: ".print_r($GLOBALS, true)); // Debug
+
 		$content = '';
 
-		$tmpfiles = $_FILES['attachment'];
-		foreach ($tmpfiles as $id => $file) {
-			if ($file['type'] == 'text/plain') {
-				$content .= file_get_contents($file['tmp_name']);
-				unset($_FILES['attachment'][$id]);
+		$newfiles = array();
+		foreach ($_FILES['attachment']['error'] as $id => $error) {
+			if ($_FILES['attachment']['type'][$id] == 'text/plain') {
+				$content .= file_get_contents($_FILES['attachment']['tmp_name'][$id]);
 			}
-			elseif ($file['type'] == 'message/rfc822') { // Signed message, ignore for now
-				unset($_FILES['attachment'][$id]);
+			elseif ($_FILES['attachment']['type'][$id] == 'message/rfc822') { // Signed message, ignore for now
 			}
 			else { // A real attachment :^)
+				$file = array();
+				$file['name']     = $_FILES['attachment']['name'][$id];
+				$file['type']     = $_FILES['attachment']['type'][$id];
+				$file['size']     = $_FILES['attachment']['size'][$id];
+				$file['tmp_name'] = $_FILES['attachment']['tmp_name'][$id];
+				$file['error']    = $_FILES['attachment']['error'][$id];
+
+				$newfiles["file$id"] = $file;
 			}
 		}
 
-		$_FILES = $_FILES['attachment'];
-
-
+		$_FILES = $newfiles;
 	}
 	else {
 		error("NNTPChan: Wrong mime type: $ct");
 	}
 
-	$_POST['subject'] = isset($_GET['Subject']) ? $_GET['Subject'] : '';
+	$_POST['subject'] = isset($_GET['Subject']) ? ($_GET['Subject'] == 'None' ? '' : $_GET['Subject']) : '';
 	$_POST['board'] = $xboard;
 
 	if (isset ($_GET['From'])) {
-- 
cgit v1.3


From 8951cb74c8fbface07e38308994bc2fe480e3c82 Mon Sep 17 00:00:00 2001
From: "Michael D. Reiley" <seisatsu@users.noreply.github.com>
Date: Thu, 22 Sep 2016 23:03:11 -0700
Subject: Rebuild index when mod deletes a thread.

The index does not properly rebuild when a mod deletes a thread, resulting in a ghost thread remaining in the index until the next rebuild. This fix was originally contributed to Uboachan's codebase by Mannosuke.
---
 inc/mod/pages.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 303fa3dd..c3e98af5 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1721,6 +1721,8 @@ function mod_deletebyip($boardName, $post, $global = false) {
 		deletePost($post['id'], false, false);
 
 		rebuildThemes('post-delete', $board['uri']);
+		
+		buildIndex();
 
 		if ($post['thread'])
 			$threads_to_rebuild[$post['board']][$post['thread']] = true;
-- 
cgit v1.3


From 0feab91f31e464d11cacef6b138cc85a4d1fd924 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:26:12 +0900
Subject: Fix Content-Type header typographical error

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

diff --git a/b.php b/b.php
index 11d6ad34..a0638ec3 100755
--- a/b.php
+++ b/b.php
@@ -23,7 +23,7 @@ function serveRandomBanner($dir, $files) {
     header('Cache-Control: no-cache, no-store, must-revalidate'); // HTTP 1.1
     header('Pragma: no-cache'); // HTTP 1.0
     header('Expires: 0'); // Proxies
-    header("Content-type: image/" . ext);
+    header("Content-type: image/" . $ext);
     header("Content-Disposition: inline; filename=" . $name);
 
     // readfile displays the image, passthru seems to spits stream.
-- 
cgit v1.3


From 05569d150abac93b306d923679af6122c89e3b62 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:29:35 +0900
Subject: Updated copyright year

---
 templates/thread.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/thread.html b/templates/thread.html
index 62fe2c12..346db449 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -40,8 +40,10 @@
 
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
-	<a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-	<a href="#bottom" style="padding-left: 10px">[{% trans %}Go to bottom{% endtrans %}]</a>
+	<div class="threadlinks-noup">
+		<span class="threadlink">[ <a href="{{ return }}">{% trans %}Return{% endtrans %}</a> /</span>
+		<span class="threadlink"><a href="#bottom" style="padding-left: 10px"> {% trans %}Go to bottom{% endtrans %}</a> ]</span>
+	</div>
 	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
 	<input type="hidden" name="board" value="{{ board.uri }}" />
@@ -60,8 +62,8 @@
 			<a href='https://int.vichan.net/devel/'>vichan</a> + 
 			<a href='https://github.com/lainchan/lainchan'>lainchan</a> {{ config.version }} -
 		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel
-		<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2015 lainchan Administration</p>
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel
+		<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2016 lainchan Administration</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<div class="bar bottom">
-- 
cgit v1.3


From 8b5688e12a3687f86c8c40d36a1327445cfb8143 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:33:20 +0900
Subject: Add porn to public banlist theme

---
 templates/themes/public_banlist/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/themes/public_banlist/theme.php b/templates/themes/public_banlist/theme.php
index c9f7e6f0..62a794dd 100644
--- a/templates/themes/public_banlist/theme.php
+++ b/templates/themes/public_banlist/theme.php
@@ -25,7 +25,7 @@
 
 		public static function gen_json($settings) {
 			ob_start();
-			Bans::stream_json(false, true, true, array(), array("/\bcp\b/i"));
+			Bans::stream_json(false, true, true, array(), array("/\bcp\b/i", "/porn/i"));
 			$out = ob_get_contents();
 			ob_end_clean();
 			return $out;
-- 
cgit v1.3


From 31b69902bbfdccffd0ed7ba32f04aaf1479d41b7 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:38:24 +0900
Subject: Add catalog support to all of rand, semi,rand and ukko themes

---
 templates/index.html                |  9 +++++--
 templates/themes/catalog/info.php   |  7 ++++++
 templates/themes/catalog/theme.php  | 47 +++++++++++++++++++++++++++++++++++++
 templates/themes/rand/theme.php     |  1 +
 templates/themes/semirand/theme.php |  1 +
 templates/themes/ukko/theme.php     |  1 +
 6 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 1878d455..2241b13c 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -58,6 +58,11 @@
 
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
+		{% if config.catalog_link %}
+		 |  <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">Catalog</a>
+		{% endif %}
+	<hr />
+
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
 	<input type="hidden" name="board" value="{{ board.uri }}" />
 	{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
@@ -72,8 +77,8 @@
 			<a href='https://int.vichan.net/devel/'>vichan</a> + 
 			<a href='https://github.com/lainchan/lainchan'>lainchan</a> {{ config.version }} -
 		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel
-		<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2015 lainchan Administration</p>
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel
+		<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2016 lainchan Administration</p>
 
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
diff --git a/templates/themes/catalog/info.php b/templates/themes/catalog/info.php
index e2b13307..66c45082 100644
--- a/templates/themes/catalog/info.php
+++ b/templates/themes/catalog/info.php
@@ -46,6 +46,13 @@
 		'comment' => 'Enable catalog for the Ukko theme. This requires the Ukko theme to be enabled.'
 	);
 
+	$theme['config'][] = Array(
+		'title' => 'Enable Rand catalog',
+		'name' => 'enable_rand',
+		'type' => 'checkbox',
+		'default' => false,
+		'comment' => 'Enable catalog for the Rand theme. This requires the Rand theme to be enabled.'
+	);
 	$theme['config'][] = Array(
 		'title' => 'Use tooltipster',
 		'name' => 'use_tooltipster',
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 9ecdb9d1..1199b54a 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -40,6 +40,14 @@
 		{
 			$b->buildUkko();
 		}
+		
+		// FIXME: Check that Rand is actually enabled
+		if ($settings['enable_rand'] && (
+			$action === 'all' || $action === 'post' ||
+			$action === 'post-thread' || $action === 'post-delete'))
+		{
+			$b->buildRand();
+		}
 	}
 
 	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
@@ -90,6 +98,45 @@
 			$this->saveForBoard($ukkoSettings['uri'], $recent_posts,
 				$config['root'] . $ukkoSettings['uri']);
 		}
+		
+		/**
+		 * Build and save the HTML of the catalog for the Rand theme
+		 */
+		public function buildRand() {
+			global $config;
+
+			$randSettings = themeSettings('rand');
+ 			$queries = array();
+			$threads = array();
+
+			$exclusions = explode(' ', $randSettings['exclude']);
+			$boards = array_diff(listBoards(true), $exclusions);
+
+			foreach ($boards as $b) {
+				if (array_key_exists($b, $this->threadsCache)) {
+					$threads = array_merge($threads, $this->threadsCache[$b]);
+				} else {
+					$queries[] = $this->buildThreadsQuery($b);
+				}
+			}
+
+			// Fetch threads from boards that haven't beenp processed yet
+			if (!empty($queries)) {
+				$sql = implode(' UNION ALL ', $queries);
+				$res = query($sql) or error(db_error());
+				$threads = array_merge($threads, $res->fetchAll(PDO::FETCH_ASSOC));
+			}
+
+			// Sort in bump order
+			usort($threads, function($a, $b) {
+				return strcmp($b['bump'], $a['bump']);
+			});
+			// Generate data for the template
+			$recent_posts = $this->generateRecentPosts($threads);
+
+			$this->saveForBoard($randSettings['uri'], $recent_posts,
+				$config['root'] . $randSettings['uri']);
+		}
 
 		/**
 		 * Build and save the HTML of the catalog for the given board
diff --git a/templates/themes/rand/theme.php b/templates/themes/rand/theme.php
index b4cfb4ff..e3814c4e 100644
--- a/templates/themes/rand/theme.php
+++ b/templates/themes/rand/theme.php
@@ -18,6 +18,7 @@
 			$body = '';
 			$overflow = array();
 			$board = array(
+				'dir' => $this->settings['uri'] . "/",
 				'url' => $this->settings['uri'],
 				'name' => $this->settings['title'],
 				'title' => sprintf($this->settings['subtitle'], $this->settings['thread_limit'])
diff --git a/templates/themes/semirand/theme.php b/templates/themes/semirand/theme.php
index 1acecbfb..e8d3e56c 100644
--- a/templates/themes/semirand/theme.php
+++ b/templates/themes/semirand/theme.php
@@ -225,6 +225,7 @@
 			return Element('index.html', array(
 				'config'       => $config,
 				'board'        => array(
+					'dir' => $this->settings['uri'] . "/",
 					'url'      => $this->settings['uri'],
 					'title'    => $this->settings['title'],
 					'subtitle' => str_replace('%s', $this->settings['thread_limit'],
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index 05525299..92dfb317 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -28,6 +28,7 @@
 			$body = '';
 			$overflow = array();
 			$board = array(
+				'dir' => $this->settings['uri'] . "/",
 				'url' => $this->settings['uri'],
 				'uri' => $this->settings['uri'],
 				'name' => $this->settings['title'],
-- 
cgit v1.3


From ac4ddfec8ab8fb2d63524deb28be0de222e7ea0f Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:39:21 +0900
Subject: Update donate page

---
 templates/themes/donate/donate.html | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/templates/themes/donate/donate.html b/templates/themes/donate/donate.html
index 73c06cb4..1ffe0976 100644
--- a/templates/themes/donate/donate.html
+++ b/templates/themes/donate/donate.html
@@ -16,32 +16,18 @@
       <h1>{{ settings.title }}</h1>
       <div class="subtitle">{{ settings.subtitle }}</div>
     </header>
-
+<center>
     <img alt="mascot" src="/static/lain_is_cute_datass_small.png"/>
-
-    <div class="ban">
+</center>
+   <div class="ban">
       <h2>Thanks for donating</h2>
-      <p>The server costs $55 per month. If you buy stickers we get about 45-55% of whatever you spend. I have to pay my phone bill to keep two-factor authentication working thats $45 (I pay this myself if im not homeless for the month). I just purchased a few lainchan related domains with whatever BTC we had. $50 or so of donations needs to go to darkengine soon to reimburse him for stickers. I have to pay the bill for my Macbook too sometimes. I want to spend a bunch of donation money on a bulk order of stickers and give em away as prizes or just spam shit in the city. FOOFDOOF is the top donator, hes given us like almost $1000. Sometimes I spend the donation money on food when i'm starving. I transfer all donations into, and keep them as cash.
-
+      <p>The server costs $55 per month. If you buy stickers we get about 45-55% of whatever you spend. ForeverN2Dust is the top donator, giving about $3000. FOOFDOOF is #2 with $1000 and lots of cheap Chinese shit. Please specify what you'd like your money to go towards. We spent $100 for advertising in March.
         </p>
-<p> The most secure and private way to donate is probably to send cash in the mail to me, but this option is only available to select people until I set up a PO box or something.</p>
 
         <p>https://www.stickermule.com/marketplace/tags/lainchan</p>
 
-       <p> Localbitcoins.com is a good place to buy BTC. You can donate BTC to this address: 18CshTkxW6HRFoBhXo9mLJcjkReMmjvuq9</p>
-        <img src="https://www.lainchan.org/static/btc.jpg" alt="buttcoin qr">
-
-      <p> The absolute fastest way for me to receive and process the money is with a Credit/Debit/Prepaid card via paypal here:</p>
-
-      <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="hosted_button_id" value="95LE9PHD8P5NU">
-<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-</form>
-
-
     </div>
+
   </body>
 </html>
 {% endfilter %}
-- 
cgit v1.3


From e7662d385e9e852f98177435769aa9d9b08d8c4d Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:40:22 +0900
Subject: Fix irc theme to actually be IRC

---
 templates/themes/irc/irc.html | 39 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/templates/themes/irc/irc.html b/templates/themes/irc/irc.html
index 9fadff99..2828b6e0 100644
--- a/templates/themes/irc/irc.html
+++ b/templates/themes/irc/irc.html
@@ -1,48 +1,29 @@
 {% filter remove_whitespace %}
 <!DOCTYPE html>
-<html style="height:100vh; width:100%;">
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <title>{{ settings.title }}</title>
     <link rel="shortcut icon" href="/favicon.png">
     <link rel="stylesheet" media="screen" href="/stylesheets/style.css"/>
-    <link rel="stylesheet" media="screen" href="/stylesheets/cyberpunk.css"/>
+    <link rel="stylesheet" media="screen" href="/stylesheets/dark.css"/>
+    <link rel="stylesheet" media="screen" href="/stylesheets/dark_irc.css"/>
 	<link rel="stylesheet" href="/stylesheets/font-awesome/css/font-awesome.min.css">
-  </head>
-  <body style="background-image: url(/bg.php); background-size:cover; background-repeat:no-repeat; height:100vh; width: inherit; margin:none; padding:none; overflow-x:hidden; overflow-y:hidden;">
-    <div class="bar top">
-      {{ boardlist.top }}
+</head>
+  <body>
+  	<div class="bar top">
+		{{ boardlist.top }}
 	</div>
 
-	{% if config.url_banner %}<img class="board_image" 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 %}
     <header>
       <h1>{{ settings.title }}</h1>
       <div class="subtitle">{{ settings.subtitle }}</div>
     </header>
 
-    <img alt="mascot" src="static/lain_is_cute_datass_small.png"/>
 
-    <div class="ban" style="background-color: black; text-align: left!important;">
-      <h2>WELCOME TO CYBERIA</h2>
-
-      <p>Welcome to lainchan's #BADA55 radio stream. <br/>Statistics
-      about this stream such as current listeners, song title, et
-      cetera will soon be added to this page.
-      </p>
-
-      <ul>
-
-        <li><a href="https://lainchan.org/static/lain.ogg.m3u">Vorbis M3U Playlist</a></li>
-        <li><a href="https://lainchan.org/static/lain.mp3.m3u">MP3 M3U Playlist</a></li>
-
-		XSPF considered harmful.
-      </ul>
-
-      <audio controls preload="none" style="margin: 0 5% 20px 5%; width: 90%; box-shadow: 0px 0px 5px black;">
-	  	<source src="https://lainchan.org/radio_assets/lain.ogg" type="audio/ogg">
-		<source src="https://lainchan.org/radio_assets/lain.mp3" type="audio/mpeg">
-        <em>Your browser lacks support for OGG Vorbis files. Please open the M3U file or XSPF file in a multimedia player.</em>
-     </audio>
+    <div class="ban" style="text-align: left!important;">
+    	<h2>Web Client - Point your own clients to #lainchan on irc.freenode.net.</h2>		
+	<iframe src="https://webchat.freenode.net?channels=%23lainchan&uio=MTE9MTMz98" width="766" height="400"></iframe>
     </div>
   </body>
 </html>
-- 
cgit v1.3


From e7506c1961664c7eb2390803f4f5bd89e5b730d3 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:40:55 +0900
Subject: Fix radio them to actually be Radio

---
 templates/themes/radio/radio.html | 66 +++++++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 10 deletions(-)

diff --git a/templates/themes/radio/radio.html b/templates/themes/radio/radio.html
index 2828b6e0..b19d703a 100644
--- a/templates/themes/radio/radio.html
+++ b/templates/themes/radio/radio.html
@@ -1,29 +1,75 @@
 {% filter remove_whitespace %}
 <!DOCTYPE html>
-<html>
+<html style="height:100vh; width:100%;">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <title>{{ settings.title }}</title>
     <link rel="shortcut icon" href="/favicon.png">
     <link rel="stylesheet" media="screen" href="/stylesheets/style.css"/>
-    <link rel="stylesheet" media="screen" href="/stylesheets/dark.css"/>
-    <link rel="stylesheet" media="screen" href="/stylesheets/dark_irc.css"/>
+    <link rel="stylesheet" media="screen" href="/stylesheets/cyberpunk.css"/>
 	<link rel="stylesheet" href="/stylesheets/font-awesome/css/font-awesome.min.css">
-</head>
-  <body>
-  	<div class="bar top">
-		{{ boardlist.top }}
+<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
+<script type="text/javascript">
+$(document).ready(function(){
+        check_status();
+        setInterval(check_status, 15000);
+});
+
+function check_status(){  
+$.get("/radio_assets/status.xsl", function(data){    
+var el = $( '<div></div>' );   
+el.html(data);    
+var sd = el.find(".streamdata");  
+  
+$(".nowplaying").text("Now playing: " + sd[16].textContent);    
+
+$(".currentlisteners").text("Current listeners: " + sd[13].textContent);  });
+}
+</script>
+  </head>
+  <body style=" background: url(/bg.php) no-repeat center center fixed; 
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  background-size: cover;
+  ">
+    <div class="bar top">
+      {{ boardlist.top }}
 	</div>
 
+	{% if config.url_banner %}<img class="board_image" 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 %}
     <header>
       <h1>{{ settings.title }}</h1>
       <div class="subtitle">{{ settings.subtitle }}</div>
     </header>
 
+    <img alt="mascot" src="static/lain_is_cute_datass_small.png" style="display: block; margin: 0 auto;"/>
+
+    <div class="ban" style="margin-top: 0px!important; background-color: black; text-align: left!important;">
+      <h2>WELCOME TO CYBERIA</h2>
+
+      <p>Welcome to lainchan's radio stream. 
+      </p>
+      <noscript><p>Radio statistics will be not be updated without JavaScript, please visit https://lainchan.org/radio_assets/status.xsl to see them directly.</p></noscript>
+      
+      <p class="nowplaying"> Now playing: 
+      </p>
+      <p class="currentlisteners"> Current listeners: 
+      </p>
+
+      <ul>
+
+        <li><a href="https://lainchan.org/static/lain.ogg.m3u">Vorbis M3U Playlist</a></li>
+        <li><a href="https://lainchan.org/static/lain.mp3.m3u">MP3 M3U Playlist</a></li>
+
+		XSPF considered harmful.
+      </ul>
 
-    <div class="ban" style="text-align: left!important;">
-    	<h2>Web Client - Point your own clients to #lainchan on irc.freenode.net.</h2>		
-	<iframe src="https://webchat.freenode.net?channels=%23lainchan&uio=MTE9MTMz98" width="766" height="400"></iframe>
+      <audio controls preload="none" style="margin: 0 5% 20px 5%; width: 90%; box-shadow: 0px 0px 5px black;">
+	  	<source src="https://lainchan.org/radio_assets/lain.ogg" type="audio/ogg">
+		<source src="https://lainchan.org/radio_assets/lain" type="audio/mpeg">
+        <em>Your browser lacks support for OGG Vorbis files. Please open the M3U file or XSPF file in a multimedia player.</em>
+     </audio>
     </div>
   </body>
 </html>
-- 
cgit v1.3


From df4c402f1add7547d472f94934c5137faf23aef4 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:43:05 +0900
Subject: Fix header margin

---
 stylesheets/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 0d713b79..1fa2d4a8 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -244,7 +244,7 @@ h2 {
 }
 
 header {
-  margin: 1em 0;
+  margin: 2em 0;
 }
 
 h1 {
-- 
cgit v1.3


From d09953da0750347f965dcdebd7a769fed98945ee Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:44:48 +0900
Subject: ReportNotifier Slack notification support

---
 inc/config.php |  6 ++++++
 post.php       | 38 +++++++++++++++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 69b4bd3a..86ddd5aa 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1669,3 +1669,9 @@
 		'<a href="https://youtu.be/$2" target="_blank" class="file">'.
 		'<img style="width:360px;height:270px;" src="//img.youtube.com/vi/$2/0.jpg" class="post-image"/>'.
 		'</a></div>';
+
+        // Slack Report Notification
+        $config['slack'] = true;
+        $config['slack_channel'] = "reports";
+        $config['slack_incoming_webhook_endpoint'] = "https://hooks.slack.com/services/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";
+
diff --git a/post.php b/post.php
index 99ef4850..f2ed509f 100644
--- a/post.php
+++ b/post.php
@@ -141,15 +141,15 @@ 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(sprintf("SELECT `thread` , `body_nomarkup` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
-		$thread = $query->fetchColumn();
+		$thread = $query->fetch(PDO::FETCH_ASSOC);
 		
 		if ($config['syslog'])
 			_syslog(LOG_INFO, 'Reported post: ' .
-				'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($thread ? '#' . $id : '') .
+				'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($thread['thread'] ? '#' . $id : '') .
 				' for "' . $reason . '"'
 			);
 		$query = prepare("INSERT INTO ``reports`` VALUES (NULL, :time, :ip, :board, :post, :reason)");
@@ -159,6 +159,38 @@ if (isset($_POST['delete'])) {
 		$query->bindValue(':post', $id, PDO::PARAM_INT);
 		$query->bindValue(':reason', $reason, PDO::PARAM_STR);
 		$query->execute() or error(db_error($query));
+                if ($config['slack'])
+                {
+                function slack($message, $room = "reports", $icon = ":no_entry_sign:") 
+			{
+			$room = ($room) ? $room : "reports";
+			$data = "payload=" . json_encode(array(
+			"channel"       =>  "#{$room}",
+			"text"          =>  urlencode($message),
+			"icon_emoji"    =>  $icon
+			));
+
+			// You can get your webhook endpoint from your Slack settings
+			// For some reason using the configuration key doesn't work 
+			//$ch = curl_init($config['slack_incoming_webhook_endpoint']);
+			$ch = curl_init("https://hooks.slack.com/services/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");
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			$result = curl_exec($ch);
+			curl_close($ch);
+
+			return $result;
+			}
+		
+		$postcontent = mb_substr($thread['body_nomarkup'], 0, 120) . '...  _*(POST TRIMMED)*_';
+		$slackmessage = 'Post: <'  .$config['domain']  . "/mod.php?/" . $board['dir'] . $config['dir']['res'] .  ( $thread['thread'] ? $thread['thread'] : $id ) . ".html"  .  ($thread['thread'] ? '#' . $id : '') . '> \n Post Content: ' . $postcontent  . '\n Reason: ' . $reason . '\n';
+
+		$slackresult = slack($slackmessage, $config['slack_channel']); 
+		}
+
+
 	}
 	
 	$is_mod = isset($_POST['mod']) && $_POST['mod'];
-- 
cgit v1.3


From 5d08f0f04807cb0b88177d74da25d1242765868f Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 22:45:56 +0900
Subject: Change font-size pt to px for heavy ice

---
 stylesheets/heavy_ice.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stylesheets/heavy_ice.css b/stylesheets/heavy_ice.css
index 572f303e..cbdc9994 100644
--- a/stylesheets/heavy_ice.css
+++ b/stylesheets/heavy_ice.css
@@ -62,7 +62,7 @@ h1
 	font-family: 'lain', tahoma;
 
 	letter-spacing: -2px;
-	font-size: 42pt;
+	font-size: 42px;
 	text-align: center;
 	color: #d2e7e8;
 
@@ -293,7 +293,7 @@ div.pages
 	background: #333;
 	border: #666 0px solid;
 	font-family: sans-serif;
-	font-size: 10pt;
+	font-size: 10px;
 }
 div.pages a.selected
 {
@@ -326,7 +326,7 @@ div.ban h2
 	background: #333;
 	color: #d2e7e8;
 	padding: 3px 7px;
-	font-size: 12pt;
+	font-size: 12px;
 	border-bottom: 1px solid #555;
 }
 div.ban h2:not(:nth-child(1))
-- 
cgit v1.3


From 59cc269cd70147a738318cc50da0b9d4691b6ce3 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Fri, 23 Sep 2016 23:05:04 +0900
Subject: Change ReportNotifier SlackMessage format

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

diff --git a/post.php b/post.php
index f2ed509f..045bec45 100644
--- a/post.php
+++ b/post.php
@@ -185,7 +185,7 @@ if (isset($_POST['delete'])) {
 			}
 		
 		$postcontent = mb_substr($thread['body_nomarkup'], 0, 120) . '...  _*(POST TRIMMED)*_';
-		$slackmessage = 'Post: <'  .$config['domain']  . "/mod.php?/" . $board['dir'] . $config['dir']['res'] .  ( $thread['thread'] ? $thread['thread'] : $id ) . ".html"  .  ($thread['thread'] ? '#' . $id : '') . '> \n Post Content: ' . $postcontent  . '\n Reason: ' . $reason . '\n';
+		$slackmessage = ' <'  .$config['domain']  . "/mod.php?/" . $board['dir'] . $config['dir']['res'] .  ( $thread['thread'] ? $thread['thread'] : $id ) . ".html"  .  ($thread['thread'] ? '#' . $id : '') . '>  \n ' . $reason. '\n ' . $postcontent . '\n';
 
 		$slackresult = slack($slackmessage, $config['slack_channel']); 
 		}
-- 
cgit v1.3


From 5af60d1e3324cf4c5d12a39b130de6343ed53382 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 24 Sep 2016 12:52:08 +0900
Subject: Remove leading space from ReportNotifier Slack Message

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

diff --git a/post.php b/post.php
index 045bec45..718b2833 100644
--- a/post.php
+++ b/post.php
@@ -185,7 +185,7 @@ if (isset($_POST['delete'])) {
 			}
 		
 		$postcontent = mb_substr($thread['body_nomarkup'], 0, 120) . '...  _*(POST TRIMMED)*_';
-		$slackmessage = ' <'  .$config['domain']  . "/mod.php?/" . $board['dir'] . $config['dir']['res'] .  ( $thread['thread'] ? $thread['thread'] : $id ) . ".html"  .  ($thread['thread'] ? '#' . $id : '') . '>  \n ' . $reason. '\n ' . $postcontent . '\n';
+		$slackmessage = '<'  .$config['domain']  . "/mod.php?/" . $board['dir'] . $config['dir']['res'] .  ( $thread['thread'] ? $thread['thread'] : $id ) . ".html"  .  ($thread['thread'] ? '#' . $id : '') . '> \n ' . $reason . '\n ' . $postcontent . '\n';
 
 		$slackresult = slack($slackmessage, $config['slack_channel']); 
 		}
-- 
cgit v1.3


From 9436524a306c8e3d6d8a6ed195e2a3c56d5cde39 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 24 Sep 2016 20:19:08 +0900
Subject: Added donation progress bar to donate theme

---
 templates/themes/donate/donate.html | 179 +++++++++++++++++++++++++++++++++++-
 1 file changed, 177 insertions(+), 2 deletions(-)

diff --git a/templates/themes/donate/donate.html b/templates/themes/donate/donate.html
index 1ffe0976..551eea62 100644
--- a/templates/themes/donate/donate.html
+++ b/templates/themes/donate/donate.html
@@ -8,6 +8,166 @@
     <link rel="stylesheet" media="screen" href="/stylesheets/style.css"/>
     <link rel="stylesheet" media="screen" href="/stylesheets/dark.css"/>
 	{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
+<style>
+	/*---------------------------*/			
+        .container {
+	margin: auto;
+	width : 50%;
+	}    
+        .progress-bar {
+            background-color: #1a1a1a;
+            height: 25px;
+            padding: 5px;
+            width: 350px;
+	    position: relative;
+            margin: 70px 0 20px 0;			
+            -moz-border-radius: 5px;
+			-webkit-border-radius: 5px;
+			border-radius: 5px;
+            -moz-box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;
+			-webkit-box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;
+			box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;           
+        }
+        
+        .progress-bar span {
+            display: inline-block;
+            height: 100%;
+			background-color: #777;
+            -moz-border-radius: 3px;
+			-webkit-border-radius: 3px;
+			border-radius: 3px;
+            -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset;
+			-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset;
+			box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset;
+			-webkit-transition: width .4s ease-in-out;
+			-moz-transition: width .4s ease-in-out;
+			-ms-transition: width .4s ease-in-out;
+			-o-transition: width .4s ease-in-out;
+			transition:   width .4s ease-in-out;		
+        }
+		
+		
+        .blue span {
+            background-color: #34c2e3;   
+        }
+
+        .red span {
+			  background-color: #f42323;
+			  background-image: -webkit-gradient(linear, left top, left bottom, from(#f42323), to(#ff0000));
+			  background-image: -webkit-linear-gradient(top, #f42323, #ff0000);
+			  background-image: -moz-linear-gradient(top, #f42323, #ff0000);
+			  background-image: -ms-linear-gradient(top, #f42323, #ff0000);
+			  background-image: -o-linear-gradient(top, #f42323, #ff0000);
+			  background-image: linear-gradient(top, #f42323, #ff0000);  
+        }	
+
+        .green span {
+			  background-color: #a5df41;
+			  background-image: -webkit-gradient(linear, left top, left bottom, from(#a5df41), to(#4ca916));
+			  background-image: -webkit-linear-gradient(top, #a5df41, #4ca916);
+			  background-image: -moz-linear-gradient(top, #a5df41, #4ca916);
+			  background-image: -ms-linear-gradient(top, #a5df41, #4ca916);
+			  background-image: -o-linear-gradient(top, #a5df41, #4ca916);
+			  background-image: linear-gradient(top, #a5df41, #4ca916);  
+        }		
+		
+		/*---------------------------*/		
+		
+		.stripes span {
+            -webkit-background-size: 30px 30px;
+            -moz-background-size: 30px 30px;
+            background-size: 30px 30px;			
+			background-image: -webkit-gradient(linear, left top, right bottom,
+								color-stop(.25, rgba(255, 255, 255, .15)), color-stop(.25, transparent),
+								color-stop(.5, transparent), color-stop(.5, rgba(255, 255, 255, .15)),
+								color-stop(.75, rgba(255, 255, 255, .15)), color-stop(.75, transparent),
+								to(transparent));
+            background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);
+            background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);
+            background-image: -ms-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);
+            background-image: -o-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);
+            background-image: linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);            
+            
+            -webkit-animation: animate-stripes 3s linear infinite;
+            -moz-animation: animate-stripes 3s linear infinite;       		
+		}
+        
+	@-webkit-keyframes animate-stripes { 
+			0% {background-position: 0 0;} 100% {background-position: 60px 0;}
+        }
+        
+        
+        @-moz-keyframes animate-stripes {
+			0% {background-position: 0 0;} 100% {background-position: 60px 0;}
+        }
+		
+		/*---------------------------*/	 
+
+		.shine span {
+			position: relative;
+		}
+		
+		.shine span::after {
+			content: '';
+			opacity: 0;
+			position: absolute;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			background: #fff;
+            -moz-border-radius: 3px;
+			-webkit-border-radius: 3px;
+			border-radius: 3px;			
+			
+            -webkit-animation: animate-shine 2s ease-out infinite;
+            -moz-animation: animate-shine 2s ease-out infinite; 			
+		}
+
+        @-webkit-keyframes animate-shine { 
+			0% {opacity: 0; width: 0;}
+			50% {opacity: .5;}
+			100% {opacity: 0; width: 95%;}
+        }
+        
+        
+        @-moz-keyframes animate-shine {
+			0% {opacity: 0; width: 0;}
+			50% {opacity: .5;}
+			100% {opacity: 0; width: 95%;}
+        }
+		.glow span {
+            -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;
+			-webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;
+			box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;
+			
+            -webkit-animation: animate-glow 1s ease-out infinite;
+            -moz-animation: animate-glow 1s ease-out infinite; 			
+		}
+
+		@-webkit-keyframes animate-glow {
+		 0% { -webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;} 
+		 50% { -webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .3) inset, 0 -5px 5px rgba(255, 255, 255, .3) inset;} 
+		 100% { -webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;}
+		 }
+
+		@-moz-keyframes animate-glow {
+		 0% { -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;} 
+		 50% { -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .3) inset, 0 -5px 5px rgba(255, 255, 255, .3) inset;} 
+		 100% { -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;}
+		 }
+
+ </style>
   </head>
   <body>
     <div class="bar top">{{ boardlist.top }}</div>
@@ -21,10 +181,25 @@
 </center>
    <div class="ban">
       <h2>Thanks for donating</h2>
-      <p>The server costs $55 per month. If you buy stickers we get about 45-55% of whatever you spend. ForeverN2Dust is the top donator, giving about $3000. FOOFDOOF is #2 with $1000 and lots of cheap Chinese shit. Please specify what you'd like your money to go towards. We spent $100 for advertising in March.
+      <p>The server costs $55 per month. If you buy stickers we get about 45-55% of whatever you spend. Historical donation records to the former owner are ForeverN2Dust is the top donator, giving about $3000. FOOFDOOF is #2 with $1000 and lots of cheap Chinese shit. Please specify what you'd like your money to go towards. If you don't want to buy stickers, but want to donate something else please either ask in /q/ or contact the Lainchan administration on IRC at #lainchan on Freenode.
         </p>
 
-        <p>https://www.stickermule.com/marketplace/tags/lainchan</p>
+  <p><a href="https://www.stickermule.com/marketplace/tags/lainchan"> Buy stickers here</a>
+</p>
+
+<p>Monthly Funding Progress Bar</p>
+
+<p>Cost per month $55</p>
+
+<p>Funds from stickers $37.75</p>
+
+<div class="container">
+<div class="progress-bar red glow">
+    <span style="width:14%;position:relative;left:36%; 
+  "> </span>
+</div>
+<div id="value" style="position:relative;left:135px;top:-45px">$-19.25</div>
+</div>
 
     </div>
 
-- 
cgit v1.3


From ea9da7da611509fbe9c5f23867414242a443e3a8 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sun, 2 Oct 2016 01:15:34 +0900
Subject: Make slack report notifier, donate page, irc page and radio page use
 configuration variables instead of hard coding values.

---
 inc/config.php                      |   6 +-
 post.php                            |  52 +++++------
 stylesheets/progressbar.css         | 159 +++++++++++++++++++++++++++++++++
 templates/themes/donate/donate.html | 173 ++----------------------------------
 templates/themes/donate/info.php    |  33 ++++++-
 templates/themes/irc/info.php       |   7 +-
 templates/themes/irc/irc.html       |   4 +-
 templates/themes/irc/radio.html     |  29 ------
 templates/themes/radio/info.php     |   9 +-
 templates/themes/radio/radio.html   |   2 +-
 10 files changed, 244 insertions(+), 230 deletions(-)
 create mode 100644 stylesheets/progressbar.css
 delete mode 100644 templates/themes/irc/radio.html

diff --git a/inc/config.php b/inc/config.php
index dc65068f..0f2d40fc 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1811,9 +1811,9 @@
 		'</a></div>';
 
     // Slack Report Notification
-    $config['slack'] = true;
-    $config['slack_channel'] = "reports";
-    $config['slack_incoming_webhook_endpoint'] = "https://hooks.slack.com/services/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";
+    $config['slack'] = false;
+    $config['slack_channel'] = "";
+    $config['slack_incoming_webhook_endpoint'] = "https://hooks.slack.com/services/";
 
 	// Password hashing function
 	//
diff --git a/post.php b/post.php
index 070cbd88..84858bb2 100644
--- a/post.php
+++ b/post.php
@@ -342,36 +342,38 @@ if (isset($_POST['delete'])) {
 		$query->bindValue(':post', $id, PDO::PARAM_INT);
 		$query->bindValue(':reason', $reason, PDO::PARAM_STR);
 		$query->execute() or error(db_error($query));
-                if ($config['slack'])
-                {
-                function slack($message, $room = "reports", $icon = ":no_entry_sign:") 
-			{
-			$room = ($room) ? $room : "reports";
-			$data = "payload=" . json_encode(array(
-			"channel"       =>  "#{$room}",
-			"text"          =>  urlencode($message),
-			"icon_emoji"    =>  $icon
-			));
-
-			// You can get your webhook endpoint from your Slack settings
-			// For some reason using the configuration key doesn't work 
-			//$ch = curl_init($config['slack_incoming_webhook_endpoint']);
-			$ch = curl_init("https://hooks.slack.com/services/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");
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			$result = curl_exec($ch);
-			curl_close($ch);
-
-			return $result;
-			}
+        
+        if ($config['slack'])
+        {
+            
+        function slack($message, $room = "reports", $icon = ":no_entry_sign:") 
+        {
+        $room = ($room) ? $room : "reports";
+        $data = "payload=" . json_encode(array(
+        "channel"       =>  "#{$room}",
+        "text"          =>  urlencode($message),
+        "icon_emoji"    =>  $icon
+        ));
+
+        // You can get your webhook endpoint from your Slack settings
+        // For some reason using the configuration key doesn't work 
+        $ch = curl_init($config['slack_incoming_webhook_endpoint']);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        $result = curl_exec($ch);
+        curl_close($ch);
+
+        return $result;
+        }
 		
 		$postcontent = mb_substr($thread['body_nomarkup'], 0, 120) . '...  _*(POST TRIMMED)*_';
 		$slackmessage = '<'  .$config['domain']  . "/mod.php?/" . $board['dir'] . $config['dir']['res'] .  ( $thread['thread'] ? $thread['thread'] : $id ) . ".html"  .  ($thread['thread'] ? '#' . $id : '') . '> \n ' . $reason . '\n ' . $postcontent . '\n';
 
 		$slackresult = slack($slackmessage, $config['slack_channel']); 
-		}
+        
+        }
 
 
 	}
diff --git a/stylesheets/progressbar.css b/stylesheets/progressbar.css
new file mode 100644
index 00000000..6083e72e
--- /dev/null
+++ b/stylesheets/progressbar.css
@@ -0,0 +1,159 @@
+	/*---------------------------*/			
+        .container {
+	margin: auto;
+	width : 50%;
+	}    
+        .progress-bar {
+            background-color: #1a1a1a;
+            height: 25px;
+            padding: 5px;
+            width: 350px;
+	    position: relative;
+            margin: 70px 0 20px 0;			
+            -moz-border-radius: 5px;
+			-webkit-border-radius: 5px;
+			border-radius: 5px;
+            -moz-box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;
+			-webkit-box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;
+			box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;           
+        }
+        
+        .progress-bar span {
+            display: inline-block;
+            height: 100%;
+			background-color: #777;
+            -moz-border-radius: 3px;
+			-webkit-border-radius: 3px;
+			border-radius: 3px;
+            -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset;
+			-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset;
+			box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset;
+			-webkit-transition: width .4s ease-in-out;
+			-moz-transition: width .4s ease-in-out;
+			-ms-transition: width .4s ease-in-out;
+			-o-transition: width .4s ease-in-out;
+			transition:   width .4s ease-in-out;		
+        }
+		
+		
+        .blue span {
+            background-color: #34c2e3;   
+        }
+
+        .red span {
+			  background-color: #f42323;
+			  background-image: -webkit-gradient(linear, left top, left bottom, from(#f42323), to(#ff0000));
+			  background-image: -webkit-linear-gradient(top, #f42323, #ff0000);
+			  background-image: -moz-linear-gradient(top, #f42323, #ff0000);
+			  background-image: -ms-linear-gradient(top, #f42323, #ff0000);
+			  background-image: -o-linear-gradient(top, #f42323, #ff0000);
+			  background-image: linear-gradient(top, #f42323, #ff0000);  
+        }	
+
+        .green span {
+			  background-color: #a5df41;
+			  background-image: -webkit-gradient(linear, left top, left bottom, from(#a5df41), to(#4ca916));
+			  background-image: -webkit-linear-gradient(top, #a5df41, #4ca916);
+			  background-image: -moz-linear-gradient(top, #a5df41, #4ca916);
+			  background-image: -ms-linear-gradient(top, #a5df41, #4ca916);
+			  background-image: -o-linear-gradient(top, #a5df41, #4ca916);
+			  background-image: linear-gradient(top, #a5df41, #4ca916);  
+        }		
+		
+		/*---------------------------*/		
+		
+		.stripes span {
+            -webkit-background-size: 30px 30px;
+            -moz-background-size: 30px 30px;
+            background-size: 30px 30px;			
+			background-image: -webkit-gradient(linear, left top, right bottom,
+								color-stop(.25, rgba(255, 255, 255, .15)), color-stop(.25, transparent),
+								color-stop(.5, transparent), color-stop(.5, rgba(255, 255, 255, .15)),
+								color-stop(.75, rgba(255, 255, 255, .15)), color-stop(.75, transparent),
+								to(transparent));
+            background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);
+            background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);
+            background-image: -ms-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);
+            background-image: -o-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);
+            background-image: linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
+                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
+                                transparent 75%, transparent);            
+            
+            -webkit-animation: animate-stripes 3s linear infinite;
+            -moz-animation: animate-stripes 3s linear infinite;       		
+		}
+        
+	@-webkit-keyframes animate-stripes { 
+			0% {background-position: 0 0;} 100% {background-position: 60px 0;}
+        }
+        
+        
+        @-moz-keyframes animate-stripes {
+			0% {background-position: 0 0;} 100% {background-position: 60px 0;}
+        }
+		
+		/*---------------------------*/	 
+
+		.shine span {
+			position: relative;
+		}
+		
+		.shine span::after {
+			content: '';
+			opacity: 0;
+			position: absolute;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			background: #fff;
+            -moz-border-radius: 3px;
+			-webkit-border-radius: 3px;
+			border-radius: 3px;			
+			
+            -webkit-animation: animate-shine 2s ease-out infinite;
+            -moz-animation: animate-shine 2s ease-out infinite; 			
+		}
+
+        @-webkit-keyframes animate-shine { 
+			0% {opacity: 0; width: 0;}
+			50% {opacity: .5;}
+			100% {opacity: 0; width: 95%;}
+        }
+        
+        
+        @-moz-keyframes animate-shine {
+			0% {opacity: 0; width: 0;}
+			50% {opacity: .5;}
+			100% {opacity: 0; width: 95%;}
+        }
+		.glow span {
+            -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;
+			-webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;
+			box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;
+			
+            -webkit-animation: animate-glow 1s ease-out infinite;
+            -moz-animation: animate-glow 1s ease-out infinite; 			
+		}
+
+		@-webkit-keyframes animate-glow {
+		 0% { -webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;} 
+		 50% { -webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .3) inset, 0 -5px 5px rgba(255, 255, 255, .3) inset;} 
+		 100% { -webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;}
+		 }
+
+		@-moz-keyframes animate-glow {
+		 0% { -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;} 
+		 50% { -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .3) inset, 0 -5px 5px rgba(255, 255, 255, .3) inset;} 
+		 100% { -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;}
+		 }
+
+
diff --git a/templates/themes/donate/donate.html b/templates/themes/donate/donate.html
index 551eea62..27f16747 100644
--- a/templates/themes/donate/donate.html
+++ b/templates/themes/donate/donate.html
@@ -7,167 +7,8 @@
     <link rel="shortcut icon" href="/favicon.png">
     <link rel="stylesheet" media="screen" href="/stylesheets/style.css"/>
     <link rel="stylesheet" media="screen" href="/stylesheets/dark.css"/>
+    <link rel="stylesheet" media="screen" href="/stylesheets/progressbar.css"/>
 	{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
-<style>
-	/*---------------------------*/			
-        .container {
-	margin: auto;
-	width : 50%;
-	}    
-        .progress-bar {
-            background-color: #1a1a1a;
-            height: 25px;
-            padding: 5px;
-            width: 350px;
-	    position: relative;
-            margin: 70px 0 20px 0;			
-            -moz-border-radius: 5px;
-			-webkit-border-radius: 5px;
-			border-radius: 5px;
-            -moz-box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;
-			-webkit-box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;
-			box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;           
-        }
-        
-        .progress-bar span {
-            display: inline-block;
-            height: 100%;
-			background-color: #777;
-            -moz-border-radius: 3px;
-			-webkit-border-radius: 3px;
-			border-radius: 3px;
-            -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset;
-			-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset;
-			box-shadow: 0 1px 0 rgba(255, 255, 255, .5) inset;
-			-webkit-transition: width .4s ease-in-out;
-			-moz-transition: width .4s ease-in-out;
-			-ms-transition: width .4s ease-in-out;
-			-o-transition: width .4s ease-in-out;
-			transition:   width .4s ease-in-out;		
-        }
-		
-		
-        .blue span {
-            background-color: #34c2e3;   
-        }
-
-        .red span {
-			  background-color: #f42323;
-			  background-image: -webkit-gradient(linear, left top, left bottom, from(#f42323), to(#ff0000));
-			  background-image: -webkit-linear-gradient(top, #f42323, #ff0000);
-			  background-image: -moz-linear-gradient(top, #f42323, #ff0000);
-			  background-image: -ms-linear-gradient(top, #f42323, #ff0000);
-			  background-image: -o-linear-gradient(top, #f42323, #ff0000);
-			  background-image: linear-gradient(top, #f42323, #ff0000);  
-        }	
-
-        .green span {
-			  background-color: #a5df41;
-			  background-image: -webkit-gradient(linear, left top, left bottom, from(#a5df41), to(#4ca916));
-			  background-image: -webkit-linear-gradient(top, #a5df41, #4ca916);
-			  background-image: -moz-linear-gradient(top, #a5df41, #4ca916);
-			  background-image: -ms-linear-gradient(top, #a5df41, #4ca916);
-			  background-image: -o-linear-gradient(top, #a5df41, #4ca916);
-			  background-image: linear-gradient(top, #a5df41, #4ca916);  
-        }		
-		
-		/*---------------------------*/		
-		
-		.stripes span {
-            -webkit-background-size: 30px 30px;
-            -moz-background-size: 30px 30px;
-            background-size: 30px 30px;			
-			background-image: -webkit-gradient(linear, left top, right bottom,
-								color-stop(.25, rgba(255, 255, 255, .15)), color-stop(.25, transparent),
-								color-stop(.5, transparent), color-stop(.5, rgba(255, 255, 255, .15)),
-								color-stop(.75, rgba(255, 255, 255, .15)), color-stop(.75, transparent),
-								to(transparent));
-            background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
-                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
-                                transparent 75%, transparent);
-            background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
-                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
-                                transparent 75%, transparent);
-            background-image: -ms-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
-                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
-                                transparent 75%, transparent);
-            background-image: -o-linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
-                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
-                                transparent 75%, transparent);
-            background-image: linear-gradient(135deg, rgba(255, 255, 255, .15) 25%, transparent 25%,
-                                transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%,
-                                transparent 75%, transparent);            
-            
-            -webkit-animation: animate-stripes 3s linear infinite;
-            -moz-animation: animate-stripes 3s linear infinite;       		
-		}
-        
-	@-webkit-keyframes animate-stripes { 
-			0% {background-position: 0 0;} 100% {background-position: 60px 0;}
-        }
-        
-        
-        @-moz-keyframes animate-stripes {
-			0% {background-position: 0 0;} 100% {background-position: 60px 0;}
-        }
-		
-		/*---------------------------*/	 
-
-		.shine span {
-			position: relative;
-		}
-		
-		.shine span::after {
-			content: '';
-			opacity: 0;
-			position: absolute;
-			top: 0;
-			right: 0;
-			bottom: 0;
-			left: 0;
-			background: #fff;
-            -moz-border-radius: 3px;
-			-webkit-border-radius: 3px;
-			border-radius: 3px;			
-			
-            -webkit-animation: animate-shine 2s ease-out infinite;
-            -moz-animation: animate-shine 2s ease-out infinite; 			
-		}
-
-        @-webkit-keyframes animate-shine { 
-			0% {opacity: 0; width: 0;}
-			50% {opacity: .5;}
-			100% {opacity: 0; width: 95%;}
-        }
-        
-        
-        @-moz-keyframes animate-shine {
-			0% {opacity: 0; width: 0;}
-			50% {opacity: .5;}
-			100% {opacity: 0; width: 95%;}
-        }
-		.glow span {
-            -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;
-			-webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;
-			box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;
-			
-            -webkit-animation: animate-glow 1s ease-out infinite;
-            -moz-animation: animate-glow 1s ease-out infinite; 			
-		}
-
-		@-webkit-keyframes animate-glow {
-		 0% { -webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;} 
-		 50% { -webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .3) inset, 0 -5px 5px rgba(255, 255, 255, .3) inset;} 
-		 100% { -webkit-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;}
-		 }
-
-		@-moz-keyframes animate-glow {
-		 0% { -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;} 
-		 50% { -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .3) inset, 0 -5px 5px rgba(255, 255, 255, .3) inset;} 
-		 100% { -moz-box-shadow: 0 5px 5px rgba(255, 255, 255, .7) inset, 0 -5px 5px rgba(255, 255, 255, .7) inset;}
-		 }
-
- </style>
   </head>
   <body>
     <div class="bar top">{{ boardlist.top }}</div>
@@ -181,7 +22,7 @@
 </center>
    <div class="ban">
       <h2>Thanks for donating</h2>
-      <p>The server costs $55 per month. If you buy stickers we get about 45-55% of whatever you spend. Historical donation records to the former owner are ForeverN2Dust is the top donator, giving about $3000. FOOFDOOF is #2 with $1000 and lots of cheap Chinese shit. Please specify what you'd like your money to go towards. If you don't want to buy stickers, but want to donate something else please either ask in /q/ or contact the Lainchan administration on IRC at #lainchan on Freenode.
+      <p>The server costs {{ settings.monthlyamount }} per month. If you buy stickers we get about 45-55% of whatever you spend. Historical donation records to the former owner are ForeverN2Dust is the top donator, giving about $3000. FOOFDOOF is #2 with $1000 and lots of cheap Chinese shit. Please specify what you'd like your money to go towards. If you don't want to buy stickers, but want to donate something else please either ask in /q/ or contact the Lainchan administration on IRC at #lainchan on Freenode.
         </p>
 
   <p><a href="https://www.stickermule.com/marketplace/tags/lainchan"> Buy stickers here</a>
@@ -189,16 +30,16 @@
 
 <p>Monthly Funding Progress Bar</p>
 
-<p>Cost per month $55</p>
+<p>Cost per month {{ settings.monthlyamount }}</p>
 
-<p>Funds from stickers $37.75</p>
+<p>Funds from stickers {{ settings.currentamount }} </p>
 
 <div class="container">
-<div class="progress-bar red glow">
-    <span style="width:14%;position:relative;left:36%; 
+    <div class="{{ settings.progressbarcssclass }}">
+        <span style="width:14%;position:relative;left:{{ settings.progressbarcssleft }}%; 
   "> </span>
 </div>
-<div id="value" style="position:relative;left:135px;top:-45px">$-19.25</div>
+<div id="value" style="position:relative;left:{{ settings.progressbartextcssleft }}px;top:-45px">{{ settings.currentprogress }}</div>
 </div>
 
     </div>
diff --git a/templates/themes/donate/info.php b/templates/themes/donate/info.php
index fa3f649b..2b618e89 100644
--- a/templates/themes/donate/info.php
+++ b/templates/themes/donate/info.php
@@ -17,7 +17,38 @@ $theme = array(
         array('title'   => 'File',
               'name'    => 'file',
               'type'    => 'text',
-              'default' => 'donate.html')),
+              'default' => 'donate.html'),
+
+        array('title'   => 'Monthly Amount',
+              'name'    => 'monthlyamount',
+              'type'    => 'text',
+              'default' => '$55'),
+          
+        array('title'   => 'Current Amount',
+              'name'    => 'currentamount',
+              'type'    => 'text',
+              'default' => '$0'),
+        
+        array('title'   => 'Current Progress',
+              'name'    => 'currentprogress',
+              'type'    => 'text',
+              'default' => '$0'),
+        
+        array('title'   => 'Progress Bar CSS class',
+              'name'    => 'progressbarcssclass',
+              'type'    => 'text',
+              'default' => 'progress-bar red glow'),
+        
+        array('title'   => 'Progress Bar CSS left',
+              'name'    => 'progressbarcssleft',
+              'type'    => 'text',
+              'default' => '36'),
+        
+        array('title'   => 'Progress Bar Text CSS left',
+              'name'    => 'progressbartextcssleft',
+              'type'    => 'text',
+              'default' => '135'),
+          ),
 
     'build_function'   => 'donate_build');
 ?>
diff --git a/templates/themes/irc/info.php b/templates/themes/irc/info.php
index 8b31b011..59ff4bd6 100644
--- a/templates/themes/irc/info.php
+++ b/templates/themes/irc/info.php
@@ -17,7 +17,12 @@ $theme = array(
         array('title'   => 'File',
               'name'    => 'file',
               'type'    => 'text',
-              'default' => 'irc.html')),
+              'default' => 'irc.html'),
+
+        array('title'   => 'Channel',
+              'name'    => 'channel',
+              'type'    => 'text',
+              'default' => 'lainchan')),
 
     'build_function'   => 'irc_build');
 ?>
diff --git a/templates/themes/irc/irc.html b/templates/themes/irc/irc.html
index 2828b6e0..1766f426 100644
--- a/templates/themes/irc/irc.html
+++ b/templates/themes/irc/irc.html
@@ -22,8 +22,8 @@
 
 
     <div class="ban" style="text-align: left!important;">
-    	<h2>Web Client - Point your own clients to #lainchan on irc.freenode.net.</h2>		
-	<iframe src="https://webchat.freenode.net?channels=%23lainchan&uio=MTE9MTMz98" width="766" height="400"></iframe>
+        <h2>Web Client - Point your own clients to #{{ settings.channel }} on irc.freenode.net.</h2>		
+        <iframe src="https://webchat.freenode.net?channels=%23{{ settings.channel }}&uio=MTE9MTMz98" width="766" height="400"></iframe>
     </div>
   </body>
 </html>
diff --git a/templates/themes/irc/radio.html b/templates/themes/irc/radio.html
deleted file mode 100644
index 7f84134b..00000000
--- a/templates/themes/irc/radio.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% filter remove_whitespace %}
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <title>{{ settings.title }}</title>
-    <link rel="shortcut icon" href="/favicon.png">
-    <link rel="stylesheet" media="screen" href="/stylesheets/style.css"/>
-    <link rel="stylesheet" media="screen" href="/stylesheets/dark.css"/>
-    <link rel="stylesheet" media="screen" href="/stylesheets/dark_irc.css"/>
-  </head>
-  <body>
-  	<div class="bar top">
-		{{ boardlist.top }}
-	</div>
-
-    <header>
-      <h1>{{ settings.title }}</h1>
-      <div class="subtitle">{{ settings.subtitle }}</div>
-    </header>
-
-
-    <div class="ban" style="text-align: left!important;">
-    	<h2>Web Client - Point your own clients to #lainchan on irc.freenode.net.</h2>		
-	<iframe src="https://webchat.freenode.net?channels=%23lainchan&uio=MTE9MTMz98" width="766" height="400"></iframe>
-    </div>
-  </body>
-</html>
-{% endfilter %}
diff --git a/templates/themes/radio/info.php b/templates/themes/radio/info.php
index d6679733..2ae31fbd 100644
--- a/templates/themes/radio/info.php
+++ b/templates/themes/radio/info.php
@@ -17,7 +17,12 @@ $theme = array(
         array('title'   => 'File',
               'name'    => 'file',
               'type'    => 'text',
-              'default' => 'radio.html')),
+              'default' => 'radio.html'),
+    
+        array('title'   => 'Radio Status URL',
+              'name'    => 'radiostatus',
+              'type'    => 'text',
+              'default' => '/radio_assets/status.xsl')),
 
     'build_function'   => 'radio_build');
-?>
\ No newline at end of file
+?>
diff --git a/templates/themes/radio/radio.html b/templates/themes/radio/radio.html
index b19d703a..3e16430e 100644
--- a/templates/themes/radio/radio.html
+++ b/templates/themes/radio/radio.html
@@ -16,7 +16,7 @@ $(document).ready(function(){
 });
 
 function check_status(){  
-$.get("/radio_assets/status.xsl", function(data){    
+$.get("{{ settings.radiostatus }}", function(data){    
 var el = $( '<div></div>' );   
 el.html(data);    
 var sd = el.find(".streamdata");  
-- 
cgit v1.3


From c0d1f60752f9a9c2ff6c2516cd7edd946fd3a441 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 8 Oct 2016 00:47:55 +0900
Subject: Add other donation fields to donate theme / extension

---
 templates/themes/donate/donate.html | 4 +++-
 templates/themes/donate/info.php    | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/templates/themes/donate/donate.html b/templates/themes/donate/donate.html
index 27f16747..1ecf008e 100644
--- a/templates/themes/donate/donate.html
+++ b/templates/themes/donate/donate.html
@@ -32,7 +32,9 @@
 
 <p>Cost per month {{ settings.monthlyamount }}</p>
 
-<p>Funds from stickers {{ settings.currentamount }} </p>
+<p>Funds from stickers {{ settings.stickeramount }} </p>
+
+<p>Funds from other donations {{ settings.otheramount }} </p>
 
 <div class="container">
     <div class="{{ settings.progressbarcssclass }}">
diff --git a/templates/themes/donate/info.php b/templates/themes/donate/info.php
index 2b618e89..6fa57cd6 100644
--- a/templates/themes/donate/info.php
+++ b/templates/themes/donate/info.php
@@ -24,8 +24,13 @@ $theme = array(
               'type'    => 'text',
               'default' => '$55'),
           
-        array('title'   => 'Current Amount',
-              'name'    => 'currentamount',
+        array('title'   => 'Current Sticker Amount',
+              'name'    => 'stickeramount',
+              'type'    => 'text',
+              'default' => '$0'),
+        
+        array('title'   => 'Current Other Donations Amount',
+              'name'    => 'otheramount',
               'type'    => 'text',
               'default' => '$0'),
         
-- 
cgit v1.3


From 379fe63fba2bd74584a4af0a209022207974c66c Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 8 Oct 2016 00:48:55 +0900
Subject: Add enable per board feature and only include new threads feature for
 RSS theme / extension

---
 templates/themes/rss/info.php  |  14 +++++
 templates/themes/rss/rss.xml   |   2 +-
 templates/themes/rss/theme.php | 114 +++++++++++++++++++++--------------------
 3 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/templates/themes/rss/info.php b/templates/themes/rss/info.php
index 14b39eb9..4da43bf0 100755
--- a/templates/themes/rss/info.php
+++ b/templates/themes/rss/info.php
@@ -48,6 +48,20 @@
 		'comment' => '(eg. "http://test.com")'
 	);
 	
+	$theme['config'][] = Array(
+		'title' => 'Show Threads Only',
+		'name' => 'show_threads_only',
+		'type' => 'text',
+		'default' => 'false',
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'Enable Per Board',
+		'name' => 'enable_per_board',
+		'type' => 'text',
+		'default' => 'false',
+	);
+
 	// Unique function name for building everything
 	$theme['build_function'] = 'rss_recentposts_build';
 	$theme['install_callback'] = 'rss_recentposts_install';
diff --git a/templates/themes/rss/rss.xml b/templates/themes/rss/rss.xml
index 30fdb473..6bf34113 100644
--- a/templates/themes/rss/rss.xml
+++ b/templates/themes/rss/rss.xml
@@ -11,7 +11,7 @@
     <link>{{ settings.base_url }}{{ config.root }}{{ settings.html }}</link>
     {% for post in recent_posts %}
     <item>
-      <title>{{ post.board_name }}</title>
+      <title><![CDATA[ {{ post.board_name }} ]]></title>
       <description>
 	<![CDATA[
 		 <a href="{{ settings.base_url }}{{ post.link }}">
diff --git a/templates/themes/rss/theme.php b/templates/themes/rss/theme.php
index 33c1b210..d0a80f51 100755
--- a/templates/themes/rss/theme.php
+++ b/templates/themes/rss/theme.php
@@ -16,52 +16,91 @@
 	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
 	class RSSRecentPosts {
 		public function build($action, $settings) {
-			global $config, $_theme;
+			global $config, $_theme,$board;
 			
-			/*if ($action == 'all') {
-				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . $settings['css']);
-			}*/
 			
 			$this->excluded = explode(' ', $settings['exclude']);
-			
-			if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
-				file_write($config['dir']['home'] . $settings['xml'], $this->homepage($settings));
+			if ($settings['show_threads_only'] == 'true'){
+				if ($action == 'all' || $action == 'post-thread' || $action == 'post-delete')
+					file_write($config['dir']['home'] . $settings['xml'], $this->site_rsspage($settings));
+			}
+			else {	
+				if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
+					file_write($config['dir']['home'] . $settings['xml'], $this->site_rsspage($settings));
+			}
+
+			if ($settings['enable_per_board'] == 'true'){
+				$boards = listBoards();
+				foreach ($boards as &$_board) {
+					if (in_array($_board['uri'], $this->excluded))
+						continue;
+
+					openBoard($_board['uri']);
+					if ($settings['show_threads_only'] == 'true'){
+						if ($action == 'all' || $action == 'post-thread' || $action == 'post-delete')
+							file_write($config['dir']['home']  . 'debug.xml', $board['dir']);
+							file_write($config['dir']['home']  . $board['dir'] . $settings['xml'], $this->board_rsspage($settings,$_board));
+					}
+					else {	
+						if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
+							file_write($config['dir']['home']  . $board['dir'] . $settings['xml'], $this->board_rsspage($settings,$_board));
+					}
+				}
+
+			}
 		}
 		
 		// Build news page
-		public function homepage($settings) {
+		public function site_rsspage($settings) {
 			global $config, $board;
 			
-			//$recent_images = Array();
 			$recent_posts = Array();
-			//$stats = Array();
 			
 			$boards = listBoards();
 			
-			/*$query = '';
+			$query = '';
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
+				if ($settings['show_threads_only'] == 'true'){
+					$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `thread` is null UNION ALL ", $_board['uri'], $_board['uri']);
+				}
+				else {
+					$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
+				}
 			}
-			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
+			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
 			$query = query($query) or error(db_error());
 			
 			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				openBoard($post['board']);
 				
-				// board settings won't be available in the template file, so generate links now
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
-				$post['src'] = $config['uri_thumb'] . $post['thumb'];
+				$post['snippet'] = pm_snippet($post['body'], 30);
+				$post['board_name'] = $board['name'];
 				
-				//$recent_images[] = $post;
-			}*/
+				$recent_posts[] = $post;
+			}
+			
+			
+			return Element('themes/rss/rss.xml', Array(
+				'settings' => $settings,
+				'config' => $config,
+				'recent_posts' => $recent_posts,
+			));
+		}
+		
+		// Build news page
+		public function board_rsspage($settings,$_board) {
+			global $config, $board;
 			
+			$recent_posts = Array();
 			
 			$query = '';
-			foreach ($boards as &$_board) {
-				if (in_array($_board['uri'], $this->excluded))
-					continue;
+			if ($settings['show_threads_only'] == 'true'){
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `thread` is null UNION ALL ", $_board['uri'], $_board['uri']);
+			}
+			else {
 				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
@@ -77,46 +116,11 @@
 				$recent_posts[] = $post;
 			}
 			
-			// Total posts
-			/*$query = 'SELECT SUM(`top`) FROM (';
-			foreach ($boards as &$_board) {
-				if (in_array($_board['uri'], $this->excluded))
-					continue;
-				$query .= sprintf("SELECT MAX(`id`) AS `top` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
-			}
-			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
-			$query = query($query) or error(db_error());*/
-			//$stats['total_posts'] = number_format($query->fetchColumn());
-			
-			// Unique IPs
-			/*$query = 'SELECT COUNT(DISTINCT(`ip`)) FROM (';
-			foreach ($boards as &$_board) {
-				if (in_array($_board['uri'], $this->excluded))
-					continue;
-				$query .= sprintf("SELECT `ip` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
-			}
-			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
-			$query = query($query) or error(db_error());
-			//$stats['unique_posters'] = number_format($query->fetchColumn());*/
-			
-			// Active content
-			/*$query = 'SELECT SUM(`filesize`) FROM (';
-			foreach ($boards as &$_board) {
-				if (in_array($_board['uri'], $this->excluded))
-					continue;
-				$query .= sprintf("SELECT `filesize` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
-			}
-			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
-			$query = query($query) or error(db_error());
-			//$stats['active_content'] = $query->fetchColumn();*/
 			
 			return Element('themes/rss/rss.xml', Array(
 				'settings' => $settings,
 				'config' => $config,
-				//'boardlist' => createBoardlist(),
-				//'recent_images' => $recent_images,
 				'recent_posts' => $recent_posts,
-				//'stats' => $stats
 			));
 		}
 	};
-- 
cgit v1.3


From 2abb80ba296908be3d4480ff32e5eda3822881a6 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 8 Oct 2016 01:47:53 +0900
Subject: Remove debugging from RSS extension

---
 templates/themes/rss/theme.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/themes/rss/theme.php b/templates/themes/rss/theme.php
index d0a80f51..eb833ec8 100755
--- a/templates/themes/rss/theme.php
+++ b/templates/themes/rss/theme.php
@@ -38,7 +38,6 @@
 					openBoard($_board['uri']);
 					if ($settings['show_threads_only'] == 'true'){
 						if ($action == 'all' || $action == 'post-thread' || $action == 'post-delete')
-							file_write($config['dir']['home']  . 'debug.xml', $board['dir']);
 							file_write($config['dir']['home']  . $board['dir'] . $settings['xml'], $this->board_rsspage($settings,$_board));
 					}
 					else {	
-- 
cgit v1.3


From fa01d816b3b2d9dfb4f6b37435d1a6fd3cbf76f7 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 8 Oct 2016 15:29:06 +0900
Subject: Add stream theme / extension to Lainchan

---
 templates/themes/stream/info.php    |  74 +++++++++++++++++++++++++++++++
 templates/themes/stream/stream.html |  84 ++++++++++++++++++++++++++++++++++++
 templates/themes/stream/theme.php   |  34 +++++++++++++++
 templates/themes/stream/thumb.png   | Bin 0 -> 7872 bytes
 4 files changed, 192 insertions(+)
 create mode 100644 templates/themes/stream/info.php
 create mode 100644 templates/themes/stream/stream.html
 create mode 100644 templates/themes/stream/theme.php
 create mode 100644 templates/themes/stream/thumb.png

diff --git a/templates/themes/stream/info.php b/templates/themes/stream/info.php
new file mode 100644
index 00000000..169cbe46
--- /dev/null
+++ b/templates/themes/stream/info.php
@@ -0,0 +1,74 @@
+<?php
+	$theme = Array();
+	
+	// Theme name
+	$theme['name'] = 'Stream';
+	// Description (you can use Tinyboard markup here)
+	$theme['description'] = 'Stream page';
+	$theme['version'] = 'v0.9.1';
+	
+	// Theme configuration	
+	$theme['config'] = Array();
+	
+	$theme['config'][] = Array(
+		'title' => 'Site title',
+		'name' => 'title',
+		'type' => 'text'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'Slogan',
+		'name' => 'subtitle',
+		'type' => 'text',
+		'comment' => '(optional)'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'File',
+		'name' => 'file',
+		'type' => 'text',
+		'default' => 'stream.html',
+		'comment' => '(eg. "stream.html")'
+	);
+    $theme['config'][] =  Array(
+              'title'   => 'OGV stream URL',
+              'name'    => 'ogvurl',
+              'type'    => 'text',
+              'default' => 'https://lainchan.org/radio_assets/lainstream.ogg')
+          );
+    $theme['config'][] =  Array(
+              'title'   => 'RTMP stream URL',
+              'name'    => 'rtmpurl',
+              'type'    => 'text',
+              'default' => 'rtmp://lainchan.org/live/&stream')
+          );
+
+    $theme['config'][] =  Array(
+              'title'   => 'OGV Status URL',
+              'name'    => 'ogvstatus',
+              'type'    => 'text',
+              'default' => '/radio_assets/status.xsl')
+          );
+    
+    $theme['config'][] =  Array(
+              'title'   => 'RTMP Status URL',
+              'name'    => 'rtmpstatus',
+              'type'    => 'text',
+              'default' => '/live/status?app=live&name=stream')
+          );
+    $theme['config'][] =  Array(
+              'title'   => 'RTMP Viewers URL',
+              'name'    => 'rtmpviewers',
+              'type'    => 'text',
+              'default' => '/live/subs?app=live&name=stream')
+          );
+	
+	
+	// Unique function name for building everything
+	$theme['build_function'] = 'stream_build';
+	$theme['install_callback'] = 'stream_install';
+	if (!function_exists('stream_install')) {
+		function stream_install($settings) {
+		}
+	}
+
diff --git a/templates/themes/stream/stream.html b/templates/themes/stream/stream.html
new file mode 100644
index 00000000..cf952366
--- /dev/null
+++ b/templates/themes/stream/stream.html
@@ -0,0 +1,84 @@
+{% filter remove_whitespace %}
+<!doctype html>
+<html>
+<head>
+	<link rel="stylesheet" media="screen" href="/stylesheets/style.css">
+	<link href="https://vjs.zencdn.net/5.11.7/video-js.css" rel="stylesheet">
+	<meta charset="utf-8">
+	<title>{{ settings.title }}</title>
+	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
+	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
+	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
+	<link rel="stylesheet" media="screen" href="/stylesheets/dark.css">
+	<!--{% 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 %}
+<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
+
+<script type="text/javascript">
+$(document).ready(function(){
+        check_status();
+        setInterval(check_status, 15000);
+});
+
+function check_status(){
+    $.get("{ settings.rtmpviewers }}", function(data){
+    $("#rtmpviewers").text(data);
+  });
+
+  $.get("{{ settings.ogvstatus }}", function(data){    
+var el = $( '<div></div>' );   
+el.html(data);    
+var sd = el.find(".streamdata");  
+  
+$("#ogvnowplaying").text( sd[25].textContent);    
+
+$("#ogvviewers").text( sd[22].textContent  );
+});
+}
+
+</script>
+</head>
+<body>
+	<div class="bar top">
+		{{ boardlist.top }}
+	</div>
+	<header>
+		<h1>{{ settings.title }}</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
+	
+	<div class="ban">
+	<video id="my-video" class="video-js vjs-big-play-centered vjs-default-skin" controls preload="auto"  width="640" height="264"  poster="https://lainchan.org/static/lain_is_cute_datass_small.png" data-setup="{}">
+        <source src='{{ setings.rtmpurl }}' type='rtmp/mp4'/>
+        <source src="{{ settings.ogvurl }}" type='video/ogv'>
+    <p class="vjs-no-js">
+      To view this video please enable JavaScript, and consider upgrading to a web browser that
+      <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a>
+    </p>
+  	</video>
+
+	<br/>
+	<p>Now Streaming RTMP <span id="rtmpnowplaying">unknown</span></p>
+	<p>Now Streaming OGV <span id="ogvnowplaying">unknown</span></p>
+	<p>Current RTMP viewers: <span id="rtmpviewers">unknown</span></p>
+	<p>Current OGV viewers: <span id="ogvviewers">unknown</span></p>
+	<div>
+	<p>Raw stream URLs for Mplayer, mpv, VLC, etc:</p>
+    <p> RTMP : {{ setings.rtmpurl }} </p>
+    <p> OGV :  {{ setings.ogvurl }} </p>
+	</div><br/>
+	</div>
+	
+	</div>
+	
+	<hr/>
+        <footer>
+                <p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
+                        <a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
+                <br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
+                <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
+        </footer>
+<script src="https://vjs.zencdn.net/5.11.7/video.js"></script>
+</body>
+</html>
+{% endfilter %}
diff --git a/templates/themes/stream/theme.php b/templates/themes/stream/theme.php
new file mode 100644
index 00000000..6d11a0dc
--- /dev/null
+++ b/templates/themes/stream/theme.php
@@ -0,0 +1,34 @@
+<?php
+	require 'info.php';
+	
+	function stream_build($action, $settings, $board) {
+		// Possible values for $action:
+		//	- all (rebuild everything, initialization)
+		//	- boards (board list changed)
+		
+		Stream::build($action, $settings);
+	}
+	
+	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
+	class Stream {
+		public static function build($action, $settings) {
+			global $config;
+			
+			if ($action == 'all' )
+				file_write($config['dir']['home'] . $settings['file'], Stream::homepage($settings));
+		}
+		
+		// Build news page
+		public static function homepage($settings) {
+			global $config;
+			
+			
+			return Element('themes/stream/stream.html', Array(
+				'settings' => $settings,
+				'config' => $config,
+				'boardlist' => createBoardlist(),
+			));
+		}
+	};
+	
+?>
diff --git a/templates/themes/stream/thumb.png b/templates/themes/stream/thumb.png
new file mode 100644
index 00000000..d0c3c771
Binary files /dev/null and b/templates/themes/stream/thumb.png differ
-- 
cgit v1.3


From bd3cc259810fa664abd09de0d94e4d0dc70648e8 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 10 Dec 2016 18:15:11 +0900
Subject: Add JSON API to Ukko Overboard Theme

---
 templates/themes/ukko/theme.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index ee2707bf..a3f30dd4 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -15,6 +15,10 @@
 
 		if ($action == 'delete') {
 			file_unlink($settings['uri'] . '/index.html');
+	                 if ($config['api']['enabled']) {
+			 	$jsonFilename = $settings['uri'] . '/0.json';
+				file_unlink($jsonFilename);
+			 }
 		}
 		elseif ($action == 'rebuild') {
 			file_write($settings['uri'] . '/index.html', $ukko->build());
@@ -48,6 +52,9 @@
 
 			$count = 0;
 			$threads = array();
+	                if ($config['api']['enabled']) {
+				$apithreads = array(); 
+			}	
 			while($post = $query->fetch()) {
 
 				if(!isset($threads[$post['board']])) {
@@ -89,6 +96,9 @@
 					$thread->posts = array_reverse($thread->posts);
 					$body .= '<h2><a href="' . $config['root'] . $post['board'] . '">/' . $post['board'] . '/</a></h2>';
 					$body .= $thread->build(true);
+					if ($config['api']['enabled']) {
+						array_push($apithreads,$thread);
+					}	
 				} else {
 					$page = 'index';
 					if(floor($threads[$post['board']] / $config['threads_per_page']) > 0) {
@@ -102,7 +112,15 @@
 
 			$body .= '<script> var overflow = ' . json_encode($overflow) . '</script>';
 			$body .= '<script type="text/javascript" src="/'.$this->settings['uri'].'/ukko.js"></script>';
-
+			
+			 // json api
+	                 if ($config['api']['enabled']) {
+				require_once __DIR__. '/../../../inc/api.php';
+				$api = new Api();
+				$jsonFilename = $board['dir'] . '0.json';
+				$json = json_encode($api->translatePage($apithreads));
+	                	file_write($jsonFilename, $json);
+			 }
 			return Element('index.html', array(
 				'config' => $config,
 				'board' => $board,
-- 
cgit v1.3


From 1c7c6458316daaed5b233e1c125a7aa2f853425e Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 10 Dec 2016 18:18:27 +0900
Subject: Adding separate videojs RTMP URL configuration variable to stream
 theme

---
 templates/themes/stream/info.php    | 16 +++++++++++-----
 templates/themes/stream/stream.html | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/templates/themes/stream/info.php b/templates/themes/stream/info.php
index 169cbe46..081b29ca 100644
--- a/templates/themes/stream/info.php
+++ b/templates/themes/stream/info.php
@@ -34,33 +34,39 @@
               'title'   => 'OGV stream URL',
               'name'    => 'ogvurl',
               'type'    => 'text',
-              'default' => 'https://lainchan.org/radio_assets/lainstream.ogg')
+              'default' => 'https://lainchan.org/radio_assets/lainstream.ogg'
           );
     $theme['config'][] =  Array(
               'title'   => 'RTMP stream URL',
               'name'    => 'rtmpurl',
               'type'    => 'text',
-              'default' => 'rtmp://lainchan.org/live/&stream')
+              'default' => 'rtmp://lainchan.org/live/stream'
+          );
+    $theme['config'][] =  Array(
+              'title'   => 'RTMP  Video.JS stream URL',
+              'name'    => 'rtmpvideojsurl',
+              'type'    => 'text',
+              'default' => 'rtmp://lainchan.org/live/&stream'
           );
 
     $theme['config'][] =  Array(
               'title'   => 'OGV Status URL',
               'name'    => 'ogvstatus',
               'type'    => 'text',
-              'default' => '/radio_assets/status.xsl')
+              'default' => '/radio_assets/status.xsl'
           );
     
     $theme['config'][] =  Array(
               'title'   => 'RTMP Status URL',
               'name'    => 'rtmpstatus',
               'type'    => 'text',
-              'default' => '/live/status?app=live&name=stream')
+              'default' => '/live/status?app=live&name=stream'
           );
     $theme['config'][] =  Array(
               'title'   => 'RTMP Viewers URL',
               'name'    => 'rtmpviewers',
               'type'    => 'text',
-              'default' => '/live/subs?app=live&name=stream')
+              'default' => '/live/subs?app=live&name=stream'
           );
 	
 	
diff --git a/templates/themes/stream/stream.html b/templates/themes/stream/stream.html
index cf952366..dc2ed26d 100644
--- a/templates/themes/stream/stream.html
+++ b/templates/themes/stream/stream.html
@@ -12,6 +12,9 @@
 	<link rel="stylesheet" media="screen" href="/stylesheets/dark.css">
 	<!--{% 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 %}
+<style>
+.video-js { width:100%!important; height: auto!important; }
+</style>
 <script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
 
 <script type="text/javascript">
@@ -21,7 +24,7 @@ $(document).ready(function(){
 });
 
 function check_status(){
-    $.get("{ settings.rtmpviewers }}", function(data){
+    $.get("{{ settings.rtmpviewers }}", function(data){
     $("#rtmpviewers").text(data);
   });
 
@@ -47,16 +50,17 @@ $("#ogvviewers").text( sd[22].textContent  );
 		<div class="subtitle">{{ settings.subtitle }}</div>
 	</header>
 	
-	<div class="ban">
-	<video id="my-video" class="video-js vjs-big-play-centered vjs-default-skin" controls preload="auto"  width="640" height="264"  poster="https://lainchan.org/static/lain_is_cute_datass_small.png" data-setup="{}">
-        <source src='{{ setings.rtmpurl }}' type='rtmp/mp4'/>
+	<div>
+	<div id="box" width="100%">
+	<video id="my-video" class="video-js vjs-big-play-centered vjs-default-skin" height="264" width="640"  controls preload="auto" poster="https://lainchan.org/static/lain_is_cute_datass_small.png" data-setup='{ "example_option": true,  "techOrder": ["html5","flash"],"fluid": true}'>
+        <source src='{{ settings.rtmpvideojsurl }}' type='rtmp/mp4'/>
         <source src="{{ settings.ogvurl }}" type='video/ogv'>
     <p class="vjs-no-js">
       To view this video please enable JavaScript, and consider upgrading to a web browser that
       <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a>
     </p>
   	</video>
-
+	</div>
 	<br/>
 	<p>Now Streaming RTMP <span id="rtmpnowplaying">unknown</span></p>
 	<p>Now Streaming OGV <span id="ogvnowplaying">unknown</span></p>
@@ -64,8 +68,8 @@ $("#ogvviewers").text( sd[22].textContent  );
 	<p>Current OGV viewers: <span id="ogvviewers">unknown</span></p>
 	<div>
 	<p>Raw stream URLs for Mplayer, mpv, VLC, etc:</p>
-    <p> RTMP : {{ setings.rtmpurl }} </p>
-    <p> OGV :  {{ setings.ogvurl }} </p>
+    <p> RTMP : {{ settings.rtmpurl }} </p>
+    <p> OGV :  {{ settings.ogvurl }} </p>
 	</div><br/>
 	</div>
 	
-- 
cgit v1.3


From bf78c3a46ec5db6106713e78e30a9437d9ae0f28 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 10 Dec 2016 18:23:18 +0900
Subject: Changed message and CSS on the recent page / e.g. the recent theme.
 Cyberpunk is DUCK.

---
 templates/themes/recent/recent.css  |  8 ++++++--
 templates/themes/recent/recent.html | 10 ++++++----
 templates/themes/recent/theme.php   |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/templates/themes/recent/recent.css b/templates/themes/recent/recent.css
index 1ec5dc50..2559bcc3 100644
--- a/templates/themes/recent/recent.css
+++ b/templates/themes/recent/recent.css
@@ -44,14 +44,14 @@ body
 	color: #7fdd57;
 	border: 0px solid #060;
 	float: left;
-	width: 300px;
+	width: 50%;
 }
 .box.right {
 	background: #0b000f;
 	color: #7fdd57;
 	border: 0px solid #006;
 	float: right;
-	width: 436px;
+	width: 50%;
 }
 
 .box h2 {
@@ -170,3 +170,7 @@ div.ban h2:not(:nth-child(1))
 {
 	border-top: 0px solid #0b000f;
 }
+
+div.footer{
+clear:both;
+}
diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html
index f0276ac7..45b627d8 100644
--- a/templates/themes/recent/recent.html
+++ b/templates/themes/recent/recent.html
@@ -9,7 +9,6 @@
 	<link rel="stylesheet" media="screen" href="https://lainchan.org/stylesheets/font-awesome/css/font-awesome.min.css"/>
 
 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %}
-	{% 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>
@@ -24,12 +23,14 @@
 	</header>
 <br>
 
+		<center>
     <img alt="mascot" class="lain_banner"src="static/lain_banner1.png"/>
+		</center>
 
  <br>
 
-     <div class="ban" id="global">      <h2>CYBERPUNK IS DEAD</h2>  Pour out the Soykaf, lurk, and read the <a href="https://lainchan.org/rules">rules</a> before posting!    </div> 
-
+     <div class="ban" id="global2">      <h2>CYBERPUNK IS DUCK</h2>  Pour out the Soykaf, lurk, and read the <a href="https://lainchan.org/rules">rules</a> before posting!    </div> 
+	<center>    <img alt="mascot" class="lain_banner" src="static/duck.png"></center>
     <br>
 
 	<div class="ban" id="global">
@@ -67,13 +68,14 @@
 			</ul>
 		</div>
 	</div>
-
+	<div class="footer">
 	<footer>
         <center>
         	<a href="mailto:admin@lainchan.org?Subject=Hello" target="_top">admin@lainchan.org</a>
         </center>
 
 	</footer>
+	</div>
 </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index a826048f..d4d4e9b8 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -19,7 +19,7 @@
 			global $config, $_theme;
 			
 			if ($action == 'all') {
-				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . $settings['css']);
+				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . "stylesheets/" . $settings['css']);
 			}
 			
 			$this->excluded = explode(' ', $settings['exclude']);
-- 
cgit v1.3


From c4810e4e384c67dc19e1df286ea6e9b65447acd4 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 10 Dec 2016 18:24:58 +0900
Subject: Migrated irc theme from webchat to kiwiirc and adding additional
 configuration options to the theme.

---
 templates/themes/irc/info.php | 12 +++++++++++-
 templates/themes/irc/irc.html |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/templates/themes/irc/info.php b/templates/themes/irc/info.php
index 59ff4bd6..8ca3be0a 100644
--- a/templates/themes/irc/info.php
+++ b/templates/themes/irc/info.php
@@ -22,7 +22,17 @@ $theme = array(
         array('title'   => 'Channel',
               'name'    => 'channel',
               'type'    => 'text',
-              'default' => 'lainchan')),
+              'default' => 'general'),
+        
+        array('title'   => 'Server',
+              'name'    => 'server',
+              'type'    => 'text',
+              'default' => 'irc.lainchan.org'),
+	
+	array('title'   => 'Port',
+              'name'    => 'port',
+              'type'    => 'text',
+              'default' => '6697')),
 
     'build_function'   => 'irc_build');
 ?>
diff --git a/templates/themes/irc/irc.html b/templates/themes/irc/irc.html
index 1766f426..7aa617cf 100644
--- a/templates/themes/irc/irc.html
+++ b/templates/themes/irc/irc.html
@@ -22,8 +22,8 @@
 
 
     <div class="ban" style="text-align: left!important;">
-        <h2>Web Client - Point your own clients to #{{ settings.channel }} on irc.freenode.net.</h2>		
-        <iframe src="https://webchat.freenode.net?channels=%23{{ settings.channel }}&uio=MTE9MTMz98" width="766" height="400"></iframe>
+        <h2>Web Client - Point your own clients to #{{ settings.channel }} on {{ settings.server }}:+{{ settings.port }} .</h2>		
+        <iframe src="https://kiwiirc.com/client/{{ settings.server }}:+{{ settings.port }}/#{{ settings.channel }}" width="800px" height="100%" scrolling="no"></iframe>
     </div>
   </body>
 </html>
-- 
cgit v1.3


From 0e7577f4ea7d5cec1130864f7fcdd8791094928e Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 10 Dec 2016 18:32:18 +0900
Subject: Add cssleft configuration parameter to donate theme

---
 templates/themes/donate/donate.html |  4 ++--
 templates/themes/donate/info.php    | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/templates/themes/donate/donate.html b/templates/themes/donate/donate.html
index 1ecf008e..1047cf56 100644
--- a/templates/themes/donate/donate.html
+++ b/templates/themes/donate/donate.html
@@ -38,10 +38,10 @@
 
 <div class="container">
     <div class="{{ settings.progressbarcssclass }}">
-        <span style="width:14%;position:relative;left:{{ settings.progressbarcssleft }}%; 
+        <span style="width:{{ settings.progressbarcsswidth }};position:relative;left:{{ settings.progressbarcssleft }}%; 
   "> </span>
 </div>
-<div id="value" style="position:relative;left:{{ settings.progressbartextcssleft }}px;top:-45px">{{ settings.currentprogress }}</div>
+<div id="value" style="position:relative;left:{{ settings.progressbartextcssleft }}px;top:-45px;color:#0000ff;">{{ settings.currentprogress }}</div>
 </div>
 
     </div>
diff --git a/templates/themes/donate/info.php b/templates/themes/donate/info.php
index 6fa57cd6..751f8a23 100644
--- a/templates/themes/donate/info.php
+++ b/templates/themes/donate/info.php
@@ -22,37 +22,44 @@ $theme = array(
         array('title'   => 'Monthly Amount',
               'name'    => 'monthlyamount',
               'type'    => 'text',
-              'default' => '$55'),
+              'default' => '$0'),
           
+
         array('title'   => 'Current Sticker Amount',
               'name'    => 'stickeramount',
               'type'    => 'text',
               'default' => '$0'),
-        
+
         array('title'   => 'Current Other Donations Amount',
               'name'    => 'otheramount',
               'type'    => 'text',
               'default' => '$0'),
-        
-        array('title'   => 'Current Progress',
+
+	 array('title'   => 'Current Progress',
               'name'    => 'currentprogress',
               'type'    => 'text',
               'default' => '$0'),
-        
+
         array('title'   => 'Progress Bar CSS class',
               'name'    => 'progressbarcssclass',
               'type'    => 'text',
-              'default' => 'progress-bar red glow'),
+              'default' => 'progress-bar green glow'),
         
-        array('title'   => 'Progress Bar CSS left',
+        
+        array('title'   => 'Progress Bar CSS width',
+              'name'    => 'progressbarcsswidth',
+              'type'    => 'text',
+              'default' => '15%'),
+       
+	 array('title'   => 'Progress Bar CSS left',
               'name'    => 'progressbarcssleft',
               'type'    => 'text',
-              'default' => '36'),
+              'default' => '51'),
         
         array('title'   => 'Progress Bar Text CSS left',
               'name'    => 'progressbartextcssleft',
               'type'    => 'text',
-              'default' => '135'),
+              'default' => '195'),
           ),
 
     'build_function'   => 'donate_build');
-- 
cgit v1.3


From a5c79ff63872b105bd670b4b9697cda38fabda96 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 10 Dec 2016 18:33:52 +0900
Subject: Adding board name to title of catalog theme

---
 templates/themes/catalog/catalog.html |  3 ++-
 templates/themes/catalog/theme.php    | 15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index e556b4a9..ac19a90e 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -7,6 +7,7 @@
 		var active_page = "catalog"
 		  , board_name = "{{ board }}";
 	</script>
+		<title>{{ settings.title }} ( /{{ board }}/ )</title>
 	{% include 'header.html' %}
 </head>
 <body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} theme-catalog active-catalog" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
@@ -41,7 +42,7 @@
 			<option value="large">{% trans 'Large' %}</option>
 		</select>
 	</div>
-
+	<br></br>
         <div class="threads">
                 <div id="Grid">
                 {% for post in recent_posts %}
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 24cdcbb8..3ef974c3 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -15,7 +15,7 @@
 		//	- post-thread (a thread has been made)
 		if ($action === 'all') {
 			foreach ($boards as $board) {
-				$b = new Catalog();
+				$b = new Catalog($settings);
 
 				$action = generation_strategy("sb_catalog", array($board));
 				if ($action == 'delete') {
@@ -27,7 +27,7 @@
 				}
 			}
 		} elseif ($action == 'post-thread' || ($settings['update_on_posts'] && $action == 'post') || ($settings['update_on_posts'] && $action == 'post-delete') && in_array($board, $boards)) {
-			$b = new Catalog();
+			$b = new Catalog($settings);
 
 			$action = generation_strategy("sb_catalog", array($board));
 			if ($action == 'delete') {
@@ -148,10 +148,13 @@
 		/**
 		 * Build and save the HTML of the catalog for the given board
 		 */
-		public function build($board_name) {
-			if (!openBoard($board_name)) {
-				error(sprintf(_("Board %s doesn't exist"), $post['board']));
-			}
+		public function build($settings, $board_name) {
+			global $config, $board;
+			if ($board['uri'] != $board_name) {			
+				if (!openBoard($board_name)) {
+					error(sprintf(_("Board %s doesn't exist"), $board_name));
+				}
+			}	
 
 			if (array_key_exists($board_name, $this->threadsCache)) {
 				$threads = $this->threadsCache[$board_name];
-- 
cgit v1.3


From b89fe3046bfbc0d7db8e7e8773e92c0536417450 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 10 Dec 2016 18:39:18 +0900
Subject: Fix board filter listing in the search form

---
 templates/search_form.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/templates/search_form.html b/templates/search_form.html
index 4c8bd077..095968de 100644
--- a/templates/search_form.html
+++ b/templates/search_form.html
@@ -6,8 +6,13 @@
 			<input id="search" name="search" type="text" size="40" value="{{ search }}">
 			<select name="board">
 				<option value="none">{% trans %}Select board{% endtrans %}&hellip;</option>
-				{% for b in boards %}
-					<option value="{{ b }}"{% if b == board %} selected{% endif %}>/{{ b }}/</option>
+	
+				{% for b2 in boards %}
+				    {% if b2 == b %}
+				    <option value="{{ b2 }}" selected>/{{ b2 }}/</option>
+				    {% else %}
+				    <option value="{{ b2 }}">/{{ b2 }}/</option>
+				    {% endif %}
 				{% endfor %}
 			</select>
 			<input type="submit" value="{% trans %}Search{% endtrans %}" />
-- 
cgit v1.3


From 2c9fbb5770495a209872642fb3169d8568e4181e Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sat, 10 Dec 2016 18:40:11 +0900
Subject: Updated maximum file size on rules page

---
 templates/rules.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/rules.html b/templates/rules.html
index 76fb6a5f..3cc064c2 100644
--- a/templates/rules.html
+++ b/templates/rules.html
@@ -24,7 +24,7 @@
         <li>Mods usually ask each other for opinions before doing anything. We hate having to ban someone.</li>
         <li> Just relax and try to have fun. Jokes are always welcome.</li>
         <li> Visit a board you've never been to. Try out /random/.</li>
-        <li> Max file size is 35 mb.</li>
+        <li> Max file size is 25 mb.</li>
         <li> PDF, ePub, and webm are supported across the boards.</li>
         <li>We ALWAYS need contributors to our board software, located on <a href="https://github.com/lainchan/lainchan/">github</a></li>
         <li> Dice rolling: posting in the email field with the form "dice XdY+/-Z" will result in X Y-sided dice rolled and summed, with the modifier Z added, the result is displayed at the top of the post body.</li>
-- 
cgit v1.3


From ceb8df370caeba48219530bf5deb5e6a06e56648 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sun, 11 Dec 2016 08:04:18 +0900
Subject: Fix copyright on page templates

---
 templates/generic_page.html | 11 +++++++----
 templates/page.html         | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/templates/generic_page.html b/templates/generic_page.html
index 6d2f28c3..cc076106 100644
--- a/templates/generic_page.html
+++ b/templates/generic_page.html
@@ -38,10 +38,13 @@
 	{% endfor %} {{ btn.next }}</div>
 	{{ boardlist.bottom }}
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
-			<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
-		<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
+			<a href='https://int.vichan.net/devel/'>vichan</a> + 
+			<a href='https://github.com/lainchan/lainchan'>lainchan</a> {{ config.version }} -
+		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel
+		<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2016 lainchan Administration</p>
+
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}
diff --git a/templates/page.html b/templates/page.html
index a5327cf8..a61e6f73 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -26,10 +26,13 @@
 	{{ body }}
 	<hr>
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
-			<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
-		<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
+			<a href='https://int.vichan.net/devel/'>vichan</a> + 
+			<a href='https://github.com/lainchan/lainchan'>lainchan</a> {{ config.version }} -
+		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel
+		<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2016 lainchan Administration</p>
+
 	</footer>
 </body>
 </html>
-- 
cgit v1.3


From 68e80524c548d0b515f03508a1a0f06da1787493 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Sun, 11 Dec 2016 08:14:23 +0900
Subject: Dashboard simplification

---
 templates/mod/dashboard.html | 123 +------------------------------------------
 1 file changed, 1 insertion(+), 122 deletions(-)

diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 706504ea..ee1817b3 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -1,5 +1,5 @@
 <ul>
-  {% for board in boards %}
+  {% for board in boards  %}
   <li>
     <a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board.uri) }}</a>
     -
@@ -56,127 +56,6 @@
   {% if mod|hasPermission(config.mod.edit_config) %}
   <li><a href="?/config">{% trans 'Configuration' %}</a></li>
   {% endif %}
-=======
-<fieldset>
-	<legend>{% trans 'Boards' %}</legend>
-	
-	<ul>
-		{% for board in boards %}
-			<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|hasPermission(config.mod.manageboards) %}
-					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
-				{% endif %}
-				{% if mod|hasPermission(config.mod.edit_pages) %}
-					 <a href="?/edit_pages/{{ board.uri }}"><small>[{% trans 'pages' %}]</small></a>
-				{% endif %}
-			</li>
-		{% 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>
-	<legend>{% trans 'Messages' %}</legend>
-	<ul>
-		{% if mod|hasPermission(config.mod.noticeboard) %}
-			{% if noticeboard|count > 0 %}
-				<li>
-					{% trans 'Noticeboard' %}:
-					<ul>
-						{% for post in noticeboard %}
-							<li>
-								<a href="?/noticeboard#{{ post.id }}">
-									{% if post.subject %}
-										{{ post.subject|e }}
-									{% else %}
-										<em>{% trans 'no subject' %}</em>
-									{% endif %}
-								</a> 
-								<small class="unimportant">
-									&mdash; by 
-									{% if post.username %}
-										{{ post.username|e }}
-									{% else %}
-										<em>deleted?</em>
-									{% endif %} 
-									at 
-									{{ post.time|date(config.post_date) }} 
-								</small>
-							</li>
-						{% endfor %}
-					</ul>
-				</li>
-			{% endif %}
-			<li><a href="?/noticeboard">{% trans 'View all noticeboard entries' %}</a></li>
-		{% endif %}
-		<li><a href="?/edit_news">{% trans 'News' %}</a></li>
-		<li>
-			<a href="?/inbox">
-				{% trans 'PM inbox' %} 
-				{% if unread_pms > 0 %}<strong>{%endif %}({{ unread_pms }} unread){% if unread_pms > 0 %}</strong>{%endif %}
-			</a>
-		</li>
-	</ul>
-</fieldset>
-
-<fieldset>
-	<legend>{% trans 'Administration' %}</legend>
-	
-	<ul>
-		{% if mod|hasPermission(config.mod.reports) %}
-			<li>
-				{% if reports > 0 %}<strong>{% endif %}
-					<a href="?/reports">{% trans 'Report queue' %} ({{ reports }})</a>
-				{% if reports > 0 %}</strong>{% endif %}
-			</li>
-		{% endif %}
-		{% if mod|hasPermission(config.mod.view_banlist) %}
-			<li><a href="?/bans">{% trans 'Ban list' %}</a></li>
-		{% endif %}
-		{% if config.ban_appeals and mod|hasPermission(config.mod.view_ban_appeals) %}
-			<li><a href="?/ban-appeals">{% trans 'Ban appeals' %}</a></li>
-		{% endif %}
-		{% if mod|hasPermission(config.mod.manageusers) %}
-			<li><a href="?/users">{% trans 'Manage users' %}</a></li>
-		{% elseif mod|hasPermission(config.mod.change_password) %}
-			<li><a href="?/users/{{ mod.id }}">{% trans 'Change password' %}</a></li>
-		{% endif %}
-		{% if mod|hasPermission(config.mod.themes) %}
-			<li><a href="?/themes">{% trans 'Manage themes' %}</a></li>
-		{% endif %}
-		{% if mod|hasPermission(config.mod.modlog) %}
-			<li><a href="?/log">{% trans 'Moderation log' %}</a></li>
-		{% endif %}
-		{% if mod|hasPermission(config.mod.edit_pages) %}
-			<li><a href="?/edit_pages">{% trans 'Global static pages' %}</a></li>
-		{% endif %}
-		{% if mod|hasPermission(config.mod.recent) %}
-			<li><a href="?/recent/25">{% trans 'Recent posts' %}</a></li>
-		{% endif %}
-		{% if mod|hasPermission(config.mod.rebuild) %}
-			<li><a href="?/rebuild">{% trans 'Rebuild' %}</a></li>
-		{% endif %}
-		{% if mod|hasPermission(config.mod.edit_config) %}
-			<li><a href="?/config">{% trans 'Configuration' %}</a></li>
-		{% endif %}
-		
-	</ul>
-</fieldset>
 
 {% if mod|hasPermission(config.mod.search) %}
 
-- 
cgit v1.3


From 243c1a3a524aaff3e60acc34890c62fe11dfcd2e Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Tue, 13 Dec 2016 01:09:25 +0900
Subject: Removing duplicate page numbers and Catalog link from index page
 template

---
 templates/index.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 52c7419b..ae9af59a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -72,14 +72,6 @@
 	{% include 'report_delete.html' %}
 	</form>
 	
-	<div class="pages">
-		{{ btn.prev }} {% for page in pages %}
-		 [<a {% if page.selected %}class="selected"{% endif %}{% if not page.selected %}href="{{ page.link }}"{% endif %}>{{ page.num }}</a>]{% if loop.last %} {% endif %}
-		{% endfor %} {{ btn.next }}
-		{% if config.catalog_link %}
-			 | <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">{% trans %}Catalog{% endtrans %}</a>
-		{% endif %}
-	</div>
 	
 	{{ boardlist.bottom }}
 
-- 
cgit v1.3


From a51d83a9a427ed7bbf1a49fcf6f081e0a03cd48b Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Tue, 13 Dec 2016 02:58:55 +0900
Subject: Changes to css for homepage slogan changes.

---
 stylesheets/dark.css   |  5 +++--
 stylesheets/recent.css | 52 ++++++++++++++++++--------------------------------
 2 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/stylesheets/dark.css b/stylesheets/dark.css
index 1c76f7c5..1c56f0d2 100644
--- a/stylesheets/dark.css
+++ b/stylesheets/dark.css
@@ -156,8 +156,9 @@ hr {
 	border: #333333 1px solid;
 }
 div.boardlist {
+	text-align: center;
 	color: #999999;
-    background-color: rgba(12%, 12%, 12%, 0.10);
+    	background-color: rgba(12%, 12%, 12%, 0.10);
 }
 
 div.ban {
@@ -241,4 +242,4 @@ table.board-list-table .board-tags .board-cell:hover {
 }
 table.board-list-table tr:nth-of-type( even ) .board-tags .board-cell {
 	background: #333333;
-}
\ No newline at end of file
+}
diff --git a/stylesheets/recent.css b/stylesheets/recent.css
index 417e65b8..2559bcc3 100644
--- a/stylesheets/recent.css
+++ b/stylesheets/recent.css
@@ -2,20 +2,14 @@
  * dark.css
  * Stolen from circlepuller who stole it from derpcat
  */
-body 
+body
 {
 	background: #0b000f;
 	color: #7fdd57;
 	font-family: sans-serif;
 	font-size: 12px;
-	margin:auto:
-	}
-.lain_banner{
-margin-left: auto;
-	margin-right: auto;
-	display: block;
-
 }
+
 @font-face {
     font-family: 'FontAwesome';
     src: url('../fonts/fontawesome-webfont.eot?v=4.4.0');
@@ -24,10 +18,9 @@ margin-left: auto;
     font-style: normal
 }
 
-
 .box-wrap {
 	max-width: 670px;
-	
+	min-width: 400px;
 	margin: 30px auto;
 	overflow: auto;
 	padding: 0;
@@ -35,16 +28,10 @@ margin-left: auto;
 .box {
 	background: #0b000f;
 	border: 0px solid #98E;
-	width: 768px;
+	width: 330px;
 	margin: 0px 0;
 	padding: 0;
-	
-}
-
-div#global.ban{
-	max-width: 768px
 }
-
 .box ul {
 	padding: 2px 15px;
 }
@@ -70,7 +57,6 @@ div#global.ban{
 .box h2 {
 	padding: 3px 7px;
 	font-size: 12pt;
-	
 }
 .box.left h2 {
 	background: #7fdd57;
@@ -85,34 +71,34 @@ div#global.ban{
 	margin: 0px auto;
 }
 
-span.quote 
+span.quote
 {
     color:#677965;
 }
-@font-face 
+@font-face
 {
   font-family: 'lain';
   src: url('./fonts/nrdyyh.woff') format('woff'),
        url('./fonts/tojcxo.TTF') format('truetype');
 }
-h1 
+h1
 {
 	font-family: 'arial black', arial;
 	letter-spacing: -20px;
-	font-size: 116pt;	
+	font-size: 116pt;
 	text-align: center;
 	color: #7fdd57;
 }
-header div.subtitle 
+header div.subtitle
 {
     color: #677965;
 }
-div.title 
+div.title
 {
 	color: #677965;
 	font-family: Arial, Helvetica, sans-serif;
 }
-div.title p 
+div.title p
 {
 	font-size: 10px;
 }
@@ -123,7 +109,7 @@ a:link, a:visited, .intro a.email span.name {
 	font-size: 11pt;
 }
 
-div.post.reply div.body a:link:hover, div.post.reply div.body a:visited:hover 
+div.post.reply div.body a:link:hover, div.post.reply div.body a:visited:hover
 {
 	color: #7fdd57;
 }
@@ -147,7 +133,6 @@ p.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.ema
 	-moz-box-shadow: 0 0 40px #000;
 	-webkit-box-shadow: 0 0 40px #000;
 	box-shadow: 0 0 40px #000;
-	
 }
 .bar.top
 {
@@ -158,12 +143,12 @@ p.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.ema
 	border-top: 1px solid #666;
 }
 
-div.boardlist 
+div.boardlist
 {
 	color: #0b000f;
 }
 
-div.ban 
+div.ban
 {
 	background-color: rgba(11, 0, 15, 0);
 	border: 0px solid #555;
@@ -172,7 +157,7 @@ div.ban
 	border-radius: 2px;
 	text-align: left!important;
 }
-div.ban h2 
+div.ban h2
 {
 	background: #0b000f;
 	color: #7fdd57;
@@ -181,10 +166,11 @@ div.ban h2
 	border-bottom: 0px solid #555;
 }
 
-div.ban h2:not(:nth-child(1)) 
+div.ban h2:not(:nth-child(1))
 {
 	border-top: 0px solid #0b000f;
 }
 
-
-
+div.footer{
+clear:both;
+}
-- 
cgit v1.3


From eb43a310d8a182526acf74674d4cdd8d8c4fd69e Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Tue, 13 Dec 2016 03:13:16 +0900
Subject: Remove superflous extra error handling from merge of upstream vichan

---
 inc/display.php | 58 ---------------------------------------------------------
 1 file changed, 58 deletions(-)

diff --git a/inc/display.php b/inc/display.php
index 58cb4805..ce39197c 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -71,64 +71,6 @@ function createBoardlist($mod=false) {
 	);
 }
 
-function error($message, $priority = true, $debug_stuff = false) {
-	global $board, $mod, $config, $db_error;
-	
-	if ($config['syslog'] && $priority !== false) {
-		// Use LOG_NOTICE instead of LOG_ERR or LOG_WARNING because most error message are not significant.
-		_syslog($priority !== true ? $priority : LOG_NOTICE, $message);
-	}
-	
-	if (defined('STDIN')) {
-		// Running from CLI
-		echo('Error: ' . $message . "\n");
-		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		die();
-	}
-
-	if ($config['debug'] && isset($db_error)) {
-		$debug_stuff = array_combine(array('SQLSTATE', 'Error code', 'Error message'), $db_error);
-	}
-
-	if ($config['debug']) {
-		$debug_stuff['backtrace'] = debug_backtrace();
-	}
-
-	if (isset($_POST['json_response'])) {
-		header('Content-Type: text/json; charset=utf-8');
-		die(json_encode(array(
-			'error' => $message
-		)));
-	}
-	else {
-		header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
-	}
-
-	$pw = $config['db']['password'];
-	$debug_callback = function(&$item) use (&$debug_callback, $pw) {
-		if (is_array($item)) {
-			$item = array_filter($item, $debug_callback);
-		}
-		return ($item !== $pw || !$pw);
-	};
-
-
-	if ($debug_stuff) 
-		$debug_stuff = array_filter($debug_stuff, $debug_callback);
-
-	die(Element('page.html', array(
-		'config' => $config,
-		'title' => _('Error'),
-		'subtitle' => _('An error has occured.'),
-		'body' => Element('error.html', array(
-			'config' => $config,
-			'message' => $message,
-			'mod' => $mod,
-			'board' => isset($board) ? $board : false,
-			'debug' => is_array($debug_stuff) ? str_replace("\n", '&#10;', utf8tohtml(print_r($debug_stuff, true))) : utf8tohtml($debug_stuff)
-		))
-	)));
-}
 
 function loginForm($error=false, $username=false, $redirect=false) {
 	global $config;
-- 
cgit v1.3


From d01bcf48d75c721276f547a5c17d1476aa053c48 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Wed, 14 Dec 2016 05:42:12 +0900
Subject: Changing wording of post filtering when action is not set from
 throttled to blocked at user request.

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

diff --git a/inc/filters.php b/inc/filters.php
index 22843f10..b4781958 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -145,7 +145,7 @@ class Filter {
 		}				
 		if (isset ($this->action)) switch($this->action) {
 			case 'reject':
-				error(isset($this->message) ? $this->message : 'Posting throttled by filter.');
+				error(isset($this->message) ? $this->message : 'Posting blocked by filter.');
 			case 'ban':
 				if (!isset($this->reason))
 					error('The ban action requires a reason.');
-- 
cgit v1.3


From c9edbdc1c86127b31b8f59c19c1904e41bcb3842 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Wed, 14 Dec 2016 05:47:08 +0900
Subject: Add support for ignoring URLs when using word filters

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

diff --git a/inc/functions.php b/inc/functions.php
index 86efe789..ff7c129a 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1779,20 +1779,54 @@ function ReverseIPOctets($ip) {
 }
 
 function wordfilters(&$body) {
-	global $config;
+        global $config;
+
+        foreach ($config['wordfilters'] as $filter) {
+                if (isset($filter[3]) && $filter[3]) {
+                        $refilter = $filter[0]; 
+                        if (strncmp($filter[0], "/", 1) !== 0) 
+                        {
+                                $refilter = "/.*" . $filter[0] .  "/";
+                        }
+                        $body = preg_replace_callback($refilter,
+                        function($matches) use ($filter , $body) {
+                                foreach ($matches as $match) {
+                                        if (preg_match("/(http|https|ftp):\/\//i", $match)) {
+                                                return $match;
+                                        } else {
+                                                if (isset($filter[2]) && $filter[2]) {
+                                                        $refilter = $filter[0]; 
+                                                        if (strncmp($filter[0], "/", 1) !== 0) 
+                                                        {
+                                                                $refilter = "/.*" . $filter[0] .  "/";
+                                                        }
+                                                        if (is_callable($filter[1]))
+                                                                return  preg_replace_callback($refilter, $filter[1], $match);
+                                                        else
+                                                                return  preg_replace($refilter, $filter[1], $match);
+                                                } else {
+                                                        return str_ireplace($filter[0], $filter[1], $match);
+                                                }
+
+                                        }
+                                }
+                        }
+                        , $body);
+                } else { 
+                        if (isset($filter[2]) && $filter[2]) {
+                                if (is_callable($filter[1]))
+                                        $body = preg_replace_callback($filter[0], $filter[1], $body);
+                                else
+                                        $body = preg_replace($filter[0], $filter[1], $body);
+                        } else {
+                                $body = str_ireplace($filter[0], $filter[1], $body);
+                        }
+                }
+        }
 
-	foreach ($config['wordfilters'] as $filter) {
-		if (isset($filter[2]) && $filter[2]) {
-			if (is_callable($filter[1]))
-				$body = preg_replace_callback($filter[0], $filter[1], $body);
-			else
-				$body = preg_replace($filter[0], $filter[1], $body);
-		} else {
-			$body = str_ireplace($filter[0], $filter[1], $body);
-		}
-	}
 }
 
+
 function quote($body, $quote=true) {
 	global $config;
 
-- 
cgit v1.3


From 1cab6af5263a943230c86962779913d53e2df0c9 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Wed, 14 Dec 2016 06:06:05 +0900
Subject: Remove linking to OP as part of post hover.

---
 js/post-hover.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/post-hover.js b/js/post-hover.js
index e78b57e8..74864d9d 100644
--- a/js/post-hover.js
+++ b/js/post-hover.js
@@ -54,7 +54,10 @@ onready(function(){
 			hovered_at = {'x': e.pageX, 'y': e.pageY};
 			
 			var start_hover = function($link) {
-				if ($post.is(':visible') &&
+				if($.contains($post[0], $link[0])) {
+					// link links to itself or to op; ignore
+				}
+				else if ($post.is(':visible') &&
 						$post.offset().top >= $(window).scrollTop() &&
 						$post.offset().top + $post.height() <= $(window).scrollTop() + $(window).height()) {
 					// post is in view
-- 
cgit v1.3


From 5feae402cb55d49963bfd2c6f5a33d10690ecbc1 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Wed, 14 Dec 2016 06:11:54 +0900
Subject: Changes to report notification callback to Slack HTTP endpoint

---
 post.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/post.php b/post.php
index 84858bb2..bbd0c628 100644
--- a/post.php
+++ b/post.php
@@ -1147,6 +1147,37 @@ if (isset($_POST['delete'])) {
 		$query->bindValue(':thread', $post['thread']);
 		$query->bindValue(':limit', $config['cycle_limit'], PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
+                if ($config['slack'])
+                {
+                function slack($message, $room = "reports", $icon = ":no_entry_sign:") 
+			{
+			$room = ($room) ? $room : "reports";
+			$data = "payload=" . json_encode(array(
+			"channel"       =>  "#{$room}",
+			"text"          =>  urlencode($message),
+			"icon_emoji"    =>  $icon
+			));
+
+			// You can get your webhook endpoint from your Slack settings
+			// For some reason using the configuration key doesn't work 
+			$ch = curl_init($config['slack_incoming_webhook_endpoint']);
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			$result = curl_exec($ch);
+			curl_close($ch);
+
+			return $result;
+			}
+		
+		$postcontent = mb_substr($thread['body_nomarkup'], 0, 120) . '...  _*(POST TRIMMED)*_';
+		$slackmessage = '<'  .$config['domain']  . "/mod.php?/" . $board['dir'] . $config['dir']['res'] .  ( $thread['thread'] ? $thread['thread'] : $id ) . ".html"  .  ($thread['thread'] ? '#' . $id : '') . '> \n ' . $reason . '\n ' . $postcontent . '\n';
+
+		$slackresult = slack($slackmessage, $config['slack_channel']); 
+		}
+
+
 	}
 	
 	if (isset($post['antispam_hash'])) {
-- 
cgit v1.3