Index: openacs-4/packages/static-pages/tcl/static-pages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-procs.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/static-pages/tcl/static-pages-procs.tcl	13 Jan 2005 13:58:41 -0000	1.17
+++ openacs-4/packages/static-pages/tcl/static-pages-procs.tcl	12 Sep 2013 20:43:19 -0000	1.18
@@ -51,7 +51,7 @@
         order by package_id
     } {
         set root_folder_id [sp_root_folder_id $package_id]
-        set fs_root "[acs_root_dir][ad_parameter -package_id $package_id {fs_root}]"
+        set fs_root "[acs_root_dir][parameter::get -package_id $package_id -parameter {fs_root}]"
 
         ns_log Debug "$proc_name: About to scan the filesystem for:  package_id '$package_id', instance_name '$instance_name', fs_root '$fs_root':"
 
@@ -294,7 +294,7 @@
     set fs_trimmed [string trimright $fs_root "/"]
     set fs_trimmed_length [string length $fs_trimmed]
 
-    set static_page_regexp "\\.[join [split [string trim [ad_parameter -package_id $package_id AllowedExtensions]] " "] "$|\\."]$"
+    set static_page_regexp "\\.[join [split [string trim [parameter::get -package_id $package_id -parameter AllowedExtensions]] " "] "$|\\."]$"
 
     # TODO: What happens if at some point, an Admin CHANGES the
     # fs_root parameter for a Static Pages package instance?  BAD
@@ -757,7 +757,7 @@
     set comment_p [parameter::get -package_id $package_id -parameter CommentsDisplayedP -default 1]
 
     set file [ad_conn file]
-    ad_conn -set subsite_id [site_node_closest_ancestor_package "acs-subsite"]
+    ad_conn -set subsite_id [site_node::closest_ancestor_package -include_self -package_key "acs-subsite"]
 
     # If the page is in the db, serve it carefully; otherwise just dump it out.
     # We are careful to use ns_returnfile if possible since it is much more 
@@ -778,7 +778,7 @@
 
         set comment_link ""
         if { $comment_p } {
-            if { [ad_permission_p -user_id [acs_magic_object the_public] $page_id general_comments_create] } {
+            if { [permission::permission_p -party_id [acs_magic_object the_public] -object_id $page_id -privilege general_comments_create] } {
                 append comment_link "<center>[general_comments_create_link -object_name [lindex $page_info 0] $page_id [ad_conn url]]</center>"
             }
             append comment_link "[general_comments_get_comments -print_content_p [lindex $page_info 1] $page_id [ad_conn url]]"
@@ -839,7 +839,7 @@
 
 	set file_mtime [clock format [file mtime $file]]
 
-	set body [template::adp_parse [acs_root_dir]/[ad_parameter -package_id $package_id TemplatePath] [list body $body sp_scripts $sp_scripts title "$title" file_mtime $file_mtime page_id $page_id] ]
+	set body [template::adp_parse [acs_root_dir]/[parameter::get -package_id $package_id -parameter TemplatePath] [list body $body sp_scripts $sp_scripts title "$title" file_mtime $file_mtime page_id $page_id] ]
     }
     ns_return 200 text/html $body
 }
@@ -862,7 +862,7 @@
 
     array set extensions_arr [list]
     foreach package_id $package_ids {
-        foreach extension [split [string tolower [string trim [ad_parameter -package_id $package_id AllowedExtensions]]] " "] {
+        foreach extension [split [string tolower [string trim [parameter::get -package_id $package_id -parameter AllowedExtensions]]] " "] {
             set extensions_arr($extension) {}
         }
     }
Index: openacs-4/packages/static-pages/www/admin/commentability-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/commentability-toggle.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/static-pages/www/admin/commentability-toggle.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/static-pages/www/admin/commentability-toggle.tcl	12 Sep 2013 20:43:19 -0000	1.2
@@ -10,7 +10,7 @@
     recurse:boolean
 }
 
-if [ad_permission_p -user_id [acs_magic_object the_public] $item_id general_comments_create] {
+if [permission::permission_p -party_id [acs_magic_object the_public] -object_id $item_id -privilege general_comments_create] {
     db_exec_plsql revoke_commentability {
 	begin
 	    static_page.revoke_permission(:item_id,acs.magic_object_id('the_public'),'general_comments_create',
Index: openacs-4/packages/static-pages/www/admin/fs-scan-progress.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/fs-scan-progress.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/static-pages/www/admin/fs-scan-progress.tcl	16 Jan 2003 14:03:04 -0000	1.3
+++ openacs-4/packages/static-pages/www/admin/fs-scan-progress.tcl	12 Sep 2013 20:43:19 -0000	1.4
@@ -48,7 +48,7 @@
 
 set package_id [ad_conn package_id]
 set root_folder_id [sp_root_folder_id $package_id]
-set fs_root "[acs_root_dir][ad_parameter -package_id $package_id {fs_root}]"
+set fs_root "[acs_root_dir][parameter::get -package_id $package_id -parameter {fs_root}]"
 
 ns_write "
 <p>
Index: openacs-4/packages/static-pages/www/admin/fs-scan.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/fs-scan.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/static-pages/www/admin/fs-scan.tcl	16 Jan 2003 14:03:04 -0000	1.3
+++ openacs-4/packages/static-pages/www/admin/fs-scan.tcl	12 Sep 2013 20:43:19 -0000	1.4
@@ -42,7 +42,7 @@
 
 set package_id [ad_conn package_id]
 set root_folder_id [sp_root_folder_id $package_id]
-set fs_root "[acs_root_dir][ad_parameter -package_id $package_id {fs_root}]"
+set fs_root "[acs_root_dir][parameter::get -package_id $package_id -parameter {fs_root}]"
 
 set result [sp_sync_cr_with_filesystem \
 	-file_unchanged_proc sp_old_item \
Index: openacs-4/packages/static-pages/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/static-pages/www/admin/index.tcl	16 Jan 2003 14:03:04 -0000	1.3
+++ openacs-4/packages/static-pages/www/admin/index.tcl	12 Sep 2013 20:43:19 -0000	1.4
@@ -34,5 +34,5 @@
 }
 
 set title "Static Pages Administration"
-set fs_root "[acs_root_dir][ad_parameter {fs_root}]"
+set fs_root "[acs_root_dir][parameter::get -parameter {fs_root}]"
 set context [list $title]
Index: openacs-4/packages/wp-slim/www/add-edit-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/add-edit-presentation.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/add-edit-presentation.tcl	1 Mar 2005 00:01:46 -0000	1.2
+++ openacs-4/packages/wp-slim/www/add-edit-presentation.tcl	12 Sep 2013 20:47:19 -0000	1.3
@@ -90,7 +90,7 @@
     }
 } -edit_data {
     set title "[_ wp-slim.Edit_Presentation]"
-    set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "$pres_title"] "[_ wp-slim.Edit_Presentation]"]
+    set context [list [list "presentation-top?[export_vars -url {pres_item_id}]"  "$pres_title"] "[_ wp-slim.Edit_Presentation]"]
     db_exec_plsql update_wp_presentation { *SQL* }
     if {$public_p == "t"} {
 	db_exec_plsql grant_public_read { *SQL* }
@@ -111,9 +111,9 @@
     set audience [ad_quotehtml $audience] 
     set background [ad_quotehtml $background]
     set title "[_ wp-slim.Edit_Presentation]"
-    set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "$pres_title"] "[_ wp-slim.Edit_Presentation]"]
+    set context [list [list "presentation-top?[export_vars -url {pres_item_id}]"  "$pres_title"] "[_ wp-slim.Edit_Presentation]"]
 } -after_submit {
-    ad_returnredirect "presentation-top?[export_url_vars pres_item_id]"
+    ad_returnredirect "presentation-top?[export_vars -url {pres_item_id}]"
     ad_script_abort
 }
 
