Index: openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	29 Jun 2004 10:17:48 -0000	1.5
+++ openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	9 Sep 2013 12:19:56 -0000	1.6
@@ -194,7 +194,7 @@
     set title ""
     regexp -nocase {<title>([^<]*)</title>} $html_code match title
 
-    if {[string length $title]> [ad_parameter URLTitleMaxLength] || [string length $title] > 499 } {
+    if {[string length $title]> [parameter::get -parameter URLTitleMaxLength] || [string length $title] > 499 } {
 	set title "[string range $title 0 496]..."
     }
 
@@ -208,7 +208,7 @@
     set description ""
     regexp -nocase {<meta name="description" content="([^"]*)"} $html_code match description
 
-    if {[string length $description]> [ad_parameter URLDescriptionMaxLength] || [string length $description] > 3999 } {
+    if {[string length $description]> [parameter::get -parameter URLDescriptionMaxLength] || [string length $description] > 3999 } {
 	set description "[string range $description 0 3996]..."
     }
 
@@ -221,7 +221,7 @@
     set keywords ""
     regexp -nocase {<meta name="keywords" content="([^"]*)">} $html_code match keywords
 
-    if {[string length $keywords]> [ad_parameter URLKeywordsMaxLength] || [string length $keywords] > 3999 } {
+    if {[string length $keywords]> [parameter::get -parameter URLKeywordsMaxLength] || [string length $keywords] > 3999 } {
 	set keywords "[string range $keywords 0 3996]..."
     }
 
Index: openacs-4/packages/bookmarks/www/bookmark-add-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	29 Jun 2004 10:17:48 -0000	1.7
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	9 Sep 2013 12:19:56 -0000	1.8
@@ -66,7 +66,7 @@
     ad_script_abort
 }
 
-set full_bookmark_add_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL][ad_conn package_url]bookmark-add-import"
+set full_bookmark_add_url "[parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL][ad_conn package_url]bookmark-add-import"
 
 set bookmarklet "javascript:location.href='${full_bookmark_add_url}?return_url='+escape(location.href)+'&local_title='+escape(document.title)+'&complete_url='+escape(location.href)"
 
Index: openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl	29 Jun 2004 10:17:48 -0000	1.5
+++ openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl	9 Sep 2013 12:19:56 -0000	1.6
@@ -30,7 +30,7 @@
 
 set user_id [ad_conn user_id]
 
-ad_require_permission $parent_id write
+permission::require_permission -object_id $parent_id -privilege write
 
 # split the url to get the host_url
 set host_url [bm_host_url $complete_url]
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	27 Feb 2004 16:51:04 -0000	1.6
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	9 Sep 2013 12:19:56 -0000	1.7
@@ -122,7 +122,7 @@
 set meta_description [bm_get_html_description $url_content]
 set meta_keywords [bm_get_html_keywords $url_content]
 
-set export_form_vars_html [export_form_vars return_url local_title complete_url bookmark_id viewed_user_id meta_description meta_keywords url_title parent_id]
+set export_form_vars_html [export_vars -form return_url local_title complete_url bookmark_id viewed_user_id meta_description meta_keywords url_title parent_id]
 
 # If the user provided a title and the url is reachable we do not
 # ask for a confirmation
Index: openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl	10 Sep 2002 22:22:26 -0000	1.3
+++ openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl	9 Sep 2013 12:19:56 -0000	1.4
@@ -39,7 +39,7 @@
 }
 
 
-ad_require_permission $bookmark_id admin
+permission::require_permission -object_id $bookmark_id -privilege admin
 
 # We update or insert the url
 if { [string equal $folder_p "f"] } {
Index: openacs-4/packages/bookmarks/www/bookmark-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/bookmark-edit.tcl	29 Jun 2004 10:17:48 -0000	1.6
+++ openacs-4/packages/bookmarks/www/bookmark-edit.tcl	9 Sep 2013 12:19:56 -0000	1.7
@@ -93,7 +93,7 @@
         and    bm_bookmarks.url_id = bm_urls.url_id(+)"
 
 
-set export_form_vars [export_form_vars viewed_user_id folder_p old_private_p return_url]
+set export_form_vars [export_vars -form viewed_user_id folder_p old_private_p return_url]
 
 set return_url_urlenc [ad_urlencode $return_url]
 
Index: openacs-4/packages/bookmarks/www/bookmark-header.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-header.tcl	29 Jun 2004 10:17:48 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-header.tcl	9 Sep 2013 12:19:56 -0000	1.3
@@ -61,8 +61,8 @@
     set root_folder_id 0
 }
 
