Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v diff -u -r1.54 -r1.55 --- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 23 Sep 2003 21:43:46 -0000 1.54 +++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 20 Apr 2004 21:13:19 -0000 1.55 @@ -252,26 +252,27 @@ ad_proc -public user_can_read_private_data_p { {-user_id ""} + {-object_id:required} } { Check if a user can read sensitive data in dotLRN } { - if { [parameter::get -parameter protect_private_data_p -default 1] } { - return [ad_permission_p \ - -user_id $user_id \ - [dotlrn::get_package_id] \ - read_private_data - ] - } else { - return 1 - } + if { [parameter::get -parameter protect_private_data_p -default 1] } { + return [acs_privacy::user_can_read_private_data_p \ + -user_id $user_id \ + -object_id $object_id + ] + } else { + return 1 + } } ad_proc -public require_user_read_private_data { {-user_id ""} + {-object_id:required} } { Require that a user be able to read sensitive data } { - if {![user_can_read_private_data_p -user_id $user_id]} { + if {![user_can_read_private_data_p -user_id $user_id -object_id $object_id]} { do_abort } }