Index: openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 8 Dec 2012 18:20:36 -0000 1.11 +++ openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 9 Sep 2013 09:11:30 -0000 1.11.2.1 @@ -518,7 +518,7 @@ # pretty name for that attribute set col_value $enum_values($key:$col_value) } - template::multirow append $datasource_name $attr_props(pretty_name:$key) $col_value "id_column=$object_id&[ad_export_vars {attribute_id return_url}]" + template::multirow append $datasource_name $attr_props(pretty_name:$key) $col_value "id_column=$object_id&[export_vars {attribute_id return_url}]" } } } Index: openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl,v diff -u -r1.3 -r1.3.10.1 --- openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl 10 Jan 2007 21:22:06 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl 9 Sep 2013 09:11:30 -0000 1.3.10.1 @@ -57,9 +57,9 @@ # If we're an enumeration, redirect to start adding possible values. if {$datatype eq "enumeration"} { - ad_returnredirect enum-add?[ad_export_vars {attribute_id return_url}] + ad_returnredirect enum-add?[export_vars {attribute_id return_url}] } elseif { $return_url eq "" } { - ad_returnredirect add?[ad_export_vars {object_type}] + ad_returnredirect add?[export_vars {object_type}] } else { ad_returnredirect $return_url } Index: openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl 6 Sep 2002 21:49:57 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl 9 Sep 2013 09:11:31 -0000 1.2.26.1 @@ -25,7 +25,7 @@ } set context [list "Add attribute"] -set export_vars [ad_export_vars -form {object_type return_url}] +set export_vars [export_vars -form {object_type return_url}] set object_pretty_name [db_string object_pretty_name { select t.pretty_name Index: openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl 10 Jan 2007 21:22:06 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl 9 Sep 2013 09:11:31 -0000 1.2.10.1 @@ -29,7 +29,7 @@ } } } elseif { $return_url eq "" } { - set return_url one?[ad_export_vars attribute_id] + set return_url one?[export_vars attribute_id] } ad_returnredirect $return_url Index: openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl 6 Sep 2002 21:49:57 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl 9 Sep 2013 09:11:31 -0000 1.2.26.1 @@ -19,14 +19,14 @@ export_form_vars:onevalue } -set context [list [list one?[ad_export_vars attribute_id] "One attribute"] "Delete attribute"] +set context [list [list one?[export_vars attribute_id] "One attribute"] "Delete attribute"] db_1row select_object_type { select a.object_type, a.pretty_name as attribute_pretty_name from acs_attributes a where a.attribute_id = :attribute_id } -set export_form_vars [ad_export_vars -form {attribute_id return_url}] +set export_form_vars [export_vars -form {attribute_id return_url}] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl 10 Jan 2007 21:22:06 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl 9 Sep 2013 09:11:31 -0000 1.2.10.1 @@ -61,9 +61,9 @@ if {$operation eq "Add more values"} { # redirect to add more values - set return_url enum-add?[ad_export_vars {attribute_id return_url}] + set return_url enum-add?[export_vars {attribute_id return_url}] } elseif { $return_url eq "" } { - set return_url one?[ad_export_vars attribute_id] + set return_url one?[export_vars attribute_id] } ad_returnredirect $return_url Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl,v diff -u -r1.3 -r1.3.10.1 --- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl 10 Jan 2007 21:22:06 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl 9 Sep 2013 09:11:31 -0000 1.3.10.1 @@ -51,6 +51,6 @@ set context [list [list one?[export_url_vars attribute_id] "One attribute"] "Add values"] -set export_vars [ad_export_vars -form {attribute_id return_url}] +set export_vars [export_vars -form {attribute_id return_url}] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl,v diff -u -r1.3 -r1.3.10.1 --- openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl 10 Jan 2007 21:22:06 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl 9 Sep 2013 09:11:31 -0000 1.3.10.1 @@ -20,7 +20,7 @@ } set context [list "One attribute"] -set url_vars [ad_export_vars {attribute_id return_url}] +set url_vars [export_vars {attribute_id return_url}] # Note we really do want all the columns here for this generic display # Stuff it into a column array to avoid writing all these damn column Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl 10 Jan 2007 21:22:06 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl 9 Sep 2013 09:11:31 -0000 1.2.10.1 @@ -12,7 +12,7 @@ attribute_id:naturalnum,notnull enum_value:trim,notnull { operation:trim "No, I want to cancel my request" } - { return_url "one?[ad_export_vars attribute_id]" } + { return_url "one?[export_vars attribute_id]" } } if {$operation eq "Yes, I really want to delete this attribute value"} { Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl,v diff -u -r1.3 -r1.3.26.1 --- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl 18 Sep 2002 12:16:40 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl 9 Sep 2013 09:11:31 -0000 1.3.26.1 @@ -11,7 +11,7 @@ } { attribute_id:naturalnum,notnull enum_value:trim,notnull - { return_url "one?[ad_export_vars attribute_id]" } + { return_url "one?[export_vars attribute_id]" } } -properties { context:onevalue export_vars:onevalue @@ -29,7 +29,7 @@ ad_script_abort } -set context [list [list one?[ad_export_vars attribute_id] "One attribute"] "Delete value"] -set export_vars [ad_export_vars -form {attribute_id enum_value return_url}] +set context [list [list one?[export_vars attribute_id] "One attribute"] "Delete value"] +set export_vars [export_vars -form {attribute_id enum_value return_url}] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl 10 Jan 2007 21:22:06 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl 9 Sep 2013 09:11:31 -0000 1.2.10.1 @@ -45,7 +45,7 @@ } if {$return_url eq ""} { - set return_url one?[ad_export_vars group_type] + set return_url one?[export_vars group_type] } ad_returnredirect $return_url \ No newline at end of file Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl,v diff -u -r1.4 -r1.4.10.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 10 Jan 2007 21:22:06 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 9 Sep 2013 09:11:31 -0000 1.4.10.1 @@ -23,7 +23,7 @@ set context [list \ [list "[ad_conn package_url]admin/group-types/" "Group types"] \ - [list "one?[ad_export_vars group_type]" "One type"] \ + [list "one?[export_vars group_type]" "One type"] \ "Edit default join policy"] if { ![db_0or1row select_pretty_name { Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl,v diff -u -r1.5 -r1.5.10.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl 10 Jan 2007 21:22:06 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl 9 Sep 2013 09:11:31 -0000 1.5.10.1 @@ -24,7 +24,7 @@ if { $operation ne "Yes, I really want to delete this group type" } { if { $return_url eq "" } { - ad_returnredirect "one?[ad_export_vars {group_type}]" + ad_returnredirect "one?[export_vars {group_type}]" } else { ad_returnredirect $return_url } Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl,v diff -u -r1.3 -r1.3.26.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl 6 Sep 2002 21:49:58 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl 9 Sep 2013 09:11:31 -0000 1.3.26.1 @@ -61,7 +61,7 @@ from acs_object_types t where t.supertype = :group_type } { - template::multirow append subtypes $pretty_name [ad_export_vars {group_type return_url}] + template::multirow append subtypes $pretty_name [export_vars {group_type return_url}] } ad_return_template "delete-subtypes-exist" return @@ -90,13 +90,13 @@ or rel.object_type_two = :group_type) and rel.rel_type = t.object_type } { - template::multirow append rel_types $pretty_name [ad_export_vars {rel_type return_url}] + template::multirow append rel_types $pretty_name [export_vars {rel_type return_url}] } ad_return_template "delete-rel-types-exist" return } -set export_form_vars [ad_export_vars -form {group_type return_url}] +set export_form_vars [export_vars -form {group_type return_url}] set groups_of_this_type [util_commify_number [db_string groups_of_this_type { select count(o.object_id) Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl,v diff -u -r1.3 -r1.3.26.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl 6 Sep 2002 21:49:58 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl 9 Sep 2013 09:11:32 -0000 1.3.26.1 @@ -18,7 +18,7 @@ } set user_id [ad_conn user_id] -set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars group_type] "One type"] "Groups"] +set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[export_vars group_type] "One type"] "Groups"] set group_type_enc [ad_urlencode $group_type] if { ![db_0or1row select_type_info { Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl 4 Oct 2010 21:59:20 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl 9 Sep 2013 09:11:32 -0000 1.3.4.1 @@ -50,7 +50,7 @@ db_release_unused_handles if { $return_url eq "" } { - set return_url "one?[ad_export_vars {group_type}]" + set return_url "one?[export_vars {group_type}]" } ad_returnredirect $return_url Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl 15 Apr 2011 11:43:48 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl 9 Sep 2013 09:11:32 -0000 1.4.4.1 @@ -21,7 +21,7 @@ set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"] set doc(title) [_ acs-subsite.Add_a_permissible_relationship_type] -set context [list [list "[ad_conn package_url]admin/group-types/" [_ acs-subsite.Group_Types]] [list one?[ad_export_vars {group_type}] $group_type] $doc(title)] +set context [list [list "[ad_conn package_url]admin/group-types/" [_ acs-subsite.Group_Types]] [list one?[export_vars {group_type}] $group_type] $doc(title)] # Select out all the relationship types that are not currently @@ -49,6 +49,6 @@ } -set export_vars [ad_export_vars -form {group_type return_url}] +set export_vars [export_vars -form {group_type return_url}] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl 10 Jan 2007 21:22:06 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl 9 Sep 2013 09:11:32 -0000 1.2.10.1 @@ -21,7 +21,7 @@ from group_type_rels g where g.group_rel_type_id = :group_rel_type_id } - set return_url one?[ad_export_vars {group_type}] + set return_url one?[export_vars {group_type}] } if {$operation eq "Yes, I really want to remove this relationship type"} { Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl,v diff -u -r1.3 -r1.3.26.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl 6 Sep 2002 21:49:58 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl 9 Sep 2013 09:11:32 -0000 1.3.26.1 @@ -30,7 +30,7 @@ return } -set export_vars [ad_export_vars -form {group_rel_type_id return_url}] -set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Remove relation type"] +set export_vars [export_vars -form {group_rel_type_id return_url}] +set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[export_vars {group_type}] "One type"] "Remove relation type"] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl 10 Jan 2007 21:22:07 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl 9 Sep 2013 09:11:32 -0000 1.2.10.1 @@ -22,12 +22,12 @@ if { $return_url eq "" } { # Setup return_url to send up back to the group admin page # when we're all done - set return_url "[ad_conn package_url]/admin/groups/one?[ad_export_vars group_id]" + set return_url "[ad_conn package_url]/admin/groups/one?[export_vars group_id]" } - ad_returnredirect "../rel-segments/new?[ad_export_vars {group_id rel_type return_url}]" + ad_returnredirect "../rel-segments/new?[export_vars {group_id rel_type return_url}]" } else { if { $return_url eq "" } { - set return_url "one?[ad_export_vars group_id]" + set return_url "one?[export_vars group_id]" } ad_returnredirect $return_url } Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl,v diff -u -r1.3 -r1.3.26.1 --- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl 6 Sep 2002 21:49:59 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl 9 Sep 2013 09:11:32 -0000 1.3.26.1 @@ -20,8 +20,8 @@ group_name:onevalue } -set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "Add constraint"] -set export_vars [ad_export_vars -form {group_id rel_type return_url}] +set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[export_vars group_id] "One Group"] "Add constraint"] +set export_vars [export_vars -form {group_id rel_type return_url}] db_1row select_props { select acs_group.name(:group_id) as group_name, Index: openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl 10 Jan 2007 21:22:07 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl 9 Sep 2013 09:11:32 -0000 1.2.10.1 @@ -25,11 +25,11 @@ set group_type [group::delete $group_id] } if { $return_url eq "" && $group_type ne "" } { - set return_url "../group-types/one?[ad_export_vars group_type]" + set return_url "../group-types/one?[export_vars group_type]" } } else { if { $return_url eq "" } { - set return_url "one?[ad_export_vars group_id]" + set return_url "one?[export_vars group_id]" } } Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl 6 Sep 2002 21:49:59 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl 9 Sep 2013 09:11:32 -0000 1.2.26.1 @@ -23,9 +23,9 @@ } } -set context [list [list "" "Groups"] [list one?[ad_export_vars {group_id}] "One Group"] "Nuke group"] +set context [list [list "" "Groups"] [list one?[export_vars {group_id}] "One Group"] "Nuke group"] set group_name [db_string object_name {select acs_object.name(:group_id) from dual}] -set export_form_vars [ad_export_vars -form {group_id}] +set export_form_vars [export_vars -form {group_id}] db_1row select_counts { select (select count(*) from group_element_map where group_id = :group_id) as elements, Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl,v diff -u -r1.2.10.2 -r1.2.10.3 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 6 Sep 2013 12:06:49 -0000 1.2.10.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 9 Sep 2013 09:11:32 -0000 1.2.10.3 @@ -72,7 +72,7 @@ # Build the member state dimensional slider -set base_url [ad_conn package_url]admin/groups/elements-display?[ad_export_vars {group_id rel_type}] +set base_url [ad_conn package_url]admin/groups/elements-display?[export_vars {group_id rel_type}] template::multirow create possible_member_states \ val label url Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl,v diff -u -r1.4.22.1 -r1.4.22.2 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 6 Sep 2013 12:06:49 -0000 1.4.22.1 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 9 Sep 2013 09:11:32 -0000 1.4.22.2 @@ -54,6 +54,6 @@ set role_pretty_name [lang::util::localize $role_pretty_name] set role_pretty_plural [lang::util::localize $role_pretty_plural] -set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "All $role_pretty_plural"] +set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[export_vars group_id] "One Group"] "All $role_pretty_plural"] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v diff -u -r1.6 -r1.6.10.1 --- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 10 Jan 2007 21:22:07 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 9 Sep 2013 09:11:33 -0000 1.6.10.1 @@ -100,7 +100,7 @@ # Sub rel-types exist... select one set group_type_exact_p "t" - set export_url_vars [ad_export_vars -exclude group_type $export_var_list ] + set export_url_vars [export_vars -exclude group_type $export_var_list ] party::types_valid_for_rel_type_multirow -datasource_name object_types -start_with $group_type -rel_type $add_with_rel_type Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl 4 Oct 2010 21:59:20 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl 9 Sep 2013 09:11:33 -0000 1.4.4.1 @@ -67,10 +67,10 @@ from dual }] } { if { $return_url eq "" } { - set return_url one?[ad_export_vars group_id] + set return_url one?[export_vars group_id] } ad_returnredirect $return_url } else { - ad_returnredirect constraints-create?[ad_export_vars {group_id rel_type return_url}] + ad_returnredirect constraints-create?[export_vars {group_id rel_type return_url}] } Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl,v diff -u -r1.3 -r1.3.26.1 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl 6 Sep 2002 21:49:59 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl 9 Sep 2013 09:11:33 -0000 1.3.26.1 @@ -18,7 +18,7 @@ primary_rels:multirow } -set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list "one?[ad_export_vars group_id]" "One Group"] "Add relation type"] +set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list "one?[export_vars group_id]" "One Group"] "Add relation type"] set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"] # Select out all the relationship types that are not currently @@ -49,6 +49,6 @@ or acs_object_type.is_subtype_p(rel_type.object_type_one, :group_type) = 't') } -set export_vars [ad_export_vars -form {group_id return_url}] +set export_vars [export_vars -form {group_id return_url}] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl 10 Jan 2007 21:22:07 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl 9 Sep 2013 09:11:33 -0000 1.2.10.1 @@ -65,7 +65,7 @@ if { $return_url eq "" } { - set return_url one?[ad_export_vars {group_id}] + set return_url one?[export_vars {group_id}] } ad_returnredirect $return_url Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl,v diff -u -r1.3.26.1 -r1.3.26.2 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl 6 Sep 2013 16:01:45 -0000 1.3.26.1 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl 9 Sep 2013 09:11:33 -0000 1.3.26.2 @@ -32,7 +32,7 @@ permission::require_permission -object_id $group_id -privilege admin -set export_vars [ad_export_vars -form {group_rel_id return_url}] -set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars {group_id}] "One group"] "Remove relation type"] +set export_vars [export_vars -form {group_rel_id return_url}] +set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[export_vars {group_id}] "One group"] "Remove relation type"] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/parties/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new.tcl,v diff -u -r1.6 -r1.6.10.1 --- openacs-4/packages/acs-subsite/www/admin/parties/new.tcl 10 Jan 2007 21:22:07 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/parties/new.tcl 9 Sep 2013 09:11:33 -0000 1.6.10.1 @@ -116,7 +116,7 @@ lappend export_var_list group_rel_type_list - set export_url_vars [ad_export_vars -exclude {add_to_group_id add_with_rel_type} $export_var_list] + set export_url_vars [export_vars -exclude {add_to_group_id add_with_rel_type} $export_var_list] ad_return_template new-list-required-segments return @@ -132,9 +132,9 @@ set object_type_path_list [subsite::util::object_type_path_list $party_type party] set redirects_for_type [list \ - group "groups/new?group_id=$party_id&group_type_exact_p=$party_type_exact_p&group_type=$party_type&[ad_export_vars -exclude {party_id party_type_exact_p party_type} $export_var_list]" \ + group "groups/new?group_id=$party_id&group_type_exact_p=$party_type_exact_p&group_type=$party_type&[export_vars -exclude {party_id party_type_exact_p party_type} $export_var_list]" \ rel_segment "rel-segments/new?segment_id=$party_id&group_id=$add_to_group_id" \ - user "users/new?user_id=$party_id&[ad_export_vars -exclude {party_id party_type_exact_p party_type} $export_var_list]"] + user "users/new?user_id=$party_id&[export_vars -exclude {party_id party_type_exact_p party_type} $export_var_list]"] foreach {type url} $redirects_for_type { if {[lsearch $object_type_path_list $type] != -1} { @@ -148,7 +148,7 @@ # Sub party-types exist... select one set party_type_exact_p "t" - set export_url_vars [ad_export_vars -exclude party_type $export_var_list ] + set export_url_vars [export_vars -exclude party_type $export_var_list ] party::types_valid_for_rel_type_multirow -datasource_name object_types -start_with $party_type -rel_type $add_with_rel_type Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl 10 Jan 2007 21:22:07 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl 9 Sep 2013 09:11:33 -0000 1.2.10.1 @@ -17,10 +17,10 @@ set operation [string trim [string tolower $operation]] if {$operation eq "yes"} { - ad_returnredirect "constraints/new?rel_segment=$segment_id&[ad_export_vars return_url]" + ad_returnredirect "constraints/new?rel_segment=$segment_id&[export_vars return_url]" } else { if { $return_url eq "" } { - set return_url "one?[ad_export_vars segment_id]" + set return_url "one?[export_vars segment_id]" } ad_returnredirect $return_url } Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 10 Jan 2007 21:22:07 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 9 Sep 2013 09:11:33 -0000 1.2.10.1 @@ -27,7 +27,7 @@ select s.group_id from rel_segments s where s.segment_id = :segment_id } -default ""] if { $group_id ne "" } { - set return_url "../groups/one?[ad_export_vars group_id]" + set return_url "../groups/one?[export_vars group_id]" } } @@ -38,7 +38,7 @@ } if { $return_url eq "" } { - set return_url "one?[ad_export_vars {segment_id}]" + set return_url "one?[export_vars {segment_id}]" } ad_returnredirect $return_url Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl,v diff -u -r1.3.26.1 -r1.3.26.2 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl 9 Sep 2013 08:51:53 -0000 1.3.26.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl 9 Sep 2013 09:11:33 -0000 1.3.26.2 @@ -31,7 +31,7 @@ set export_vars [export_vars segment_id] set context [list \ [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] \ - [list one?[ad_export_vars segment_id] "One segment"] \ + [list one?[export_vars segment_id] "One segment"] \ "Remove segment"] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl,v diff -u -r1.5 -r1.5.22.1 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl 5 Dec 2002 13:11:01 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl 9 Sep 2013 09:11:33 -0000 1.5.22.1 @@ -36,7 +36,7 @@ # to be localized before they are displayed set role_pretty_plural [lang::util::localize $role_pretty_plural] -set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_export_vars {segment_id}] "One segment"] "Elements"] +set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[export_vars {segment_id}] "One segment"] "Elements"] # Expects segment_id, segment_name, group_id, role to be passed in Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl,v diff -u -r1.4.22.1 -r1.4.22.2 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl 6 Sep 2013 16:01:45 -0000 1.4.22.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl 9 Sep 2013 09:11:33 -0000 1.4.22.2 @@ -39,7 +39,7 @@ set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] "Add segment"] -set export_vars [ad_export_vars -form {group_id rel_type return_url}] +set export_vars [export_vars -form {group_id rel_type return_url}] db_1row select_basic_info { select acs_group.name(:group_id) as group_name, Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl,v diff -u -r1.4.10.1 -r1.4.10.2 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl 6 Sep 2013 16:01:46 -0000 1.4.10.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl 9 Sep 2013 09:11:33 -0000 1.4.10.2 @@ -66,7 +66,7 @@ } -set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_export_vars segment_id] "One segment"] "Create constraints"] -set export_vars [ad_export_vars -form {segment_id return_url}] +set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[export_vars segment_id] "One segment"] "Create constraints"] +set export_vars [export_vars -form {segment_id return_url}] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl,v diff -u -r1.3.10.1 -r1.3.10.2 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl 6 Sep 2013 16:01:46 -0000 1.3.10.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl 9 Sep 2013 09:11:33 -0000 1.3.10.2 @@ -31,15 +31,15 @@ # If the user has specified a rel_type, redirect to new-2 if { $rel_type ne "" } { - ad_returnredirect new-2?[ad_export_vars {group_id rel_type return_url}] + ad_returnredirect new-2?[export_vars {group_id rel_type return_url}] ad_script_abort } permission::require_permission -object_id $group_id -privilege "read" set context [list [list "" "Relational segments"] "Add segment"] -set export_vars [ad_export_vars -form {group_id return_url}] +set export_vars [export_vars -form {group_id return_url}] # Select out all relationship types db_multirow rel_types select_relation_types { select t.pretty_name, t.object_type as rel_type, Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl,v diff -u -r1.4.10.1 -r1.4.10.2 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl 6 Sep 2013 16:01:46 -0000 1.4.10.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl 9 Sep 2013 09:11:33 -0000 1.4.10.2 @@ -25,7 +25,7 @@ if { [db_0or1row select_segment_id { select c.rel_segment as segment_id from rel_constraints c where c.constraint_id = :constraint_id }] } { - set return_url "../one?[ad_export_vars {segment_id}]" + set return_url "../one?[export_vars {segment_id}]" } } @@ -51,7 +51,7 @@ } elseif { $return_url eq "" } { # if we're not deleting, redirect to the constraint page - set return_url one?[ad_export_vars constraint_id] + set return_url one?[export_vars constraint_id] } Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl,v diff -u -r1.3 -r1.3.26.1 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl 18 Sep 2002 12:16:42 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl 9 Sep 2013 09:11:33 -0000 1.3.26.1 @@ -18,7 +18,7 @@ export_vars:onevalue } -set context [list [list one?[ad_export_vars constraint_id] "One constraint"] "Delete constraint"] +set context [list [list one?[export_vars constraint_id] "One constraint"] "Delete constraint"] set package_id [ad_conn package_id] @@ -37,4 +37,4 @@ ad_script_abort } -set export_vars [ad_export_vars -form {constraint_id return_url}] +set export_vars [export_vars -form {constraint_id return_url}] Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl,v diff -u -r1.4 -r1.4.10.1 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 10 Jan 2007 21:22:07 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 9 Sep 2013 09:11:34 -0000 1.4.10.1 @@ -33,7 +33,7 @@ } -set return_url_enc [ad_urlencode "[ad_conn url]?[ad_export_vars {rel_segment constraint_name rel_side required_rel_segment return_url}]"] +set return_url_enc [ad_urlencode "[ad_conn url]?[export_vars {rel_segment constraint_name rel_side required_rel_segment return_url}]"] set context [list [list "../" "Relational segments"] [list "../one?segment_id=$rel_segment" "One Segment"] "Add constraint"] Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl,v diff -u -r1.3 -r1.3.10.1 --- openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl 10 Jan 2007 21:22:07 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl 9 Sep 2013 09:11:34 -0000 1.3.10.1 @@ -17,7 +17,7 @@ if { $operation ne "Yes, I really want to delete this relationship type" } { # set the return_url to something useful if we are not deleting if { $return_url eq "" } { - set return_url "one?[ad_export_vars rel_type]" + set return_url "one?[export_vars rel_type]" } } else { db_1row select_type_info { Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl 6 Sep 2002 21:50:03 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl 9 Sep 2013 09:11:34 -0000 1.2.26.1 @@ -18,7 +18,7 @@ counts:onerow } -set context [list [list "" "Relationship types"] [list one?[ad_export_vars rel_type] "One type"] "Delete type"] +set context [list [list "" "Relationship types"] [list one?[export_vars rel_type] "One type"] "Delete type"] set rel_type_pretty_name [db_string select_pretty_name { select t.pretty_name @@ -46,7 +46,7 @@ from acs_object_types t where t.supertype = :rel_type } { - template::multirow append subtypes $rel_type $pretty_name [ad_export_vars {rel_type return_url}] + template::multirow append subtypes $rel_type $pretty_name [export_vars {rel_type return_url}] } ad_return_template "delete-subtypes-exist" return @@ -59,6 +59,6 @@ from dual } -column_array counts -set export_vars [ad_export_vars -form {rel_type return_url}] +set export_vars [export_vars -form {rel_type return_url}] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl 6 Sep 2002 21:50:03 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl 9 Sep 2013 09:11:34 -0000 1.2.26.1 @@ -31,7 +31,7 @@ return } -set export_vars [ad_export_vars -form {group_rel_type_id return_url}] -set context [list [list "" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Remove relation type"] +set export_vars [export_vars -form {group_rel_type_id return_url}] +set context [list [list "" "Group types"] [list one?[export_vars {group_type}] "One type"] "Remove relation type"] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl 19 Apr 2011 21:22:47 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl 9 Sep 2013 09:11:34 -0000 1.4.4.1 @@ -25,6 +25,6 @@ set context [list [list "[ad_conn package_url]admin/rel-types/" [_ acs-subsite.Relationship_Types]] [_ acs-subsite.Create_relation_type]] -set export_vars [ad_export_vars -form {return_url}] +set export_vars [export_vars -form {return_url}] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl 6 Sep 2002 21:50:03 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl 9 Sep 2013 09:11:34 -0000 1.2.26.1 @@ -19,7 +19,7 @@ set user_id [ad_conn user_id] set package_id [ad_conn package_id] -set context [list [list "" "Relationship types"] [list one?[ad_export_vars rel_type] "One type"] "Relations"] +set context [list [list "" "Relationship types"] [list one?[export_vars rel_type] "One type"] "Relations"] if { ![db_0or1row select_pretty_name { select t.pretty_name as rel_type_pretty_name Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl 6 Sep 2002 21:50:03 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl 9 Sep 2013 09:11:34 -0000 1.2.26.1 @@ -17,9 +17,9 @@ export_vars:onevalue } -set context [list [list "../" "Relationship types"] [list "" "Roles"] [list one?[ad_export_vars role] "One role"] "Delete role"] +set context [list [list "../" "Relationship types"] [list "" "Roles"] [list one?[export_vars role] "One role"] "Delete role"] -set export_vars [ad_export_vars -form {role return_url}] +set export_vars [export_vars -form {role return_url}] set pretty_name [db_string select_role_pretty_name { select r.pretty_name from acs_rel_roles r where r.role = :role Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl,v diff -u -r1.4 -r1.4.10.1 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl 10 Jan 2007 21:22:07 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl 9 Sep 2013 09:11:34 -0000 1.4.10.1 @@ -22,7 +22,7 @@ where r.role = :role } -set context [list [list "../" "Relationship types"] [list "one?[ad_export_vars role]" "One role"] "Edit"] +set context [list [list "../" "Relationship types"] [list "one?[export_vars role]" "One role"] "Edit"] template::form create role_form @@ -57,7 +57,7 @@ where r.role = :role } -bind [ns_getform] if { $return_url eq "" } { - set return_url "one?[ad_export_vars role]" + set return_url "one?[export_vars role]" } ad_returnredirect $return_url ad_script_abort Index: openacs-4/packages/acs-subsite/www/admin/relations/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.tcl,v diff -u -r1.10 -r1.10.10.1 --- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 10 Jan 2007 21:22:08 -0000 1.10 +++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 9 Sep 2013 09:11:34 -0000 1.10.10.1 @@ -97,7 +97,7 @@ # Sub rel-types exist... select one set exact_p "t" - set export_url_vars [ad_export_vars -exclude rel_type $export_var_list ] + set export_url_vars [export_vars -exclude rel_type $export_var_list ] relation_types_valid_to_group_multirow \ -datasource_name object_types \ @@ -126,14 +126,14 @@ set party_type_exact_p f set add_to_group_id $group_id set add_with_rel_type $rel_type -set add_party_url "[ad_conn package_url]admin/parties/new?[ad_export_vars {add_to_group_id add_with_rel_type party_type party_type_exact_p return_url}]" +set add_party_url "[ad_conn package_url]admin/parties/new?[export_vars {add_to_group_id add_with_rel_type party_type party_type_exact_p return_url}]" # Build a url used to select an existing party from the system (as opposed # to limiting the selection to parties on the current subsite). -set add_out_of_scope_url "[ad_conn url]?[ad_export_vars -exclude allow_out_of_scope_p $export_var_list]&allow_out_of_scope_p=t" +set add_out_of_scope_url "[ad_conn url]?[export_vars -exclude allow_out_of_scope_p $export_var_list]&allow_out_of_scope_p=t" # Build a url used to select an existing party from the current subsite -set add_in_scope_url "[ad_conn url]?[ad_export_vars -exclude allow_out_of_scope_p $export_var_list]&allow_out_of_scope_p=f" +set add_in_scope_url "[ad_conn url]?[export_vars -exclude allow_out_of_scope_p $export_var_list]&allow_out_of_scope_p=f" # We select out all parties that are to not already belong to the @@ -159,7 +159,7 @@ ad_script_abort } if { $return_url eq "" } { - set return_url one?[ad_export_vars rel_id] + set return_url one?[export_vars rel_id] } ad_returnredirect $return_url ad_script_abort Index: openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl 10 Jan 2007 21:22:08 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl 9 Sep 2013 09:11:34 -0000 1.2.10.1 @@ -28,7 +28,7 @@ } else { if { $return_url eq "" } { # redirect to the relation by default, if we haven't deleted it - set return_url "one?[ad_export_vars rel_id]" + set return_url "one?[export_vars rel_id]" } } Index: openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl,v diff -u -r1.2.26.1 -r1.2.26.2 --- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 9 Sep 2013 08:51:53 -0000 1.2.26.1 +++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 9 Sep 2013 09:11:34 -0000 1.2.26.2 @@ -57,7 +57,7 @@ from rc_violations_by_removing_rel r where r.rel_id = :rel_id } { - template::multirow append dependants $rel_id $rel_type_pretty_name $object_id_one_name $object_id_two_name [ad_export_vars {rel_id return_url}] + template::multirow append dependants $rel_id $rel_type_pretty_name $object_id_one_name $object_id_two_name [export_vars {rel_id return_url}] } ad_return_template remove-dependants-exist return Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v diff -u -r1.12 -r1.12.6.1 --- openacs-4/packages/acs-subsite/www/admin/users/new.tcl 13 Jan 2010 10:48:45 -0000 1.12 +++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl 9 Sep 2013 09:11:34 -0000 1.12.6.1 @@ -91,7 +91,7 @@ # Sub user-types exist... select one set user_type_exact_p "t" - set export_url_vars [ad_export_vars -exclude user_type $export_var_list ] + set export_url_vars [export_vars -exclude user_type $export_var_list ] party::types_valid_for_rel_type_multirow -datasource_name object_types -start_with $user_type -rel_type $add_with_rel_type 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.133.2.5 -r1.133.2.6 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 9 Sep 2013 08:51:54 -0000 1.133.2.5 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 9 Sep 2013 09:11:34 -0000 1.133.2.6 @@ -887,7 +887,7 @@ Example: - 
doc_body_append [ad_export_vars { msg_id user(email) { order_by date } }]
+ 
doc_body_append [export_vars { msg_id $user(email) { order_by date } }]
will export the variable msg_id and the value email from the array user, and it will export a variable named order_by with the value date. @@ -908,7 +908,7 @@ A more involved example: 
set my_vars { msg_id user(email) order_by }
-doc_body_append [ad_export_vars -override { order_by $new_order_by } $my_vars]
+doc_body_append [export_vars -override { order_by $new_order_by } $my_vars] @param form set this parameter if you want the variables exported as hidden form variables, as opposed to URL variables, which is the default. Index: openacs-4/packages/forums/tcl/messages-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v diff -u -r1.44.2.2 -r1.44.2.3 --- openacs-4/packages/forums/tcl/messages-procs.tcl 7 Sep 2013 08:36:36 -0000 1.44.2.2 +++ openacs-4/packages/forums/tcl/messages-procs.tcl 9 Sep 2013 09:11:35 -0000 1.44.2.3 @@ -333,7 +333,7 @@ set child_label "[_ forums.Last_post_in_subject]" set new_order_by [ad_decode $order_by posting_date last_child_post posting_date] - set export_vars [ad_export_vars -override [list [list order_by $new_order_by]] {order_by forum_id}] + set export_vars [export_vars -override [list [list order_by $new_order_by]] {order_by forum_id}] set toggle_url "[ad_conn url]?${export_vars}" if {$order_by eq "posting_date"} { # subject selected