Index: openacs-4/packages/wp-slim/www/add-edit-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/add-edit-slide.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/add-edit-slide.tcl	1 Mar 2005 00:01:46 -0000	1.2
+++ openacs-4/packages/wp-slim/www/add-edit-slide.tcl	12 Sep 2013 20:47:19 -0000	1.3
@@ -178,7 +178,7 @@
 }
 
 if { $edit_slide == 1} {
-    set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "[_ wp-slim.Edit_Slide]"]
+    set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$pres_title"] "[_ wp-slim.Edit_Slide]"]
     ad_form -extend -name f -form {
         {attach:text(radio)
 	    {label "<b>#wp-slim.Upload_Attachments#</b>"}
@@ -187,7 +187,7 @@
 	}
     }
 } else {
-    set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "[_ wp-slim.New_Slide]"]
+    set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$pres_title"] "[_ wp-slim.New_Slide]"]
     ad_form -extend -name f -form {
         {attach:text(hidden)
 	    {value "f"}
@@ -213,10 +213,10 @@
     #insert the slide
     db_exec_plsql wp_slide_insert { *SQL* }
     if { $attach == "t"} {
-    set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] [list "add-edit-slide?[export_url_vars slide_item_id pres_item_id edit_slide]" "[_ wp-slim.Edit_Slide]"] "$slide_title"]
-        ad_returnredirect attach-list?[export_url_vars pres_item_id slide_item_id]
+    set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$pres_title"] [list "add-edit-slide?[export_vars -url {slide_item_id pres_item_id edit_slide}]" "[_ wp-slim.Edit_Slide]"] "$slide_title"]
+        ad_returnredirect attach-list?[export_vars -url {pres_item_id slide_item_id}]
     } else {
-        ad_returnredirect presentation-top?[export_url_vars pres_item_id]
+        ad_returnredirect presentation-top?[export_vars -url {pres_item_id}]
     }
 } -edit_data {
   
@@ -232,10 +232,10 @@
     # update the slide in the db
     db_exec_plsql update_slide { *SQL* }
     if { $attach == "t"} {
-    set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] [list "add-edit-slide?[export_url_vars slide_item_id pres_item_id edit_slide]" "[_ wp-slim.Edit_Slide]"] "$slide_title"]
-        ad_returnredirect attach-list?[export_url_vars pres_item_id slide_item_id]
+    set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$pres_title"] [list "add-edit-slide?[export_vars -url {slide_item_id pres_item_id edit_slide}]" "[_ wp-slim.Edit_Slide]"] "$slide_title"]
+        ad_returnredirect attach-list?[export_vars -url {pres_item_id slide_item_id}]
     } else {
-        ad_returnredirect presentation-top?[export_url_vars pres_item_id]
+        ad_returnredirect presentation-top?[export_vars -url {pres_item_id}]
     }
 } -edit_request {
 
Index: openacs-4/packages/wp-slim/www/attach-del.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-del.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/attach-del.tcl	1 Mar 2005 00:01:46 -0000	1.7
+++ openacs-4/packages/wp-slim/www/attach-del.tcl	12 Sep 2013 20:47:19 -0000	1.8
@@ -24,4 +24,4 @@
     end;
 }
     
