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)

---
 templates/post/name.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

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

(limited to 'templates')

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 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(+)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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

(limited to 'templates')

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 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

(limited to 'templates')

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 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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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

(limited to 'templates')

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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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 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

(limited to 'templates')

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

(limited to 'templates')

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 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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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(+)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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 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(-)

(limited to 'templates')

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

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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(-)

(limited to 'templates')

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