- Fixed export_vars brace vs. brackets

tcl/graph-procs.tcl

@@ -129,21 +129,21 @@ ad_proc wf_decorate_workflow {
 
     switch $mode {
 	normal {
-	    set transition_link "define?[export_url_vars format mode]&"
-	    set place_link "define?[export_url_vars format mode]&"
+	    set transition_link "define?[export_vars -url { format mode}]&"
+	    set place_link "define?[export_vars -url { format mode}]&"
 	}
 	arcadd {
 	    if { ![empty_string_p $selected_place_key] } {
 		set direction in
 		set place_link {}
-		set transition_link "arc-add?[export_url_vars place_key=[ns_urlencode $selected_place_key] direction return_url]&"
+		set transition_link "arc-add?[export_vars -url { place_key=[ns_urlencode $selected_place_key] direction return_url}]&"
 		foreach loop_transition_key $workflow(arcs,place,$selected_place_key,in) {
 		    lappend nolink "transition,$loop_transition_key"
 		}
 	    } else {
 		set direction out
 		set transition_link {}
-		set place_link "arc-add?[export_url_vars transition_key=[ns_urlencode $selected_transition_key] direction return_url]&"
+		set place_link "arc-add?[export_vars -url { transition_key=[ns_urlencode $selected_transition_key] direction return_url}]&"
 		foreach loop_place_key $workflow(arcs,transition,$selected_transition_key,out) {
 		    lappend nolink "place,$loop_place_key"
 		}
@@ -153,14 +153,14 @@ ad_proc wf_decorate_workflow {
 	    if { ![empty_string_p $selected_place_key] } {
 		set direction in
 		set place_link {}
-		set transition_link "arc-delete?[export_url_vars place_key=[ns_urlencode $selected_place_key] direction return_url]&"
+		set transition_link "arc-delete?[export_vars -url { place_key=[ns_urlencode $selected_place_key] direction return_url}]&"
 		foreach loop_transition_key $workflow(arcs,place,$selected_place_key,in) {
 		    lappend onlylink "transition,$loop_transition_key"
 		}
 	    } else {
 		set direction out
 		set transition_link {}
-		set place_link "arc-delete?[export_url_vars transition_key=[ns_urlencode $selected_transition_key] direction return_url]&"
+		set place_link "arc-delete?[export_vars -url { transition_key=[ns_urlencode $selected_transition_key] direction return_url}]&"
 		foreach loop_place_key $workflow(arcs,transition,$selected_transition_key,out) {
 		    lappend onlylink "place,$loop_place_key"
 		}
@@ -190,7 +190,7 @@ ad_proc wf_decorate_workflow {
     #
     #####
 
-    # to make export_url_vars easier
+    # to make export_vars easier
     set workflow_key $workflow(workflow_key)
 
     foreach type { transition place } {
@@ -199,7 +199,7 @@ ad_proc wf_decorate_workflow {
 		set workflow($type,$key,url) [ad_decode \
 			[set ${type}_link] \
 			"" "" \
-			"[set ${type}_link][export_url_vars workflow_key ${type}_key=[ns_urlencode $key]]"]
+			"[set ${type}_link][export_vars -url { workflow_key ${type}_key=[ns_urlencode $key]}]"]
 	    } else {
 		set workflow($type,$key,url) {}
 	    }
@@ -211,7 +211,7 @@ ad_proc wf_decorate_workflow {
 	set workflow($key,url) [ad_decode \
 		[set ${type}_link] \
 		"" "" \
-		"[set ${type}_link][export_url_vars workflow_key ${type}_key=[ns_urlencode ${type_key}]]"]
+		"[set ${type}_link][export_vars -url { workflow_key ${type}_key=[ns_urlencode ${type_key}]}]"]
     }
     foreach key $nolink {
 	set workflow($key,url) {}

www/admin/arc-add.tcl

@@ -3,7 +3,7 @@ ad_page_contract {} {
     transition_key:notnull
     place_key:notnull
     direction:notnull
-    {return_url "define?[export_url_vars workflow_key]"}
+    {return_url "define?[export_vars -url { workflow_key}]"}
 }
 
 if { [db_string num_arcs { 

www/admin/arc-delete.tcl

@@ -9,7 +9,7 @@ ad_page_contract {
     transition_key
     place_key
     direction
-    {return_url "define?[export_url_vars workflow_key transition_key]"}
+    {return_url "define?[export_vars -url { workflow_key transition_key}]"}
 }
 
 wf_delete_arc \

www/admin/arc-edit-2.tcl

@@ -8,7 +8,7 @@ ad_page_contract {
     guard_callback
     guard_custom_arg
     guard_description
-    {return_url "define?[export_url_vars workflow_key transition_key]"}
+    {return_url "define?[export_vars -url { workflow_key transition_key}]"}
 }
 
 db_dml arc_update {

www/admin/arc-edit.tcl

@@ -49,7 +49,7 @@ foreach possible_guard $possible_guards {
 }
  
 
-set context [list [list "define?[export_url_vars workflow_key]" "Process Builder"] "Edit arc"]
+set context [list [list "define?[export_vars -url { workflow_key}]" "Process Builder"] "Edit arc"]
 set export_vars [export_vars -form {workflow_key transition_key place_key direction return_url}]
 
 

www/admin/attributes.tcl

@@ -25,7 +25,7 @@ db_1row workflow_name {
     where  ot.object_type = :workflow_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Attributes"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Attributes"]
 
 ad_return_template
 

www/admin/cases.tcl

@@ -33,7 +33,7 @@ db_1row workflow_name {
 
 set workflow_name [ad_quotehtml $workflow_name]
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Cases"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Cases"]
 
 
 #

www/admin/define-place-info.tcl

@@ -27,9 +27,9 @@ if { ![info exists modifiable_p] } {
 
 set place(place_key) $place_key
 set place(place_name) $workflow(place,$place_key,place_name)
-set place(edit_url) "place-edit?[export_url_vars workflow_key place_key return_url]"
+set place(edit_url) "place-edit?[export_vars -url { workflow_key place_key return_url}]"
 if { $modifiable_p } {
-    set place(delete_url) "place-delete?[export_url_vars workflow_key place_key return_url]"
+    set place(delete_url) "place-delete?[export_vars -url { workflow_key place_key return_url}]"
     set place(arc_add_url) "define?[export_ns_set_vars {url} {mode}]&mode=arcadd"
     set place(arc_delete_url) "define?[export_ns_set_vars {url} {mode}]&mode=arcdelete"
 } else {
@@ -46,18 +46,18 @@ template::multirow create producing_transitions transition_key transition_name u
 
 set direction "out"
 foreach loop_transition_key $workflow(arcs,place,$place_key,out) {
-    set url "define?[export_url_vars workflow_key transition_key=[ns_urlencode $loop_transition_key] format]"
+    set url "define?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] format}]"
     if { $modifiable_p } {
-	set arc_delete_url "arc-delete?[export_url_vars workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url]"
+	set arc_delete_url "arc-delete?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]"
     } else {
 	set arc_delete_url ""
     }
     set guard_pretty [ad_decode $workflow(arc,$loop_transition_key,$place_key,out,guard_description) \
 	    "" $workflow(arc,$loop_transition_key,$place_key,out,guard_callback) \
 	    $workflow(arc,$loop_transition_key,$place_key,out,guard_description)]
-    set guard_edit_url "arc-edit?[export_url_vars workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url]"
-    set guard_delete_url "arc-edit-2?[export_url_vars workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url]&guard_callback=&guard_custom_arg=&guard_description="
-    set guard_add_url "arc-edit?[export_url_vars workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url]"
+    set guard_edit_url "arc-edit?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]"
+    set guard_delete_url "arc-edit-2?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]&guard_callback=&guard_custom_arg=&guard_description="
+    set guard_add_url "arc-edit?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]"
     
     template::multirow append producing_transitions $loop_transition_key \
 	    $workflow(transition,$loop_transition_key,transition_name) $url $arc_delete_url \
@@ -70,9 +70,9 @@ template::multirow create consuming_transitions transition_key transition_name u
 
 set direction "in"
 foreach loop_transition_key $workflow(arcs,place,$place_key,in) {
-    set url "define?[export_url_vars workflow_key transition_key=[ns_urlencode $loop_transition_key] format]"
+    set url "define?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] format}]"
     if { $modifiable_p } {
-	set arc_delete_url "arc-delete?[export_url_vars workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url]"
+	set arc_delete_url "arc-delete?[export_vars -url { workflow_key transition_key=[ns_urlencode $loop_transition_key] place_key direction return_url}]"
     } else {
 	set arc_delete_url ""
     }

www/admin/define-transition-info.tcl

@@ -27,9 +27,9 @@ if { ![info exists modifiable_p] } {
 
 set transition(transition_key) $transition_key
 set transition(transition_name) $workflow(transition,$transition_key,transition_name)
-set transition(edit_url) "task-edit?[export_url_vars workflow_key transition_key return_url]"
+set transition(edit_url) "task-edit?[export_vars -url {workflow_key transition_key return_url}]"
 if { $modifiable_p } {
-    set transition(delete_url) "task-delete?[export_url_vars workflow_key transition_key return_url]"
+    set transition(delete_url) "task-delete?[export_vars -url {workflow_key transition_key return_url}]"
     set transition(arc_add_url) "define?[export_ns_set_vars {url} {mode}]&mode=arcadd"
     set transition(arc_delete_url) "define?[export_ns_set_vars {url} {mode}]&mode=arcdelete"
 } else {
@@ -48,9 +48,9 @@ template::multirow create input_places place_key place_name url arc_delete_url
 
 set direction "in"
 foreach loop_place_key $workflow(arcs,transition,$transition_key,in) {
-    set url "define?[export_url_vars workflow_key place_key=[ns_urlencode $loop_place_key] format]"
+    set url "define?[export_vars -url { workflow_key place_key=[ns_urlencode $loop_place_key] format}]"
     if { $modifiable_p } {
-	set arc_delete_url "arc-delete?[export_url_vars workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url]"
+	set arc_delete_url "arc-delete?[export_vars -url {workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]"
     } else {
 	set arc_delete_url ""
     }
@@ -65,18 +65,19 @@ template::multirow create output_places place_key place_name url arc_delete_url
 
 set direction "out"
 foreach loop_place_key $workflow(arcs,transition,$transition_key,out) {
-    set url "define?[export_url_vars workflow_key place_key=[ns_urlencode $loop_place_key] format]"
+    set url "define?[export_vars -url { workflow_key place_key=[ns_urlencode $loop_place_key] format}]"
     if { $modifiable_p } {
-	set arc_delete_url "arc-delete?[export_url_vars workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url]"
+	# ToDo: test: palace_key=[...]
+	set arc_delete_url "arc-delete?[export_vars -url { workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]"
     } else {
 	set arc_delete_url ""
     }
     set guard_pretty [ad_decode $workflow(arc,$transition_key,$loop_place_key,out,guard_description) \
 	    "" $workflow(arc,$transition_key,$loop_place_key,out,guard_callback) \
 	    $workflow(arc,$transition_key,$loop_place_key,out,guard_description)]
-    set guard_edit_url "arc-edit?[export_url_vars workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url]"
-    set guard_delete_url "arc-edit-2?[export_url_vars workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url]&guard_callback=&guard_custom_arg=&guard_description="
-    set guard_add_url "arc-edit?[export_url_vars workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url]"
+    set guard_edit_url "arc-edit?[export_vars -url { workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]"
+    set guard_delete_url "arc-edit-2?[export_vars -url { workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]&guard_callback=&guard_custom_arg=&guard_description="
+    set guard_add_url "arc-edit?[export_vars -url { workflow_key transition_key place_key=[ns_urlencode $loop_place_key] direction return_url}]"
     template::multirow append output_places $loop_place_key $workflow(place,$loop_place_key,place_name) $url $arc_delete_url \
 	    $guard_pretty $guard_edit_url $guard_delete_url $guard_add_url
 }

www/admin/define.tcl

@@ -108,9 +108,9 @@ if { [empty_string_p $place_key] && [empty_string_p $transition_key] && \
 
 set header_stuff {}
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow(pretty_name)"] "Edit process"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow(pretty_name)"] "Edit process"]
 
-set return_url "[ns_conn url]?[export_url_vars workflow_key format transition_key place_key]"
+set return_url "[ns_conn url]?[export_vars -url { workflow_key format transition_key place_key}]"
 
 set cancel_url $return_url
 
@@ -184,8 +184,8 @@ wf_decorate_workflow \
 #####
 
 template::multirow create edit_links url title
-template::multirow append edit_links "task-add?[export_url_vars workflow_key]" "add task"
-template::multirow append edit_links "place-add?[export_url_vars workflow_key]" "add place"
+template::multirow append edit_links "task-add?[export_vars -url { workflow_key}]" "add task"
+template::multirow append edit_links "place-add?[export_vars -url { workflow_key}]" "add place"
 
 #####
 #

www/admin/export-2.tcl

@@ -22,7 +22,7 @@ db_1row workflow_info {
     where  ot.object_type = :workflow_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Export process"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Export process"]
 
 set message {}
 

www/admin/export.tcl

@@ -21,7 +21,7 @@ db_1row workflow_info {
     where  ot.object_type = :workflow_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Export process"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Export process"]
 
 set download_url "export-download?[export_vars -url {workflow_key context_key}]"
 set view_url "export-2?[export_vars -url {workflow_key context_key {format "view"}}]"

www/admin/init-2.tcl

@@ -8,4 +8,4 @@ ad_page_contract {
 
 wf_case_new $workflow_key $context_key $object_id
 
-ad_returnredirect "workflow?[export_url_vars workflow_key]"
+ad_returnredirect "workflow?[export_vars -url { workflow_key}]"

www/admin/init.tcl

@@ -26,7 +26,7 @@ db_multirow objects object {
 } 
 
 set workflow_name [db_string workflow_name "select pretty_name from acs_object_types where object_type = :workflow_key"]
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Start case"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Start case"]
 set export_vars [export_vars -form {workflow_key}]
 
 ad_return_template

www/admin/name-edit-2.tcl

@@ -4,7 +4,7 @@ ad_page_contract {
     workflow_key:notnull
     workflow_name:notnull
     description
-    {return_url "workflow?[export_url_vars workflow_key]"}
+    {return_url "workflow?[export_vars -url { workflow_key}]"}
 }
 
 db_transaction {

www/admin/name-edit.tcl

@@ -19,7 +19,7 @@ db_1row workflow_info {
 
 
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Edit name"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Edit name"]
 set export_vars [export_vars -form {workflow_key return_url}]
 set workflow_name [ad_quotehtml $workflow_name]
 set description [ad_quotehtml $description]

www/admin/place-add-2.tcl

@@ -65,6 +65,6 @@ db_dml place_add {
     
 wf_workflow_changed $workflow_key
 
-ad_returnredirect "define?[export_url_vars workflow_key place_key]"
+ad_returnredirect "define?[export_vars -url { workflow_key place_key}]"
 
 

www/admin/place-add.tcl

@@ -14,7 +14,7 @@ db_1row workflow_info {
     where  ot.object_type = :workflow_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_url_vars workflow_key]" "Edit process"] "Add place"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] [list "define?[export_vars -url { workflow_key}]" "Edit process"] "Add place"]
 
 set export_vars [export_vars -form {workflow_key}]
 

www/admin/place-delete.tcl

@@ -3,7 +3,7 @@ ad_page_contract {
 } {
     workflow_key
     place_key
-    {return_url "define?[export_url_vars workflow_key]"}
+    {return_url "define?[export_vars -url { workflow_key}]"}
 }
 
 db_transaction {

www/admin/place-edit-2.tcl

@@ -5,7 +5,7 @@ ad_page_contract {
     place_key
     place_name
     {sort_order:integer ""}
-    {return_url "define?[export_url_vars workflow_key place_key]"}
+    {return_url "define?[export_vars -url { workflow_key place_key}]"}
 }
 
 db_dml place_update {

www/admin/place-edit.tcl

@@ -21,7 +21,7 @@ db_1row place_info {
 
 set place_name [ad_quotehtml $place_name]
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_url_vars workflow_key]" "Edit process"] "Edit place"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] [list "define?[export_vars -url { workflow_key}]" "Edit process"] "Edit place"]
 
 set export_vars [export_vars -form {workflow_key place_key return_url}]
 

www/admin/role-delete.tcl

@@ -7,7 +7,7 @@ ad_page_contract {
 } {
     workflow_key
     role_key
-    {return_url "define?[export_url_vars workflow_key]"}
+    {return_url "define?[export_vars -url { workflow_key}]"}
 }
 
 wf_delete_role \

www/admin/static-assignments.tcl

@@ -26,7 +26,7 @@ db_1row workflow_name {
     where  object_type = :workflow_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Static Assignments"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Static Assignments"]
 
 
 db_multirow context_slider context_slider {

www/admin/task-actions.tcl

@@ -29,7 +29,7 @@ db_1row workflow_and_transition_name {
     and    t.transition_key = :transition_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Actions by $transition_name"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Actions by $transition_name"]
 
 set export_vars [export_vars -form {workflow_key transition_key context_key return_url}]
 

www/admin/task-add.tcl

@@ -16,7 +16,7 @@ db_1row workflow_info {
 }
 
 
-set context [list [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"] [list "define?[export_url_vars workflow_key]" "Edit process"] "Add task"]
+set context [list [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"] [list "define?[export_vars -url { workflow_key}]" "Edit process"] "Add task"]
 
 set export_vars [export_vars -form {workflow_key return_url}]
 

www/admin/task-assignment.tcl

@@ -38,7 +38,7 @@ db_1row workflow_and_transition_name {
     and    t.transition_key = :transition_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Assignments by $transition_name"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Assignments by $transition_name"]
 
 db_multirow assigned_by_this assigned_by_this {
     select r.role_name,

www/admin/task-attributes.tcl

@@ -35,7 +35,7 @@ db_1row workflow_and_transition_name {
     and    t.transition_key = :transition_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Attributes for $transition_name"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Attributes for $transition_name"]
 
 set counter 0
 db_multirow attributes attributes {

www/admin/task-delete.tcl

@@ -7,7 +7,7 @@ ad_page_contract {
 } {
     workflow_key
     transition_key
-    {return_url "define?[export_url_vars workflow_key]"}
+    {return_url "define?[export_vars -url { workflow_key}]"}
 }
 
 wf_delete_transition \

www/admin/task-panel-edit.tcl

@@ -19,7 +19,7 @@ ad_page_contract {
 
 db_1row workflow_and_transition_name {}
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Edit panel"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Edit panel"]
 
 db_1row panel {} -column_array panel
 

www/admin/task-panels.tcl

@@ -37,7 +37,7 @@ db_1row workflow_and_transition_name {
     and    t.transition_key = :transition_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Panels for $transition_name"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Panels for $transition_name"]
 
 db_multirow context_slider context_slider {
     select context_key as context_key_from_db,

www/admin/unassigned-tasks.tcl

@@ -21,7 +21,7 @@ db_1row workflow_info {
 
 set workflow(workflow_key) $workflow_key
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow(pretty_name)"] "Unassigned tasks"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow(pretty_name)"] "Unassigned tasks"]
 
 set date_format "Mon fmDDfm, YYYY HH24:MI:SS"
 

www/admin/workflow-add-2.tcl

@@ -75,4 +75,4 @@ db_transaction {
 
 
 
-ad_returnredirect "define?[export_url_vars workflow_key]"
+ad_returnredirect "define?[export_vars -url { workflow_key}]"

www/admin/workflow-cases-delete.tcl

@@ -6,7 +6,7 @@ ad_page_contract {
     @cvs-id $Id$
 } {
     workflow_key:notnull
-    {return_url "workflow?[export_url_vars workflow_key]"}
+    {return_url "workflow?[export_vars -url { workflow_key}]"}
 } -validate {
     workflow_exists -requires {workflow_key} {
 	if ![db_string workflow_exists "

www/admin/workflow-copy-2.tcl

@@ -61,7 +61,7 @@ db_1row workflow_info {
 ReturnHeaders
 ns_write "[ad_header "Copying Process..."]
 <h2>Copying Process...</h2>
-[ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Copy process"]
+[ad_context_bar [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Copy process"]
 <hr>
 
 <pre>

www/admin/workflow-copy.tcl

@@ -22,7 +22,7 @@ db_1row workflow_info {
     where  ot.object_type = :workflow_key
 }
 
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Copy process"]
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Copy process"]
 
 
 db_1row pretty_names {

www/admin/workflow-display.tcl

@@ -48,7 +48,7 @@ switch $format {
 	set header_stuff [wf_ismap_to_client_map -name "wf_map" $ismap]
 
 	set display "
-	<img src=\"/[im_workflow_url]/workflow-gif?[export_url_vars tmpfile]\" border=0 usemap=\"#wf_map\" $width_and_height alt=\"Graphical representation of the process network\">
+	<img src=\"/[im_workflow_url]/workflow-gif?[export_vars -url { tmpfile}]\" border=0 usemap=\"#wf_map\" $width_and_height alt=\"Graphical representation of the process network\">
 	"
     }
     html {

www/admin/workflow-graph.tcl

@@ -50,7 +50,7 @@ if { [wf_graphviz_installed_p] } {
     
     ad_set_client_property wf wf_net_tmpfile $tmpfile
     
-    set workflow_img_tag "<img src=\"/[im_workflow_url]/workflow-gif?[export_url_vars tmpfile]\" border=0 $width_and_height alt=\"Graphical representation of the process network\">"
+    set workflow_img_tag "<img src=\"/[im_workflow_url]/workflow-gif?[export_vars -url { tmpfile}]\" border=0 $width_and_height alt=\"Graphical representation of the process network\">"
 } else {
     set workflow_img_tag ""
 }

www/admin/workflow-summary.tcl

@@ -39,9 +39,7 @@ db_1row workflow_name {
 }
 
 set workflow_name [ad_quotehtml $workflow_name]
-
-set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Workflow Summary"]
-
+set context [list [list "workflow?[export_vars -url { workflow_key}]" "$workflow_name"] "Workflow Summary"]
 set workflow_info [wf_get_workflow_net $workflow_key]
 array set workflow $workflow_info
 
@@ -188,7 +186,7 @@ if { [wf_graphviz_installed_p] } {
 	}
     }
     ad_set_client_property wf wf_net_tmpfile $tmpfile
-    set workflow_img_tag "<img src=\"/[im_workflow_url]/workflow-gif?[export_url_vars tmpfile]\" border=0 $width_and_height alt=\"Graphical representation of the process network\">"
+    set workflow_img_tag "<img src=\"/[im_workflow_url]/workflow-gif?[export_vars -url { tmpfile}]\" border=0 $width_and_height alt=\"Graphical representation of the process network\">"
     
 } else {
     set workflow_img_tag ""

www/assignee-add-2.tcl

@@ -3,7 +3,7 @@ ad_page_contract {
 } {
     task_id:integer
     party_id:integer
-    {return_url "task?[export_url_vars task_id]"}
+    {return_url "task?[export_vars -url { task_id}]"}
 }
 
 # ------------------------------------------------------------

www/case-state-change.tcl

@@ -29,7 +29,7 @@ switch $action {
 }
 
 if { ![info exists return_url] } {
-    set return_url case?[export_url_vars case_id]
+    set return_url case?[export_vars -url { case_id}]
 }
 
 ad_returnredirect $return_url
\ No newline at end of file

www/case-state-graph.tcl

@@ -96,7 +96,7 @@ if { [wf_graphviz_installed_p] } {
     
     ad_set_client_property wf wf_net_tmpfile $tmpfile
     
-    set workflow_img_tag "<img src=\"${workflow_url}workflow-gif?[export_url_vars tmpfile]\" border=0 $width_and_height alt=\"Graphical representation of the process network\">"
+    set workflow_img_tag "<img src=\"${workflow_url}workflow-gif?[export_vars -url { tmpfile}]\" border=0 $width_and_height alt=\"Graphical representation of the process network\">"
 } else {
     set workflow_img_tag ""
 }

www/case.tcl

@@ -36,11 +36,11 @@ switch $case(state) {
 	template::multirow append actions "case-state-change?[export_vars -url {case_id {action cancel}}]" "cancel"
     }
     suspended {
-	template::multirow append actions "case-state-change?[export_url_vars case_id]&action=resume" "resume"
-	template::multirow append actions "case-state-change?[export_url_vars case_id]&action=cancel" "cancel"
+	template::multirow append actions "case-state-change?[export_vars -url { case_id}]&action=resume" "resume"
+	template::multirow append actions "case-state-change?[export_vars -url { case_id}]&action=cancel" "cancel"
     }
     canceled {
-	template::multirow append actions "case-state-change?[export_url_vars case_id]&action=resume" "resume"
+	template::multirow append actions "case-state-change?[export_vars -url { case_id}]&action=resume" "resume"
     }
 }
 

www/comment-add-2.tcl

@@ -12,7 +12,7 @@ if { [info exists action(comment)] } {
 }
 
 if { ![info exists return_url] } {
-    set return_url case?[export_url_vars case_id]
+    set return_url case?[export_vars -url { case_id}]
 }
 
 ad_returnredirect $return_url
\ No newline at end of file

www/comment-add.tcl

@@ -19,7 +19,7 @@ db_1row case {
     where  case_id = :case_id
 } -column_array case
 
-set context [list [list "./" "Work List"] [list "case?[export_url_vars case_id]" "Case $case(object_name)"] "Comment"]
+set context [list [list "./" "Work List"] [list "case?[export_vars -url { case_id}]" "Case $case(object_name)"] "Comment"]
 
 set export_vars [export_vars -form {case_id return_url}]
 

www/task-deadline-set.tcl

@@ -18,7 +18,7 @@ set write_p [ad_permission_p $task_id "write"]
 
 array set task [wf_task_info $task_id]
 
-set context [list [list "case?case_idf=$task(case_id)" "Case \"$task(object_name)\""] [list "task?[export_url_vars task_id]" "Task \"$task(task_name)\""] "Set deadline"]
+set context [list [list "case?case_idf=$task(case_id)" "Case \"$task(object_name)\""] [list "task?[export_vars -url {task_id}]" "Task \"$task(task_name)\""] "Set deadline"]
 
 set export_vars [export_vars -form {task_id return_url}]
 

www/task.tcl

@@ -45,7 +45,7 @@ if { [llength $the_action] > 1 } {
     if {"finish" == $the_action} { ad_returnredirect $return_url }
 
     # Otherwise go back to the tasks's page
-    ad_returnredirect "task?[export_url_vars task_id return_url]"
+    ad_returnredirect "task?[export_vars -url {task_id return_url}]"
 
     ad_script_abort
 }
@@ -76,7 +76,7 @@ if {[catch {
     return
 }
 
-set task(add_assignee_url) "assignee-add?[export_url_vars task_id]"
+set task(add_assignee_url) "assignee-add?[export_vars -url {task_id}]"
 set task(assign_yourself_url) "assign-yourself?[export_vars -url {task_id {return_url $current_url}}]"
 set task(manage_assignments_url) "task-assignees?[export_vars -url {task_id {return_url $current_url}}]"
 set task(cancel_url) "task?[export_vars -url {task_id return_url {action.cancel Cancel}}]"
@@ -147,8 +147,8 @@ set wf_cancel_case_p [permission::permission_p -party_id $user_id -object_id [ad
 if { [string compare $case_state "active"] == 0 && ($wf_suspend_case_p || $wf_cancel_case_p) } {
     set extreme_p 1
     template::multirow create extreme_actions url title
-    if { $wf_suspend_case_p } { template::multirow append extreme_actions "case-state-change?[export_url_vars case_id]&action=suspend" [lang::message::lookup "" intranet-workflow.Suspend_Case "Suspend Case"]}
-    if { $wf_cancel_case_p } { template::multirow append extreme_actions "case-state-change?[export_url_vars case_id]&action=cancel" [lang::message::lookup "" intranet-workflow.Cancel_Case "Cancel Case"]}
+    if { $wf_suspend_case_p } { template::multirow append extreme_actions "case-state-change?[export_vars -url {case_id}]&action=suspend" [lang::message::lookup "" intranet-workflow.Suspend_Case "Suspend Case"]}
+    if { $wf_cancel_case_p } { template::multirow append extreme_actions "case-state-change?[export_vars -url {case_id}]&action=cancel" [lang::message::lookup "" intranet-workflow.Cancel_Case "Cancel Case"]}
 }
  
 # ---------------------------------------------------------

www/workflow.tcl

@@ -51,7 +51,7 @@ foreach transition $wf_info(transitions) {
     doc_body_append "
     <tr bgcolor=$bgcolor>
     <td align=center><strong>$task_num.</strong></td>
-    <td><a href=\"transition-edit?[export_url_vars transition_key]\">$trans(transition_name)</a></td>
+    <td><a href=\"transition-edit?[export_vars -url {transition_key}]\">$trans(transition_name)</a></td>
     "
 
     # the attributes which the loop can depend on (the '..if' part)
@@ -64,7 +64,7 @@ foreach transition $wf_info(transitions) {
 	array set attr $attribute
 
 	set attribute_name $attr(attribute_name)
-	append attribute_display "<a href=\"attribute-edit?[export_url_vars attribute_name]\">$attr(attribute_name)</a><br>"
+	append attribute_display "<a href=\"attribute-edit?[export_vars -url {attribute_name}]\">$attr(attribute_name)</a><br>"
 	lappend selectbox_if_items $attr(attribute_name)
     }