Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -N -r1.189 -r1.190
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	12 Jan 2010 17:50:08 -0000	1.189
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	29 Sep 2013 13:59:55 -0000	1.190
@@ -179,7 +179,7 @@
 
     # get the default theme name from param, if no theme given
     if {[empty_string_p $theme_name]} {
-        set theme_name [ad_parameter -package_id [get_package_id] default_theme_name]
+        set theme_name [parameter::get -package_id [get_package_id] -parameter default_theme_name]
     }
 
     set theme_id [get_theme_id_from_name -theme_name $theme_name]
@@ -251,10 +251,10 @@
     @return Fully rendered portal as an html string
     @param portal_id
 } {
-    ad_require_permission $portal_id portal_read_portal
-    set edit_p [ad_permission_p $portal_id portal_edit_portal]
+    permission::require_permission -object_id $portal_id -privilege portal_read_portal
+    set edit_p [permission::permission_p -object_id $portal_id -privilege portal_edit_portal]
 
-    set master_template [ad_parameter master_template]
+    set master_template [parameter::get -parameter master_template]
 
     # if no page_num set, render page 0
     if {[empty_string_p $page_id] && [empty_string_p $page_num]} {
@@ -349,8 +349,8 @@
     @param new_name
 } {
 
-    ad_require_permission $portal_id portal_read_portal
-    ad_require_permission $portal_id portal_edit_portal
+    permission::require_permission -object_id $portal_id -privilege portal_read_portal
+    permission::require_permission -object_id $portal_id -privilege portal_edit_portal
 
     db_dml update {}
 }
@@ -380,15 +380,15 @@
                     -privilege portal_edit_portal]
 
     if {!$edit_p} {
-        ad_require_permission $portal_id portal_admin_portal
+        permission::require_permission -object_id $portal_id -privilege portal_admin_portal
         set edit_p 1
     }
 
     #
     # Set up some whole page stuff
     #
 
-    set master_template [ad_parameter master_template]
+    set master_template [parameter::get -parameter master_template]
     set action_string [generate_action_string]
 
     if { $template_p == "f" } {
@@ -743,7 +743,7 @@
         ]
 
     if {!$edit_p} {
-        ad_require_permission $portal_id portal_admin_portal
+        permission::require_permission -object_id $portal_id -privilege portal_admin_portal
         set edit_p 1
     }
 
@@ -1343,8 +1343,8 @@
     @param dir either up or down
 } {
 
-    ad_require_permission $portal_id portal_read_portal
-    ad_require_permission $portal_id portal_edit_portal
+    permission::require_permission -object_id $portal_id -privilege portal_read_portal
+    permission::require_permission -object_id $portal_id -privilege portal_edit_portal
 
     # get this element's sk
     db_1row get_my_sort_key_and_page_id {}
@@ -1396,8 +1396,8 @@
     @param direction up or down
 } {
 
-    ad_require_permission $portal_id portal_read_portal
-    ad_require_permission $portal_id portal_edit_portal
+    permission::require_permission -object_id $portal_id -privilege portal_read_portal
+    permission::require_permission -object_id $portal_id -privilege portal_edit_portal
 
     if { $direction == "right" } {
         set target_region [expr $region + 1]
@@ -1818,8 +1818,8 @@
     if { [db_0or1row select {}] } {
         # passed in element_id is good, do they have perms?
         if {[empty_string_p $noconn]} {
-            ad_require_permission $portal_id portal_read_portal
-            ad_require_permission $portal_id portal_edit_portal
+            permission::require_permission -object_id $portal_id -privilege portal_read_portal
+            permission::require_permission -object_id $portal_id -privilege portal_edit_portal
         }
     } else {
         ad_returnredirect $return_url
@@ -1840,7 +1840,7 @@
             }
 
             # Set up some template vars, including the form target
-            set master_template [ad_parameter master_template]
+            set master_template [parameter::get -parameter master_template]
             set action_string [generate_action_string]
 
             # the <include> sources /www/place-element.tcl
@@ -1965,7 +1965,7 @@
     @param portal_id
     @param ds_id
 } {
-    # ad_require_permission $portal_id portal_admin_portal
+    # permission::require_permission -object_id $portal_id -privilege portal_admin_portal
     db_dml delete {}
 }
 
@@ -1975,7 +1975,7 @@
     @param portal_id
     @param ds_id
 } {
-    ad_require_permission $portal_id portal_admin_portal
+    permission::require_permission -object_id $portal_id -privilege portal_admin_portal
 
     if { [db_0or1row select {}] } {
         [make_datasource_unavailable $portal_id $ds_id]
Index: openacs-4/packages/new-portal/www/render-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render-element.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/new-portal/www/render-element.tcl	9 Aug 2002 20:56:29 -0000	1.14
+++ openacs-4/packages/new-portal/www/render-element.tcl	29 Sep 2013 13:59:55 -0000	1.15
@@ -29,7 +29,7 @@
 # get the complete, evaluated element.
 # if there's an error, report it.
 if { [catch {set element_data [portal::evaluate_element $element_id $theme_id] } errmsg ] } {
-    if { [ad_parameter show_datasource_errors_p] == 1} {
+    if { [parameter::get -parameter show_datasource_errors_p] == 1} {
 	set element(content) "<div class=portal_alert>$errmsg</div>"
     } else {
 	return
Index: openacs-4/packages/new-portal/www/layouts/title-buttons.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/title-buttons.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/layouts/title-buttons.tcl	9 Aug 2002 20:56:30 -0000	1.3
+++ openacs-4/packages/new-portal/www/layouts/title-buttons.tcl	29 Sep 2013 13:59:55 -0000	1.4
@@ -27,5 +27,5 @@
 # should this come from the template or something?  how does it work?
 set title(resource_dir) "/packages/portal/www/templates/components/simple-element"
 
-set title_noshade_p [ad_parameter title_noshade_p]
-set title_nomove_p [ad_parameter title_nomove_p]
+set title_noshade_p [parameter::get -parameter title_noshade_p]
+set title_nomove_p [parameter::get -parameter title_nomove_p]
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl	4 Jan 2008 17:54:34 -0000	1.3
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl	29 Sep 2013 13:59:55 -0000	1.4
@@ -42,7 +42,7 @@
 #
 # $Id$
 
-set user_id [ad_get_user_id] 
+set user_id [ad_conn user_id] 
 set community_id [dotlrn_community::get_community_id]
 set dotlrn_url [dotlrn::get_url]
 
@@ -150,7 +150,7 @@
 }
 
 # Set up some basic stuff
-set user_id [ad_get_user_id]
+set user_id [ad_conn user_id]
 if { [ad_conn untrusted_user_id] == 0 } {
     set user_name {}
 } else {