Index: openacs-4/packages/assessment/lib/item-show-mc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-mc.tcl,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/assessment/lib/item-show-mc.tcl	10 Sep 2015 08:27:54 -0000	1.11.2.1
+++ openacs-4/packages/assessment/lib/item-show-mc.tcl	18 Sep 2015 08:03:23 -0000	1.11.2.2
@@ -21,8 +21,8 @@
 set total [llength $choices]
 foreach one_choice $choices {
     lassign $one_choice choice_id title correct_answer_p feedback_text selected_p percent_score sort_order fixed_position answer_value content_rev_id content_filename content_name
-    set title  [ad_quotehtml $title]
-    set feedback_text [ad_quotehtml $feedback_text]
+    set title  [ns_quotehtml $title]
+    set feedback_text [ns_quotehtml $feedback_text]
     incr count
     set options ""
     if {$count < $total} {
Index: openacs-4/packages/assessment/lib/results-edit-oq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/results-edit-oq.tcl,v
diff -u -r1.3.6.1 -r1.3.6.2
--- openacs-4/packages/assessment/lib/results-edit-oq.tcl	10 Sep 2015 08:27:54 -0000	1.3.6.1
+++ openacs-4/packages/assessment/lib/results-edit-oq.tcl	18 Sep 2015 08:03:23 -0000	1.3.6.2
@@ -2,7 +2,7 @@
 # author Timo Hentschel (timo@timohentschel.de)
 
 db_1row item_type_data {}
-set keywords [string tolower [ad_quotehtml [join $keywords "\n"]]]
+set keywords [string tolower [ns_quotehtml [join $keywords "\n"]]]
 set answer_text [ad_text_to_html -no_links -- $answer_text]
 
 foreach keyword $keywords {
Index: openacs-4/packages/bulk-mail/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/one.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/bulk-mail/www/one.tcl	10 Sep 2015 08:30:14 -0000	1.7.2.1
+++ openacs-4/packages/bulk-mail/www/one.tcl	18 Sep 2015 08:01:34 -0000	1.7.2.2
@@ -17,8 +17,8 @@
 
 db_1row select_message_info {}
 
-set subject [ad_quotehtml $subject]
-set message [ad_quotehtml $message]
+set subject [ns_quotehtml $subject]
+set message [ns_quotehtml $message]
 
 set title $subject
 set context [list $subject]
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 -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/categories/tcl/category-list-procs.tcl	10 Sep 2015 08:30:18 -0000	1.8.2.1
+++ openacs-4/packages/categories/tcl/category-list-procs.tcl	18 Sep 2015 08:01:09 -0000	1.8.2.2
@@ -148,7 +148,7 @@
     foreach category $sorted_categories {
 	lassign $category category_id category_name tree_id tree_name
 
-	set category_name [ad_quotehtml $category_name]
+	set category_name [ns_quotehtml $category_name]
 	if {$category_link_eval ne ""} {
 	    set category_link [uplevel $uplevel concat $category_link_eval]
 	}
@@ -167,7 +167,7 @@
 	    if {$result ne ""} {
 		append result $tree_delimiter
 	    }
-	    set tree_name [ad_quotehtml $tree_name]
+	    set tree_name [ns_quotehtml $tree_name]
 	    if {$tree_link_eval ne ""} {
 		set tree_link [uplevel $uplevel concat $tree_link_eval]
 	    }
@@ -318,7 +318,7 @@
 
 		foreach category $tree_categories($tree_id) {
 		    lassign $category category_id category_name
-		    set category_name [ad_quotehtml $category_name]
+		    set category_name [ns_quotehtml $category_name]
 		    if {$category_link_eval ne ""} {
 			set category_link [uplevel 1 concat $category_link_eval]
 		    }
Index: openacs-4/packages/categories/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/widget-procs.tcl,v
diff -u -r1.23.2.1 -r1.23.2.2
--- openacs-4/packages/categories/tcl/widget-procs.tcl	10 Sep 2015 08:30:19 -0000	1.23.2.1
+++ openacs-4/packages/categories/tcl/widget-procs.tcl	18 Sep 2015 08:01:09 -0000	1.23.2.2
@@ -126,7 +126,7 @@
 
     foreach mapped_tree $mapped_trees {
 	lassign $mapped_tree tree_id tree_name subtree_id assign_single_p require_category_p widget
-	set tree_name [ad_quotehtml [lang::util::localize $tree_name]]
+	set tree_name [ns_quotehtml [lang::util::localize $tree_name]]
 	set one_tree [list]
 
         if { $require_category_p == "t" } { 
@@ -137,7 +137,7 @@
 
 	foreach category [category_tree::get_tree -subtree_id $subtree_id $tree_id] {
 	    lassign $category category_id category_name deprecated_p level
-	    set category_name [ad_quotehtml [lang::util::localize $category_name]]
+	    set category_name [ns_quotehtml [lang::util::localize $category_name]]
 	    if { $level>1 } {
 		set category_name "[string repeat "&nbsp;" [expr {2*$level -4}]]..$category_name"
 	    }
Index: openacs-4/packages/dotlrn/tcl/spam-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/spam-procs.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/dotlrn/tcl/spam-procs.tcl	11 Sep 2015 11:40:40 -0000	1.10.2.1
+++ openacs-4/packages/dotlrn/tcl/spam-procs.tcl	18 Sep 2015 08:05:09 -0000	1.10.2.2
@@ -88,7 +88,7 @@
                 append errors "
 <p>
 Failed to deliver to $email because:
-    [ad_quotehtml $errmsg]
+    [ns_quotehtml $errmsg]
 </p>
             "
             }
Index: openacs-4/packages/dotlrn/www/spam-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.tcl,v
diff -u -r1.10.4.1 -r1.10.4.2
--- openacs-4/packages/dotlrn/www/spam-2.tcl	11 Sep 2015 11:40:46 -0000	1.10.4.1
+++ openacs-4/packages/dotlrn/www/spam-2.tcl	18 Sep 2015 08:05:10 -0000	1.10.4.2
@@ -38,7 +38,7 @@
 } elseif {$format eq "pre"} {
     set preview_message [ad_text_to_html $message]
 } else {
-    set preview_message [ad_quotehtml $message]
+    set preview_message [ns_quotehtml $message]
 }
 
 set context [list [list $referer Admin] "[_ dotlrn.Spam_Community]"]
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.31.4.1 -r1.31.4.2
--- openacs-4/packages/dotlrn/www/spam.tcl	11 Sep 2015 11:40:46 -0000	1.31.4.1
+++ openacs-4/packages/dotlrn/www/spam.tcl	18 Sep 2015 08:05:10 -0000	1.31.4.2
@@ -208,7 +208,7 @@
 	set message [ad_text_to_html $message]
 	set message_type "html"
     } else {
-	set message [ad_quotehtml $message]
+	set message [ns_quotehtml $message]
 	set message_type "text"
     }
 
Index: openacs-4/packages/dotlrn/www/user-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-3.tcl,v
diff -u -r1.13.4.1 -r1.13.4.2
--- openacs-4/packages/dotlrn/www/user-add-3.tcl	11 Sep 2015 11:40:47 -0000	1.13.4.1
+++ openacs-4/packages/dotlrn/www/user-add-3.tcl	18 Sep 2015 08:05:10 -0000	1.13.4.2
@@ -43,7 +43,7 @@
 if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $admin_email -subject $email_subject -body $message} errmsg]} {
     ad_return_error "[_ dotlrn.Mail_Failed]" "[_ dotlrn.lt_The_system_was_unable]
 <pre>
-[ad_quotehtml $errmsg]
+[ns_quotehtml $errmsg]
 </pre>"
     ad_script_abort
 }
Index: openacs-4/packages/dotlrn/www/admin/archived-communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/archived-communities.tcl,v
diff -u -r1.7.10.1 -r1.7.10.2
--- openacs-4/packages/dotlrn/www/admin/archived-communities.tcl	11 Sep 2015 11:40:49 -0000	1.7.10.1
+++ openacs-4/packages/dotlrn/www/admin/archived-communities.tcl	18 Sep 2015 08:05:10 -0000	1.7.10.2
@@ -35,7 +35,7 @@
 set context_bar [list $title]
 
 db_multirow -extend { unarchive_url } archived_comms select_archived_comms {} {
-    set description [ad_quotehtml $description]
+    set description [ns_quotehtml $description]
     set unarchive_url "unarchive?community_id=$community_id"
 }
 
Index: openacs-4/packages/dotlrn/www/admin/class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.tcl,v
diff -u -r1.21.4.1 -r1.21.4.2
--- openacs-4/packages/dotlrn/www/admin/class.tcl	11 Sep 2015 11:40:50 -0000	1.21.4.1
+++ openacs-4/packages/dotlrn/www/admin/class.tcl	18 Sep 2015 08:05:10 -0000	1.21.4.2
@@ -42,7 +42,7 @@
     ad_script_abort
 }
 
-set description [ad_quotehtml $description]
+set description [ns_quotehtml $description]
 
 set terms [db_list_of_lists select_terms_for_select_widget {}]
 set terms [linsert $terms 0 {All -1}]
Index: openacs-4/packages/dotlrn/www/admin/club.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.tcl,v
diff -u -r1.16.10.1 -r1.16.10.2
--- openacs-4/packages/dotlrn/www/admin/club.tcl	11 Sep 2015 11:40:50 -0000	1.16.10.1
+++ openacs-4/packages/dotlrn/www/admin/club.tcl	18 Sep 2015 08:05:10 -0000	1.16.10.2
@@ -37,7 +37,7 @@
 
 db_1row select_club {}
 
-set description [ad_quotehtml $description]
+set description [ns_quotehtml $description]
 
 set context_bar [list [list clubs [parameter::get -localize -parameter clubs_pretty_plural]] $pretty_name]
 
Index: openacs-4/packages/dotlrn/www/admin/clubs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.tcl,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/dotlrn/www/admin/clubs.tcl	11 Sep 2015 11:40:50 -0000	1.19.2.1
+++ openacs-4/packages/dotlrn/www/admin/clubs.tcl	18 Sep 2015 08:05:10 -0000	1.19.2.2
@@ -76,7 +76,7 @@
     }
 
 db_multirow clubs select_clubs {} {
-    set description [ad_quotehtml $description]
+    set description [ns_quotehtml $description]
 }
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/department.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.tcl,v
diff -u -r1.16.4.1 -r1.16.4.2
--- openacs-4/packages/dotlrn/www/admin/department.tcl	11 Sep 2015 11:40:51 -0000	1.16.4.1
+++ openacs-4/packages/dotlrn/www/admin/department.tcl	18 Sep 2015 08:05:10 -0000	1.16.4.2
@@ -45,7 +45,7 @@
     ad_script_abort
 }
 
