Update of /cvsroot/pywebmail/webmail/webmail/backends
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12469/backends
Modified Files:
web.py merge.py
Log Message:
support new field of message info - recipients
Index: merge.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/backends/merge.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** merge.py 30 Nov 2007 02:21:48 -0000 1.4
--- merge.py 8 Dec 2007 07:59:44 -0000 1.5
***************
*** 13,17 ****
MessageInfoBase.__init__(self, folder, uid)
# to allow __getattr__ to work
! del self.sender, self.subject, self.date, self.size, self.msg
self._msginfo = msginfo
def __getattr__(self, name):
--- 13,17 ----
MessageInfoBase.__init__(self, folder, uid)
# to allow __getattr__ to work
! del self.sender, self.recipients, self.subject, self.date, self.size, self.msg
self._msginfo = msginfo
def __getattr__(self, name):
Index: web.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/backends/web.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** web.py 1 Mar 2007 23:35:09 -0000 1.10
--- web.py 8 Dec 2007 07:59:44 -0000 1.11
***************
*** 16,23 ****
--- 16,36 ----
else:
self.sender = (self.sender.strip(),msginfo.get('from_email'))
+ self.recipients = msginfo.get('to')
+ if not self.recipients:
+ self.recipients = [(msginfo.get('to_name'),msginfo.get('to_email'))]
+ elif self.recipients.find('@'):
+ recipients = []
+ for recipient in self.recipients.split(','):
+ recipient = recipient.strip()
+ recipient = [(msginfo.get('to_name') or recipient,recipient)]
+ recipients.append(recipient)
+ self.recipients = recipients
+ else:
+ self.recipients = [(self.recipients.strip(),msginfo.get('to_email'))]
self.subject = msginfo.get('subject')
self.date = msginfo.get('date')
self.size = parsesize(msginfo.get('size'))
self.uid = msginfo.get('uid', msginfo.get('id', self._msgid))
+ self._msginfo = msginfo
def custom_get(self, action):
return self._folder.custom_get(action, self._msgid)
|
