Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a member_list permission to allow or deny viewing of the full member list #83

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crm/include/member/install.inc.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ function member_install($old_revision = 0) {
, '8' => 'webAdmin' , '8' => 'webAdmin'
); );
$default_perms = array( $default_perms = array(
'member' => array('member_view', 'member_membership_view') 'member' => array('member_list', 'member_view', 'member_membership_view')
, 'director' => array('member_plan_edit', 'member_view', 'member_add', 'member_edit', 'member_delete', 'member_membership_view', 'member_membership_edit') , 'director' => array('member_list', 'member_plan_edit', 'member_view', 'member_add', 'member_edit', 'member_delete', 'member_membership_view', 'member_membership_edit')
); );
foreach ($roles as $rid => $role) { foreach ($roles as $rid => $role) {
if (array_key_exists($role, $default_perms)) { if (array_key_exists($role, $default_perms)) {
Expand Down
1 change: 1 addition & 0 deletions crm/include/member/member.inc.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ function member_permissions () {
, 'contact_edit' , 'contact_edit'
, 'contact_delete' , 'contact_delete'
, 'member_plan_edit' , 'member_plan_edit'
, 'member_list'
, 'member_view' , 'member_view'
, 'member_add' , 'member_add'
, 'member_edit' , 'member_edit'
Expand Down
7 changes: 7 additions & 0 deletions crm/include/member/page.inc.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ function member_page (&$page_data, $page_name, $options) {
return; return;
} }


// Disallow access if neccessary
// TODO: maybe add a nice error message
if (!user_access('member_list') && $_GET['cid'] != user_id()) {
page_set_title($page_data, "Error");
return;
}

// Set page title // Set page title
page_set_title($page_data, theme('member_contact_name', $cid)); page_set_title($page_data, theme('member_contact_name', $cid));


Expand Down
6 changes: 6 additions & 0 deletions crm/include/member/table.inc.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ function member_table ($opts = NULL) {


// Loop through member data // Loop through member data
foreach ($members as $member) { foreach ($members as $member) {

// If the user does not have member_list access, disallow listing
// for all members other than its own user
if (!user_access('member_list') && $member['cid'] != user_id()) {
continue;
}


// Add user data // Add user data
$row = array(); $row = array();
Expand Down