-set description [ad_quotehtml $description]
+set description [ns_quotehtml $description]
 
 set context_bar [list [list departments [parameter::get -localize -parameter departments_pretty_plural]] $pretty_name]
 set referer "[ns_conn url]?[ns_conn query]"
Index: openacs-4/packages/faq/www/admin/q_and_a-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new.tcl,v
diff -u -r1.8.4.1 -r1.8.4.2
--- openacs-4/packages/faq/www/admin/q_and_a-new.tcl	12 Sep 2015 11:06:15 -0000	1.8.4.1
+++ openacs-4/packages/faq/www/admin/q_and_a-new.tcl	18 Sep 2015 08:07:33 -0000	1.8.4.2
@@ -41,8 +41,8 @@
     set insert_p "t"
 }
 
-set question_q [ad_quotehtml $question]
-set answer_q [ad_quotehtml $answer]
+set question_q [ns_quotehtml $question]
+set answer_q [ns_quotehtml $answer]
 
 ad_return_template 
 
Index: openacs-4/packages/general-comments/tcl/general-comments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-procs.tcl,v
diff -u -r1.22 -r1.22.2.1
--- openacs-4/packages/general-comments/tcl/general-comments-procs.tcl	27 Jun 2015 21:10:12 -0000	1.22
+++ openacs-4/packages/general-comments/tcl/general-comments-procs.tcl	18 Sep 2015 08:07:33 -0000	1.22.2.1
@@ -208,17 +208,17 @@
 
                                    append attachments_html "<li>$title "
                                    if { $mime_type eq "image_gif" || $mime_type eq "image/jpeg" } {
-                                       append attachments_html "(<a href=\"[ad_quotehtml ${package_url}view-image?image_id=$item_id&return_url=$return_url]\">$name</a>)\n"
+                                       append attachments_html "(<a href=\"[ns_quotehtml ${package_url}view-image?image_id=$item_id&return_url=$return_url]\">$name</a>)\n"
                                    } else {
-                                       append attachments_html "(<a href=\"[ad_quotehtml ${package_url}file-download?item_id=$item_id]\">$name</a>)\n"
+                                       append attachments_html "(<a href=\"[ns_quotehtml ${package_url}file-download?item_id=$item_id]\">$name</a>)\n"
                                    }
                                }
 
             db_foreach get_links "
                   select i.item_id, e.label, e.url
                     from cr_items i, cr_extlinks e
                    where i.parent_id = :comment_id and e.extlink_id = i.item_id" {
