Index: openacs-4/packages/acs-admin/www/apm/package-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add.tcl,v
diff -u -r1.12.4.1 -r1.12.4.2
--- openacs-4/packages/acs-admin/www/apm/package-add.tcl	9 Sep 2013 08:51:52 -0000	1.12.4.1
+++ openacs-4/packages/acs-admin/www/apm/package-add.tcl	9 Sep 2013 10:11:47 -0000	1.12.4.2
@@ -17,7 +17,7 @@
 db_release_unused_handles
 
 doc_body_append "[apm_header -form "action=package-add-2 method=post" "Add a New Package"]
-[export_vars package_id version_id]
+[export_form_vars package_id version_id]
 
 
 <script type=\"text/javascript\">
Index: openacs-4/packages/acs-admin/www/apm/package-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete.tcl,v
diff -u -r1.9.8.1 -r1.9.8.2
--- openacs-4/packages/acs-admin/www/apm/package-delete.tcl	9 Sep 2013 08:51:52 -0000	1.9.8.1
+++ openacs-4/packages/acs-admin/www/apm/package-delete.tcl	9 Sep 2013 10:11:48 -0000	1.9.8.2
@@ -100,7 +100,7 @@
 
 <p>
 
-[export_vars version_id]
+[export_form_vars version_id]
 $file_list
 
 <p>
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -r1.12.4.1 -r1.12.4.2
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	9 Sep 2013 08:51:52 -0000	1.12.4.1
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	9 Sep 2013 10:11:48 -0000	1.12.4.2
@@ -66,7 +66,7 @@
     We've added these additional packages needed, and ask you to review the list of packages below.
 
     <form action=\"packages-install-2\" method=\"post\">
-    [export_vars spec_files]<p>
+    [export_form_vars spec_files]<p>
     
     <blockquote>
     <table>
@@ -111,7 +111,7 @@
     If you think you might want to use a package later (but not right away),
     install it but don't enable it.
     
-    [export_vars spec_files]<p>
+    [export_form_vars spec_files]<p>
     
     <blockquote>
     <table>
Index: openacs-4/packages/acs-admin/www/apm/parameter-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add.tcl,v
diff -u -r1.9.4.2 -r1.9.4.3
--- openacs-4/packages/acs-admin/www/apm/parameter-add.tcl	9 Sep 2013 08:51:52 -0000	1.9.4.2
+++ openacs-4/packages/acs-admin/www/apm/parameter-add.tcl	9 Sep 2013 10:11:48 -0000	1.9.4.3
@@ -21,7 +21,7 @@
 <form action=\"parameter-add-2\" method=\"post\">
 <blockquote>
 <table>
-[export_vars package_key parameter_id version_id]
+[export_form_vars package_key parameter_id version_id]
 
 <tr>
   <td></td>
Index: openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl,v
diff -u -r1.6.10.1 -r1.6.10.2
--- openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl	9 Sep 2013 08:51:52 -0000	1.6.10.1
+++ openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl	9 Sep 2013 10:11:48 -0000	1.6.10.2
@@ -33,7 +33,7 @@
 <form action=\"parameter-edit-2\" method=\"post\">
 <blockquote>
 <table>
-[export_vars package_key parameter_id version_id]
+[export_form_vars package_key parameter_id version_id]
 
 <tr>
   <td></td>
Index: openacs-4/packages/acs-admin/www/apm/version-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit.tcl,v
diff -u -r1.10.8.1 -r1.10.8.2
--- openacs-4/packages/acs-admin/www/apm/version-edit.tcl	9 Sep 2013 08:51:53 -0000	1.10.8.1
+++ openacs-4/packages/acs-admin/www/apm/version-edit.tcl	9 Sep 2013 10:11:48 -0000	1.10.8.2
@@ -48,7 +48,7 @@
 }
 </script>
 
-[export_vars version_id release_date]
+[export_form_vars version_id release_date]
 
 <table>
 
Index: openacs-4/packages/acs-admin/www/users/user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-2.tcl,v
diff -u -r1.10.8.1 -r1.10.8.2
--- openacs-4/packages/acs-admin/www/users/user-add-2.tcl	9 Sep 2013 08:51:53 -0000	1.10.8.1
+++ openacs-4/packages/acs-admin/www/users/user-add-2.tcl	9 Sep 2013 10:11:48 -0000	1.10.8.2
@@ -35,7 +35,7 @@
 
 set context [list [list "./" "Users"] "Notify added user"]
 set system_name [ad_system_name]
-set export_vars [export_vars email first_names last_name user_id]
+set export_vars [export_form_vars email first_names last_name user_id]
 set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]
 
 ad_return_template
Index: openacs-4/packages/acs-admin/www/users/user-batch-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add.tcl,v
diff -u -r1.4.8.1 -r1.4.8.2
--- openacs-4/packages/acs-admin/www/users/user-batch-add.tcl	9 Sep 2013 08:51:53 -0000	1.4.8.1
+++ openacs-4/packages/acs-admin/www/users/user-batch-add.tcl	9 Sep 2013 10:11:48 -0000	1.4.8.2
@@ -17,7 +17,7 @@
 
 set context [list [list "./" "Users"] "Notify added user"]
 set system_name [ad_system_name]
-set export_vars [export_vars email first_names last_name user_id]
+set export_vars [export_form_vars email first_names last_name user_id]
 set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]
 
 ad_return_template
Index: openacs-4/packages/acs-core-docs/www/db-api-detailed.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/db-api-detailed.html,v
diff -u -r1.47.2.2 -r1.47.2.3
--- openacs-4/packages/acs-core-docs/www/db-api-detailed.html	9 Sep 2013 08:51:53 -0000	1.47.2.2
+++ openacs-4/packages/acs-core-docs/www/db-api-detailed.html	9 Sep 2013 10:11:48 -0000	1.47.2.3
@@ -84,7 +84,7 @@
 variables automatically. For instance: 
 </p><pre class="programlisting">
 
-db_1row select_names "select first_names, last_name from users where user_id = [ad_conn user_id]"
+db_1row select_names "select first_names, last_name from users where user_id = [ad_get_user_id]"
 doc_body_append "Hello, $first_names $last_name!"
 
 </pre><p>
@@ -93,7 +93,7 @@
 write: 
 </p><pre class="programlisting">
 