-ad_returnredirect "attach-list?[export_url_vars slide_item_id pres_item_id]"
+ad_returnredirect "attach-list?[export_vars -url {slide_item_id pres_item_id}]"
Index: openacs-4/packages/wp-slim/www/attach-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/attach-detail.tcl	1 Mar 2005 00:01:46 -0000	1.8
+++ openacs-4/packages/wp-slim/www/attach-detail.tcl	12 Sep 2013 20:47:19 -0000	1.9
@@ -35,7 +35,7 @@
 permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
 
 set edit-slide 1
-set context [list [list "add-edit-slide?[export_url_vars slide_item_id pres_item_id edit-slide]" "[_ wp-slim.Edit_Slide]"] "[_ wp-slim.Details]"]
+set context [list [list "add-edit-slide?[export_vars -url {slide_item_id pres_item_id edit-slide}]" "[_ wp-slim.Edit_Slide]"] "[_ wp-slim.Details]"]
 
 db_multirow revisions revisions_get {
     select r.revision_id,
@@ -65,6 +65,6 @@
 
 set ${display}_selected "selected"
 
-set return_url [ns_urlencode "attach-detail?[export_url_vars slide_item_id attach_item_id file_name]"]
+set return_url [ns_urlencode "attach-detail?[export_vars -url {slide_item_id attach_item_id file_name}]"]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/attach-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/attach-list.tcl	1 Mar 2005 00:01:46 -0000	1.7
+++ openacs-4/packages/wp-slim/www/attach-list.tcl	12 Sep 2013 20:47:19 -0000	1.8
@@ -29,7 +29,7 @@
     and   item_id = :slide_item_id
 }]
 set edit_slide 1
