Index: server/pifr_server.manage.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/server/pifr_server.manage.inc,v retrieving revision 1.32 diff -u -r1.32 pifr_server.manage.inc --- server/pifr_server.manage.inc 27 Oct 2009 00:31:06 -0000 1.32 +++ server/pifr_server.manage.inc 28 Oct 2009 04:41:39 -0000 @@ -52,17 +52,19 @@ 'title' => t('view test'), 'href' => "pifr/test/{$client['test_id']}" ); - if ($client['status'] == PIFR_SERVER_CLIENT_STATUS_ENABLED) { - $links['client_disable'] = array( - 'title' => t('disable'), - 'href' => "$base/disable/{$client['client_id']}" - ); - } - elseif ($client['status'] == PIFR_SERVER_CLIENT_STATUS_DISABLED || $client['status'] == PIFR_SERVER_CLIENT_STATUS_FAIL) { - $links['client_enable'] = array( - 'title' => t('request enable'), - 'href' => "$base/enable/{$client['client_id']}" - ); + if (pifr_server_manage_access($client['client_id'], $account)) { + if ($client['status'] == PIFR_SERVER_CLIENT_STATUS_ENABLED) { + $links['client_disable'] = array( + 'title' => t('disable'), + 'href' => "$base/disable/{$client['client_id']}" + ); + } + elseif ($client['status'] == PIFR_SERVER_CLIENT_STATUS_DISABLED || $client['status'] == PIFR_SERVER_CLIENT_STATUS_FAIL) { + $links['client_enable'] = array( + 'title' => t('request enable'), + 'href' => "$base/enable/{$client['client_id']}" + ); + } } $links['client_edit'] = array( 'title' => t('edit'), Index: server/pifr_server.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/server/pifr_server.module,v retrieving revision 1.49 diff -u -r1.49 pifr_server.module --- server/pifr_server.module 28 Oct 2009 03:06:30 -0000 1.49 +++ server/pifr_server.module 28 Oct 2009 04:41:39 -0000 @@ -50,11 +50,15 @@ * Check if user has access to edit client. * * @param integer $client_id Client ID. - * @param object $account User object. + * @param object $account (Optional) User object. * @return boolean Access granted. */ -function pifr_server_manage_access($client_id, $account) { - if (user_access('pifr manage own client', $account)) { +function pifr_server_manage_access($client_id, $account = NULL) { + if (user_access('pifr manage clients')) { + return TRUE; + } + + if ($account && user_access('pifr manage own client', $account)) { $client = pifr_server_client_get($client_id); if ($account->uid == $client['uid']) { return TRUE;