Index: openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl,v
diff -u -N -r1.5 -r1.5.8.1
--- openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl	8 Aug 2006 21:26:36 -0000	1.5
+++ openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl	18 Aug 2014 21:56:33 -0000	1.5.8.1
@@ -305,8 +305,8 @@
     }
 
     # The get routines return a list of name/id pairs so extract the ids
-    set interval_id [lindex [lindex $intervals 0] 1]
-    set delivery_method_id [lindex [lindex $delivery_methods 0] 1]
+    set interval_id [lindex $intervals 0 1]
+    set delivery_method_id [lindex $delivery_methods 0 1]
 
     # Add the alert
     notification::request::new -type_id $type_id -user_id [ad_conn user_id] -object_id $homework_file_id \
Index: openacs-4/packages/dotlrn-homework/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-add.tcl,v
diff -u -N -r1.5.6.1 -r1.5.6.2
--- openacs-4/packages/dotlrn-homework/www/file-add.tcl	18 Aug 2014 21:53:42 -0000	1.5.6.1
+++ openacs-4/packages/dotlrn-homework/www/file-add.tcl	18 Aug 2014 21:56:33 -0000	1.5.6.2
@@ -21,7 +21,7 @@
 }
 
 # check for write permission on the folder
-ad_require_permission $folder_id write
+permission::require_permission -object_id $folder_id -privilege write
 
 # Homework_file_id tells us whether or not we're uploading a correction file to relate
 # to an existing homework file, or a new home work file
