Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v diff -u -r1.42 -r1.43 --- openacs-4/packages/acs-subsite/tcl/group-procs.tcl 6 Jun 2018 22:32:41 -0000 1.42 +++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl 6 Jun 2018 22:58:09 -0000 1.43 @@ -732,7 +732,7 @@ group::get -group_id $group_id -array group if { !$no_perm_check_p } { - set create_p [group::permission_p -privilege create $group_id] + set create_p [party::permission_p -privilege create $group_id] if { $group(join_policy) eq "closed" && !$create_p } { error "You do not have permission to add members to the group '$group(group_name)'" } Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl 19 Jan 2018 14:09:48 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl 6 Jun 2018 22:58:09 -0000 1.6 @@ -13,14 +13,14 @@ {return_url:localurl ""} } -validate { groups_exists_p -requires {group_id:notnull} { - if { ![group::permission_p -privilege admin $group_id] } { - ad_complain "The group either does not exist or you do not have permission to administer it" - } + if { ![party::permission_p -privilege admin $group_id] } { + ad_complain "The group either does not exist or you do not have permission to administer it" + } } group_in_scope_p -requires {group_id:notnull} { - if { ![application_group::contains_party_p -party_id $group_id]} { - ad_complain "The group either does not exist or does not belong to this subsite." - } + if { ![application_group::contains_party_p -party_id $group_id]} { + ad_complain "The group either does not exist or does not belong to this subsite." + } } } Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl 7 Aug 2017 23:47:58 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl 6 Jun 2018 22:58:09 -0000 1.6 @@ -20,21 +20,21 @@ possible_join_policies:onevalue } -validate { groups_exists_p -requires {group_id:notnull} { - if { ![group::permission_p -privilege admin $group_id] } { - ad_complain "The group either does not exist or you do not have permission to administer it" - } + if { ![party::permission_p -privilege admin $group_id] } { + ad_complain "The group either does not exist or you do not have permission to administer it" + } } group_in_scope_p -requires {group_id:notnull} { - if { ![application_group::contains_party_p -party_id $group_id]} { - ad_complain "The group either does not exist or does not belong to this subsite." - } + if { ![application_group::contains_party_p -party_id $group_id]} { + ad_complain "The group either does not exist or does not belong to this subsite." + } } } set context [list \ [list "[ad_conn package_url]admin/groups/" "Groups"] \ - [list "one?group_id=$group_id" "One Group" ] \ + [list "one?group_id=$group_id" "One Group" ] \ "Edit Join Policy"] db_1row group_info { Index: openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl 19 Jan 2018 14:09:48 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl 6 Jun 2018 22:58:09 -0000 1.7 @@ -14,22 +14,22 @@ { return_url:localurl "" } } -validate { groups_exists_p -requires {group_id:notnull} { - if { ![group::permission_p $group_id] } { - ad_complain "The group either does not exist or you do not have permission to view it" - } + if { ![party::permission_p $group_id] } { + ad_complain "The group either does not exist or you do not have permission to view it" + } } } if {$operation eq "Yes, I really want to delete this group"} { db_transaction { - set group_type [group::delete $group_id] + set group_type [group::delete $group_id] } if { $return_url eq "" && $group_type ne "" } { - set return_url [export_vars -base ../group-types/one group_type] + set return_url [export_vars -base ../group-types/one group_type] } } else { if { $return_url eq "" } { - set return_url [export_vars -base one group_id] + set return_url [export_vars -base one group_id] } } Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl 7 Aug 2017 23:47:58 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl 6 Jun 2018 22:58:09 -0000 1.7 @@ -17,9 +17,9 @@ group_id:onevalue } -validate { groups_exists_p -requires {group_id:notnull} { - if { ![group::permission_p -privilege delete $group_id] } { - ad_complain "The group either does not exist or you do not have permission to delete it" - } + if { ![party::permission_p -privilege delete $group_id] } { + ad_complain "The group either does not exist or you do not have permission to delete it" + } } } 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.7 -r1.8 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 7 Aug 2017 23:47:58 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 6 Jun 2018 22:58:09 -0000 1.8 @@ -26,9 +26,9 @@ ancestor_rel_type:onevalue } -validate { groups_exists_p -requires {group_id:notnull} { - if { ![group::permission_p $group_id] } { - ad_complain "The group either does not exist or you do not have permission to view it" - } + if { ![party::permission_p $group_id] } { + ad_complain "The group either does not exist or you do not have permission to view it" + } } } @@ -45,7 +45,7 @@ # The role pretty names can be message catalog keys that need # to be localized before they are displayed set role_pretty_name [lang::util::localize $role_pretty_name] -set role_pretty_plural [lang::util::localize $role_pretty_plural] +set role_pretty_plural [lang::util::localize $role_pretty_plural] set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list [export_vars -base one group_id] "One Group"] "All $role_pretty_plural"] Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 7 Aug 2017 23:47:58 -0000 1.11 +++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 6 Jun 2018 22:58:09 -0000 1.12 @@ -47,7 +47,7 @@ # We assume the group is on side 1... db_1row rel_type_info {} -set create_p [group::permission_p -privilege create $add_to_group_id] +set create_p [party::permission_p -privilege create $add_to_group_id] # Membership relations have a member_state attribute that gets set # based on the group's join policy. 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.10 -r1.11 --- openacs-4/packages/acs-subsite/www/admin/groups/one.tcl 7 Oct 2017 10:26:29 -0000 1.10 +++ openacs-4/packages/acs-subsite/www/admin/groups/one.tcl 6 Jun 2018 22:58:09 -0000 1.11 @@ -21,14 +21,14 @@ join_policy:onevalue } -validate { groups_exists_p -requires {group_id:notnull} { - if { ![group::permission_p $group_id] } { - ad_complain "The group either does not exist or you do not have permission to view it" - } + if { ![party::permission_p $group_id] } { + ad_complain "The group either does not exist or you do not have permission to view it" + } } group_in_scope_p -requires {group_id:notnull} { - if { ![application_group::contains_party_p -include_self -party_id $group_id]} { - ad_complain "The group either does not exist or does not belong to this subsite." - } + if { ![application_group::contains_party_p -include_self -party_id $group_id]} { + ad_complain "The group either does not exist or does not belong to this subsite." + } } } Index: openacs-4/packages/acs-subsite/www/admin/parties/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-subsite/www/admin/parties/new.tcl 19 Jan 2018 14:09:48 -0000 1.11 +++ openacs-4/packages/acs-subsite/www/admin/parties/new.tcl 6 Jun 2018 22:58:09 -0000 1.12 @@ -43,7 +43,7 @@ # We assume the group is on side 1... db_1row rel_type_info {} -set create_p [group::permission_p -privilege create $add_to_group_id] +set create_p [party::permission_p -privilege create $add_to_group_id] # Membership relations have a member_state attribute that gets set # based on the group's join policy. Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/acs-subsite/www/admin/users/new.tcl 28 May 2018 18:26:11 -0000 1.22 +++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl 6 Jun 2018 22:58:09 -0000 1.23 @@ -36,7 +36,7 @@ # We assume the group is on side 1... db_1row rel_type_info {} -set create_p [group::permission_p -privilege create $add_to_group_id] +set create_p [party::permission_p -privilege create $add_to_group_id] # Membership relations have a member_state attribute that gets set # based on the group's join policy. Index: openacs-4/packages/acs-subsite/www/members/member-invite.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/member-invite.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-subsite/www/members/member-invite.tcl 17 Dec 2017 18:36:06 -0000 1.13 +++ openacs-4/packages/acs-subsite/www/members/member-invite.tcl 6 Jun 2018 22:58:09 -0000 1.14 @@ -42,7 +42,7 @@ } ad_form -extend -name user_search -on_submit { - set create_p [group::permission_p -privilege create $group_id] + set create_p [party::permission_p -privilege create $group_id] if { $group_info(join_policy) eq "closed" && !$create_p} { ad_return_forbidden "Cannot invite members" "I'm sorry, but you're not allowed to invite members to this group" Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v diff -u -r1.120 -r1.121 --- openacs-4/packages/contacts/tcl/contacts-procs.tcl 21 Feb 2011 14:27:27 -0000 1.120 +++ openacs-4/packages/contacts/tcl/contacts-procs.tcl 6 Jun 2018 23:02:01 -0000 1.121 @@ -1023,7 +1023,7 @@ group::get -group_id $group_id -array group if { !$no_perm_check_p } { - set create_p [group::permission_p -privilege create $group_id] + set create_p [party::permission_p -privilege create $group_id] if { $group(join_policy) eq "closed" && !$create_p } { error "You do not have permission to add members to the group '$group(group_name)'" }