more fixes

v1.18.x
Baris Soner Usakli 11 years ago
parent e5c8caf5ff
commit afe97233aa

@ -44,7 +44,11 @@ define(function() {
} else { } else {
socket.emit('user.emailExists', { socket.emit('user.emailExists', {
email: emailEl.val() email: emailEl.val()
}, function(exists) { }, function(err, exists) {
if(err) {
return app.alertError(err.message);
}
if (exists) { if (exists) {
showError(email_notify, 'Email address already taken!'); showError(email_notify, 'Email address already taken!');
} else { } else {

@ -15,6 +15,7 @@ var groups = require('../groups'),
async = require('async'), async = require('async'),
winston = require('winston'), winston = require('winston'),
index = require('./index'),
SocketAdmin = {}; SocketAdmin = {};
@ -252,7 +253,7 @@ SocketAdmin.config.set = function(socket, data, callback) {
}); });
} }
logger.monitorConfig({io: socket.server}, data); logger.monitorConfig({io: index.server}, data);
}); });
}; };

@ -933,7 +933,7 @@ var bcrypt = require('bcrypt'),
}, },
exists: function(email, callback) { exists: function(email, callback) {
User.getUidByEmail(email, function(err, exists) { User.getUidByEmail(email, function(err, exists) {
callback(!!exists); callback(err, !!exists);
}); });
}, },
confirm: function(code, callback) { confirm: function(code, callback) {

Loading…
Cancel
Save