From 1466e68aa1ee1fd762f3a64b51eac0661ac74893 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Sat, 4 Jan 2014 18:05:15 -0500 Subject: [PATCH 1/8] ssl support 101 --- public/templates/footer.tpl | 2 +- src/routes/api.js | 2 +- src/webserver.js | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl index ed17d6d878..9eb77e1cc4 100644 --- a/public/templates/footer.tpl +++ b/public/templates/footer.tpl @@ -63,7 +63,7 @@ diff --git a/src/routes/api.js b/src/routes/api.js index 5ebe3dd9f1..ebe3f28055 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -67,7 +67,7 @@ var path = require('path'), data.motd_class = (parseInt(meta.config.show_motd, 10) === 1 || meta.config.show_motd === undefined) ? '' : ' none'; data.motd_class += (meta.config.motd && meta.config.motd.length > 0 ? '' : ' default'); - data.motd = require('marked')(meta.config.motd || "
 Get NodeBB  Fork us on Github  @NodeBB
\n\n# NodeBB v" + pkg.version + "\nWelcome to NodeBB, the discussion platform of the future."); + data.motd = require('marked')(meta.config.motd || "
 Get NodeBB  Fork us on Github  @NodeBB
\n\n# NodeBB v" + pkg.version + "\nWelcome to NodeBB, the discussion platform of the future."); res.json(data); }); }); diff --git a/src/webserver.js b/src/webserver.js index a2d6de53ef..7ebe9c7753 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -1,11 +1,10 @@ var path = require('path'), fs = require('fs'), - + nconf = require('nconf'), express = require('express'), express_namespace = require('express-namespace'), WebServer = express(), - server = require('http').createServer(WebServer), - nconf = require('nconf'), + server, winston = require('winston'), validator = require('validator'), async = require('async'), @@ -30,6 +29,16 @@ var path = require('path'), plugins = require('./plugins'), logger = require('./logger'); +if(nconf.get('ssl')) { + server = require('https').createServer({ + key: fs.readFileSync(nconf.get('ssl').key), + cert: fs.readFileSync(nconf.get('ssl').cert) + }, WebServer); +} else { + server = require('http').createServer(WebServer); +} + + (function (app) { "use strict"; From 0edb895c2cf4df03137a873c67ce45254db500a0 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Sat, 4 Jan 2014 18:09:43 -0500 Subject: [PATCH 2/8] indent --- src/webserver.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webserver.js b/src/webserver.js index 7ebe9c7753..22ea4aaa1d 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -32,7 +32,7 @@ var path = require('path'), if(nconf.get('ssl')) { server = require('https').createServer({ key: fs.readFileSync(nconf.get('ssl').key), - cert: fs.readFileSync(nconf.get('ssl').cert) + cert: fs.readFileSync(nconf.get('ssl').cert) }, WebServer); } else { server = require('http').createServer(WebServer); From ea49295774b9d5668ac7337cb77466c0aad92451 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 4 Jan 2014 18:15:06 -0500 Subject: [PATCH 3/8] some translator methods useful for plugins that wish to support i8n --- public/src/translator.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/public/src/translator.js b/public/src/translator.js index 22de13a045..7f87402557 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -25,6 +25,15 @@ module.exports = translator; + // Use this in plugins to add your own translation files. + translator.addTranslation = function(filename, translations) { + files.loaded[filename] = translations; + }; + + translator.getLanguage = function() { + return DEFAULT_LANGUAGE; + }; + translator.get = function (key, callback) { var parsedKey = key.split(':'), languageFile = parsedKey[0]; From 680fac06745d533358f4356e235fb20ed02fc635 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Sat, 4 Jan 2014 18:27:54 -0500 Subject: [PATCH 4/8] added relative_path to header.tpl --- public/templates/header.tpl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 8ab37bd63e..09fbcd190e 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -40,10 +40,10 @@
- + - +

{title}
@@ -52,24 +52,24 @@
diff --git a/public/templates/confirm.tpl b/public/templates/confirm.tpl index ef9638a906..7662d9e177 100644 --- a/public/templates/confirm.tpl +++ b/public/templates/confirm.tpl @@ -2,6 +2,6 @@ {title}

{text}

- [[notifications:back_to_home]] + [[notifications:back_to_home]]

diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl index 7412c907ed..c26e4952c1 100644 --- a/public/templates/favourites.tpl +++ b/public/templates/favourites.tpl @@ -1,13 +1,13 @@
-
[[topic:has_no_favourites]]
+
[[topic:favourites.has_no_favourites]]
diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl index 3e8ad82a63..7182280206 100644 --- a/public/templates/followers.tpl +++ b/public/templates/followers.tpl @@ -2,20 +2,20 @@
- +