-set context [list [list "presentation-top?[export_url_vars pres_item_id ]" "[_ wp-slim.Edit_Slide]"] "[_ wp-slim.List_Attachments]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id }]" "[_ wp-slim.Edit_Slide]"] "[_ wp-slim.List_Attachments]"]
 
 db_multirow att attachments_get {
     select name, item_id
Index: openacs-4/packages/wp-slim/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/wp-slim/www/attach.tcl	1 Mar 2005 00:01:46 -0000	1.11
+++ openacs-4/packages/wp-slim/www/attach.tcl	12 Sep 2013 20:47:19 -0000	1.12
@@ -35,9 +35,9 @@
     incr exception_count
 }
 
-if { ![empty_string_p [ad_parameter MaxAttachmentSize "comments"]] && $tmp_size > [ad_parameter MaxAttachmentSize "comments"] } {
+if { ![empty_string_p [parameter::get -parameter MaxAttachmentSize -default "comments"]] && $tmp_size > [parameter::get -parameter MaxAttachmentSize -default "comments"] } {
     set system_name [ad_system_name]
-    set bytes [util_commify_number [ad_parameter MaxAttachmentSize "comments"]]
+    set bytes [util_commify_number [parameter::get -parameter MaxAttachmentSize -default "comments"]]
     append exception_text "<li>[_ wp-slim.lt_Your_file_is_too_larg]\n"
     incr exception_count
 }
@@ -69,4 +69,4 @@
 }
 
 set edit_slide 1
-ad_returnredirect add-edit-slide?[export_url_vars slide_item_id pres_item_id edit_slide]
+ad_returnredirect add-edit-slide?[export_vars -url {slide_item_id pres_item_id edit_slide}]
Index: openacs-4/packages/wp-slim/www/delete-presentation-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/delete-presentation-2.tcl	30 Mar 2007 09:37:53 -0000	1.8
+++ openacs-4/packages/wp-slim/www/delete-presentation-2.tcl	12 Sep 2013 20:47:19 -0000	1.9
@@ -12,7 +12,7 @@
     password:notnull
 }
 
-ad_require_permission $pres_item_id wp_delete_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_delete_presentation
 
 set user_id [ad_conn user_id]
 set username [db_string sel_authority_id "select username from cc_users where user_id = :user_id"]
Index: openacs-4/packages/wp-slim/www/delete-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/delete-presentation.tcl	21 Dec 2004 22:06:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/delete-presentation.tcl	12 Sep 2013 20:47:19 -0000	1.5
@@ -15,8 +15,8 @@
     pres_item_id
 }
 
-ad_require_permission $pres_item_id wp_delete_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_delete_presentation
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "[_ wp-slim.Delete_Presentation]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$title"] "[_ wp-slim.Delete_Presentation]"]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/delete-slide-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/delete-slide-2.tcl	1 Mar 2005 00:01:46 -0000	1.7
+++ openacs-4/packages/wp-slim/www/delete-slide-2.tcl	12 Sep 2013 20:47:19 -0000	1.8
@@ -23,4 +23,4 @@
     end;
 }
 
-ad_returnredirect presentation-top?[export_url_vars pres_item_id]
+ad_returnredirect presentation-top?[export_vars -url {pres_item_id}]
Index: openacs-4/packages/wp-slim/www/display-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/display-change.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/www/display-change.tcl	21 Dec 2004 22:06:47 -0000	1.6
+++ openacs-4/packages/wp-slim/www/display-change.tcl	12 Sep 2013 20:47:19 -0000	1.7
@@ -37,4 +37,4 @@
 }
 
 
-ad_returnredirect "attach-detail?[export_url_vars slide_item_id attach_item_id file_name]"
+ad_returnredirect "attach-detail?[export_vars -url {slide_item_id attach_item_id file_name}]"
Index: openacs-4/packages/wp-slim/www/invite-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/invite-2.tcl	1 Mar 2005 00:01:46 -0000	1.5
+++ openacs-4/packages/wp-slim/www/invite-2.tcl	12 Sep 2013 20:47:19 -0000	1.6
@@ -20,9 +20,9 @@
     role
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] [list "invite?[export_url_vars pres_item_id role title]" "[_ wp-slim.Invite_User]"] "[_ wp-slim.Email_Sent]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$title"] [list "presentation-acl?[export_vars -url {pres_item_id}]" "[_ wp-slim.Authorization]"] [list "invite?[export_vars -url {pres_item_id role title}]" "[_ wp-slim.Invite_User]"] "[_ wp-slim.Email_Sent]"]
 
 set user_id [ad_conn user_id]
 
