Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-18 20:47:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-25 16:42:06 -05:00
parent b23960e8d7 2e786cc4d1
commit 8744013013
14 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@@ -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();

4
public/src/templates.js
View File

@@ -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) {
@@ -396,7 +396,7 @@
namespace = '';
} else {
// clean up all undefined conditionals
template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, '');
template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, '');
}
return template;

1
src/categories.js
View File

@@ -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'),

14
src/emailer.js
View File

@@ -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);
});

2
src/messaging.js
View File

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

2
src/meta.js
View File

@@ -255,7 +255,7 @@ var fs = require('fs'),
},
minFile: function (next) {
if (!fs.existsSync(Meta.js.minFile)) {
winston.warn('No minified client-side library found');
winston.info('No minified client-side library found');
return next(null, 0);
}

2
src/posts.js
View File

@@ -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;

5
src/routes/admin.js
View File

@@ -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) {

4
src/socket.io/index.js
View File

@@ -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

2
src/socket.io/meta.js
View File

@@ -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
}

6
src/topics.js
View File

@@ -738,14 +738,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);
@@ -1053,7 +1053,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
});
});

39
src/upgrade.js
View File

@@ -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!!!

5
src/user.js
View File

@@ -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) {

18
src/webserver.js
View File

@@ -28,7 +28,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 +41,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 +61,6 @@ if(nconf.get('ssl')) {
});
});
server.app = app;
/**
* `options` object requires: req, res
* accepts: metaTags, linkTags
@@ -200,7 +198,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 +373,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({
@@ -932,6 +927,3 @@ if(nconf.get('ssl')) {
});
}(WebServer));
global.server = server;