Merge branch 'master' of https://github.com/designcreateplay/NodeBB

app.js

@@ -106,11 +106,9 @@
 				upgrade.check(function(schema_ok) {
 					if (schema_ok || nconf.get('check-schema') === false) {
 
-						sockets.init();
+						sockets.init(webserver.server);
 
 						plugins.init();
-						global.templates = {};
-						global.translator = translator;
 
 						translator.loadServer();
 

public/language/en/global.json

@@ -33,5 +33,8 @@
 	"motd.get": "Get NodeBB",
 	"motd.fork": "Fork",
 	"motd.like": "Like",
-	"motd.follow": "Follow"
+	"motd.follow": "Follow",
+
+	"previouspage": "Previous Page",
+	"nextpage": "Next Page"
 }

public/src/app.js

@@ -396,6 +396,16 @@ var socket,
 		});
 	};
 
+	app.enableInfiniteLoading = function(callback) {
+		$(window).off('scroll').on('scroll', function() {
+			var bottom = ($(document).height() - $(window).height()) * 0.9;
+
+			if ($(window).scrollTop() > bottom) {
+				callback();
+			}
+		});
+	}
+
 	var	titleObj = {
 			active: false,
 			interval: undefined,
@@ -528,6 +538,9 @@ var socket,
 		});
 
 		templates.setGlobal('relative_path', RELATIVE_PATH);
+		templates.setGlobal('usePagination', config.usePagination);
+		templates.setGlobal('topicsPerPage', config.topicsPerPage);
+		templates.setGlobal('postsPerPage', config.postsPerPage);
 	});
 
 	showWelcomeMessage = location.href.indexOf('loggedin') !== -1;

public/src/forum/category.js

