Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-21 16:00:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-02-02 22:15:26 -07:00
parent f4147f7922 1012368acd
commit 360a35d0a6
295 changed files with 3018 additions and 2755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/webserver.js
View File

@@ -52,7 +52,7 @@ server.on('error', function (err) {
});
module.exports.listen = function (callback) {
callback = callback || function () {};
callback = callback || function () { };
emailer.registerApp(app);
setupExpressApp(app);
@@ -135,7 +135,7 @@ function setupExpressApp(app) {
app.use(relativePath + '/apple-touch-icon', middleware.routeTouchIcon);
app.use(bodyParser.urlencoded({extended: true}));
app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.json());
app.use(cookieParser());
app.use(useragent.express());
@@ -166,8 +166,12 @@ function setupFavicon(app) {
}
function setupCookie() {
var ttlDays = 1000 * 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0);
var ttlSeconds = 1000 * (parseInt(meta.config.loginSeconds, 10) || 0);
var ttl = ttlSeconds || ttlDays || 1209600000; // Default to 14 days
var cookie = {
maxAge: 1000 * 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 14)
maxAge: ttl
};
if (nconf.get('cookieDomain') || meta.config.cookieDomain) {
@@ -187,7 +191,7 @@ function setupCookie() {
}
function listen(callback) {
callback = callback || function () {};
callback = callback || function () { };
var port = parseInt(nconf.get('port'), 10);
var isSocket = isNaN(port);
var socketPath = isSocket ? nconf.get('port') : '';