-                       append attachments_html "<li><a href=\"[ad_quotehtml $url]\">$label</a>\n"
+                       append attachments_html "<li><a href=\"[ns_quotehtml $url]\">$label</a>\n"
                    }
             if { $attachments_html ne "" } {
                 append html "<h5>[_ general-comments.Attachments]</h5>\n<ul>\n$attachments_html</ul>\n"
@@ -231,7 +231,7 @@
         }]
     } else {
         append html [subst {
-            <li><a href="[ad_quotehtml [export_vars -base ${package_url}view-comment {comment_id return_url}]]">$title</a>
+            <li><a href="[ns_quotehtml [export_vars -base ${package_url}view-comment {comment_id return_url}]]">$title</a>
         }]
         if {$print_user_info_p} {
             append html [subst {
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.193.2.2 -r1.193.2.3
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	12 Sep 2015 11:06:38 -0000	1.193.2.2
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	18 Sep 2015 08:07:33 -0000	1.193.2.3
@@ -494,7 +494,7 @@
             <div><input type="hidden" name="return_url" value="@return_url@#$page_id"></div>
             <div><input type="hidden" name="anchor" value="$page_id"></div>
             <div><input type="submit" name="op_rename_page" value="[_ new-portal.Rename_Page]"></div>
-            <div><input type="text" name="pretty_name" value="[ad_quotehtml $page_name]"></div>
+            <div><input type="text" name="pretty_name" value="[ns_quotehtml $page_name]"></div>
 	    </form>
 	    <form name="op_toggle_tab_visibility" method="post" action="@action_string@">
             <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
@@ -2433,7 +2433,7 @@
             set thisoption_name [lindex $option_value 0]
             # We allow portal page names to have embedded message catalog keys
             # that we localize on the fly
-            set thisoption_value [ad_quotehtml [lang::util::localize [lindex $option_value 1]]]
+            set thisoption_value [ns_quotehtml [lang::util::localize [lindex $option_value 1]]]
             set thisoption_link_p 1
             if {[llength $option_value] > 3} {
                 set thisoption_link_p [lindex $option_value 3]
Index: openacs-4/packages/new-portal/www/show-here.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/show-here.tcl,v
diff -u -r1.6.4.1 -r1.6.4.2
--- openacs-4/packages/new-portal/www/show-here.tcl	12 Sep 2015 11:06:39 -0000	1.6.4.1
+++ openacs-4/packages/new-portal/www/show-here.tcl	18 Sep 2015 08:07:33 -0000	1.6.4.2
@@ -34,7 +34,7 @@
 ns_log notice "portal_id = $portal_id"
 foreach element [portal::hidden_elements_list_not_cached -portal_id $portal_id] {
     set show_avail_p 1
-    append show_html "<option value=\"[ad_quotehtml [lindex $element 0]]\">[lang::util::localize [lindex $element 1]]</option>\n"
+    append show_html "<option value=\"[ns_quotehtml [lindex $element 0]]\">[lang::util::localize [lindex $element 1]]</option>\n"
 }
 
 set imgdir /resources/new-portal/images
Index: openacs-4/packages/notifications/tcl/notification-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-display-procs.tcl,v
diff -u -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/notifications/tcl/notification-display-procs.tcl	12 Sep 2015 11:06:46 -0000	1.20.2.1
+++ openacs-4/packages/notifications/tcl/notification-display-procs.tcl	18 Sep 2015 08:08:43 -0000	1.20.2.2
@@ -42,14 +42,14 @@
         set icon /resources/acs-subsite/email_delete.gif
         set icon_alt [_ acs-subsite.icon_of_envelope]
         set sub_url [unsubscribe_url -request_id $request_id -url $url]
-        set pretty_name [ad_quotehtml $pretty_name]
+        set pretty_name [ns_quotehtml $pretty_name]
         set title [_ notifications.lt_Ubsubscribe_Notification_]
         set sub_chunk [_ notifications.lt_You_have_requested_no]
     } else {
         set icon /resources/acs-subsite/email_add.gif
         set icon_alt [_ acs-subsite.icon_of_envelope]
         set sub_url [subscribe_url -type $type -object_id $object_id -url $url -user_id $user_id -pretty_name $pretty_name]
-        set pretty_name [ad_quotehtml $pretty_name]
+        set pretty_name [ns_quotehtml $pretty_name]
         set title [_ notifications.lt_Request_Notification_]
         set sub_chunk [_ notifications.lt_You_may_a_hrefsub_url]
     }
Index: openacs-4/packages/survey/tcl/survey-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/tcl/survey-procs.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/survey/tcl/survey-procs.tcl	19 Jun 2015 07:06:31 -0000	1.11
+++ openacs-4/packages/survey/tcl/survey-procs.tcl	18 Sep 2015 08:08:43 -0000	1.11.2.1
@@ -126,7 +126,7 @@
 		}
 	    }
 
-	    append html [subst {<input type=text name="$element_name" value="[ad_quotehtml $user_value]" 
+	    append html [subst {<input type=text name="$element_name" value="[ns_quotehtml $user_value]" 
 		[ad_decode $presentation_options "large" "size=70" "medium" "size=40" "size=10"]>}]
 	}
 
Index: openacs-4/packages/survey/www/admin/survey-create-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-create-confirm.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/survey/www/admin/survey-create-confirm.tcl	6 Nov 2013 07:33:55 -0000	1.3
+++ openacs-4/packages/survey/www/admin/survey-create-confirm.tcl	18 Sep 2015 08:08:43 -0000	1.3.4.1
@@ -1,6 +1,6 @@
 if {$desc_html eq "pre"} {
     set description [ad_text_to_html $description]
 } elseif {$desc_html eq "plain"} {
-    set description [ad_quotehtml $description]
+    set description [ns_quotehtml $description]
 }