Update this user's employee information "
 #  } else {
 #      set intranet_admin_link ""
 #  }
Index: openacs-4/packages/acs-admin/www/users/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.tcl,v
diff -u -r1.6.10.1 -r1.6.10.2
--- openacs-4/packages/acs-admin/www/users/search.tcl	27 Aug 2013 11:44:44 -0000	1.6.10.1
+++ openacs-4/packages/acs-admin/www/users/search.tcl	9 Sep 2013 16:44:17 -0000	1.6.10.2
@@ -150,11 +150,11 @@
     set user_search:[set rowcount](first_names) $first_names
     set user_search:[set rowcount](last_name) $last_name
     set user_search:[set rowcount](email) $email
-    set user_search:[set rowcount](export_vars) [export_url_vars user_id_from_search first_names_from_search last_name_from_search email_from_search]
+    set user_search:[set rowcount](export_vars) [export_vars -url {user_id_from_search first_names_from_search last_name_from_search email_from_search}]
     set user_search:[set rowcount](member_state) $member_state
     
     if { $member_state ne "approved" } {
-	set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "search?[export_url_vars email last_name keyword target passthrough limit_users_in_group_id only_authorized_p]"] " | "]
+	set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "search?[export_vars -url {email last_name keyword target passthrough limit_users_in_group_id only_authorized_p}]"] " | "]
     } else {
 	set user_search:[set rowcount](user_finite_state_links) ""
     }
Index: openacs-4/packages/acs-admin/www/users/session-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/session-history.tcl,v
diff -u -r1.3 -r1.3.10.1
--- openacs-4/packages/acs-admin/www/users/session-history.tcl	10 Jan 2007 21:22:00 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/session-history.tcl	9 Sep 2013 16:44:17 -0000	1.3.10.1
@@ -38,7 +38,7 @@
 	set last_year $pretty_year
     }
     append whole_page "
