Browse Source

Added MAIL_SERVICE settings. Part 2.

Thanks to xet7 !

Fixes #3702
Lauri Ojansivu 3 years ago
parent
commit
1fadf204c2
4 changed files with 9 additions and 5 deletions
  1. 6 2
      models/settings.js
  2. 1 1
      models/users.js
  3. 1 1
      server/notifications/email.js
  4. 1 1
      server/rulesHelper.js

+ 6 - 2
models/settings.js

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

+ 1 - 1
models/users.js

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

+ 1 - 1
server/notifications/email.js

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

+ 1 - 1
server/rulesHelper.js

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