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 -r1.45.2.10 -r1.45.2.11
--- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 13 Jul 2022 09:54:32 -0000 1.45.2.10
+++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 26 Aug 2022 13:00:48 -0000 1.45.2.11
@@ -399,7 +399,7 @@
@return a list of acceptable system paths to search for executables in.
} {
- set paths [ad_parameter_all_values_as_list -package_id [ad_acs_kernel_id] SystemCommandPaths acs-kernel]
+ set paths [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemCommandPaths]
if {$paths eq ""} {
return [list "/usr/local/bin" "/usr/bin" "/bin" "/usr/sbin" "/sbin" "/usr/sbin"]
} else {
Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.81.2.17 -r1.81.2.18
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 29 May 2022 19:16:42 -0000 1.81.2.17
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 26 Aug 2022 13:00:49 -0000 1.81.2.18
@@ -614,20 +614,6 @@
}
}
-# returns particular parameter values as a Tcl list (i.e., it selects
-# out those with a certain key)
-
-ad_proc -public ad_parameter_all_values_as_list {
- {-package_id ""}
- name {subsection ""}
-} {
-
- Returns multiple values for a parameter as a list.
-
-} {
- return [join [parameter::get -package_id $package_id -parameter $name ] " "]
-}
-
ad_proc doc_return {args} {
A wrapper to be used instead of ns_return. It calls
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 -r1.29.2.25 -r1.29.2.26
--- openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl 23 Aug 2022 18:44:55 -0000 1.29.2.25
+++ openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl 26 Aug 2022 13:00:49 -0000 1.29.2.26
@@ -4347,7 +4347,26 @@
# return [util_memoize [list db_list db_type_keys {select db_type_key from apm_package_db_types}]]
}
+ad_proc -deprecated ad_parameter_all_values_as_list {
+ {-package_id ""}
+ name {subsection ""}
+} {
+ Returns multiple values for a parameter as a list.
+
+ DEPRECATED: this proc does not do much that joining a string
+ coming from a parameter, which does not make an invalid string
+ into a list. Best to take the value from the parameter directly
+ and rely on proper quoting by the user. Furthermore, the
+ 'subsection' argument is not used anywhere.
+
+ @see parameter::get
+ @see join
+
+} {
+ return [join [parameter::get -package_id $package_id -parameter $name ] " "]
+}
+
########################################################################
# Functions based on undefined code
########################################################################
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 -r1.109.2.30 -r1.109.2.31
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 25 Aug 2022 11:44:46 -0000 1.109.2.30
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 26 Aug 2022 13:00:49 -0000 1.109.2.31
@@ -901,31 +901,17 @@
return "For security reasons, you're not allowed to have the less-than-percent combination in your input."
}
- if {[info exists allowed_tags]} {
- lappend allowed_tags {*}$extra_tags
- } else {
- set allowed_tags [concat \
- $extra_tags \
- [ad_parameter_all_values_as_list \
- -package_id $::acs::kernel_id \
- AllowedTag antispam] \
- [ad_parameter_all_values_as_list AllowedTag antispam]]
+ if {![info exists allowed_tags]} {
+ set allowed_tags [parameter::get -package_id $::acs::kernel_id -parameter AllowedTag]
}
+ lappend allowed_tags {*}$extra_tags
if {![info exists allowed_attributes]} {
- set allowed_attributes [concat \
- [ad_parameter_all_values_as_list \
- -package_id $::acs::kernel_id \
- AllowedAttribute antispam] \
- [ad_parameter_all_values_as_list AllowedAttribute antispam]]
+ set allowed_attributes [parameter::get -package_id $::acs::kernel_id -parameter AllowedAttribute]
}
if {![info exists allowed_protocols]} {
- set allowed_protocols [concat \
- [ad_parameter_all_values_as_list \
- -package_id $::acs::kernel_id \
- AllowedProtocol antispam] \
- [ad_parameter_all_values_as_list AllowedProtocol antispam]]
+ set allowed_protocols [parameter::get -package_id $::acs::kernel_id -parameter AllowedProtocol]
}
foreach var {attributes tags protocols} {
@@ -1219,24 +1205,17 @@
array set allowed_tag {}
if {![info exists allowed_tags]} {
- # Use the antispam tags for this package instance and whatever is on the kernel.
- set allowed_tags {}
- lappend allowed_tags_list {*}[ad_parameter_all_values_as_list -package_id $::acs::kernel_id AllowedTag antispam]
- lappend allowed_tags_list {*}[ad_parameter_all_values_as_list AllowedTag antispam]
+ set allowed_tags [parameter::get -package_id $::acs::kernel_id -parameter AllowedTag]
}
array set allowed_attribute {}
if {![info exists allowed_attributes]} {
- set allowed_attributes {}
- lappend allowed_attributes {*}[ad_parameter_all_values_as_list -package_id $::acs::kernel_id AllowedAttribute antispam]
- lappend allowed_attributes {*}[ad_parameter_all_values_as_list AllowedAttribute antispam]
+ set allowed_attributes [parameter::get -package_id $::acs::kernel_id -parameter AllowedAttribute]
}
array set allowed_protocol {}
if {![info exists allowed_protocols]} {
- set allowed_protocols {}
- lappend allowed_protocols {*}[ad_parameter_all_values_as_list -package_id $::acs::kernel_id AllowedProtocol antispam]
- lappend allowed_protocols {*}[ad_parameter_all_values_as_list AllowedProtocol antispam]
+ set allowed_protocols [parameter::get -package_id $::acs::kernel_id -parameter AllowedProtocol]
}
if {"*" in $allowed_tags} {
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 -r1.20.2.11 -r1.20.2.12
--- openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl 25 Aug 2022 11:44:46 -0000 1.20.2.11
+++ openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl 26 Aug 2022 13:00:49 -0000 1.20.2.12
@@ -111,7 +111,6 @@
-procs {
ad_html_security_check
- ad_parameter_all_values_as_list
ad_parse_html_attributes_upvar
} \
ad_html_security_check_href_allowed {
@@ -128,7 +127,6 @@
-procs {
ad_html_security_check
- ad_parameter_all_values_as_list
ad_parse_html_attributes_upvar
} \
ad_html_security_check_forbidden_protolcols {