Merge pull request #519 from HorlogeSkynet/master

Removes potential '//' from email links (#420)
This commit is contained in:
Jelmer Vernooij 2018-12-30 13:39:02 +00:00 committed by GitHub
commit 5b44ca8fb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -77,6 +77,8 @@ class SMTP(object):
self.isso = isso self.isso = isso
self.conf = isso.conf.section("smtp") self.conf = isso.conf.section("smtp")
self.public_endpoint = isso.conf.get("server", "public-endpoint") or local("host") self.public_endpoint = isso.conf.get("server", "public-endpoint") or local("host")
if self.public_endpoint.endswith('/'):
self.public_endpoint = self.public_endpoint.rstrip('/')
self.admin_notify = any((n in ("smtp", "SMTP")) for n in isso.conf.getlist("general", "notify")) self.admin_notify = any((n in ("smtp", "SMTP")) for n in isso.conf.getlist("general", "notify"))
self.reply_notify = isso.conf.getboolean("general", "reply-notifications") self.reply_notify = isso.conf.getboolean("general", "reply-notifications")