Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-06 17:58:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
# Conflicts:
#	package.json
#	src/views/admin/manage/ip-blacklist.tpl
This commit is contained in:
Barış Soner Uşaklı
2017-08-24 19:29:15 -04:00
parent abffc29128 53ca6d1199
commit 5cc39e8546
371 changed files with 961 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/controllers/admin/blacklist.js
View File

@@ -2,19 +2,22 @@
var async = require('async');
var meta = require('../../meta');
var analytics = require('../../analytics');
var blacklistController = module.exports;
blacklistController.get = function (req, res, next) {
async.waterfall([
function (next) {
meta.blacklist.get(next);
},
function (rules) {
res.render('admin/manage/ip-blacklist', {
rules: rules,
title: '[[pages:ip-blacklist]]',
});
},
], next);
// Analytics.getBlacklistAnalytics
async.parallel({
rules: async.apply(meta.blacklist.get),
analytics: async.apply(analytics.getBlacklistAnalytics),
}, function (err, data) {
if (err) {
return next(err);
}
res.render('admin/manage/ip-blacklist', Object.assign(data, {
title: '[[pages:ip-blacklist]]',
}));
});
};