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.25 -r1.81.2.26 --- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 1 Mar 2023 16:47:01 -0000 1.81.2.25 +++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 24 Jul 2023 12:59:23 -0000 1.81.2.26 @@ -713,7 +713,7 @@ } if {[ns_conn isconnected]} { - set query_list [export_vars -url -entire_form] + set query_list [export_vars -entire_form] set base_url [ns_conn url] } else { set query_list "" 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 -r1.153.2.58 -r1.153.2.59 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 19 May 2023 12:13:19 -0000 1.153.2.58 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 24 Jul 2023 12:59:24 -0000 1.153.2.59 @@ -716,7 +716,7 @@ if { $host_header ne "" && $host_no_port ne $desired_host_no_port } { set query [ns_getform] if { $query ne "" } { - set query ?[export_vars -url -entire_form] + set query ?[export_vars -entire_form] } ad_returnredirect -allow_complete_url "[ns_conn location][ns_conn url]$query" return filter_return @@ -898,7 +898,7 @@ # set message $::errorInfo } - set error_url [ad_url][ad_conn url]?[export_vars -url -entire_form] + set error_url [ad_url][ad_conn url]?[export_vars -entire_form] set error_file [ad_conn file] set prev_url [util::get_referrer -trusted] set feedback_id [db_nextval acs_object_id_seq] 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 -r1.189.2.169 -r1.189.2.170 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 6 Jun 2023 09:07:19 -0000 1.189.2.169 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 24 Jul 2023 12:59:24 -0000 1.189.2.170 @@ -1028,7 +1028,7 @@ set query [ns_getform] if { $query ne "" } { - append url ?[export_vars -url -entire_form] + append url ?[export_vars -entire_form] } return $url Index: openacs-4/packages/acs-tcl/tcl/test/http-client-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/http-client-procs.tcl,v diff -u -r1.1.2.22 -r1.1.2.23 --- openacs-4/packages/acs-tcl/tcl/test/http-client-procs.tcl 26 Nov 2022 16:47:54 -0000 1.1.2.22 +++ openacs-4/packages/acs-tcl/tcl/test/http-client-procs.tcl 24 Jul 2023 12:59:24 -0000 1.1.2.23 @@ -270,7 +270,7 @@ aa_true "One cannot specify URLvars and POST vars at the same time" [catch { util::http::post \ -url $url?thevars=1 \ - -formvars [export_vars -url {{thevars 2}}] \ + -formvars [export_vars {{thevars 2}}] \ -formvars_list {thevars 3 thevars 4} } errmsg] @@ -279,14 +279,14 @@ util::http::post \ -url $url \ -files {{file /tmp/myfile.txt fieldname thevars}} \ - -formvars [export_vars -url {{thevars 2}}] \ + -formvars [export_vars {{thevars 2}}] \ -formvars_list {thevars 3 thevars 4} } errmsg] aa_section "Combine URLencoded and list parameters in a urlencoded POST request" set r [util::http::post \ -url $url \ - -formvars [export_vars -url {{vars 2} {vars_urlencoded:multiple {c d e f}}}] \ + -formvars [export_vars {{vars 2} {vars_urlencoded:multiple {c d e f}}}] \ -formvars_list {vars 3 vars 4 vars_list a vars_list b}] lassign [dict get $r page] files vars vars_urlencoded vars_list aa_equals "'files' has been sent correctly" \ @@ -313,7 +313,7 @@ set r [util::http::post \ -url $url \ -files $files \ - -formvars [export_vars -url {{vars 2} {vars_urlencoded:multiple {c d e f}}}] \ + -formvars [export_vars {{vars 2} {vars_urlencoded:multiple {c d e f}}}] \ -formvars_list {vars 3 vars 4 vars_list a vars_list b}] lassign [dict get $r page] files vars vars_urlencoded vars_list aa_equals "'files' has been sent correctly" \ @@ -329,7 +329,7 @@ set r [util::http::post \ -url $url \ -multipart \ - -formvars [export_vars -url {{vars 2} {vars_urlencoded:multiple {c d e f}}}] \ + -formvars [export_vars {{vars 2} {vars_urlencoded:multiple {c d e f}}}] \ -formvars_list {vars 3 vars 4 vars_list a vars_list b}] lassign [dict get $r page] files vars vars_urlencoded vars_list aa_equals "'files' has been sent correctly" \ Index: openacs-4/packages/proctoring-support/lib/proctoring-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/lib/proctoring-display.tcl,v diff -u -r1.1.2.23 -r1.1.2.24 --- openacs-4/packages/proctoring-support/lib/proctoring-display.tcl 11 Mar 2022 15:41:40 -0000 1.1.2.23 +++ openacs-4/packages/proctoring-support/lib/proctoring-display.tcl 24 Jul 2023 13:01:30 -0000 1.1.2.24 @@ -70,7 +70,7 @@ set proto [dict get $parsed_host proto] set ws_proto [expr {$proto eq "https" ? "wss" : "ws"}] set proctoring_url [site_node::get_package_url -package_key proctoring-support] -set ws_url $ws_proto://${host}${proctoring_url}/websocket?[export_vars -no_empty {user_id object_id}] +set ws_url $ws_proto://${host}${proctoring_url}/[export_vars -base websocket -no_empty {user_id object_id}] if {$delete_p && [llength $user_id] >= 1} { # Index: openacs-4/packages/proctoring-support/tcl/test/proctoring-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/tcl/test/proctoring-test-procs.tcl,v diff -u -r1.1.2.18 -r1.1.2.19 --- openacs-4/packages/proctoring-support/tcl/test/proctoring-test-procs.tcl 13 Dec 2022 15:29:20 -0000 1.1.2.18 +++ openacs-4/packages/proctoring-support/tcl/test/proctoring-test-procs.tcl 24 Jul 2023 13:01:30 -0000 1.1.2.19 @@ -482,7 +482,7 @@ -url $url \ -headers $headers \ -files [list [list fieldname file file $file]] \ - -formvars [export_vars -url {type name object_id}]] + -formvars [export_vars {type name object_id}]] aa_equals "Request returns 200" [dict get $r status] 200 aa_equals "Proctoring is not configured for '$object_id', so requests returns 'OFF'" \ @@ -500,7 +500,7 @@ -url $url \ -headers $headers \ -files [list [list fieldname file file $file]] \ - -formvars [export_vars -url {type name object_id {check_active_p false}}]] + -formvars [export_vars {type name object_id {check_active_p false}}]] aa_equals "Request returns 200" [dict get $r status] 200 aa_equals "Requests returns 'OK'" \ 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 -r1.21.2.2 -r1.21.2.3 --- openacs-4/packages/acs-admin/www/users/complex-search.tcl 6 Sep 2022 11:17:46 -0000 1.21.2.2 +++ openacs-4/packages/acs-admin/www/users/complex-search.tcl 24 Jul 2023 13:02:18 -0000 1.21.2.3 @@ -90,7 +90,7 @@ if { ![info exists passthrough] } { set passthrough_parameters "" } else { - set passthrough_parameters [export_vars -url -formvars $passthrough] + set passthrough_parameters [export_vars -formvars $passthrough] } @@ -245,7 +245,7 @@ set user_search:rowcount $rowcount -set export_authorize [export_vars -url -entire_form -exclude {only_authorized_p}] +set export_authorize [export_vars -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 -r1.10.2.4 -r1.10.2.5 --- openacs-4/packages/acs-admin/www/users/search.tcl 6 Sep 2022 11:17:46 -0000 1.10.2.4 +++ openacs-4/packages/acs-admin/www/users/search.tcl 24 Jul 2023 13:02:18 -0000 1.10.2.5 @@ -101,7 +101,7 @@ if { ![info exists passthrough] } { set passthrough_parameters "" } else { - set passthrough_parameters [export_vars -url -formvars $passthrough] + set passthrough_parameters [export_vars -formvars $passthrough] } if { [llength $limit_to_user_id] > 0} { @@ -177,7 +177,7 @@ set title "User search" } -set export_authorize [export_vars -url -entire_form -exclude {only_authorized_p}] +set export_authorize [export_vars -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 -r1.25.2.5 -r1.25.2.6 --- openacs-4/packages/acs-developer-support/www/request-info.tcl 6 Sep 2022 09:44:03 -0000 1.25.2.5 +++ openacs-4/packages/acs-developer-support/www/request-info.tcl 24 Jul 2023 13:03:57 -0000 1.25.2.6 @@ -165,7 +165,7 @@ } } if { !$rp_show_debug_p } { - set href [export_vars -url -base "./request-info" -entire_form {{rp_show_debug_p 1}}] + set href [export_vars -base "./request-info" -entire_form {{rp_show_debug_p 1}}] append body [subst {

show RP debugging information }] 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 -r1.11.2.2 -r1.11.2.3 --- openacs-4/packages/chat/www/search-2.tcl 6 Sep 2022 11:17:46 -0000 1.11.2.2 +++ openacs-4/packages/chat/www/search-2.tcl 24 Jul 2023 13:03:57 -0000 1.11.2.3 @@ -81,7 +81,7 @@ if { ![info exists passthrough] } { set passthrough_parameters "" } else { - set passthrough_parameters [export_vars -url -formvars $passthrough] + set passthrough_parameters [export_vars -formvars $passthrough] } if { [info exists limit_to_users_in_group_id] && $limit_to_users_in_group_id ne "" } { @@ -141,7 +141,7 @@ set title "User search" } -set export_authorize [export_vars -url -entire_form -exclude {only_authorized_p}] +set export_authorize [export_vars -entire_form -exclude {only_authorized_p}] ad_return_template 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 -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/acs-templating/tcl/dimensional-procs.tcl 11 Oct 2022 13:26:21 -0000 1.3.2.2 +++ openacs-4/packages/acs-templating/tcl/dimensional-procs.tcl 24 Jul 2023 13:08:29 -0000 1.3.2.3 @@ -98,7 +98,7 @@ lassign $option_value group_key group_label clause set selected [expr {$option_val eq $group_key}] - set href $url?[export_vars -url -set $options_set [list [list $option_key $group_key]]] + set href [export_vars -base $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/new-portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v diff -u -r1.216.2.20 -r1.216.2.21 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 29 Jan 2023 12:31:58 -0000 1.216.2.20 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 24 Jul 2023 13:08:29 -0000 1.216.2.21 @@ -2498,7 +2498,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_vars -url -set $options_set [list [list $option_key $thisoption_name]]] + set href [export_vars -base $url -set $options_set [list [list $option_key $thisoption_name]]] append html [subst { ${pre_td_html}${pre_html}${thisoption_value}${post_html} }]