Index: openacs-4/packages/acs-core-docs/www/db-api-detailed.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api-detailed.adp,v diff -u -N -r1.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-core-docs/www/db-api-detailed.adp 10 Mar 2019 21:47:13 -0000 1.5.2.3 +++ openacs-4/packages/acs-core-docs/www/db-api-detailed.adp 1 Nov 2019 13:16:18 -0000 1.5.2.4 @@ -584,7 +584,7 @@ situations).
You may supply a code block, which will be executed for each row in the loop. This is very useful if you need to make computations that are better done in Tcl than in SQL, for example using -ns_urlencode or ad_quotehtml, etc. When the Tcl code is executed, +ns_urlencode or ns_quotehtml, etc. When the Tcl code is executed, all the columns from the SQL query will be set as local variables in that code. Any changes made to these local variables will be copied back into the multirow.
You may also add additional, computed columns to the multirow, Index: openacs-4/packages/acs-core-docs/www/db-api-detailed.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api-detailed.html,v diff -u -N -r1.52.2.4 -r1.52.2.5 --- openacs-4/packages/acs-core-docs/www/db-api-detailed.html 27 Jun 2019 18:22:21 -0000 1.52.2.4 +++ openacs-4/packages/acs-core-docs/www/db-api-detailed.html 1 Nov 2019 13:16:18 -0000 1.52.2.5 @@ -553,7 +553,7 @@ You may supply a code block, which will be executed for each row in the loop. This is very useful if you need to make computations that are better done in Tcl than in SQL, for example using ns_urlencode - or ad_quotehtml, etc. When the Tcl code is executed, all the columns + or ns_quotehtml, etc. When the Tcl code is executed, all the columns from the SQL query will be set as local variables in that code. Any changes made to these local variables will be copied back into the multirow. Index: openacs-4/packages/acs-core-docs/www/db-api.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api.adp,v diff -u -N -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-core-docs/www/db-api.adp 2 Mar 2019 19:30:04 -0000 1.5.2.2 +++ openacs-4/packages/acs-core-docs/www/db-api.adp 1 Nov 2019 13:16:18 -0000 1.5.2.3 @@ -282,7 +282,7 @@ situations).
You may supply a code block, which will be executed for each row in the loop. This is very useful if you need to make computations that are better done in Tcl than in SQL, for example using -ns_urlencode or ad_quotehtml, etc. When the Tcl code is executed, +ns_urlencode or ns_quotehtml, etc. When the Tcl code is executed, all the columns from the SQL query will be set as local variables in that code. Any changes made to these local variables will be copied back into the multirow.
You may also add additional, computed columns to the multirow,
Index: openacs-4/packages/acs-core-docs/www/db-api.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api.html,v
diff -u -N -r1.53.2.4 -r1.53.2.5
--- openacs-4/packages/acs-core-docs/www/db-api.html 27 Jun 2019 18:22:21 -0000 1.53.2.4
+++ openacs-4/packages/acs-core-docs/www/db-api.html 1 Nov 2019 13:16:18 -0000 1.53.2.5
@@ -315,7 +315,7 @@
You may supply a code block, which will be executed for each row in
the loop. This is very useful if you need to make computations that
are better done in Tcl than in SQL, for example using ns_urlencode
- or ad_quotehtml, etc. When the Tcl code is executed, all the columns
+ or ns_quotehtml, etc. When the Tcl code is executed, all the columns
from the SQL query will be set as local variables in that code. Any
changes made to these local variables will be copied back into the
multirow.
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml,v
diff -u -N -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml 14 Feb 2019 16:15:00 -0000 1.17.2.1
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml 1 Nov 2019 13:16:18 -0000 1.17.2.2
@@ -491,7 +491,7 @@
You may supply a code block, which will be executed for each row in
the loop. This is very useful if you need to make computations that
are better done in Tcl than in SQL, for example using ns_urlencode
- or ad_quotehtml, etc. When the Tcl code is executed, all the columns
+ or ns_quotehtml, etc. When the Tcl code is executed, all the columns
from the SQL query will be set as local variables in that code. Any
changes made to these local variables will be copied back into the
multirow.
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml,v
diff -u -N -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml 10 Mar 2019 21:44:57 -0000 1.12.2.2
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml 1 Nov 2019 13:16:18 -0000 1.12.2.3
@@ -969,7 +969,7 @@
You may supply a code block, which will be executed for each row in
the loop. This is very useful if you need to make computations that
are better done in Tcl than in SQL, for example using ns_urlencode
- or ad_quotehtml, etc. When the Tcl code is executed, all the columns
+ or ns_quotehtml, etc. When the Tcl code is executed, all the columns
from the SQL query will be set as local variables in that code. Any
changes made to these local variables will be copied back into the
multirow.
Index: openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/01-database-procs.tcl,v
diff -u -N -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl 8 Oct 2019 16:30:26 -0000 1.1.2.4
+++ openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl 1 Nov 2019 13:16:18 -0000 1.1.2.5
@@ -1930,7 +1930,7 @@
You may supply a code block, which will be executed for each row in
the loop. This is very useful if you need to make computations that
are better done in Tcl than in SQL, for example using ns_urlencode
- or ad_quotehtml, etc. When the Tcl code is executed, all the columns
+ or ns_quotehtml, etc. When the Tcl code is executed, all the columns
from the SQL query will be set as local variables in that code. Any
changes made to these local variables will be copied back into the
multirow.
Index: openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl,v
diff -u -N -r1.29.2.3 -r1.29.2.4
--- openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl 10 Aug 2019 14:33:26 -0000 1.29.2.3
+++ openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl 1 Nov 2019 13:16:18 -0000 1.29.2.4
@@ -1180,28 +1180,28 @@
}
ad_proc -deprecated -warn util_quotehtml { arg } {
- This proc does exactly the same as ad_quotehtml
.
+ This proc does exactly the same as ns_quotehtml
.
Use that instead. This one will be deleted eventually.
- @see ad_quotehtml
+ @see ns_quotehtml
} {
return [ns_quotehtml $arg]
}
ad_proc -deprecated util_quote_double_quotes {arg} {
- This proc does exactly the same as ad_quotehtml
.
+ This proc does exactly the same as ns_quotehtml
.
Use that instead. This one will be deleted eventually.
- @see ad_quotehtml
+ @see ns_quotehtml
} {
return [ns_quotehtml $arg]
}
ad_proc -deprecated philg_quote_double_quotes {arg} {
- This proc does exactly the same as ad_quotehtml
.
+ This proc does exactly the same as ns_quotehtml
.
Use that instead. This one will be deleted eventually.
- @see ad_quotehtml
+ @see ns_quotehtml
} {
return [ns_quotehtml $arg]
}
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.109.2.8 -r1.109.2.9
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 5 Oct 2019 12:57:36 -0000 1.109.2.8
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 1 Nov 2019 13:16:18 -0000 1.109.2.9
@@ -271,7 +271,7 @@
-ad_proc -public ad_quotehtml { arg } {
+ad_proc -deprecated -public ad_quotehtml { arg } {
Quotes ampersands, double-quotes, and angle brackets in $arg.
Analogous to ns_quotehtml except that it quotes double-quotes
@@ -283,9 +283,9 @@
}
ad_proc -public ad_unquotehtml {arg} {
- reverses ad_quotehtml
+ reverses ns_quotehtml
- @see ad_quotehtml
+ @see ns_quotehtml
} {
return [string map {& & > > < < " \" " \" ' '} $arg]
}
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.65.2.1 -r1.65.2.2
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl 10 Mar 2019 21:59:12 -0000 1.65.2.1
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl 1 Nov 2019 13:16:18 -0000 1.65.2.2
@@ -455,7 +455,7 @@
# Convert syntax to Tcl syntax:
# It's either an array variable or a Tcl variable
# array variables
- # TODO: ad_quotehtml
+ # TODO: ns_quotehtml
# TODO: lang::util::localize
regsub -all {[\]\[\{\}\"]\\$} $substitution {\\&} substitution
if { [regexp {^%([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)%$} $substitution match arr key] } {
@@ -549,17 +549,9 @@
while {[regsub -all [template::adp_array_variable_regexp_literal] $code {\1$\2(\3)} code]} {}
#
# Some aolservers have broken implementations of ns_quotehtml
- # (returning for the empty string input a one byte output). If this
- # happens, we fall back to the "manual" ad_quotehtml. However, we
- # prefer to use the faster (C-implemented) ns_quotehtml, since the
- # actual substitutions occur at page-view time, and they are called
- # therefore very often.
+ # (returning for the empty string input a one byte output).
#
- 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[ns_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
while {[regsub -all [template::adp_variable_regexp_noquote] $code {\1[lang::util::localize ${\2}]} code]} {}
Index: openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp,v
diff -u -N -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp 5 Oct 2019 13:29:58 -0000 1.6.2.1
+++ openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp 1 Nov 2019 13:16:18 -0000 1.6.2.2
@@ -168,7 +168,7 @@
the slave template, and once by the master template. This is the
result of how the templating system works: every
occurrence of \@variable\@ is converted to
-[ad_quotehtml $variable], even when it
+[ns_quotehtml $variable], even when it
is used only to set a property and you would expect the quoting to
be suppressed.
Implementation note: Ideally, the Index: openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html,v diff -u -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html 5 Oct 2019 13:29:58 -0000 1.4.2.1 +++ openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html 1 Nov 2019 13:16:18 -0000 1.4.2.2 @@ -199,7 +199,7 @@ the slave template, and once by the master template. This is the result of how the templating system works: every occurrence of @variable@ is converted to - [ad_quotehtml $variable], even when it + [ns_quotehtml $variable], even when it is used only to set a property and you would expect the quoting to be suppressed. @@ -393,6 +393,6 @@
Hrvoje Niksic -Last modified: Thu Aug 20 18:38:05 CEST 2015 +Last modified: Fri Nov 1 14:11:00 CET 2019