Index: openacs-4/packages/wp-slim/www/invite.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/invite.tcl	21 Dec 2004 22:06:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/invite.tcl	12 Sep 2013 20:47:19 -0000	1.5
@@ -18,9 +18,9 @@
     encoded_title
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Invite_User]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$title"] [list "presentation-acl?[export_vars -url {pres_item_id}]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Invite_User]"]
 
 set encoded_title [ad_urlencode $title]
 ad_return_template
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl	21 Dec 2004 22:06:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl	12 Sep 2013 20:47:19 -0000	1.5
@@ -21,9 +21,9 @@
     role
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Confirm_Add_User]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$title"] [list "presentation-acl?[export_vars -url {pres_item_id}]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Confirm_Add_User]"]
 
 
 set privilege [ad_decode $role "read" "wp_view_presentation" "write" "wp_edit_presentation" "admin" "wp_admin_presentation" ""]
@@ -35,7 +35,7 @@
     and   grantee_id = :user_id_from_search
     and   privilege = :privilege
 }] {
-    set vars [export_url_vars pres_item_id]
+    set vars [export_vars -url {pres_item_id}]
     ad_return_error "[_ wp-slim.lt_User_Already_Had_That]" "[_ wp-slim.lt_That_user_can_already]"
     db_release_unused_handles
     return
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl	1 Mar 2005 00:01:46 -0000	1.5
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl	12 Sep 2013 20:47:19 -0000	1.6
@@ -18,7 +18,7 @@
     {email ""}
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
 if {![empty_string_p $email]} {
     set user_id [ad_conn user_id]
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl	21 Dec 2004 22:06:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl	12 Sep 2013 20:47:19 -0000	1.5
@@ -20,9 +20,9 @@
     groups:multirow
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Confirm_Add_Users]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$title"] [list "presentation-acl?[export_vars -url {pres_item_id}]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Confirm_Add_Users]"]
 
 db_multirow group users_get {
     select p.first_names,
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group-3.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group-3.tcl	21 Dec 2004 22:06:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-3.tcl	12 Sep 2013 20:47:19 -0000	1.5
@@ -13,7 +13,7 @@
     group_id:integer,notnull
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
 # adds a group of users
 db_foreach group_grant { *SQL } {
@@ -27,4 +27,4 @@
     db_exec_plsql permission_grant { *SQL }
 }
 
-ad_returnredirect presentation-acl?[export_url_vars pres_item_id]
+ad_returnredirect presentation-acl?[export_vars -url {pres_item_id}]
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl	21 Dec 2004 22:06:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl	12 Sep 2013 20:47:19 -0000	1.5
@@ -19,9 +19,9 @@
     groups:multirow
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Add_Group]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$title"] [list "presentation-acl?[export_vars -url {pres_item_id}]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Add_Group]"]
 
 db_multirow groups groups_get {
     select group_id, group_name
Index: openacs-4/packages/wp-slim/www/presentation-acl-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/presentation-acl-add.tcl	21 Dec 2004 22:06:47 -0000	1.5
+++ openacs-4/packages/wp-slim/www/presentation-acl-add.tcl	12 Sep 2013 20:47:20 -0000	1.6
@@ -18,14 +18,14 @@
     encoded_title
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Add_User]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$title"] [list "presentation-acl?[export_vars -url {pres_item_id}]" "[_ wp-slim.Authorization]"] "[_ wp-slim.Add_User]"]
 
 set encoded_title [ns_urlencode $title]
 
 set target "[ad_conn package_url]/presentation-acl-add-2"
 set passthrough [list pres_item_id role title]
-set params [export_form_vars pres_item_id role title target passthrough]
+set params [export_vars -form {pres_item_id role title target passthrough}]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/presentation-acl-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-acl-delete.tcl	21 Dec 2004 22:06:47 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-acl-delete.tcl	12 Sep 2013 20:47:20 -0000	1.3
@@ -13,7 +13,7 @@
     user_id:naturalnum,notnull
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
 set privilege [ad_decode $role "read" "wp_view_presentation" "write" "wp_edit_presentation" "admin" "wp_admin_presentation" ""]
 
@@ -31,4 +31,4 @@
     end;
 }
 
