From a2627d20667353d55a7dbf77836a8907858b1670 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 13 Jul 2017 11:30:44 -0400
Subject: [PATCH] added default payload to emails, and adding nodebb logo for
 email header

---
 public/images/emails/nodebb.png | Bin 0 -> 6285 bytes
 src/emailer.js                  |  10 ++++++++++
 src/messaging/notifications.js  |   2 --
 src/socket.io/admin.js          |   2 --
 src/socket.io/user.js           |   1 -
 src/socket.io/user/ban.js       |   1 -
 src/topics/follow.js            |   1 -
 src/user/approval.js            |   1 -
 src/user/digest.js              |   2 --
 src/user/email.js               |   1 -
 src/user/reset.js               |   1 -
 src/views/emails/welcome.tpl    |  14 ++++++++++++--
 12 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 public/images/emails/nodebb.png

diff --git a/public/images/emails/nodebb.png b/public/images/emails/nodebb.png
new file mode 100644
index 0000000000000000000000000000000000000000..11ac9507adaccf6d55a7267f4648adc2cfca9dbc
GIT binary patch
literal 6285
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

literal 0
HcmV?d00001

diff --git a/src/emailer.js b/src/emailer.js
index 38d68102c1..5120ef9caf 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -25,10 +25,17 @@ var fallbackTransport;
 
 var Emailer = module.exports;
 
