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

app.js

@@ -113,7 +113,9 @@
 					], customTemplates);
 
 
-					templates.ready(webserver.init);
+					plugins.ready(function() {
+						templates.ready(webserver.init);
+					});
 
 					Notifications.init();
 				} else {

public/src/ajaxify.js

@@ -1,5 +1,6 @@
-var ajaxify = {};
+"use strict";
 
+var ajaxify = {};
 
 (function ($) {
 	/*global app, templates, utils*/
@@ -23,8 +24,9 @@ var ajaxify = {};
 
 	window.onpopstate = function (event) {
 		// "quiet": If set to true, will not call pushState
-		if (event !== null && event.state && event.state.url !== undefined)
+		if (event !== null && event.state && event.state.url !== undefined) {
 			ajaxify.go(event.state.url, null, null, true);
+		}
 	};
 
 	var pagination;
@@ -35,7 +37,10 @@ var ajaxify = {};
 		app.enter_room('global');
 
 		pagination = pagination || document.getElementById('pagination');
-		if (pagination) pagination.parentNode.style.display = 'none';
+		if (pagination) {
+			pagination.parentNode.style.display = 'none';
+		}
+
 		window.onscroll = null;
 		// end
 
@@ -65,8 +70,21 @@ var ajaxify = {};
 			if (quiet !== true) {
 				if (window.history && window.history.pushState) {
 					window.history.pushState({
-						"url": url
+						url: url
-					}, url, RELATIVE_PATH + "/" + url);
+					}, url, RELATIVE_PATH + '/' + url);
+
+					$.ajax(RELATIVE_PATH + '/plugins/fireHook', {
+						type: 'PUT',
+						data: {
+							_csrf: $('#csrf_token').val(),
+							hook: 'page.load',
+							args: {
+								template: tpl_url,
+								url: url,
+								uid: app.uid
+							}
+						}
+					});
 				}
 			}
 
@@ -78,7 +96,9 @@ var ajaxify = {};
 			templates.load_template(function () {
 				exec_body_scripts(content);
 				require(['forum/' + tpl_url], function(script) {
-					if (script && script.init) script.init();
+					if (script && script.init) {
+						script.init();
+					}
 				});
 
 				if (callback) {
@@ -88,10 +108,13 @@ var ajaxify = {};
 				app.process_page();
 
 				jQuery('#content, #footer').stop(true, true).fadeIn(200, function () {
-					if (window.location.hash)
+					if (window.location.hash) {
 						hash = window.location.hash;
-					if (hash)
+					}
+
+					if (hash) {
 						app.scrollToPost(hash.substr(1));
+					}
 				});
 
 				utils.refreshTitle(url);
@@ -105,23 +128,27 @@ var ajaxify = {};
 	};
 
 	$('document').ready(function () {
-		if (!window.history || !window.history.pushState) return; // no ajaxification for old browsers
+		if (!window.history || !window.history.pushState) {
+			return; // no ajaxification for old browsers
+		}
 
 		content = content || document.getElementById('content');
 
 		// Enhancing all anchors to ajaxify...
 		$(document.body).on('click', 'a', function (e) {
 			function hrefEmpty(href) {
-				return href == 'javascript:;' || href == window.location.href + "#" || href.slice(-1) === "#";
+				return href === 'javascript:;' || href === window.location.href + "#" || href.slice(-1) === "#";
 			}
 
-			if (hrefEmpty(this.href) || this.target !== '' || this.protocol === 'javascript:')
+			if (hrefEmpty(this.href) || this.target !== '' || this.protocol === 'javascript:') {
 				return;
+			}
 
-			if(!window.location.pathname.match(/\/(403|404)$/g))
+			if(!window.location.pathname.match(/\/(403|404)$/g)) {
 				app.previousUrl = window.location.href;
+			}
 
-			if (this.getAttribute('data-ajaxify') == 'false') {
+			if (this.getAttribute('data-ajaxify') === 'false') {
 				return;
 			}
 

public/templates/footer.tpl

@@ -60,6 +60,7 @@
 
 
 	<footer id="footer" class="container footer">
+		{footerHTML}
 		<div class="copyright">Copyright &copy; 2013 <a target="_blank" href="http://www.nodebb.org">NodeBB</a> by <a target="_blank" href="https://github.com/psychobunny">psychobunny</a>, <a href="https://github.com/julianlam" target="_blank">julianlam</a>, <a href="https://github.com/barisusakli" target="_blank">barisusakli</a> from <a target="_blank" href="http://www.designcreateplay.com">designcreateplay</a></div>
 	</footer>
 

src/plugins.js

@@ -284,7 +284,7 @@ var fs = require('fs'),
 									winston.warn("Plugin: " + file + " is corrupted or invalid. Please check plugin.json for errors.")
 									return next(err, null);
 								}
-								
+
 								_self.isActive(config.id, function(err, active) {
 									if (err) next(new Error('no-active-state'));
 

src/routes/plugins.js

@@ -1,9 +1,28 @@
+"use strict";
+
 var	nconf = require('nconf'),
 	path = require('path'),
 	fs = require('fs'),
 	Plugins = require('../plugins'),
 
 	PluginRoutes = function(app) {
+		app.get('/plugins/fireHook', function(req, res) {
+			// GET = filter
+			Plugins.fireHook('filter:' + req.query.hook, req.query.args, function(err, returnData) {
+				if (typeof returnData === 'object') {
+					res.json(200, returnData);
+				} else {
+					res.send(200, returnData);
+				}
+			});
+		});
+
+		app.put('/plugins/fireHook', function(req, res) {
+			// PUT = action
+			Plugins.fireHook('action:' + req.body.hook, req.body.args);
+			res.send(200);
+		});
+
 		// Static Assets
 		app.get('/plugins/:id/*', function(req, res) {
 			var	relPath = req.url.replace('/plugins/' + req.params.id, '');
@@ -15,7 +34,7 @@ var	nconf = require('nconf'),
 					} else {
 						res.redirect('/404');
 					}
-				})
+				});
 			} else {
 				res.redirect('/404');
 			}

src/webserver.js

@@ -309,7 +309,11 @@ var path = require('path'),
 
 		// translate all static templates served by webserver here. ex. footer, logout
 		translator.translate(templates.footer.toString(), function(parsedTemplate) {
-			templates.footer = parsedTemplate;
+			plugins.fireHook('filter:footer.build', '', function(err, appendHTML) {
+				templates.footer = templates.footer.parse({
+					footerHTML: appendHTML
+				});
+			});
 		});
 		translator.translate(templates.logout.toString(), function(parsedTemplate) {
 			templates.logout = parsedTemplate;