@@ -1,13 +1,10 @@
-define(['composer'], function(composer) {
+define(['composer', 'forum/pagination'], function(composer, pagination) {
 	var Category = {},
 		loadingMoreTopics = false;
 
 	Category.init = function() {
 		var	cid = templates.get('category_id'),
 			categoryName = templates.get('category_name'),
-			twitterEl = jQuery('#twitter-intent'),
-			facebookEl = jQuery('#facebook-share'),
-			googleEl = jQuery('#google-share'),
 			categoryUrl = encodeURIComponent(window.location.href),
 			twitterUrl = "https://twitter.com/intent/tweet?url=" + categoryUrl + "&text=" + encodeURIComponent(categoryName),
 			facebookUrl = "https://www.facebook.com/sharer/sharer.php?u=" + categoryUrl,
@@ -15,17 +12,17 @@ define(['composer'], function(composer) {
 
 		app.enterRoom('category_' + cid);
 
-
-
-		twitterEl.on('click', function () {
+		$('#twitter-intent').on('click', function () {
 			window.open(twitterUrl, '_blank', 'width=550,height=420,scrollbars=no,status=no');
 			return false;
 		});
-		facebookEl.on('click', function () {
+
+		$('#facebook-share').on('click', function () {
 			window.open(facebookUrl, '_blank', 'width=626,height=436,scrollbars=no,status=no');
 			return false;
 		});
-		googleEl.on('click', function () {
+
+		$('#google-share').on('click', function () {
 			window.open(googleUrl, '_blank', 'width=500,height=570,scrollbars=no,status=no');
 			return false;
 		});
@@ -42,14 +39,20 @@ define(['composer'], function(composer) {
 
 		socket.emit('categories.getRecentReplies', cid, renderRecentReplies);
 
-		$(window).off('scroll').on('scroll', function (ev) {
-			var bottom = ($(document).height() - $(window).height()) * 0.9;
+		enableInfiniteLoading();
+	};
 
-			if ($(window).scrollTop() > bottom && !loadingMoreTopics) {
-				Category.loadMoreTopics(cid);
+	function enableInfiniteLoading() {
+		if(!config.usePagination) {
+			app.enableInfiniteLoading(function() {
+				if(!loadingMoreTopics) {
+					Category.loadMoreTopics(templates.get('category_id'));
 				}
 			});
-	};
+		} else {
+			pagination.init(templates.get('currentPage'), templates.get('pageCount'));
+		}
+	}
 
 	Category.onNewTopic = function(data) {
 		var html = templates.prepare(templates['category'].blocks['topics']).parse({
@@ -85,7 +88,12 @@ define(['composer'], function(composer) {
 
 			addActiveUser(data);
 
+			socket.emit('categories.getPageCount', templates.get('category_id'), function(err, newPageCount) {
+				pagination.recreatePaginationLinks(newPageCount);
+			});
+
 			$('#topics-container span.timeago').timeago();
+			app.createUserTooltips();
 		});
 	}
 
@@ -116,9 +124,15 @@ define(['composer'], function(composer) {
 			jQuery('#category-no-topics').remove();
 
 			html = $(translatedHTML);
+
+			if(config.usePagination) {
+				container.empty().append(html);
+			} else {
 				container.append(html);
+			}
 
 			$('#topics-container span.timeago').timeago();
+			app.createUserTooltips();
 			app.makeNumbersHumanReadable(html.find('.human-readable-number'));
 		});
 	}

public/src/forum/login.js

@@ -52,12 +52,6 @@ define(function() {
 		});
 
 		document.querySelector('#content input').focus();
-
-		if(!config.emailSetup)
-			$('#reset-link').addClass('hide');
-		else
-			$('#reset-link').removeClass('hide');
-
 	};
 
 	return Login;

public/src/forum/pagination.js

@@ -0,0 +1,110 @@
+
+
+define(function() {
+	var pagination = {};
+
+	pagination.currentPage = 0;
+	pagination.pageCount = 0;
+
+	pagination.init = function(currentPage, pageCount) {
+		pagination.currentPage = parseInt(currentPage, 10);
+		pagination.pageCount = parseInt(pageCount, 10);
+
+		pagination.recreatePaginationLinks(pageCount);
+
+		$('.pagination')
+			.on('click', '.previous', function() {
+				return pagination.loadPage(pagination.currentPage - 1);
+			}).on('click', '.next', function() {
+				return pagination.loadPage(pagination.currentPage + 1);
+			}).on('click', '.page', function() {
+				return pagination.loadPage($(this).attr('data-page'));
+			}).on('click', '.select_page', function(e) {
+				e.preventDefault();
+				bootbox.prompt('Enter page number:', function(pageNum) {
+					pagination.loadPage(pageNum);
+				});
+			});
+	}
+
+	pagination.recreatePaginationLinks = function(newPageCount) {
+		pagination.pageCount = parseInt(newPageCount, 10);
+
+		var pagesToShow = [1];
+		if(pagination.pageCount !== 1) {
+			pagesToShow.push(pagination.pageCount);
+		}
+
+		var previous = pagination.currentPage - 1;
+		var next = pagination.currentPage + 1;
+
+		if(previous > 1 && pagesToShow.indexOf(previous) === -1) {
+			pagesToShow.push(previous);
+		}
+
+		if(next < pagination.pageCount && pagesToShow.indexOf(next) === -1) {
+			pagesToShow.push(next);
+		}
+
+		if(pagesToShow.indexOf(pagination.currentPage) === -1) {
+			pagesToShow.push(pagination.currentPage);
+		}
+
+		pagesToShow.sort(function(a, b) {
+			return parseInt(a, 10) - parseInt(b, 10);
+		});
+
+		var html = '';
+		for(var i=0; i<pagesToShow.length; ++i) {
+			if(i > 0) {
+				if (pagesToShow[i] - 1 !== pagesToShow[i-1]) {
+					html += '<li><a class="select_page" href="#">|</a></li>';
+				}
+			}
+			html += '<li class="page" data-page="' + pagesToShow[i] + '"><a href="#">' + pagesToShow[i] + '</a></li>';
+		}
+
+		$('.pagination li.page').remove();
+		$(html).insertAfter($('.pagination li.previous'));
+		updatePageLinks();
+	}
+
+	pagination.loadPage = function(page, callback) {
+		page = parseInt(page, 10);
+		if(!utils.isNumber(page) || page < 1 || page > pagination.pageCount) {
+			return false;
+		}
+
+		ajaxify.go(window.location.pathname.slice(1) + '?page=' + page);
+		return true;
+	}
+
+	function updatePageLinks() {
+		if(pagination.pageCount === 0) {
+			$('.pagination').addClass('hide');
+		} else {
+			$('.pagination').removeClass('hide');
+		}
+
+		$('.pagination .next').removeClass('disabled');
+		$('.pagination .previous').removeClass('disabled');
+
+		if(pagination.currentPage === 1) {
+			$('.pagination .previous').addClass('disabled');
+		}
+
+		if(pagination.currentPage === pagination.pageCount) {
+			$('.pagination .next').addClass('disabled');
+		}
+
+		$('.pagination .page').removeClass('active');
+		$('.pagination .page[data-page="' + pagination.currentPage + '"]').addClass('active');
+		$('.pagination .page').each(function(index, element) {
+			var li = $(this);
+			var page = li.attr('data-page');
+			li.find('a').attr('href', window.location.pathname + '?page=' + page);
+		});
+	}
+
+	return pagination;
+});

public/src/forum/recent.js

@@ -1,20 +1,16 @@
 define(function() {
 	var	Recent = {};
 
-	Recent.newTopicCount = 0;
-	Recent.newPostCount = 0;
-	Recent.loadingMoreTopics = false;
+	var newTopicCount = 0,
+		newPostCount = 0,
+		loadingMoreTopics = false;
 
 	var active = '';
 
 	Recent.init = function() {
 		app.enterRoom('recent_posts');
 
-		ajaxify.register_events([
-			'event:new_topic',
-			'event:new_post'
-		]);
-
+		Recent.watchForNewPosts();
 
 		function getActiveSection() {
 			var url = window.location.href,
@@ -37,27 +33,35 @@ define(function() {
 			$(this).addClass('hide');
 		});
 
-		socket.on('event:new_topic', function(data) {
 
-			++Recent.newTopicCount;
-			Recent.updateAlertText();
-
-		});
-
-		socket.on('event:new_post', function(data) {
-			++Recent.newPostCount;
-			Recent.updateAlertText();
-		});
-
-		$(window).off('scroll').on('scroll', function() {
-			var bottom = ($(document).height() - $(window).height()) * 0.9;
-
-			if ($(window).scrollTop() > bottom && !Recent.loadingMoreTopics) {
+		app.enableInfiniteLoading(function() {
+			if(!loadingMoreTopics) {
 				Recent.loadMoreTopics();
 			}
 		});
 	};
 
+	Recent.watchForNewPosts = function () {
+
+		newPostCount = 0;
+		newTopicCount = 0;
+
+		ajaxify.register_events([
+			'event:new_topic',
+			'event:new_post'
+		]);
+
+		socket.on('event:new_topic', function(data) {
+			++newTopicCount;
+			Recent.updateAlertText();
+		});
+
+		socket.on('event:new_post', function(data) {
+			++newPostCount;
+			Recent.updateAlertText();
+		});
+	}
+
 	Recent.updateAlertText = function() {
 		var text = 'There';
 
@@ -76,28 +80,11 @@ define(function() {
 		text += '. Click here to reload.';
 
 		$('#new-topics-alert').html(text).removeClass('hide').fadeIn('slow');
-	}
-
-	Recent.onTopicsLoaded = function(topics) {
-		var html = templates.prepare(templates['recent'].blocks['topics']).parse({
-			topics: topics
-		});
-
-		translator.translate(html, function(translatedHTML) {
-			var container = $('#topics-container');
-
-			$('#category-no-topics').remove();
-
-			html = $(translatedHTML);
-			container.append(html);
-			$('span.timeago').timeago();
-			app.createUserTooltips();
-			app.makeNumbersHumanReadable(html.find('.human-readable-number'));
-		});
+		$('#category-no-topics').addClass('hide');
 	}
 
 	Recent.loadMoreTopics = function() {
-		Recent.loadingMoreTopics = true;
+		loadingMoreTopics = true;
 		socket.emit('topics.loadMoreRecentTopics', {
 			after: $('#topics-container').children('li').length,
 			term: active
@@ -105,10 +92,29 @@ define(function() {
 			if(err) {
 				return app.alertError(err.message);
 			}
+
 			if (data.topics && data.topics.length) {
-				Recent.onTopicsLoaded(data.topics);
+				Recent.onTopicsLoaded('recent', data.topics);
 			}
-			Recent.loadingMoreTopics = false;
+
+			loadingMoreTopics = false;
+		});
+	}
+
+	Recent.onTopicsLoaded = function(template, topics) {
+		var html = templates.prepare(templates[template].blocks['topics']).parse({
+			topics: topics
+		});
+
+		translator.translate(html, function(translatedHTML) {
+
+			$('#category-no-topics').remove();
+
+			html = $(translatedHTML);
+			$('#topics-container').append(html);
+			$('span.timeago').timeago();
+			app.createUserTooltips();
+			app.makeNumbersHumanReadable(html.find('.human-readable-number'));
 		});
 	}
 

public/src/forum/topic.js

@@ -1,11 +1,11 @@
-define(['composer'], function(composer) {
+define(['composer', 'forum/pagination'], function(composer, pagination) {
 	var	Topic = {},
 		infiniteLoaderActive = false,
 		pagination;
 
 	function showBottomPostBar() {
-		if($('#post-container .post-row').length > 1) {
-			$('.topic-main-buttons').removeClass('hide').parent().removeClass('hide');
+		if($('#post-container .post-row').length > 1 || !$('#post-container li[data-index="0"]').length) {
+			$('.bottom-post-bar').removeClass('hide');
 		}
 	}
 
@@ -17,7 +17,11 @@ define(['composer'], function(composer) {
 				deleted: templates.get('deleted'),
 				pinned: templates.get('pinned')
 			},
-			topic_name = templates.get('topic_name');
+			topic_name = templates.get('topic_name'),
+			currentPage = parseInt(templates.get('currentPage'), 10),
+			pageCount = parseInt(templates.get('pageCount'), 10);
+
+		Topic.postCount = templates.get('postcount');
 
 
 		function fixDeleteStateForPosts() {
@@ -38,7 +42,8 @@ define(['composer'], function(composer) {
 
 			showBottomPostBar();
 
-			// Resetting thread state
+			updateHeader();
+
 			if (thread_state.locked === '1') set_locked_state(true);
 			if (thread_state.deleted === '1') set_delete_state(true);
 			if (thread_state.pinned === '1') set_pinned_state(true);
@@ -327,21 +332,6 @@ define(['composer'], function(composer) {
 				Topic.scrollToPost(parseInt(bookmark, 10));
 			}
 
-			$('#post-container').on('click', '.deleted', function(ev) {
-				$(this).toggleClass('deleted-expanded');
-			});
-
-			// Show the paginator block, now that the DOM has finished loading
-			(function delayedHeaderUpdate() {
-				if (!Topic.postCount) {
-					setTimeout(function() {
-						delayedHeaderUpdate();
-					}, 25);
-				} else {
-					updateHeader();
-				}
-			})();
-
 			$('#post-container').on('mouseenter', '.favourite-tooltip', function(e) {
 				if (!$(this).data('users-loaded')) {
 					$(this).data('users-loaded', "true");
@@ -355,15 +345,19 @@ define(['composer'], function(composer) {
 		});
 
 		function enableInfiniteLoading() {
-			$(window).off('scroll').on('scroll', function() {
-				var bottom = ($(document).height() - $(window).height()) * 0.9;
-
-				if ($(window).scrollTop() > bottom && !infiniteLoaderActive && $('#post-container').children().length) {
+			if(!config.usePagination) {
+				app.enableInfiniteLoading(function() {
+					if (!infiniteLoaderActive && $('#post-container').children().length) {
 						loadMorePosts(tid, function(posts) {
 							fixDeleteStateForPosts();
 						});
 					}
 				});
+			} else {
+				$('.pagination-block').addClass('hide');
+
+				pagination.init(currentPage, pageCount);
+			}
 		}
 
 		$('.topic').on('click', '.post_reply', function() {
@@ -380,7 +374,7 @@ define(['composer'], function(composer) {
 			var username = '',
 				post = $(this).parents('li[data-pid]');
 			if (post.length) {
-				username = '@' + post.attr('data-username') + ' ';
+				username = '@' + post.attr('data-username').replace(/\s/g, '-') + ' ';
 			}
 
 			if (thread_state.locked !== '1') {
@@ -395,12 +389,12 @@ define(['composer'], function(composer) {
 					pid = $(this).parents('.post-row').attr('data-pid');
 
 				if (post.length) {
-					username = '@' + post.attr('data-username');
+					username = '@' + post.attr('data-username').replace(/\s/g, '-');
 				}
 
 				socket.emit('posts.getRawPost', pid, function(err, post) {
 					if(err) {
-						return app.alert(err.message);
+						return app.alertError(err.message);
 					}
 					var quoted = '';
 					if(post) {
@@ -433,7 +427,7 @@ define(['composer'], function(composer) {
 			var pid = $(this).parents('.post-row').attr('data-pid');
 			$('#post_' + pid + '_link').val(window.location.href + "#" + pid);
 			// without the setTimeout can't select the text in the input
-			setTimeout(function(){
+			setTimeout(function() {
 				$('#post_' + pid + '_link').select();
 			}, 50);
 		});
@@ -641,6 +635,11 @@ define(['composer'], function(composer) {
 		});
 
 		socket.on('event:new_post', function(data) {
+			if(config.usePagination) {
+				onNewPostPagination(data);
+				return;
+			}
+
 			var posts = data.posts;
 			for (var p in posts) {
 				if (posts.hasOwnProperty(p)) {
@@ -894,55 +893,37 @@ define(['composer'], function(composer) {
 		}
 
 		function toggle_post_delete_state(pid) {
-			var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]'));
+			var postEl = $('#post-container li[data-pid="' + pid + '"]');
 
-			if (postEl[0]) {
-				quoteEl = postEl.find('.quote'),
-				favEl = postEl.find('.favourite'),
-				replyEl = postEl.find('.post_reply');
-
-				socket.emit('posts.getPrivileges', pid, function(err, privileges) {
-					if(err) {
-						return app.alert(err.message);
-					}
-
-					if (privileges.editable) {
-						if (!postEl.hasClass('deleted')) {
-							toggle_post_tools(pid, false);
-						} else {
-							toggle_post_tools(pid, true);
-						}
-					}
-
-					if (privileges.view_deleted) {
+			if (postEl.length) {
 				postEl.toggleClass('deleted');
-					} else {
-						postEl.toggleClass('none');
-					}
+
+				toggle_post_tools(pid, postEl.hasClass('deleted'));
+
 				updatePostCount();
-				});
 			}
 		}
 
-		function toggle_post_tools(pid, state) {
-			var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')),
+		function toggle_post_tools(pid, isDeleted) {
+			var postEl = $('#post-container li[data-pid="' + pid + '"]'),
 				quoteEl = $(postEl[0].querySelector('.quote')),
 				favEl = $(postEl[0].querySelector('.favourite')),
-				replyEl = $(postEl[0].querySelector('.post_reply'));
+				replyEl = $(postEl[0].querySelector('.post_reply')),
+				chatEl = $(postEl[0].querySelector('.chat'));
 
-			if (state) {
-				quoteEl.removeClass('none');
-				favEl.removeClass('none');
-				replyEl.removeClass('none');
-			} else {
+			if (isDeleted) {
 				quoteEl.addClass('none');
 				favEl.addClass('none');
 				replyEl.addClass('none');
+				chatEl.addClass('none');
+			} else {
+				quoteEl.removeClass('none');
+				favEl.removeClass('none');
+				replyEl.removeClass('none');
+				chatEl.removeClass('none');
 			}
 		}
 
-		Topic.postCount = templates.get('postcount');
-
 		window.onscroll = updateHeader;
 	};
 
@@ -969,6 +950,7 @@ define(['composer'], function(composer) {
 		var	progressBarContainer = $('.progress-container');
 		var tid = templates.get('topic_id');
 
+		if(pagination.parentNode)
 			pagination.parentNode.style.display = 'block';
 		progressBarContainer.css('display', '');
 
@@ -1019,6 +1001,22 @@ define(['composer'], function(composer) {
 			return;
 		}
 
+		if(config.usePagination) {
+			socket.emit('posts.getPidPage', pid, function(err, page) {
+				if(err) {
+					return;
+				}
+				if(parseInt(page, 10) !== pagination.currentPage) {
+					pagination.loadPage(page);
+				} else {
+					scrollToPid(pid);
+				}
+			});
+		} else {
+			scrollToPid(pid);
+		}
+
+		function scrollToPid(pid) {
 			var container = $(window),
 			scrollTo = $('#post_anchor_' + pid),
 			tid = $('#post-container').attr('data-tid');
@@ -1048,6 +1046,21 @@ define(['composer'], function(composer) {
 				animateScroll();
 			}
 		}
+	}
+
+	function onNewPostPagination(data) {
+		var posts = data.posts;
+		socket.emit('topics.getPageCount', templates.get('topic_id'), function(err, newPageCount) {
+
+			pagination.recreatePaginationLinks(newPageCount);
+
+			if(pagination.currentPage === pagination.pageCount) {
+				createNewPosts(data);
+			} else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) {
+				pagination.loadPage(pagination.pageCount);
+			}
+		});
+	}
 
 	function createNewPosts(data, infiniteLoaded) {
 		if(!data || (data.posts && !data.posts.length)) {
@@ -1063,6 +1076,7 @@ define(['composer'], function(composer) {
 		function findInsertionPoint() {
 			var after = null,
 				firstPid = data.posts[0].pid;
+
 			$('#post-container li[data-pid]').each(function() {
 				if(parseInt(firstPid, 10) > parseInt($(this).attr('data-pid'), 10)) {
 					after = $(this);
@@ -1083,11 +1097,7 @@ define(['composer'], function(composer) {
 
 		var insertAfter = findInsertionPoint();
 
-		var html = templates.prepare(templates['topic'].blocks['posts']).parse(data);
-		var regexp = new RegExp("<!--[\\s]*IF @first[\\s]*-->([\\s\\S]*?)<!--[\\s]*ENDIF @first[\\s]*-->", 'g');
-		html = html.replace(regexp, '');
-
-		translator.translate(html, function(translatedHTML) {
+		parseAndTranslatePosts(data, function(translatedHTML) {
 			var translated = $(translatedHTML);
 
 			if(!infiniteLoaded) {
@@ -1098,8 +1108,22 @@ define(['composer'], function(composer) {
 				.hide()
 				.fadeIn('slow');
 
-			for (var x = 0, numPosts = data.posts.length; x < numPosts; x++) {
-				socket.emit('posts.getPrivileges', data.posts[x].pid, function(err, privileges) {
+			onNewPostsLoaded(data.posts);
+		});
+	}
+
+	function parseAndTranslatePosts(data, callback) {
+		var html = templates.prepare(templates['topic'].blocks['posts']).parse(data);
+		var regexp = new RegExp("<!--[\\s]*IF @first[\\s]*-->([\\s\\S]*?)<!--[\\s]*ENDIF @first[\\s]*-->", 'g');
+		html = html.replace(regexp, '');
+
+		translator.translate(html, callback);
+	}
+
+
+	function onNewPostsLoaded(posts) {
+		for (var x = 0, numPosts = posts.length; x < numPosts; x++) {
+			socket.emit('posts.getPrivileges', posts[x].pid, function(err, privileges) {
 				if(err) {
 					return app.alertError(err.message);
 				}
@@ -1116,9 +1140,9 @@ define(['composer'], function(composer) {
 		$('.post-content img').addClass('img-responsive');
 		updatePostCount();
 		showBottomPostBar();
-		});
 	}
 
+
 	function toggle_mod_tools(pid, state) {
 		var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')),
 			editEl = postEl.find('.edit'),
@@ -1150,7 +1174,6 @@ define(['composer'], function(composer) {
 			return;
 		}
 
-
 		if (indicatorEl.attr('done') === '0') {
 			infiniteLoaderActive = true;
 			indicatorEl.fadeIn();

public/src/forum/unread.js

@@ -1,53 +1,15 @@
-define(function() {
+define(['forum/recent'], function(recent) {
 	var Unread = {},
 		loadingMoreTopics = false;
 
 	Unread.init = function() {
 		app.enterRoom('recent_posts');
 
-		ajaxify.register_events([
-			'event:new_topic',
-			'event:new_post',
-			'topics.markAllRead'
-		]);
-
-		var newTopicCount = 0,
-			newPostCount = 0;
-
 		$('#new-topics-alert').on('click', function() {
 			$(this).addClass('hide');
 		});
 
-		socket.on('event:new_topic', function(data) {
-			++newTopicCount;
-			updateAlertText();
-		});
-
-		function updateAlertText() {
-			var text = 'There';
-
-			if (newTopicCount > 1) {
-				text += ' are ' + newTopicCount + ' new topics';
-			} else if (newTopicCount === 1) {
-				text += ' is a new topic';
-			}
-
-			if (newPostCount > 1) {
-				text += (newTopicCount?' and ':' are ') + newPostCount + ' new posts';
-			} else if(newPostCount === 1) {
-				text += (newTopicCount?' and ':' is ') + ' a new post';
-			}
-
-			text += '. Click here to reload.';
-
-			$('#new-topics-alert').html(text).removeClass('hide').fadeIn('slow');
-			$('#category-no-topics').addClass('hidden');
-		}
-
-		socket.on('event:new_post', function(data) {
-			++newPostCount;
-			updateAlertText();
-		});
+		recent.watchForNewPosts();
 
 		$('#mark-allread-btn').on('click', function() {
 			var btn = $(this);
@@ -67,25 +29,20 @@ define(function() {
 			});
 		});
 
-		function onTopicsLoaded(topics) {
-
-			var html = templates.prepare(templates['unread'].blocks['topics']).parse({
-				topics: topics
-			});
-
-			translator.translate(html, function(translatedHTML) {
-				var container = $('#topics-container');
-
-				$('#category-no-topics').remove();
-
-				html = $(translatedHTML);
-				container.append(html);
-				$('span.timeago').timeago();
-				app.createUserTooltips();
-				app.makeNumbersHumanReadable(html.find('.human-readable-number'));
-			});
+		if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) {
+			$('#load-more-btn').show();
 		}
 
+		$('#load-more-btn').on('click', function() {
+			loadMoreTopics();
+		});
+
+		app.enableInfiniteLoading(function() {
+			if(!loadingMoreTopics) {
+				loadMoreTopics();
+			}
+		});
+
 		function loadMoreTopics() {
 			loadingMoreTopics = true;
 			socket.emit('topics.loadMoreUnreadTopics', {
@@ -96,7 +53,7 @@ define(function() {
 				}
 
 				if (data.topics && data.topics.length) {
-					onTopicsLoaded(data.topics);
+					recent.onTopicsLoaded('unread', data.topics);
 					$('#topics-container').attr('data-next-start', data.nextStart);
 				} else {
 					$('#load-more-btn').hide();
@@ -105,23 +62,6 @@ define(function() {
 				loadingMoreTopics = false;
 			});
 		}
-
-		$(window).off('scroll').on('scroll', function() {
-			var bottom = ($(document).height() - $(window).height()) * 0.9;
-
-			if ($(window).scrollTop() > bottom && !loadingMoreTopics) {
-				loadMoreTopics();
-			}
-		});
-
-
-		if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) {
-			$('#load-more-btn').show();
-		}
-
-		$('#load-more-btn').on('click', function() {
-			loadMoreTopics();
-		});
 	};
 
 	return Unread;

public/src/modules/composer.js

@@ -352,7 +352,7 @@ define(['taskbar'], function(taskbar) {
 		}
 
 		postContainer.css('visibility', 'visible')
-			.css('z-index', 1);
+			.css('z-index', 2);
 
 		$('body').css({'margin-bottom': postContainer.css('height')});
 

public/src/templates.js

@@ -79,7 +79,7 @@
 							template.prototype.parse = parse;
 							template.prototype.html = String(html);
 
-							global.templates[file] = new template;
+							templates[file] = new template;
 
 							loaded--;
 							if (loaded === 0) {
@@ -196,6 +196,7 @@
 			template_data = data;
 			parse_template();
 		}).fail(function (data, textStatus) {
+			jQuery('#content, #footer').stop(true, true).removeClass('ajaxifying');
 			if (data && data.status == 404) {
 				return ajaxify.go('404');
 			} else if (data && data.status === 403) {

public/templates/admin/settings.tpl

@@ -7,6 +7,7 @@
 	<li><a href="#email" data-toggle="tab">Email</a></li>
 	<li><a href="#user" data-toggle="tab">User</a></li>
 	<li><a href="#post" data-toggle="tab">Post</a></li>
+	<li><a href="#pagination" data-toggle="tab">Pagination</a></li>
 	<li><a href="#web-crawler" data-toggle="tab">Web Crawler</a></li>
 </ul>
 
@@ -133,6 +134,21 @@
 		</form>
 	</div>
 
+	<div class="tab-pane" id="pagination">
+		<form>
+			<div class="alert alert-warning">
+				<div class="checkbox">
+					<label>
+						<input type="checkbox" data-field="usePagination"> <strong>Paginate topics and posts instead of using infinite scroll.</strong>
+					</label>
+				</div>
+
+				<strong>Topics per Page</strong><br /> <input type="text" class="form-control" value="20" data-field="topicsPerPage"><br />
+				<strong>Posts per Page</strong><br /> <input type="text" class="form-control" value="20" data-field="postsPerPage"><br />
+			</div>
+		</form>
+	</div>
+
 	<div class="tab-pane" id="web-crawler">
 		<form>
 			<div class="alert alert-warning">

public/templates/category.tpl

@@ -84,7 +84,16 @@
 			</li>
 			<!-- END topics -->
 		</ul>
+		<!-- IF usePagination -->
+		<div class="text-center">
+			<ul class="pagination">
+				<li class="previous pull-left"><a href="#"><i class="fa fa-chevron-left"></i> [[global:previouspage]]</a></li>
+				<li class="next pull-right"><a href="#">[[global:nextpage]] <i class="fa fa-chevron-right"></i></a></li>
+			</ul>
 		</div>
+		<!-- ENDIF usePagination -->
+	</div>
+
 	<div class="col-md-3 col-xs-12 {show_sidebar} category-sidebar">
 		<div class="panel panel-default">
 			<div class="panel-heading">[[category:sidebar.recent_replies]]</div>
@@ -122,3 +131,5 @@
 
 <input type="hidden" template-variable="category_id" value="{category_id}" />
 <input type="hidden" template-variable="category_name" value="{category_name}" />
+<input type="hidden" template-variable="currentPage" value="{currentPage}" />
+<input type="hidden" template-variable="pageCount" value="{pageCount}" />

public/templates/login.tpl

@@ -41,7 +41,10 @@
 				<div class="form-group">
 					<div class="col-lg-offset-2 col-lg-10">
 						<hr />
-						<button class="btn btn-primary btn-lg btn-block"  id="login" type="submit">[[login:login]]</button> &nbsp; <a id="reset-link" class="hide" href="{relative_path}/reset">[[login:forgot_password]]</a>
+						<button class="btn btn-primary btn-lg btn-block"  id="login" type="submit">[[login:login]]</button>
+						<!-- IF showResetLink -->
+						&nbsp; <a id="reset-link" href="{relative_path}/reset">[[login:forgot_password]]</a>
+						<!-- ENDIF showResetLink -->
 					</div>
 				</div>
 				<input type="hidden" name="_csrf" value="{token}" id="csrf-token" />

public/templates/topic.tpl

@@ -1,5 +1,7 @@
 <input type="hidden" template-variable="expose_tools" value="{expose_tools}" />
 <input type="hidden" template-variable="topic_id" value="{topic_id}" />
+<input type="hidden" template-variable="currentPage" value="{currentPage}" />
+<input type="hidden" template-variable="pageCount" value="{pageCount}" />
 <input type="hidden" template-variable="locked" value="{locked}" />
 <input type="hidden" template-variable="deleted" value="{deleted}" />
 <input type="hidden" template-variable="pinned" value="{pinned}" />
@@ -141,7 +143,7 @@
 			</li>
 
 			<!-- IF @first -->
-			<li class="well post-bar">
+			<li class="well post-bar" data-index="{posts.index}">
 				<div class="inline-block">
 					<small class="topic-stats">
 						<span>[[category:posts]]</span>
@@ -176,15 +178,15 @@
 		<!-- END posts -->
 	</ul>
 
-	<div class="well col-md-11 col-xs-12 pull-right hide">
-		<div class="topic-main-buttons pull-right inline-block hide">
+	<div class="well col-md-11 col-xs-12 pull-right post-bar bottom-post-bar hide">
+		<div class="topic-main-buttons pull-right inline-block">
 			<div class="loading-indicator" done="0" style="display:none;">
 				<span class="hidden-xs-inline">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
 			</div>
 			<!-- IF privileges.write -->
 			<button class="btn btn-primary post_reply" type="button">[[topic:reply]]</button>
 			<!-- ENDIF privileges.write -->
-			<div class="btn-group thread-tools hide">
+			<div class="btn-group thread-tools hide dropup">
 				<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[topic:thread_tools.title]] <span class="caret"></span></button>
 				<ul class="dropdown-menu pull-right">
 					<li><a href="#" class="markAsUnreadForAll"><i class="fa fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]</a></li>
@@ -201,6 +203,15 @@
 		<div style="clear:both;"></div>
 	</div>
 
+	<!-- IF usePagination -->
+	<div class="text-center">
+		<ul class="pagination">
+			<li class="previous pull-left"><a href="#"><i class="fa fa-chevron-left"></i> [[global:previouspage]]</a></li>
+			<li class="next pull-right"><a href="#">[[global:nextpage]] <i class="fa fa-chevron-right"></i></a></li>
+		</ul>
+	</div>
+	<!-- ENDIF usePagination -->
+
 	<div id="move_thread_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Move Topic" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">

src/categories.js

@@ -5,6 +5,7 @@ var db = require('./database.js'),
 	topics = require('./topics.js'),
 	plugins = require('./plugins'),
 	CategoryTools = require('./categoryTools'),
+	meta = require('./meta'),
 
 	async = require('async'),
 	winston = require('winston'),
@@ -45,14 +46,14 @@ var db = require('./database.js'),
 		});
 	};
 
-	Categories.getCategoryById = function(category_id, current_user, callback) {
+	Categories.getCategoryById = function(category_id, start, end, current_user, callback) {
 		Categories.getCategoryData(category_id, function(err, categoryData) {
 			if (err) {
 				return callback(err);
 			}
 
 			function getTopicIds(next) {
-				Categories.getTopicIds(category_id, 0, 19, next);
+				Categories.getTopicIds(category_id, start, end, next);
 			}
 
 			function getActiveUsers(next) {
@@ -65,10 +66,15 @@ var db = require('./database.js'),
 				});
 			}
 
-			async.parallel([getTopicIds, getActiveUsers, getSidebars], function(err, results) {
+			function getPageCount(next) {
+				Categories.getPageCount(category_id, next);
+			}
+
+			async.parallel([getTopicIds, getActiveUsers, getSidebars, getPageCount], function(err, results) {
 				var tids = results[0],
 					active_users = results[1],
-					sidebars = results[2];
+					sidebars = results[2],
+					pageCount = results[3];
 
 				var category = {
 					'category_name': categoryData.name,
@@ -82,6 +88,7 @@ var db = require('./database.js'),
 					'category_id': category_id,
 					'active_users': [],
 					'topics': [],
+					'pageCount': pageCount,
 					'disableSocialButtons': meta.config.disableSocialButtons !== undefined ? parseInt(meta.config.disableSocialButtons, 10) !== 0 : false,
 					'sidebars': sidebars
 				};
@@ -137,6 +144,18 @@ var db = require('./database.js'),
 		db.getSortedSetRevRange('categories:' + cid + ':tid', start, stop, callback);
 	};
 
+	Categories.getPageCount = function(cid, callback) {
+		db.sortedSetCard('categories:' + cid + ':tid', function(err, topicCount) {
+			if(err) {
+				return callback(err);
+			}
+
+			var topicsPerPage = parseInt(meta.config.topicsPerPage, 10);
+			topicsPerPage = topicsPerPage ? topicsPerPage : 20;
+
+			callback(null, Math.ceil(parseInt(topicCount, 10) / topicsPerPage));
+		});
+	};
 
 	Categories.getAllCategories = function(current_user, callback) {
 		db.getListRange('categories:cid', 0, -1, function(err, cids) {

src/database/mongo.js

@@ -626,6 +626,19 @@
 		});
 	}
 
+	module.sortedSetCard = function(key, callback) {
+		db.collection('objects').count({_key:key}, function(err, count) {
+			if(err) {
+				return callback(err);
+			}
+
+			if(!count) {
+				return callback(null, 0);
+			}
+			callback(null, count);
+		});
+	}
+
 	module.sortedSetRank = function(key, value, callback) {
 		if(value !== null && value !== undefined) {
 			value = value.toString();

src/database/redis.js

@@ -374,6 +374,10 @@
 		redisClient.zcount(key, min, max, callback);
 	}
 
+	module.sortedSetCard = function(key, callback) {
+		redisClient.zcard(key, callback);
+	}
+
 	module.sortedSetRank = function(key, value, callback) {
 		redisClient.zrank(key, value, callback);
 	}

src/emailer.js

@@ -1,16 +1,18 @@
-var	User = require('./user'),
+var	fs = require('fs'),
+	async = require('async'),
+	path = require('path'),
+
+	User = require('./user'),
 	Plugins = require('./plugins'),
 	Meta = require('./meta'),
 	Translator = require('../public/src/translator'),
-
-	fs = require('fs'),
-	async = require('async'),
-	path = require('path'),
+	templates = require('../public/src/templates'),
 
 	Emailer = {};
 
 var	render = function(template, params, callback) {
-	if (templates[template] !== null) {
+
+	if (templates[template]) {
 		Translator.translate(templates[template].parse(params), function(template) {
 			callback(null, template);
 		});

src/feed.js

@@ -84,7 +84,7 @@
 	};
 
 	Feed.updateCategory = function (cid, callback) {
-		categories.getCategoryById(cid, 0, function (err, categoryData) {
+		categories.getCategoryById(cid, 0, -1, 0, function (err, categoryData) {
 			if (err) return callback(new Error('category-invalid'));
 
 			var feed = new rss({

src/messaging.js

@@ -1,7 +1,7 @@
 var db = require('./database'),
 	async = require('async'),
 	user = require('./user'),
-    plugins = require('./plugins');
+	plugins = require('./plugins'),
 	meta = require('./meta');
 
 

src/plugins.js

@@ -202,6 +202,10 @@ var fs = require('fs'),
 		} else return;
 	};
 
+	Plugins.hasListeners = function(hook) {
+		return (Plugins.loadedHooks[hook] && Plugins.loadedHooks[hook].length > 0);
+	};
+
 	Plugins.fireHook = function(hook, args, callback) {
 		hookList = Plugins.loadedHooks[hook];
 

src/posts.js

@@ -194,7 +194,7 @@ var db = require('./database'),
 				post.user_rep = userData.reputation || 0;
 				post.user_postcount = userData.postcount || 0;
 				post.user_banned = parseInt(userData.banned, 10) === 1;
-				post.picture = userData.picture || gravatar.url('', {}, https = nconf.get('https'));
+				post.picture = userData.picture || gravatar.url('', {}, true);
 
 				if(meta.config.disableSignatures === undefined || parseInt(meta.config.disableSignatures, 10) === 0) {
 					post.signature = signature;
@@ -468,4 +468,28 @@ var db = require('./database'),
 		});
 	}
 
+	Posts.getPidPage = function(pid, callback) {
+		Posts.getPostField(pid, 'tid', function(err, tid) {
+			if(err) {
+				return callback(err);
+			}
+
+			topics.getPids(tid, function(err, pids) {
+				if(err) {
+					return callback(err);
+				}
+
+				var index = pids.indexOf(pid);
+				if(index === -1) {
+					return callback(new Error('pid not found'));
+				}
+				var postsPerPage = parseInt(meta.config.postsPerPage, 10);
+				postsPerPage = postsPerPage ? postsPerPage : 20;
+
+				var page = Math.ceil((index + 1) / postsPerPage);
+				callback(null, page);
+			});
+		});
+	}
+
 }(exports));

src/routes/admin.js

@@ -7,13 +7,14 @@ var nconf = require('nconf'),
 	user = require('./../user'),
 	groups = require('../groups'),
 	topics = require('./../topics'),
-	pkg = require('./../../package.json'),
+	pkg = require('./../../package'),
 	categories = require('./../categories'),
 	meta = require('../meta'),
 	plugins = require('../plugins'),
 	Languages = require('../languages'),
 	events = require('./../events'),
-	utils = require('./../../public/src/utils.js');
+	utils = require('./../../public/src/utils'),
+	templates = require('./../../public/src/templates');
 
 (function (Admin) {
 	Admin.isAdmin = function (req, res, next) {

src/routes/api.js

@@ -11,10 +11,11 @@ var path = require('path'),
 	posts = require('../posts'),
 	categories = require('../categories'),
 	categoryTools = require('../categoryTools')
+	meta = require('../meta'),
+	Plugins = require('../plugins'),
 	utils = require('../../public/src/utils'),
 	translator = require('../../public/src/translator'),
-	pkg = require('../../package.json'),
-	meta = require('../meta');
+	pkg = require('../../package.json');
 
 
 (function (Api) {
@@ -42,8 +43,10 @@ var path = require('path'),
 				config.useOutgoingLinksPage = parseInt(meta.config.useOutgoingLinksPage, 10) === 1;
 				config.allowGuestPosting = parseInt(meta.config.allowGuestPosting, 10) === 1;
 				config.allowFileUploads = parseInt(meta.config.allowFileUploads, 10) === 1;
+				config.usePagination = parseInt(meta.config.usePagination, 10) === 1;
+				config.topicsPerPage = meta.config.topicsPerPage || 20;
+				config.postsPerPage = meta.config.postsPerPage || 20;
 				config.maximumFileSize = meta.config.maximumFileSize;
-				config.emailSetup = !!meta.config['email:from'];
 				config.defaultLang = meta.config.defaultLang || 'en';
 
 				res.json(200, config);
@@ -113,7 +116,8 @@ var path = require('path'),
 			app.get('/login', function (req, res) {
 				var data = {},
 					login_strategies = auth.get_login_strategies(),
-					num_strategies = login_strategies.length;
+					num_strategies = login_strategies.length,
+					emailersPresent = Plugins.hasListeners('action:email.send');
 
 				if (num_strategies == 0) {
 					data = {
@@ -128,8 +132,8 @@ var path = require('path'),
 				}
 
 				data.authentication = login_strategies;
-
 				data.token = res.locals.csrf_token;
+				data.showResetLink = emailersPresent;
 
 				res.json(data);
 			});
@@ -161,12 +165,33 @@ var path = require('path'),
 			});
 
 			app.get('/topic/:id/:slug?', function (req, res, next) {
+
 				var uid = (req.user) ? req.user.uid : 0;
+				var page = 1;
+				if(req.query && req.query.page) {
+					page = req.query.page;
+				}
+
+				if(!utils.isNumber(page) || parseInt(page, 10) < 1) {
+					return res.send(404);
+				}
+
+				var postsPerPage = parseInt(meta.config.postsPerPage ? meta.config.postsPerPage : 20, 10);
+				var start = (page - 1) * postsPerPage;
+				var end = start + postsPerPage - 1;
+
 				ThreadTools.privileges(req.params.id, uid, function(err, privileges) {
 					if (privileges.read) {
-						topics.getTopicWithPosts(req.params.id, uid, 0, 10, false, function (err, data) {
-							if (!err) {
-								// Send in privilege data as well
+						topics.getTopicWithPosts(req.params.id, uid, start, end, false, function (err, data) {
+							if(err) {
+								return next(err);
+							}
+
+							if(page > data.pageCount) {
+								return res.send(404);
+							}
+
+							data.currentPage = page;
 							data.privileges = privileges;
 
 							if (parseInt(data.deleted, 10) === 1 && parseInt(data.expose_tools, 10) === 0) {
@@ -174,7 +199,6 @@ var path = require('path'),
 							}
 
 							res.json(data);
-							} else next();
 						});
 					} else {
 						res.send(403);
@@ -184,16 +208,28 @@ var path = require('path'),
 
 			app.get('/category/:id/:slug?', function (req, res, next) {
 				var uid = (req.user) ? req.user.uid : 0;
+				var page = 1;
+				if(req.query && req.query.page) {
+					page = req.query.page;
+				}
+
+				if(!utils.isNumber(page) || parseInt(page, 10) < 1) {
+					return res.send(404);
+				}
+
+				var topicsPerPage = parseInt(meta.config.topicsPerPage ? meta.config.topicsPerPage : 20, 10);
+				var start = (page - 1) * topicsPerPage;
+				var end = start + topicsPerPage - 1;
 
 				// Category Whitelisting
 				categoryTools.privileges(req.params.id, uid, function(err, privileges) {
 					if (!err && privileges.read) {
-						categories.getCategoryById(req.params.id, uid, function (err, data) {
+						categories.getCategoryById(req.params.id, start, end, uid, function (err, data) {
 							if(err) {
 								return next(err);
 							}
 
-							// Add privilege data to template data
+							data.currentPage = page;
 							data.privileges = privileges;
 
 							if (data && parseInt(data.disabled, 10) === 0) {

src/routes/debug.js

@@ -74,7 +74,13 @@ var	DebugRoute = function(app) {
 		});
 
 		app.get('/test', function(req, res) {
-			res.send();
+
+			/*topics.getTopicPosts2(2, 0, 10, 5, function(err, data) {
+				res.json(data);
+			})*/
+			topics.getTopicWithPosts(2, 1, 0, -1, true, function (err, topicData) {
+				res.json(topicData);
+			});
 		});
 
 	});

src/routes/user.js

@@ -8,6 +8,7 @@ var fs = require('fs'),
 	posts = require('./../posts'),
 	postTools = require('../postTools'),
 	utils = require('./../../public/src/utils'),
+	templates = require('./../../public/src/templates'),
 	meta = require('./../meta'),
 	db = require('./../database');
 

src/socket.io/categories.js

@@ -1,4 +1,5 @@
 var	categories = require('../categories'),
+	meta = require('./../meta'),
 
 	SocketCategories = {};
 
@@ -15,8 +16,10 @@ SocketCategories.loadMore = function(socket, data, callback) {
 		return callback(new Error('invalid data'));
 	}
 
+	var topicsPerPage = parseInt(meta.config.topicsPerPage, 10) || 20;
+
 	var start = data.after,
-		end = start + 9;
+		end = start + topicsPerPage - 1;
 
 	categories.getCategoryTopics(data.cid, start, end, socket.uid, function(err, topics) {
 		callback(err, {
@@ -25,4 +28,8 @@ SocketCategories.loadMore = function(socket, data, callback) {
 	});
 };
 
+SocketCategories.getPageCount = function(socket, cid, callback) {
+	categories.getPageCount(cid, callback);
+}
+
 module.exports = SocketCategories;

src/socket.io/index.js

@@ -30,9 +30,9 @@ Sockets.userSockets = {};
 Sockets.rooms = {};
 
 
-Sockets.init = function() {
+Sockets.init = function(server) {
 
-	io = socketioWildcard(SocketIO).listen(global.server, {
+	io = socketioWildcard(SocketIO).listen(server, {
 		log: false,
 		transports: ['websocket', 'xhr-polling', 'jsonp-polling', 'flashsocket'],
 		'browser client minification': true

src/socket.io/meta.js

@@ -58,7 +58,7 @@ SocketMeta.updateHeader = function(socket, data, callback) {
 			email: '',
 			picture: gravatar.url('', {
 				s: '24'
-			}, nconf.get('https')),
+			}, true),
 			config: {
 				allowGuestSearching: meta.config.allowGuestSearching
 			}

src/socket.io/posts.js

@@ -93,7 +93,17 @@ SocketPosts.uploadFile = function(socket, data, callback) {
 };
 
 SocketPosts.getRawPost = function(socket, pid, callback) {
-	posts.getPostField(pid, 'content', callback);
+	posts.getPostFields(pid, ['content', 'deleted'], function(err, data) {
+		if(err) {
+			return callback(err);
+		}
+
+		if(data.deleted === '1') {
+			return callback(new Error('This post no longer exists'));
+		}
+
+		callback(null, data.content);
+	});
 };
 
 SocketPosts.edit = function(socket, data, callback) {
@@ -194,4 +204,8 @@ SocketPosts.getFavouritedUsers = function(socket, pid, callback) {
 	});
 };
 
+SocketPosts.getPidPage = function(socket, pid, callback) {
+	posts.getPidPage(pid, callback);
+}
+
 module.exports = SocketPosts;

src/socket.io/topics.js

@@ -1,6 +1,9 @@
 var topics = require('../topics'),
 	threadTools = require('../threadTools'),
 	index = require('./index'),
+
+	async = require('async'),
+
 	SocketTopics = {};
 
 SocketTopics.post = function(socket, data, callback) {
@@ -230,11 +233,21 @@ SocketTopics.loadMore = function(socket, data, callback) {
 		return callback(new Error('invalid data'));
 	}
 
-	var start = data.after,
-		end = start + 9;
+	var postsPerPage = parseInt(meta.config.postsPerPage, 10);
+	postsPerPage = postsPerPage ? postsPerPage : 20;
 
-	topics.getTopicPosts(data.tid, start, end, socket.uid, function(err, posts) {
-		callback(err, {posts: posts});
+	var start = data.after,
+		end = start + postsPerPage - 1;
+
+	async.parallel({
+		posts: function(next) {
+			topics.getTopicPosts(data.tid, start, end, socket.uid, next);
+		},
+		privileges: function(next) {
+			threadTools.privileges(data.tid, socket.uid, next);
+		}
+	}, function(err, results) {
+		callback(err, results);
 	});
 };
 
@@ -256,4 +269,8 @@ SocketTopics.loadMoreUnreadTopics = function(socket, data, callback) {
 	topics.getUnreadTopics(socket.uid, start, end, callback);
 };
 
+SocketTopics.getPageCount = function(socket, tid, callback) {
+	topics.getPageCount(tid, callback);
+}
+
 module.exports = SocketTopics;

src/threadTools.js

@@ -187,9 +187,20 @@ var winston = require('winston'),
 
 	ThreadTools.move = function(tid, cid, callback) {
 		topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) {
+			if(err) {
+				return callback(err);
+			}
+
 			var oldCid = topicData.cid;
+			if(!oldCid) {
+				return callback(new Error('invalid-topic'));
+			}
 
 			db.sortedSetRemove('categories:' + oldCid + ':tid', tid, function(err, result) {
+				if(err) {
+					return callback(err);
+				}
+
 				db.sortedSetAdd('categories:' + cid + ':tid', topicData.lastposttime, tid, function(err, result) {
 
 					if(err) {

src/topics.js

@@ -330,10 +330,6 @@ var async = require('async'),
 				postData[i].index = start + i;
 			}
 
-			postData = postData.filter(function(post) {
-				return parseInt(current_user, 10) !== 0 || parseInt(post.deleted, 10) === 0;
-			});
-
 			pids = postData.map(function(post) {
 				return post.pid;
 			});
@@ -386,6 +382,9 @@ var async = require('async'),
 					postData[i].favourited = fav_data[pid];
 					postData[i].display_moderator_tools = (current_user != 0) && privileges[pid].editable;
 					postData[i].display_move_tools = privileges[pid].move ? '' : 'hidden';
+					if(parseInt(postData[i].deleted, 10) === 1 && !privileges[pid].view_deleted) {
+						postData[i].content = 'This post is deleted!';
+					}
 				}
 
 				callback(null, postData);
@@ -393,6 +392,19 @@ var async = require('async'),
 		});
 	}
 
+	Topics.getPageCount = function(tid, callback) {
+		db.sortedSetCard('tid:' + tid + ':posts', function(err, postCount) {
+			if(err) {
+				return callback(err);
+			}
+
+			var postsPerPage = parseInt(meta.config.postsPerPage, 10);
+			postsPerPage = postsPerPage ? postsPerPage : 20;
+
+			callback(null, Math.ceil(parseInt(postCount, 10) / postsPerPage));
+		});
+	}
+
 	Topics.getCategoryData = function(tid, callback) {
 		Topics.getTopicField(tid, 'cid', function(err, cid) {
 			if(err) {
@@ -713,14 +725,14 @@ var async = require('async'),
 					topicData.unreplied = parseInt(topicData.postcount, 10) === 1;
 					topicData.username = topicInfo.username || 'anonymous';
 					topicData.userslug = topicInfo.userslug || '';
-					topicData.picture = topicInfo.picture || gravatar.url('', {}, https = nconf.get('https'));
+					topicData.picture = topicInfo.picture || gravatar.url('', {}, true);
 					topicData.categoryIcon = topicInfo.categoryData.icon;
 					topicData.categoryName = topicInfo.categoryData.name;
 					topicData.categorySlug = topicInfo.categoryData.slug;
 					topicData.badgeclass = (topicInfo.hasread && parseInt(current_user, 10) !== 0) ? '' : 'badge-important';
 					topicData.teaser_username = topicInfo.teaserInfo.username || '';
 					topicData.teaser_userslug = topicInfo.teaserInfo.userslug || '';
-					topicData.teaser_userpicture = topicInfo.teaserInfo.picture || gravatar.url('', {}, https = nconf.get('https'));
+					topicData.teaser_userpicture = topicInfo.teaserInfo.picture || gravatar.url('', {}, true);
 					topicData.teaser_pid = topicInfo.teaserInfo.pid;
 					topicData.teaser_timestamp = utils.toISOString(topicInfo.teaserInfo.timestamp);
 
@@ -755,21 +767,25 @@ var async = require('async'),
 
 			function getTopicData(next) {
 				Topics.getTopicData(tid, next);
-			};
+			}
 
 			function getTopicPosts(next) {
 				Topics.getTopicPosts(tid, start, end, current_user, next);
-			};
+			}
 
 			function getPrivileges(next) {
 				threadTools.privileges(tid, current_user, next);
-			};
+			}
 
 			function getCategoryData(next) {
 				Topics.getCategoryData(tid, next);
-			};
+			}
 
-			async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData], function(err, results) {
+			function getPageCount(next) {
+				Topics.getPageCount(tid, next);
+			}
+
+			async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData, getPageCount], function(err, results) {
 				if (err) {
 					winston.error('[Topics.getTopicWithPosts] Could not retrieve topic data: ', err.message);
 					return callback(err, null);
@@ -778,7 +794,11 @@ var async = require('async'),
 				var topicData = results[0],
 					topicPosts = results[1],
 					privileges = results[2],
-					categoryData = results[3];
+					categoryData = results[3],
+					pageCount = results[4];
+
+				var postsPerPage = parseInt(meta.config.postsPerPage, 10);
+				postsPerPage = postsPerPage ? postsPerPage : 20;
 
 				callback(null, {
 					'topic_name': topicData.title,
@@ -791,6 +811,7 @@ var async = require('async'),
 					'slug': topicData.slug,
 					'postcount': topicData.postcount,
 					'viewcount': topicData.viewcount,
+					'pageCount': pageCount,
 					'unreplied': parseInt(topicData.postcount, 10) > 1,
 					'topic_id': tid,
 					'expose_tools': privileges.editable ? 1 : 0,
@@ -1018,7 +1039,7 @@ var async = require('async'),
 						pid: postData.pid,
 						username: userData.username || 'anonymous',
 						userslug: userData.userslug,
-						picture: userData.picture || gravatar.url('', {}, https = nconf.get('https')),
+						picture: userData.picture || gravatar.url('', {}, true),
 						timestamp: postData.timestamp
 					});
 				});

src/upgrade.js

@@ -17,7 +17,7 @@ var db = require('./database'),
 
 Upgrade.check = function(callback) {
 	// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema
-	var	latestSchema = new Date(2014, 0, 23, 16, 5).getTime();
+	var	latestSchema = new Date(2014, 0, 25, 0, 0).getTime();
 
 	db.get('schemaDate', function(err, value) {
 		if (parseInt(value, 10) >= latestSchema) {
@@ -318,11 +318,46 @@ Upgrade.upgrade = function(callback) {
 						winston.info('[2014/1/23] Updating Administrators Group');
 						next();
 					});
-				})
+				});
 			} else {
 				winston.info('[2014/1/23] Updating Administrators Group -- skipped');
 				next();
 			}
+		},
+		function(next) {
+			thisSchemaDate = new Date(2014, 0, 25, 0, 0).getTime();
+			if (schemaDate < thisSchemaDate) {
+				updatesMade = true;
+
+				db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) {
+					if(err) {
+						return next(err);
+					}
+
+					if(!uids || !uids.length) {
+						winston.info('[2014/1/25] Updating User Gravatars to HTTPS  -- skipped');
+						return next();
+					}
+
+					var gravatar = require('gravatar');
+
+					function updateGravatar(uid, next) {
+						User.getUserFields(uid, ['email', 'picture', 'gravatarpicture'], function(err, userData) {
+							var gravatarPicture = User.createGravatarURLFromEmail(userData.email);
+							if(userData.picture === userData.gravatarpicture) {
+								User.setUserField(uid, 'picture', gravatarPicture);
+							}
+							User.setUserField(uid, 'gravatarpicture', gravatarPicture, next);
+						});
+					}
+
+					winston.info('[2014/1/25] Updating User Gravatars to HTTPS');
+					async.each(uids, updateGravatar, next);
+				});
+			} else {
+				winston.info('[2014/1/25] Updating User Gravatars to HTTPS -- skipped');
+				next();
+			}
 		}
 		// Add new schema updates here
 		// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 17!!!

src/user.js

@@ -442,15 +442,14 @@ var bcrypt = require('bcrypt'),
 			size: '128',
 			default: 'identicon',
 			rating: 'pg'
-		},
-		https = nconf.get('https');
+		};
 
 		if (!email) {
 			email = '';
 			options.forcedefault = 'y';
 		}
 
-		return gravatar.url(email, options, https);
+		return gravatar.url(email, options, true);
 	};
 
 	User.hashPassword = function(password, callback) {
@@ -490,13 +489,13 @@ var bcrypt = require('bcrypt'),
 
 	User.search = function(query, callback) {
 		if (!query || query.length === 0) {
-			return callback(null, []);
+			return callback(null, {timing:0, users:[]});
 		}
 		var start = process.hrtime();
 
 		db.getObject('username:uid', function(err, usernamesHash) {
 			if (err) {
-				return callback(null, []);
+				return callback(null, {timing: 0, users:[]});
 			}
 
 			query = query.toLowerCase();
@@ -516,7 +515,9 @@ var bcrypt = require('bcrypt'),
 			});
 
 			User.getDataForUsers(results, function(userdata) {
-				callback(null, userdata);
+				var diff = process.hrtime(start);
+				var timing = (diff[0] * 1e3 + diff[1] / 1e6).toFixed(1);
+				callback(null, {timing: timing, users: userdata});
 			});
 		});
 	};
@@ -885,6 +886,10 @@ var bcrypt = require('bcrypt'),
 
 	User.email = {
 		verify: function(uid, email) {
+			if (!plugins.hasListeners('action:email.send')) {
+				return;
+			}
+
 			var confirm_code = utils.generateUUID(),
 				confirm_link = nconf.get('url') + '/confirm/' + confirm_code;
 

src/webserver.js

@@ -9,6 +9,7 @@ var path = require('path'),
 	validator = require('validator'),
 	async = require('async'),
 	S = require('string'),
+	qs = require('querystring'),
 
 	pkg = require('../package.json'),
 
@@ -28,7 +29,9 @@ var path = require('path'),
 	meta = require('./meta'),
 	feed = require('./feed'),
 	plugins = require('./plugins'),
-	logger = require('./logger');
+	logger = require('./logger'),
+	templates = require('./../public/src/templates'),
+	translator = require('./../public/src/translator');
 
 if(nconf.get('ssl')) {
 	server = require('https').createServer({
@@ -39,13 +42,12 @@ if(nconf.get('ssl')) {
 	server = require('http').createServer(WebServer);
 }
 
+module.exports.server = server;
 
 (function (app) {
 	"use strict";
 
-	var templates = null,
-		clientScripts;
-
+	var	clientScripts;
 
 	plugins.ready(function() {
 		// Minify client-side libraries
@@ -60,9 +62,6 @@ if(nconf.get('ssl')) {
 		});
 	});
 
-
-	server.app = app;
-
 	/**
 	 *	`options` object	requires:	req, res
 	 *						accepts:	metaTags, linkTags
@@ -200,7 +199,6 @@ if(nconf.get('ssl')) {
 
 				// Local vars, other assorted setup
 				app.use(function (req, res, next) {
-					nconf.set('https', req.secure);
 					res.locals.csrf_token = req.session._csrf;
 
 					// Disable framing
@@ -376,8 +374,6 @@ if(nconf.get('ssl')) {
 	});
 
 	module.exports.init = function () {
-		templates = global.templates;
-
 		// translate all static templates served by webserver here. ex. footer, logout
 		plugins.fireHook('filter:footer.build', '', function(err, appendHTML) {
 			var footer = templates.footer.parse({
@@ -649,6 +645,10 @@ if(nconf.get('ssl')) {
 				}
 
 				var topic_url = tid + (req.params.slug ? '/' + req.params.slug : '');
+				var queryString = qs.stringify(req.query);
+				if(queryString.length) {
+					topic_url += '?' + queryString;
+				}
 
 				res.send(
 					data.header +
@@ -706,7 +706,7 @@ if(nconf.get('ssl')) {
 					});
 				},
 				function (next) {
-					categories.getCategoryById(cid, 0, function (err, categoryData) {
+					categories.getCategoryById(cid, 0, -1, 0, function (err, categoryData) {
 
 						if (categoryData) {
 							if (parseInt(categoryData.disabled, 10) === 1) {
@@ -763,6 +763,10 @@ if(nconf.get('ssl')) {
 				}
 
 				var category_url = cid + (req.params.slug ? '/' + req.params.slug : '');
+				var queryString = qs.stringify(req.query);
+				if(queryString.length) {
+					category_url += '?' + queryString;
+				}
 
 				res.send(
 					data.header +
@@ -932,6 +936,3 @@ if(nconf.get('ssl')) {
 
 	});
 }(WebServer));
-
-
-global.server = server;

tests/categories.js

@@ -31,7 +31,7 @@ describe('Categories', function() {
 
 	describe('.getCategoryById', function() {
 		it('should retrieve a newly created category by its ID', function(done) {
-			Categories.getCategoryById(categoryObj.cid, 0, function(err, categoryData) {
+			Categories.getCategoryById(categoryObj.cid, 0, -1, 0, function(err, categoryData) {
 				assert(categoryData);
 				assert.equal(categoryObj.name, categoryData.category_name);
 				assert.equal(categoryObj.description, categoryData.category_description);