+Emailer._defaultPayload = {};
 
 Emailer.registerApp = function (expressApp) {
 	app = expressApp;
 
+	Emailer._defaultPayload = {
+		url: nconf.get('url'),
+		site_title: meta.config.title || 'NodeBB',
+		'brand:logo': nconf.get('url') + meta.config['brand:logo'],
+	};
+
 	// Enable Gmail transport if enabled in ACP
 	if (parseInt(meta.config['email:GmailTransport:enabled'], 10) === 1) {
 		transports.gmail = nodemailer.createTransport(smtpTransport({
@@ -55,6 +62,9 @@ Emailer.send = function (template, uid, params, callback) {
 		return callback();
 	}
 
+	// Combined passed-in payload with default values
+	params = Object.assign({}, Emailer._defaultPayload, params);
+
 	async.waterfall([
 		function (next) {
 			async.parallel({
diff --git a/src/messaging/notifications.js b/src/messaging/notifications.js
index 5d433b2c33..12640def03 100644
--- a/src/messaging/notifications.js
+++ b/src/messaging/notifications.js
@@ -124,8 +124,6 @@ module.exports = function (Messaging) {
 						subject: '[[email:notif.chat.subject, ' + messageObj.fromUser.username + ']]',
 						summary: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
 						message: messageObj,
-						site_title: meta.config.title || 'NodeBB',
-						url: nconf.get('url'),
 						roomId: messageObj.roomId,
 						username: userData.username,
 						userslug: userData.userslug,
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index 6f1345afdd..304fdd831c 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -228,8 +228,6 @@ SocketAdmin.email.test = function (socket, data, callback) {
 	var site_title = meta.config.title || 'NodeBB';
 	var payload = {
 		subject: '[' + site_title + '] Test Email',
-		site_title: site_title,
-		url: nconf.get('url'),
 	};
 
 	switch (data.template) {
diff --git a/src/socket.io/user.js b/src/socket.io/user.js
index d59fad3c58..1ed67276c4 100644
--- a/src/socket.io/user.js
+++ b/src/socket.io/user.js
@@ -128,7 +128,6 @@ SocketUser.reset.commit = function (socket, data, callback) {
 			emailer.send('reset_notify', uid, {
 				username: username,
 				date: parsedDate,
-				site_title: meta.config.title || 'NodeBB',
 				subject: '[[email:reset.notify.subject]]',
 			});
 
diff --git a/src/socket.io/user/ban.js b/src/socket.io/user/ban.js
index d6cfbd6f68..a61a9b83ee 100644
--- a/src/socket.io/user/ban.js
+++ b/src/socket.io/user/ban.js
@@ -107,7 +107,6 @@ module.exports = function (SocketUser) {
 				var siteTitle = meta.config.title || 'NodeBB';
 				var data = {
 					subject: '[[email:banned.subject, ' + siteTitle + ']]',
-					site_title: siteTitle,
 					username: username,
 					until: until ? utils.toISOString(until) : false,
 					reason: reason,
diff --git a/src/topics/follow.js b/src/topics/follow.js
index 89db6b3d13..62ee424eea 100644
--- a/src/topics/follow.js
+++ b/src/topics/follow.js
@@ -259,7 +259,6 @@ module.exports = function (Topics) {
 								subject: '[' + (meta.config.title || 'NodeBB') + '] ' + title,
 								intro: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + titleEscaped + ']]',
 								postBody: postData.content.replace(/"\/\//g, '"https://'),
-								site_title: meta.config.title || 'NodeBB',
 								username: data.userData.username,
 								userslug: data.userData.userslug,
 								url: nconf.get('url') + '/topic/' + postData.topic.tid,
diff --git a/src/user/approval.js b/src/user/approval.js
index d04686a7b0..4beeab6806 100644
--- a/src/user/approval.js
+++ b/src/user/approval.js
@@ -89,7 +89,6 @@ module.exports = function (User) {
 				var title = meta.config.title || meta.config.browserTitle || 'NodeBB';
 				translator.translate('[[email:welcome-to, ' + title + ']]', meta.config.defaultLang, function (subject) {
 					var data = {
-						site_title: title,
 						username: username,
 						subject: subject,
 						template: 'registration_accepted',
diff --git a/src/user/digest.js b/src/user/digest.js
index 61b727de3a..ffd4f9031e 100644
--- a/src/user/digest.js
+++ b/src/user/digest.js
@@ -136,8 +136,6 @@ Digest.send = function (data, callback) {
 							subject: '[' + meta.config.title + '] [[email:digest.subject, ' + (now.getFullYear() + '/' + (now.getMonth() + 1) + '/' + now.getDate()) + ']]',
 							username: userObj.username,
 							userslug: userObj.userslug,
-							url: nconf.get('url'),
-							site_title: meta.config.title || meta.config.browserTitle || 'NodeBB',
 							notifications: notifications,
 							recent: data.topics,
 							interval: data.interval,
diff --git a/src/user/email.js b/src/user/email.js
index 734e247eb1..9c61211d9a 100644
--- a/src/user/email.js
+++ b/src/user/email.js
@@ -102,7 +102,6 @@ UserEmail.sendValidationEmail = function (uid, options, callback) {
 			var title = meta.config.title || meta.config.browserTitle || 'NodeBB';
 			translator.translate('[[email:welcome-to, ' + title + ']]', meta.config.defaultLang, function (subject) {
 				var data = {
-					site_title: title,
 					username: username,
 					confirm_link: confirm_link,
 					confirm_code: confirm_code,
diff --git a/src/user/reset.js b/src/user/reset.js
index 438d629225..2aaa1d76bb 100644
--- a/src/user/reset.js
+++ b/src/user/reset.js
@@ -85,7 +85,6 @@ UserReset.send = function (email, callback) {
 		function (subject, code, next) {
 			var reset_link = nconf.get('url') + '/reset/' + code;
 			emailer.send('reset', uid, {
-				site_title: (meta.config.title || 'NodeBB'),
 				reset_link: reset_link,
 				subject: subject,
 				template: 'reset',
diff --git a/src/views/emails/welcome.tpl b/src/views/emails/welcome.tpl
index 3ac45b06cd..6f126a7754 100644
--- a/src/views/emails/welcome.tpl
+++ b/src/views/emails/welcome.tpl
@@ -173,12 +173,22 @@
 			<td>
 			<![endif]-->
 
+			<!-- Email Header : BEGIN -->
+			<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px;">
+				<tr>
+					<td style="padding: 20px 0; text-align: center">
+						<img src="http://juliantest.nodebb.com/assets/images/emails/nodebb.png" height="100" width="245" alt="alt_text" border="0" style="height: auto; background: #dddddd; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
+					</td>
+				</tr>
+			</table>
+			<!-- Email Header : END -->
+
 			<!-- Email Body : BEGIN -->
 			<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px;">
 
 				<!-- Hero Image, Flush : BEGIN -->
 				<tr>
-					<td bgcolor="#ffffff" style="text-align: center; background-image: url(http://juliantest.nodebb.com/assets/images/emails/triangularbackground.png); background-size: cover; background-repeat: no-repeat;">
+					<td bgcolor="#efeff0" style="text-align: center; background-image: url(http://juliantest.nodebb.com/assets/images/emails/triangularbackground.png); background-size: cover; background-repeat: no-repeat;">
 						<img src="http://juliantest.nodebb.com/assets/images/emails/emailconfirm.png" width="600" height="" alt="alt_text" border="0" align="center" style="width: 50%; max-width: 600px; height: auto; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;" class="g-img">
 					</td>
 				</tr>
@@ -186,7 +196,7 @@
 
 				<!-- 1 Column Text + Button : BEGIN -->
 				<tr>
-					<td bgcolor="#ffffff">
+					<td bgcolor="#efeff0">
 						<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
 							<tr>
 								<td style="padding: 40px; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;">