Index: openacs-4/packages/directory/tcl/directory-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/directory/tcl/directory-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/directory/tcl/directory-procs.tcl	27 Oct 2001 00:11:04 -0000	1.3
+++ openacs-4/packages/directory/tcl/directory-procs.tcl	12 Sep 2013 20:25:19 -0000	1.4
@@ -11,7 +11,7 @@
     -top:boolean
     {navbar_list_list ""}
 } {
-    set subsite_home [site_node_closest_ancestor_package_url -package_key "acs-subsite"]
+    set subsite_home [lindex [site_node::get_url_from_object_id -object_id [site_node::closest_ancestor_package -include_self -package_key "acs-subsite"]] 0]
 
     set package_home [ad_conn package_url]
 
Index: openacs-4/packages/directory/templates/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/directory/templates/master.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/directory/templates/master.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/directory/templates/master.tcl	12 Sep 2013 20:25:20 -0000	1.2
@@ -1 +1 @@
-set page_width [ad_parameter PageWidth]
+set page_width [parameter::get -parameter PageWidth]
Index: openacs-4/packages/directory/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/directory/www/index.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/directory/www/index.tcl	26 Mar 2004 12:05:33 -0000	1.6
+++ openacs-4/packages/directory/www/index.tcl	12 Sep 2013 20:25:20 -0000	1.7
@@ -44,9 +44,9 @@
 set search_vars [export_ns_set_vars form [list search start_row letter]]
 set browse_vars [export_ns_set_vars url [list search start_row]]
 
-set page_width      [ad_parameter PageWidth]
+set page_width      [parameter::get -parameter PageWidth]
 set navbar_list     [dir_navbar_list]
-set master_template [ad_parameter MasterTemplate]
+set master_template [parameter::get -parameter MasterTemplate]
 
 # if they want to see all users, select from dir_all_users
 # and use a dummy where clause
Index: openacs-4/packages/faq/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/faq/www/index.tcl	15 May 2007 20:14:35 -0000	1.8
+++ openacs-4/packages/faq/www/index.tcl	12 Sep 2013 20:29:36 -0000	1.9
@@ -23,7 +23,7 @@
 
 set user_id [ad_conn user_id]
  
-ad_require_permission $package_id faq_view_faq
+permission::require_permission -object_id $package_id -privilege faq_view_faq
 
 set admin_p 0
 
@@ -35,7 +35,7 @@
                         -url [ad_conn url] \
                         ]
 
-if {[ad_permission_p -user_id $user_id $package_id faq_admin_faq]} {
+if {[permission::permission_p -party_id $user_id -object_id $package_id -privilege faq_admin_faq]} {
     set admin_p 1
 }
 
Index: openacs-4/packages/faq/www/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/faq/www/one-faq.tcl	15 May 2007 20:14:35 -0000	1.8
+++ openacs-4/packages/faq/www/one-faq.tcl	12 Sep 2013 20:29:36 -0000	1.9
@@ -17,7 +17,7 @@
 
 set user_id [ad_conn user_id]
 
-ad_require_permission $package_id faq_view_faq
+permission::require_permission -object_id $package_id -privilege faq_view_faq
 
 faq::get_instance_info -arrayname faq_info -faq_id $faq_id
 
Index: openacs-4/packages/faq/www/one-question.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-question.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/faq/www/one-question.tcl	15 May 2007 20:14:35 -0000	1.5
+++ openacs-4/packages/faq/www/one-question.tcl	12 Sep 2013 20:29:36 -0000	1.6
@@ -14,7 +14,7 @@
 
 set package_id [ad_conn package_id]
 
-ad_require_permission $package_id faq_view_faq
+permission::require_permission -object_id $package_id -privilege faq_view_faq
 
 set user_id [ad_conn user_id]
 
Index: openacs-4/packages/faq/www/admin/faq-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-edit-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/faq-edit-2.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/faq-edit-2.tcl	12 Sep 2013 20:29:36 -0000	1.2
@@ -12,7 +12,7 @@
     separate_p:
 } 
 
-ad_require_permission [ad_conn package_id] faq_modify_faq
+permission::require_permission -object_id [ad_conn package_id] -privilege faq_modify_faq
 
 db_dml faq_edit "update faqs 
                   set faq_name = :faq_name,
Index: openacs-4/packages/faq/www/admin/faq-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/faq-edit.tcl	10 Nov 2003 15:08:05 -0000	1.4
+++ openacs-4/packages/faq/www/admin/faq-edit.tcl	12 Sep 2013 20:29:36 -0000	1.5
@@ -17,7 +17,7 @@
 }
 
 
