From 64ae123739c39567447bfc16fc95deb556786671 Mon Sep 17 00:00:00 2001
From: Michael Save <savethenternet@tinyboard.org>
Date: Sat, 16 Mar 2013 18:27:24 +1100
Subject: Mod log in ?/IP (ie. ban history)

---
 templates/mod/view_ip.html | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'templates')

diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index c49880ae..562a0140 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -161,3 +161,43 @@
 		{% include 'mod/ban_form.html' %}
 	</fieldset>
 {% endif %}
+
+{% if logs|count > 0  %}
+	<fieldset id="history">
+		<legend>History</legend>
+		<table class="modlog" style="width:100%">
+			<tr>
+				<th>{% trans 'Staff' %}</th>
+				<th>{% trans 'Time' %}</th>
+				<th>{% trans 'Board' %}</th>
+				<th>{% trans 'Action' %}</th>
+			</tr>
+			{% for log in logs %}
+				<tr>
+					<td class="minimal">
+						{% if log.username %}
+							<a href="?/log:{{ log.username|e }}">{{ log.username|e }}</a>
+						{% elseif log.mod == -1 %}
+							<em>system</em>
+						{% else %}
+							<em>{% trans 'deleted?' %}</em>
+						{% endif %}
+					</td>
+					<td class="minimal">
+						<span title="{{ log.time|date(config.post_date) }}">{{ log.time|ago }}</span>
+					</td>
+					<td class="minimal">
+						{% if log.board %}
+							<a href="?/{{ config.board_path|sprintf(log.board) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(log.board) }}</a>
+						{% else %}
+							-
+						{% endif %}
+					</td>
+					<td>
+						{{ log.text }}
+					</td>
+				</tr>
+			{% endfor %}
+		</table>
+	</fieldset>
+{% endif %}
-- 
cgit v1.3


From 9c29cec6598331589a9020e5be627260e659e977 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 26 May 2013 18:03:20 -0400
Subject: Moved ukko to a proper location

---
 info.php                        |  53 -------------------
 templates/themes/ukko/info.php  |  53 +++++++++++++++++++
 templates/themes/ukko/theme.php | 111 ++++++++++++++++++++++++++++++++++++++++
 templates/themes/ukko/thumb.png | Bin 0 -> 15123 bytes
 templates/themes/ukko/ukko.js   |  37 ++++++++++++++
 theme.php                       | 111 ----------------------------------------
 thumb.png                       | Bin 15123 -> 0 bytes
 ukko.js                         |  37 --------------
 8 files changed, 201 insertions(+), 201 deletions(-)
 delete mode 100644 info.php
 create mode 100644 templates/themes/ukko/info.php
 create mode 100644 templates/themes/ukko/theme.php
 create mode 100644 templates/themes/ukko/thumb.png
 create mode 100644 templates/themes/ukko/ukko.js
 delete mode 100644 theme.php
 delete mode 100644 thumb.png
 delete mode 100644 ukko.js

(limited to 'templates')

