Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-09-22 01:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #943 from Zokormazo/smtp

Browse source 
Don't send emails if missing smtp host
This commit is contained in:
Lauri Ojansivu 2017-03-28 20:52:39 +03:00 • committed by GitHub
commit 0c36f5f4c2
4 changed files with 47 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

36
models/users.js
View file

@ -373,24 +373,25 @@ if (Meteor.isServer) {
board.addMember(user._id);
user.addInvite(boardId);
try {
const params = {
user: user.username,
inviter: inviter.username,
board: board.title,
url: board.absoluteUrl(),
};
const lang = user.getLanguage();
Email.send({
to: user.emails[0].address.toLowerCase(),
from: Accounts.emailTemplates.from,
subject: TAPi18n.__('email-invite-subject', params, lang),
text: TAPi18n.__('email-invite-text', params, lang),
});
} catch (e) {
throw new Meteor.Error('email-fail', e.message);
if (Settings.findOne().mailUrl()) {
try {
const params = {
user: user.username,
inviter: inviter.username,
board: board.title,
url: board.absoluteUrl(),
};
const lang = user.getLanguage();
Email.send({
to: user.emails[0].address.toLowerCase(),
from: Accounts.emailTemplates.from,
subject: TAPi18n.__('email-invite-subject', params, lang),
text: TAPi18n.__('email-invite-text', params, lang),
});
} catch (e) {
throw new Meteor.Error('email-fail', e.message);
}
}
return { username: user.username, email: user.emails[0].address };
},
});
@ -510,4 +511,3 @@ if (Meteor.isServer) {
}
});
}