diff --git a/src/categories.js b/src/categories.js
index 985f2a3df8..d72e11b10b 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -4,14 +4,17 @@ var RDB = require('./redis.js'),
user = require('./user.js'),
async = require('async'),
topics = require('./topics.js'),
- winston = require('winston');
+ winston = require('winston'),
+ nconf = require('nconf');
(function(Categories) {
+ "use strict";
Categories.create = function(data, callback) {
RDB.incr('global:next_category_id', function(err, cid) {
- if (err)
+ if (err) {
return callback(err, null);
+ }
var slug = cid + '/' + utils.slugify(data.name);
RDB.rpush('categories:cid', cid);
@@ -35,9 +38,10 @@ var RDB = require('./redis.js'),
};
Categories.getCategoryById = function(category_id, current_user, callback) {
-
Categories.getCategoryData(category_id, function(err, categoryData) {
- if (err) return callback(err);
+ if (err) {
+ return callback(err);
+ }
var category_name = categoryData.name,
category_slug = categoryData.slug,
@@ -284,8 +288,11 @@ var RDB = require('./redis.js'),
Categories.getCategoryData = function(cid, callback) {
RDB.exists('category:' + cid, function(err, exists) {
- if (exists) RDB.hgetall('category:' + cid, callback);
- else callback(new Error('No category found!'));
+ if (exists) {
+ RDB.hgetall('category:' + cid, callback);
+ } else {
+ callback(new Error('No category found!'));
+ }
});
};
@@ -295,10 +302,11 @@ var RDB = require('./redis.js'),
Categories.getCategoryFields = function(cid, fields, callback) {
RDB.hmgetObject('category:' + cid, fields, function(err, data) {
- if (err === null)
+ if (err === null) {
callback(data);
- else
+ } else {
winston.err(err);
+ }
});
};
@@ -329,7 +337,7 @@ var RDB = require('./redis.js'),
}
Categories.hasReadCategory(cid, current_user, function(hasRead) {
- categoryData['badgeclass'] = (parseInt(categoryData.topic_count, 10) === 0 || (hasRead && current_user != 0)) ? '' : 'badge-important';
+ categoryData.badgeclass = (parseInt(categoryData.topic_count, 10) === 0 || (hasRead && current_user !== 0)) ? '' : 'badge-important';
categories.push(categoryData);
callback(null);
@@ -354,15 +362,17 @@ var RDB = require('./redis.js'),
Categories.isUserActiveIn = function(cid, uid, callback) {
RDB.lrange('uid:' + uid + ':posts', 0, -1, function(err, pids) {
- if (err)
+ if (err) {
return callback(err, null);
+ }
function getPostCategory(pid, callback) {
posts.getPostField(pid, 'tid', function(tid) {
topics.getTopicField(tid, 'cid', function(err, postCid) {
- if (err)
+ if (err) {
return callback(err, null);
+ }
return callback(null, postCid);
});
@@ -378,17 +388,23 @@ var RDB = require('./redis.js'),
},
function(callback) {
getPostCategory(pids[index], function(err, postCid) {
- if (err)
+ if (err) {
return callback(err);
- if (postCid === cid)
+ }
+
+ if (postCid === cid) {
active = true;
+ }
+
++index;
callback(null);
});
},
function(err) {
- if (err)
+ if (err) {
return callback(err, null);
+ }
+
callback(null, active);
}
diff --git a/src/feed.js b/src/feed.js
index fed447b7b7..f7a57ecf94 100644
--- a/src/feed.js
+++ b/src/feed.js
@@ -6,7 +6,8 @@
fs = require('fs'),
rss = require('rss'),
winston = require('winston'),
- path = require('path');
+ path = require('path'),
+ nconf = require('nconf');
Feed.defaults = {
ttl: 60,
diff --git a/src/install.js b/src/install.js
index 3665b89263..d947ac4a5d 100644
--- a/src/install.js
+++ b/src/install.js
@@ -6,6 +6,7 @@ var async = require('async'),
prompt = require('prompt'),
winston = require('winston'),
reds = require('reds'),
+ nconf = require('nconf');
install = {
questions: [{
diff --git a/src/meta.js b/src/meta.js
index 73a938a914..5326c46315 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -3,7 +3,8 @@ var utils = require('./../public/src/utils.js'),
async = require('async'),
path = require('path'),
fs = require('fs'),
- winston = require('winston');
+ winston = require('winston'),
+ nconf = require('nconf');
(function(Meta) {
diff --git a/src/postTools.js b/src/postTools.js
index c88ca4405b..5917d8c83b 100644
--- a/src/postTools.js
+++ b/src/postTools.js
@@ -4,6 +4,7 @@ var RDB = require('./redis.js'),
threadTools = require('./threadTools.js'),
user = require('./user.js'),
async = require('async'),
+ nconf = require('nconf'),
utils = require('../public/src/utils'),
plugins = require('./plugins'),
diff --git a/src/redis.js b/src/redis.js
index d8e1c750ba..5413f58651 100644
--- a/src/redis.js
+++ b/src/redis.js
@@ -1,7 +1,8 @@
(function(RedisDB) {
var redis = require('redis'),
utils = require('./../public/src/utils.js'),
- winston = require('winston');
+ winston = require('winston'),
+ nconf = require('nconf');
RedisDB.exports = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'));
diff --git a/src/routes/admin.js b/src/routes/admin.js
index f74aad3b2d..4a8f1a13b4 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -5,7 +5,8 @@ var user = require('./../user.js'),
pkg = require('./../../package.json'),
categories = require('./../categories.js'),
plugins = require('../plugins'),
- winston = require('winston');
+ winston = require('winston'),
+ nconf = require('nconf');
(function(Admin) {
Admin.isAdmin = function(req, res, next) {
diff --git a/src/routes/api.js b/src/routes/api.js
index a070f443df..d7b7bd9acc 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -5,7 +5,8 @@ var user = require('./../user.js'),
utils = require('./../../public/src/utils.js'),
pkg = require('../../package.json'),
meta = require('./../meta.js'),
- path = require('path');
+ path = require('path'),
+ nconf = require('nconf');
(function(Api) {
diff --git a/src/routes/user.js b/src/routes/user.js
index 3bfabf59f0..0667751da1 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -4,7 +4,8 @@ var user = require('./../user.js'),
fs = require('fs'),
utils = require('./../../public/src/utils.js'),
path = require('path'),
- winston = require('winston');
+ winston = require('winston'),
+ nconf = require('nconf');
(function(User) {
User.create_routes = function(app) {
@@ -157,7 +158,7 @@ var user = require('./../user.js'),
return;
}
- var absolutePath = path.join(process.cwd(), global.nconf.get('upload_path'), path.basename(oldpicture));
+ var absolutePath = path.join(process.cwd(), nconf.get('upload_path'), path.basename(oldpicture));
fs.unlink(absolutePath, function(err) {
if (err) {
@@ -178,7 +179,7 @@ var user = require('./../user.js'),
}
var filename = uid + '-profileimg' + extension;
- var uploadPath = path.join(process.cwd(), global.nconf.get('upload_path'), filename);
+ var uploadPath = path.join(process.cwd(), nconf.get('upload_path'), filename);
winston.info('Attempting upload to: ' + uploadPath);
@@ -188,7 +189,7 @@ var user = require('./../user.js'),
is.on('end', function() {
fs.unlinkSync(tempPath);
- var imageUrl = global.nconf.get('upload_url') + filename;
+ var imageUrl = nconf.get('upload_url') + filename;
user.setUserField(uid, 'uploadedpicture', imageUrl);
user.setUserField(uid, 'picture', imageUrl);
diff --git a/src/sitemap.js b/src/sitemap.js
index 7e68fa8ec7..26be952b21 100644
--- a/src/sitemap.js
+++ b/src/sitemap.js
@@ -2,6 +2,7 @@ var path = require('path'),
async = require('async'),
sm = require('sitemap'),
url = require('url'),
+ nconf = require('nconf'),
categories = require('./categories'),
topics = require('./topics'),
sitemap = {
diff --git a/src/threadTools.js b/src/threadTools.js
index 5e189fee3b..d4c9ab682b 100644
--- a/src/threadTools.js
+++ b/src/threadTools.js
@@ -8,7 +8,8 @@ var RDB = require('./redis.js'),
reds = require('reds'),
topicSearch = reds.createSearch('nodebbtopicsearch'),
winston = require('winston'),
- meta = require('./meta');
+ meta = require('./meta'),
+ nconf = require('nconf');
(function(ThreadTools) {
diff --git a/src/user.js b/src/user.js
index 60ed7ce4bb..c3e700cd20 100644
--- a/src/user.js
+++ b/src/user.js
@@ -9,6 +9,7 @@ var utils = require('./../public/src/utils.js'),
notifications = require('./notifications.js'),
topics = require('./topics.js'),
async = require('async'),
+ nconf = require('nconf'),
userSearch = require('reds').createSearch('nodebbusersearch');
(function(User) {
diff --git a/src/webserver.js b/src/webserver.js
index 7dff3c792b..07c97bf3d8 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -21,7 +21,8 @@ var express = require('express'),
auth = require('./routes/authentication.js'),
meta = require('./meta.js'),
feed = require('./feed'),
- plugins = require('./plugins');
+ plugins = require('./plugins'),
+ nconf = require('nconf');
(function(app) {
var templates = null;
@@ -116,6 +117,7 @@ var express = require('express'),
module.exports.init = function() {
templates = global.templates;
+ server.listen(nconf.get('PORT') || nconf.get('port'));
}
auth.initialize(app);
@@ -517,5 +519,5 @@ var express = require('express'),
}(WebServer));
-server.listen(nconf.get('PORT') || nconf.get('port'));
+
global.server = server;
\ No newline at end of file