Index: openacs-4/packages/notes/www/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notes/www/add-edit.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/notes/www/add-edit.tcl	5 Sep 2002 11:04:56 -0000	1.5
+++ openacs-4/packages/notes/www/add-edit.tcl	6 Dec 2002 09:46:52 -0000	1.5.2.1
@@ -7,8 +7,8 @@
   @cvs-id $Id$
 } {
 	note_id:integer,notnull,optional
-	{title:html,notnull,optional ""}
-	{body ""}
+	{title:trim,notnull,optional ""}
+	{body:trim ""}
 } -properties {
 	context:onevalue
 }
@@ -85,4 +85,6 @@
   ad_returnredirect "./"
 }
 
+set title [ad_quotehtml $title]
+
 ad_return_template
Index: openacs-4/packages/notes/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notes/www/index.adp,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/notes/www/index.adp	5 Sep 2002 11:04:56 -0000	1.5
+++ openacs-4/packages/notes/www/index.adp	6 Dec 2002 09:46:52 -0000	1.5.2.1
@@ -29,12 +29,7 @@
         <table border=0 cellpadding=4 cellspacing=0>
 	  <tr>
 	    <td>&nbsp;</td>
-	    <td>
-	    <%
-	    regsub -all "\n" $notes(body) "<br>" body
-	    adp_puts $body
-	    %>
-	    </td>
+	    <td>@notes.body@</td>
 	  </tr>
 	</table>
     </td>
Index: openacs-4/packages/notes/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notes/www/index.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/notes/www/index.tcl	5 Sep 2002 11:04:56 -0000	1.2
+++ openacs-4/packages/notes/www/index.tcl	6 Dec 2002 09:46:52 -0000	1.2.2.1
@@ -39,6 +39,10 @@
   and o.context_id = :package_id
   and acs_permission.permission_p(note_id, :user_id, 'read') = 't'
   order by creation_date
+} {
+  set title [ad_quotehtml $title]
+  set body [ad_text_to_html $body]
 }
 
+
 ad_return_template
Index: openacs-4/packages/notes/www/view-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notes/www/view-one.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/notes/www/view-one.tcl	5 Sep 2002 11:04:56 -0000	1.2
+++ openacs-4/packages/notes/www/view-one.tcl	6 Dec 2002 09:46:52 -0000	1.2.2.1
@@ -17,5 +17,7 @@
     where note_id = :note_id
 }
 
+set title [ad_quotehtml $title]
+set body [ad_text_to_html $body]
 
 ad_return_template