Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v diff -u -N -r1.21 -r1.21.2.1 --- openacs-4/packages/acs-admin/www/users/complex-search.tcl 27 Jul 2018 08:54:02 -0000 1.21 +++ openacs-4/packages/acs-admin/www/users/complex-search.tcl 6 Sep 2022 09:44:02 -0000 1.21.2.1 @@ -245,7 +245,7 @@ set user_search:rowcount $rowcount -set export_authorize [export_ns_set_vars {url} {only_authorized_p}] +set export_authorize [export_vars -url -entire_form -exclude {only_authorized_p}] # Local variables: # mode: tcl Index: openacs-4/packages/acs-admin/www/users/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.tcl,v diff -u -N -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/acs-admin/www/users/search.tcl 3 May 2020 18:18:53 -0000 1.10.2.2 +++ openacs-4/packages/acs-admin/www/users/search.tcl 6 Sep 2022 09:44:03 -0000 1.10.2.3 @@ -177,7 +177,7 @@ set title "User search" } -set export_authorize [export_ns_set_vars {url} {only_authorized_p}] +set export_authorize [export_vars -url -entire_form -exclude {only_authorized_p}] ad_return_template Index: openacs-4/packages/acs-developer-support/www/request-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.tcl,v diff -u -N -r1.25.2.4 -r1.25.2.5 --- openacs-4/packages/acs-developer-support/www/request-info.tcl 29 Aug 2022 14:17:23 -0000 1.25.2.4 +++ openacs-4/packages/acs-developer-support/www/request-info.tcl 6 Sep 2022 09:44:03 -0000 1.25.2.5 @@ -165,7 +165,7 @@ } } if { !$rp_show_debug_p } { - set href "./request-info?[export_ns_set_vars url]&rp_show_debug_p=1" + set href [export_vars -url -base "./request-info" -entire_form {{rp_show_debug_p 1}}] append body [subst {
show RP debugging information
}]
Index: openacs-4/packages/acs-lang/www/admin/message-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.tcl,v
diff -u -N -r1.19.2.8 -r1.19.2.9
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl 15 Jul 2022 12:50:16 -0000 1.19.2.8
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl 6 Sep 2022 09:44:03 -0000 1.19.2.9
@@ -36,7 +36,7 @@
ad_form -name locale_form -action [ad_conn url] -export { tree_id category_id } -form {
{locale:text(select) {label "Language"} {value $locale} {options $languages}}
}
-set form_vars [export_ns_set_vars form {locale form:mode form:id __confirmed_p __refreshing_p formbutton:ok} [ad_conn form]]
+set form_vars [export_vars -form -entire_form -exclude {locale form\\:mode form\\:id __confirmed_p __refreshing_p formbutton\\:ok}]
# Title and context
set page_title $package_key
Index: openacs-4/packages/acs-subsite/www/shared/confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/confirm.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-subsite/www/shared/confirm.tcl 7 Aug 2017 23:47:59 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/shared/confirm.tcl 6 Sep 2022 09:44:03 -0000 1.2.2.1
@@ -32,8 +32,8 @@
set no_path [lindex $no_list 0]
set no_args_set [ns_parsequery [lindex $no_list 1]]
-set export_vars_yes [export_ns_set_vars form {} $yes_args_set]
-set export_vars_no [export_ns_set_vars form {} $no_args_set]
+set export_vars_yes [export_vars -form -set $yes_args_set]
+set export_vars_no [export_vars -form -set $no_args_set]
ad_return_template
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.189.2.143 -r1.189.2.144
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 6 Sep 2022 08:15:07 -0000 1.189.2.143
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 6 Sep 2022 09:44:03 -0000 1.189.2.144
@@ -415,6 +415,7 @@
{-anchor}
{-exclude {}}
{-override {}}
+ {-set {}}
{vars {}}
} {
@@ -595,6 +596,11 @@
base
option will be encoded by
ad_urlencode_url proc
+ @param set a ns_set that we want to export together with our
+ variables. It has no effect when also the 'entire_form'
+ flag is specified and will otherwise behave as if the
+ current request form data was the supplied ns_set.
+
@author Lars Pind (lars@pinds.com)
@creation-date December 7, 2000
} {
@@ -626,11 +632,17 @@
if { $entire_form_p } {
set the_form [ns_getform]
- # ns_getform will return the empty string outside a connection
- if { $the_form ne "" } {
- foreach {varname varvalue} [ns_set array $the_form] {
- lappend noprocessing_vars [list $varname $varvalue]
- }
+ } elseif { $set ne "" } {
+ set the_form $set
+ } else {
+ set the_form ""
+ }
+
+ # Note that ns_getform will return the empty string outside a
+ # connection.
+ if { $the_form ne "" } {
+ foreach {varname varvalue} [ns_set array $the_form] {
+ lappend noprocessing_vars [list $varname $varvalue]
}
}
@@ -918,7 +930,7 @@
return $hidden
}
-ad_proc export_ns_set_vars {
+ad_proc -deprecated export_ns_set_vars {
{format "url"}
{exclusion_list ""}
{setid ""}
Index: openacs-4/packages/acs-templating/tcl/dimensional-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/dimensional-procs.tcl,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-templating/tcl/dimensional-procs.tcl 20 Dec 2018 13:02:06 -0000 1.3
+++ openacs-4/packages/acs-templating/tcl/dimensional-procs.tcl 6 Sep 2022 09:44:03 -0000 1.3.2.1
@@ -98,7 +98,7 @@
lassign $option_value group_key group_label clause
set selected [expr {$option_val eq $group_key}]
- set href $url?[export_ns_set_vars url $option_key $options_set]&[ns_urlencode $option_key]=[ns_urlencode $group_key]
+ set href $url?[export_vars -url -set $options_set [list [list $option_key $group_key]]]
template::multirow append dimensional $option_key $option_label $group_key $group_label $selected $href
}
Index: openacs-4/packages/chat/www/search-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-2.tcl,v
diff -u -N -r1.11 -r1.11.2.1
--- openacs-4/packages/chat/www/search-2.tcl 17 Jul 2018 13:32:18 -0000 1.11
+++ openacs-4/packages/chat/www/search-2.tcl 6 Sep 2022 09:44:03 -0000 1.11.2.1
@@ -141,7 +141,7 @@
set title "User search"
}
-set export_authorize [export_ns_set_vars {url} {only_authorized_p}]
+set export_authorize [export_vars -url -entire_form -exclude {only_authorized_p}]
ad_return_template
Index: openacs-4/packages/general-comments/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.tcl,v
diff -u -N -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/general-comments/www/index.tcl 14 Feb 2019 16:15:01 -0000 1.10.2.1
+++ openacs-4/packages/general-comments/www/index.tcl 6 Sep 2022 09:44:03 -0000 1.10.2.2
@@ -27,7 +27,7 @@
# return_url to be passed to various helper pages so that we return to
# this page with the proper parameters
-set return_url [ns_urlencode index?[export_ns_set_vars url]]
+set return_url [ad_return_url]
set user_name [person::name -person_id $user_id]
Index: openacs-4/packages/general-comments/www/view-comment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v
diff -u -N -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/general-comments/www/view-comment.tcl 14 Feb 2019 16:15:01 -0000 1.12.2.1
+++ openacs-4/packages/general-comments/www/view-comment.tcl 6 Sep 2022 09:44:03 -0000 1.12.2.2
@@ -124,7 +124,7 @@
}]
set page_title "[_ general-comments.View_comment_on]: [acs_object_name $comment_on_id]"
set context "\"[_ general-comments.View_comment]\""
-set return_url_view "view-comment?[export_ns_set_vars url]"
+set return_url_view [ad_return_url]
set is_creator_p [expr {$user_id == $creation_user}]
if { $comment_mime_type ne "text/html" } {
Index: openacs-4/packages/general-comments/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/index.tcl,v
diff -u -N -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/general-comments/www/admin/index.tcl 14 Feb 2019 16:15:01 -0000 1.8.2.1
+++ openacs-4/packages/general-comments/www/admin/index.tcl 6 Sep 2022 09:44:03 -0000 1.8.2.2
@@ -20,7 +20,7 @@
# return_url to be passed to various helper pages so that we return to
# this page with the proper parameters
-set return_url [ad_urlencode index?[export_ns_set_vars url]]
+set return_url [ad_return_url]
# dimensional slider definition
set dimensional [list \
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 -N -r1.216.2.17 -r1.216.2.18
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl 30 Aug 2022 08:24:05 -0000 1.216.2.17
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 6 Sep 2022 09:44:03 -0000 1.216.2.18
@@ -2484,7 +2484,7 @@
if {($option_val eq $thisoption_name && !$link_all) || !$thisoption_link_p} {
append html "${pre_selected_td_html}${pre_html}${thisoption_value}${post_selected_html}\n"
} else {
- set href "$url?[export_ns_set_vars url $option_key $options_set]&[ns_urlencode $option_key]=[ns_urlencode $thisoption_name]"
+ set href $url?[export_vars -url -set $options_set [list [list $option_key $thisoption_name]]]
append html [subst {
${pre_td_html}${pre_html}${thisoption_value}${post_html}
}]