Index: openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl,v diff -u -N -r1.14.2.1 -r1.14.2.2 --- openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl 10 Sep 2015 08:21:36 -0000 1.14.2.1 +++ openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl 18 Sep 2015 07:27:47 -0000 1.14.2.2 @@ -181,8 +181,8 @@ # Delete the temporary file created by ImageMagick catch { file delete $dest_path } errMsg - set img_src [ad_quotehtml "/shared/email-image-bits.tcl?user_id=$user_id&revision_id=$revision_id"] - set send_email_url [ad_quotehtml "/shared/send-email?sendto=$user_id&return_url=$return_url"] + set img_src [ns_quotehtml "/shared/email-image-bits.tcl?user_id=$user_id&revision_id=$revision_id"] + set send_email_url [ns_quotehtml "/shared/send-email?sendto=$user_id&return_url=$return_url"] set email_image [subst {#acs-subsite.Email#} return "$email_image" Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl,v diff -u -N -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 10 Sep 2015 08:21:40 -0000 1.6.2.1 +++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 18 Sep 2015 07:27:47 -0000 1.6.2.2 @@ -42,8 +42,8 @@ } set possible_join_policies [list open "needs approval" closed] -set QQreturn_url [ad_quotehtml $return_url] -set QQgroup_type [ad_quotehtml $group_type] +set QQreturn_url [ns_quotehtml $return_url] +set QQgroup_type [ns_quotehtml $group_type] ad_return_template # Local variables: # mode: tcl Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl,v diff -u -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl 10 Sep 2015 08:21:41 -0000 1.4.2.1 +++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl 18 Sep 2015 07:27:48 -0000 1.4.2.2 @@ -44,7 +44,7 @@ } set possible_join_policies [list open "needs approval" closed] -set QQreturn_url [ad_quotehtml $return_url] +set QQreturn_url [ns_quotehtml $return_url] ad_return_template # Local variables: # mode: tcl Index: openacs-4/packages/acs-subsite/www/admin/relations/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.tcl,v diff -u -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/acs-subsite/www/admin/relations/one.tcl 10 Sep 2015 08:21:47 -0000 1.4.2.1 +++ openacs-4/packages/acs-subsite/www/admin/relations/one.tcl 18 Sep 2015 07:27:48 -0000 1.4.2.2 @@ -88,7 +88,7 @@ # Data used to build the "toggle member state" widget. set return_url [ad_conn url]?[ad_conn query] -set QQreturn_url [ad_quotehtml $return_url] +set QQreturn_url [ns_quotehtml $return_url] set possible_member_states [group::possible_member_states] set object_two_read_p [permission::permission_p -object_id $rel(object_id_two) -privilege "read"] Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl,v diff -u -N -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 10 Sep 2015 08:21:47 -0000 1.10.2.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 18 Sep 2015 07:27:48 -0000 1.10.2.2 @@ -49,7 +49,7 @@ where package_id = :package_id } -default 0]} { ad_return_error "Error Deleting Instance" "The following error was returned: -
[ad_quotehtml $errmsg]
" +
[ns_quotehtml $errmsg]
" } } Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v diff -u -N -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 10 Sep 2015 08:21:47 -0000 1.7.2.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 18 Sep 2015 07:27:48 -0000 1.7.2.2 @@ -57,7 +57,7 @@ "Error Creating Site Node" \ "The following error was generated when attempting to create the site node:
-                [ad_quotehtml $errmsg]
+                [ns_quotehtml $errmsg]
         
" } Index: openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl,v diff -u -N -r1.15.2.1 -r1.15.2.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl 10 Sep 2015 08:21:48 -0000 1.15.2.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl 18 Sep 2015 07:27:48 -0000 1.15.2.2 @@ -62,7 +62,7 @@ ad_return_complaint 1 "Error Creating Package: The following error was generated when attempting to create the package
-		[ad_quotehtml $errmsg]
+		[ns_quotehtml $errmsg]
 	
" } } Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-2.tcl,v diff -u -N -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl 10 Sep 2015 08:21:48 -0000 1.6.2.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl 18 Sep 2015 07:27:48 -0000 1.6.2.2 @@ -24,7 +24,7 @@ } } errmsg] } { ad_return_error "Database Error" "The parameters could not be set. The database error was:

-

[ad_quotehtml $errmsg]
." +
[ns_quotehtml $errmsg]
." } else { ad_returnredirect $return_url } Index: openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl,v diff -u -N -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl 10 Sep 2015 08:21:49 -0000 1.6.2.1 +++ openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl 18 Sep 2015 07:27:48 -0000 1.6.2.2 @@ -102,7 +102,7 @@ if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $from -subject $subject -body $sub_message} errmsg]} { ad_return_error "Mail Failed" "

The system was unable to send email. Please notify the user personally. This problem is probably caused by a misconfiguration of your email system. Here is the error:

-[ad_quotehtml $errmsg] +[ns_quotehtml $errmsg]
" return } Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v diff -u -N -r1.17.2.1 -r1.17.2.2 --- openacs-4/packages/acs-subsite/www/permissions/one.tcl 10 Sep 2015 08:21:49 -0000 1.17.2.1 +++ openacs-4/packages/acs-subsite/www/permissions/one.tcl 18 Sep 2015 07:27:49 -0000 1.17.2.2 @@ -28,7 +28,7 @@ set name [db_string name {}] -set context [list [list "./" [_ acs-subsite.Permissions]] [ad_quotehtml [_ acs-subsite.Permissions_for_name]]] +set context [list [list "./" [_ acs-subsite.Permissions]] [ns_quotehtml [_ acs-subsite.Permissions_for_name]]] db_multirow inherited inherited_permissions { *SQL* } { } @@ -45,7 +45,7 @@ set toggleUrl [export_vars -base toggle-inherit {application_url object_id}] if { $security_inherit_p == "t" && $context_id ne "" } { - lappend controls "Don't Inherit Permissions from [ad_quotehtml $context_name]" + lappend controls "Don't Inherit Permissions from [ns_quotehtml $context_name]" } else { lappend controls "Inherit Permissions from [ns_quotehtml $context_name]" } Index: openacs-4/packages/acs-subsite/www/shared/send-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/send-email.tcl,v diff -u -N -r1.8.8.1 -r1.8.8.2 --- openacs-4/packages/acs-subsite/www/shared/send-email.tcl 10 Sep 2015 08:21:53 -0000 1.8.8.1 +++ openacs-4/packages/acs-subsite/www/shared/send-email.tcl 18 Sep 2015 07:27:49 -0000 1.8.8.2 @@ -42,7 +42,7 @@ if {[catch {acs_mail_lite::send -send_immediately -to_addr $to -from_addr $from -subject $subject -body $body} errmsg]} { ad_return_error "Mail Failed" "

The system was unable to send email. Please notify the user personally. This problem is probably caused by a misconfiguration of your email system. Here is the error:

-
[ad_quotehtml $errmsg]
" +
[ns_quotehtml $errmsg]
" } } -after_submit { Index: openacs-4/packages/acs-tcl/lib/page-error.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/page-error.tcl,v diff -u -N -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/acs-tcl/lib/page-error.tcl 10 Sep 2015 08:21:54 -0000 1.10.2.1 +++ openacs-4/packages/acs-tcl/lib/page-error.tcl 18 Sep 2015 07:33:47 -0000 1.10.2.2 @@ -40,13 +40,13 @@ [_ acs-tcl.File] [ns_quotehtml $error_file]
[_ acs-tcl.User_Name] [ns_quotehtml $user_name]
[_ acs-tcl.lt_User_Id_of_the_user_t] [ns_quotehtml $user_id]
-IP: [ad_quotehtml [ns_conn peeraddr]]
+IP: [ns_quotehtml [ns_conn peeraddr]]
[_ acs-tcl.Browser_of_the_user] [ns_quotehtml [ns_set get [ns_conn headers] User-Agent]]

-----------------------------
[_ acs-tcl.Error_details]
-----------------------------
-
[ad_quotehtml $error_info]
+
[ns_quotehtml $error_info]

