From e34b6b57cccc739cf51bfb386e7b91aea41c0d59 Mon Sep 17 00:00:00 2001
From: fpeters <>
Date: Mon, 19 Apr 2004 09:58:01 +0000
Subject: [PATCH] =?UTF-8?q?2=20niveaux=20de=20fallback=20pour=20le=20messa?=
 =?UTF-8?q?ge=20de=20bienvenue;=20qui=20peut=20=C3=AAtre=20envoy=C3=A9=20a?=
 =?UTF-8?q?vec=20des=20accents?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PasswordAccountsServer.py                    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/servers/PasswordAccountsServer/PasswordAccountsServer.py b/servers/PasswordAccountsServer/PasswordAccountsServer.py
index e8363ed9..15242768 100755
--- a/servers/PasswordAccountsServer/PasswordAccountsServer.py
+++ b/servers/PasswordAccountsServer/PasswordAccountsServer.py
@@ -268,6 +268,10 @@ class PasswordAccountsServer(
         messageFileName = commonTools.getConfig(
                 commonTools.extractDispatcherId(object.id),
                 'WelcomeEmail-%s' % personLanguage)
+        if not messageFileName:
+            messageFileName = commonTools.getConfig(
+                    commonTools.extractDispatcherId(object.id), 'WelcomeEmail')
+            
         messageSubject = commonTools.getConfig(
                 commonTools.extractDispatcherId(object.id),
                 'WelcomeEmailSubject',
@@ -304,6 +308,10 @@ The Glasnost administrator - %(fromAddress)s
                 mailTo = toAddress,
                 mailSubject = messageSubject,
                 mailMessage = message,
+                moreHeaders = {
+                    'Content-Type': 'text/plain; charset=iso-8859-1',
+                    'Content-Transfer-Encoding': '8bit',
+                    }
                 )
 
 
@@ -378,6 +386,14 @@ The Glasnost administrator - %(fromAddress)s
 
 
     def getAdminEmailAddresses(self, stopAsap = 0):
+        # if an address is set in the config file we use it; otherwise we
+        # must grab addresses from self.admin.adminsSet
+        email = commonTools.getConfig(
+            commonTools.extractDispatcherId(context.getVar('dispatcherId')),
+            'AdminEmailAddress')
+        if email:
+            return [email]
+
         virtualServerId = context.getVar('applicationId')
         virtualServer = self.getVirtualServer(virtualServerId)
         try: