Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40: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

5
Dockerfile
View file

@ -21,11 +21,6 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
ARCHITECTURE=linux-x64 \ ARCHITECTURE=linux-x64 \
SRC_PATH=./ \ SRC_PATH=./ \
WITH_API=true \ WITH_API=true \
MAIL_URL="" \
MAIL_FROM="" \
MAIL_SERVICE="" \
MAIL_SERVICE_USER="" \
MAIL_SERVICE_PASSWORD="" \
RESULTS_PER_PAGE="" \ RESULTS_PER_PAGE="" \
ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \ ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \ ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \

8
models/settings.js
View file

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

2
models/users.js
View file

@ -1234,7 +1234,7 @@ if (Meteor.isServer) {
subject: TAPi18n.__('email-invite-subject', params, lang), subject: TAPi18n.__('email-invite-subject', params, lang),
text: TAPi18n.__('email-invite-text', params, lang), text: TAPi18n.__('email-invite-text', params, lang),
}) })
} else if (process.env.MAIL_URL !== '') { } else {
Email.send({ Email.send({
to: user.emails[0].address.toLowerCase(), to: user.emails[0].address.toLowerCase(),
from: Accounts.emailTemplates.from, from: Accounts.emailTemplates.from,

2
server/notifications/email.js
View file

@ -54,7 +54,7 @@ Meteor.startup(() => {
subject, subject,
html, html,
}) })
} else if (process.env.MAIL_URL !== '') { } else {
Email.send({ Email.send({
to: user.emails[0].address.toLowerCase(), to: user.emails[0].address.toLowerCase(),
from: Accounts.emailTemplates.from, from: Accounts.emailTemplates.from,

2
server/rulesHelper.js
View file

@ -135,7 +135,7 @@ RulesHelper = {
subject, subject,
text, text,
}) })
} else if (process.env.MAIL_URL !== '') { } else {
Email.send({ Email.send({
to, to,
from: Accounts.emailTemplates.from, from: Accounts.emailTemplates.from,