Index: openacs-4/packages/edit-this-page/www/etp-create-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/edit-this-page/www/etp-create-2.tcl 24 Sep 2001 17:24:13 -0000 1.1 +++ openacs-4/packages/edit-this-page/www/etp-create-2.tcl 9 Sep 2013 17:34:17 -0000 1.2 @@ -17,5 +17,5 @@ identifies this subtopic." } else { etp::make_page $name $title - ad_returnredirect "etp?[export_url_vars name]" + ad_returnredirect "etp?[export_vars -url {name}]" } Index: openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl 7 Sep 2013 12:50:57 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl 9 Sep 2013 17:34:17 -0000 1.4 @@ -30,12 +30,12 @@ db_dml copy_parameter "" } set title $subtopic_title - ad_returnredirect "$subtopic_name/etp-setup-2?[export_url_vars title]" + ad_returnredirect "$subtopic_name/etp-setup-2?[export_vars -url {title}]" } ad_script_abort } else { set confirmed "t" - set form_vars [export_form_vars confirmed] + set form_vars [export_vars -form {confirmed}] } set page_title "Create a new subtopic" Index: openacs-4/packages/edit-this-page/www/etp-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-delete.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-delete.tcl 7 Sep 2013 12:50:58 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-delete.tcl 9 Sep 2013 17:34:17 -0000 1.3 @@ -30,7 +30,7 @@ ad_script_abort } else { set confirmed "t" - set form_vars [export_form_vars name confirmed] + set form_vars [export_vars -form {name confirmed}] set page_url "[file dirname [ad_conn url]]/$name" db_0or1row get_title "" if {![info exists title]} { Index: openacs-4/packages/edit-this-page/www/etp-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/edit-this-page/www/etp-edit.tcl 7 Sep 2013 12:50:58 -0000 1.14 +++ openacs-4/packages/edit-this-page/www/etp-edit.tcl 9 Sep 2013 17:34:17 -0000 1.15 @@ -166,14 +166,14 @@ db_dml update_package_instance_name "" } - ad_returnredirect "etp?[export_url_vars name]" + ad_returnredirect "etp?[export_vars -url {name}]" ad_script_abort } set page_title [_ edit-this-page.atribute_for_page_title] if {$name eq "index"} { - set context [list [list "etp?[export_url_vars name]" Edit] $attribute_title] + set context [list [list "etp?[export_vars -url {name}]" Edit] $attribute_title] } else { - set context [list [list $name $name] [list "etp?[export_url_vars name]" Edit] $attribute_title] + set context [list [list $name $name] [list "etp?[export_vars -url {name}]" Edit] $attribute_title] } Index: openacs-4/packages/edit-this-page/www/etp-extlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/edit-this-page/www/etp-extlink.tcl 7 Sep 2013 12:50:58 -0000 1.5 +++ openacs-4/packages/edit-this-page/www/etp-extlink.tcl 9 Sep 2013 17:34:17 -0000 1.6 @@ -41,7 +41,7 @@ ad_script_abort } else { set confirmed "t" - set form_vars [export_form_vars item_id confirmed] + set form_vars [export_vars -form {item_id confirmed}] if {$item_id ne ""} { db_1row get_extlink_info { Index: openacs-4/packages/edit-this-page/www/etp-history.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-history.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-history.tcl 7 Sep 2013 12:50:58 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-history.tcl 9 Sep 2013 17:34:17 -0000 1.5 @@ -26,9 +26,9 @@ set page_title [_ edit-this-page.revision_history_for] if {$name eq "index"} { - set context [list [list "etp?[export_url_vars name]" "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"] + set context [list [list "etp?[export_vars -url {name}]" "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"] } else { - set context [list [list $name $name] [list "etp?[export_url_vars name]" "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"] + set context [list [list $name $name] [list "etp?[export_vars -url {name}]" "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"] } Index: openacs-4/packages/edit-this-page/www/etp-publish.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-publish.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/edit-this-page/www/etp-publish.tcl 24 Sep 2001 17:24:13 -0000 1.1 +++ openacs-4/packages/edit-this-page/www/etp-publish.tcl 9 Sep 2013 17:34:17 -0000 1.2 @@ -28,5 +28,5 @@ util_memoize_flush $key } -ad_returnredirect "etp?[export_url_vars name]" +ad_returnredirect "etp?[export_vars -url {name}]" Index: openacs-4/packages/edit-this-page/www/etp-revert.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revert.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-revert.tcl 7 Sep 2013 12:50:58 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-revert.tcl 9 Sep 2013 17:34:17 -0000 1.3 @@ -34,13 +34,13 @@ db_exec_plsql delete_revision "" } } - ad_returnredirect "etp?[export_url_vars name]" + ad_returnredirect "etp?[export_vars -url {name}]" ad_script_abort } else { db_1row get_revision_count "" set confirmed "t" - set form_vars [export_form_vars name revision_id version_number confirmed] + set form_vars [export_vars -form {name revision_id version_number confirmed}] } \ No newline at end of file Index: openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl 7 Sep 2013 12:50:58 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl 9 Sep 2013 17:34:17 -0000 1.4 @@ -26,7 +26,7 @@ db_exec_plsql delete_revision {} - ad_returnredirect "etp?[export_url_vars name]" + ad_returnredirect "etp?[export_vars -url {name}]" ad_script_abort } else { set form_vars [export_vars -form { name revision_id version_number { confirmed t }}] Index: openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl 7 Sep 2013 12:50:58 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl 9 Sep 2013 17:34:17 -0000 1.5 @@ -38,12 +38,12 @@ apm_parameter_sync "edit-this-page" $new_package_id set title $subtopic_title - ad_returnredirect "$subtopic_name/etp-setup-2?[export_url_vars title]" + ad_returnredirect "$subtopic_name/etp-setup-2?[export_vars -url {title}]" } ad_script_abort } else { set confirmed "t" - set form_vars [export_form_vars confirmed] + set form_vars [export_vars -form {confirmed}] } set page_title "[_ edit-this-page.Create_a_new_subtopic]" Index: openacs-4/packages/news/www/preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.tcl,v diff -u -r1.28 -r1.29 --- openacs-4/packages/news/www/preview.tcl 6 Sep 2013 16:46:28 -0000 1.28 +++ openacs-4/packages/news/www/preview.tcl 9 Sep 2013 17:34:18 -0000 1.29 @@ -136,23 +136,23 @@ # form variables for confirmation step - set hidden_vars [export_form_vars publish_title publish_lead publish_body publish_body.format \ - publish_date_ansi archive_date_ansi html_p permanent_p imgfile] - set image_vars [export_form_vars publish_title publish_lead publish_body publish_body.format \ + set hidden_vars [export_vars -form {publish_title publish_lead publish_body publish_body.format \ + publish_date_ansi archive_date_ansi html_p permanent_p imgfile}] + set image_vars [export_vars -form {publish_title publish_lead publish_body publish_body.format \ publish_date_ansi archive_date_ansi html_p \ - permanent_p action] + permanent_p action}] set form_action "