-ad_require_permission [ad_conn package_id] faq_modify_faq
+permission::require_permission -object_id [ad_conn package_id] -privilege faq_modify_faq
 
 set context [list [_ faq.Edit_an_FAQ]]
 set title [_ faq.Edit_an_FAQ]
Index: openacs-4/packages/faq/www/admin/faq-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/faq-new-2.tcl	1 Mar 2005 00:01:36 -0000	1.2
+++ openacs-4/packages/faq/www/admin/faq-new-2.tcl	12 Sep 2013 20:29:36 -0000	1.3
@@ -20,7 +20,7 @@
 set user_id [ad_conn user_id]
 set creation_ip [ad_conn host]
 
-ad_require_permission $package_id faq_create_faq
+permission::require_permission -object_id $package_id -privilege faq_create_faq
 
 db_transaction {
     db_exec_plsql create_faq {
Index: openacs-4/packages/faq/www/admin/faq-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/faq-new.tcl	23 Jan 2005 23:44:51 -0000	1.4
+++ openacs-4/packages/faq/www/admin/faq-new.tcl	12 Sep 2013 20:29:36 -0000	1.5
@@ -18,7 +18,7 @@
   
 }
 
-ad_require_permission [ad_conn package_id] faq_create_faq
+permission::require_permission -object_id [ad_conn package_id] -privilege faq_create_faq
 
 set context [list [_ faq.Create_an_FAQ]]
 set title [_ faq.Create_an_FAQ]
Index: openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-edit-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl	17 Sep 2002 21:41:48 -0000	1.2
+++ openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl	12 Sep 2013 20:29:36 -0000	1.3
@@ -13,7 +13,7 @@
     
 } 
 
-ad_require_permission [ad_conn package_id] faq_modify_faq
+permission::require_permission -object_id [ad_conn package_id] -privilege faq_modify_faq
 # Don't forget to do the permissioning
 
 db_dml q_and_a_edit "update faq_q_and_as
Index: openacs-4/packages/faq/www/admin/q_and_a-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/faq/www/admin/q_and_a-edit.tcl	1 Mar 2005 00:01:36 -0000	1.5
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.tcl	12 Sep 2013 20:29:36 -0000	1.6
@@ -16,7 +16,7 @@
 
 set package_id [ad_conn package_id]
 
-ad_require_permission $package_id faq_modify_faq
+permission::require_permission -object_id $package_id -privilege faq_modify_faq
 
 set action "q_and_a-edit-2"
 set submit_label [_ faq.Update_This_QA]
Index: openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl	1 Mar 2005 00:01:36 -0000	1.4
+++ openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl	12 Sep 2013 20:29:36 -0000	1.5
@@ -18,7 +18,7 @@
 
 set package_id [ad_conn package_id]
 
-ad_require_permission $package_id faq_create_faq
+permission::require_permission -object_id $package_id -privilege faq_create_faq
 
 set user_id [ad_conn user_id]
 set creation_ip [ad_conn host]
@@ -74,4 +74,4 @@
     }
 }
 
-ad_returnredirect "one-faq?[export_url_vars faq_id]"
+ad_returnredirect "one-faq?[export_vars -url {faq_id}]"
Index: openacs-4/packages/faq/www/admin/q_and_a-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/faq/www/admin/q_and_a-new.tcl	12 Mar 2004 13:45:34 -0000	1.7
+++ openacs-4/packages/faq/www/admin/q_and_a-new.tcl	12 Sep 2013 20:29:36 -0000	1.8
@@ -24,7 +24,7 @@
     answer_q:onevalue
 }
 
-ad_require_permission [ad_conn package_id] faq_create_faq
+permission::require_permission -object_id [ad_conn package_id] -privilege faq_create_faq
 
 db_1row get_name "select faq_name from faqs where faq_id=:faq_id"
 
Index: openacs-4/packages/faq/www/admin/swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/swap.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/swap.tcl	28 Nov 2003 16:55:15 -0000	1.2
+++ openacs-4/packages/faq/www/admin/swap.tcl	12 Sep 2013 20:29:36 -0000	1.3
@@ -51,5 +51,5 @@
 
 db_release_unused_handles
 
-ad_returnredirect "one-faq?[export_url_vars faq_id]" 
+ad_returnredirect "one-faq?[export_vars -url {faq_id}]"