diff --git a/info.php b/info.php
deleted file mode 100644
index 34d59d4e..00000000
--- a/info.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-	$theme = Array();
-	
-	// Theme name
-	$theme['name'] = 'Ukko';
-	// Description (you can use Tinyboard markup here)
-	$theme['description'] = 'Board with threads and messages from all boards';
-	$theme['version'] = 'v0.1';
-	
-	// Theme configuration	
-	$theme['config'] = Array();
-	
-	$theme['config'][] = Array(
-		'title' => 'Board name',
-		'name' => 'title',
-		'type' => 'text',
-		'default' => 'Ukko'
-	);
-	$theme['config'][] = Array(
-		'title' => 'Board URI',
-		'name' => 'uri',
-		'type' => 'text',
-		'comment' => '(ukko for example)'
-	);	
-	$theme['config'][] = Array(
-		'title' => 'Subtitle',
-		'name' => 'subtitle',
-		'type' => 'text',
-		'comment' => '(%s = thread limit. for example "%s freshly bumped threads")'
-	);		
-	$theme['config'][] = Array(
-		'title' => 'Excluded boards',
-		'name' => 'exclude',
-		'type' => 'text',
-		'comment' => '(space seperated)'
-	);
-	$theme['config'][] = Array(
-		'title' => 'Number of threads',
-		'name' => 'thread_limit',
-		'type' => 'text',
-		'default' => '15',
-	);	
-	// Unique function name for building everything
-	$theme['build_function'] = 'ukko_build';
-	$theme['install_callback'] = 'ukko_install';
-
-	if(!function_exists('ukko_install')) {
-		function ukko_install($settings) {
-			if (!file_exists($settings['uri']))
-				@mkdir($settings['uri'], 0777) or error("Couldn't create " . $settings['uri'] . ". Check permissions.", true);
-		}
-	}
-	
diff --git a/templates/themes/ukko/info.php b/templates/themes/ukko/info.php
new file mode 100644
index 00000000..34d59d4e
--- /dev/null
+++ b/templates/themes/ukko/info.php
@@ -0,0 +1,53 @@
+<?php
+	$theme = Array();
+	
+	// Theme name
+	$theme['name'] = 'Ukko';
+	// Description (you can use Tinyboard markup here)
+	$theme['description'] = 'Board with threads and messages from all boards';
+	$theme['version'] = 'v0.1';
+	
+	// Theme configuration	
+	$theme['config'] = Array();
+	
+	$theme['config'][] = Array(
+		'title' => 'Board name',
+		'name' => 'title',
+		'type' => 'text',
+		'default' => 'Ukko'
+	);
+	$theme['config'][] = Array(
+		'title' => 'Board URI',
+		'name' => 'uri',
+		'type' => 'text',
+		'comment' => '(ukko for example)'
+	);	
+	$theme['config'][] = Array(
+		'title' => 'Subtitle',
+		'name' => 'subtitle',
+		'type' => 'text',
+		'comment' => '(%s = thread limit. for example "%s freshly bumped threads")'
+	);		
+	$theme['config'][] = Array(
+		'title' => 'Excluded boards',
+		'name' => 'exclude',
+		'type' => 'text',
+		'comment' => '(space seperated)'
+	);
+	$theme['config'][] = Array(
+		'title' => 'Number of threads',
+		'name' => 'thread_limit',
+		'type' => 'text',
+		'default' => '15',
+	);	
+	// Unique function name for building everything
+	$theme['build_function'] = 'ukko_build';
+	$theme['install_callback'] = 'ukko_install';
+
+	if(!function_exists('ukko_install')) {
+		function ukko_install($settings) {
+			if (!file_exists($settings['uri']))
+				@mkdir($settings['uri'], 0777) or error("Couldn't create " . $settings['uri'] . ". Check permissions.", true);
+		}
+	}
+	
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
new file mode 100644
index 00000000..6fa5fa7e
--- /dev/null
+++ b/templates/themes/ukko/theme.php
@@ -0,0 +1,111 @@
+<?php
+	require 'info.php';
+	
+	function ukko_build($action, $settings) {
+		$ukko = new ukko();
+		$ukko->settings = $settings;
+		$ukko->build();
+	}
+	
+	class ukko {
+		public $settings;
+		public function build($mod = false) {
+			global $config;
+			$boards = listBoards();
+			
+			$body = '';
+			$overflow = array();
+			$board = array(
+				'url' => $this->settings['uri'],
+				'name' => $this->settings['title'],
+				'title' => sprintf($this->settings['subtitle'], $this->settings['thread_limit'])
+			);
+
+			$query = '';
+			foreach($boards as &$_board) {
+				if(in_array($_board['uri'], explode(' ', $this->settings['exclude'])))
+					continue;
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` WHERE `thread` IS NULL UNION ALL ", $_board['uri'], $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', 'ORDER BY `bump` DESC', $query);
+			$query = query($query) or error(db_error());
+
+			$count = 0;
+			$threads = array();
+			while($post = $query->fetch()) {
+
+				if(!isset($threads[$post['board']])) {
+					$threads[$post['board']] = 1;
+				} else {
+					$threads[$post['board']] += 1;
+				}
+	
+				if($count < $this->settings['thread_limit']) {				
+					openBoard($post['board']);			
+					$thread = new Thread(
+						$post['id'], $post['subject'], $post['email'], $post['name'], $post['trip'], $post['capcode'], $post['body'], $post['time'],
+						$post['thumb'], $post['thumbwidth'], $post['thumbheight'], $post['file'], $post['filewidth'], $post['fileheight'], $post['filesize'],
+						$post['filename'], $post['ip'], $post['sticky'], $post['locked'], $post['sage'], $post['embed'], $mod ? '?/' : $config['root'], $mod
+					);
+
+					$posts = prepare(sprintf("SELECT * FROM `posts_%s` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $post['board']));
+					$posts->bindValue(':id', $post['id']);
+					$posts->bindValue(':limit', ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT);
+					$posts->execute() or error(db_error($posts));
+					
+					$num_images = 0;
+					while ($po = $posts->fetch()) {
+						if ($po['file'])
+							$num_images++;
+						
+						$thread->add(new Post(
+							$po['id'], $post['id'], $po['subject'], $po['email'], $po['name'], $po['trip'], $po['capcode'], $po['body'], $po['time'],
+							$po['thumb'], $po['thumbwidth'], $po['thumbheight'], $po['file'], $po['filewidth'], $po['fileheight'], $po['filesize'],
+							$po['filename'], $po['ip'], $po['embed'], $mod ? '?/' : $config['root'], $mod)
+						);
+					
+					}
+					if ($posts->rowCount() == ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview'])) {
+						$ct = prepare(sprintf("SELECT COUNT(`id`) as `num` FROM `posts_%s` WHERE `thread` = :thread UNION ALL SELECT COUNT(`id`) FROM `posts_%s` WHERE `file` IS NOT NULL AND `thread` = :thread", $post['board'], $post['board']));
+						$ct->bindValue(':thread', $post['id'], PDO::PARAM_INT);
+						$ct->execute() or error(db_error($count));
+						
+						$c = $ct->fetch();
+						$thread->omitted = $c['num'] - ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']);
+						
+						$c = $ct->fetch();
+						$thread->omitted_images = $c['num'] - $num_images;
+					}
+
+
+					$thread->posts = array_reverse($thread->posts);
+					$body .= '<h2><a href="' . $config['root'] . $post['board'] . '">/' . $post['board'] . '/</a></h2>';
+					$body .= $thread->build(true);
+				} else {
+					$page = 'index';
+					if(floor($threads[$post['board']] / $config['threads_per_page']) > 0) {
+						$page = floor($threads[$post['board']] / $config['threads_per_page']) + 1;
+					}
+					$overflow[] = array('id' => $post['id'], 'board' => $post['board'], 'page' => $page . '.html');
+				}
+
+				$count += 1;
+			}
+
+			$body .= '<script> var overflow = ' . json_encode($overflow) . '</script>';
+			$body .= '<script type="text/javascript" src="ukko.js"></script>';
+
+			file_write($this->settings['uri'] . '/index.html', Element('index.html', array(
+				'config' => $config,
+				'board' => $board,
+				'no_post_form' => true,
+				'body' => $body,
+				'boardlist' => createBoardlist($mod)
+			)));
+
+			file_write($this->settings['uri'] . '/ukko.js', Element('themes/ukko/ukko.js', array()));			
+		}
+		
+	};
+	
+?>
diff --git a/templates/themes/ukko/thumb.png b/templates/themes/ukko/thumb.png
new file mode 100644
index 00000000..49c4237b
Binary files /dev/null and b/templates/themes/ukko/thumb.png differ
diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
new file mode 100644
index 00000000..baf0f78d
--- /dev/null
+++ b/templates/themes/ukko/ukko.js
@@ -0,0 +1,37 @@
+var cache = new Array(),
+	thread = false,
+	loading = false;
+$(document).ready(function() {
+	$(window).on('scroll', function() {
+		if($(window).scrollTop() + $(window).height() + 100 > $(document).height() && !loading && overflow.length > 0) {
+			var page = '../' + overflow[0].board + '/' + overflow[0].page;
+			if($.inArray(page, cache) != -1) {
+				thread = $('div#thread_' + overflow[0].id);
+				if(thread.length > 0) {
+					thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
+					$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
+					overflow.shift();
+				}
+			} else {
+				loading = true;
+				$.get(page, function(data) {
+					cache.push(page);
+
+					$(data).find('div[id*="thread_"]').each(function() {
+						$('body').prepend($(this).css('display', 'none').attr('data-board', overflow[0].board));
+					});
+
+					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
+					if(thread.length > 0) {
+						thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
+						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
+						overflow.shift();
+					}
+
+					loading = false;
+				});
+			}
+		}
+	});
+
+});
\ No newline at end of file
diff --git a/theme.php b/theme.php
deleted file mode 100644
index 6fa5fa7e..00000000
--- a/theme.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-	require 'info.php';
-	
-	function ukko_build($action, $settings) {
-		$ukko = new ukko();
-		$ukko->settings = $settings;
-		$ukko->build();
-	}
-	
-	class ukko {
-		public $settings;
-		public function build($mod = false) {
-			global $config;
-			$boards = listBoards();
-			
-			$body = '';
-			$overflow = array();
-			$board = array(
-				'url' => $this->settings['uri'],
-				'name' => $this->settings['title'],
-				'title' => sprintf($this->settings['subtitle'], $this->settings['thread_limit'])
-			);
-
-			$query = '';
-			foreach($boards as &$_board) {
-				if(in_array($_board['uri'], explode(' ', $this->settings['exclude'])))
-					continue;
-				$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` WHERE `thread` IS NULL UNION ALL ", $_board['uri'], $_board['uri']);
-			}
-			$query = preg_replace('/UNION ALL $/', 'ORDER BY `bump` DESC', $query);
-			$query = query($query) or error(db_error());
-
-			$count = 0;
-			$threads = array();
-			while($post = $query->fetch()) {
-
-				if(!isset($threads[$post['board']])) {
-					$threads[$post['board']] = 1;
-				} else {
-					$threads[$post['board']] += 1;
-				}
-	
-				if($count < $this->settings['thread_limit']) {				
-					openBoard($post['board']);			
-					$thread = new Thread(
-						$post['id'], $post['subject'], $post['email'], $post['name'], $post['trip'], $post['capcode'], $post['body'], $post['time'],
-						$post['thumb'], $post['thumbwidth'], $post['thumbheight'], $post['file'], $post['filewidth'], $post['fileheight'], $post['filesize'],
-						$post['filename'], $post['ip'], $post['sticky'], $post['locked'], $post['sage'], $post['embed'], $mod ? '?/' : $config['root'], $mod
-					);
-
-					$posts = prepare(sprintf("SELECT * FROM `posts_%s` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $post['board']));
-					$posts->bindValue(':id', $post['id']);
-					$posts->bindValue(':limit', ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT);
-					$posts->execute() or error(db_error($posts));
-					
-					$num_images = 0;
-					while ($po = $posts->fetch()) {
-						if ($po['file'])
-							$num_images++;
-						
-						$thread->add(new Post(
-							$po['id'], $post['id'], $po['subject'], $po['email'], $po['name'], $po['trip'], $po['capcode'], $po['body'], $po['time'],
-							$po['thumb'], $po['thumbwidth'], $po['thumbheight'], $po['file'], $po['filewidth'], $po['fileheight'], $po['filesize'],
-							$po['filename'], $po['ip'], $po['embed'], $mod ? '?/' : $config['root'], $mod)
-						);
-					
-					}
-					if ($posts->rowCount() == ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview'])) {
-						$ct = prepare(sprintf("SELECT COUNT(`id`) as `num` FROM `posts_%s` WHERE `thread` = :thread UNION ALL SELECT COUNT(`id`) FROM `posts_%s` WHERE `file` IS NOT NULL AND `thread` = :thread", $post['board'], $post['board']));
-						$ct->bindValue(':thread', $post['id'], PDO::PARAM_INT);
-						$ct->execute() or error(db_error($count));
-						
-						$c = $ct->fetch();
-						$thread->omitted = $c['num'] - ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']);
-						
-						$c = $ct->fetch();
-						$thread->omitted_images = $c['num'] - $num_images;
-					}
-
-
-					$thread->posts = array_reverse($thread->posts);
-					$body .= '<h2><a href="' . $config['root'] . $post['board'] . '">/' . $post['board'] . '/</a></h2>';
-					$body .= $thread->build(true);
-				} else {
-					$page = 'index';
-					if(floor($threads[$post['board']] / $config['threads_per_page']) > 0) {
-						$page = floor($threads[$post['board']] / $config['threads_per_page']) + 1;
-					}
-					$overflow[] = array('id' => $post['id'], 'board' => $post['board'], 'page' => $page . '.html');
-				}
-
-				$count += 1;
-			}
-
-			$body .= '<script> var overflow = ' . json_encode($overflow) . '</script>';
-			$body .= '<script type="text/javascript" src="ukko.js"></script>';
-
-			file_write($this->settings['uri'] . '/index.html', Element('index.html', array(
-				'config' => $config,
-				'board' => $board,
-				'no_post_form' => true,
-				'body' => $body,
-				'boardlist' => createBoardlist($mod)
-			)));
-
-			file_write($this->settings['uri'] . '/ukko.js', Element('themes/ukko/ukko.js', array()));			
-		}
-		
-	};
-	
-?>
diff --git a/thumb.png b/thumb.png
deleted file mode 100644
index 49c4237b..00000000
Binary files a/thumb.png and /dev/null differ
diff --git a/ukko.js b/ukko.js
deleted file mode 100644
index baf0f78d..00000000
--- a/ukko.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var cache = new Array(),
-	thread = false,
-	loading = false;
-$(document).ready(function() {
-	$(window).on('scroll', function() {
-		if($(window).scrollTop() + $(window).height() + 100 > $(document).height() && !loading && overflow.length > 0) {
-			var page = '../' + overflow[0].board + '/' + overflow[0].page;
-			if($.inArray(page, cache) != -1) {
-				thread = $('div#thread_' + overflow[0].id);
-				if(thread.length > 0) {
-					thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
-					$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
-					overflow.shift();
-				}
-			} else {
-				loading = true;
-				$.get(page, function(data) {
-					cache.push(page);
-
-					$(data).find('div[id*="thread_"]').each(function() {
-						$('body').prepend($(this).css('display', 'none').attr('data-board', overflow[0].board));
-					});
-
-					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
-					if(thread.length > 0) {
-						thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
-						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
-						overflow.shift();
-					}
-
-					loading = false;
-				});
-			}
-		}
-	});
-
-});
\ No newline at end of file
-- 
cgit v1.3


From 0e490407e18679de2458647b891edaeb664a2f8f Mon Sep 17 00:00:00 2001
From: lanc33 <lancee@55ch.org>
Date: Wed, 29 May 2013 19:16:37 -0300
Subject: Fixes #59 by making quick-reply.js agnostic to the value of
 $config['button_reply'].

---
 js/quick-reply.js    | 2 +-
 templates/index.html | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/js/quick-reply.js b/js/quick-reply.js
index dc48a743..bc36ca48 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
 		return; // not index
 	
 	txt_new_topic = $('form[name=post] input[type=submit]').val();
-	txt_new_reply = txt_new_topic == 'Submit' ? txt_new_topic : 'New Reply';
+	txt_new_reply = txt_new_topic == 'Submit' ? txt_new_topic : new_reply_string;
 	
 	undo_quick_reply = function() {
 		$('div.banner').remove();
diff --git a/templates/index.html b/templates/index.html
index 761227ed..112756d1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,6 +10,11 @@
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
 	{% if not nojavascript %}
 		<script type="text/javascript" src="{{ config.url_javascript }}"></script>
+    {% if config.quick_reply %}
+    <script type="text/javascript">
+      var new_reply_string = "{{ config.button_reply }}";
+    </script>
+    {% endif %}
 		{% if not config.additional_javascript_compile %}
 		{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
 		{% endif %}
-- 
cgit v1.3


From b85fc7d102bc17797f53858457b019f4934a03bc Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 14 Jun 2013 23:57:04 -0400
Subject: generic boardlist for overboard

---
 templates/boardlist.html | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 templates/boardlist.html

(limited to 'templates')

diff --git a/templates/boardlist.html b/templates/boardlist.html
new file mode 100644
index 00000000..62646845
--- /dev/null
+++ b/templates/boardlist.html
@@ -0,0 +1 @@
+I'm your overboard boardlist. You can put here anything and I reside in templates/boardlist.html
-- 
cgit v1.3


From 8b952fe97fc0ead62eb944e8aa62b71852d9adf5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 15 Jun 2013 00:04:08 -0400
Subject: overboard: missed templates/index.html

---
 templates/index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/index.html b/templates/index.html
index eaed3666..059abc5e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -20,7 +20,11 @@
 	</header>
 	
 	{% include 'attention_bar.html' %}
-	{% include 'post_form.html' %}
+	{% if not no_post_form %}
+		{% include 'post_form.html' %}
+	{% else %}
+		{% include 'boardlist.html' %}
+	{% endif %}
 
 	{% if config.blotter %}<hr /><div class="blotter">{{ config.blotter }}</div>{% endif %}
 	<hr />
-- 
cgit v1.3


From ba424698e0f9e79da93b6c54573a67e12fa363e5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 15 Jun 2013 00:22:13 -0400
Subject: header abstraction: abstracted also in thread.html

---
 templates/page.html   |  2 +-
 templates/thread.html | 28 +---------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

(limited to 'templates')

diff --git a/templates/page.html b/templates/page.html
index 6e7a8a18..07eea62e 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,8 +1,8 @@
 <!doctype html>
 <html>
 <head>
-	{% include 'header.html' %}
 	<meta charset="utf-8">
+	{% include 'header.html' %}
 	<title>{{ title }}</title>
 </head>
 <body>
diff --git a/templates/thread.html b/templates/thread.html
index 0997f668..4e2a95a1 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -2,34 +2,8 @@
 <html>
 <head>
 	<meta charset="utf-8">
-	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
-	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
+	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.name }}</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
-	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
-	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
-	<script type="text/javascript">var configRoot="{{ config.root }}";</script>
-	{% if not nojavascript %}
-		<script type="text/javascript" src="{{ config.url_javascript }}"></script>
-		{% if not config.additional_javascript_compile %}
-		{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
-		{% endif %}
-	{% endif %}
-	{% if config.recaptcha %}<style type="text/css">{% raw %}
-		.recaptcha_image_cell {
-			background: none !important;
-		}
-		table.recaptchatable {
-			border: none !important;
-		}
-		#recaptcha_logo, #recaptcha_tagline {
-			display: none;
-			float: right;
-		}
-		.recaptchatable a {
-			display: block;
-		}
-	{% endraw %}</style>{% endif %}
 </head>
 <body>
 	{{ boardlist.top }}
-- 
cgit v1.3


From a92bb182d91ae98b2a2bc7787d5650050868f1f1 Mon Sep 17 00:00:00 2001
From: Macil Tech <maciltech@gmail.com>
Date: Tue, 2 Apr 2013 17:28:04 +0800
Subject: Fix display issues with RTL control characters in post names,
 subjects, and filenames.

---
 inc/display.php                                 | 33 +++++++++++++++++++++++++
 inc/lib/Twig/Extensions/Extension/Tinyboard.php |  1 +
 templates/post_reply.html                       |  8 +++---
 templates/post_thread.html                      | 14 +++++------
 4 files changed, 45 insertions(+), 11 deletions(-)

(limited to 'templates')

diff --git a/inc/display.php b/inc/display.php
index 57110224..ab96eb26 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -213,6 +213,39 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) {
 	return $body;
 }
 
+function bidi_cleanup($str){
+	# Closes all embedded RTL and LTR unicode formatting blocks in a string so that
+	# it can be used inside another without controlling its direction.
+	# More info: http://www.iamcal.com/understanding-bidirectional-text/
+	#
+	# LRE - U+202A - 0xE2 0x80 0xAA
+	# RLE - U+202B - 0xE2 0x80 0xAB
+	# LRO - U+202D - 0xE2 0x80 0xAD
+	# RLO - U+202E - 0xE2 0x80 0xAE
+	#
+	# PDF - U+202C - 0xE2 0x80 0xAC
+	#
+	$explicits	= '\xE2\x80\xAA|\xE2\x80\xAB|\xE2\x80\xAD|\xE2\x80\xAE';
+	$pdf		= '\xE2\x80\xAC';
+
+	$stack = 0;
+	$str = preg_replace_callback("!(?<explicits>$explicits)|(?<pdf>$pdf)!", function($match) use (&$stack) {
+		if (isset($match['explicits']) && $match['explicits']) {
+			$stack++;
+		} else {
+			if ($stack)
+				$stack--;
+			else
+				return '';
+		}
+		return $match[0];
+	}, $str);
+	for ($i=0; $i<$stack; $i++){
+		$str .= "\xE2\x80\xAC";
+	}
+	return $str;
+}
+
 function secure_link_confirm($text, $title, $confirm_message, $href) {
 	global $config;
 
diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index 0a128e7b..7592d1b4 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -25,6 +25,7 @@ class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
 			'until' => new Twig_Filter_Function('until'),
 			'split' => new Twig_Filter_Function('twig_split_filter'),
 			'push' => new Twig_Filter_Function('twig_push_filter'),
+			'bidi_cleanup' => new Twig_Filter_Function('bidi_cleanup'),
 			'addslashes' => new Twig_Filter_Function('addslashes')
 		);
 	}
