Index: openacs-4/packages/acs-admin/www/send-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/send-email.tcl,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/acs-admin/www/send-email.tcl 10 Sep 2015 08:21:01 -0000 1.6.2.1 +++ openacs-4/packages/acs-admin/www/send-email.tcl 18 Sep 2015 07:39:03 -0000 1.6.2.2 @@ -25,7 +25,7 @@ if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $email_from -subject $subject -body $message} errmsg]} { ad_return_error $error_subject "
$error_message
-[ad_quotehtml $errmsg]
[ns_quotehtml $errmsg]
" + message[ad_quotehtml $errmsg]
" } } Index: openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl 10 Sep 2015 08:21:02 -0000 1.8.2.1 +++ openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl 18 Sep 2015 07:39:03 -0000 1.8.2.2 @@ -31,7 +31,7 @@ -callback apm_body_callback $package_key} errmsg] } { append body [subst { We encountered the following error when deleting package "$package_key": -[ns_quotehtml $errmsg]
+[ad_quotehtml $errmsg]
}] append body $::__apm_body Index: openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl,v diff -u -r1.19.2.3 -r1.19.2.4 --- openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl 12 Sep 2015 16:47:24 -0000 1.19.2.3 +++ openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl 18 Sep 2015 07:39:03 -0000 1.19.2.4 @@ -47,7 +47,7 @@ array set version [apm_read_package_info_file $spec_file] } errmsg] } { ns_write "[ns_quotehtml $errmsg]
" + file is invalid:[ad_quotehtml $errmsg]
" continue } Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v diff -u -r1.24 -r1.24.2.1 --- openacs-4/packages/acs-admin/www/apm/packages-install.tcl 15 Jun 2015 11:10:10 -0000 1.24 +++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl 18 Sep 2015 07:39:03 -0000 1.24.2.1 @@ -123,7 +123,7 @@ array set package [apm_read_package_info_file $spec_file] } errmsg] } { lappend errors "[ns_quotehtml $errmsg]
[ad_quotehtml $errmsg]
" +
[ns_quotehtml $errmsg]
" } else { apm_log APMDebug "APM: Adding $package(package.key) to list for installation." lappend pkg_info_list [pkg_info_new $package(package.key) $spec_file \ Index: openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl 10 Sep 2015 08:21:02 -0000 1.10.2.1 +++ openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl 18 Sep 2015 07:39:03 -0000 1.10.2.2 @@ -45,7 +45,7 @@ select 1 from apm_parameters where parameter_id = :parameter_id } -default 0]} { ad_return_error "Database Error" "The database is complaining about the parameter you entered:
-
" +[ad_quotehtml $errmsg]
" ad_script_abort } } Index: openacs-4/packages/acs-admin/www/apm/parameter-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add.tcl,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/acs-admin/www/apm/parameter-add.tcl 10 Sep 2015 08:21:02 -0000 1.10.2.1 +++ openacs-4/packages/acs-admin/www/apm/parameter-add.tcl 18 Sep 2015 07:39:03 -0000 1.10.2.2 @@ -64,7 +64,7 @@[ns_quotehtml $errmsg]
-
" +[ad_quotehtml $errmsg]
" } # LARS hack Index: openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl,v diff -u -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl 10 Sep 2015 08:21:03 -0000 1.7.2.1 +++ openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl 18 Sep 2015 07:39:03 -0000 1.7.2.2 @@ -44,7 +44,7 @@[ns_quotehtml $errmsg]
" +[ad_quotehtml $errmsg]
" } } Index: openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl 10 Sep 2015 08:21:04 -0000 1.8.2.1 +++ openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl 18 Sep 2015 07:39:04 -0000 1.8.2.2 @@ -29,7 +29,7 @@ apm_package_install_spec $version_id } on_error { ad_return_complaint 1 "Database Error: The database returned the following error: -[ns_quotehtml $errmsg]
" +[ad_quotehtml $errmsg]
" } ad_returnredirect [export_vars -base version-dependencies {version_id}] Index: openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl 10 Sep 2015 08:21:05 -0000 1.5.2.1 +++ openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl 18 Sep 2015 07:39:04 -0000 1.5.2.2 @@ -14,7 +14,7 @@ ad_return_complaint 1 "APM Generation Error: The database returned the following error message:[ns_quotehtml $errmsg]
" Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/acs-admin/www/apm/version-reload.tcl 27 Jun 2015 16:41:08 -0000 1.11 +++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl 18 Sep 2015 07:39:04 -0000 1.11.2.1 @@ -59,7 +59,7 @@ if {[info exists package_errors($file)]} { append body "-[ad_quotehtml $errmsg] +[ns_quotehtml $errmsg]
[ad_quotehtml $package_errors($file)]
[ns_quotehtml $package_errors($file)]
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]
The procedure is defined as:
proc $proc {[info args $proc]} { - [ad_quotehtml [info body $proc]] + [ns_quotehtml [info body $proc]] }}] Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v diff -u -r1.25.2.1 -r1.25.2.2 --- openacs-4/packages/acs-bootstrap-installer/installer.tcl 18 Aug 2015 12:27:15 -0000 1.25.2.1 +++ openacs-4/packages/acs-bootstrap-installer/installer.tcl 18 Sep 2015 07:43:09 -0000 1.25.2.2 @@ -25,7 +25,7 @@ set type_attribute [ad_decode $type "" "" "type=\"$type\""] if { $value ne "" } { - append extra_attributes " value=\"[ad_quotehtml $value]\"" + append extra_attributes " value=\"[ns_quotehtml $value]\"" } set input_widget "" @@ -361,7 +361,7 @@ foreach {package error_infos} [array get errors] { append result "