diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-08-26 03:39:27 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-08-26 03:39:27 +0300 |
commit | e21b3e6bb2dea62f19189f0d4ad4d5ca0aa06d33 (patch) | |
tree | 2c048fe35437bd255101d09f66608a0cce5c787f | |
parent | 777b65b1f7f732e9df65e9b6460adad6399d9f65 (diff) | |
parent | 4d4c127b991e04a060985bb2a5589c56a29c7f1c (diff) | |
download | wekan-e21b3e6bb2dea62f19189f0d4ad4d5ca0aa06d33.tar.gz wekan-e21b3e6bb2dea62f19189f0d4ad4d5ca0aa06d33.tar.bz2 wekan-e21b3e6bb2dea62f19189f0d4ad4d5ca0aa06d33.zip |
Merge branch 'fix-smtp-uri-malformed' of https://github.com/pkuhner/wekan into pkuhner-fix-smtp-uri-malformed
-rw-r--r-- | models/settings.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/settings.js b/models/settings.js index ce162d45..a490d9c5 100644 --- a/models/settings.js +++ b/models/settings.js @@ -45,7 +45,7 @@ Settings.helpers({ if (!this.mailServer.username && !this.mailServer.password) { return `${protocol}${this.mailServer.host}:${this.mailServer.port}/`; } - return `${protocol}${this.mailServer.username}:${this.mailServer.password}@${this.mailServer.host}:${this.mailServer.port}/`; + return `${protocol}${this.mailServer.username}:${encodeURIComponent(this.mailServer.password)}@${this.mailServer.host}:${this.mailServer.port}/`; }, }); Settings.allow({ @@ -84,7 +84,7 @@ if (Meteor.isServer) { if (!doc.mailServer.username && !doc.mailServer.password) { process.env.MAIL_URL = `${protocol}${doc.mailServer.host}:${doc.mailServer.port}/`; } else { - process.env.MAIL_URL = `${protocol}${doc.mailServer.username}:${doc.mailServer.password}@${doc.mailServer.host}:${doc.mailServer.port}/`; + process.env.MAIL_URL = `${protocol}${doc.mailServer.username}:${encodeURIComponent(doc.mailServer.password)}@${doc.mailServer.host}:${doc.mailServer.port}/`; } Accounts.emailTemplates.from = doc.mailServer.from; } |