@@ -55,8 +55,8 @@
                                          {html {rows 5 cols 50}}}
 } -validate {
     {upload_file
-      { [file size [template::util::file::get_property tmp_filename $upload_file]] <= [ad_parameter "MaximumFileSize"] }
-      "[_ dotlrn-homework.lt_your_file_is] ([util_commify_number [ad_parameter MaximumFileSize]] [_ dotlrn-homework.bytes])"
+      { [file size [template::util::file::get_property tmp_filename $upload_file]] <= [parameter::get -parameter "MaximumFileSize"] }
+      "[_ dotlrn-homework.lt_your_file_is] ([util_commify_number [parameter::get -parameter MaximumFileSize]] [_ dotlrn-homework.bytes])"
     }
 } -new_data {
 
Index: openacs-4/packages/dotlrn-homework/www/file-copy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-copy-2.tcl,v
diff -u -N -r1.2.18.1 -r1.2.18.2
--- openacs-4/packages/dotlrn-homework/www/file-copy-2.tcl	18 Aug 2014 21:53:42 -0000	1.2.18.1
+++ openacs-4/packages/dotlrn-homework/www/file-copy-2.tcl	18 Aug 2014 21:56:33 -0000	1.2.18.2
@@ -24,8 +24,8 @@
 # check for read permission on the file and write permission on the
 # target folder
 
-ad_require_permission $file_id read
-ad_require_permission $parent_id write
+permission::require_permission -object_id $file_id -privilege read
+permission::require_permission -object_id $parent_id -privilege write
 
 set user_id [ad_conn user_id]
 set ip_address [ad_conn peeraddr]
Index: openacs-4/packages/dotlrn-homework/www/file-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-copy.tcl,v
diff -u -N -r1.3.12.1 -r1.3.12.2
--- openacs-4/packages/dotlrn-homework/www/file-copy.tcl	18 Aug 2014 21:53:42 -0000	1.3.12.1
+++ openacs-4/packages/dotlrn-homework/www/file-copy.tcl	18 Aug 2014 21:56:33 -0000	1.3.12.2
@@ -20,7 +20,7 @@
 
 # check for read permission on the file
 
-ad_require_permission $file_id read
+permission::require_permission -object_id $file_id -privilege read
 
 # set templating datasources
 
Index: openacs-4/packages/dotlrn-homework/www/file-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-delete.tcl,v
diff -u -N -r1.4.12.1 -r1.4.12.2
--- openacs-4/packages/dotlrn-homework/www/file-delete.tcl	18 Aug 2014 21:53:42 -0000	1.4.12.1
+++ openacs-4/packages/dotlrn-homework/www/file-delete.tcl	18 Aug 2014 21:56:33 -0000	1.4.12.2
@@ -22,7 +22,7 @@
 
 # check for delete permission on the file
 
-ad_require_permission $file_id delete
+permission::require_permission -object_id $file_id -privilege delete
 
 # check the file doesn't have any revisions that the user
 # doesn't have permission to delete
Index: openacs-4/packages/dotlrn-homework/www/file-move-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-move-2.tcl,v
diff -u -N -r1.3.12.1 -r1.3.12.2
--- openacs-4/packages/dotlrn-homework/www/file-move-2.tcl	18 Aug 2014 21:53:42 -0000	1.3.12.1
+++ openacs-4/packages/dotlrn-homework/www/file-move-2.tcl	18 Aug 2014 21:56:33 -0000	1.3.12.2
@@ -23,8 +23,8 @@
 
 # check for write permission on both the file and the target folder
 
-ad_require_permission $file_id write
-ad_require_permission $parent_id write
+permission::require_permission -object_id $file_id -privilege write
+permission::require_permission -object_id $parent_id -privilege write
 
 set creation_user [ad_conn user_id]
 set creation_ip [ns_conn peeraddr]
Index: openacs-4/packages/dotlrn-homework/www/file-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-move.tcl,v
diff -u -N -r1.2.18.1 -r1.2.18.2
--- openacs-4/packages/dotlrn-homework/www/file-move.tcl	18 Aug 2014 21:53:43 -0000	1.2.18.1
+++ openacs-4/packages/dotlrn-homework/www/file-move.tcl	18 Aug 2014 21:56:34 -0000	1.2.18.2
@@ -23,7 +23,7 @@
 # check they have write permission on the file (is this really the
 # right permission?)
 
-ad_require_permission $file_id write
+permission::require_permission -object_id $file_id -privilege write
 set context_bar "[_ dotlrn-homework.Move]"
 set return_url "[ad_conn url]?[ad_conn query]"
 
Index: openacs-4/packages/dotlrn-homework/www/file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file.tcl,v
diff -u -N -r1.4.12.1 -r1.4.12.2
--- openacs-4/packages/dotlrn-homework/www/file.tcl	18 Aug 2014 21:53:43 -0000	1.4.12.1
+++ openacs-4/packages/dotlrn-homework/www/file.tcl	18 Aug 2014 21:56:34 -0000	1.4.12.2
@@ -35,7 +35,7 @@
 
 # check that they have read permission on this file.
 
-ad_require_permission $file_id read
+permission::require_permission -object_id $file_id -privilege read
 
 #set templating datasources
 
Index: openacs-4/packages/dotlrn-homework/www/folder-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-create.tcl,v
diff -u -N -r1.3.12.1 -r1.3.12.2
--- openacs-4/packages/dotlrn-homework/www/folder-create.tcl	18 Aug 2014 21:53:43 -0000	1.3.12.1
+++ openacs-4/packages/dotlrn-homework/www/folder-create.tcl	18 Aug 2014 21:56:34 -0000	1.3.12.2
@@ -33,7 +33,7 @@
 # to upload homework files but only class admins can create new homework
 # subfolders.
 
-ad_require_permission $parent_id admin
+permission::require_permission -object_id $parent_id -privilege admin
 
 ad_form -name homework_form -form {
     {return_url:text(hidden)         {value $return_url}}
Index: openacs-4/packages/dotlrn-homework/www/folder-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-delete.tcl,v
diff -u -N -r1.3.12.1 -r1.3.12.2
--- openacs-4/packages/dotlrn-homework/www/folder-delete.tcl	18 Aug 2014 21:53:43 -0000	1.3.12.1
+++ openacs-4/packages/dotlrn-homework/www/folder-delete.tcl	18 Aug 2014 21:56:34 -0000	1.3.12.2
@@ -29,7 +29,7 @@
 
 # check for delete permission on the folder
 
-ad_require_permission $folder_id delete
+permission::require_permission -object_id $folder_id -privilege delete
 
 if {$confirmed_p == "t"} {
     # they have confirmed that they want to delete the folder
Index: openacs-4/packages/dotlrn-homework/www/toggle-homework-alert.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/toggle-homework-alert.tcl,v
diff -u -N -r1.3.18.1 -r1.3.18.2
--- openacs-4/packages/dotlrn-homework/www/toggle-homework-alert.tcl	18 Aug 2014 21:53:43 -0000	1.3.18.1
+++ openacs-4/packages/dotlrn-homework/www/toggle-homework-alert.tcl	18 Aug 2014 21:56:34 -0000	1.3.18.2
@@ -37,8 +37,8 @@
     }
 
     # The get routines return a list of name/id pairs so extract the ids
-    set interval_id [lindex [lindex $intervals 0] 1]
-    set delivery_method_id [lindex [lindex $delivery_methods 0] 1]
+    set interval_id [lindex $intervals 0 1]
+    set delivery_method_id [lindex $delivery_methods 0 1]
 
     # Add the alert
     notification::request::new -type_id $type_id -user_id [ad_conn user_id] -object_id $folder_id \
Index: openacs-4/packages/dotlrn-homework/www/version-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/version-add.tcl,v
diff -u -N -r1.4.6.1 -r1.4.6.2
--- openacs-4/packages/dotlrn-homework/www/version-add.tcl	18 Aug 2014 21:53:43 -0000	1.4.6.1
+++ openacs-4/packages/dotlrn-homework/www/version-add.tcl	18 Aug 2014 21:56:34 -0000	1.4.6.2
@@ -22,7 +22,7 @@
 }
 
 # check for write permission on the file
-ad_require_permission $file_id write
+permission::require_permission -object_id $file_id -privilege write
 
 set page_title "[_ dotlrn-homework.lt_upload_new_version_of]"
 set context_bar [list [_ dotlrn-homework.lt_upload_new_ass_version]]
@@ -35,8 +35,8 @@
 } -edit_request {
 } -validate {
     {upload_file
-      { [file size [template::util::file::get_property tmp_filename $upload_file]] <= [ad_parameter "MaximumFileSize"] }
-      "[_ dotlrn-homework.lt_your_file_is] ([util_commify_number [ad_parameter MaximumFileSize]] [_ dotlrn-homework.bytes])"
+      { [file size [template::util::file::get_property tmp_filename $upload_file]] <= [parameter::get -parameter "MaximumFileSize"] }
+      "[_ dotlrn-homework.lt_your_file_is] ([util_commify_number [parameter::get -parameter MaximumFileSize]] [_ dotlrn-homework.bytes])"
     }
 } -edit_data {
 
Index: openacs-4/packages/dotlrn-homework/www/version-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/version-delete.tcl,v
diff -u -N -r1.4.12.1 -r1.4.12.2
--- openacs-4/packages/dotlrn-homework/www/version-delete.tcl	18 Aug 2014 21:53:43 -0000	1.4.12.1
+++ openacs-4/packages/dotlrn-homework/www/version-delete.tcl	18 Aug 2014 21:56:34 -0000	1.4.12.2
@@ -22,7 +22,7 @@
 
 # check for delete permission on the version
 
-ad_require_permission $version_id delete
+permission::require_permission -object_id $version_id -privilege delete
 
 db_1row item_select "
 select item_id