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

Fix email settings loading:

Browse source 
MAIL_URL was overriden with database info all the time.
Now if MAIL_URL exists is not overwritten and if neither MAIL_URL nor
exists valid admin panel data MAIL_URL is not set.
MAIL_FROM was ignored. Same behaviour, env variable has bigger priority
than database configuration.
On both cases, althrought environment variable is set, updating admin-panel
mail settings will load new info and ignore the environment variable.
Remove some code that is not needed anymore
This commit is contained in:
Julen Landa Alustiza 2017-04-01 21:46:09 +02:00
parent 823aea497b
commit dfeeec308a
4 changed files with 38 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/notifications/email.js
View file

@ -26,17 +26,15 @@ Meteor.startup(() => {
const text = texts.join('\n\n');
user.clearEmailBuffer();
if (Settings.findOne().mailUrl()) {
try {
Email.send({
to: user.emails[0].address.toLowerCase(),
from: Accounts.emailTemplates.from,
subject: TAPi18n.__('act-activity-notify', {}, user.getLanguage()),
text,
});
} catch (e) {
return;
}
try {
Email.send({
to: user.emails[0].address.toLowerCase(),
from: Accounts.emailTemplates.from,
subject: TAPi18n.__('act-activity-notify', {}, user.getLanguage()),
text,
});
} catch (e) {
return;
}
}, 30000);
});