diff --git a/templates/post_reply.html b/templates/post_reply.html
index ddd0afd4..c5735a0e 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -7,14 +7,14 @@
 	<label for="delete_{{ post.id }}">
 		{% if post.subject|length > 0 %}
 			{# show subject #}
-			<span class="subject">{{ post.subject }}</span> 
+			<span class="subject">{{ post.subject|bidi_cleanup }}</span> 
 		{% endif %}
 		{% if post.email|length > 0 %}
 			{# start email #}
 			<a class="email" href="mailto:{{ post.email }}">
 		{% endif %}
 		{% set capcode = post.capcode|capcode %}
-		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name }}</span>
+		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name|bidi_cleanup }}</span>
 		{% if post.trip|length > 0 %}
 			<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>
 		{% endif %}
@@ -66,9 +66,9 @@
 			{% if config.show_filename and post.filename %}
 				, 
 				{% if post.filename|length > config.max_filename_display %}
-					<span title="{{ post.filename }}">{{ post.filename|truncate(config.max_filename_display) }}</span>
+					<span class="postfilename" title="{{ post.filename|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
 				{% else %}
-					{{ post.filename }}
+					<span class="postfilename">{{ post.filename|bidi_cleanup }}</span>
 				{% endif %}
 			{% endif %}
 		)
diff --git a/templates/post_thread.html b/templates/post_thread.html
index cf93bed0..d7a62d4f 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -22,11 +22,11 @@
 		{% endif %}
 		{% if config.show_filename and post.filename %}
 			, 
-			{% if post.filename|length > config.max_filename_display %}
-				<span title="{{ post.filename }}">{{ post.filename|truncate(config.max_filename_display) }}</span>
-			{% else %}
-				{{ post.filename }}
-			{% endif %}
+			{% if post.filename|length > config.max_filename_display %}

+				<span class="postfilename" title="{{ post.filename|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>

+			{% else %}

+				<span class="postfilename">{{ post.filename|bidi_cleanup }}</span>

+			{% endif %}

 		{% endif %}
 	)
 	</span></p>
@@ -50,14 +50,14 @@
 	<label for="delete_{{ post.id }}">
 		{% if post.subject|length > 0 %}
 			{# show subject #}
-			<span class="subject">{{ post.subject }}</span> 
+			<span class="subject">{{ post.subject|bidi_cleanup }}</span> 
 		{% endif %}
 		{% if post.email|length > 0 %}
 			{# start email #}
 			<a class="email" href="mailto:{{ post.email }}">
 		{% endif %}
 		{% set capcode = post.capcode|capcode %}
-		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name }}</span>
+		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name|bidi_cleanup }}</span>
 		{% if post.trip|length > 0 %}
 			<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>
 		{% endif %}
-- 
cgit v1.3


From 4ad1ce13b1b7743ef13c27ecf425e13c4e4b2a33 Mon Sep 17 00:00:00 2001
From: Macil Tech <maciltech@gmail.com>
Date: Tue, 11 Jun 2013 10:18:41 -0500
Subject: Include non-compiled javascript in page.html too.

---
 templates/page.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/page.html b/templates/page.html
index e66b3fff..2f3de358 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -7,7 +7,12 @@
 	<title>{{ title }}</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
