Skip to content

Commit d627ee8

Browse files
author
Derrick Hudson
committed
remove CR characters embedded in messages (ZRoundup)
1 parent 0814363 commit d627ee8

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Feature:
4040
- also changed cgi client since it was duplicating the functionality
4141

4242
Fixed:
43+
. remove CR characters embedded in messages (ZRoundup)
4344
. properly quote the email address and "real name" in all situations using the
4445
'email' module if it is available and 'rfc822' otherwise
4546
. #565992 ] if ISSUE_TRACKER_WEB doesn't have the trailing '/', add it

frontends/ZRoundup/ZRoundup.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1515
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1616
#
17-
# $Id: ZRoundup.py,v 1.7 2002-06-14 01:25:46 dman13 Exp $
17+
# $Id: ZRoundup.py,v 1.8 2002-06-16 01:01:42 dman13 Exp $
1818
#
1919
''' ZRoundup module - exposes the roundup web interface to Zope
2020
@@ -146,7 +146,13 @@ def _opendb(self):
146146
# with it and we lose all the :filter, :columns, etc goodness
147147
form = None
148148
else:
149-
form = FormWrapper(self.REQUEST.form)
149+
# For some reason, CRs are embeded in multiline notes.
150+
# It doesn't occur with apache/roundup.cgi, though.
151+
form = self.REQUEST.form
152+
if form.has_key( '__note' ) :
153+
form['__note'] = form['__note'].replace( '\r' , '' )
154+
form = FormWrapper(form)
155+
150156
return instance.Client(instance, request, env, form)
151157

152158

@@ -201,6 +207,9 @@ def __getitem__(self, item):
201207

202208
#
203209
# $Log: not supported by cvs2svn $
210+
# Revision 1.7 2002/06/14 01:25:46 dman13
211+
# Fixed bug #558867 by redirecting /instance requests to /instance/
212+
#
204213
# Revision 1.6 2002/06/12 00:59:44 dman13
205214
# Fixed the logic for determing the cookie path. (Closes #562130.)
206215
#

0 commit comments

Comments
 (0)