Changeset 3013

Timestamp:

09/06/06 22:36:35 (18 years ago)

Author:

jerome

Message:

Killed another item from the TODO list

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (2 diffs)
• bin/pkmail (modified) (3 diffs)
• pykota/tool.py (modified) (3 diffs)
• TODO (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -42 +42 @@
 from email.MIMEText import MIMEText
 from email.Header import Header
+import email.Utils
 
 from mx import DateTime
@@ -1037 +1038 @@
                         else :    
                             msg["To"] = adminmail
+                        msg["Date"] = email.Utils.formatdate(localtime=True)
                         server.sendmail(adminmail, destination, msg.as_string())
                     except smtplib.SMTPException, answer :    

pykota/trunk/bin/pkmail

@@ -30 +30 @@
 import smtplib
 import email
+from email.MIMEText import MIMEText
+from email.Header import Header
+import email.Utils
 
 from pykota.tool import PyKotaTool, PyKotaCommandLineError, crashed, N_
@@ -96 +99 @@
             
         if cheatmeonce :    
-            self.logdebug("Possible intruder at %s : %s" % (useremail, str(arguments)))
+            self.printInfo("Possible intruder at %s : %s" % (useremail, str(arguments)), "warn")
             result = "Either you mistyped your command, or you're a bad guy !"
         else :
@@ -104 +107 @@
         
         self.logdebug("Sending answer to : %s" % useremail)
+        emailmsg = MIMEText(result, _charset=self.charset)
+        emailmsg["Subject"] = str(Header(_("Result of your commands"), charset=self.charset))
+        emailmsg["From"] = whoami
+        emailmsg["To"] = useremail
+        emailmsg["Date"] = email.Utils.formatdate(localtime=True)
         server = smtplib.SMTP(self.smtpserver)
-        server.sendmail(whoami, [ useremail ], "From: %s\nTo: %s\nSubject: Result of your commands\n\n%s\n" % (whoami, useremail, result))
+        server.sendmail(whoami, [ useremail ], emailmsg.as_string())
         server.quit()
         self.logdebug("Answer sent to : %s" % useremail)

pykota/trunk/pykota/tool.py

@@ -35 +35 @@
 from email.MIMEText import MIMEText
 from email.Header import Header
+import email.Utils
 
 from mx import DateTime
@@ -360 +361 @@
                 msg["To"] = crashrecipient
                 msg["Cc"] = admin
+                msg["Date"] = email.Utils.formatdate(localtime=True)
                 server.sendmail(admin, [admin, crashrecipient], msg.as_string())
                 server.quit()
@@ -495 +497 @@
         msg["From"] = adminmail
         msg["To"] = usermail
+        msg["Date"] = email.Utils.formatdate(localtime=True)
         self.sendMessage(adminmail, usermail, msg.as_string())
         

pykota/trunk/TODO

@@ -21 +21 @@
 
 TODO, in no particular order :
-        
-        - Add a date header to all email messages sent, because some
-          spam detection tools cause SMTP servers to reject the 
-          messages with no date.
         
         - Allow the disabling of an user print quota entry without