-	{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}
+	{% if not nojavascript %}
+		<script type="text/javascript" src="{{ config.url_javascript }}"></script>
+		{% if not config.additional_javascript_compile %}
+		{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
+		{% endif %}
+	{% endif %}
 </head>
 <body>
 	{% 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 %}
-- 
cgit v1.3


From a5e5cd03e6936e17b91acfb485c7e8a19b4c0b2a Mon Sep 17 00:00:00 2001
From: Macil Tech <maciltech@gmail.com>
Date: Tue, 18 Jun 2013 11:58:32 -0500
Subject: Don't forget secure tripcode that's preceded by a space.

Mod capcodes are not remembered in the posting form.
---
 templates/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/main.js b/templates/main.js
index b0a96393..9ec0025f 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -105,7 +105,7 @@ function generatePassword() {
 
 function dopost(form) {
 	if (form.elements['name']) {
-		localStorage.name = form.elements['name'].value.replace(/ ##.+$/, '');
+		localStorage.name = form.elements['name'].value.replace(/( |^)## .+$/, '');
 	}
 	if (form.elements['email'] && form.elements['email'].value != 'sage') {
 		localStorage.email = form.elements['email'].value;
-- 
cgit v1.3


From 3bcf88e842b8616a52dec7744e19073248817812 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 24 Jun 2013 08:23:09 -0400
Subject: JS Api: added an active_page variable to make it easier to denote the
 context from javascript

---
 templates/index.html  | 13 +++++++++----
 templates/thread.html |  5 +++++
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'templates')

diff --git a/templates/index.html b/templates/index.html
index 9dec93e0..82d3104e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,11 +3,16 @@
 <head>
 	<meta charset="utf-8">
 
-        {% if config.quick_reply %}
-          <script type="text/javascript">
+        <script type="text/javascript">
+          {% if config.quick_reply %}
             var new_reply_string = "{{ config.button_reply }}";
-          </script>           
-        {% endif %}
+          {% endif %}
+          {% if not no_post_form %}
+            var active_page = "index";
+	  {% else %}
+            var active_page = "ukko";
+          {% endif %}
+        </script>
 
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.name }}</title>
diff --git a/templates/thread.html b/templates/thread.html
index 4e2a95a1..b8c54dec 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -2,6 +2,11 @@
 <html>
 <head>
 	<meta charset="utf-8">
+
+        <script type="text/javascript">
+          var active_page = "thread";
+	</script>
+
 	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.name }}</title>
 </head>
-- 
cgit v1.3


From da57f51c87d4c60c1d7065745e456e91f18966f6 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 24 Jun 2013 08:44:19 -0400
Subject: templates/post_thread.html: changed windows-type endlines to
 unix-type

---
 templates/post_thread.html | 296 ++++++++++++++++++++++-----------------------
 1 file changed, 148 insertions(+), 148 deletions(-)

(limited to 'templates')

diff --git a/templates/post_thread.html b/templates/post_thread.html
index 33ef950d..970f32eb 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -1,148 +1,148 @@
-{% filter remove_whitespace %}
-{# tabs and new lines will be ignored #}
-
-<div id="thread_{{ post.id }}">
-
-{% if post.embed %}
-	{{ post.embed }}
-{% elseif post.file == 'deleted' %}
-	<img src="{{ config.image_deleted }}" alt="" />
-{% elseif post.file and post.file %}
-	<p class="fileinfo">{% trans %}File:{% endtrans %} <a href="{{ config.uri_img }}{{ post.file }}">{{ post.file }}</a> <span class="unimportant">
-	(
-		{% if post.thumb == 'spoiler' %}
-			{% trans %}Spoiler Image{% endtrans %}, 
-		{% endif %}
-		{{ post.filesize|filesize }}
-		{% if post.filex and post.filey %}
-			, {{ post.filex}}x{{ post.filey }}
-			{% if config.show_ratio %}
-				, {{ post.ratio }}
-			{% endif %}
-		{% endif %}
-		{% if config.show_filename and post.filename %}
-			, 
-			{% if post.filename|length > config.max_filename_display %}

-				<span class="postfilename" title="{{ post.filename|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>

-			{% else %}

-				<span class="postfilename">{{ post.filename|bidi_cleanup }}</span>

-			{% endif %}

-		{% endif %}
-		{% if post.thumb != 'file' and config.image_identification %}
-			, 
-			<span class='image_id'>
-			 <a href="http://imgops.com/{{ config.domain }}{{ config.uri_img }}{{ post.file }}">io</a>
-			{% if post.file|extension == 'jpg' %}
-				 <a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">e</a>
-			{% endif %}
-			 <a href="http://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">g</a>
-			 <a href="http://www.tineye.com/search?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">t</a>
-			</span>
-		{% endif %}
-	)
-	</span></p>
-<a href="{{ config.uri_img }}{{ post.file }}" target="_blank"{% if post.thumb == 'file' %} class="file"{% endif %}>
-<img src="
-	{% if post.thumb == 'file' %}
-		{{ config.root }}
-		{% if config.file_icons[post.filename|extension] %}
-			{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
-		{% else %}
-			{{ config.file_thumb|sprintf(config.file_icons.default) }}
-		{% endif %}
-	{% elseif post.thumb == 'spoiler' %}
-		{{ config.root }}{{ config.spoiler_image }}
-	{% else %}
-		{{ config.uri_thumb }}{{ post.thumb }}
-	{% endif %}" style="width:{{ post.thumbx }}px;height:{{ post.thumby }}px" alt="" /></a>
-{% endif %}
-<div class="post op"><p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}>
-	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
-	<label for="delete_{{ post.id }}">
-		{% if post.subject|length > 0 %}
-			{# show subject #}
-			<span class="subject">{{ post.subject|bidi_cleanup }}</span> 
-		{% endif %}
-		{% if post.email|length > 0 %}
-			{# start email #}
-			<a class="email" href="mailto:{{ post.email }}">
-		{% endif %}
-		{% set capcode = post.capcode|capcode %}
-		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name|bidi_cleanup }}</span>
-		{% if post.trip|length > 0 %}
-			<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>
-		{% endif %}
-		{% if post.email|length > 0 %}
-			{# end email #}
-			</a>
-		{% endif %}
-		{% if capcode %}
-			{{ capcode.cap }}
-		{% endif %}
-		{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
-			 [<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
-		{% endif %}
-		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
-	</label>
-	{% if config.poster_ids %}
-		 ID: {{ post.ip|poster_id(post.id) }}
-	{% endif %}
-	 <a class="post_no" href="{{ post.link }}">No.</a>
-	<a class="post_no"
-		{% if not index %}
-			 onclick="citeReply({{ post.id }});"
-		{% endif %}
-		 href="{% if index %}
-			{{ post.link('q') }}
-		{% else %}
-			javascript:void(0);
-		{% endif %}">
-		{{ post.id }}
-	</a>
-	{% if post.sticky %}
-		<img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" />
-	{% endif %}
-	{% if post.locked %}
-		<img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" />
-	{% endif %}
-	{% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %}
-		<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
-	{% endif %}
-	{% if index %}
-		<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ config.file_page|sprintf(post.id) }}">[{% trans %}Reply{% endtrans %}]</a>
-	{% endif %}
-	{{ post.postControls }}
-	</p>
-	<div class="body">
-		{% endfilter %}{% if index %}{{ post.body|truncate_body(post.link) }}{% else %}{{ post.body }}{% endif %}{% filter remove_whitespace %}
-	</div>
-	{% if post.omitted or post.omitted_images %}
-		<span class="omitted">
-			{% if post.omitted %}
-				{% trans %}
-					1 post
-				{% plural post.omitted %}
-					{{ count }} posts
-				{% endtrans %}
-				{% if post.omitted_images %}
-					 {% trans %}and{% endtrans %} 
-				{% endif %}
-			{% endif %}
-			{% if post.omitted_images %}
-				{% trans %}
-					1 image reply
-				{% plural post.omitted_images %}
-					{{ count }} image replies
-				{% endtrans %}
-			{% endif %} {% trans %}omitted. Click reply to view.{% endtrans %}
-		</span>
-	{% endif %}
-{% if not index %}
-{% endif %}
-</div>{% endfilter %}
-{% set hr = post.hr %}
-{% for post in post.posts %}
-	{% include 'post_reply.html' %}
-{% endfor %}
-<br class="clear"/>{% if hr %}<hr/>{% endif %}
-</div>
+{% filter remove_whitespace %}
+{# tabs and new lines will be ignored #}
+
+<div id="thread_{{ post.id }}">
+
+{% if post.embed %}
+	{{ post.embed }}
+{% elseif post.file == 'deleted' %}
+	<img src="{{ config.image_deleted }}" alt="" />
+{% elseif post.file and post.file %}
+	<p class="fileinfo">{% trans %}File:{% endtrans %} <a href="{{ config.uri_img }}{{ post.file }}">{{ post.file }}</a> <span class="unimportant">
+	(
+		{% if post.thumb == 'spoiler' %}
+			{% trans %}Spoiler Image{% endtrans %}, 
+		{% endif %}
+		{{ post.filesize|filesize }}
+		{% if post.filex and post.filey %}
+			, {{ post.filex}}x{{ post.filey }}
+			{% if config.show_ratio %}
+				, {{ post.ratio }}
+			{% endif %}
+		{% endif %}
+		{% if config.show_filename and post.filename %}
+			, 
+			{% if post.filename|length > config.max_filename_display %}
+				<span class="postfilename" title="{{ post.filename|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
+			{% else %}
+				<span class="postfilename">{{ post.filename|bidi_cleanup }}</span>
+			{% endif %}
+		{% endif %}
+		{% if post.thumb != 'file' and config.image_identification %}
+			, 
+			<span class='image_id'>
+			 <a href="http://imgops.com/{{ config.domain }}{{ config.uri_img }}{{ post.file }}">io</a>
+			{% if post.file|extension == 'jpg' %}
+				 <a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">e</a>
+			{% endif %}
+			 <a href="http://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">g</a>
+			 <a href="http://www.tineye.com/search?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">t</a>
+			</span>
+		{% endif %}
+	)
+	</span></p>
+<a href="{{ config.uri_img }}{{ post.file }}" target="_blank"{% if post.thumb == 'file' %} class="file"{% endif %}>
+<img src="
+	{% if post.thumb == 'file' %}
+		{{ config.root }}
+		{% if config.file_icons[post.filename|extension] %}
+			{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
+		{% else %}
+			{{ config.file_thumb|sprintf(config.file_icons.default) }}
+		{% endif %}
+	{% elseif post.thumb == 'spoiler' %}
+		{{ config.root }}{{ config.spoiler_image }}
+	{% else %}
+		{{ config.uri_thumb }}{{ post.thumb }}
+	{% endif %}" style="width:{{ post.thumbx }}px;height:{{ post.thumby }}px" alt="" /></a>
+{% endif %}
+<div class="post op"><p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}>
+	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
+	<label for="delete_{{ post.id }}">
+		{% if post.subject|length > 0 %}
+			{# show subject #}
+			<span class="subject">{{ post.subject|bidi_cleanup }}</span> 
+		{% endif %}
+		{% if post.email|length > 0 %}
+			{# start email #}
+			<a class="email" href="mailto:{{ post.email }}">
+		{% endif %}
+		{% set capcode = post.capcode|capcode %}
+		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name|bidi_cleanup }}</span>
+		{% if post.trip|length > 0 %}
+			<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>
+		{% endif %}
+		{% if post.email|length > 0 %}
+			{# end email #}
+			</a>
+		{% endif %}
+		{% if capcode %}
+			{{ capcode.cap }}
+		{% endif %}
+		{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
+			 [<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
+		{% endif %}
+		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
+	</label>
+	{% if config.poster_ids %}
+		 ID: {{ post.ip|poster_id(post.id) }}
+	{% endif %}
+	 <a class="post_no" href="{{ post.link }}">No.</a>
+	<a class="post_no"
+		{% if not index %}
+			 onclick="citeReply({{ post.id }});"
+		{% endif %}
+		 href="{% if index %}
+			{{ post.link('q') }}
+		{% else %}
+			javascript:void(0);
+		{% endif %}">
+		{{ post.id }}
+	</a>
+	{% if post.sticky %}
+		<img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" />
+	{% endif %}
+	{% if post.locked %}
+		<img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" />
+	{% endif %}
+	{% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %}
+		<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
+	{% endif %}
+	{% if index %}
+		<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ config.file_page|sprintf(post.id) }}">[{% trans %}Reply{% endtrans %}]</a>
+	{% endif %}
+	{{ post.postControls }}
+	</p>
+	<div class="body">
+		{% endfilter %}{% if index %}{{ post.body|truncate_body(post.link) }}{% else %}{{ post.body }}{% endif %}{% filter remove_whitespace %}
+	</div>
+	{% if post.omitted or post.omitted_images %}
+		<span class="omitted">
+			{% if post.omitted %}
+				{% trans %}
+					1 post
+				{% plural post.omitted %}
+					{{ count }} posts
+				{% endtrans %}
+				{% if post.omitted_images %}
+					 {% trans %}and{% endtrans %} 
+				{% endif %}
+			{% endif %}
+			{% if post.omitted_images %}
+				{% trans %}
+					1 image reply
+				{% plural post.omitted_images %}
+					{{ count }} image replies
+				{% endtrans %}
+			{% endif %} {% trans %}omitted. Click reply to view.{% endtrans %}
+		</span>
+	{% endif %}
+{% if not index %}
+{% endif %}
+</div>{% endfilter %}
+{% set hr = post.hr %}
+{% for post in post.posts %}
+	{% include 'post_reply.html' %}
+{% endfor %}
+<br class="clear"/>{% if hr %}<hr/>{% endif %}
+</div>
-- 
cgit v1.3


From 802fd16d46c8fb19382f4c81cf1642d3d7ae9744 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 24 Jun 2013 08:46:59 -0400
Subject: templates/post_thread.html: add data-board field for every thread;
 mainly for post-hiding and ukko integration

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

(limited to 'templates')

diff --git a/templates/post_thread.html b/templates/post_thread.html
index 970f32eb..08e8f840 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 }}">
+<div id="thread_{{ post.id }}" data-board="{{ board.uri }}">
 
 {% if post.embed %}
 	{{ post.embed }}
-- 
cgit v1.3


From 6961f5b8b5da98413468bb888eb24254e78970ae Mon Sep 17 00:00:00 2001
From: Marcin Łabanowski <marcin@6irc.net>
Date: Tue, 2 Jul 2013 18:05:18 -0400
Subject: post_form: move submit button upper when thread field is disabled

---
 templates/post_form.html | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'templates')

diff --git a/templates/post_form.html b/templates/post_form.html
index 1727250b..e5cb423c 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -24,24 +24,22 @@
 			<td>
 				<input type="text" name="email" size="25" maxlength="40" autocomplete="off">
 				{{ antibot.html() }}
+				{% if not (not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri))) %}
+				<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />{% if config.spoiler_images %} <input id="spoiler" name="spoiler" type="checkbox"> <label for="spoiler">{% trans %}Spoiler Image{% endtrans %}</label>{% endif %}
+				{% endif %}
 			</td>
 		</tr>{% endif %}