-ad_returnredirect presentation-acl?[export_url_vars pres_item_id]
\ No newline at end of file
+ad_returnredirect presentation-acl?[export_vars -url {pres_item_id}]
\ No newline at end of file
Index: openacs-4/packages/wp-slim/www/presentation-acl.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/www/presentation-acl.tcl	1 Mar 2005 00:01:46 -0000	1.6
+++ openacs-4/packages/wp-slim/www/presentation-acl.tcl	12 Sep 2013 20:47:20 -0000	1.7
@@ -34,7 +34,7 @@
 
 set encoded_title [ns_urlencode $title]
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "[_ wp-slim.Authorization]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$title"] "[_ wp-slim.Authorization]"]
 
 
 
Index: openacs-4/packages/wp-slim/www/presentation-public.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-public.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-public.tcl	21 Dec 2004 22:06:47 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-public.tcl	12 Sep 2013 20:47:20 -0000	1.3
@@ -12,7 +12,7 @@
     public_p:notnull
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
 
 if {[regexp {t} $public_p]} {
     db_exec_plsql grant_public_read {
@@ -36,4 +36,4 @@
                              where item_id = :pres_item_id)
 }
 
-ad_returnredirect presentation-acl?[export_url_vars pres_item_id]
\ No newline at end of file
+ad_returnredirect presentation-acl?[export_vars -url {pres_item_id}]
\ No newline at end of file
Index: openacs-4/packages/wp-slim/www/presentation-revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/presentation-revisions.tcl	1 Mar 2005 00:01:46 -0000	1.8
+++ openacs-4/packages/wp-slim/www/presentation-revisions.tcl	12 Sep 2013 20:47:20 -0000	1.9
@@ -39,8 +39,8 @@
     set creation_date [lc_time_fmt $creation_date "%X %Q"]
 }
 db_1row get_presentation {}
-set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "$pres_title"] "[_ wp-slim.All_Revisions]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]"  "$pres_title"] "[_ wp-slim.All_Revisions]"]
 
-set return_url [ns_urlencode "presentation-revisions?[export_url_vars pres_item_id]"]
+set return_url [ns_urlencode "presentation-revisions?[export_vars -url {pres_item_id}]"]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/search.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/search.tcl	21 Dec 2004 22:06:47 -0000	1.3
+++ openacs-4/packages/wp-slim/www/search.tcl	12 Sep 2013 20:47:20 -0000	1.4
@@ -128,7 +128,7 @@
     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
 }
 
Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl	1 Mar 2005 00:01:46 -0000	1.8
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl	12 Sep 2013 20:47:20 -0000	1.9
@@ -57,6 +57,6 @@
     and r.revision_id = pb.id
 }   
 