-$pretty_month $pretty_year 
+$pretty_month $pretty_year 
 [util_commify_number $total_sessions] 
 [util_commify_number $total_repeats] 
  
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.3 -r1.10.8.4
--- openacs-4/packages/acs-admin/www/users/user-add-2.tcl	9 Sep 2013 10:17:37 -0000	1.10.8.3
+++ openacs-4/packages/acs-admin/www/users/user-add-2.tcl	9 Sep 2013 16:44:17 -0000	1.10.8.4
@@ -35,7 +35,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_vars -form {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-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.tcl,v
diff -u -r1.6.6.1 -r1.6.6.2
--- openacs-4/packages/acs-admin/www/users/user-add-3.tcl	27 Aug 2013 11:44:44 -0000	1.6.6.1
+++ openacs-4/packages/acs-admin/www/users/user-add-3.tcl	9 Sep 2013 16:44:17 -0000	1.6.6.2
@@ -19,7 +19,7 @@
 set admin_user_id [ad_conn user_id]
 
 set context [list [list "./" "Users"] "New user notified"]
-set export_vars [export_url_vars user_id]
+set export_vars [export_vars -url {user_id}]
 
 set admin_email [db_string get_admin_email {}]
 set subject "You have been added as a user to [ad_system_name] at [ad_url]"
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.3 -r1.4.8.4
--- openacs-4/packages/acs-admin/www/users/user-batch-add.tcl	9 Sep 2013 10:17:37 -0000	1.4.8.3
+++ openacs-4/packages/acs-admin/www/users/user-batch-add.tcl	9 Sep 2013 16:44:18 -0000	1.4.8.4
@@ -17,7 +17,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_vars -form {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-api-browser/www/content-page-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/content-page-view.tcl,v
diff -u -r1.5 -r1.5.4.1
--- openacs-4/packages/acs-api-browser/www/content-page-view.tcl	25 Nov 2010 09:17:23 -0000	1.5
+++ openacs-4/packages/acs-api-browser/www/content-page-view.tcl	9 Sep 2013 16:44:18 -0000	1.5.4.1
@@ -20,7 +20,7 @@
 }
 
 set context [list]
-set url_vars [export_url_vars path version_id]
+set url_vars [export_vars -url {path version_id}]
 set return_url [ns_urlencode [ad_conn url]?][ns_urlencode $url_vars]
 set default_source_p [ad_get_client_property -default 0 acs-api-browser api_doc_source_p]
 
Index: openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl,v
diff -u -r1.3 -r1.3.26.1
--- openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl	6 Sep 2002 21:49:54 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl	9 Sep 2013 16:44:18 -0000	1.3.26.1
@@ -33,12 +33,12 @@
 switch $type {
     "PACKAGE" {
 	set type "PACKAGE BODY"
-	set package_slider_list [list "package" "package body "]
+	set package_slider_list [list "package" "package body "]
     }
 
     "PACKAGE BODY" {
 	set type "PACKAGE"
-	set package_slider_list [list "package " "package body"]
+	set package_slider_list [list "package " "package body"]
     }
 
     default {
Index: openacs-4/packages/acs-api-browser/www/proc-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-view.tcl,v
diff -u -r1.6.16.1 -r1.6.16.2
--- openacs-4/packages/acs-api-browser/www/proc-view.tcl	27 Aug 2013 12:20:34 -0000	1.6.16.1
+++ openacs-4/packages/acs-api-browser/www/proc-view.tcl	9 Sep 2013 16:44:18 -0000	1.6.16.2
@@ -30,7 +30,7 @@
 lappend context [list $proc]
 
 set default_source_p [ad_get_client_property -default 0 acs-api-browser api_doc_source_p]
-set return_url [ns_urlencode [ad_conn url]?[export_url_vars proc version_id]]
+set return_url [ns_urlencode [ad_conn url]?[export_vars -url {proc version_id}]]
 set error_msg ""
 
 if { ![info exists source_p] } {
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.4 -r1.47.2.5
--- openacs-4/packages/acs-core-docs/www/db-api-detailed.html	9 Sep 2013 10:34:30 -0000	1.47.2.4
+++ openacs-4/packages/acs-core-docs/www/db-api-detailed.html	9 Sep 2013 16:44:18 -0000	1.47.2.5
@@ -84,7 +84,7 @@
 variables automatically. For instance: 
 
 
-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!"
 
  
@@ -93,7 +93,7 @@
 write: 
 
 
-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.4 -r1.48.2.5
--- openacs-4/packages/acs-core-docs/www/templates.html	9 Sep 2013 10:34:30 -0000	1.48.2.4
+++ openacs-4/packages/acs-core-docs/www/templates.html	9 Sep 2013 16:44:18 -0000	1.48.2.5
@@ -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-core-docs/www/sql/display-sql.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/sql/display-sql.tcl,v
diff -u -r1.5 -r1.5.10.1
--- openacs-4/packages/acs-core-docs/www/sql/display-sql.tcl	10 Jan 2007 21:22:03 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/sql/display-sql.tcl	9 Sep 2013 16:44:18 -0000	1.5.10.1
@@ -48,7 +48,7 @@
     set files [glob -nocomplain "[acs_package_root_dir $package_key]/sql/*/$url" "[acs_package_root_dir $package_key]/sql/$url"]
     foreach f $files { 
         regexp {([^/]*)/([^/]*)$} $f match db url
-        append text "  No sql file found."
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.7 -r1.52.2.8
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	9 Sep 2013 10:17:37 -0000	1.52.2.7
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	9 Sep 2013 16:44:18 -0000	1.52.2.8
@@ -474,7 +474,7 @@
          $you_are_really
          Change user: 
          $options
-          [export_vars -form return_url] "
+         [export_vars -form {return_url}] "
      } 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-mail-lite/tcl/bounce-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/bounce-procs.tcl,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/acs-mail-lite/tcl/bounce-procs.tcl	17 Oct 2010 21:06:08 -0000	1.9
+++ openacs-4/packages/acs-mail-lite/tcl/bounce-procs.tcl	9 Sep 2013 16:44:18 -0000	1.9.4.1
@@ -130,7 +130,7 @@
             array set user $notification_list
             set user_id $user(user_id)
 
-            set body "Dear $user(name),\n\nDue to returning mails from your email account, we currently do not send you any email from our system. To reenable your email account, please visit\n[ad_url]/register/restore-bounce?[export_url_vars user_id]"
+            set body "Dear $user(name),\n\nDue to returning mails from your email account, we currently do not send you any email from our system. To reenable your email account, please visit\n[ad_url]/register/restore-bounce?[export_vars -url {user_id}]"
 
             send -to_addr $notification_list -from_addr $notification_sender -subject $subject -body $body -valid_email
             ns_log Notice "Bounce notification send to user $user_id"
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.3 -r1.3.10.4
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl	9 Sep 2013 10:17:38 -0000	1.3.10.3
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl	9 Sep 2013 16:44:19 -0000	1.3.10.4
@@ -49,7 +49,7 @@
      where a.attribute_id = :attribute_id
 }
 
-set context [list [list one?[export_url_vars attribute_id] "One attribute"] "Add values"]
+set context [list [list one?[export_vars -url {attribute_id}] "One attribute"] "Add values"]
 
 set export_vars [export_vars -form {attribute_id 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.3 -r1.3.26.4
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl	9 Sep 2013 10:17:38 -0000	1.3.26.3
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl	9 Sep 2013 16:44:20 -0000	1.3.26.4
@@ -30,7 +30,7 @@
 
 set context [list \
          [list "[ad_conn package_url]admin/group-types/" "Group types"] \
-         [list one?[export_url_vars group_type] "One group type"] \
+         [list one?[export_vars -url {group_type}] "One group type"] \
          "Delete group type"]
 
 if { ![db_0or1row select_pretty_name {
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.4 -r1.3.26.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl	9 Sep 2013 10:17:41 -0000	1.3.26.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl	9 Sep 2013 16:44:22 -0000	1.3.26.5
@@ -28,7 +28,7 @@
      where s.segment_id = :segment_id
 }
 
-set export_vars [export_vars -form segment_id]
+set export_vars [export_vars -form {segment_id}]
 set context [list \
      [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] \
      [list one?[export_vars segment_id] "One segment"] \
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.3 -r1.3.26.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl	9 Sep 2013 10:17:41 -0000	1.3.26.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl	9 Sep 2013 16:44:23 -0000	1.3.26.4
@@ -20,8 +20,8 @@
 
 set context [list "Add relation type"]
 set constraint_id [db_nextval "acs_object_id_seq"]
-set export_form_vars [export_vars -form constraint_id object_type return_url]
-set export_url_vars [export_url_vars constraint_id object_type return_url]
+set export_form_vars [export_vars -form {constraint_id object_type return_url}]
+set export_url_vars [export_vars -url {constraint_id object_type return_url}]
 
 db_multirow primary_rels select_primary_relations {
     select o.object_type as rel_type, o.pretty_name
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.4 -r1.2.26.5
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	9 Sep 2013 10:17:42 -0000	1.2.26.4
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	9 Sep 2013 16:44:24 -0000	1.2.26.5
@@ -64,6 +64,6 @@
 }
 
 
-set export_vars [export_vars -form rel_id return_url]
+set export_vars [export_vars -form {rel_id return_url}]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl,v
diff -u -r1.4 -r1.4.26.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl	10 Sep 2002 22:22:11 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl	9 Sep 2013 16:44:24 -0000	1.4.26.1
@@ -18,4 +18,4 @@
 
 site_node::delete -node_id $node_id
 
-ad_returnredirect ".?[export_url_vars expand:multiple root_id]"
+ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
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.4 -r1.27.4.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	9 Sep 2013 10:17:42 -0000	1.27.4.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	9 Sep 2013 16:44:24 -0000	1.27.4.5
@@ -208,17 +208,17 @@
     if {$directory_p eq "t"} {
 	set add_folder_url "?[export_url_vars expand:multiple root_id node_id new_parent=$node_id new_type=folder]"
 	if {$object_id eq ""} {
-	    set mount_url "mount?[export_url_vars expand:multiple root_id node_id]"
+	    set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"
 	    set new_app_url "?[export_url_vars expand:multiple root_id new_application=$node_id]"
 	} else {
 	    # This makes sure you can't unmount the thing that is serving the page you're looking at.
 	    if {[ad_conn node_id] != $node_id} {
-		set unmount_url "unmount?[export_url_vars expand:multiple root_id node_id]"
+		set unmount_url "unmount?[export_vars -url {expand:multiple root_id node_id}]"
 	    }
 	    
 	    # Add a link to control permissioning
 	    if {$object_admin_p} {
-		set permissions_url "../../permissions/one?[export_url_vars object_id]"
+		set permissions_url "../../permissions/one?[export_vars -url {object_id}]"
 		set rename_url "?[export_url_vars expand:multiple root_id rename_application=$node_id]"
 		set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
 	    }
@@ -232,7 +232,7 @@
     }
     
     if {[ad_conn node_id] != $node_id && $n_children == 0 && $object_id eq ""} {
-	set delete_url "delete?[export_url_vars expand:multiple root_id node_id]"
+	set delete_url "delete?[export_vars -url {expand:multiple root_id node_id}]"
     }
     
     # use the indent variable to hold current indent level we'll use it later to indent stuff at the end by the amount of the last node
@@ -274,7 +274,7 @@
 	if {$new_application == $node_id} {
 	    
 	    set action_type "new_app"
-	    set action_form_part "[export_vars -form expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
+	    set action_form_part "[export_vars -form {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 -form expand:multiple root_id node_id rename_package_id]"
+	set action_form_part "[export_vars -form {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 -form expand:multiple parent_id node_type root_id]"
+	set action_form_part "[export_vars -form {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 {"
Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl,v
diff -u -r1.2.26.1 -r1.2.26.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl	6 Sep 2013 16:01:46 -0000	1.2.26.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl	9 Sep 2013 16:44:24 -0000	1.2.26.2
@@ -16,4 +16,4 @@
 
 site_node::mount -node_id $node_id -object_id $package_id
 
-ad_returnredirect ".?[export_url_vars expand:multiple root_id]"
+ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v
diff -u -r1.5 -r1.5.16.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl	1 Mar 2005 00:01:23 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl	9 Sep 2013 16:44:24 -0000	1.5.16.1
@@ -65,4 +65,4 @@
     lappend expand $parent_id
 }
 
-ad_returnredirect ".?[export_url_vars expand:multiple root_id]"
+ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
Index: openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl,v
diff -u -r1.12 -r1.12.10.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	10 Jan 2007 21:22:08 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	9 Sep 2013 16:44:24 -0000	1.12.10.1
@@ -67,4 +67,4 @@
     }
 }
 
-ad_returnredirect ".?[export_url_vars expand:multiple root_id]"
+ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
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.6 -r1.9.10.7
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	9 Sep 2013 10:17:43 -0000	1.9.10.6
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	9 Sep 2013 16:44:24 -0000	1.9.10.7
@@ -92,7 +92,7 @@
 ns_return 200 text/html "$body
 
  
 
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.4 -r1.6.8.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	9 Sep 2013 10:17:43 -0000	1.6.8.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	9 Sep 2013 16:44:25 -0000	1.6.8.5
@@ -185,17 +185,17 @@
     if {$directory_p eq "t"} {
 	set add_folder_url "?[export_url_vars expand:multiple root_id node_id new_parent=$node_id new_type=folder]"
 	if {$object_id eq ""} {
-	    set mount_url "mount?[export_url_vars expand:multiple root_id node_id]"
+	    set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"
 	    set new_app_url "?[export_url_vars expand:multiple root_id new_application=$node_id]"
 	} else {
 	    # This makes sure you can't unmount the thing that is serving the page you're looking at.
 	    if {[ad_conn node_id] != $node_id} {
-		set unmount_url "unmount?[export_url_vars expand:multiple root_id node_id]"
+		set unmount_url "unmount?[export_vars -url {expand:multiple root_id node_id}]"
 	    }
 	    
 	    # Add a link to control permissioning
 	    if {$object_admin_p} {
-		set permissions_url "../../permissions/one?[export_url_vars object_id]"
+		set permissions_url "../../permissions/one?[export_vars -url {object_id}]"
 		set rename_url "?[export_url_vars expand:multiple root_id rename_application=$node_id]"
 		set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
 	    }
@@ -209,7 +209,7 @@
     }
     
     if {[ad_conn node_id] != $node_id && $n_children == 0 && $object_id eq ""} {
-	set delete_url "delete?[export_url_vars expand:multiple root_id node_id]"
+	set delete_url "delete?[export_vars -url {expand:multiple root_id node_id}]"
     }
     
     # use the indent variable to hold current indent level we'll use it later to indent stuff at the end by the amount of the last node
@@ -256,7 +256,7 @@
 	if {$new_application == $node_id} {
 	    
 	    set action_type "new_app"
-	    set action_form_part "[export_vars -form expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
+	    set action_form_part "[export_vars -form {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 -form expand:multiple root_id node_id rename_package_id]"
+	set action_form_part "[export_vars -form {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 -form expand:multiple parent_id node_type root_id]"
+	set action_form_part "[export_vars -form {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 "
"
Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl,v
diff -u -r1.3 -r1.3.26.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl	10 Sep 2002 22:22:11 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl	9 Sep 2013 16:44:25 -0000	1.3.26.1
@@ -14,4 +14,4 @@
 
 site_node::unmount -node_id $node_id
 
-ad_returnredirect ".?[export_url_vars expand:multiple root_id]"
+ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
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.3 -r1.12.6.4
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl	9 Sep 2013 10:17:43 -0000	1.12.6.3
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl	9 Sep 2013 16:44:25 -0000	1.12.6.4
@@ -251,7 +251,7 @@
 	    ns_sendmail [template::element::get_value add_user email] \
 		    $notification_address \
 		    "Welcome to [ad_system_name]" \
-		    "To confirm your registration, please go to [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL]/register/email-confirm?[export_url_vars row_id]
+		    "To confirm your registration, please go to [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL]/register/email-confirm?[export_vars -url {row_id}]
 
 After confirming your email, here's how you can log in at [ad_url]:
 
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.4 -r1.4.8.5
--- openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl	9 Sep 2013 10:17:43 -0000	1.4.8.4
+++ openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl	9 Sep 2013 16:44:25 -0000	1.4.8.5
@@ -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_vars -form {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/permissions/grant.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.tcl,v
diff -u -r1.14.10.2 -r1.14.10.3
--- openacs-4/packages/acs-subsite/www/permissions/grant.tcl	6 Sep 2013 16:01:46 -0000	1.14.10.2
+++ openacs-4/packages/acs-subsite/www/permissions/grant.tcl	9 Sep 2013 16:44:25 -0000	1.14.10.3
@@ -19,7 +19,7 @@
 
 set title [_ acs-subsite.lt_Grant_Permission_on_n]
 
-set context [list [list one?[export_url_vars object_id] "[_ acs-subsite.Permissions_for_name]"] [_ acs-subsite.Grant]]
+set context [list [list one?[export_vars -url {object_id}] "[_ acs-subsite.Permissions_for_name]"] [_ acs-subsite.Grant]]
 
 
 # Compute a hierarchical tree representation of the contents of
Index: openacs-4/packages/acs-subsite/www/permissions/revoke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/revoke.tcl,v
diff -u -r1.4.22.1 -r1.4.22.2
--- openacs-4/packages/acs-subsite/www/permissions/revoke.tcl	6 Sep 2013 16:01:47 -0000	1.4.22.1
+++ openacs-4/packages/acs-subsite/www/permissions/revoke.tcl	9 Sep 2013 16:44:25 -0000	1.4.22.2
@@ -14,7 +14,7 @@
 permission::require_permission -object_id $object_id -privilege admin
 
 if {[llength $revoke_list] == 0} {
-  ad_returnredirect "./?[export_url_vars object_id]"
+  ad_returnredirect "./?[export_vars -url {object_id}]"
   ad_script_abort
 }
 
Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/acs-subsite/www/shared/community-member.tcl	6 Sep 2013 15:41:22 -0000	1.19.2.1
+++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl	9 Sep 2013 16:44:25 -0000	1.19.2.2
@@ -73,7 +73,7 @@
 
 # Do we show the portrait?
 set inline_portrait_state "none"
-set portrait_export_vars [export_url_vars user_id]
+set portrait_export_vars [export_vars -url {user_id}]
 
 if {[db_0or1row portrait_info "
 select i.width, i.height, cr.title, cr.description, cr.publish_date
Index: openacs-4/packages/acs-subsite/www/shared/portrait.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.tcl,v
diff -u -r1.8 -r1.8.8.1
--- openacs-4/packages/acs-subsite/www/shared/portrait.tcl	31 Mar 2009 14:58:07 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/shared/portrait.tcl	9 Sep 2013 16:44:25 -0000	1.8.8.1
@@ -46,7 +46,7 @@
 
 set doc(title) [_ acs-subsite.lt_Portrait_of_first_last]
 set context [list [list [acs_community_member_url -user_id $user_id] "$first_names $last_name"] [_ acs-subsite.Portrait]]
-set export_vars [export_url_vars user_id]
+set export_vars [export_vars -url {user_id}]
 set pretty_date [lc_time_fmt $publish_date "%q"]
 
 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.3 -r1.7.8.4
--- openacs-4/packages/acs-subsite/www/site-map/index.tcl	9 Sep 2013 10:17:43 -0000	1.7.8.3
+++ openacs-4/packages/acs-subsite/www/site-map/index.tcl	9 Sep 2013 16:44:26 -0000	1.7.8.4
@@ -152,17 +152,17 @@
     if {$directory_p eq "t"} {
 	set add_folder_url "?[export_url_vars expand:multiple root_id node_id new_parent=$node_id new_type=folder]"
 	if {$object_id eq ""} {
-	    set mount_url "mount?[export_url_vars expand:multiple root_id node_id]"
+	    set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"
 	    set new_app_url "?[export_url_vars expand:multiple root_id new_application=$node_id]"
 	} else {
 	    # This makes sure you can't unmount the thing that is serving the page you're looking at.
 	    if {[ad_conn node_id] != $node_id} {
-		set unmount_url "unmount?[export_url_vars expand:multiple root_id node_id]"
+		set unmount_url "unmount?[export_vars -url {expand:multiple root_id node_id}]"
 	    }
 	    
 	    # Add a link to control permissioning
 	    if {$object_admin_p} {
-		set permissions_url "../../permissions/one?[export_url_vars object_id]"
+		set permissions_url "../../permissions/one?[export_vars -url {object_id}]"
 		set rename_url "?[export_url_vars expand:multiple root_id rename_application=$node_id]"
 		set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
 	    }
@@ -176,7 +176,7 @@
     }
     
     if {[ad_conn node_id] != $node_id && $n_children == 0 && $object_id eq ""} {
-	set delete_url "delete?[export_url_vars expand:multiple root_id node_id]"
+	set delete_url "delete?[export_vars -url {expand:multiple root_id node_id}]"
     }
     
     # use the indent variable to hold current indent level we'll use it later to indent stuff at the end by the amount of the last node
@@ -228,7 +228,7 @@
 	if {$new_application == $node_id} {
 	    
 	    set action_type "new_app"
-	    set action_form_part "[export_vars -form expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
+	    set action_form_part "[export_vars -form {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 -form expand:multiple root_id node_id rename_package_id]"
+	set action_form_part "[export_vars -form {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 -form expand:multiple parent_id node_type root_id]"
+	set action_form_part "[export_vars -form {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 "
"
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v
diff -u -r1.10.8.1 -r1.10.8.2
--- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	6 Sep 2013 16:01:47 -0000	1.10.8.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	9 Sep 2013 16:44:26 -0000	1.10.8.2
@@ -45,8 +45,8 @@
     set admin_p 0
 }
 
-set export_vars      [export_url_vars user_id]
-set export_edit_vars [export_url_vars user_id return_url]
+set export_vars      [export_vars -url {user_id}]
+set export_edit_vars [export_vars -url {user_id return_url}]
 
 if {![db_0or1row user_info "select 
   first_names, 
Index: openacs-4/packages/acs-tcl/tcl/object-type-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/object-type-procs.tcl,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/acs-tcl/tcl/object-type-procs.tcl	18 Apr 2011 16:56:12 -0000	1.9
+++ openacs-4/packages/acs-tcl/tcl/object-type-procs.tcl	9 Sep 2013 16:44:26 -0000	1.9.4.1
@@ -48,7 +48,7 @@
 	    append result $join_string
 	}
 	incr i
-	append result [subst {\n    $indent[lang::util::localize $pretty_name] }]
+	append result [subst {\n    $indent[lang::util::localize $pretty_name] }]
 	append result $additional_html
 
     }
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.3 -r1.20.8.4
--- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	9 Sep 2013 10:17:43 -0000	1.20.8.3
+++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	9 Sep 2013 16:44:26 -0000	1.20.8.4
@@ -606,25 +606,25 @@
         append html ""
     }
 
     append html ""
     }
 
     append html "