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 -r1.12.4.1
--- openacs-4/packages/acs-admin/www/apm/package-add.tcl 9 Apr 2010 20:55:00 -0000 1.12
+++ openacs-4/packages/acs-admin/www/apm/package-add.tcl 9 Sep 2013 08:51:52 -0000 1.12.4.1
@@ -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_form_vars package_id version_id]
+[export_vars package_id version_id]
-[export_form_vars version_id release_date]
+[export_vars version_id release_date]
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 -r1.10.8.1
--- openacs-4/packages/acs-admin/www/users/user-add-2.tcl 29 Sep 2008 08:40:34 -0000 1.10
+++ openacs-4/packages/acs-admin/www/users/user-add-2.tcl 9 Sep 2013 08:51:53 -0000 1.10.8.1
@@ -35,7 +35,7 @@
set context [list [list "./" "Users"] "Notify added user"]
set system_name [ad_system_name]
-set export_vars [export_form_vars email first_names last_name user_id]
+set export_vars [export_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 -r1.4.8.1
--- openacs-4/packages/acs-admin/www/users/user-batch-add.tcl 29 Sep 2008 08:40:34 -0000 1.4
+++ openacs-4/packages/acs-admin/www/users/user-batch-add.tcl 9 Sep 2013 08:51:53 -0000 1.4.8.1
@@ -17,7 +17,7 @@
set context [list [list "./" "Users"] "Notify added user"]
set system_name [ad_system_name]
-set export_vars [export_form_vars email first_names last_name user_id]
+set export_vars [export_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.1 -r1.47.2.2
--- openacs-4/packages/acs-core-docs/www/db-api-detailed.html 21 Aug 2013 10:19:21 -0000 1.47.2.1
+++ openacs-4/packages/acs-core-docs/www/db-api-detailed.html 9 Sep 2013 08:51:53 -0000 1.47.2.2
@@ -84,7 +84,7 @@
variables automatically. For instance:
-db_1row select_names "select first_names, last_name from users where user_id = [ad_get_user_id]"
+db_1row select_names "select first_names, last_name from users where user_id = [ad_conn 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_get_user_id]"] } {
+if { [db_0or1row select_names "select first_names, last_name from users where user_id = [ad_conn 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.1 -r1.48.2.2
--- openacs-4/packages/acs-core-docs/www/templates.html 21 Aug 2013 10:19:31 -0000 1.48.2.1
+++ openacs-4/packages/acs-core-docs/www/templates.html 9 Sep 2013 08:51:53 -0000 1.48.2.2
@@ -61,7 +61,7 @@
} -query {
}
-set user_id [ad_verify_and_get_user_id]
+set user_id [ad_conn 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.4 -r1.52.2.5
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 9 Sep 2013 07:56:43 -0000 1.52.2.4
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 9 Sep 2013 08:51:53 -0000 1.52.2.5
@@ -474,7 +474,7 @@
$you_are_really
Change user: [export_form_vars return_url]"
+ [export_vars 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-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 -r1.3.26.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl 6 Sep 2002 21:50:01 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl 9 Sep 2013 08:51:53 -0000 1.3.26.1
@@ -28,7 +28,7 @@
where s.segment_id = :segment_id
}
-set export_vars [export_form_vars segment_id]
+set export_vars [export_vars segment_id]
set context [list \
[list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] \
[list one?[ad_export_vars segment_id] "One segment"] \
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 -r1.3.26.1
--- openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl 6 Sep 2002 21:50:03 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl 9 Sep 2013 08:51:53 -0000 1.3.26.1
@@ -20,7 +20,7 @@
set context [list "Add relation type"]
set constraint_id [db_nextval "acs_object_id_seq"]
-set export_form_vars [export_form_vars constraint_id object_type return_url]
+set export_form_vars [export_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/relations/remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl,v
diff -u -r1.2 -r1.2.26.1
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 6 Sep 2002 21:50:04 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 9 Sep 2013 08:51:53 -0000 1.2.26.1
@@ -64,6 +64,6 @@
}
-set export_vars [export_form_vars rel_id return_url]
+set export_vars [export_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.1 -r1.27.4.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 6 Sep 2013 16:01:46 -0000 1.27.4.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 9 Sep 2013 08:51:54 -0000 1.27.4.2
@@ -274,7 +274,7 @@
if {$new_application == $node_id} {
set action_type "new_app"
- set action_form_part "[export_form_vars expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
+ set action_form_part "[export_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_form_vars expand:multiple root_id node_id rename_package_id]"
+ set action_form_part "[export_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_form_vars expand:multiple parent_id node_type root_id]"
+ set action_form_part "[export_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 {
"
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.3 -r1.9.10.4
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl 6 Sep 2013 16:01:46 -0000 1.9.10.3
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl 9 Sep 2013 08:51:54 -0000 1.9.10.4
@@ -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.1 -r1.6.8.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 6 Sep 2013 16:01:46 -0000 1.6.8.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 9 Sep 2013 08:51:54 -0000 1.6.8.2
@@ -256,7 +256,7 @@
if {$new_application == $node_id} {
set action_type "new_app"
- set action_form_part "[export_form_vars expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
+ set action_form_part "[export_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_form_vars expand:multiple root_id node_id rename_package_id]"
+ set action_form_part "[export_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_form_vars expand:multiple parent_id node_type root_id]"
+ set action_form_part "[export_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 ""
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 -r1.4.8.1
--- openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl 6 Jan 2009 02:25:34 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl 9 Sep 2013 08:51:54 -0000 1.4.8.1
@@ -19,7 +19,7 @@
set context [list [list "./" "Users"] "Notify added user"]
set system_name [ad_system_name]
-set export_vars [export_form_vars email first_names last_name user_id]
+set export_vars [export_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 -r1.7.8.1
--- openacs-4/packages/acs-subsite/www/site-map/index.tcl 29 Jul 2008 22:04:14 -0000 1.7
+++ openacs-4/packages/acs-subsite/www/site-map/index.tcl 9 Sep 2013 08:51:54 -0000 1.7.8.1
@@ -228,7 +228,7 @@
if {$new_application == $node_id} {
set action_type "new_app"
- set action_form_part "[export_form_vars expand:multiple root_id node_id new_package_id] [apm_application_new_checkbox]"
+ set action_form_part "[export_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_form_vars expand:multiple root_id node_id rename_package_id]"
+ set action_form_part "[export_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_form_vars expand:multiple parent_id node_type root_id]"
+ set action_form_part "[export_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 ""
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 -r1.20.8.1
--- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl 13 Feb 2009 20:28:08 -0000 1.20
+++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl 9 Sep 2013 08:51:54 -0000 1.20.8.1
@@ -606,25 +606,25 @@
append html ""
}
append html ""
}
append html "