-if { [db_0or1row select_names "select first_names, last_name from users where user_id = [ad_conn user_id]"] } {
+if { [db_0or1row select_names "select first_names, last_name from users where user_id = [ad_get_user_id]"] } {
     doc_body_append "Hello, $first_names $last_name!"
 } else {
     # Executed if the query returns no rows.
Index: openacs-4/packages/acs-core-docs/www/templates.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/templates.html,v
diff -u -r1.48.2.2 -r1.48.2.3
--- openacs-4/packages/acs-core-docs/www/templates.html	9 Sep 2013 08:51:53 -0000	1.48.2.2
+++ openacs-4/packages/acs-core-docs/www/templates.html	9 Sep 2013 10:11:48 -0000	1.48.2.3
@@ -61,7 +61,7 @@
 } -query {
 }
 
-set user_id [ad_conn user_id]
+set user_id [ad_verify_and_get_user_id]
 
 db_1row user_name {
     select first_names || ' ' || last_name as user_name 
Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v
diff -u -r1.52.2.5 -r1.52.2.6
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	9 Sep 2013 08:51:53 -0000	1.52.2.5
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	9 Sep 2013 10:11:49 -0000	1.52.2.6
@@ -474,7 +474,7 @@
          $you_are_really
          Change user: <select name=\"user_id\">
          $options
-         </select>[export_vars return_url]<input type=submit value=\"Go\"></form>"
+         </select>[export_form_vars return_url]<input type=submit value=\"Go\"></form>"
      } else {
          ns_log Error "ACS-Developer-Support: Unable to offer link to Developer Support \
                  because it is not mounted anywhere."
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.2.1 -r1.11.2.2
--- openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl	9 Sep 2013 09:11:30 -0000	1.11.2.1
+++ openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl	9 Sep 2013 10:11:49 -0000	1.11.2.2
@@ -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&[export_vars {attribute_id return_url}]"
+		template::multirow append $datasource_name $attr_props(pretty_name:$key) $col_value "id_column=$object_id&[ad_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.10.1 -r1.3.10.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl	9 Sep 2013 09:11:30 -0000	1.3.10.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl	9 Sep 2013 10:11:49 -0000	1.3.10.2
@@ -57,9 +57,9 @@
 
 # If we're an enumeration, redirect to start adding possible values.
 if {$datatype eq "enumeration"} {
-    ad_returnredirect enum-add?[export_vars {attribute_id return_url}]
+    ad_returnredirect enum-add?[ad_export_vars {attribute_id return_url}]
 } elseif { $return_url eq "" } {
-    ad_returnredirect add?[export_vars {object_type}]
+    ad_returnredirect add?[ad_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.26.1 -r1.2.26.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl	9 Sep 2013 09:11:31 -0000	1.2.26.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl	9 Sep 2013 10:11:49 -0000	1.2.26.2
@@ -25,7 +25,7 @@
 }
 
 set context [list "Add attribute"]
-set export_vars [export_vars -form {object_type return_url}]
+set export_vars [ad_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.10.1 -r1.2.10.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl	9 Sep 2013 09:11:31 -0000	1.2.10.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl	9 Sep 2013 10:11:49 -0000	1.2.10.2
@@ -29,7 +29,7 @@
 	}
     }
 } elseif { $return_url eq "" } {
-    set return_url one?[export_vars attribute_id]
+    set return_url one?[ad_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.26.1 -r1.2.26.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl	9 Sep 2013 09:11:31 -0000	1.2.26.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl	9 Sep 2013 10:11:49 -0000	1.2.26.2
@@ -19,14 +19,14 @@
     export_form_vars:onevalue
 }
 
-set context [list [list one?[export_vars attribute_id] "One attribute"] "Delete attribute"]
+set context [list [list one?[ad_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 [export_vars -form {attribute_id return_url}]
+set export_form_vars [ad_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.10.1 -r1.2.10.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl	9 Sep 2013 09:11:31 -0000	1.2.10.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl	9 Sep 2013 10:11:49 -0000	1.2.10.2
@@ -61,9 +61,9 @@
 
 if {$operation eq "Add more values"} {
     # redirect to add more values
-    set return_url enum-add?[export_vars {attribute_id return_url}]
+    set return_url enum-add?[ad_export_vars {attribute_id return_url}]
 } elseif { $return_url eq "" } {
-    set return_url one?[export_vars attribute_id]
+    set return_url one?[ad_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.10.1 -r1.3.10.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl	9 Sep 2013 09:11:31 -0000	1.3.10.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl	9 Sep 2013 10:11:49 -0000	1.3.10.2
@@ -51,6 +51,6 @@
 
 set context [list [list one?[export_url_vars attribute_id] "One attribute"] "Add values"]
 
-set export_vars [export_vars -form {attribute_id return_url}]
+set export_vars [ad_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.10.1 -r1.3.10.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl	9 Sep 2013 09:11:31 -0000	1.3.10.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl	9 Sep 2013 10:11:49 -0000	1.3.10.2
@@ -20,7 +20,7 @@
 }
 set context [list "One attribute"]
 
-set url_vars [export_vars {attribute_id return_url}]
+set url_vars [ad_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.10.1 -r1.2.10.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl	9 Sep 2013 09:11:31 -0000	1.2.10.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl	9 Sep 2013 10:11:50 -0000	1.2.10.2
@@ -12,7 +12,7 @@
     attribute_id:naturalnum,notnull
     enum_value:trim,notnull
     { operation:trim "No, I want to cancel my request" } 
-    { return_url "one?[export_vars attribute_id]" }    
+    { return_url "one?[ad_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.26.1 -r1.3.26.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl	9 Sep 2013 09:11:31 -0000	1.3.26.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl	9 Sep 2013 10:11:50 -0000	1.3.26.2
@@ -11,7 +11,7 @@
 } {
     attribute_id:naturalnum,notnull
     enum_value:trim,notnull
-    { return_url "one?[export_vars attribute_id]" }    
+    { return_url "one?[ad_export_vars attribute_id]" }    
 } -properties {
     context:onevalue
     export_vars:onevalue
@@ -29,7 +29,7 @@
     ad_script_abort
 }
 
-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}]
+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}]
 
 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.10.1 -r1.2.10.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
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl	9 Sep 2013 10:11:50 -0000	1.2.10.2
@@ -45,7 +45,7 @@
 }
 
 if {$return_url eq ""} {
-    set return_url one?[export_vars group_type]
+    set return_url one?[ad_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.10.1 -r1.4.10.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl	9 Sep 2013 09:11:31 -0000	1.4.10.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl	9 Sep 2013 10:11:50 -0000	1.4.10.2
@@ -23,7 +23,7 @@
 
 set context [list \
         [list "[ad_conn package_url]admin/group-types/" "Group types"] \
-	[list "one?[export_vars group_type]" "One type"] \
+	[list "one?[ad_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.10.1 -r1.5.10.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl	9 Sep 2013 09:11:31 -0000	1.5.10.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl	9 Sep 2013 10:11:50 -0000	1.5.10.2
@@ -24,7 +24,7 @@
 
 if { $operation ne "Yes, I really want to delete this group type" } {
     if { $return_url eq "" } {
-	ad_returnredirect "one?[export_vars {group_type}]"
+	ad_returnredirect "one?[ad_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.26.1 -r1.3.26.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl	9 Sep 2013 09:11:31 -0000	1.3.26.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl	9 Sep 2013 10:11:50 -0000	1.3.26.2
@@ -61,7 +61,7 @@
           from acs_object_types t
          where t.supertype = :group_type
     } {
-	template::multirow append subtypes $pretty_name [export_vars {group_type return_url}]
+	template::multirow append subtypes $pretty_name [ad_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 [export_vars {rel_type return_url}]
+	template::multirow append rel_types $pretty_name [ad_export_vars {rel_type return_url}]
     }
     ad_return_template "delete-rel-types-exist"
     return
 }
 
-set export_form_vars [export_vars -form {group_type return_url}]
+set export_form_vars [ad_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.26.1 -r1.3.26.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl	9 Sep 2013 09:11:32 -0000	1.3.26.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl	9 Sep 2013 10:11:50 -0000	1.3.26.2
@@ -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?[export_vars group_type] "One type"] "Groups"]
+set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_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.4.1 -r1.3.4.2
--- 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
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl	9 Sep 2013 10:11:50 -0000	1.3.4.2
@@ -50,7 +50,7 @@
 db_release_unused_handles
 
 if { $return_url eq "" } {
-    set return_url "one?[export_vars {group_type}]"
+    set return_url "one?[ad_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.4.1 -r1.4.4.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl	9 Sep 2013 09:11:32 -0000	1.4.4.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl	9 Sep 2013 10:11:50 -0000	1.4.4.2
@@ -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?[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?[ad_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 [export_vars -form {group_type return_url}]
+set export_vars [ad_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.10.1 -r1.2.10.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
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl	9 Sep 2013 10:11:50 -0000	1.2.10.2
@@ -21,7 +21,7 @@
 	from group_type_rels g 
 	where g.group_rel_type_id = :group_rel_type_id
     }
-    set return_url one?[export_vars {group_type}]
+    set return_url one?[ad_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.26.1 -r1.3.26.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl	9 Sep 2013 09:11:32 -0000	1.3.26.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl	9 Sep 2013 10:11:51 -0000	1.3.26.2
@@ -30,7 +30,7 @@
     return
 }
 
-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"]
+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"]
 
 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.10.1 -r1.2.10.2
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl	9 Sep 2013 09:11:32 -0000	1.2.10.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl	9 Sep 2013 10:11:51 -0000	1.2.10.2
@@ -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?[export_vars group_id]"
+	set return_url "[ad_conn package_url]/admin/groups/one?[ad_export_vars group_id]"
     }
-    ad_returnredirect "../rel-segments/new?[export_vars {group_id rel_type return_url}]"
+    ad_returnredirect "../rel-segments/new?[ad_export_vars {group_id rel_type return_url}]"
 } else {
     if { $return_url eq "" } {
-	set return_url "one?[export_vars group_id]"
+	set return_url "one?[ad_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.26.1 -r1.3.26.2
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	9 Sep 2013 09:11:32 -0000	1.3.26.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	9 Sep 2013 10:11:51 -0000	1.3.26.2
@@ -20,8 +20,8 @@
     group_name:onevalue
 }
 
-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}]
+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}]
 
 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.10.1 -r1.2.10.2
--- openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl	9 Sep 2013 09:11:32 -0000	1.2.10.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl	9 Sep 2013 10:11:51 -0000	1.2.10.2
@@ -25,11 +25,11 @@
 	set group_type [group::delete $group_id]
     }
     if { $return_url eq "" && $group_type ne "" } {
-	set return_url "../group-types/one?[export_vars group_type]"
+	set return_url "../group-types/one?[ad_export_vars group_type]"
     }
 } else {
     if { $return_url eq "" } {
-	set return_url "one?[export_vars group_id]"
+	set return_url "one?[ad_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.26.1 -r1.2.26.2
--- openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl	9 Sep 2013 09:11:32 -0000	1.2.26.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl	9 Sep 2013 10:11:51 -0000	1.2.26.2
@@ -23,9 +23,9 @@
     }
 }
 
-set context [list [list "" "Groups"] [list one?[export_vars {group_id}] "One Group"] "Nuke group"]
+set context [list [list "" "Groups"] [list one?[ad_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 [export_vars -form {group_id}]
+set export_form_vars [ad_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.3 -r1.2.10.4
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl	9 Sep 2013 09:11:32 -0000	1.2.10.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl	9 Sep 2013 10:11:51 -0000	1.2.10.4
@@ -72,7 +72,7 @@
 
 # Build the member state dimensional slider
 
-set base_url [ad_conn package_url]admin/groups/elements-display?[export_vars {group_id rel_type}]
+set base_url [ad_conn package_url]admin/groups/elements-display?[ad_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.2 -r1.4.22.3
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl	9 Sep 2013 09:11:32 -0000	1.4.22.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl	9 Sep 2013 10:11:51 -0000	1.4.22.3
@@ -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?[export_vars group_id] "One Group"] "All $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"]
 
 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.10.1 -r1.6.10.2
--- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	9 Sep 2013 09:11:33 -0000	1.6.10.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	9 Sep 2013 10:11:51 -0000	1.6.10.2
@@ -100,7 +100,7 @@
 
     # Sub rel-types exist... select one
     set group_type_exact_p "t"
-    set export_url_vars [export_vars -exclude group_type $export_var_list ]
+    set export_url_vars [ad_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.4.1 -r1.4.4.2
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl	9 Sep 2013 09:11:33 -0000	1.4.4.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl	9 Sep 2013 10:11:51 -0000	1.4.4.2
@@ -67,10 +67,10 @@
       from dual
 }] } {
     if { $return_url eq "" } {
-	set return_url one?[export_vars group_id]
+	set return_url one?[ad_export_vars group_id]
     }
     ad_returnredirect $return_url 
 } else {
-    ad_returnredirect constraints-create?[export_vars {group_id rel_type return_url}]
+    ad_returnredirect constraints-create?[ad_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.26.1 -r1.3.26.2
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl	9 Sep 2013 09:11:33 -0000	1.3.26.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl	9 Sep 2013 10:11:51 -0000	1.3.26.2
@@ -18,7 +18,7 @@
     primary_rels:multirow
 }
 
-set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list "one?[export_vars group_id]" "One Group"] "Add relation type"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list "one?[ad_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 [export_vars -form {group_id return_url}]
+set export_vars [ad_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.10.1 -r1.2.10.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
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl	9 Sep 2013 10:11:52 -0000	1.2.10.2
@@ -65,7 +65,7 @@
 
 
 if { $return_url eq "" } {
-    set return_url one?[export_vars {group_id}]
+    set return_url one?[ad_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.2 -r1.3.26.3
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl	9 Sep 2013 09:11:33 -0000	1.3.26.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl	9 Sep 2013 10:11:52 -0000	1.3.26.3
@@ -32,7 +32,7 @@
 
 permission::require_permission -object_id $group_id -privilege admin
 
-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"]
+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"]
 
 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.10.1 -r1.6.10.2
--- openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	9 Sep 2013 09:11:33 -0000	1.6.10.1
+++ openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	9 Sep 2013 10:11:52 -0000	1.6.10.2
@@ -116,7 +116,7 @@
 	
 	lappend export_var_list group_rel_type_list
 	
-	set export_url_vars [export_vars -exclude {add_to_group_id add_with_rel_type} $export_var_list]
+	set export_url_vars [ad_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&[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&[ad_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&[export_vars -exclude {party_id party_type_exact_p party_type} $export_var_list]"]
+	user "users/new?user_id=$party_id&[ad_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 [export_vars -exclude party_type $export_var_list ]
+    set export_url_vars [ad_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.10.1 -r1.2.10.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl	9 Sep 2013 09:11:33 -0000	1.2.10.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl	9 Sep 2013 10:11:52 -0000	1.2.10.2
@@ -17,10 +17,10 @@
 set operation [string trim [string tolower $operation]]
 
 if {$operation eq "yes"} {
-    ad_returnredirect "constraints/new?rel_segment=$segment_id&[export_vars return_url]"
+    ad_returnredirect "constraints/new?rel_segment=$segment_id&[ad_export_vars return_url]"
 } else {
     if { $return_url eq "" } {
-	set return_url "one?[export_vars segment_id]"
+	set return_url "one?[ad_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.10.1 -r1.2.10.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl	9 Sep 2013 09:11:33 -0000	1.2.10.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl	9 Sep 2013 10:11:52 -0000	1.2.10.2
@@ -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?[export_vars group_id]"
+	    set return_url "../groups/one?[ad_export_vars group_id]"
 	}
     }
 
@@ -38,7 +38,7 @@
 } 
 
 if { $return_url eq "" } {
-    set return_url "one?[export_vars {segment_id}]"
+    set return_url "one?[ad_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.2 -r1.3.26.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl	9 Sep 2013 09:11:33 -0000	1.3.26.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl	9 Sep 2013 10:11:52 -0000	1.3.26.3
@@ -28,10 +28,10 @@
      where s.segment_id = :segment_id
 }
 
-set export_vars [export_vars segment_id]
+set export_vars [export_form_vars segment_id]
 set context [list \
      [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] \
-     [list one?[export_vars segment_id] "One segment"] \
+     [list one?[ad_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.22.1 -r1.5.22.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl	9 Sep 2013 09:11:33 -0000	1.5.22.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl	9 Sep 2013 10:11:52 -0000	1.5.22.2
@@ -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?[export_vars {segment_id}] "One segment"] "Elements"]
+set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_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.2 -r1.4.22.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl	9 Sep 2013 09:11:33 -0000	1.4.22.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl	9 Sep 2013 10:11:52 -0000	1.4.22.3
@@ -39,7 +39,7 @@
 
 set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] "Add segment"]
 
-set export_vars [export_vars -form {group_id rel_type return_url}]
+set export_vars [ad_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.2 -r1.4.10.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	9 Sep 2013 09:11:33 -0000	1.4.10.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	9 Sep 2013 10:11:52 -0000	1.4.10.3
@@ -66,7 +66,7 @@
 }
 
 
-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}]
+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}]
 
 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.2 -r1.3.10.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl	9 Sep 2013 09:11:33 -0000	1.3.10.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl	9 Sep 2013 10:11:52 -0000	1.3.10.3
@@ -31,15 +31,15 @@
 
 # If the user has specified a rel_type, redirect to new-2
 if { $rel_type ne "" } {
-    ad_returnredirect new-2?[export_vars {group_id rel_type return_url}]
+    ad_returnredirect new-2?[ad_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 [export_vars -form {group_id return_url}]
+set export_vars [ad_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.2 -r1.4.10.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl	9 Sep 2013 09:11:33 -0000	1.4.10.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl	9 Sep 2013 10:11:52 -0000	1.4.10.3
@@ -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?[export_vars {segment_id}]"
+	    set return_url "../one?[ad_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?[export_vars constraint_id]
+    set return_url one?[ad_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.26.1 -r1.3.26.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl	9 Sep 2013 09:11:33 -0000	1.3.26.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl	9 Sep 2013 10:11:52 -0000	1.3.26.2
@@ -18,7 +18,7 @@
     export_vars:onevalue
 }
 
-set context [list [list one?[export_vars constraint_id] "One constraint"] "Delete constraint"]
+set context [list [list one?[ad_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 [export_vars -form {constraint_id return_url}]
+set export_vars [ad_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.10.1 -r1.4.10.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl	9 Sep 2013 09:11:34 -0000	1.4.10.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl	9 Sep 2013 10:11:52 -0000	1.4.10.2
@@ -33,7 +33,7 @@
 
 }
 
-set return_url_enc [ad_urlencode "[ad_conn url]?[export_vars {rel_segment constraint_name rel_side required_rel_segment return_url}]"]
+set return_url_enc [ad_urlencode "[ad_conn url]?[ad_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/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl,v
diff -u -r1.3.26.1 -r1.3.26.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl	9 Sep 2013 08:51:53 -0000	1.3.26.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl	9 Sep 2013 10:11:53 -0000	1.3.26.2
@@ -20,7 +20,7 @@
 
 set context [list "Add relation type"]
 set constraint_id [db_nextval "acs_object_id_seq"]
-set export_form_vars [export_vars constraint_id object_type return_url]
+set export_form_vars [export_form_vars constraint_id object_type return_url]
 set export_url_vars [export_url_vars constraint_id object_type return_url]
 
 db_multirow primary_rels select_primary_relations {
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.10.1 -r1.3.10.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl	9 Sep 2013 09:11:34 -0000	1.3.10.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl	9 Sep 2013 10:11:53 -0000	1.3.10.2
@@ -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?[export_vars rel_type]"
+	set return_url "one?[ad_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.26.1 -r1.2.26.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl	9 Sep 2013 09:11:34 -0000	1.2.26.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl	9 Sep 2013 10:11:53 -0000	1.2.26.2
@@ -18,7 +18,7 @@
     counts:onerow
 }
 
-set context [list [list "" "Relationship types"] [list one?[export_vars rel_type] "One type"] "Delete type"]
+set context [list [list "" "Relationship types"] [list one?[ad_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 [export_vars {rel_type return_url}]
+	template::multirow append subtypes $rel_type $pretty_name [ad_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 [export_vars -form {rel_type return_url}]
+set export_vars [ad_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.26.1 -r1.2.26.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl	9 Sep 2013 09:11:34 -0000	1.2.26.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl	9 Sep 2013 10:11:53 -0000	1.2.26.2
@@ -31,7 +31,7 @@
     return
 }
 
-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"]
+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"]
 
 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.4.1 -r1.4.4.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl	9 Sep 2013 09:11:34 -0000	1.4.4.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl	9 Sep 2013 10:11:53 -0000	1.4.4.2
@@ -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 [export_vars -form {return_url}]
+set export_vars [ad_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.26.1 -r1.2.26.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl	9 Sep 2013 09:11:34 -0000	1.2.26.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl	9 Sep 2013 10:11:53 -0000	1.2.26.2
@@ -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?[export_vars rel_type] "One type"] "Relations"]
+set context [list [list "" "Relationship types"] [list one?[ad_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.26.1 -r1.2.26.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl	9 Sep 2013 09:11:34 -0000	1.2.26.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl	9 Sep 2013 10:11:53 -0000	1.2.26.2
@@ -17,9 +17,9 @@
     export_vars:onevalue
 }
 
-set context [list [list "../" "Relationship types"] [list "" "Roles"] [list one?[export_vars role] "One role"] "Delete role"]
+set context [list [list "../" "Relationship types"] [list "" "Roles"] [list one?[ad_export_vars role] "One role"] "Delete role"]
 
-set export_vars [export_vars -form {role return_url}]
+set export_vars [ad_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.10.1 -r1.4.10.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl	9 Sep 2013 09:11:34 -0000	1.4.10.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl	9 Sep 2013 10:11:53 -0000	1.4.10.2
@@ -22,7 +22,7 @@
      where r.role = :role
 }
 
-set context [list [list "../" "Relationship types"] [list "one?[export_vars role]" "One role"] "Edit"]
+set context [list [list "../" "Relationship types"] [list "one?[ad_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?[export_vars role]"
+	set return_url "one?[ad_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.10.1 -r1.10.10.2
--- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	9 Sep 2013 09:11:34 -0000	1.10.10.1
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	9 Sep 2013 10:11:53 -0000	1.10.10.2
@@ -97,7 +97,7 @@
 
     # Sub rel-types exist... select one
     set exact_p "t"
-    set export_url_vars [export_vars -exclude rel_type $export_var_list ]
+    set export_url_vars [ad_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?[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?[ad_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]?[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]?[ad_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]?[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]?[ad_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?[export_vars rel_id]
+	set return_url one?[ad_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.10.1 -r1.2.10.2
--- openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl	9 Sep 2013 09:11:34 -0000	1.2.10.1
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl	9 Sep 2013 10:11:53 -0000	1.2.10.2
@@ -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?[export_vars rel_id]"
+	set return_url "one?[ad_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.2 -r1.2.26.3
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	9 Sep 2013 09:11:34 -0000	1.2.26.2
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	9 Sep 2013 10:11:53 -0000	1.2.26.3
@@ -57,13 +57,13 @@
 	  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 [export_vars {rel_id return_url}]
+	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}]
     }
     ad_return_template remove-dependants-exist
     return
 }
 
 
-set export_vars [export_vars rel_id return_url]
+set export_vars [export_form_vars rel_id return_url]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v
diff -u -r1.27.4.2 -r1.27.4.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	9 Sep 2013 08:51:54 -0000	1.27.4.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	9 Sep 2013 10:11:53 -0000	1.27.4.3
@@ -274,7 +274,7 @@
 	if {$new_application == $node_id} {
 	    
 	    set action_type "new_app"
-	    set action_form_part "[export_vars expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
+	    set action_form_part "[export_form_vars expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
 	    
 	    #Generate a package_id for double click protection
 	    set new_package_id [db_nextval acs_object_id_seq]
@@ -283,22 +283,22 @@
 	}
     } elseif {$rename_application == $node_id} {
 	set action_type "rename_app"
-	set action_form_part "[export_vars expand:multiple root_id node_id rename_package_id]"
+	set action_form_part "[export_form_vars expand:multiple root_id node_id rename_package_id]"
 	
     } else {}
     
     if {$node_id == $new_parent} {
 	set parent_id $new_parent
 	set node_type $new_type	
 	set action_type "new_folder"
-	set action_form_part "[export_vars expand:multiple parent_id node_type root_id]"
+	set action_form_part "[export_form_vars expand:multiple parent_id node_type root_id]"
     }
 
     multirow append nodes $node_id $expand_mode $expand_url $indent $name $name_url $object_name $url $package_pretty_name $action_type $action_form_part $add_folder_url $new_app_url $unmount_url $mount_url $rename_url $delete_url $parameters_url $permissions_url ""
 
 }
 
-set new_app_form_part_1 [subst {<form name="new_application" action="package-new"><input type="hidden" name="node_id" value="$node(node_id)"><input type="hidden" name="root_id" value="$node(node_id)"><input type="hidden" name="new_node_p" value="t">[export_vars expand:multiple]<input name="node_name" type="text" size="8">}]
+set new_app_form_part_1 [subst {<form name="new_application" action="package-new"><input type="hidden" name="node_id" value="$node(node_id)"><input type="hidden" name="root_id" value="$node(node_id)"><input type="hidden" name="new_node_p" value="t">[export_form_vars expand:multiple]<input name="node_name" type="text" size="8">}]
 
 set new_app_form_part_2 "[apm_application_new_checkbox]"
 set new_app_form_part_3 "<input type=\"submit\" value=\"Mount Package\"></form>"
Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set.tcl,v
diff -u -r1.9.10.4 -r1.9.10.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	9 Sep 2013 08:51:54 -0000	1.9.10.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	9 Sep 2013 10:11:53 -0000	1.9.10.5
@@ -92,7 +92,7 @@
 ns_return 200 text/html "$body
 <blockquote>
 <form method=post action=parameter-set-2>
-[export_vars package_key package_id instance_name return_url]
+[export_form_vars package_key package_id instance_name return_url]
 $table
 </blockquote>
 </form>
Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -r1.6.8.2 -r1.6.8.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	9 Sep 2013 08:51:54 -0000	1.6.8.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	9 Sep 2013 10:11:53 -0000	1.6.8.3
@@ -256,7 +256,7 @@
 	if {$new_application == $node_id} {
 	    
 	    set action_type "new_app"
-	    set action_form_part "[export_vars expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
+	    set action_form_part "[export_form_vars expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
 	    
 	    #Generate a package_id for double click protection
 	    set new_package_id [db_nextval acs_object_id_seq]
@@ -265,22 +265,22 @@
 	}
     } elseif {$rename_application == $node_id} {
 	set action_type "rename_app"
-	set action_form_part "[export_vars expand:multiple root_id node_id rename_package_id]"
+	set action_form_part "[export_form_vars expand:multiple root_id node_id rename_package_id]"
 	
     } else {}
     
     if {$node_id == $new_parent} {
 	set parent_id $new_parent
 	set node_type $new_type	
 	set action_type "new_folder"
-	set action_form_part "[export_vars expand:multiple parent_id node_type root_id]"
+	set action_form_part "[export_form_vars expand:multiple parent_id node_type root_id]"
     }
 
     multirow append nodes $node_id $expand_mode $expand_url $indent $name $name_url $object_name $url $package_pretty_name $action_type $action_form_part $add_folder_url $new_app_url $unmount_url $mount_url $rename_url $delete_url $parameters_url $permissions_url "" $view_p
 
 }
 
-#set new_app_form_part_1 "<p align=\"top\"><form name=new_application action=package-new><input type=hidden name=node_id value=$node(node_id)><input type=hidden name=root_id value=$node(node_id) /><input type=hidden name=new_node_p value=t>[export_vars expand:multiple]<input name=node_name type=text size=8></p>"
+#set new_app_form_part_1 "<p align=\"top\"><form name=new_application action=package-new><input type=hidden name=node_id value=$node(node_id)><input type=hidden name=root_id value=$node(node_id) /><input type=hidden name=new_node_p value=t>[export_form_vars expand:multiple]<input name=node_name type=text size=8></p>"
 
 #set new_app_form_part_2 "<p align=\"top\">[apm_application_new_checkbox]</p>"
 #set new_app_form_part_3 "<p align=\"top\"><input type=submit value=\"Mount Package\"></form></p>"
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.6.1 -r1.12.6.2
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl	9 Sep 2013 09:11:34 -0000	1.12.6.1
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl	9 Sep 2013 10:11:54 -0000	1.12.6.2
@@ -91,7 +91,7 @@
 
     # Sub user-types exist... select one
     set user_type_exact_p "t"
-    set export_url_vars [export_vars -exclude user_type $export_var_list ]
+    set export_url_vars [ad_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-subsite/www/members/user-batch-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl,v
diff -u -r1.4.8.2 -r1.4.8.3
--- openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl	9 Sep 2013 09:40:33 -0000	1.4.8.2
+++ openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl	9 Sep 2013 10:11:54 -0000	1.4.8.3
@@ -19,7 +19,7 @@
 
 set context [list [list "./" "Users"] "Notify added user"]
 set system_name [ad_system_name]
-set export_vars [export_vars -form email first_names last_name user_id]
+set export_vars [export_form_vars email first_names last_name user_id]
 set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""].
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index.tcl,v
diff -u -r1.7.8.1 -r1.7.8.2
--- openacs-4/packages/acs-subsite/www/site-map/index.tcl	9 Sep 2013 08:51:54 -0000	1.7.8.1
+++ openacs-4/packages/acs-subsite/www/site-map/index.tcl	9 Sep 2013 10:11:54 -0000	1.7.8.2
@@ -228,7 +228,7 @@
 	if {$new_application == $node_id} {
 	    
 	    set action_type "new_app"
-	    set action_form_part "[export_vars expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
+	    set action_form_part "[export_form_vars expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
 	    
 	    #Generate a package_id for double click protection
 	    set new_package_id [db_nextval acs_object_id_seq]
@@ -237,22 +237,22 @@
 	}
     } elseif {$rename_application == $node_id} {
 	set action_type "rename_app"
-	set action_form_part "[export_vars expand:multiple root_id node_id rename_package_id]"
+	set action_form_part "[export_form_vars expand:multiple root_id node_id rename_package_id]"
 	
     } else {}
     
     if {$node_id == $new_parent} {
 	set parent_id $new_parent
 	set node_type $new_type	
 	set action_type "new_folder"
-	set action_form_part "[export_vars expand:multiple parent_id node_type root_id]"
+	set action_form_part "[export_form_vars expand:multiple parent_id node_type root_id]"
     }
 
     multirow append nodes $node_id $expand_mode $expand_url $indent $name $name_url $object_name $url $package_pretty_name $action_type $action_form_part $add_folder_url $new_app_url $unmount_url $mount_url $rename_url $delete_url $parameters_url $permissions_url "" $view_p
 
 }
 
-#set new_app_form_part_1 "<p align=\"top\"><form name=new_application action=package-new><input type=hidden name=node_id value=$node(node_id)><input type=hidden name=root_id value=$node(node_id)><input type=hidden name=new_node_p value=t>[export_vars expand:multiple]<input name=node_name type=text size=8></p>"
+#set new_app_form_part_1 "<p align=\"top\"><form name=new_application action=package-new><input type=hidden name=node_id value=$node(node_id)><input type=hidden name=root_id value=$node(node_id)><input type=hidden name=new_node_p value=t>[export_form_vars expand:multiple]<input name=node_name type=text size=8></p>"
 
 #set new_app_form_part_2 "<p align=\"top\">[apm_application_new_checkbox]</p>"
 #set new_app_form_part_3 "<p align=\"top\"><input type=submit value=\"Mount Package\"></form></p>"
Index: openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/table-display-procs.tcl,v
diff -u -r1.20.8.1 -r1.20.8.2
--- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	9 Sep 2013 08:51:54 -0000	1.20.8.1
+++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	9 Sep 2013 10:11:54 -0000	1.20.8.2
@@ -606,25 +606,25 @@
         append html "<form method=\"get\" action=\"/tools/table-custom\">"
         append html "<input type=\"submit\" value=\"Delete this view\">"
         append html "<input type=\"hidden\" name=\"delete_the_view\" value=\"1\">"
-        append html "[export_vars item_group item]"
+        append html "[export_form_vars item_group item]"
         if {$return_url ne ""} {
-            append html "[export_vars return_url]"
+            append html "[export_form_vars return_url]"
         }
         append html "</form>"
     }
 
     append html "<form method=get action=\"/tools/table-custom\">" 
     if {$return_url ne ""} {
-        append html "[export_vars return_url]"
+        append html "[export_form_vars return_url]"
     }
     if {$item_group eq ""} {
         set item_group [ad_conn url]
     }
 
-    append html "[export_vars item_group]"
+    append html "[export_form_vars item_group]"
     if {$item ne ""} {
         set item_original $item
-        append html "[export_vars item_original]"
+        append html "[export_form_vars item_original]"
         append html "<input type=\"submit\" value=\"Save changes\">"
     } else {
         append html "<input type=\"submit\" value=\"Save new view\">"
@@ -634,7 +634,7 @@
     append html "<tr><th>Name:</th><td><input type=\"text\" size=\"60\" name=\"item\" [export_form_value item]></td></tr>"
     if {$item ne ""} {
         set item_original item
-        append html "[export_vars item_original]"
+        append html "[export_form_vars item_original]"
         append html "<tr><td>&nbsp;</td><td><em>Editing the name will rename the view</em></td></tr>"
     }
 
@@ -731,25 +731,25 @@
         append html "<form method=\"get\" action=\"/tools/sort-custom\">"
         append html "<input type=\"submit\" value=\"Delete this sort\">"
         append html "<input type=\"hidden\" name=\"delete_the_sort\" value=\"1\">"
-        append html "[export_vars item_group item]"
+        append html "[export_form_vars item_group item]"
         if {$return_url ne ""} {
-            append html "[export_vars return_url]"
+            append html "[export_form_vars return_url]"
         }
         append html "</form>"
     }
 
     append html "<form method=get action=\"/tools/sort-custom\">" 
     if {$return_url ne ""} {
-        append html "[export_vars return_url]"
+        append html "[export_form_vars return_url]"
     }
     if {$item_group eq ""} {
         set item_group [ad_conn url]
     }
 
-    append html "[export_vars item_group]"
+    append html "[export_form_vars item_group]"
     if {$item ne ""} {
         set item_original $item
-        append html "[export_vars item_original]"
+        append html "[export_form_vars item_original]"
         append html "<input type=\"submit\" value=\"Save changes\">"
     } else {
         append html "<input type=\"submit\" value=\"Save new sort\">"
@@ -759,7 +759,7 @@
     append html "<tr><th>Name:</th><td><input type=\"text\" size=\"60\" name=\"item\" [export_form_value item]></td></tr>"
     if {$item ne ""} {
         set item_original item
-        append html "[export_vars item_original]"
+        append html "[export_form_vars item_original]"
         append html "<tr><td>&nbsp;</td><td><em>Editing the name will rename the sort</em></td></tr>"
     }
 
@@ -962,13 +962,13 @@
 } {
     append html "<form method=\"get\" action=\"/tools/form-custom\">\n" 
     if {$return_url ne ""} {
-        append html "[export_vars return_url]\n"
+        append html "[export_form_vars return_url]\n"
     }
     if {$item_group eq ""} {
         set item_group [ad_conn url]
     }
     set item_original $item
-    append html "[export_vars item_group item item_original]\n"
+    append html "[export_form_vars item_group item item_original]\n"
     append html "<input type=\"submit\" value=\"Save settings\">"
 }
 
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.6 -r1.133.2.7
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	9 Sep 2013 09:11:34 -0000	1.133.2.6
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	9 Sep 2013 10:11:54 -0000	1.133.2.7
@@ -491,7 +491,7 @@
     <p>
     
     This will export the three variables <code>foo</code>, <code>bar</code> and <code>baz</code> as 
-    hidden HTML form fields. It does exactly the same as <code>[export_vars foo bar baz]</code>.
+    hidden HTML form fields. It does exactly the same as <code>[export_form_vars foo bar baz]</code>.
 
     <p>
 
@@ -887,7 +887,7 @@
 
     Example:
 
-    <blockquote><pre>doc_body_append [export_vars { msg_id $user(email) { order_by date } }]</pre></blockquote>
+    <blockquote><pre>doc_body_append [ad_export_vars { msg_id user(email) { order_by date } }]</pre></blockquote>
     will export the variable <code>msg_id</code> and the value <code>email</code> from the array <code>user</code>,
     and it will export a variable named <code>order_by</code> with the value <code>date</code>.
 
@@ -908,7 +908,7 @@
 
     A more involved example:
     <blockquote><pre>set my_vars { msg_id user(email) order_by }
-doc_body_append [export_vars -override { order_by $new_order_by } $my_vars]</pre></blockquote>
+doc_body_append [ad_export_vars -override { order_by $new_order_by } $my_vars]</pre></blockquote>
 
     @param form set this parameter if you want the variables exported as hidden form variables,
     as opposed to URL variables, which is the default.
@@ -1020,7 +1020,7 @@
     export_vars is now the prefered interface.
     <p>
 
-    Example usage: <code>[export_vars -sign foo bar:multiple baz]</code>
+    Example usage: <code>[export_form_vars -sign foo bar:multiple baz]</code>
 
     @param sign If this flag is set, all the variables output will be
     signed using <a
Index: openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html,v
diff -u -r1.1.22.1 -r1.1.22.2
--- openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html	9 Sep 2013 08:51:54 -0000	1.1.22.1
+++ openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html	9 Sep 2013 10:11:54 -0000	1.1.22.2
@@ -85,7 +85,7 @@
 
     <blockquote>
       <pre>
-set form_vars [export_vars var1 var2]
+set form_vars [export_form_vars var1 var2]
       </pre>
     </blockquote>
 
Index: openacs-4/packages/calendar/www/mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v
diff -u -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/calendar/www/mini-calendar.tcl	9 Sep 2013 08:51:54 -0000	1.20.2.1
+++ openacs-4/packages/calendar/www/mini-calendar.tcl	9 Sep 2013 10:11:54 -0000	1.20.2.2
@@ -21,7 +21,7 @@
 
 
 if {[exists_and_not_null page_num]} {
-    set page_num_formvar [export_vars page_num]
+    set page_num_formvar [export_form_vars page_num]
     set page_num "&page_num=$page_num"
 } else {
     set page_num_formvar ""
Index: openacs-4/packages/categories/www/categories-browse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.tcl,v
diff -u -r1.9.4.1 -r1.9.4.2
--- openacs-4/packages/categories/www/categories-browse.tcl	9 Sep 2013 08:51:55 -0000	1.9.4.1
+++ openacs-4/packages/categories/www/categories-browse.tcl	9 Sep 2013 10:11:54 -0000	1.9.4.2
@@ -37,7 +37,7 @@
 
 set context_bar [list "Browse categories"]
 set url_vars [export_url_vars tree_ids:multiple category_ids:multiple subtree_p letter join package_id]
-set form_vars [export_vars tree_ids:multiple orderby subtree_p letter package_id]
+set form_vars [export_form_vars tree_ids:multiple orderby subtree_p letter package_id]
 
 db_transaction {
     # use temporary table to use only bind vars in queries
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.3 -r1.44.2.4
--- openacs-4/packages/forums/tcl/messages-procs.tcl	9 Sep 2013 09:11:35 -0000	1.44.2.3
+++ openacs-4/packages/forums/tcl/messages-procs.tcl	9 Sep 2013 10:11:54 -0000	1.44.2.4
@@ -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 [export_vars -override [list [list order_by $new_order_by]] {order_by forum_id}]
+    set export_vars [ad_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
Index: openacs-4/packages/general-comments/www/comment-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-ae-2.adp,v
diff -u -r1.9.6.1 -r1.9.6.2
--- openacs-4/packages/general-comments/www/comment-ae-2.adp	9 Sep 2013 08:51:55 -0000	1.9.6.1
+++ openacs-4/packages/general-comments/www/comment-ae-2.adp	9 Sep 2013 10:11:54 -0000	1.9.6.2
@@ -15,7 +15,7 @@
 </else>
 
 <form action="@target@" method=post>
-<%= [export_vars comment_id object_id object_name context_id title content comment_mime_type category return_url] %>
+<%= [export_form_vars comment_id object_id object_name context_id title content comment_mime_type category return_url] %>
 <input type=submit name=submit value="#general-comments.Confirm#">
 <p>
 <input type="checkbox" name="attach_p" id="attach_ck"><label for="attach_ck">#general-comments.lt_I_would_like_to_uploa#</label>
Index: openacs-4/packages/general-comments/www/comment-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-ae.adp,v
diff -u -r1.9.6.1 -r1.9.6.2
--- openacs-4/packages/general-comments/www/comment-ae.adp	9 Sep 2013 08:51:55 -0000	1.9.6.1
+++ openacs-4/packages/general-comments/www/comment-ae.adp	9 Sep 2013 10:11:54 -0000	1.9.6.2
@@ -5,7 +5,7 @@
 
 <form action="@target@" method="post" name="comment" class="margin-form">
 <div>
-  <%= [export_vars comment_id object_id object_name context_id return_url] %>
+  <%= [export_form_vars comment_id object_id object_name context_id return_url] %>
 </div>
 <div class="form-item-wrapper">
   <label for="title" class="form-label">
Index: openacs-4/packages/general-comments/www/delete-attachment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment.adp,v
diff -u -r1.5.20.1 -r1.5.20.2
--- openacs-4/packages/general-comments/www/delete-attachment.adp	9 Sep 2013 08:51:55 -0000	1.5.20.1
+++ openacs-4/packages/general-comments/www/delete-attachment.adp	9 Sep 2013 10:11:54 -0000	1.5.20.2
@@ -9,15 +9,15 @@
 <tr>
 	<td>
 		<form action=delete-attachment-2 method=post>
-		<%= [export_vars attach_id parent_id return_url] %>
+		<%= [export_form_vars attach_id parent_id return_url] %>
 		<input type=submit name=submit value="#general-comments.Proceed#">
 		</form>
 	</td>
 
 	<td>
 		<form action="view-comment" method="get">
 		<input type=hidden name="comment_id" value="@parent_id@">
-		<%= [export_vars return_url] %>
+		<%= [export_form_vars return_url] %>
 		<input type=submit name=submit value="#general-comments.Cancel#">
 		</form>
 	</td
Index: openacs-4/packages/general-comments/www/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete.adp,v
diff -u -r1.2.6.1 -r1.2.6.2
--- openacs-4/packages/general-comments/www/delete.adp	9 Sep 2013 08:51:55 -0000	1.2.6.1
+++ openacs-4/packages/general-comments/www/delete.adp	9 Sep 2013 10:11:54 -0000	1.2.6.2
@@ -19,7 +19,7 @@
 <tr>
 	<td>
 		<form action=delete-2 method=post>
-		<%= [export_vars comment_id return_url] %>
+		<%= [export_form_vars comment_id return_url] %>
 		<input type=submit name=submit value="#general-comments.Proceed#">
 		</form>
 	</td>
Index: openacs-4/packages/general-comments/www/file-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-ae.adp,v
diff -u -r1.6.6.1 -r1.6.6.2
--- openacs-4/packages/general-comments/www/file-ae.adp	9 Sep 2013 08:51:55 -0000	1.6.6.1
+++ openacs-4/packages/general-comments/www/file-ae.adp	9 Sep 2013 10:11:55 -0000	1.6.6.2
@@ -4,7 +4,7 @@
 <property name="parent_id">@parent_id;noquote@</property>
 
 <form enctype="multipart/form-data" method=POST action="@target@">
-<div><%= [export_vars attach_id parent_id return_url] %></div>
+<div><%= [export_form_vars attach_id parent_id return_url] %></div>
 
 <table>
   <tr>
Index: openacs-4/packages/general-comments/www/url-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-ae.adp,v
diff -u -r1.6.6.1 -r1.6.6.2
--- openacs-4/packages/general-comments/www/url-ae.adp	9 Sep 2013 08:51:55 -0000	1.6.6.1
+++ openacs-4/packages/general-comments/www/url-ae.adp	9 Sep 2013 10:11:55 -0000	1.6.6.2
@@ -4,7 +4,7 @@
 <property name="parent_id">@parent_id;noquote@</property>
 
 <form method=POST action= "@target@">
-<div><%= [export_vars attach_id parent_id return_url] %></div>
+<div><%= [export_form_vars attach_id parent_id return_url] %></div>
 
 <table>
   <tr>
Index: openacs-4/packages/general-comments/www/admin/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.adp,v
diff -u -r1.6.6.1 -r1.6.6.2
--- openacs-4/packages/general-comments/www/admin/delete.adp	9 Sep 2013 08:51:55 -0000	1.6.6.1
+++ openacs-4/packages/general-comments/www/admin/delete.adp	9 Sep 2013 10:11:55 -0000	1.6.6.2
@@ -19,7 +19,7 @@
 <tr>
 	<td>
 		<form action=delete-2 method=post>
-		<%= [export_vars comment_id return_url] %>
+		<%= [export_form_vars comment_id return_url] %>
 		<input type=submit name=submit value="#general-comments.Proceed#">
 		</form>
 	</td>
Index: openacs-4/packages/rss-support/www/subscr-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.tcl,v
diff -u -r1.7.20.5 -r1.7.20.6
--- openacs-4/packages/rss-support/www/subscr-ae.tcl	9 Sep 2013 08:51:55 -0000	1.7.20.5
+++ openacs-4/packages/rss-support/www/subscr-ae.tcl	9 Sep 2013 10:11:55 -0000	1.7.20.6
@@ -72,7 +72,7 @@
     }
 }
 
-set formvars [export_vars subscr_id           \
+set formvars [export_form_vars subscr_id           \
 			       impl_id             \
 			       summary_context_id  \
 			       return_url          \