Skip to content

Commit 57bee7c

Browse files
author
Richard Jones
committed
*mutter* stupid cutnpaste
1 parent f92a21a commit 57bee7c

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

roundup/cgi_client.py

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: cgi_client.py,v 1.88 2002-01-02 02:31:38 richard Exp $
18+
# $Id: cgi_client.py,v 1.89 2002-01-07 20:24:45 richard Exp $
1919

2020
__doc__ = """
2121
WWW request handler (also used in the stand-alone server).
@@ -433,7 +433,7 @@ def _handle_message(self):
433433
props = cl.getprops()
434434
note = None
435435
# in a nutshell, don't do anything if there's no note or there's no
436-
# nosy
436+
# NOSY
437437
if self.form.has_key('__note'):
438438
note = self.form['__note'].value
439439
if not props.has_key('messages'):
@@ -458,8 +458,8 @@ def _handle_message(self):
458458

459459
# handle the messageid
460460
# TODO: handle inreplyto
461-
messageid = "%s.%s.%s%s-%s"%(time.time(), random.random(),
462-
classname, nodeid, self.MAIL_DOMAIN)
461+
messageid = "%s.%s.%s-%s"%(time.time(), random.random(),
462+
self.classname, self.MAIL_DOMAIN)
463463

464464
# now create the message, attaching the files
465465
content = '\n'.join(m)
@@ -1168,6 +1168,21 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
11681168

11691169
#
11701170
# $Log: not supported by cvs2svn $
1171+
# Revision 1.88 2002/01/02 02:31:38 richard
1172+
# Sorry for the huge checkin message - I was only intending to implement #496356
1173+
# but I found a number of places where things had been broken by transactions:
1174+
# . modified ROUNDUPDBSENDMAILDEBUG to be SENDMAILDEBUG and hold a filename
1175+
# for _all_ roundup-generated smtp messages to be sent to.
1176+
# . the transaction cache had broken the roundupdb.Class set() reactors
1177+
# . newly-created author users in the mailgw weren't being committed to the db
1178+
#
1179+
# Stuff that made it into CHANGES.txt (ie. the stuff I was actually working
1180+
# on when I found that stuff :):
1181+
# . #496356 ] Use threading in messages
1182+
# . detectors were being registered multiple times
1183+
# . added tests for mailgw
1184+
# . much better attaching of erroneous messages in the mail gateway
1185+
#
11711186
# Revision 1.87 2001/12/23 23:18:49 richard
11721187
# We already had an admin-specific section of the web heading, no need to add
11731188
# another one :)

0 commit comments

Comments
 (0)