-		<tr>
-			{% if not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<th>
+		{% if not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<tr>
+			<th>
 				{% trans %}Subject{% endtrans %}
 				{{ antibot.html() }}
 			</th>
 			<td>
 				<input style="float:left;" type="text" name="subject" size="25" maxlength="100" autocomplete="off">
-			{% else %}<th>
-				{% trans %}Submit{% endtrans %}
-				{{ antibot.html() }}
-			</th>
-			<td>
-			{% endif %}
 				<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />{% if config.spoiler_images %} <input id="spoiler" name="spoiler" type="checkbox"> <label for="spoiler">{% trans %}Spoiler Image{% endtrans %}</label>{% endif %}
 			</td>
 		</tr>
+		{% endif %}
 		<tr>
 			<th>
 				{% trans %}Comment{% endtrans %}
@@ -50,6 +48,11 @@
 			<td>
 				<textarea name="body" id="body" rows="5" cols="35"></textarea>
 				{{ antibot.html() }}
+				{% if not (not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri))) %}
+				{% if not (not config.field_disable_email or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri))) %}
+				<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />{% if config.spoiler_images %} <input id="spoiler" name="spoiler" type="checkbox"> <label for="spoiler">{% trans %}Spoiler Image{% endtrans %}</label>{% endif %}
+				{% endif %}
+				{% endif %}
 			</td>
 		</tr>
 		{% if config.recaptcha %}
-- 
cgit v1.3


From 74f4c7da18aa96aecfbe92d234b09d697f7a268a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 2 Jul 2013 23:10:00 -0400
Subject: main.js: added preliminary translation functions for javascript

---
 templates/main.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'templates')

diff --git a/templates/main.js b/templates/main.js
index 9ec0025f..b3e773a3 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -1,5 +1,27 @@
 {% raw %}
 
+/* gettext-compatible _ function, example of usage:
+ *
+ * > // Loading pl_PL.json here (containing polish translation strings generated by tools/locale_compile.php)
+ * > alert(_("Hello!"));
+ * Witaj!
+ */
+function _(s) {
+	return (typeof tb_l10n != 'undefined' && typeof tb_l10n[s] != 'undefined') ? tb_l10n[s] : s;
+}
+
+/* printf-like formatting function, example of usage:
+ *
+ * > alert(fmt("There are {0} birds on {1} trees", [3,4]));
+ * There are 3 birds on 4 trees
+ * > // Loading pl_PL.json here (containing polish translation strings generated by tools/locale_compile.php)
+ * > alert(fmt(_("{0} users"), [3]));
+ * 3 uzytkownikow
+ */
+function fmt(s,a) {
+	return s.replace(/\{([0-9]+)\}/g, function(x) { return a[x[1]]; });
+}
+
 var saved = {};
 
 
-- 
cgit v1.3


From da9f367f2f9cf24d47b8d6a04cf2e54cb14a03bc Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 3 Jul 2013 01:04:08 -0400
Subject: js i18n: misc fixes; quick-reply.js i18n

---
 js/quick-reply.js      | 6 +++---
 templates/main.js      | 4 ++--
 tools/i18n_compile.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'templates')

diff --git a/js/quick-reply.js b/js/quick-reply.js
index bc36ca48..ea504b48 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
 		return; // not index
 	
 	txt_new_topic = $('form[name=post] input[type=submit]').val();
