From 3bfba8a3f6729b31a4810cfdad9bc6783ba579f1 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@forwardbias.in>
Date: Tue, 3 Mar 2015 22:29:06 -0800
Subject: [PATCH] Fix user event mail template

---
 src/mail_templates/user_event.ejs | 15 +++++++++++++++
 src/mail_templates/user_html.ejs  |  1 -
 src/mail_templates/user_text.ejs  |  1 -
 src/mailer.js                     |  3 +--
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 src/mail_templates/user_event.ejs
 delete mode 100644 src/mail_templates/user_html.ejs
 delete mode 100644 src/mail_templates/user_text.ejs

diff --git a/src/mail_templates/user_event.ejs b/src/mail_templates/user_event.ejs
new file mode 100644
index 000000000..eeb9b58b1
--- /dev/null
+++ b/src/mail_templates/user_event.ejs
@@ -0,0 +1,15 @@
+<%if (format === 'text') { %>
+
+Dear Admin,
+
+User with name '<%= username %>' (<%= email %>) was <%= event %> in the Cloudron at <%= fqdn %>.
+
+You are receiving this email because you are an Admin of the Cloudron at <%= fqdn %>.
+
+Thank you,
+User Manager
+
+<% } else { %>
+
+<% } %>
+
diff --git a/src/mail_templates/user_html.ejs b/src/mail_templates/user_html.ejs
deleted file mode 100644
index db57d57fd..000000000
--- a/src/mail_templates/user_html.ejs
+++ /dev/null
@@ -1 +0,0 @@
-User <%= username %> was <%= event %>, just letting you know.
diff --git a/src/mail_templates/user_text.ejs b/src/mail_templates/user_text.ejs
deleted file mode 100644
index f41bbc4cd..000000000
--- a/src/mail_templates/user_text.ejs
+++ /dev/null
@@ -1 +0,0 @@
-User <%= username %> was <%= event %>, just letting you know
diff --git a/src/mailer.js b/src/mailer.js
index ce42019a3..8aa6e62bd 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -133,8 +133,7 @@ function mailUserEventToAdmins(user, event) {
             from: config.get('mailUsername'),
             to: adminEmails.join(', '),
             subject: 'User ' + event,
-            text: render('user_text.ejs', { username: user.username, event: event }),
-            html: render('user_html.ejs', { username: user.username, event: event })
+            text: render('user_event.ejs', { fqdn: config.fqdn(), username: user.username, email: user.email, event: event, format: 'text' }),
         };
 
         enqueue(mailOptions);