-set context [list [list "$subsite_name/presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "[_ wp-slim.One_Revision]"]
+set context [list [list "$subsite_name/presentation-top?[export_vars -url {pres_item_id}]" "$pres_title"] "[_ wp-slim.One_Revision]"]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/serve-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/wp-slim/www/serve-slide.tcl	1 Mar 2005 00:01:47 -0000	1.10
+++ openacs-4/packages/wp-slim/www/serve-slide.tcl	12 Sep 2013 20:47:20 -0000	1.11
@@ -122,10 +122,10 @@
 set edit_slide 1
 set extra ""
 if {$edit_p == 1} {
-    append extra "<a href=\"$subsite_name/add-edit-slide?[export_url_vars slide_item_id pres_item_id edit_slide]\">[_ wp-slim.edit]</a> | "
+    append extra "<a href=\"$subsite_name/add-edit-slide?[export_vars -url {slide_item_id pres_item_id edit_slide}]\">[_ wp-slim.edit]</a> | "
 }
 if {$delete_p == 1} {
-    append extra "<a href=\"$subsite_name/delete-slide?[export_url_vars slide_item_id pres_item_id slide_title]\">[_ wp-slim.delete]</a> |"
+    append extra "<a href=\"$subsite_name/delete-slide?[export_vars -url {slide_item_id pres_item_id slide_title}]\">[_ wp-slim.delete]</a> |"
 }
 
 set href_back_forward "$href_back $extra $href_forward"
Index: openacs-4/packages/wp-slim/www/slide-revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/wp-slim/www/slide-revisions.tcl	1 Mar 2005 00:01:47 -0000	1.7
+++ openacs-4/packages/wp-slim/www/slide-revisions.tcl	12 Sep 2013 20:47:20 -0000	1.8
@@ -23,7 +23,7 @@
 
 set subsite_name [ad_conn package_url]
 
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "[_ wp-slim.Presentation]"] "[_ wp-slim.Slide_Revisions]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "[_ wp-slim.Presentation]"] "[_ wp-slim.Slide_Revisions]"]
 
 
 db_multirow revisions revisions_get {
@@ -45,6 +45,6 @@
     set creation_date [lc_time_fmt $creation_date "%X %Q"]
 }
 
-set return_url [ns_urlencode "slide-revisions?[export_url_vars slide_item_id pres_item_id]"]
+set return_url [ns_urlencode "slide-revisions?[export_vars -url {slide_item_id pres_item_id}]"]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/slides-reorder-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/www/slides-reorder-2.tcl	1 Mar 2005 00:01:47 -0000	1.6
+++ openacs-4/packages/wp-slim/www/slides-reorder-2.tcl	12 Sep 2013 20:47:20 -0000	1.7
@@ -30,4 +30,4 @@
 
 db_release_unused_handles
 
-ad_returnredirect "presentation-top?[export_url_vars pres_item_id]"
+ad_returnredirect "presentation-top?[export_vars -url {pres_item_id}]"
Index: openacs-4/packages/wp-slim/www/slides-reorder.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/wp-slim/www/slides-reorder.tcl	1 Mar 2005 00:01:47 -0000	1.9
+++ openacs-4/packages/wp-slim/www/slides-reorder.tcl	12 Sep 2013 20:47:20 -0000	1.10
@@ -21,7 +21,7 @@
 set header [ad_header "[_ wp-slim.Reorder_Slides]"]
 
 db_1row get_presentation {}
-set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "[_ wp-slim.Reorder_Slides]"]
+set context [list [list "presentation-top?[export_vars -url {pres_item_id}]" "$pres_title"] "[_ wp-slim.Reorder_Slides]"]
 
 set counter 0
 
Index: openacs-4/packages/wp-slim/www/style-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-delete.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/style-delete.tcl	1 Mar 2005 00:01:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/style-delete.tcl	12 Sep 2013 20:47:20 -0000	1.5
@@ -31,6 +31,6 @@
 }
 
 
-set form_vars [export_form_vars style_id]
+set form_vars [export_vars -form {style_id}]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/style-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-edit-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/style-edit-2.tcl	1 Mar 2005 00:01:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/style-edit-2.tcl	12 Sep 2013 20:47:20 -0000	1.5
@@ -82,4 +82,4 @@
 
 db_release_unused_handles
 
-ad_returnredirect "style-view?[export_url_vars style_id presentation_id]"
+ad_returnredirect "style-view?[export_vars -url {style_id presentation_id}]"
Index: openacs-4/packages/wp-slim/www/style-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/style-edit.tcl	1 Mar 2005 00:01:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/style-edit.tcl	12 Sep 2013 20:47:20 -0000	1.5
@@ -77,7 +77,7 @@
 
 set context "[list [list "style-list.tcl" "Your Styles"] $header "[_ wp-slim.role_Style]"]"
 
-set export_form_vars [export_form_vars style_id presentation_id]
+set export_form_vars [export_vars -form {style_id presentation_id}]
 set ad_color_widget_js [ad_color_widget_js]
 set random_range_1 [lindex $colors [randomRange [llength $colors]]]
 set random_range_2 [lindex $colors [randomRange [llength $colors]]]
Index: openacs-4/packages/wp-slim/www/style-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-view.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/style-view.tcl	1 Mar 2005 00:01:47 -0000	1.4
+++ openacs-4/packages/wp-slim/www/style-view.tcl	12 Sep 2013 20:47:20 -0000	1.5
@@ -17,7 +17,7 @@
 
 db_1row style_select { *SQL* }
 
-set url_vars "[export_url_vars style_id presentation_id]"
+set url_vars "[export_vars -url {style_id presentation_id}]"
 
 if { $background_color == "" } {
     set bgcolor_str ""
@@ -50,7 +50,7 @@
 
 set context [list $last_link "[_ wp-slim.One_Style]"]
 
-set export_form_vars "[export_form_vars style_id presentation_id]"
+set export_form_vars "[export_vars -form {style_id presentation_id}]"
 
 db_multirow style_images style_image_select { *SQL* } {