-	txt_new_reply = txt_new_topic == 'Submit' ? txt_new_topic : new_reply_string;
+	txt_new_reply = txt_new_topic == _('Submit') ? txt_new_topic : new_reply_string;
 	
 	undo_quick_reply = function() {
 		$('div.banner').remove();
@@ -27,9 +27,9 @@ $(document).ready(function(){
 	
 	$('div.post.op').each(function() {
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
-		$('<a href="?/b/res/69.html">[Quick reply]</a>').insertAfter($(this).children('p.intro').children('a:last')).click(function() {
+		$('<a href="#">['+_("Quick reply")+']</a>').insertAfter($(this).children('p.intro').children('a:last')).click(function() {
 			$('div.banner').remove();
-			$('<div class="banner">Posting mode: Replying to <small>&gt;&gt;' + id + '</small> <a class="unimportant" onclick="undo_quick_reply()" href="javascript:void(0)">[Return]</a></div>')
+			$('<div class="banner">'+fmt(_("Posting mode: Replying to <small>&gt;&gt;{0}</small>"), [id])+' <a class="unimportant" onclick="undo_quick_reply()" href="javascript:void(0)">['+_("Return")+']</a></div>')
 				.insertBefore('form[name=post]');
 			$('form[name=post] input[type=submit]').val(txt_new_reply);
 			
diff --git a/templates/main.js b/templates/main.js
index b3e773a3..31c0254a 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -2,12 +2,12 @@
 
 /* gettext-compatible _ function, example of usage:
  *
- * > // Loading pl_PL.json here (containing polish translation strings generated by tools/locale_compile.php)
+ * > // Loading pl_PL.json here (containing polish translation strings generated by tools/i18n_compile.php)
  * > alert(_("Hello!"));
  * Witaj!
  */
 function _(s) {
-	return (typeof tb_l10n != 'undefined' && typeof tb_l10n[s] != 'undefined') ? tb_l10n[s] : s;
+	return (typeof l10n != 'undefined' && typeof l10n[s] != 'undefined') ? l10n[s] : s;
 }
 
 /* printf-like formatting function, example of usage:
diff --git a/tools/i18n_compile.php b/tools/i18n_compile.php
index c85ccb83..ce00051c 100755
--- a/tools/i18n_compile.php
+++ b/tools/i18n_compile.php
@@ -35,10 +35,10 @@ foreach ($locales as $loc) {
 	if (file_exists($locdir."/LC_MESSAGES/tinyboard.po"))	$join = "-j";
 	else							$join = "";
 	`cd $locdir/LC_MESSAGES;
-         msgfmt tinyboard.po`;
+         msgfmt tinyboard.po -o tinyboard.mo`;
 
 	// Generate javascript.po
 	`cd tools/inc/lib/jsgettext/;
          php po2json.php -i ../../../../$locdir/LC_MESSAGES/javascript.po \
-                         -o ../../../../$locdir/LC_MESSAGES/javascript.js -k tb_i18n`;
+                         -o ../../../../$locdir/LC_MESSAGES/javascript.js`;
 }
-- 
cgit v1.3


From 34dc31c50e89b38e9489826661edb3f0fffd23ea Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 16 Jul 2013 01:14:42 -0400
Subject: Remove search section from dashboard as it is currently nonexistent
 in the latest version.

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

(limited to 'templates')

diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 2f0b03ad..e54b3cd3 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -101,6 +101,7 @@
 	</ul>
 </fieldset>
 
+{#
 <fieldset>
 	<legend>{% trans 'Search' %}</legend>
 	
@@ -115,6 +116,7 @@
 		</li>
 	</ul>
 </fieldset>
+#}
 
 {% if config.debug %}
 	<fieldset>
-- 
cgit v1.3


From 29b10c88db1ba16210e753e1fcf08d702455a674 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 16 Jul 2013 02:48:20 -0400
Subject: Outputting thread subject in header/title (issue #122)

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

(limited to 'templates')

diff --git a/inc/config.php b/inc/config.php
index 83b98c2b..ed4a31f1 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -527,6 +527,9 @@
 	// Number of characters in the poster ID (maximum is 40)
 	$config['poster_id_length'] = 5;
 	
+	// Show thread subject in page title?
+	$config['thread_subject_in_title'] = false;
+	
 	// Page footer
 	$config['footer'][] = 'All trademarks, copyrights, comments, and images on this page are owned by and are the responsibility of their respective parties.';
 	
diff --git a/inc/functions.php b/inc/functions.php
index 67019e0a..4b0e56d8 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1537,8 +1537,9 @@ function buildThread($id, $return=false, $mod=false) {
 		error($config['error']['nonexistant']);
 	
 	$body = Element('thread.html', array(
-		'board'=>$board, 
-		'body'=>$thread->build(),
+		'board' => $board,
+		'thread' => $thread,
+		'body' => $thread->build(),
 		'config' => $config,
 		'id' => $id,
 		'mod' => $mod,
diff --git a/templates/index.html b/templates/index.html
index 112756d1..9b25e1be 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
-	<title>{{ board.url }} - {{ board.name }}</title>
+	<title>{{ board.url }} - {{ board.title|e }}</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
 	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
diff --git a/templates/thread.html b/templates/thread.html
index 5442166f..aea8abb5 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
-	<title>{{ board.url }} - {{ board.name }}</title>
+	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
 	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
-- 
cgit v1.3


From c8f30550af861b95a1f475069ad8d10960a613b2 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 16 Jul 2013 06:33:37 -0400
Subject: $config['require_ban_view']: Force users to view the "You are banned"
 page at least once before letting a ban disappear naturally.

---
 inc/config.php        |  3 +++
 inc/functions.php     | 18 ++++++++++++++----
 inc/mod/ban.php       |  2 +-
 install.php           |  4 +++-
 install.sql           |  1 +
 templates/banned.html | 16 +++++++++++++---
 6 files changed, 35 insertions(+), 9 deletions(-)

(limited to 'templates')

diff --git a/inc/config.php b/inc/config.php
index ed4a31f1..b7f6d220 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -366,6 +366,9 @@
 	// When true, a blank password will be used for files (not usable for deletion).
 	$config['field_disable_password'] = false;
 	
+	// Require users to see the ban page at least once for a ban even if it has since expired?
+	$config['require_ban_view'] = false;
+	
 /*
  * ====================
  *  Markup settings
diff --git a/inc/functions.php b/inc/functions.php
index 4b0e56d8..8d6e0a2d 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -579,6 +579,12 @@ function ago($timestamp) {
 function displayBan($ban) {
 	global $config;
 	
+	if (!$ban['seen']) {
+		$query = prepare("UPDATE `bans` SET `seen` = 1 WHERE `id` = :id");
+		$query->bindValue(':id', $ban['id'], PDO::PARAM_INT);
+		$query->execute() or error(db_error($query));
+	}
+	
 	$ban['ip'] = $_SERVER['REMOTE_ADDR'];
 	
 	// Show banned page and exit
@@ -605,12 +611,12 @@ function checkBan($board = 0) {
 	if (event('check-ban', $board))
 		return true;
 	
-	$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `bans`.`id` FROM `bans` WHERE (`board` IS NULL OR `board` = :board) AND `ip` = :ip ORDER BY `expires` IS NULL DESC, `expires` DESC, `expires` DESC LIMIT 1");
+	$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, `bans`.`id` FROM `bans` WHERE (`board` IS NULL OR `board` = :board) AND `ip` = :ip ORDER BY `expires` IS NULL DESC, `expires` DESC, `expires` DESC LIMIT 1");
 	$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 	$query->bindValue(':board', $board);
 	$query->execute() or error(db_error($query));
 	if ($query->rowCount() < 1 && $config['ban_range']) {
-		$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `bans`.`id` FROM `bans` WHERE (`board` IS NULL OR `board` = :board) AND :ip LIKE REPLACE(REPLACE(`ip`, '%', '!%'), '*', '%') ESCAPE '!' ORDER BY `expires` IS NULL DESC, `expires` DESC LIMIT 1");
+		$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, `bans`.`id` FROM `bans` WHERE (`board` IS NULL OR `board` = :board) AND :ip LIKE REPLACE(REPLACE(`ip`, '%', '!%'), '*', '%') ESCAPE '!' ORDER BY `expires` IS NULL DESC, `expires` DESC LIMIT 1");
 		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 		$query->bindValue(':board', $board);
 		$query->execute() or error(db_error($query));
@@ -618,7 +624,7 @@ function checkBan($board = 0) {
 	
 	if ($query->rowCount() < 1 && $config['ban_cidr'] && !isIPv6()) {
 		// my most insane SQL query yet
-		$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `bans`.`id` FROM `bans` WHERE (`board` IS NULL OR `board` = :board)
+		$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, `bans`.`id` FROM `bans` WHERE (`board` IS NULL OR `board` = :board)
 			AND (					
 				`ip` REGEXP '^(\[0-9]+\.\[0-9]+\.\[0-9]+\.\[0-9]+\)\/(\[0-9]+)$'
 					AND
@@ -635,10 +641,14 @@ function checkBan($board = 0) {
 	if ($ban = $query->fetch()) {
 		if ($ban['expires'] && $ban['expires'] < time()) {
 			// Ban expired
-			$query = prepare("DELETE FROM `bans` WHERE `id` = :id LIMIT 1");
+			$query = prepare("DELETE FROM `bans` WHERE `id` = :id");
 			$query->bindValue(':id', $ban['id'], PDO::PARAM_INT);
 			$query->execute() or error(db_error($query));
 			
+			if ($config['require_ban_view'] && !$ban['seen']) {
+				displayBan($ban);
+			}
+			
 			return;
 		}
 		
diff --git a/inc/mod/ban.php b/inc/mod/ban.php
index 30234157..cfc2636f 100644
--- a/inc/mod/ban.php
+++ b/inc/mod/ban.php
@@ -56,7 +56,7 @@ function parse_time($str) {
 function ban($mask, $reason, $length, $board) {
 	global $mod, $pdo;
 	
-	$query = prepare("INSERT INTO `bans` VALUES (NULL, :ip, :mod, :time, :expires, :reason, :board)");
+	$query = prepare("INSERT INTO `bans` VALUES (NULL, :ip, :mod, :time, :expires, :reason, :board, 0)");
 	$query->bindValue(':ip', $mask);
 	$query->bindValue(':mod', $mod['id']);
 	$query->bindValue(':time', time());
diff --git a/install.php b/install.php
index 1447c723..71d1c910 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', 'v0.9.6-dev-7');
+define('VERSION', 'v0.9.6-dev-8');
 
 require 'inc/functions.php';
 
@@ -227,6 +227,8 @@ if (file_exists($config['has_installed'])) {
 				query(sprintf("CREATE INDEX `thread_id` ON `posts_%s` (`thread`, `id`)", $_board['uri'])) or error(db_error());
 				query(sprintf("ALTER TABLE `posts_%s` DROP INDEX `thread`", $_board['uri'])) or error(db_error());
 			}
+		case 'v0.9.6-dev-7':
+			query("ALTER TABLE  `bans` ADD  `seen` BOOLEAN NOT NULL") or error(db_error());
 		case false:
 			// Update version number
 			file_write($config['has_installed'], VERSION);
diff --git a/install.sql b/install.sql
index 811811e2..04896681 100644
--- a/install.sql
+++ b/install.sql
@@ -51,6 +51,7 @@ CREATE TABLE IF NOT EXISTS `bans` (
   `expires` int(11) DEFAULT NULL,
   `reason` text,
   `board` varchar(120) DEFAULT NULL,
+  `seen` tinyint(1) NOT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `ip` (`ip`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
diff --git a/templates/banned.html b/templates/banned.html
index e912c1a9..e7b626f6 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -1,9 +1,17 @@
 {% filter remove_whitespace %}
 {# Automatically removes unnecessary whitespace #}
 <div class="ban">
-	<h2>{% trans %}You are banned! ;_;{% endtrans %}</h2>
+	{% if ban.expires and time() >= ban.expires %}
+		<h2>{% trans %}You were banned! ;_;{% endtrans %}</h2>
+	{% else %}
+		<h2>{% trans %}You are banned! ;_;{% endtrans %}</h2>
+	{% endif %}
 	<p>
-		{% trans %}You have been banned from{% endtrans %}
+		{% if ban.expires and time() >= ban.expires %}
+			{% trans %}You were banned from{% endtrans %}
+		{% else %}
+			{% trans %}You have been banned from{% endtrans %}
+		{% endif %}
 			{% if ban.board %}
 				 <strong>{{ config.board_abbreviation|sprintf(ban.board) }}</strong>
 			{% else %}
@@ -23,7 +31,9 @@
 	<p>
 		{% trans %}Your ban was filed on{% endtrans %} 
 			<strong>{{ ban.set|date(config.ban_date) }}</strong> {% trans %}and{% endtrans %} <span id="expires">
-		{% if ban.expires %}
+		{% if ban.expires and time() >= ban.expires %}
+			{% trans %} has since expired. Refresh the page to continue.{%  endtrans %}
+		{% elseif ban.expires %}
 			{% trans %}expires{% endtrans %} <span id="countdown">{{ ban.expires|until }}</span> {% trans %}from now, which is on{% endtrans %} 
 			<strong>
 				{{ ban.expires|date(config.ban_date) }}
-- 
cgit v1.3


From aadb57f2a2db9210468f25d7dcd45d561ef6ad54 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 16 Jul 2013 08:50:39 -0400
Subject: More ban stuff: Show whether or not user has "seen" a ban yet in the
 ban list and on IP address pages. Purge useless expired ban records.

---
 inc/functions.php           | 10 ++++++++++
 templates/mod/ban_list.html |  8 ++++++++
 templates/mod/view_ip.html  | 10 ++++++++++
 3 files changed, 28 insertions(+)

(limited to 'templates')

diff --git a/inc/functions.php b/inc/functions.php
index 8d6e0a2d..40a2c1fe 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -654,6 +654,16 @@ function checkBan($board = 0) {
 		
 		displayBan($ban);
 	}
+	
+	// I'm not sure where else to put this. It doesn't really matter where; it just needs to be called every now and then to keep the ban list tidy.
+	purge_bans();
+}
+
+// No reason to keep expired bans in the database (except those that haven't been viewed yet)
+function purge_bans() {
+	$query = prepare("DELETE FROM `bans` WHERE `expires` IS NOT NULL AND `expires` < :time AND `seen` = 1");
+	$query->bindValue(':time', time());
+	$query->execute() or error(db_error($query));
 }
 
 function threadLocked($id) {
diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index 2edb9cdf..f8826ade 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -10,6 +10,7 @@
 				<th>{% trans 'Set' %}</th>
 				<th>{% trans 'Duration' %}</th>
 				<th>{% trans 'Expires' %}</th>
+				<th>{% trans 'Seen' %}</th>
 				<th>{% trans 'Staff' %}</th>
 			</tr>
 			{% for ban in bans %}
@@ -58,6 +59,13 @@
 							{% endif %}
 						{% endif %}
 					</td>
+					<td>
+						{%  if ban.seen %}
+							{% trans 'Yes' %}
+						{%  else %}
+							{% trans 'No' %}
+						{%  endif %}
+					</td>
 					<td>
 						{% if ban.username %}
 							{% if mod|hasPermission(config.mod.view_banstaff) %}
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index 562a0140..e2dad7af 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -136,6 +136,16 @@
 							{% endif %}
 						</td>
 					</tr>
+					<tr>
+						<th>{% trans 'Seen' %}</th>
+						<td>
+							{%  if ban.seen %}
+								{% trans 'Yes' %}
+							{%  else %}
+								{% trans 'No' %}
+							{%  endif %}
+						</td>
+					</tr>
 					<tr>
 						<th>{% trans 'Staff' %}</th>
 						<td>
-- 
cgit v1.3


From 786ac5c55cf151ffcb942d78554c5ae06471eda0 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 16 Jul 2013 13:18:55 -0400
Subject: recaptcha: fix for https

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

(limited to 'templates')

diff --git a/templates/post_form.html b/templates/post_form.html
index e5cb423c..07b53a9f 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -62,7 +62,7 @@
 				{{ antibot.html() }}
 			</th>
 			<td>
-				<script type="text/javascript" src="http://www.google.com/recaptcha/api/challenge?k={{ config.recaptcha_public }}"></script>
+				<script type="text/javascript" src="//www.google.com/recaptcha/api/challenge?k={{ config.recaptcha_public }}"></script>
 				{{ antibot.html() }}
 			</td>
 		</tr>
-- 
cgit v1.3


From 7e95e80c25e2f35b8a49ebd73f95671b0233be6f Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 17 Jul 2013 10:17:28 -0400
Subject: New theme: XML sitemap generator

---
 templates/themes/sitemap/info.php    | 53 ++++++++++++++++++++++++++++++++++++
 templates/themes/sitemap/sitemap.xml | 19 +++++++++++++
 templates/themes/sitemap/theme.php   | 28 +++++++++++++++++++
 3 files changed, 100 insertions(+)
 create mode 100644 templates/themes/sitemap/info.php
 create mode 100644 templates/themes/sitemap/sitemap.xml
 create mode 100644 templates/themes/sitemap/theme.php

(limited to 'templates')

diff --git a/templates/themes/sitemap/info.php b/templates/themes/sitemap/info.php
new file mode 100644
index 00000000..e16448ee
--- /dev/null
+++ b/templates/themes/sitemap/info.php
@@ -0,0 +1,53 @@
+<?php
+	$theme = Array();
+	
+	// Theme name
+	$theme['name'] = 'Sitemap Generator';
+	// Description (you can use Tinyboard markup here)
+	$theme['description'] = 'Generates an XML sitemap to help search engines find all threads and pages.';
+	$theme['version'] = 'v1.0';
+	
+	// Theme configuration	
+	$theme['config'] = Array();
+	
+	$theme['config'][] = Array(
+		'title' => 'Sitemap Path',
+		'name' => 'path',
+		'type' => 'text',
+		'default' => 'sitemap.xml',
+		'size' => '20'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'URL prefix',
+		'name' => 'url',
+		'type' => 'text',
+		'comment' => '(with trailing slash)',
+		'default' => 'http://' . $_SERVER['HTTP_HOST'] . $config['root'],
+		'size' => '20'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'Thread change frequency',
+		'name' => 'changefreq',
+		'type' => 'text',
+		'comment' => '(eg. "hourly", "daily", etc.)',
+		'default' => 'hourly',
+		'size' => '20'
+	);
+		
+	$__boards = listBoards();
+	$__default_boards = Array();
+	foreach ($__boards as $__board)
+		$__default_boards[] = $__board['uri'];
+	
+	$theme['config'][] = Array(
+		'title' => 'Boards',
+		'name' => 'boards',
+		'type' => 'text',
+		'comment' => '(boards to include; space seperated)',
+		'size' => 24,
+		'default' => implode(' ', $__default_boards)
+	);
+
+	$theme['build_function'] = 'sitemap_build';
diff --git a/templates/themes/sitemap/sitemap.xml b/templates/themes/sitemap/sitemap.xml
new file mode 100644
index 00000000..733da607
--- /dev/null
+++ b/templates/themes/sitemap/sitemap.xml
@@ -0,0 +1,19 @@
+{% filter remove_whitespace %}
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+	{% for board in boards %}
+		<url>
+			<loc>{{ settings.url ~ (config.board_path | format(board)) ~ config.file_index }}</loc>
+		</url>
+	{% endfor %}
+	{% for board, thread_list in threads %}
+		{% for thread in thread_list %}
+			<url>
+				<loc>{{ settings.url ~ (config.board_path | format(board)) ~ config.dir.res ~ (config.file_page | format(thread.thread_id)) }}</loc>
+				<lastmod>{{ thread.lastmod | date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}</lastmod>
+				<changefreq>{{ settings.changefreq }}</changefreq>
+			</url>
+		{% endfor %}
+	{% endfor %}
+</urlset>
+{% endfilter %}
\ No newline at end of file
diff --git a/templates/themes/sitemap/theme.php b/templates/themes/sitemap/theme.php
new file mode 100644
index 00000000..372d292d
--- /dev/null
+++ b/templates/themes/sitemap/theme.php
@@ -0,0 +1,28 @@
+<?php
+	require 'info.php';
+	
+	function sitemap_build($action, $settings) {
+		global $config;
+		
+		// Possible values for $action:
+		//	- all (rebuild everything, initialization)
+		//	- news (news has been updated)
+		//	- boards (board list changed)
+		//	- post (a post has been made)
+		
+		$boards = explode(' ', $settings['boards']);
+		
+		$threads = array();
+		
+		foreach ($boards as $board) {
+			$query = query(sprintf("SELECT `id` AS `thread_id`, (SELECT `time` FROM `posts_%s` WHERE `thread` = `thread_id` OR `id` = `thread_id` ORDER BY `time` DESC LIMIT 1) AS `lastmod` FROM `posts_%s` WHERE `thread` IS NULL", $board, $board)) or error(db_error());
+			$threads[$board] = $query->fetchAll(PDO::FETCH_ASSOC);
+		}
+				
+		file_write($settings['path'], Element('themes/sitemap/sitemap.xml', Array(
+			'settings' => $settings,
+			'config' => $config,
+			'threads' => $threads,
+			'boards' => $boards,
+		)));
+	}
-- 
cgit v1.3


From f5d378fab5eca1147923bbc268cc7ea1e864041c Mon Sep 17 00:00:00 2001
From: copypaste <wizardchan@hush.com>
Date: Thu, 18 Jul 2013 11:30:00 -0400
Subject: Catalog theme

---
 templates/themes/catalog/catalog.css | 38 +++++++++++++++++++++
 templates/themes/catalog/info.php    | 42 +++++++++++++++++++++++
 templates/themes/catalog/theme.php   | 64 ++++++++++++++++++++++++++++++++++++
 3 files changed, 144 insertions(+)
 create mode 100644 templates/themes/catalog/catalog.css
 create mode 100644 templates/themes/catalog/info.php
 create mode 100644 templates/themes/catalog/theme.php

(limited to 'templates')

diff --git a/templates/themes/catalog/catalog.css b/templates/themes/catalog/catalog.css
new file mode 100644
index 00000000..048dd656
--- /dev/null
+++ b/templates/themes/catalog/catalog.css
@@ -0,0 +1,38 @@
+img {
+	float:none!important;
+	margin: auto;
+	margin-bottom: 12px;
+	max-height: 150px;
+	max-width: 200px;
+	box-shadow: 0 0 4px rgba(0, 0, 0, 0.55);
+	border: 2px solid rgba(153, 153, 153, 0);
+}
+
+/*
+img:hover {
+	border: 2px solid rgba(153, 153, 153, 0.27);
+}
+*/
+
+div.thread {
+	display: inline-block;
+	vertical-align: top;
+	margin-bottom:25px;
+	margin-left: 20px;
+	margin-right: 15px;
+	text-align:center;
+	font-weight:normal;
+	width:205px;      
+	overflow:hidden;
+	position: relative;
+	font-size:11px;
+	padding: 15px;
+	background: rgba(182, 182, 182, 0.12);
+	border: 2px solid rgba(111, 111, 111, 0.34);
+	max-height:300px;
+}
+
+div.thread:hover {
+    background: #D6DAF0;
+    border-color: #B7C5D9;
+}
\ No newline at end of file
diff --git a/templates/themes/catalog/info.php b/templates/themes/catalog/info.php
new file mode 100644
index 00000000..1b9831ae
--- /dev/null
+++ b/templates/themes/catalog/info.php
@@ -0,0 +1,42 @@
+<?php
+	$theme = array();
+	
+	// Theme name
+	$theme['name'] = 'Catalog';
+	// Description (you can use Tinyboard markup here)
+	$theme['description'] = 'Show a post catalog.';
+	$theme['version'] = 'v0.1';
+	
+	// Theme configuration	
+	$theme['config'] = Array();
+	
+	$theme['config'][] = Array(
+		'title' => 'Title',
+		'name' => 'title',
+		'type' => 'text',
+		'default' => 'Catalog'
+	);
+	
+	$__boards = listBoards();
+	$__default_boards = Array();
+	foreach ($__boards as $__board)
+		$__default_boards[] = $__board['uri'];
+	
+	$theme['config'][] = Array(
+		'title' => 'Included boards',
+		'name' => 'boards',
+		'type' => 'text',
+		'comment' => '(space seperated)',
+		'default' => implode(' ', $__default_boards)
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'CSS file',
+		'name' => 'css',
+		'type' => 'text',
+		'default' => 'catalog.css',
+		'comment' => '(eg. "catalog.css")'
+	);
+	
+	// Unique function name for building everything
+	$theme['build_function'] = 'catalog_build';
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
new file mode 100644
index 00000000..356933ba
--- /dev/null
+++ b/templates/themes/catalog/theme.php
@@ -0,0 +1,64 @@
+<?php
+	require 'info.php';
+	
+	function catalog_build($action, $settings) {
+		// Possible values for $action:
+		//	- all (rebuild everything, initialization)
+		//	- news (news has been updated)
+		//	- boards (board list changed)
+		//	- post (a post has been made)
+		
+		$b = new Catalog();
+		$b->build($action, $settings);
+	}
+	
+	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
+	class Catalog {
+		public function build($action, $settings) {
+			global $config, $_theme;
+			
+			if ($action == 'all') {
+				copy('templates/themes/catalog/catalog.css', $config['dir']['home'] . $settings['css']);
+			}
+			
+			$boards = explode(' ', $settings['boards']);
+			foreach ($boards as $board) {
+			if ($action == 'all' || $action == 'post')
+				file_write($config['dir']['home'] . $board . '/catalog.html', $this->homepage($settings, $board));
+			}
+			
+		}
+		
+		public function homepage($settings, $board_name) {
+			global $config, $board;
+			
+			$recent_images = array();
+			$recent_posts = array();
+			$stats = array();
+			
+			$query = query(sprintf("SELECT *, `id` AS `thread_id`, (SELECT COUNT(*) FROM `posts_%s` WHERE `thread` = `thread_id`) AS `reply_count`, '%s' AS `board` FROM `posts_%s` WHERE `thread` IS NULL ORDER BY `bump` DESC", $board_name, $board_name, $board_name)) or error(db_error());
+			
+			while ($post = $query->fetch()) {
+				openBoard($post['board']);
+				
+				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id']));
+				$post['board_name'] = $board['name'];
+				$post['file'] = $config['uri_thumb'] . $post['thumb'];
+				$recent_posts[] = $post;
+			}
+			
+			
+			return Element('themes/catalog/catalog.html', Array(
+				'settings' => $settings,
+				'config' => $config,
+				'boardlist' => createBoardlist(),
+				'recent_images' => $recent_images,
+				'recent_posts' => $recent_posts,
+				'stats' => $stats,
+				'board' => $board_name,
+				'link' => $config['root'] . $board['dir']
+			));
+		}
+	};
+	
+?>
-- 
cgit v1.3


From 461d98b9457f90a6ff87534081f760572301e6f9 Mon Sep 17 00:00:00 2001
From: copypaste <wizardchan@hush.com>
Date: Thu, 18 Jul 2013 11:34:04 -0400
Subject: Catalog theme

---
 templates/themes/catalog/catalog.html | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 templates/themes/catalog/catalog.html

(limited to 'templates')

diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
new file mode 100644
index 00000000..501117a8
--- /dev/null
+++ b/templates/themes/catalog/catalog.html
@@ -0,0 +1,35 @@
+{% filter remove_whitespace %}
+<!doctype html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+	<title>{{ settings.title }}</title>
+	<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 %}
+</head>
+<body>
+	{{ boardlist.top }}
+	<header>
+		<h1>{{ settings.title }} (<a href="{{link}}">/{{ board }}/</a>)</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
+	
+	<ul>
+		{% for post in recent_posts %}
+		<a href="{{post.link}}">	
+		  <div class="thread">
+		    <img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
+		    <span class="replies">
+		      <strong>{{ post.reply_count }} {% if post.reply_count == 1 %}{% trans 'reply' %}{% else %}{% trans 'replies' %}{% endif %}</strong><br/>{{ post.body }}
+		    </span>
+		  </div>
+		</a>
+		  {% endfor %}
+	</ul>
+	
+	<hr/>
+	<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
+</body>
+</html>
+{% endfilter %}
-- 
cgit v1.3


From de4b5b396246ee5c3cb8687cfef3647c844a3b54 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 18 Jul 2013 11:40:21 -0400
Subject: Quick catalog theme bugfix

---
 templates/themes/catalog/catalog.html | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'templates')

diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 501117a8..7fcae04e 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -16,16 +16,17 @@
 	</header>
 	
 	<ul>
-		{% for post in recent_posts %}
-		<a href="{{post.link}}">	
-		  <div class="thread">
-		    <img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
-		    <span class="replies">
-		      <strong>{{ post.reply_count }} {% if post.reply_count == 1 %}{% trans 'reply' %}{% else %}{% trans 'replies' %}{% endif %}</strong><br/>{{ post.body }}
-		    </span>
-		  </div>
-		</a>
-		  {% endfor %}
+	{% for post in recent_posts %}
+		<div class="thread">
+			<a href="{{post.link}}">
+				<img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
+			</a>
+			<span class="replies">
+				<strong>{{ post.reply_count }} {% if post.reply_count == 1 %}{% trans 'reply' %}{% else %}{% trans 'replies' %}{% endif %}</strong><br/>
+				{{ post.body }}
+			</span>
+		</div>
+	{% endfor %}
 	</ul>
 	
 	<hr/>
-- 
cgit v1.3


From e4bd9a6886af2a812ccc909d8ad957df1bdc5d2b Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 18 Jul 2013 12:06:26 -0400
Subject: Themes edit: Split "post" into two seperate actions: "post" (replies)
 and "post-thread". And add a $board variable.

---
 inc/functions.php                     |  8 +++---
 post.php                              |  6 ++++-
 templates/themes/basic/theme.php      |  2 +-
 templates/themes/catalog/theme.php    | 50 ++++++++++++++++-------------------
 templates/themes/categories/theme.php |  2 +-
 templates/themes/frameset/theme.php   |  2 +-
 templates/themes/recent/theme.php     |  5 ++--
 templates/themes/rrdtool/theme.php    |  2 +-
 templates/themes/sitemap/theme.php    |  6 ++++-
 9 files changed, 44 insertions(+), 39 deletions(-)

(limited to 'templates')

diff --git a/inc/functions.php b/inc/functions.php
index 40a2c1fe..af810f31 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -239,12 +239,12 @@ function create_antibot($board, $thread = null) {
 	return _create_antibot($board, $thread);
 }
 
-function rebuildThemes($action) {
+function rebuildThemes($action, $board = false) {
 	// List themes
 	$query = query("SELECT `theme` FROM `theme_settings` WHERE `name` IS NULL AND `value` IS NULL") or error(db_error());
 
 	while ($theme = $query->fetch()) {
-		rebuildTheme($theme['theme'], $action);
+		rebuildTheme($theme['theme'], $action, $board);
 	}
 }
 
@@ -261,7 +261,7 @@ function loadThemeConfig($_theme) {
 	return $theme;
 }
 
-function rebuildTheme($theme, $action) {
+function rebuildTheme($theme, $action, $board = false) {
 	global $config, $_theme;
 	$_theme = $theme;
 
@@ -270,7 +270,7 @@ function rebuildTheme($theme, $action) {
 	if (file_exists($config['dir']['themes'] . '/' . $_theme . '/theme.php')) {
 		require_once $config['dir']['themes'] . '/' . $_theme . '/theme.php';
 	
-		$theme['build_function']($action, themeSettings($_theme));
+		$theme['build_function']($action, themeSettings($_theme), $board);
 	}
 }
 
diff --git a/post.php b/post.php
index 3d718786..97fb263d 100644
--- a/post.php
+++ b/post.php
@@ -677,7 +677,11 @@ if (isset($_POST['delete'])) {
 		_syslog(LOG_INFO, 'New post: /' . $board['dir'] . $config['dir']['res'] .
 			sprintf($config['file_page'], $post['op'] ? $id : $post['thread']) . (!$post['op'] ? '#' . $id : ''));
 	
-	rebuildThemes('post');
+	if ($post['op'])
+		rebuildThemes('post-thread', $board['uri']);
+	else
+		rebuildThemes('post', $board['uri']);
+	
 	header('Location: ' . $redirect, true, $config['redirect_http']);
 } else {
 	if (!file_exists($config['has_installed'])) {
diff --git a/templates/themes/basic/theme.php b/templates/themes/basic/theme.php
index 806a331a..7ba0d1e7 100644
--- a/templates/themes/basic/theme.php
+++ b/templates/themes/basic/theme.php
@@ -1,7 +1,7 @@
 <?php
 	require 'info.php';
 	
-	function basic_build($action, $settings) {
+	function basic_build($action, $settings, $board) {
 		// Possible values for $action:
 		//	- all (rebuild everything, initialization)
 		//	- news (news has been updated)
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 356933ba..e585cf17 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -1,37 +1,38 @@
 <?php
 	require 'info.php';
 	
-	function catalog_build($action, $settings) {
+	function catalog_build($action, $settings, $board) {
+		global $config;
+		
 		// Possible values for $action:
 		//	- all (rebuild everything, initialization)
 		//	- news (news has been updated)
 		//	- boards (board list changed)
-		//	- post (a post has been made)
+		//	- post (a reply has been made)
+		//	- post-thread (a thread has been made)
 		
-		$b = new Catalog();
-		$b->build($action, $settings);
-	}
-	
-	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
-	class Catalog {
-		public function build($action, $settings) {
-			global $config, $_theme;
-			
-			if ($action == 'all') {
-				copy('templates/themes/catalog/catalog.css', $config['dir']['home'] . $settings['css']);
-			}
+		$boards = explode(' ', $settings['boards']);
+				
+		if ($action == 'all') {
+			copy('templates/themes/catalog/catalog.css', $config['dir']['home'] . $settings['css']);
 			
-			$boards = explode(' ', $settings['boards']);
 			foreach ($boards as $board) {
-			if ($action == 'all' || $action == 'post')
-				file_write($config['dir']['home'] . $board . '/catalog.html', $this->homepage($settings, $board));
+				$b = new Catalog();
+				$b->build($settings, $board);
 			}
-			
+		} elseif ($action == 'post-thread' && in_array($board, $boards)) {
+			$b = new Catalog();
+			$b->build($settings, $board);
 		}
-		
-		public function homepage($settings, $board_name) {
+	}
+	
+	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
+	class Catalog {
+		public function build($settings, $board_name) {
 			global $config, $board;
 			
+			openBoard($board_name);
+			
 			$recent_images = array();
 			$recent_posts = array();
 			$stats = array();
@@ -39,16 +40,13 @@
 			$query = query(sprintf("SELECT *, `id` AS `thread_id`, (SELECT COUNT(*) FROM `posts_%s` WHERE `thread` = `thread_id`) AS `reply_count`, '%s' AS `board` FROM `posts_%s` WHERE `thread` IS NULL ORDER BY `bump` DESC", $board_name, $board_name, $board_name)) or error(db_error());
 			
 			while ($post = $query->fetch()) {
-				openBoard($post['board']);
-				
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id']));
 				$post['board_name'] = $board['name'];
 				$post['file'] = $config['uri_thumb'] . $post['thumb'];
 				$recent_posts[] = $post;
 			}
 			
-			
-			return Element('themes/catalog/catalog.html', Array(
+			file_write($config['dir']['home'] . $board_name . '/catalog.html', Element('themes/catalog/catalog.html', Array(
 				'settings' => $settings,
 				'config' => $config,
 				'boardlist' => createBoardlist(),
@@ -57,8 +55,6 @@
 				'stats' => $stats,
 				'board' => $board_name,
 				'link' => $config['root'] . $board['dir']
-			));
+			)));
 		}
 	};
-	
-?>
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 11fcbbaf..7d468d0d 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -1,7 +1,7 @@
 <?php
 	require 'info.php';
 	
-	function categories_build($action, $settings) {
+	function categories_build($action, $settings, $board) {
 		// Possible values for $action:
 		//	- all (rebuild everything, initialization)
 		//	- news (news has been updated)
diff --git a/templates/themes/frameset/theme.php b/templates/themes/frameset/theme.php
index 015eebaf..5fd9d29e 100644
--- a/templates/themes/frameset/theme.php
+++ b/templates/themes/frameset/theme.php
@@ -1,7 +1,7 @@
 <?php
 	require 'info.php';
 	
-	function frameset_build($action, $settings) {
+	function frameset_build($action, $settings, $board) {
 		// Possible values for $action:
 		//	- all (rebuild everything, initialization)
 		//	- news (news has been updated)
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index 986fac6a..1ebe58f6 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -1,12 +1,13 @@
 <?php
 	require 'info.php';
 	
-	function recentposts_build($action, $settings) {
+	function 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 RecentPosts();
 		$b->build($action, $settings);
@@ -23,7 +24,7 @@
 			
 			$this->excluded = explode(' ', $settings['exclude']);
 			
-			if ($action == 'all' || $action == 'post')
+			if ($action == 'all' || $action == 'post' || $action == 'post-thread')
 				file_write($config['dir']['home'] . $settings['html'], $this->homepage($settings));
 		}
 		
diff --git a/templates/themes/rrdtool/theme.php b/templates/themes/rrdtool/theme.php
index eed2ac9a..68fc1850 100644
--- a/templates/themes/rrdtool/theme.php
+++ b/templates/themes/rrdtool/theme.php
@@ -1,7 +1,7 @@
 <?php
 	require 'info.php';
 	
-	function rrdtool_build($action, $settings) {
+	function rrdtool_build($action, $settings, $board) {
 		// Possible values for $action:
 		//	- all (rebuild everything, initialization)
 		//	- news (news has been updated)
diff --git a/templates/themes/sitemap/theme.php b/templates/themes/sitemap/theme.php
index 372d292d..e210316b 100644
--- a/templates/themes/sitemap/theme.php
+++ b/templates/themes/sitemap/theme.php
@@ -1,7 +1,7 @@
 <?php
 	require 'info.php';
 	
-	function sitemap_build($action, $settings) {
+	function sitemap_build($action, $settings, $board) {
 		global $config;
 		
 		// Possible values for $action:
@@ -9,6 +9,10 @@
 		//	- news (news has been updated)
 		//	- boards (board list changed)
 		//	- post (a post has been made)
+		//	- thread (a thread has been made)
+		
+		if ($action != 'post' && $action != 'post-thread')
+			return;
 		
 		$boards = explode(' ', $settings['boards']);
 		
-- 
cgit v1.3


From aa9844ae2a3522c0792096c7d3682ea9f1679017 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 18 Jul 2013 15:31:22 -0400
Subject: sitemap theme: fix notice when rebuilding using tools/rebuild.php
 from CLI

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

(limited to 'templates')

diff --git a/templates/themes/sitemap/info.php b/templates/themes/sitemap/info.php
index e16448ee..1198c2e3 100644
--- a/templates/themes/sitemap/info.php
+++ b/templates/themes/sitemap/info.php
@@ -23,7 +23,7 @@
 		'name' => 'url',
 		'type' => 'text',
 		'comment' => '(with trailing slash)',
-		'default' => 'http://' . $_SERVER['HTTP_HOST'] . $config['root'],
+		'default' => 'http://' . (isset ($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : "localhost") . $config['root'],
 		'size' => '20'
 	);
 	
-- 
cgit v1.3


From a5a1f00223ea59658b09a0a503a368bf03425ee9 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 18 Jul 2013 16:13:48 -0400
Subject: catalog: translation fix

---
 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 7fcae04e..986db846 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -22,7 +22,7 @@
 				<img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
 			</a>
 			<span class="replies">
-				<strong>{{ post.reply_count }} {% if post.reply_count == 1 %}{% trans 'reply' %}{% else %}{% trans 'replies' %}{% endif %}</strong><br/>
+				<strong>{% trans %}1 reply{% plural post.omitted %}{{ count }} replies{% endtrans %}</strong><br/>
 				{{ post.body }}
 			</span>
 		</div>
-- 
cgit v1.3


From 5547591b87f1ca25d9f1f455fa633991c652ac30 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 18 Jul 2013 16:16:43 -0400
Subject: catalog: fix previous commit

---
 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 986db846..7b8c075a 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -22,7 +22,7 @@
 				<img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
 			</a>
 			<span class="replies">
-				<strong>{% trans %}1 reply{% plural post.omitted %}{{ count }} replies{% endtrans %}</strong><br/>
+				<strong>{% trans %}1 reply{% plural post.reply_count %}{{ count }} replies{% endtrans %}</strong><br/>
 				{{ post.body }}
 			</span>
 		</div>
-- 
cgit v1.3