From 8cfcdbc978b49d9230b78a9c3fa6ad4fa468ecb8 Mon Sep 17 00:00:00 2001
From: dman13 <dman13@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Sun, 16 Jun 2002 01:01:42 +0000
Subject: [PATCH] remove CR characters embedded in messages (ZRoundup)

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@784 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 CHANGES.txt                    |  1 +
 frontends/ZRoundup/ZRoundup.py | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index eace6d2..985df81 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -40,6 +40,7 @@ Feature:
    - also changed cgi client since it was duplicating the functionality
 
 Fixed:
+ . remove CR characters embedded in messages (ZRoundup)
  . properly quote the email address and "real name" in all situations using the
     'email' module if it is available and 'rfc822' otherwise
  . #565992 ] if ISSUE_TRACKER_WEB doesn't have the trailing '/', add it
diff --git a/frontends/ZRoundup/ZRoundup.py b/frontends/ZRoundup/ZRoundup.py
index 8cd92ab..b034140 100644
--- a/frontends/ZRoundup/ZRoundup.py
+++ b/frontends/ZRoundup/ZRoundup.py
@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: ZRoundup.py,v 1.7 2002-06-14 01:25:46 dman13 Exp $
+# $Id: ZRoundup.py,v 1.8 2002-06-16 01:01:42 dman13 Exp $
 #
 ''' ZRoundup module - exposes the roundup web interface to Zope
 
@@ -146,7 +146,13 @@ class ZRoundup(Item, PropertyManager, Implicit, Persistent):
             # with it and we lose all the :filter, :columns, etc goodness
             form = None
         else:
-            form = FormWrapper(self.REQUEST.form)
+            # For some reason, CRs are embeded in multiline notes.
+            # It doesn't occur with apache/roundup.cgi, though.
+            form = self.REQUEST.form 
+            if form.has_key( '__note' ) :
+                form['__note'] = form['__note'].replace( '\r' , '' )
+            form = FormWrapper(form)
+
         return instance.Client(instance, request, env, form)
 
 
@@ -201,6 +207,9 @@ modulesecurity.apply(globals())
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.7  2002/06/14 01:25:46  dman13
+# Fixed bug #558867 by redirecting /instance requests to /instance/
+#
 # Revision 1.6  2002/06/12 00:59:44  dman13
 # Fixed the logic for determing the cookie path.  (Closes #562130.)
 #
-- 
2.30.2