Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 04:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code review change

Browse Source
This commit is contained in:
Dominic Lennon
2017-01-16 08:48:53 +00:00
parent 04e5707143
commit a06e39528f
4 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/database/mongo.js
View File

@@ -9,7 +9,6 @@
var session = require('express-session');
var _ = require('underscore');
var semver = require('semver');
var meta = require('../meta');
var db;
_.mixin(require('underscore.deep'));
@@ -130,14 +129,12 @@
rdb.client = rdb.connect();
var ttlDays = 1000 * 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0);
var ttlHours = 1000 * 60 * 60 * (parseInt(meta.config.loginHours, 10) || 0);
var ttlMinutes = 1000 * 60 * (parseInt(meta.config.loginMinutes, 10) || 0);
var ttlSeconds = 1000 * (parseInt(meta.config.loginSeconds, 10) || 0);
var ttlTotal = (ttlDays + ttlHours + ttlMinutes + ttlSeconds) || 1209600000; // Default to 14 days
var ttl = ttlSeconds || ttlDays || 1209600000; // Default to 14 days
module.sessionStore = new sessionStore({
client: rdb.client,
ttl: ttlTotal
ttl: ttl
});
} else if (nconf.get('mongo')) {
sessionStore = require('connect-mongo')(session);

6
src/database/redis.js
View File

@@ -63,14 +63,12 @@
var sessionStore = require('connect-redis')(session);
var ttlDays = 1000 * 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0);
var ttlHours = 1000 * 60 * 60 * (parseInt(meta.config.loginHours, 10) || 0);
var ttlMinutes = 1000 * 60 * (parseInt(meta.config.loginMinutes, 10) || 0);
var ttlSeconds = 1000 * (parseInt(meta.config.loginSeconds, 10) || 0);
var ttlTotal = (ttlDays + ttlHours + ttlMinutes + ttlSeconds) || 1209600000; // Default to 14 days
var ttl = ttlSeconds || ttlDays || 1209600000; // Default to 14 days
module.sessionStore = new sessionStore({
client: module.client,
ttl: ttlTotal
ttl: ttl
});
if (typeof callback === 'function') {

9
src/views/admin/settings/user.tpl
View File

@@ -113,19 +113,18 @@
</div>
<div class="row">
<div class="col-sm-2 col-xs-12 settings-header">Session time
<div class="col-sm-2 col-xs-12 settings-header">
Session time
</div>
<div class="col-sm-10 col-xs-12">
<form>
<div class="form-group">
<label>Days: </label>
<input type="text" class="form-control" data-field="loginDays" placeholder="Days" />
<label>Hours: </label>
<input type="text" class="form-control" data-field="loginHours" placeholder="Hours" />
<label>Minutes: </label>
<input type="text" class="form-control" data-field="loginMinutes" placeholder="Minutes" />
<label>Seconds: </label>
<input type="text" class="form-control" data-field="loginSeconds" placeholder="Seconds" />
<p class="help-block">Note that only one of these values will be used. If there is no <i>seconds</i> value we fall back to <i>days</i>. If
there is no <i>days</i> value we default to <i>14 days</i>.
</div>
</form>
</div>

6
src/webserver.js
View File

@@ -171,13 +171,11 @@ function setupFavicon(app) {
function setupCookie() {
var ttlDays = 1000 * 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0);
var ttlHours = 1000 * 60 * 60 * (parseInt(meta.config.loginHours, 10) || 0);
var ttlMinutes = 1000 * 60 * (parseInt(meta.config.loginMinutes, 10) || 0);
var ttlSeconds = 1000 * (parseInt(meta.config.loginSeconds, 10) || 0);
var ttlTotal = (ttlDays + ttlHours + ttlMinutes + ttlSeconds) || 1209600000; // Default to 14 days
var ttl = ttlSeconds || ttlDays || 1209600000; // Default to 14 days
var cookie = {
maxAge: ttlTotal
maxAge: ttl
};
if (nconf.get('cookieDomain') || meta.config.cookieDomain) {