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

public/src/modules/composer.js

@@ -94,9 +94,8 @@ define(['taskbar'], function(taskbar) {
 
 			var postContainer = $(composerTemplate[0]);
 
-			if(config.imgurClientIDSet) {
+			if(config.allowFileUploads || config.imgurClientIDSet)
 				initializeFileReader(post_uuid);
-			}
 
 			var postData = composer.posts[post_uuid],
 				titleEl = postContainer.find('.title'),

src/database/mongo.js

@@ -269,6 +269,9 @@
 	module.setObjectField = function(key, field, value, callback) {
 		var data = {};
 		// if there is a '.' in the field name it inserts subdocument in mongo, replace '.'s with \uff0E
+		if(typeof field !== 'string') {
+			field = field.toString();
+		}
 		field = field.replace(/\./g, '\uff0E');
 		data[field] = value;
 		db.collection('objects').update({_key:key}, {$set:data}, {upsert:true, w: 1}, function(err, result) {
@@ -318,7 +321,7 @@
 
 		var _fields = {};
 		for(var i=0; i<fields.length; ++i) {
-			if(typeof fields[i] !== string) {
+			if(typeof fields[i] !== 'string') {
 				_fields[fields[i].toString().replace(/\./g, '\uff0E')] = 1;
 			} else {
 				_fields[fields[i].replace(/\./g, '\uff0E')] = 1;
@@ -363,6 +366,9 @@
 
 	module.isObjectField = function(key, field, callback) {
 		var data = {};
+		if(typeof field !== 'string') {
+			field = field.toString();
+		}
 		field = field.replace(/\./g, '\uff0E');
 		data[field] = '';
 		db.collection('objects').findOne({_key:key}, {fields:data}, function(err, item) {
@@ -375,6 +381,9 @@
 
 	module.deleteObjectField = function(key, field, callback) {
 		var data = {};
+		if(typeof field !== 'string') {
+			field = field.toString();
+		}
 		field = field.replace(/\./g, '\uff0E');
 		data[field] = "";
 		db.collection('objects').update({_key:key}, {$unset : data}, function(err, result) {
@@ -394,6 +403,9 @@
 
 	module.incrObjectFieldBy = function(key, field, value, callback) {
 		var data = {};
+		if(typeof field !== 'string') {
+			field = field.toString();
+		}
 		field = field.replace(/\./g, '\uff0E');
 		data[field] = value;
 		db.collection('objects').update({_key:key}, {$inc : data}, {upsert:true}, function(err, result) {

src/postTools.js

@@ -152,7 +152,7 @@ var winston = require('winston'),
 				// Delete the thread if it is the last undeleted post
 				threadTools.getLatestUndeletedPid(postData.tid, function(err, pid) {
 					if (err && err.message === 'no-undeleted-pids-found') {
-						threadTools.delete(postData.tid, function(err) {
+						threadTools.delete(postData.tid, uid, function(err) {
 							if (err) {
 								winston.error('Could not delete topic (tid: ' + postData.tid + ')', err.stack);
 							}

src/posts.js

@@ -360,24 +360,26 @@ var db = require('./database'),
 
 	Posts.uploadPostImage = function(image, callback) {
 
-		if(!meta.config.imgurClientID) {
+		if(meta.config.imgurClientID) {
-			return callback('imgurClientID not set', null);
+			if(!image) {
-		}
+				return callback('invalid image', null);
+			}
 
-		if(!image) {
+			require('./imgur').upload(meta.config.imgurClientID, image.data, 'base64', function(err, data) {
-			return callback('invalid image', null);
+				if(err) {
+					callback(err.message, null);
+				} else {
+					callback(null, {
+						url: data.link,
+						name: image.name
+					});
+				}
+			});
+		} else if (meta.config.allowFileUploads) {
+			Posts.uploadPostFile(image, callback);
+		} else {
+			callback('Uploads are disabled!');
 		}
-
-		require('./imgur').upload(meta.config.imgurClientID, image.data, 'base64', function(err, data) {
-			if(err) {
-				callback(err.message, null);
-			} else {
-				callback(null, {
-					url: data.link,
-					name: image.name
-				});
-			}
-		});
 	}
 
 	Posts.uploadPostFile = function(file, callback) {
@@ -400,7 +402,7 @@ var db = require('./database'),
 		var uploadPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), filename);
 
 		fs.writeFile(uploadPath, buffer, function (err) {
-  			if(err) {
+			if(err) {
 				callback(err.message, null);
 			} else {
 				callback(null, {

src/threadTools.js

@@ -91,7 +91,7 @@ var winston = require('winston'),
 		}
 	}
 
-	ThreadTools.delete = function(tid, callback) {
+	ThreadTools.delete = function(tid, uid, callback) {
 		topics.delete(tid);
 
 		db.decrObjectField('global', 'topicCount');
@@ -112,7 +112,7 @@ var winston = require('winston'),
 		}
 	}
 
-	ThreadTools.restore = function(tid, socket, callback) {
+	ThreadTools.restore = function(tid, uid, callback) {
 		topics.restore(tid);
 		db.incrObjectField('global', 'topicCount');
 		ThreadTools.unlock(tid);

src/websockets.js

@@ -562,7 +562,7 @@ websockets.init = function(io) {
 		socket.on('api:topic.delete', function(data) {
 			threadTools.privileges(data.tid, uid, function(err, privileges) {
 				if (!err && privileges.editable) {
-					threadTools.delete(data.tid, function(err) {
+					threadTools.delete(data.tid, uid, function(err) {
 						if (!err) {
 							emitTopicPostStats();
 							socket.emit('api:topic.delete', {
@@ -578,7 +578,7 @@ websockets.init = function(io) {
 		socket.on('api:topic.restore', function(data) {
 			threadTools.privileges(data.tid, uid, function(err, privileges) {
 				if (!err && privileges.editable) {
-					threadTools.restore(data.tid, socket, function(err) {
+					threadTools.restore(data.tid, uid, function(err) {
 						emitTopicPostStats();
 
 						socket.emit('api:topic.restore', {