removed showemail setting from user hash, its in user settings now

src/routes/user.js

@@ -607,32 +607,34 @@ var fs = require('fs'),
 		}
 
 		function getUserDataByUserSlug(userslug, callerUID, callback) {
-			var userData;
 
-			async.waterfall([
+			user.getUidByUserslug(userslug, function(err, uid) {
-				function(next) {
+				if(err || !uid) {
-					user.getUidByUserslug(userslug, next);
+					return callback(err || new Error('invalid-user'));
-				},
-				function(uid, next) {
-					if (!uid) {
-						return next(new Error('invalid-user'));
 				}
 
+				async.parallel({
+					userData : function(next) {
 						user.getUserData(uid, next);
 					},
-				function(data, next) {
+					userSettings : function(next) {
-					userData = data;
+						user.getSettings(uid, next);
-					if (!userData) {
+					},
-						return callback(new Error('invalid-user'));
+					isAdmin : function(next) {
-					}
-
 						user.isAdministrator(callerUID, next);
+					},
+					followStats: function(next) {
+						user.getFollowStats(uid, next);
 					}
-			], function(err, isAdmin) {
+				}, function(err, results) {
-				if(err) {
+					if(err || !results.userData) {
-					return callback(err);
+						return callback(err || new Error('invalid-user'));
 					}
 
+					var userData = results.userData;
+					var userSettings = results.userSettings;
+					var isAdmin = results.isAdmin;
+
 					userData.joindate = utils.toISOString(userData.joindate);
 					if(userData.lastonline) {
 						userData.lastonline = utils.toISOString(userData.lastonline);
@@ -647,14 +649,14 @@ var fs = require('fs'),
 					}
 
 					function canSeeEmail() {
-					return isAdmin || callerUID == userData.uid || (userData.email && (userData.showemail && parseInt(userData.showemail, 10) === 1));
+						return isAdmin || callerUID == userData.uid || (userData.email && userSettings.showemail);
 					}
 
 					if (!canSeeEmail()) {
 						userData.email = "";
 					}
 
-				if (callerUID == userData.uid && (!userData.showemail || parseInt(userData.showemail, 10) === 0)) {
+					if (callerUID == userData.uid && !userSettings.showemail) {
 						userData.emailClass = "";
 					} else {
 						userData.emailClass = "hide";
@@ -668,15 +670,13 @@ var fs = require('fs'),
 
 					userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1;
 
-				user.getFollowStats(userData.uid, function (err, followStats) {
+					userData.followingCount = results.followStats.followingCount;
-					if(err) {
+					userData.followerCount = results.followStats.followerCount;
-						return callback(err);
+
-					}
-					userData.followingCount = followStats.followingCount;
-					userData.followerCount = followStats.followerCount;
 					callback(null, userData);
 				});
 			});
+
 		}
 
 	};

src/user.js

@@ -104,8 +104,7 @@ var bcrypt = require('bcryptjs'),
 					'postcount': 0,
 					'lastposttime': 0,
 					'banned': 0,
-					'status': 'online',
+					'status': 'online'
-					'showemail': 0
 				};
 
 				db.setObject('user:' + uid, userData, function(err) {
@@ -213,7 +212,7 @@ var bcrypt = require('bcryptjs'),
 				settings = {}
 			}
 
-			settings.showemail = settings.showemail ? parseInt(settings.showemail, 10) !== 0 : parseInt(meta.config.usePagination, 10) !== 0;
+			settings.showemail = settings.showemail ? parseInt(settings.showemail, 10) !== 0 : false;
 			settings.usePagination = settings.usePagination ? parseInt(settings.usePagination, 10) !== 0 : parseInt(meta.config.usePagination, 10) !== 0;
 			settings.topicsPerPage = settings.topicsPerPage ? parseInt(settings.topicsPerPage, 10) : parseInt(meta.config.topicsPerPage, 10) || 20;
 			settings.postsPerPage = settings.postsPerPage ? parseInt(settings.postsPerPage, 10) : parseInt(meta.config.postsPerPage, 10) || 10;