messages: Make sure all messages have a To: header

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 451d0a1a7b7a7d9f895f0901d960a25d011d49f8..8eababbd144b0565b469381d37b4d273b2f0b17c 100644 (file)
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -481,7 +481,7 @@ class Accounts(Object):
 
                # Send email about account registration
                self.backend.messages.send_template("people/messages/new-account",
-                       recipients=["moderators@ipfire.org"], account=account)
+                       account=account)
 
                # Launch drip campaigns
                for campaign in ("signup", "christmas"):

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index 7d1d0cbafbb17f60d5208c02ab6cdf244ee0fbf6..02bb24ff786ddbb3376b20fc57bd8d4d5578ffb5 100644 (file)
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -445,7 +445,7 @@ class Page(misc.Object):
 
                        # Compose message
                        self.backend.messages.send_template("wiki/messages/page-changed",
-                               recipients=[watcher], page=self, priority=-10)
+                               account=watcher, page=self, priority=-10)
 
        def restore(self, author, address):
                changes = "Restore to revision from %s" % self.timestamp.isoformat()

diff --git a/src/templates/auth/messages/password-reset.txt b/src/templates/auth/messages/password-reset.txt
index 52888d824230b855bdfc755ba29e971b68497cc7..c6f81bc822fec54f47a6b8c47a60ed997caacdbc 100644 (file)
--- a/src/templates/auth/messages/password-reset.txt
+++ b/src/templates/auth/messages/password-reset.txt
@@ -1,5 +1,5 @@
 From: IPFire Project <no-reply@ipfire.org>
-To: {{ account }} <{{ account.email }}>
+To: {{ account.email_to }}
 Subject: {{ _("Please Reset Your Password") }}
 X-Auto-Response-Suppress: OOF
 

diff --git a/src/templates/people/messages/new-account.txt b/src/templates/people/messages/new-account.txt
index fe7973f37c991e39fa46a977ec412d16883b89ff..9b9daacd37617b4e87851778d700681fc91b0cc4 100644 (file)
--- a/src/templates/people/messages/new-account.txt
+++ b/src/templates/people/messages/new-account.txt
@@ -1,4 +1,5 @@
 From: IPFire Project <no-reply@ipfire.org>
+To: IPFire Moderators <moderators@ipfire.org>
 Subject: {{ _("New Account Registered: %s") % account }}
 
 {{ _("Hello,") }}

diff --git a/src/templates/wiki/messages/page-changed.txt b/src/templates/wiki/messages/page-changed.txt
index 77c86e8ca2686f1578dbbab883ecf8fe4aa873d0..42058980fb4e00c3a19f69aad14355e73f42a7b2 100644 (file)
--- a/src/templates/wiki/messages/page-changed.txt
+++ b/src/templates/wiki/messages/page-changed.txt
@@ -1,4 +1,5 @@
 From: IPFire Project <no-reply@ipfire.org>
+To: {{ account.email_to }}
 Subject: [{{ _("IPFire Wiki") }}] {{ _("Page Changed: %s") % page.title }}
 
 Hey,