Changes for issue #976. Still need some work

pull/7098/head
Luis Fernando do Nascimento 9 years ago
parent 2e38466800
commit 14825360ca
  1. 1
      packages/rocketchat-i18n/i18n/en.i18n.json
  2. 26
      server/lib/accounts.js

@ -1106,6 +1106,7 @@
"Office_hours_updated": "Office hours updated",
"Offline": "Offline",
"Offline_DM_Email": "You have been direct messaged by __user__",
"User_Needs_Approval": "A new user registered and needs approval",
"Offline_form": "Offline form",
"Offline_form_unavailable_message": "Offline form unavailable message",
"Offline_Link_Message": "GO TO MESSAGE",

@ -91,6 +91,32 @@ Accounts.onCreateUser(function(options, user = {}) {
}
}
if (!user.active) {
user.emails.some((email) => {
const header = RocketChat.placeholders.replace(RocketChat.settings.get('Email_Header') || '');
const footer = RocketChat.placeholders.replace(RocketChat.settings.get('Email_Footer') || '');
const divisorMessage = '<hr style="margin: 20px auto; border: none; border-bottom: 1px solid #dddddd;">';
const siteName = RocketChat.settings.get('Site_Name');
const messageHTML = `<p>A user with email <b>${options.email}</b> has been registered. <br>Please check Administration -> Users to activate or delete it.`;
emailSubject = TAPi18n.__('User_Needs_Approval');
RocketChat.models.Roles.findUsersInRole('admin').forEach(function (adminUser) {
email = {
to: adminUser.emails[0].address,
from: RocketChat.settings.get('From_Email'),
subject: `[${ siteName }] ${ emailSubject }`,
html: header + messageHTML + divisorMessage + footer
};
});
Meteor.defer(() => {
Email.send(email);
});
});
}
return user;
});

Loading…
Cancel
Save