Index: openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml,v diff -u -r1.6 -r1.6.12.1 --- openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml 17 Jul 2006 05:38:38 -0000 1.6 +++ openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml 6 Sep 2013 12:06:48 -0000 1.6.12.1 @@ -367,7 +367,7 @@ To receive a true or false value, Tcl code should call: -ad_permission_p $object_id $object_type $method -user_id $user_id +permission::permission_p -object_id $object_id -party_id $user_id -privilege $method If the user_id argument is left out, then the currently logged in Index: openacs-4/packages/acs-lang/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.tcl,v diff -u -r1.4 -r1.4.16.1 --- openacs-4/packages/acs-lang/www/index.tcl 26 Feb 2005 16:00:10 -0000 1.4 +++ openacs-4/packages/acs-lang/www/index.tcl 6 Sep 2013 12:06:49 -0000 1.4.16.1 @@ -14,4 +14,4 @@ set locale [lang::user::locale] set language [lang::user::language] -set admin_p [ad_permission_p [ad_conn package_id] admin] +set admin_p [permission::permission_p -object_id [ad_conn package_id] -privilege admin] Index: openacs-4/packages/acs-reference/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/index.tcl,v diff -u -r1.3 -r1.3.16.1 --- openacs-4/packages/acs-reference/www/index.tcl 1 Mar 2005 00:01:22 -0000 1.3 +++ openacs-4/packages/acs-reference/www/index.tcl 6 Sep 2013 12:06:49 -0000 1.3.16.1 @@ -18,6 +18,6 @@ set context_bar [list $title] set user_id [ad_conn user_id] -set admin_p [ad_permission_p $package_id admin] +set admin_p [permission::permission_p -object_id $package_id -privilege admin] ad_return_template Index: openacs-4/packages/acs-subsite/tcl/party-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/Attic/party-procs.tcl,v diff -u -r1.8 -r1.8.4.1 --- openacs-4/packages/acs-subsite/tcl/party-procs.tcl 17 Oct 2010 21:06:09 -0000 1.8 +++ openacs-4/packages/acs-subsite/tcl/party-procs.tcl 6 Sep 2013 12:06:49 -0000 1.8.4.1 @@ -25,7 +25,7 @@ @creation-date 10/2000 } { - return [ad_permission_p -user_id $user_id $party_id $privilege] + return [permission::permission_p -party_id $user_id -object_id $party_id -privilege $privilege] } Index: openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl,v diff -u -r1.4 -r1.4.10.1 --- openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl 10 Jan 2007 21:22:06 -0000 1.4 +++ openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl 6 Sep 2013 12:06:49 -0000 1.4.10.1 @@ -89,6 +89,6 @@ @creation-date 12/2000 } { - return [ad_permission_p -user_id $user_id $segment_id $privilege] + return [permission::permission_p -party_id $user_id -object_id $segment_id -privilege $privilege] } Index: openacs-4/packages/acs-subsite/tcl/relation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/relation-procs.tcl,v diff -u -r1.15 -r1.15.10.1 --- openacs-4/packages/acs-subsite/tcl/relation-procs.tcl 10 Jan 2007 21:22:06 -0000 1.15 +++ openacs-4/packages/acs-subsite/tcl/relation-procs.tcl 6 Sep 2013 12:06:49 -0000 1.15.10.1 @@ -23,7 +23,7 @@ @creation-date 12/2000 } { - return [ad_permission_p -user_id $user_id $rel_id $privilege] + return [permission::permission_p -party_id $user_id -object_id $rel_id -privilege $privilege] } Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl 18 Apr 2011 17:24:30 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl 6 Sep 2013 12:06:49 -0000 1.3.4.1 @@ -24,8 +24,8 @@ # @cvs-id $Id$ set user_id [ad_conn user_id] -set admin_p [ad_permission_p $group_id "admin"] -set create_p [ad_permission_p $group_id "create"] +set admin_p [permission::permission_p -object_id $group_id -privilege "admin"] +set create_p [permission::permission_p -object_id $group_id -privilege "create"] set return_url "[ad_conn url]?[ad_conn query]" set return_url_enc [ad_urlencode $return_url] Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl,v diff -u -r1.2.10.1 -r1.2.10.2 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 27 Aug 2013 12:20:37 -0000 1.2.10.1 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 6 Sep 2013 12:06:49 -0000 1.2.10.2 @@ -22,13 +22,13 @@ # We need to know both: # - does user have admin on group? # - does user have delete on group? -set admin_p [ad_permission_p -user_id $user_id $group_id "admin"] +set admin_p [permission::permission_p -party_id $user_id -object_id $group_id -privilege "admin"] if {$admin_p} { # We can skip the permissions check for "delete" because user had admin. set delete_p 1 } else { # user doesn't have admin -- now find out if they have delete. - set delete_p [ad_permission_p -user_id $user_id $group_id "delete"] + set delete_p [permission::permission_p -party_id $user_id -object_id $group_id -privilege "delete"] } # Pull out all the relations of the specified type Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl,v diff -u -r1.4 -r1.4.22.1 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 5 Dec 2002 13:10:52 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 6 Sep 2013 12:06:49 -0000 1.4.22.1 @@ -33,7 +33,7 @@ } set user_id [ad_conn user_id] -set create_p [ad_permission_p -user_id $user_id $group_id "create"] +set create_p [permission::permission_p -party_id $user_id -object_id $group_id -privilege "create"] set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"] set rel_type_enc [ad_urlencode $rel_type] Index: openacs-4/packages/acs-subsite/www/admin/groups/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.tcl,v diff -u -r1.6 -r1.6.10.1 --- openacs-4/packages/acs-subsite/www/admin/groups/one.tcl 10 Jan 2007 21:22:07 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/groups/one.tcl 6 Sep 2013 12:06:49 -0000 1.6.10.1 @@ -33,8 +33,8 @@ } set user_id [ad_conn user_id] -set write_p [ad_permission_p $group_id "write"] -set admin_p [ad_permission_p $group_id "admin"] +set write_p [permission::permission_p -object_id $group_id -privilege "write"] +set admin_p [permission::permission_p -object_id $group_id -privilege "admin"] set return_url "[ad_conn url]?[ad_conn query]" set return_url_enc [ad_urlencode $return_url] Index: openacs-4/packages/acs-subsite/www/admin/parties/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/one.tcl,v diff -u -r1.4 -r1.4.26.1 --- openacs-4/packages/acs-subsite/www/admin/parties/one.tcl 18 Sep 2002 14:54:52 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/parties/one.tcl 6 Sep 2013 12:06:49 -0000 1.4.26.1 @@ -60,8 +60,8 @@ } set user_id [ad_conn user_id] -set write_p [ad_permission_p $party_id "write"] -set admin_p [ad_permission_p $party_id "admin"] +set write_p [permission::permission_p -object_id $party_id -privilege "write"] +set admin_p [permission::permission_p -object_id $party_id -privilege "admin"] set context [list [list "" "Parties"] "One Party"] Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.tcl,v diff -u -r1.1 -r1.1.16.1 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.tcl 27 Feb 2005 20:05:59 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.tcl 6 Sep 2013 12:06:50 -0000 1.1.16.1 @@ -1,7 +1,7 @@ # included from elements. ad_require_permission $segment_id "read" -set write_p [ad_permission_p $segment_id "write"] +set write_p [permission::permission_p -object_id $segment_id -privilege "write"] set package_url [ad_conn package_url] set user_id [ad_conn user_id] Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl,v diff -u -r1.5 -r1.5.22.1 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl 10 Oct 2003 12:25:51 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl 6 Sep 2013 12:06:50 -0000 1.5.22.1 @@ -64,6 +64,6 @@ } set number_elements [util_commify_number $number_elements] -set admin_p [ad_permission_p $segment_id "admin"] +set admin_p [permission::permission_p -object_id $segment_id -privilege "admin"] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.tcl,v diff -u -r1.3 -r1.3.22.1 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.tcl 10 Oct 2003 12:25:51 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.tcl 6 Sep 2013 12:06:50 -0000 1.3.22.1 @@ -20,7 +20,7 @@ ad_require_permission $constraint_id read -set admin_p [ad_permission_p $constraint_id admin] +set admin_p [permission::permission_p -object_id $constraint_id -privilege admin] set package_id [ad_conn package_id] Index: openacs-4/packages/acs-subsite/www/admin/relations/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.tcl,v diff -u -r1.3 -r1.3.22.1 --- openacs-4/packages/acs-subsite/www/admin/relations/one.tcl 10 Oct 2003 15:03:38 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/relations/one.tcl 6 Sep 2013 12:06:50 -0000 1.3.22.1 @@ -37,9 +37,9 @@ } } -set admin_p [ad_permission_p $rel_id "admin"] -set delete_p [ad_permission_p $rel_id "delete"] -set write_p [ad_permission_p $rel_id "write"] +set admin_p [permission::permission_p -object_id $rel_id -privilege "admin"] +set delete_p [permission::permission_p -object_id $rel_id -privilege "delete"] +set write_p [permission::permission_p -object_id $rel_id -privilege "write"] set context [list "One relation"] @@ -91,9 +91,9 @@ set QQreturn_url [ad_quotehtml $return_url] set possible_member_states [group::possible_member_states] -set object_two_read_p [ad_permission_p $rel(object_id_two) "read"] +set object_two_read_p [permission::permission_p -object_id $rel(object_id_two) -privilege "read"] if {$object_two_read_p} { - set object_two_write_p [ad_permission_p $rel(object_id_two) "write"] + set object_two_write_p [permission::permission_p -object_id $rel(object_id_two) -privilege "write"] attribute::multirow \ -start_with party \ Index: openacs-4/packages/acs-subsite/www/members/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.tcl,v diff -u -r1.18 -r1.18.10.1 --- openacs-4/packages/acs-subsite/www/members/index.tcl 10 Jan 2007 21:22:08 -0000 1.18 +++ openacs-4/packages/acs-subsite/www/members/index.tcl 6 Sep 2013 12:06:50 -0000 1.18.10.1 @@ -53,7 +53,7 @@ set delete_p 1 } else { # user doesn't have admin -- now find out if they have delete. - set delete_p [ad_permission_p -user_id $user_id $group_id "delete"] + set delete_p [permission::permission_p -party_id $user_id -object_id $group_id -privilege "delete"] } set actions {} Index: openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl,v diff -u -r1.12.4.1 -r1.12.4.2 --- openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl 27 Aug 2013 12:20:37 -0000 1.12.4.1 +++ openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl 6 Sep 2013 12:06:50 -0000 1.12.4.2 @@ -6,7 +6,7 @@ set user_id [ad_conn user_id] -set admin_p [ad_permission_p $object_id admin] +set admin_p [permission::permission_p -object_id $object_id -privilege admin] if { (![info exists return_url] || $return_url eq "") } { set return_url [ad_return_url] Index: openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl,v diff -u -r1.7 -r1.7.8.1 --- openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl 30 Jan 2009 03:24:59 -0000 1.7 +++ openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl 6 Sep 2013 12:06:50 -0000 1.7.8.1 @@ -32,7 +32,7 @@ check if a user can access an object's private data } { if {[privacy_control_enabled_p]} { - return [ad_permission_p -user_id $user_id $object_id read_private_data] + return [permission::permission_p -party_id $user_id -object_id $object_id -privilege read_private_data] } else { # backwards compatibility return 1 Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -r1.94.2.2 -r1.94.2.3 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 5 Sep 2013 11:51:00 -0000 1.94.2.2 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 6 Sep 2013 12:06:50 -0000 1.94.2.3 @@ -1879,7 +1879,7 @@ } # If this is a site-wide admin, offer a link to the package manager - if { [ad_permission_p 0 admin] } { + if { [permission::permission_p -object_id 0 -privilege admin] } { append html_string "\n" } Index: openacs-4/packages/acs-templating/www/doc/demo/list3/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list3/index.tcl,v diff -u -r1.1 -r1.1.12.1 --- openacs-4/packages/acs-templating/www/doc/demo/list3/index.tcl 6 Feb 2006 13:08:30 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/list3/index.tcl 6 Sep 2013 12:06:50 -0000 1.1.12.1 @@ -17,7 +17,7 @@ set user_id [ad_conn user_id] set context [list] -set create_p [ad_permission_p $package_id create] +set create_p [permission::permission_p -object_id $package_id -privilege create] template::list::create -name notes \ -multirow template_demo_notes \ Index: openacs-4/packages/acs-templating/www/doc/demo/list4/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list4/index.tcl,v diff -u -r1.1 -r1.1.12.1 --- openacs-4/packages/acs-templating/www/doc/demo/list4/index.tcl 9 Feb 2006 02:40:10 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/list4/index.tcl 6 Sep 2013 12:06:50 -0000 1.1.12.1 @@ -17,7 +17,7 @@ set user_id [ad_conn user_id] set context [list] -set create_p [ad_permission_p $package_id create] +set create_p [permission::permission_p -object_id $package_id -privilege create] # Here, we are adding a link for every row. The title of the note # will become a link to a page that will view the note in its entirety. Index: openacs-4/packages/acs-templating/www/doc/demo/list5/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list5/index.tcl,v diff -u -r1.1 -r1.1.12.1 --- openacs-4/packages/acs-templating/www/doc/demo/list5/index.tcl 9 Feb 2006 06:39:55 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/list5/index.tcl 6 Sep 2013 12:06:51 -0000 1.1.12.1 @@ -17,7 +17,7 @@ set user_id [ad_conn user_id] set context [list] -set create_p [ad_permission_p $package_id create] +set create_p [permission::permission_p -object_id $package_id -privilege create] # New here, is the use of -key to signify which column is the key field, # and the -bulk_actions to give us the ability to delete all the checked Index: openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl,v diff -u -r1.1 -r1.1.12.1 --- openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl 10 Feb 2006 00:47:17 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl 6 Sep 2013 12:06:51 -0000 1.1.12.1 @@ -17,7 +17,7 @@ set user_id [ad_conn user_id] set context [list] -set create_p [ad_permission_p $package_id create] +set create_p [permission::permission_p -object_id $package_id -privilege create] set actions [list] Index: openacs-4/packages/acs-templating/www/doc/demo/list7/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list7/index.tcl,v diff -u -r1.3 -r1.3.12.1 --- openacs-4/packages/acs-templating/www/doc/demo/list7/index.tcl 13 Feb 2006 12:29:26 -0000 1.3 +++ openacs-4/packages/acs-templating/www/doc/demo/list7/index.tcl 6 Sep 2013 12:06:51 -0000 1.3.12.1 @@ -27,7 +27,7 @@ set user_id [ad_conn user_id] set context [list] -set create_p [ad_permission_p $package_id create] +set create_p [permission::permission_p -object_id $package_id -privilege create] set actions [list] Index: openacs-4/packages/acs-templating/www/doc/demo/list8/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list8/index.tcl,v diff -u -r1.2 -r1.2.12.1 --- openacs-4/packages/acs-templating/www/doc/demo/list8/index.tcl 13 Feb 2006 13:05:50 -0000 1.2 +++ openacs-4/packages/acs-templating/www/doc/demo/list8/index.tcl 6 Sep 2013 12:06:51 -0000 1.2.12.1 @@ -19,7 +19,7 @@ set user_id [ad_conn user_id] set context [list] -set create_p [ad_permission_p $package_id create] +set create_p [permission::permission_p -object_id $package_id -privilege create] set actions [list] Index: openacs-4/packages/acs-templating/www/doc/demo/list9/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list9/index.tcl,v diff -u -r1.1 -r1.1.12.1 --- openacs-4/packages/acs-templating/www/doc/demo/list9/index.tcl 13 Feb 2006 13:11:12 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/list9/index.tcl 6 Sep 2013 12:06:51 -0000 1.1.12.1 @@ -19,7 +19,7 @@ set user_id [ad_conn user_id] set context [list] -set create_p [ad_permission_p $package_id create] +set create_p [permission::permission_p -object_id $package_id -privilege create] set actions [list] Index: openacs-4/packages/file-storage/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v diff -u -r1.30 -r1.30.6.1 --- openacs-4/packages/file-storage/www/index.tcl 15 Jun 2007 17:40:29 -0000 1.30 +++ openacs-4/packages/file-storage/www/index.tcl 6 Sep 2013 12:06:51 -0000 1.30.6.1 @@ -44,8 +44,8 @@ -object_id $folder_id \ -privilege "read" -set write_p [ad_permission_p $folder_id write] -set admin_p [ad_permission_p $folder_id admin] +set write_p [permission::permission_p -object_id $folder_id -privilege write] +set admin_p [permission::permission_p -object_id $folder_id -privilege admin] # might want a more complicated check here, since a person might have # delete permission on the folder, but not on some child items and, @@ -54,7 +54,7 @@ set delete_p $admin_p if {!$delete_p} { - set delete_p [ad_permission_p $folder_id delete] + set delete_p [permission::permission_p -object_id $folder_id -privilege delete] } set package_id [ad_conn package_id] Index: openacs-4/packages/general-comments/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.tcl,v diff -u -r1.7 -r1.7.14.1 --- openacs-4/packages/general-comments/www/index.tcl 1 Mar 2005 00:01:37 -0000 1.7 +++ openacs-4/packages/general-comments/www/index.tcl 6 Sep 2013 12:06:51 -0000 1.7.14.1 @@ -21,7 +21,7 @@ # check for admin privileges set package_id [ad_conn package_id] -set admin_p [ad_permission_p $package_id admin] +set admin_p [permission::permission_p -object_id $package_id -privilege admin] # return_url to be passed to various helper pages so that we return to # this page with the proper parameters Index: openacs-4/packages/general-comments/www/view-comment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/general-comments/www/view-comment.tcl 20 Dec 2010 00:15:22 -0000 1.9 +++ openacs-4/packages/general-comments/www/view-comment.tcl 6 Sep 2013 12:06:51 -0000 1.9.2.1 @@ -37,8 +37,8 @@ # check for permissions set package_id [ad_conn package_id] ad_require_permission $comment_id read -set write_perm_p [ad_permission_p $comment_id write] -set admin_p [ad_permission_p $package_id admin] +set write_perm_p [permission::permission_p -object_id $comment_id -privilege write] +set admin_p [permission::permission_p -object_id $package_id -privilege admin] # if the user has write permissions then allow # viewing of selected revision