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 -r1.5 --- openacs-4/packages/dotlrn-homework/www/file-delete.tcl 13 Jan 2005 13:57:29 -0000 1.4 +++ openacs-4/packages/dotlrn-homework/www/file-delete.tcl 27 Oct 2014 16:41:20 -0000 1.5 @@ -9,7 +9,7 @@ {confirmed_p "f"} } -validate { valid_file -requires {file_id} { - if ![fs_file_p $file_id] { + if {![fs_file_p $file_id]} { ad_complain "[_ dotlrn-homework.lt_specified_file]" } } @@ -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 @@ -35,7 +35,7 @@ where item_id = :file_id and acs_permission.permission_p(revision_id,:user_id,'delete') = 'f'"] 0 f t] -if {[string equal $confirmed_p "t"] && [string equal $blocked_p "f"] } { +if {$confirmed_p == "t" && $blocked_p == "f" } { # they confirmed that they want to delete the file db_1row parent_id "select parent_id from cr_items where item_id = :file_id"