Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Try to fix MAIL_FROM.

Browse source 
Thanks to xet7 !

Fixes #3972,
fixes #3975,
fixes #3969
This commit is contained in:
Lauri Ojansivu 2021-08-27 14:35:37 +03:00
parent 8e142dfdcf
commit 787df04419
5 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
models/settings.js
View file

@ -159,7 +159,6 @@ if (Meteor.isServer) {
};
Settings.insert(defaultSetting);
}
/*
if (isSandstorm) {
// At Sandstorm, Admin Panel has SMTP settings
const newSetting = Settings.findOne();
@ -172,9 +171,7 @@ if (Meteor.isServer) {
// Not running on Sandstorm, so using environment variables
Accounts.emailTemplates.from = process.env.MAIL_FROM;
}
*/
});
/*
if (isSandstorm) {
// At Sandstorm Wekan Admin Panel, save SMTP settings.
Settings.after.update((userId, doc, fieldNames) => {
@ -194,7 +191,6 @@ if (Meteor.isServer) {
}
});
}
*/
function getRandomNum(min, max) {
const range = max - min;
@ -241,7 +237,7 @@ if (Meteor.isServer) {
subject: TAPi18n.__('email-invite-register-subject', params, lang),
text: TAPi18n.__('email-invite-register-text', params, lang),
})
} else if (process.env.MAIL_URL !== '') {
} else {
Email.send({
to: icode.email,
from: Accounts.emailTemplates.from,
@ -355,7 +351,7 @@ if (Meteor.isServer) {
subject: TAPi18n.__('email-smtp-test-subject', { lng: lang }),
text: TAPi18n.__('email-smtp-test-text', { lng: lang }),
})
} else if (process.env.MAIL_URL !== '') {
} else {
Email.send({
to: user.emails[0].address,
from: Accounts.emailTemplates.from,