Changeset 1353 for pykota/trunk/pykota/tool.py

Timestamp:

02/19/04 15:20:21 (20 years ago)

Author:

jalet

Message:

maildomain pykota.conf directive added.
Small improvements on mail headers quality.

Files:

• pykota/trunk/pykota/tool.py (modified) (4 diffs)

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.73  2004/02/19 14:20:21  jalet
+# maildomain pykota.conf directive added.
+# Small improvements on mail headers quality.
+#
 # Revision 1.72  2004/01/14 15:51:19  jalet
 # Docstring added.
@@ -317 +321 @@
         self.storage = storage.openConnection(self)
         self.smtpserver = self.config.getSMTPServer()
+        self.maildomain = self.config.getMailDomain()
         
     def logdebug(self, message) :    
@@ -425 +430 @@
         """Sends an email message containing headers to some user."""
         if "@" not in touser :
-            touser = "%s@%s" % (touser, self.smtpserver)
+            touser = "%s@%s" % (touser, self.maildomain or self.smtpserver)
         server = smtplib.SMTP(self.smtpserver)
         try :
-            server.sendmail(adminmail, [touser], fullmessage)
+            server.sendmail(adminmail, [touser], "From: %s\nTo: %s\n%s" % (adminmail, touser, fullmessage))
         except smtplib.SMTPRecipientsRefused, answer :    
             for (k, v) in answer.recipients.items() :
@@ -574 +579 @@
         email = user.Email or user.Name
         if "@" not in email :
-            email = "%s@%s" % (email, self.smtpserver)
+            email = "%s@%s" % (email, self.maildomain or self.smtpserver)
         os.system(cmd % locals())