-set root_admin_p [ad_permission_p $root_folder_id admin]
-set bookmarks_admin_p [ad_permission_p $package_id admin]
+set root_admin_p [permission::permission_p -object_id $root_folder_id -privilege admin]
+set bookmarks_admin_p [permission::permission_p -object_id $package_id -privilege admin]
 set write_p [bm_user_can_write_in_some_folder_p $viewed_user_id]
 set tree_url [export_vars -base tree { viewed_user_id write_p user_name }]
 
Index: openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl	10 Sep 2002 22:22:26 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl	9 Sep 2013 12:19:56 -0000	1.3
@@ -21,7 +21,7 @@
     reset_all_individual_p:optional
 } 
 
-ad_require_permission $root_folder_id admin
+permission::require_permission -object_id $root_folder_id -privilege admin
 
 bm_update_bookmark_private_p $root_folder_id $private_p
 
Index: openacs-4/packages/bookmarks/www/bookmark-permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/bookmark-permissions.tcl	29 Jun 2004 10:17:48 -0000	1.5
+++ openacs-4/packages/bookmarks/www/bookmark-permissions.tcl	9 Sep 2013 12:19:57 -0000	1.6
@@ -26,7 +26,7 @@
 
 set old_private_p [bm_bookmark_private_p $root_folder_id]
 
-ad_require_permission $root_folder_id admin
+permission::require_permission -object_id $root_folder_id -privilege admin
 
 set page_title "Manage Permissions on all Bookmarks"
 
Index: openacs-4/packages/bookmarks/www/bookmark-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-view.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmark-view.tcl	10 Sep 2002 22:22:26 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmark-view.tcl	9 Sep 2013 12:19:57 -0000	1.5
@@ -24,7 +24,7 @@
 
 set context [list $page_title]
 
-ad_require_permission $bookmark_id read
+permission::require_permission -object_id $bookmark_id -privilege read
 
 
 template::query bookmark_view bookmark onerow "select local_title,
Index: openacs-4/packages/bookmarks/www/bookmarks-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/bookmarks-check.tcl	29 Jun 2004 10:17:48 -0000	1.6
+++ openacs-4/packages/bookmarks/www/bookmarks-check.tcl	9 Sep 2013 12:19:57 -0000	1.7
@@ -33,7 +33,7 @@
 
 if { [empty_string_p $viewed_user_id] } {
     # Only admins can call this page for all users
-    ad_require_permission $package_id admin
+    permission::require_permission -object_id $package_id -privilege admin
 
     set root_folder_id $package_id
 } else {
Index: openacs-4/packages/bookmarks/www/bookmarks-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bookmarks/www/bookmarks-import.tcl	29 Jun 2004 10:17:48 -0000	1.8
+++ openacs-4/packages/bookmarks/www/bookmarks-import.tcl	9 Sep 2013 12:19:57 -0000	1.9
@@ -37,7 +37,7 @@
 } -return_errors error_list
 
 # Read the file and check its size
