Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v
diff -u -N -r1.33 -r1.34
--- openacs-4/packages/calendar/tcl/calendar-procs.tcl	27 Oct 2014 16:41:07 -0000	1.33
+++ openacs-4/packages/calendar/tcl/calendar-procs.tcl	22 Jun 2015 21:20:27 -0000	1.34
@@ -490,8 +490,8 @@
     set url "[ad_url][ad_conn package_url]"
 
     set new_content ""
-    append new_content "[_ calendar.Calendar]:  <a href=\"${url}\">[ad_conn instance_name]</a><br>\n"
-    append new_content "[_ calendar.Calendar_Item]: <a href=\"${url}cal-item-view?cal_item_id=$cal_item_id\">$cal_item(name)</a><br>\n"
+    append new_content "[_ calendar.Calendar]:  <a href=\"[ns_quotehtml $url]\">[ad_conn instance_name]</a><br>\n"
+    append new_content "[_ calendar.Calendar_Item]: <a href=\"[ns_quotehtml ${url}cal-item-view?cal_item_id=$cal_item_id]\">$cal_item(name)</a><br>\n"
     append new_content "[_ calendar.Start_Time]: $cal_item(start_date_ansi) $cal_item(start_time)<br>\n"
     append new_content "[_ calendar.to]: $cal_item(end_date_ansi) $cal_item(end_time)<br>\n"
 
Index: openacs-4/packages/categories/tcl/category-list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-list-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/categories/tcl/category-list-procs.tcl	27 Oct 2014 16:41:11 -0000	1.7
+++ openacs-4/packages/categories/tcl/category-list-procs.tcl	22 Jun 2015 21:20:28 -0000	1.8
@@ -157,10 +157,10 @@
 	    set remove_link [uplevel $uplevel concat $remove_link_eval]
 	}
 	if {$category_link ne ""} {
-	    set category_name "<a href=\"$category_link\"$cat_link_html>$category_name</a>"
+	    set category_name "<a href=\"[ns_quotehtml $category_link]\"$cat_link_html>$category_name</a>"
 	}
         if {$remove_link ne ""} { 
-            append category_name "&nbsp;<a href=\"$remove_link\" title=\"Remove this category\">$remove_link_text</a>"
+            append category_name "&nbsp;<a href=\"[ns_quotehtml $remove_link]\" title=\"Remove this category\">$remove_link_text</a>"
         }
 
 	if {$tree_id != $old_tree_id} {
@@ -172,7 +172,7 @@
 		set tree_link [uplevel $uplevel concat $tree_link_eval]
 	    }
 	    if {$tree_link ne ""} {
-		set tree_name "<a href=\"$tree_link\"$cat_tree_link_html>$tree_name</a>"
+		set tree_name "<a href=\"[ns_quotehtml $tree_link]\"$cat_tree_link_html>$tree_name</a>"
 	    }
 	    append result "$tree_name$tree_colon$category_name"
 	} else {
@@ -323,7 +323,7 @@
 			set category_link [uplevel 1 concat $category_link_eval]
 		    }
 		    if {$category_link ne ""} {
-			set category_name "<a href=\"$category_link\"$cat_link_html>$category_name</a>"
+			set category_name "<a href=\"[ns_quotehtml $category_link]\"$cat_link_html>$category_name</a>"
 		    }
 		    if {$pretty_category_list ne ""} {
 			append pretty_category_list "$category_delimiter$category_name"
Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -N -r1.45 -r1.46
--- openacs-4/packages/forums/tcl/messages-procs.tcl	27 Oct 2014 16:41:37 -0000	1.45
+++ openacs-4/packages/forums/tcl/messages-procs.tcl	22 Jun 2015 21:20:27 -0000	1.46
@@ -101,7 +101,8 @@
 
     set SecureOutboundP [parameter::get -parameter "SecureOutboundP" -default 0]
     if { $SecureOutboundP && [ns_conn isconnected] && [security::secure_conn_p] } {
-        set message_html "<p>#forums.Message_content_witheld# #forums.To_view_message_follow_link# <a href=\"${url}message-view?message_id=$message(root_message_id)\">${url}message-view?message_id=$message(root_message_id)</a></p>"
+	set href ${url}message-view?message_id=$message(root_message_id)
+        set message_html "<p>#forums.Message_content_witheld# #forums.To_view_message_follow_link# <a href=\"[ns_quotehtml $href]\">[ns_quotehtml $href]</a></p>"
         set message_text [ad_html_text_convert -from text/html -to text/plain -- $message_html]
     }
 
@@ -338,10 +339,10 @@
     if {$order_by eq "posting_date"} {
         # subject selected
         set subject_link "<b>$subject_label</b>"
-        set child_link "<a href=\"$toggle_url\">$child_label</a>"
+        set child_link "<a href=\"[ns_quotehtml $toggle_url]\">$child_label</a>"
     } else {
         # child selected
-        set subject_link "<a href=\"$toggle_url\">$subject_label</a>"
+        set subject_link "<a href=\"[ns_quotehtml $toggle_url]\">$subject_label</a>"
         set child_link "<b>$child_label</b>"
     }
     set sort_filter "$subject_link | $child_link"
Index: openacs-4/packages/forums/www/admin/subscribe-others-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/subscribe-others-2.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/forums/www/admin/subscribe-others-2.tcl	12 Jun 2015 08:47:28 -0000	1.7
+++ openacs-4/packages/forums/www/admin/subscribe-others-2.tcl	22 Jun 2015 21:20:27 -0000	1.8
@@ -9,7 +9,7 @@
 } {
     forum_id:naturalnum,notnull
     type_id:naturalnum,notnull
-    {lines ""}
+    {lines}
     {return_url "."}
     interval:notnull
     delivery_method:notnull
@@ -151,4 +151,4 @@
 }
 
 ns_write "<p>Complete</p>"
-ns_write "<a href=\"$return_url\">return</a>"
+ns_write [subst {<a href="[ns_quotehtml $return_url]">return</a>}]