Merge branch 'master' of github.com:vichan-devel/Tinyboard

Conflicts:
	js/post-hider.js

10 files changed, 121 insertions, 47 deletions

diff --git a/templates/themes/basic/theme.php b/templates/themes/basic/theme.php
index 7ba0d1e7..6ba09ce6 100644
--- a/templates/themes/basic/theme.php
+++ b/templates/themes/basic/theme.php
@@ -25,7 +25,7 @@
 			
 			$settings['no_recent'] = (int) $settings['no_recent'];
 			
-			$query = query("SELECT * FROM `news` ORDER BY `time` DESC" . ($settings['no_recent'] ? ' LIMIT ' . $settings['no_recent'] : '')) or error(db_error());
+			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC" . ($settings['no_recent'] ? ' LIMIT ' . $settings['no_recent'] : '')) or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
 			
 			return Element('themes/basic/index.html', Array(
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index e585cf17..4e2d40db 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -37,9 +37,9 @@
 			$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());
+			$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()) {
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				$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'];
diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 9c7d8340..b3bea2b1 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
 </head>
 <body>
-	<h1>{{ settings.title }}</h1>
+	{{ boardlist.top }}
 	<header>
 		<h1>{{ settings.title }}</h1>
 		<div class="subtitle">{{ settings.subtitle }}</div>
@@ -15,16 +15,16 @@
 	
 	<div class="ban">
 		{% if news|count == 0 %}
-			<p style="text-align:center" class="unimportant">(No news to show.)</p>
+			<p style="text-align:center" class="unimportant">{% trans %}(No news to show.){% endtrans %}</p>
 		{% else %}
 			{% for entry in news %}
 				<h2 id="{{ entry.id }}">
 					{% if entry.subject %}
 						{{ entry.subject }}
 					{% else %}
-						<em>no subject</em>
+						<em>{% trans %}no subject{% endtrans %}</em>
 					{% endif %}
-					<span class="unimportant"> &mdash; by {{ entry.name }} at {{ entry.time|date(config.post_date) }}</span>
+					<span class="unimportant"> &mdash; {% trans %}by{% endtrans %} {{ entry.name }} {% trans %}at{% endtrans %} {{ entry.time|date(config.post_date) }}</span>
 				</h2>
 				<p>{{ entry.body }}</p>
 			{% endfor %}
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 7d468d0d..74ed61ed 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -36,7 +36,7 @@
 		public static function news($settings) {
 			global $config;
 			
-			$query = query("SELECT * FROM `news` ORDER BY `time` DESC") or error(db_error());
+			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC") or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
 			
 			return Element('themes/categories/news.html', Array(
diff --git a/templates/themes/frameset/theme.php b/templates/themes/frameset/theme.php
index 5fd9d29e..ffab0538 100644
--- a/templates/themes/frameset/theme.php
+++ b/templates/themes/frameset/theme.php
@@ -36,7 +36,7 @@
 		public static function news($settings) {
 			global $config;
 			
-			$query = query("SELECT * FROM `news` ORDER BY `time` DESC") or error(db_error());
+			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC") or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
 			
 			return Element('themes/frameset/news.html', Array(
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index 75907e77..08d910f8 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -42,12 +42,12 @@
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
 			$query = query($query) or error(db_error());
 			
-			while ($post = $query->fetch()) {
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				openBoard($post['board']);
 				
 				// board settings won't be available in the template file, so generate links now
@@ -62,12 +62,12 @@
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` UNION ALL ", $_board['uri'], $_board['uri']);
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
 			$query = query($query) or error(db_error());
 			
-			while ($post = $query->fetch()) {
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				openBoard($post['board']);
 				
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
@@ -78,40 +78,37 @@
 			}
 			
 			// Total posts
-			$query = 'SELECT SUM(`top`) AS `count` FROM (';
+			$query = 'SELECT SUM(`top`) FROM (';
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT MAX(`id`) AS `top` FROM `posts_%s` UNION ALL ", $_board['uri']);
+				$query .= sprintf("SELECT MAX(`id`) AS `top` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
-			$res = $query->fetch();
-			$stats['total_posts'] = number_format($res['count']);
+			$stats['total_posts'] = number_format($query->fetchColumn());
 			
 			// Unique IPs
-			$query = 'SELECT COUNT(DISTINCT(`ip`)) AS `count` FROM (';
+			$query = 'SELECT COUNT(DISTINCT(`ip`)) FROM (';
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT `ip` FROM `posts_%s` UNION ALL ", $_board['uri']);
+				$query .= sprintf("SELECT `ip` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
-			$res = $query->fetch();
-			$stats['unique_posters'] = number_format($res['count']);
+			$stats['unique_posters'] = number_format($query->fetchColumn());
 			
 			// Active content
-			$query = 'SELECT SUM(`filesize`) AS `count` FROM (';
+			$query = 'SELECT SUM(`filesize`) FROM (';
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT `filesize` FROM `posts_%s` UNION ALL ", $_board['uri']);
+				$query .= sprintf("SELECT `filesize` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
-			$res = $query->fetch();
-			$stats['active_content'] = $res['count'];
+			$stats['active_content'] = $query->fetchColumn();
 			
 			return Element('themes/recent/recent.html', Array(
 				'settings' => $settings,
diff --git a/templates/themes/rrdtool/theme.php b/templates/themes/rrdtool/theme.php
index 68fc1850..a14169a3 100644
--- a/templates/themes/rrdtool/theme.php
+++ b/templates/themes/rrdtool/theme.php
@@ -61,9 +61,8 @@
 					// debug just the graphing (not updating) with the --debug switch
 					if (!isset($argv[1]) || $argv[1] != '--debug') {
 						// Update graph
-						$query = query(sprintf("SELECT MAX(`id`) AS `count` FROM `posts_%s`", $board));
-						$count = $query->fetch();
-						$count = $count['count'];
+						$query = query(sprintf("SELECT MAX(`id`) FROM ``posts_%s``", $board));
+						$count = $query->fetchColumn();
 					
 						if (!rrd_update($file, Array(
 							'-t',
diff --git a/templates/themes/sitemap/theme.php b/templates/themes/sitemap/theme.php
index e210316b..226f8357 100644
--- a/templates/themes/sitemap/theme.php
+++ b/templates/themes/sitemap/theme.php
@@ -19,7 +19,7 @@
 		$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());
+			$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);
 		}
 				
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index 6fa5fa7e..1682b4ec 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -25,7 +25,7 @@
 			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 .= 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());
@@ -48,7 +48,7 @@
 						$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 = 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));
@@ -66,7 +66,7 @@
 					
 					}
 					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 = 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));
 						
diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index baf0f78d..4a36b394 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -1,37 +1,115 @@
+(function(){
+
 var cache = new Array(),
 	thread = false,
-	loading = false;
+	loading = false,
+	ukkotimer = false;
+if (localStorage.hiddenboards !== null) {
+	localStorage.hiddenboards = "{}";
+}
+
+// Load data from HTML5 localStorage
+var hiddenboards = JSON.parse(localStorage.hiddenboards);
+                
+var storeboards = function() {
+        localStorage.hiddenboards = JSON.stringify(hiddenboards);
+};
+
 $(document).ready(function() {
-	$(window).on('scroll', function() {
-		if($(window).scrollTop() + $(window).height() + 100 > $(document).height() && !loading && overflow.length > 0) {
+	var addukkohide = function() {
+		var ukkohide = $('<a href="javascript:void(0);" class="unimportant ukkohide"></a>');
+		var board = $(this).next().data("board");
+		var hr = $("<hr />");
+
+		$(this).append(ukkohide);
+		$(this).append(hr);
+
+		if (hiddenboards[board] !== true) {
+			ukkohide.html(_("(hide threads from this board)"));
+			hr.hide();
+		}
+		else {
+			ukkohide.html(_("(show threads from this board)"));
+			$(this).next().hide();
+		}
+		ukkohide.click(function() {
+			hiddenboards[board] = (hiddenboards[board] !== true);
+			if (hiddenboards[board] !== true) {
+                        	$('[data-board="'+board+'"]:not([data-cached="yes"])').show().prev().
+					find('.ukkohide').html(_("(hide threads from this board)")).
+					parent().find('hr').hide();
+                	}
+                	else {
+                        	$('[data-board="'+board+'"]:not([data-cached="yes"])').hide().prev().
+					find('.ukkohide').html(_("(show threads from this board)"))
+					.parent().find('hr').show();
+                	}
+			storeboards();
+			return false;
+		});
+
+	};
+	$("h2").each(addukkohide);
+
+	$('.pages').hide();
+	var loadnext = function() {
+		if (overflow.length == 0) {
+			$('.pages').show().html(_("No more threads to display"));
+		}
+		while($(window).scrollTop() + $(window).height() + 1000 > $(document).height() && !loading && overflow.length > 0) {
 			var page = '../' + overflow[0].board + '/' + overflow[0].page;
+			thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
+			if (thread.length > 0 && thread.attr("data-cached") !== 'yes') { // already present
+				overflow.shift();
+				continue;
+			}
+
+			var boardheader = $('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a> </h2>');
+
 			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();
+				if (thread.length > 0) {
+					$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).attr("data-cached", "no").css('display', 'block'));
+					boardheader.insertBefore(thread);
+					addukkohide.call(boardheader);
+					$(document).trigger('new_post', thread);
 				}
+				overflow.shift();
 			} else {
 				loading = true;
+				$('.pages').show().html(_("Loading..."));
 				$.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));
+						var checkout = $(this).attr('id').replace('thread_', '');
+						if ($('div#thread_' + checkout + '[data-board="' + overflow[0].board + '"]').length == 0) {
+							$('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr("data-cached", "yes").attr('data-board', overflow[0].board));
+						}
 					});
 
-					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
+					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"][data-cached="yes"]');
+
 					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();
+						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).attr("data-cached", "no").css('display', 'block'));
+						boardheader.insertBefore(thread);
+						addukkohide.call(boardheader);
+						$(document).trigger('new_post', thread);
 					}
+					overflow.shift();
 
 					loading = false;
+					$('.pages').hide().html("");
 				});
+				break;
 			}
 		}
-	});
+		clearTimeout(ukkotimer);
+		ukkotimer = setTimeout(loadnext, 1000);
+	};
+
+	$(window).on('scroll', loadnext);
+
+	ukkotimer = setTimeout(loadnext, 1000);
+});
 
-});
\ No newline at end of file
+})();