mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS os108 (1.7.26); FILE MERGED

Browse Source 
2007/11/29 06:43:28 os 1.7.26.2: #i77449# missing import added
2007/11/15 12:07:23 os 1.7.26.1: #i77449# SenderName added to mail merge e-Mail
This commit is contained in:
Vladimir Glazounov
2007-12-06 09:57:39 +00:00
parent e03b635c9f
commit 28499d947c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripting/source/pyprov/mailmerge.py
View File

@@ -36,6 +36,7 @@ from com.sun.star.mail import SendMailMessageFailedException
from email.MIMEBase import MIMEBase
from email.Message import Message
from email import Encoders
from email.Header import Header
from email.MIMEMultipart import MIMEMultipart
from email.Utils import formatdate
@@ -115,13 +116,15 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
if dbg:
print >> sys.stderr, "PyMailSMPTService sendMailMessage"
recipients = xMailMessage.getRecipients()
sender = xMailMessage.SenderAddress
sendermail = xMailMessage.SenderAddress
sendername = xMailMessage.SenderName
subject = xMailMessage.Subject
ccrecipients = xMailMessage.getCcRecipients()
bccrecipients = xMailMessage.getBccRecipients()
if dbg:
print >> sys.stderr, "PyMailSMPTService subject", subject
print >> sys.stderr, "PyMailSMPTService from", sender
print >> sys.stderr, "PyMailSMPTService from", sendername.encode('utf-8')
print >> sys.stderr, "PyMailSMTPService from", sendermail
print >> sys.stderr, "PyMailSMPTService send to", recipients
attachments = xMailMessage.getAttachments()
@@ -146,8 +149,10 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
else:
msg = textmsg
msg['Subject'] = subject
msg['From'] = sender
hdr = Header(sendername, 'utf-8')
hdr.append('<'+sendermail+'>','us-ascii')
msg['Subject'] = subject
msg['From'] = hdr
msg['To'] = COMMASPACE.join(recipients)
if len(ccrecipients):
msg['Cc'] = COMMASPACE.join(ccrecipients)
@@ -185,7 +190,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
if dbg:
print >> sys.stderr, "PyMailSMPTService recipients are", truerecipients
self.server.sendmail(sender, truerecipients, msg.as_string())
self.server.sendmail(sendermail, truerecipients, msg.as_string())
class PyMailIMAPService(unohelper.Base, XMailService):
def __init__( self, ctx ):