Skip to content

Z
Zope
Commit f12c21df authored by Jeffrey Shell's avatar Jeffrey Shell
Browse files
Options

New send features _somewhat_ working. simple_send works (litely), 

sentTemplate works, but does not (yet) completely overthrow the to: from:
headers...
parent c26432ee
Hide whitespace changes
Inline Side-by-side
Showing with 222 additions and 275 deletions
lib/python/Products/MailHost/MailHost.py
View file @ f12c21df
...@@ -2,230 +2,233 @@ from Globals import Persistent, HTMLFile, HTML ...@@ -2,230 +2,233 @@ from Globals import Persistent, HTMLFile, HTML
from socket import * from socket import *
import Acquisition, sys, regex, string import Acquisition, sys, regex, string
#$Id: MailHost.py,v 1.1 1997/09/09 20:50:29 jeffrey Exp $ #$Id: MailHost.py,v 1.2 1997/09/09 21:33:41 jeffrey Exp $
__version__ = "$Revision: 1.1 $"[11:-2] __version__ = "$Revision: 1.2 $"[11:-2]
smtpError = "SMTP Error" smtpError = "SMTP Error"
MailHostError = "MailHost Error" MailHostError = "MailHost Error"
addForm=HTMLFile('MailHost/addMailHost_form') addForm=HTMLFile('MailHost/addMailHost_form')
def add(self, id='aMailHost', title='Some mail thing', smtp_host=None, def add(self, id='aMailHost', title='Some mail thing', smtp_host=None,
localhost='localhost', smtp_port=25, mailTemplate=None, localhost='localhost', smtp_port=25, REQUEST):
errorTemplate=None, sentMailTemplate=None, REQUEST): ' add a MailHost into the system '
' add a MailHost into the system ' i=MailHost() #create new mail host
i=MailHost() #create new mail host i.id=id #give it id
i.id=id #give it id i.title=title #title
i.title=title #title i._init(localHost=localhost, smtpHost=smtp_host, smtpPort=smtp_port)
i._init(localHost=localhost, smtpHost=smtp_host, smtpPort=smtp_port, self._setObject(id,i) #register it
mailTemplate=mailTemplate, errorTemplate=errorTemplate, return self.manage_main(self,REQUEST) #and whatever this does.. :)
sentMailTemplate=sentMailTemplate)
self._setObject(id,i) #register it
return self.manage_main(self,REQUEST) #and whatever this does.. :)
class MailHost(Persistent, Acquisition.Implicit): class MailHost(Persistent, Acquisition.Implicit):
'a mailhost...?' 'a mailhost...?'
manage=HTMLFile('MailHost/manageMailHost') manage=HTMLFile('MailHost/manageMailHost')
index_html=HTMLFile('MailHost/mailHost') index_html=HTMLFile('MailHost/mailHost')
icon="MailHost/MailHost_icon.gif" icon="MailHost/MailHost_icon.gif"
def __init__(self): def __init__(self):
'nothing yet' 'nothing yet'
pass pass
def _init(self, localHost, smtpHost, smtpPort): def _init(self, localHost, smtpHost, smtpPort):
self.localHost=localHost self.localHost=localHost
self.smtpHost=smtpHost self.smtpHost=smtpHost
self.smtpPort=smtpPort self.smtpPort=smtpPort
self.sentMessages=0 self.sentMessages=0
def manage_makeChanges(self, title, localHost, smtpHost, smtpPort): def manage_makeChanges(self, title, localHost, smtpHost, smtpPort):
'make the changes' 'make the changes'
self.title=title self.title=title
self.localHost=localHost self.localHost=localHost
self.smtpHost=smtpHost self.smtpHost=smtpHost
self.smtpPort=smtpPort self.smtpPort=smtpPort
return self.manage(self,REQUEST) return self.manage(self,REQUEST)
def __log(self): def __log(self):
self.sentMessages=self.sentMessages + 1 self.sentMessages=self.sentMessages + 1
def sendTemplate(trueself, self, messageTemplate, def sendTemplate(trueself, self, messageTemplate,
statusTemplate=None, to=None, from=None, REQUEST): statusTemplate=None, mto=None, mfrom=None, REQUEST):
'render a mail template, then send it...' 'render a mail template, then send it...'
mtemplate = getattr(self, messageTemplate) mtemplate = getattr(self, messageTemplate)
messageText = mtemplate(self, trueself.REQUEST) messageText = mtemplate(self, trueself.REQUEST)
headers, message = decapitate(messageText) headers, message = decapitate(messageText)
if to: headers['to'] = to if mto: headers['to'] = mto
if from: headers['from'] = from if mfrom: headers['from'] = mfrom
for requiredHeader in ('to', 'from', 'subject'): for requiredHeader in ('to', 'from', 'subject'):
if not headers.has_key(requiredHeader): if not headers.has_key(requiredHeader):
raise MailHostError,"Message missing SMTP Header '%s'"\ raise MailHostError,"Message missing SMTP Header '%s'"\
% requiredHeader % requiredHeader
SendMail(trueself.smtpHost, trueself.smtpPort, SendMail(trueself.smtpHost, trueself.smtpPort,
trueself.localHost).send( trueself.localHost).send(
mfrom=headers['from'], mto=headers['to'], mfrom=headers['from'], mto=headers['to'],
subj=headers['subject'], body=messageText subj=headers['subject'], body=messageText
) )
self.__log() self.__log()
return ("sent","sent...") return ("sent","sent...")
#return getattr(self,statusTemplate)(self, self.REQUEST, #return getattr(self,statusTemplate)(self, self.REQUEST,
# messageText=message) # messageText=message)
def send(self, messageText, to=None, from=None): def send(self, messageText, mto=None, mfrom=None):
'send a rendered message' 'send a rendered message'
headers, message = decapitate(messageText) headers, message = decapitate(messageText)
if to: headers['to'] = to if mto: headers['to'] = mto
if from: headers['from'] = from if mfrom: headers['from'] = mfrom
for requiredHeader in ('to', 'from', 'subject'): for requiredHeader in ('to', 'from', 'subject'):
if not headers.has_key(requiredHeader): if not headers.has_key(requiredHeader):
raise MailHostError,"Message missing SMTP Header '%s'"\ raise MailHostError,"Message missing SMTP Header '%s'"\
% requiredHeader % requiredHeader
SendMail(self.smtpHost, self.smtpPort, self.localHost).send( SendMail(self.smtpHost, self.smtpPort, self.localHost).send(
mfrom=headers['from'], mto=headers['to'], mfrom=headers['from'], mto=headers['to'],
subj=headers['subject'], body=messageText) subj=headers['subject'], body=messageText)
self.__log() self.__log()
return ("sent","sent...") return ("sent","sent...")
#return getattr(self,statusTemplate)(self, self.REQUEST, #return getattr(self,statusTemplate)(self, self.REQUEST,
# messageText=message) # messageText=message)
def simple_send(self, to, from, subject, body): def simple_send(self, mto, mfrom, subject, body):
'like the simplist send or something' 'like the simplist send or something'
SendMail(self.smtpHost, self.smtpPort, self.localHost).send( body="subject: %s\n\n%s" % (subject, body)
mfrom=from, mto=to, subj=subject, body=body) SendMail(self.smtpHost, self.smtpPort, self.localHost).send(
self.__log() mfrom=mfrom, mto=mto, subj=subject, body=body)
return ("sent","sent...") self.__log()
return ("sent","sent...")
# def send(trueself, self):
# 'uhh, sponges off the request and mails it..?' # def send(trueself, self):
# if trueself.REQUEST.has_key('d_template'): # 'uhh, sponges off the request and mails it..?'
# mtemplate = getattr(self, trueself.REQUEST['d_template']) # if trueself.REQUEST.has_key('d_template'):
# else: # mtemplate = getattr(self, trueself.REQUEST['d_template'])
# mtemplate = getattr(self, trueself.mailTemplate) # else:
# messageText = mtemplate(self, trueself.REQUEST) # mtemplate = getattr(self, trueself.mailTemplate)
# headers, message = decapitate(messageText) # messageText = mtemplate(self, trueself.REQUEST)
# for requiredHeader in ('to', 'from', 'subject'): # headers, message = decapitate(messageText)
# if not headers.has_key(requiredHeader): # for requiredHeader in ('to', 'from', 'subject'):
# raise MailHostError, "Message missing SMTP Header '%s'" \ # if not headers.has_key(requiredHeader):
# % requiredHeader # raise MailHostError, "Message missing SMTP Header '%s'" \
# # % requiredHeader
# SendMail(trueself.smtpHost, trueself.smtpPort, #
# trueself.localHost).send( # SendMail(trueself.smtpHost, trueself.smtpPort,
# mfrom=headers['from'], mto=headers['to'], # trueself.localHost).send(
# subj=headers['subject'], body=messageText # mfrom=headers['from'], mto=headers['to'],
# ) # subj=headers['subject'], body=messageText
# )
# #
# return getattr(self,self.sentMailTemplate)(self, self.REQUEST, # return getattr(self,self.sentMailTemplate)(self, self.REQUEST,
# messageText=message) # messageText=message)
# #
# def trueSend(trueself, self=None, REQUEST=None, **kw): # def trueSend(trueself, self=None, REQUEST=None, **kw):
# if REQUEST: kw=REQUEST # if REQUEST: kw=REQUEST
# if self == None: self=trueself # if self == None: self=trueself
# if kw.has_key('d_template'): # if kw.has_key('d_template'):
# mtemplate = getattr(self, kw['d_template']) # mtemplate = getattr(self, kw['d_template'])
# else: # else:
# mtemplate = getattr(self, trueself.mailTemplate) # mtemplate = getattr(self, trueself.mailTemplate)
# messageText = mtemplate(self, kw) # messageText = mtemplate(self, kw)
# headers, message = decapitate(messageText) # headers, message = decapitate(messageText)
# for requiredHeader in ('to', 'from', 'subject'): # for requiredHeader in ('to', 'from', 'subject'):
# if not headers.has_key(requiredHeader): # if not headers.has_key(requiredHeader):
# raise MailHostError, "Message missing SMTP Header '%s'" \ # raise MailHostError, "Message missing SMTP Header '%s'" \
# % requiredHeader # % requiredHeader
# #
# SendMail(trueself.smtpHost, trueself.smtpPort, # SendMail(trueself.smtpHost, trueself.smtpPort,
# trueself.localHost).send( # trueself.localHost).send(
# mfrom=headers['from'], mto=headers['to'], # mfrom=headers['from'], mto=headers['to'],
# subj=headers['subject'], body=messageText # subj=headers['subject'], body=messageText
# ) # )
# #
# return getattr(trueself,trueself.sentMailTemplate)(self, kw, # return getattr(trueself,trueself.sentMailTemplate)(self, kw,
# messageText=message) # messageText=message)
class SendMail: class SendMail:
def __init__(self, smtpHost, smtpPort, localHost="localhost"): def __init__(self, smtpHost, smtpPort, localHost="localhost"):
self.conn = socket(AF_INET, SOCK_STREAM) self.conn = socket(AF_INET, SOCK_STREAM)
self.conn.connect(smtpHost, smtpPort) self.conn.connect(smtpHost, smtpPort)
self.conn.send("helo "+localHost+"\r\n") self.conn.send("helo "+localHost+"\r\n")
self._check('220') self._check('220')
def __del__(self): def __del__(self):
self.close() self.close()
def _check(self, lev='250'): def _check(self, lev='250'):
data = self.conn.recv(1024) data = self.conn.recv(1024)
if data[:3] != lev: if data[:3] != lev:
raise smtpError, "Expected %s, got %s from SMTP"%(lev, data[:3]) raise smtpError, "Expected %s, got %s from SMTP"%(lev, data[:3])
def send(self, mfrom, mto, subj, body): def send(self, mfrom, mto, subj, body):
self.conn.send("mail from:<%s>\n"%mfrom) self.conn.send("mail from:<%s>\n"%mfrom)
self._check() self._check()
if type(mto) == type([1,2]): if type(mto) == type([1,2]):
for person in mto: for person in mto:
self.conn.send("rcpt to:<%s>\n" % person) self.conn.send("rcpt to:<%s>\n" % person)
self._check() self._check()
else: else:
self.conn.send("rcpt to:<%s>\n"%mto) self.conn.send("rcpt to:<%s>\n"%mto)
self._check() self._check()
self.conn.send("data\n") self.conn.send("data\n")
self._check() self._check()
self.conn.send(body) self.conn.send(body)
self.conn.send("\n.\n") self.conn.send("\n.\n")
self._check('354') self._check('354')
def _close(self): def _close(self):
self.conn.send("quit\n") self.conn.send("quit\n")
self.conn.close() self.conn.close()
def decapitate(message, def decapitate(message,
header_re=regex.compile( header_re=regex.compile(
'\(\(' '\(\('
'[^\0- <>:]+:[^\n]*\n' '[^\0- <>:]+:[^\n]*\n'
'\|' '\|'
'[ \t]+[^\0- ][^\n]*\n' '[ \t]+[^\0- ][^\n]*\n'
'\)+\)[ \t]*\n\([\0-\377]+\)' '\)+\)[ \t]*\n\([\0-\377]+\)'
), ),
space_re=regex.compile('\([ \t]+\)'), space_re=regex.compile('\([ \t]+\)'),
name_re=regex.compile('\([^\0- <>:]+\):\([^\n]*\)'), name_re=regex.compile('\([^\0- <>:]+\):\([^\n]*\)'),
): ):
if header_re.match(message) < 0: return message if header_re.match(message) < 0: return message
headers, body = header_re.group(1,3) headers, body = header_re.group(1,3)
headers=string.split(headers,'\n') headers=string.split(headers,'\n')
headerDict={} headerDict={}
i=1 i=1
while i < len(headers): while i < len(headers):
if not headers[i]: if not headers[i]:
del headers[i] del headers[i]
elif space_re.match(headers[i]) >= 0: elif space_re.match(headers[i]) >= 0:
headers[i-1]="%s %s" % (headers[i-1], headers[i-1]="%s %s" % (headers[i-1],
headers[i][len(space_re.group(1)):]) headers[i][len(space_re.group(1)):])
del headers[i] del headers[i]
else: else:
i=i+1 i=i+1
for i in range(len(headers)): for i in range(len(headers)):
if name_re.match(headers[i]) >= 0: if name_re.match(headers[i]) >= 0:
k, v = name_re.group(1,2) k, v = name_re.group(1,2)
k=string.lower(k); v=string.strip(v) k=string.lower(k); v=string.strip(v)
headerDict[k]=v headerDict[k]=v
else: else:
raise ValueError, 'Invalid Header (%d): %s ' % (i,headers[i]) raise ValueError, 'Invalid Header (%d): %s ' % (i,headers[i])
if headerDict.has_key('to'): if headerDict.has_key('to'):
headerDict['to']=map( headerDict['to']=map(
lambda x: string.strip(x), lambda x: string.strip(x),
string.split(headerDict['to'], ',') string.split(headerDict['to'], ',')
) )
return headerDict, body return headerDict, body
#$Log: MailHost.py,v $ #$Log: MailHost.py,v $
#Revision 1.2 1997/09/09 21:33:41 jeffrey
#New send features _somewhat_ working. simple_send works (litely),
#sentTemplate works, but does not (yet) completely overthrow the to: from:
#headers...
#
#Revision 1.1 1997/09/09 20:50:29 jeffrey #Revision 1.1 1997/09/09 20:50:29 jeffrey
#Managed changing of names. #Managed changing of names.
# #
\ No newline at end of file
lib/python/Products/MailHost/addMailHost_form.dtml
View file @ f12c21df
<HTML> <HTML>
<HEAD> <HEAD>
<TITLE>Add a MailForm</TITLE> <TITLE>Add a MailHost</TITLE>
</HEAD> </HEAD>
<BODY BGCOLOR="#FFFFFF"> <BODY BGCOLOR="#FFFFFF">
<H1>Add a MailForm</H1> <H1>Add a MailHost</H1>
<FORM ACTION="<!--#var PARENT_URL-->/manage_addMailForm" METHOD="POST"> <FORM ACTION="<!--#var PARENT_URL-->/manage_addMailHost" METHOD="POST">
<TABLE CELLSPACING="2"> <TABLE CELLSPACING="2">
<!--#var smallRolesWidget--> <!--#var smallRolesWidget-->
<TR VALIGN="TOP"> <TR VALIGN="TOP">
<TD ALIGN="LEFT"><B>Id</B></TD> <TD ALIGN="LEFT"><B>Id</B></TD>
<TD ALIGN="LEFT"> <TD ALIGN="LEFT">
<INPUT TYPE="TEXT" NAME="id" SIZE="50" value="MailForm"> <INPUT TYPE="TEXT" NAME="id" SIZE="50" value="MailHost">
</TD> </TD>
</TR> </TR>
<TR VALIGN="TOP"> <TR VALIGN="TOP">
...@@ -38,42 +38,9 @@ ...@@ -38,42 +38,9 @@
<INPUT TYPE="TEXT" NAME="smtp_port:int" SIZE="4" VALUE="25"> <INPUT TYPE="TEXT" NAME="smtp_port:int" SIZE="4" VALUE="25">
</TD> </TD>
</TR> </TR>
<TR VALIGN="TOP">
<TD BGCOLOR="#555555" COLSPAN=2>&nbsp;</TD>
</TR>
<TR VALIGN="TOP">
<TD ALIGN="LEFT"><B>Mail template: </B></TD>
<TD ALIGN="LEFT">
<SELECT NAME="mailTemplate" SIZE=1>
<!--#in documentIds-->
<OPTION><!--#var sequence-item--></OPTION>
<!--#endin documentIds-->
</SELECT>
</TD>
</TR>
<TR VALIGN="TOP">
<TD ALIGN="LEFT"><B>Error template: </B></TD>
<TD ALIGN="LEFT">
<SELECT NAME="errorTemplate" SIZE=1>
<!--#in documentIds-->
<OPTION><!--#var sequence-item--></OPTION>
<!--#endin documentIds-->
</SELECT>
</TD>
</TR>
<TR VALIGN="TOP">
<TD ALIGN="LEFT"><B>Sent-mail template: </B></TD>
<TD ALIGN="LEFT">
<SELECT NAME="sentMailTemplate" SIZE=1>
<!--#in documentIds-->
<OPTION><!--#var sequence-item--></OPTION>
<!--#endin documentIds-->
</SELECT>
</TD>
</TR>
<TR VALIGN="TOP"> <TR VALIGN="TOP">
<TD>&nbsp;</TD> <TD>&nbsp;</TD>
<TD><BR><INPUT TYPE="SUBMIT" VALUE="Add MailForm"></TD> <TD><BR><INPUT TYPE="SUBMIT" VALUE="Add MailHost"></TD>
</TR> </TR>
</TABLE> </TABLE>
</FORM> </FORM>
......
lib/python/Products/MailHost/mailHost.dtml
View file @ f12c21df
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN"> <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
<HTML> <HTML>
<HEAD> <HEAD>
<TITLE>MailForm: <!--#var title--></TITLE> <TITLE>MailHost: <!--#var title--></TITLE>
</HEAD> </HEAD>
<BODY BGCOLOR="#FFFFFF"> <BODY BGCOLOR="#FFFFFF">
<TABLE> <TABLE>
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<TD BGCOLOR="#CCCCCC"> <TD BGCOLOR="#CCCCCC">
<B>Title: </B><FONT COLOR="#CC0000"><!--#var title--></FONT><BR> <B>Title: </B><FONT COLOR="#CC0000"><!--#var title--></FONT><BR>
<B>Mail Host: </B><FONT COLOR="#CC0000"><!--#var smtpHost--></FONT><BR> <B>Mail Host: </B><FONT COLOR="#CC0000"><!--#var smtpHost--></FONT><BR>
<B>Mail Port: </B><FONT COLOR="#CC0000"><!--#var smtpPort--></FONT> <B>Mail Port: </B><FONT COLOR="#CC0000"><!--#var smtpPort--></FONT><BR>
<B>Messages sent: </B><FONT COLOR="#CC0000"><!--#var sentMessages--></FONT>
</TD> </TD>
</TR> </TR>
</TABLE> </TABLE>
......
lib/python/Products/MailHost/manageMailHost.dtml
View file @ f12c21df
<HTML> <HTML>
<HEAD> <HEAD>
<TITLE>Manage a MailForm</TITLE> <TITLE>Manage a MailHost</TITLE>
</HEAD> </HEAD>
<BODY BGCOLOR="#FFFFFF"> <BODY BGCOLOR="#FFFFFF">
<H1>Manage a MailForm</H1> <H1>Manage a MailHost</H1>
<FORM ACTION="<!--#var PARENT_URL-->/manage_makeChanges" METHOD="POST"> <FORM ACTION="<!--#var PARENT_URL-->/manage_makeChanges" METHOD="POST">
<TABLE CELLSPACING="2"> <TABLE CELLSPACING="2">
<!--#var smallRolesWidget--> <!--#var smallRolesWidget-->
...@@ -38,30 +38,6 @@ ...@@ -38,30 +38,6 @@
<INPUT TYPE="TEXT" NAME="smtpPort:int" SIZE="4" VALUE="<!--#var smtpPort-->"> <INPUT TYPE="TEXT" NAME="smtpPort:int" SIZE="4" VALUE="<!--#var smtpPort-->">
</TD> </TD>
</TR> </TR>
<TR VALIGN="TOP">
<TD BGCOLOR="#555555" COLSPAN=2>&nbsp;</TD>
</TR>
<TR VALIGN="TOP">
<TD ALIGN="LEFT"><B>Mail template: </B></TD>
<TD ALIGN="LEFT">
<!--#var mailTemplate-->
<A HREF="<!--#var URL2-->/<!--#var mailTemplate-->/manage">[manage]</A>
</TD>
</TR>
<TR VALIGN="TOP">
<TD ALIGN="LEFT"><B>Error template: </B></TD>
<TD ALIGN="LEFT">
<!--#var errorTemplate-->
<A HREF="<!--#var URL2-->/<!--#var errorTemplate-->/manage">[manage]</A>
</TD>
</TR>
<TR VALIGN="TOP">
<TD ALIGN="LEFT"><B>Sent Mail template: </B></TD>
<TD ALIGN="LEFT">
<!--#var sentMailTemplate-->
<A HREF="<!--#var URL2-->/<!--#var sentMailTemplate-->/manage">[manage]</A>
</TD>
</TR>
<TR VALIGN="TOP"> <TR VALIGN="TOP">
<TD>&nbsp;</TD> <TD>&nbsp;</TD>
<TD><BR><INPUT TYPE="SUBMIT" VALUE="Make changes"></TD> <TD><BR><INPUT TYPE="SUBMIT" VALUE="Make changes"></TD>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7