action:user.verify & filter:user.verify.code - plugins can now override the verification system

src/user/email.js

@@ -27,37 +27,42 @@ var async = require('async'),
 	};
 
 	UserEmail.verify = function(uid, email) {
-		if (!plugins.hasListeners('action:email.send')) {
-			return;
-		}
-
 		var confirm_code = utils.generateUUID(),
 			confirm_link = nconf.get('url') + '/confirm/' + confirm_code;
 
-		async.series([
+		plugins.fireHook('filter:user.verify.code', confirm_code, function(err, confirm_code) {
-			function(next) {
+			async.series([
-				db.setObject('confirm:' + confirm_code, {
+				function(next) {
-					email: email,
+					db.setObject('confirm:' + confirm_code, {
-					uid: uid
+						email: email,
-				}, next);
+						uid: uid
-			},
+					}, next);
-			function(next) {
+				},
-				db.expireAt('confirm:' + confirm_code, Math.floor(Date.now() / 1000 + 60 * 60 * 2), next);
+				function(next) {
-			}
+					db.expireAt('confirm:' + confirm_code, Math.floor(Date.now() / 1000 + 60 * 60 * 2), next);
-		], function(err) {
-			user.getUserField(uid, 'username', function(err, username) {
-				if (err) {
-					return winston.error(err.message);
 				}
+			], function(err) {
+				user.getUserField(uid, 'username', function(err, username) {
+					if (err) {
+						return winston.error(err.message);
+					}
+
+					var data = {
+						site_title: (meta.config.title || 'NodeBB'),
+						username: username,
+						confirm_link: confirm_link,
+						confirm_code: confirm_code,
 
-				emailer.send('welcome', uid, {
+						subject: 'Welcome to ' + (meta.config.title || 'NodeBB') + '!',
-					site_title: (meta.config.title || 'NodeBB'),
+						template: 'welcome',
-					username: username,
+						uid: uid
-					confirm_link: confirm_link,
+					};
 
-					subject: 'Welcome to ' + (meta.config.title || 'NodeBB') + '!',
+					if (plugins.hasListeners('action:user.verify')) {
-					template: 'welcome',
+						plugins.fireHook('action:user.verify', uid, data);
-					uid: uid
+					} else if (plugins.hasListeners('action:email.send')) {
+						emailer.send('welcome', uid, data);
+					}
 				});
 			});
 		});