From e6973b55d4e4cb11f785d673a7a4f446802c92ef Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 13 Nov 2014 15:47:25 -0500
Subject: [PATCH] closes #1990

---
 src/controllers/accounts.js          | 31 +++++++++++++++-------------
 src/controllers/api.js               |  1 +
 src/socket.io/modules.js             |  6 +++++-
 src/views/admin/settings/general.tpl |  5 +++++
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index 7eca9f8593..8a8aaf390a 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -23,21 +23,21 @@ var fs = require('fs'),
 	file = require('../file'),
 	websockets = require('../socket.io');
 
-function userNotFound(res) {
+function notFound(res, message) {
 	res.locals.notFound = true;
 
 	if (res.locals.isAPI) {
-		res.status(404).json('no-user');
+		res.status(404).json(message);
 	} else {
 		res.render('404', {
-			error: '[[error:no-user]]'
+			error: message
 		});
 	}
 }
 
-function userNotAllowed(res) {
+function notAllowed(res, message) {
 	if (res.locals.isAPI) {
-		res.status(403).json('not-allowed');
+		res.status(403).json(message);
 	} else {
 		res.render('403');
 	}
@@ -169,7 +169,7 @@ accountsController.getAccount = function(req, res, next) {
 		}
 
 		if(!userData) {
-			return userNotFound(res);
+			return notFound(res, '[[error:no-user]]');
 		}
 
 		async.parallel({
@@ -227,7 +227,7 @@ function getFollow(route, name, req, res, next) {
 		function(data, next) {
 			userData = data;
 			if (!userData) {
-				return userNotFound(res);
+				return notFound(res, '[[error:no-user]]');
 			}
 			var method = name === 'following' ? 'getFollowing' : 'getFollowers';
 			user[method](userData.uid, next);
@@ -252,11 +252,11 @@ accountsController.getFavourites = function(req, res, next) {
 		}
 
 		if (!userData) {
-			return userNotFound(res);
+			return notFound(res, '[[error:no-user]]');
 		}
 
 		if (parseInt(userData.uid, 10) !== callerUID) {
-			return userNotAllowed(res);
+			return notAllowed(res, '[[error:not-allowed]]');
 		}
 
 		posts.getFavourites(userData.uid, 0, 9, function (err, favourites) {
@@ -281,7 +281,7 @@ accountsController.getPosts = function(req, res, next) {
 		}
 
 		if (!userData) {
-			return userNotFound(res);
+			return notFound(res, '[[error:no-user]]');
 		}
 
 		posts.getPostsByUid(callerUID, userData.uid, 0, 19, function (err, userPosts) {
@@ -306,7 +306,7 @@ accountsController.getTopics = function(req, res, next) {
 		}
 
 		if (!userData) {
-			return userNotFound(res);
+			return notFound(res, '[[error:no-user]]');
 		}
 
 		var set = 'uid:' + userData.uid + ':topics';
@@ -390,7 +390,7 @@ accountsController.accountSettings = function(req, res, next) {
 		}
 
 		if (!userData) {
-			return userNotFound(res);
+			return notFound(res, '[[error:no-user]]');
 		}
 
 		async.parallel({
@@ -408,7 +408,7 @@ accountsController.accountSettings = function(req, res, next) {
 			userData.settings = results.settings;
 			userData.languages = results.languages;
 
-			userData.disableEmailSubscriptions = meta.config.disableEmailSubscriptions !== undefined && parseInt(meta.config.disableEmailSubscriptions, 10) === 1;
+			userData.disableEmailSubscriptions = parseInt(meta.config.disableEmailSubscriptions, 10) === 1;
 
 			res.render('account/settings', userData);
 		});
@@ -468,7 +468,7 @@ accountsController.uploadPicture = function (req, res, next) {
 				}
 
 				if (!isAdmin) {
-					return userNotAllowed();
+					return notAllowed(req, '[[error:not-allowed]]');
 				}
 				updateUid = uid;
 				next();
@@ -532,6 +532,9 @@ accountsController.getNotifications = function(req, res, next) {
 };
 
 accountsController.getChats = function(req, res, next) {
+	if (parseInt(meta.config.disableChat) === 1) {
+		return notFound(res, '[[error:not-found]]');
+	}
 	async.parallel({
 		contacts: async.apply(user.getFollowing, req.user.uid),
 		recentChats: async.apply(messaging.getRecentChats, req.user.uid, 0, 19)
diff --git a/src/controllers/api.js b/src/controllers/api.js
index 6bbcb73aa4..4a797b8645 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -34,6 +34,7 @@ apiController.getConfig = function(req, res, next) {
 	config.privateUserInfo = parseInt(meta.config.privateUserInfo, 10) === 1;
 	config.usePagination = parseInt(meta.config.usePagination, 10) === 1;
 	config.disableSocialButtons = parseInt(meta.config.disableSocialButtons, 10) === 1;
+	config.disableChat = parseInt(meta.config.disableChat, 10) === 1;
 	config.maxReconnectionAttempts = meta.config.maxReconnectionAttempts || 5;
 	config.reconnectionDelay = meta.config.reconnectionDelay || 200;
 	config.websocketAddress = meta.config.websocketAddress || '';
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index c27bed191f..ad37807516 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -117,10 +117,14 @@ SocketModules.chats.get = function(socket, data, callback) {
 };
 
 SocketModules.chats.send = function(socket, data, callback) {
-	if(!data) {
+	if (!data) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
+	if (parseInt(meta.config.disableChat) === 1) {
+		return callback(new Error('[[error:chat-disabled]]'));
+	}
+
 	var touid = parseInt(data.touid, 10);
 	if (touid === socket.uid || socket.uid === 0) {
 		return;
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index 7d333a653d..5c35ea8542 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -70,6 +70,11 @@
 					<input type="checkbox" data-field="disableSocialButtons"> <strong>Disable social buttons</strong>
 				</label>
 			</div>
+			<div class="checkbox">
+				<label>
+					<input type="checkbox" data-field="disableChat"> <strong>Disable chat</strong>
+				</label>
+			</div>
 		</form>
 	</div>
 </div>