------------------------------

@@ -262,15 +262,15 @@ --------------------------------------------------------
[_ acs-tcl.Error_Report]
--------------------------------------------------------
-
[_ acs-tcl.Previus] [ad_quotehtml $prev_url] -
[_ acs-tcl.Page] [ad_quotehtml $error_url] -
[_ acs-tcl.File] [ad_quotehtml $error_file] -
[_ acs-tcl.User_Name] [ad_quotehtml $user_name] -
[_ acs-tcl.lt_User_Id_of_the_user_t] [ad_quotehtml $user_id] -
[_ acs-tcl.Browser_of_the_user] [ad_quotehtml [ns_set get [ns_conn headers] User-Agent]] +
[_ acs-tcl.Previus] [ns_quotehtml $prev_url] +
[_ acs-tcl.Page] [ns_quotehtml $error_url] +
[_ acs-tcl.File] [ns_quotehtml $error_file] +
[_ acs-tcl.User_Name] [ns_quotehtml $user_name] +
[_ acs-tcl.lt_User_Id_of_the_user_t] [ns_quotehtml $user_id] +
[_ acs-tcl.Browser_of_the_user] [ns_quotehtml [ns_set get [ns_conn headers] User-Agent]]

[_ acs-tcl.User_comments]
-[ad_quotehtml [template::util::richtext::get_property contents $description]]
+[ns_quotehtml [template::util::richtext::get_property contents $description]]