-if [catch { set contents [read [open ${upload_file.tmpfile} r] [ad_parameter MaxNumberOfBytes bm 1000000]] } errmsg] {
+if [catch { set contents [read [open ${upload_file.tmpfile} r] [parameter::get -parameter MaxNumberOfBytes -default 1000000]] } errmsg] {
     lappend error_list "We had a problem processing your request:
 	    <p>$errmsg"
 }
Index: openacs-4/packages/bookmarks/www/delete-dead-links.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/delete-dead-links.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/delete-dead-links.tcl	30 Sep 2003 12:10:04 -0000	1.3
+++ openacs-4/packages/bookmarks/www/delete-dead-links.tcl	9 Sep 2013 12:19:57 -0000	1.4
@@ -29,7 +29,7 @@
 
 if { [empty_string_p $viewed_user_id] } {
     # Only admins can call this page for all users
-    ad_require_permission $package_id admin
+    permission::require_permission -object_id $package_id -privilege admin
     set root_folder_id $package_id
    
 } else {
@@ -66,7 +66,7 @@
     }
 
     if { [empty_string_p $viewed_user_id] } {
-	ad_require_permission $package_id admin
+	permission::require_permission -object_id $package_id -privilege admin
 
 	# Delete the url it self
 	if [catch {db_exec_plsql delete_dead_link "
Index: openacs-4/packages/bookmarks/www/folder-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/folder-add-2.tcl	10 Sep 2002 22:22:26 -0000	1.2
+++ openacs-4/packages/bookmarks/www/folder-add-2.tcl	9 Sep 2013 12:19:57 -0000	1.3
@@ -26,7 +26,7 @@
 set creation_ip [ad_conn peeraddr]
 set user_id [ad_conn user_id]
 
-ad_require_permission $parent_id write
+permission::require_permission -object_id $parent_id -privilege write
 
 set folder_p "t"
 set closed_p "f"
Index: openacs-4/packages/bookmarks/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bookmarks/www/index.tcl	29 Jun 2004 10:17:48 -0000	1.8
+++ openacs-4/packages/bookmarks/www/index.tcl	9 Sep 2013 12:19:57 -0000	1.9
@@ -81,8 +81,8 @@
 }
 
 
-set root_admin_p [ad_permission_p $root_folder_id admin]
-set bookmarks_admin_p [ad_permission_p $package_id admin]
+set root_admin_p [permission::permission_p -object_id $root_folder_id -privilege admin]
+set bookmarks_admin_p [permission::permission_p -object_id $package_id -privilege admin]
 set write_p [bm_user_can_write_in_some_folder_p $viewed_user_id]
 
 
Index: openacs-4/packages/bookmarks/www/most-popular.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/most-popular.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/most-popular.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/most-popular.tcl	9 Sep 2013 12:19:57 -0000	1.2
@@ -4,7 +4,7 @@
 # by pmarklun@arsdigita.com
 
 
-set maxrows [ad_parameter MostPopularHostsAndURLsMaxN]
+set maxrows [parameter::get -parameter MostPopularHostsAndURLsMaxN]
 
 multirow create popular_hosts n_bookmarks host_url host_name
 multirow create popular_urls n_bookmarks complete_url local_title
Index: openacs-4/packages/bookmarks/www/permissions-reset-all-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/permissions-reset-all-2.tcl	10 Sep 2002 22:22:26 -0000	1.2
+++ openacs-4/packages/bookmarks/www/permissions-reset-all-2.tcl	9 Sep 2013 12:19:57 -0000	1.3
@@ -17,7 +17,7 @@
     viewed_user_id:integer
 } 
 
-ad_require_permission $root_folder_id admin
+permission::require_permission -object_id $root_folder_id -privilege admin
 
 set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
Index: openacs-4/packages/bookmarks/www/permissions-reset-all.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/permissions-reset-all.tcl	10 Sep 2002 22:22:26 -0000	1.3
+++ openacs-4/packages/bookmarks/www/permissions-reset-all.tcl	9 Sep 2013 12:19:57 -0000	1.4
@@ -25,7 +25,7 @@
     viewed_user_id:onevalue
 }
 
-ad_require_permission $root_folder_id admin
+permission::require_permission -object_id $root_folder_id -privilege admin
 
 set page_title "Removal of Access Permission Settings"
 
Index: openacs-4/packages/bookmarks/www/top-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/top-frame.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/top-frame.tcl	29 Jun 2004 10:17:48 -0000	1.4
+++ openacs-4/packages/bookmarks/www/top-frame.tcl	9 Sep 2013 12:19:57 -0000	1.5
@@ -29,7 +29,7 @@
 <body>
 <center><table width=100%cellpadding=0 border=0 cellspacing=0><tr><td>
 <form target=target_frame action=search><table width=100% cellpadding=1 border=0 bgcolor=#f3f3f3>
-[export_form_vars viewed_user_id]
+[export_vars -form viewed_user_id]
 <tr>
 [ad_decode $write_p "t" "<td bgcolor=#cccccc align=center valign=middle><font size=-1 face=arial, helvetica><b><a target=main href=bookmark-add-import?viewed_user_id=$viewed_user_id&return_url=$return_url>Add/Import</a></td>" ""]
 [ad_decode $browsing_user_id $viewed_user_id "<td bgcolor=#cccccc align=center valign=middle><font size=-1 face=arial, helvetica><b><a target=new href=bookmarks-export?viewed_user_id=$viewed_user_id>Export</a></td>" ""]
Index: openacs-4/packages/bookmarks/www/tree-dynamic.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/tree-dynamic.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/tree-dynamic.tcl	1 Mar 2005 00:01:26 -0000	1.6
+++ openacs-4/packages/bookmarks/www/tree-dynamic.tcl	9 Sep 2013 12:19:57 -0000	1.7
@@ -26,9 +26,9 @@
 # will not try to cache this page.
 
 # get generic display parameters from the .ini file
-set folder_decoration [ad_parameter FolderDecoration bm]
-set hidden_decoration [ad_parameter HiddenDecoration bm]
-set dead_decoration   [ad_parameter DeadDecoration   bm]
+set folder_decoration [parameter::get -parameter FolderDecoration -default bm]
+set hidden_decoration [parameter::get -parameter HiddenDecoration -default bm]
+set dead_decoration   [parameter::get -parameter DeadDecoration -default bm]
 
 set name [db_string name_query "
 select first_names||' '||last_name as name