" foreach available_enabled_action_id [workflow::case::get_available_enabled_action_ids -case_id $case_id] { Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v diff -u -N -r1.88.2.2 -r1.88.2.3 --- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 10 Sep 2015 08:21:54 -0000 1.88.2.2 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 18 Sep 2015 07:33:48 -0000 1.88.2.3 @@ -2536,7 +2536,7 @@ while { [gets $fp line] >= 0 } { # Don't bother writing out lines which are purely whitespace. if { ![string is space $line] } { - apm_callback_and_log $callback "[ad_quotehtml $line]\n" + apm_callback_and_log $callback "[ns_quotehtml $line]\n" } } close $fp @@ -2581,7 +2581,7 @@ while { [gets $fp line] >= 0 } { # Don't bother writing out lines which are purely whitespace. if { ![string is space $line] } { - apm_callback_and_log $callback "[ad_quotehtml $line]\n" + apm_callback_and_log $callback "[ns_quotehtml $line]\n" } } @@ -2666,7 +2666,7 @@ while { [gets $fd line] >= 0 } { # Don't bother writing out lines which are purely whitespace. if { ![string is space $line] } { - apm_callback_and_log $callback "[ad_quotehtml $line]\n" + apm_callback_and_log $callback "[ns_quotehtml $line]\n" } } close $fd @@ -2711,7 +2711,7 @@ while { [gets $fp line] >= 0 } { # Don't bother writing out lines which are purely whitespace. if { ![string is space $line] } { - apm_callback_and_log $callback "[ad_quotehtml $line]\n" + apm_callback_and_log $callback "[ns_quotehtml $line]\n" } } @@ -2777,13 +2777,13 @@ while { [gets $fp line] >= 0 } { # Don't bother writing out lines which are purely whitespace. if { ![string is space $line] } { - apm_callback_and_log $callback "[ad_quotehtml $line]\n" + apm_callback_and_log $callback "[ns_quotehtml $line]\n" } } if { [catch { close $fp } errmsg] } { - apm_callback_and_log $callback "[ad_quotehtml $errmsg]\n" + apm_callback_and_log $callback "[ns_quotehtml $errmsg]\n" } } Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v diff -u -N -r1.36.2.1 -r1.36.2.2 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 17 Aug 2015 17:45:03 -0000 1.36.2.1 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 18 Sep 2015 07:33:48 -0000 1.36.2.2 @@ -580,7 +580,7 @@ apm_callback_and_log $callback "
  • Downloading $url..." if { [catch {apm_transfer_file -url $url -output_file_name $file_path} errmsg] } { apm_callback_and_log $callback "Unable to download. Please check your URL.. - The following error was returned:
    [ad_quotehtml $errmsg]
    +            The following error was returned: 
    [ns_quotehtml $errmsg]
                 
    " return } @@ -601,7 +601,7 @@ apm_callback_and_log $callback "
  • Done. Archive is [format %.1f [expr { [file size $file_path] / 1024.0 }]]KB, with [llength $files] files.
  • " } errmsg] } { apm_callback_and_log $callback "The follow error occured during the uncompression process: -
    [ad_quotehtml $errmsg]

    +
    [ns_quotehtml $errmsg]

    " ns_log Error "Error loading APM file form url $url: $errmsg\n$::errorInfo" return @@ -657,7 +657,7 @@ file delete -force $tmpdir apm_callback_and_log $callback "The archive contains an unparseable package specification file: $info_file. The following error was produced while trying to - parse it:
    [ad_quotehtml $errmsg]
    . + parse it:
    [ns_quotehtml $errmsg]
    .

    The package cannot be installed. \n" Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -N -r1.109.2.4 -r1.109.2.5 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 9 Sep 2015 14:18:29 -0000 1.109.2.4 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 18 Sep 2015 07:33:48 -0000 1.109.2.5 @@ -930,7 +930,7 @@ apm_callback_and_log -severity Error $callback [subst {

    Failed to install $version(package-name), version $version(name). The following error was generated:

    - [ad_quotehtml $errmsg] + [ns_quotehtml $errmsg]

    @@ -1648,7 +1648,7 @@ } errmsg] } { apm_callback_and_log -severity Error $callback "

    [string totitle $package_key] not installed.

    Error: -

    [ad_quotehtml $errmsg]
    [ad_quotehtml $::errorInfo]
    " +
    [ns_quotehtml $errmsg]
    [ns_quotehtml $::errorInfo]
    " } } } @@ -2250,7 +2250,7 @@ # Interpolate the vars. if {$binds ne ""} { foreach {var val} $binds { - set $var [ad_quotehtml $val] + set $var [ns_quotehtml $val] } if {![info exists Id]} { set Id {$Id} @@ -2652,9 +2652,9 @@ } } else { if {$attribute_name eq ""} { - set xml_string "${indentation}<${element_name}>[ad_quotehtml $value]\n" + set xml_string "${indentation}<${element_name}>[ns_quotehtml $value]\n" } else { - set xml_string "${indentation}<$element_name $attribute_name=\"[ad_quotehtml $value]\"/>\n" + set xml_string "${indentation}<$element_name $attribute_name=\"[ns_quotehtml $value]\"/>\n" } } return $xml_string Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl,v diff -u -N -r1.31.2.2 -r1.31.2.3 --- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 10 Sep 2015 08:21:55 -0000 1.31.2.2 +++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 18 Sep 2015 07:33:48 -0000 1.31.2.3 @@ -67,44 +67,44 @@ append spec " - - [ad_quotehtml $pretty_name] - [ad_quotehtml $pretty_plural] + + [ns_quotehtml $pretty_name] + [ns_quotehtml $pretty_plural] $initial_install_p $singleton_p $implements_subsite_p $inherit_templates_p ${auto_mount_tag} - \n" + \n" db_foreach owner_info {} { append spec " [ad_quotehtml $owner_name]\n" + append spec ">[ns_quotehtml $owner_name]\n" } apm_log APMDebug "APM: Writing Version summary and description" if { $summary ne "" } { - append spec " [ad_quotehtml $summary]\n" + append spec " [ns_quotehtml $summary]\n" } if { $release_date ne "" } { - append spec " [ad_quotehtml [string range $release_date 0 9]]\n" + append spec " [ns_quotehtml [string range $release_date 0 9]]\n" } if { $vendor ne "" || $vendor_uri ne "" } { append spec " [ad_quotehtml $vendor]\n" + append spec ">[ns_quotehtml $vendor]\n" } if { $description ne "" } { append spec " [ad_quotehtml $description]\n" + append spec ">[ns_quotehtml $description]\n" } append spec [apm::package_version::attributes::generate_xml \ @@ -115,16 +115,16 @@ apm_log APMDebug "APM: Writing Dependencies." db_foreach dependency_info {} { - append spec " <$dependency_type url=\"[ad_quotehtml $service_uri]\" version=\"[ad_quotehtml $service_version]\"/>\n" + append spec " <$dependency_type url=\"[ns_quotehtml $service_uri]\" version=\"[ns_quotehtml $service_version]\"/>\n" } else { append spec " \n" } append spec "\n \n" apm_log APMDebug "APM: Writing callbacks" db_foreach callback_info {} { - append spec " \n" + append spec " \n" } append spec " " append spec "\n \n" @@ -133,20 +133,20 @@ set parent_package_keys [lrange [apm_one_package_inherit_order $package_key] 0 end-1] db_foreach parameter_info {} { - append spec " \n" Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v diff -u -N -r1.32.2.1 -r1.32.2.2 --- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 10 Sep 2015 08:21:58 -0000 1.32.2.1 +++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 18 Sep 2015 07:33:49 -0000 1.32.2.2 @@ -72,7 +72,7 @@ set node(instance_name) $node(name) } - set context [concat [list [list $node(url) [ad_quotehtml $node(instance_name)]]] $context] + set context [concat [list [list $node(url) [ns_quotehtml $node(instance_name)]]] $context] # We have the break here, so that 'from_node' itself is included if {$node_id eq $from_node} { Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -N -r1.118.2.3 -r1.118.2.4 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 5 Sep 2015 14:41:10 -0000 1.118.2.3 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 18 Sep 2015 07:33:49 -0000 1.118.2.4 @@ -339,7 +339,7 @@ ad_proc -private rp_finish_serving_page {} { global doc_properties if { [info exists doc_properties(body)] } { - rp_debug "Returning page:[info level [expr {[info level] - 1}]]: [ad_quotehtml [string range $doc_properties(body) 0 100]]" + rp_debug "Returning page:[info level [expr {[info level] - 1}]]: [ns_quotehtml [string range $doc_properties(body) 0 100]]" doc_return 200 text/html $doc_properties(body) } } Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v diff -u -N -r1.93.2.3 -r1.93.2.4 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 9 Sep 2015 14:13:53 -0000 1.93.2.3 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 18 Sep 2015 07:33:49 -0000 1.93.2.4 @@ -68,7 +68,7 @@ # -if {[info command ::nx::Object] ne "" +if {[info commands ::nx::Object] ne "" && [db_driverkey ""] eq "postgresql" && [apm_package_installed_p xotcl-core] && [ns_info name] eq "NaviServer" @@ -1505,7 +1505,7 @@ $limit_clause "] foreach entry $tree { - foreach {url node_id object_id} $entry break + lassign $entry url node_id object_id foreach key [list p-$node_id url-$node_id urls-$object_id] { ::xo::clusterwide ns_cache flush xo_site_nodes $key } @@ -1596,7 +1596,7 @@ # If we are called during the *-init procs, the database # interface might not be initialized yet. However, in this # situation, there is nothing to flush yet. - if {[info command ::xo::db::sql::site_node] ne ""} { + if {[info commands ::xo::db::sql::site_node] ne ""} { ::xo::site_node flush_cache -node_id $root_node_id } } @@ -1767,7 +1767,7 @@
             # Pull out the package_id of the subsite closest to our current node
    -        set pkg_id [site_node_closest_ancestor_package "acs-subsite"]
    +        set pkg_id [site_node::closest_ancestor_package -include_self -package_key "acs-subsite"]
             
    @param default The value to return if no package can be found Index: openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/table-display-procs.tcl,v diff -u -N -r1.23.2.3 -r1.23.2.4 --- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl 10 Sep 2015 08:22:00 -0000 1.23.2.3 +++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl 18 Sep 2015 07:33:49 -0000 1.23.2.4 @@ -864,9 +864,9 @@ } foreach val [lindex $opt 3] { if {$picked eq [lindex $val 0] } { - append html "\n" + append html "\n" } else { - append html "\n" + append html "\n" } } append html "\n" Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v diff -u -N -r1.67.2.1 -r1.67.2.2 --- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 10 Sep 2015 08:22:00 -0000 1.67.2.1 +++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 18 Sep 2015 07:33:49 -0000 1.67.2.2 @@ -76,7 +76,7 @@ # At this point, before inserting some of our own <, >, and "'s # we quote the ones entered by the user: if { !$no_quote_p } { - set text [ad_quotehtml $text] + set text [ns_quotehtml $text] } if { $encode_p} { @@ -1778,7 +1778,7 @@ @see ad_quotehtml } { - return [ad_quotehtml $arg] + return [ns_quotehtml $arg] } ad_proc -deprecated util_quote_double_quotes {arg} { @@ -1787,7 +1787,7 @@ @see ad_quotehtml } { - return [ad_quotehtml $arg] + return [ns_quotehtml $arg] } ad_proc -deprecated philg_quote_double_quotes {arg} { @@ -1796,7 +1796,7 @@ @see ad_quotehtml } { - return [ad_quotehtml $arg] + return [ns_quotehtml $arg] } # Local variables: Index: openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl,v diff -u -N -r1.18.2.1 -r1.18.2.2 --- openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl 10 Sep 2015 08:22:01 -0000 1.18.2.1 +++ openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl 18 Sep 2015 07:33:49 -0000 1.18.2.2 @@ -276,15 +276,15 @@ } } if_no_rows { if {$default ne ""} { - return "\n" + return "\n" } else { return {} } } } if { $count == 1 || ($dbcount == 1 && $hidden_if_one_db) } { - return "$item\n" + return "$item\n" } elseif {!$count && !$dbcount && $blank_if_no_db} { return {} } else { Index: openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl,v diff -u -N -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl 10 Sep 2015 08:22:03 -0000 1.10.2.1 +++ openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl 18 Sep 2015 07:33:49 -0000 1.10.2.2 @@ -217,7 +217,7 @@ if { [catch {set parse [xml_parse $data]} errMsg] } { ns_log warning "acs_tcl__check_xql_files: failed parse $file $errMsg" - aa_log_result fail "XML Parse Error: $file [ad_quotehtml $errMsg]" + aa_log_result fail "XML Parse Error: $file [ns_quotehtml $errMsg]" } else { # lets walk the nodes and check they are what we want to see. Index: openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl,v diff -u -N -r1.10.8.1 -r1.10.8.2 --- openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl 10 Sep 2015 08:22:03 -0000 1.10.8.1 +++ openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl 18 Sep 2015 07:33:49 -0000 1.10.8.2 @@ -193,7 +193,7 @@ #quote html set html "\"<&text>\"" aa_log "Unquote html=$html" - set result [ad_quotehtml $html] + set result [ns_quotehtml $html] aa_true "Quoute html=$result" [string equal ""<&text>"" $result] #unquote html Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v diff -u -N -r1.49.2.1 -r1.49.2.2 --- openacs-4/packages/acs-templating/tcl/date-procs.tcl 10 Sep 2015 08:22:05 -0000 1.49.2.1 +++ openacs-4/packages/acs-templating/tcl/date-procs.tcl 18 Sep 2015 07:31:48 -0000 1.49.2.2 @@ -1287,11 +1287,11 @@ } if {$element(mode) eq "edit"} { - append output "" + append output "" append output "" } else { append output $textdate - append output "" + append output "" } return $output Index: openacs-4/packages/acs-templating/tcl/filter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/filter-procs.tcl,v diff -u -N -r1.16.2.3 -r1.16.2.4 --- openacs-4/packages/acs-templating/tcl/filter-procs.tcl 10 Sep 2015 08:22:06 -0000 1.16.2.3 +++ openacs-4/packages/acs-templating/tcl/filter-procs.tcl 18 Sep 2015 07:31:48 -0000 1.16.2.4 @@ -85,7 +85,7 @@ ns_log debug "cmp_page_filter: Time elapsed: $timeElapsed" } errMsg] } { - set output
    [ad_quotehtml $::errorInfo]
    + set output
    [ns_quotehtml $::errorInfo]
    } ns_return 200 text/html $output Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v diff -u -N -r1.46.2.2 -r1.46.2.3 --- openacs-4/packages/acs-templating/tcl/form-procs.tcl 10 Sep 2015 08:22:06 -0000 1.46.2.2 +++ openacs-4/packages/acs-templating/tcl/form-procs.tcl 18 Sep 2015 07:31:48 -0000 1.46.2.3 @@ -861,7 +861,7 @@ set value [ns_set value $form $i] append export_data " -
    " +
    " } return $export_data Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v diff -u -N -r1.60.2.6 -r1.60.2.7 --- openacs-4/packages/acs-templating/tcl/list-procs.tcl 12 Sep 2015 16:47:24 -0000 1.60.2.6 +++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 18 Sep 2015 07:31:48 -0000 1.60.2.7 @@ -1837,13 +1837,13 @@ if { $key eq "summary" } { if { $value ne "" } { set summary_exists_p 1 - append output " summary=\"[ad_quotehtml $value]\"" + append output " summary=\"[ns_quotehtml $value]\"" } } else { if { $value ne "" } { - append output " [ad_quotehtml $key]=\"[ad_quotehtml $value]\"" + append output " [ns_quotehtml $key]=\"[ns_quotehtml $value]\"" } else { - append output " [ad_quotehtml $key]" + append output " [ns_quotehtml $key]" } } } Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v diff -u -N -r1.55.2.1 -r1.55.2.2 --- openacs-4/packages/acs-templating/tcl/parse-procs.tcl 12 Sep 2015 16:47:24 -0000 1.55.2.1 +++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl 18 Sep 2015 07:31:48 -0000 1.55.2.2 @@ -534,7 +534,7 @@ # We do each substitution set in two pieces, separately for normal # variables and for variables with ";noquote" attached to them. - # Specifically, @x@ gets translated to [ad_quotehtml ${x}], whereas + # Specifically, @x@ gets translated to [ns_quotehtml ${x}], whereas # @x;noquote@ gets translated to ${x}. The same goes for array # variable references. @@ -553,7 +553,7 @@ if {[ns_quotehtml ""] eq ""} { while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize $\2(\3)]]} code]} {} } else { - while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ad_quotehtml [lang::util::localize $\2(\3)]]} code]} {} + while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize $\2(\3)]]} code]} {} } # substitute simple variable references @@ -563,7 +563,7 @@ if {[ns_quotehtml ""] eq ""} { while {[regsub -all [template::adp_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize ${\2}]]} code]} {} } else { - while {[regsub -all [template::adp_variable_regexp] $code {\1[ad_quotehtml [lang::util::localize ${\2}]]} code]} {} + while {[regsub -all [template::adp_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize ${\2}]]} code]} {} } # unescape protected # references Index: openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl,v diff -u -N -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl 10 Sep 2015 08:22:07 -0000 1.7.2.1 +++ openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl 18 Sep 2015 07:31:48 -0000 1.7.2.2 @@ -294,7 +294,7 @@ append output "onclick=\"javascript:acs_RichText_Or_File_InputMethodChanged('$element(form_id)', '$element(id)', this);\">" append output "
    " } else { - append output "" + append output "" } if { $storage_type eq "" || $storage_type eq "text" } { @@ -329,9 +329,9 @@ # Display mode if { [info exists element(value)] } { append output [template::util::richtext_or_file::get_property html_value $element(value)] - append output "" - append output "" - append output "" + append output "" + append output "" + append output "" } } Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v diff -u -N -r1.52.2.6 -r1.52.2.7 --- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 10 Sep 2015 08:22:07 -0000 1.52.2.6 +++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 18 Sep 2015 07:31:48 -0000 1.52.2.7 @@ -280,8 +280,8 @@ # Display mode if { [info exists element(value)] } { append output [template::util::richtext::get_property html_value $element(value)] - append output "" - append output "" + append output "" + append output "" } } @@ -666,8 +666,8 @@ # Display mode if { $element(mode) eq "display" && [info exists element(value)] } { append output [template::util::richtext::get_property html_value $element(value)] - append output "" - append output "" + append output "" + append output "" } } Index: openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl,v diff -u -N -r1.22.2.1 -r1.22.2.2 --- openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl 10 Sep 2015 08:22:07 -0000 1.22.2.1 +++ openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl 18 Sep 2015 07:31:48 -0000 1.22.2.2 @@ -342,7 +342,7 @@ regsub -all {} $formtext_to_display "" formtext_to_display regsub -all {} $formtext_to_display "" formtext_to_display - append formtext_to_display "" + append formtext_to_display "" #### Index: openacs-4/packages/acs-templating/tcl/util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/util-procs.tcl,v diff -u -N -r1.28.2.6 -r1.28.2.7 --- openacs-4/packages/acs-templating/tcl/util-procs.tcl 12 Sep 2015 16:56:28 -0000 1.28.2.6 +++ openacs-4/packages/acs-templating/tcl/util-procs.tcl 18 Sep 2015 07:31:49 -0000 1.28.2.7 @@ -625,7 +625,7 @@ Quote possible HTML tags in the contents of the html parameter. } { - return [ad_quotehtml $html] + return [ns_quotehtml $html] } ad_proc -public template::util::multirow_quote_html {multirow_ref column_ref} { @@ -641,7 +641,7 @@ for { set i 1 } { $i <= $rowcount } { incr i} { upvar $multirow_ref:$i arr - set arr($column_ref) [ad_quotehtml [set arr($column_ref)]] + set arr($column_ref) [ns_quotehtml [set arr($column_ref)]] } } Index: openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl,v diff -u -N -r1.7 -r1.7.2.1 --- openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl 27 Oct 2014 16:42:00 -0000 1.7 +++ openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl 18 Sep 2015 07:37:05 -0000 1.7.2.1 @@ -133,7 +133,7 @@ lappend lines $l } set string [join $lines \n] - set html [ad_quotehtml $string] + set html [ns_quotehtml $string] regsub -all {(\n[\t ]*)(\#[^\n]*)} $html \\1\\2 html return "
    $html
    " } Index: openacs-4/packages/xotcl-core/tcl/chat-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/Attic/chat-procs.tcl,v diff -u -N -r1.23 -r1.23.2.1 --- openacs-4/packages/xotcl-core/tcl/chat-procs.tcl 16 Jun 2015 20:35:32 -0000 1.23 +++ openacs-4/packages/xotcl-core/tcl/chat-procs.tcl 18 Sep 2015 07:37:05 -0000 1.23.2.1 @@ -58,7 +58,7 @@ my instvar array now set user_id [expr {[info exists uid] ? $uid : [my set user_id]}] set color [my user_color $user_id] - set msg [ad_quotehtml $msg] + set msg [ns_quotehtml $msg] my log "-- msg=$msg" if {$get_new Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -N -r1.248.2.5 -r1.248.2.6 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 7 Sep 2015 19:24:48 -0000 1.248.2.5 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 18 Sep 2015 07:37:43 -0000 1.248.2.6 @@ -2322,7 +2322,7 @@ foreach category [::xowiki::Category get_category_infos \ -subtree_id $subtree_id -tree_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]] my set category_label($category_id) $category_name if { $level>1 } { set category_name "[string repeat {.} [expr {2*$level-4}]]..$category_name" Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -N -r1.327.2.7 -r1.327.2.8 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 7 Sep 2015 18:38:45 -0000 1.327.2.7 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 18 Sep 2015 07:37:43 -0000 1.327.2.8 @@ -1724,7 +1724,7 @@ -subtree_id $subtree_id -tree_id $tree_id] { lassign $category category_id category_name deprecated_p level if {$category_id in $category_ids} {lappend value $category_id} - 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 { } [expr {2*$level-4}]]..$category_name" }