diff -u project.module project.module --- project.module 16 Aug 2010 20:16:48 -0000 +++ project.module 16 Aug 2010 21:12:32 -0000 @@ -522,7 +522,7 @@ 'title' => 'Maintainers', 'page callback' => 'drupal_get_form', 'page arguments' => array('project_maintainers_form', 1), - 'access callback' => 'project_check_access', + 'access callback' => 'project_user_access', 'access arguments' => array(1, 'administer maintainers'), 'file' => 'includes/project_maintainers.inc', 'type' => MENU_LOCAL_TASK, @@ -531,7 +531,7 @@ $items['node/%project_node/maintainers/delete/%user'] = array( 'page callback' => 'drupal_get_form', 'page arguments' => array('project_maintainer_delete_confirm', 1, 4), - 'access callback' => 'project_check_access', + 'access callback' => 'project_user_access', 'access arguments' => array(1, 'administer maintainers'), 'file' => 'includes/project_maintainers.inc', 'type' => MENU_CALLBACK, @@ -595,7 +595,7 @@ * @param $permission * The string representing the permission to check access for. */ -function project_check_access($project, $permission) { +function project_user_access($project, $permission) { global $user; if (empty($user->uid)) { return FALSE; @@ -712,11 +712,11 @@ switch ($op) { case 'view': // Since this function is shared for project_release nodes, we have to - // be careful what node we pass to project_check_access(). + // be careful what node we pass to project_user_access(). if ($node->type == 'project_release') { $node = node_load($node->project_release['pid']); } - if (project_check_access($node, 'administer settings')) { + if (project_user_access($node, 'administer settings')) { return TRUE; } if (!user_access('access projects')) { @@ -736,7 +736,7 @@ } break; case 'update': - if (project_check_access($node, 'administer settings')) { + if (project_user_access($node, 'administer settings')) { return TRUE; } break; diff -u release/project_release.module release/project_release.module --- release/project_release.module 16 Aug 2010 20:19:51 -0000 +++ release/project_release.module 16 Aug 2010 21:12:32 -0000 @@ -40,7 +40,7 @@ 'title' => 'Releases', 'page callback' => 'project_release_project_edit_releases', 'page arguments' => array(1), - 'access callback' => 'project_check_access', + 'access callback' => 'project_user_access', 'access arguments' => array(1, 'administer releases'), 'type' => MENU_LOCAL_TASK, 'file' => 'includes/project_edit_releases.inc', @@ -120,7 +120,7 @@ // We can't just use project_project_access() here, since we // need to check access to the project itself, not the release // node, so we use the helper method and pass the project id. - return project_check_access($node->project_release['pid'], 'administer releases'); + return project_user_access($node->project_release['pid'], 'administer releases'); case 'delete': // No one should ever delete a release node, only unpublish it. return FALSE; @@ -652,7 +652,7 @@ } // Display packaging errors to admins. - if (project_check_access($node->project_release['pid'], 'administer releases')) { + if (project_user_access($node->project_release['pid'], 'administer releases')) { $rows = array(); $result = db_query('SELECT * FROM {project_release_package_errors} WHERE nid = %d', $node->nid); $error = db_fetch_object($result); @@ -733,7 +733,7 @@ $where = ''; $join = ''; $args = array($project->nid); - if (!project_check_access($project, 'administer releases')) { + if (!project_user_access($project, 'administer releases')) { if (!empty($rids)) { $where = "AND (n.status = %d OR n.nid IN (". db_placeholders($rids) ."))"; $args[] = 1; @@ -1273,7 +1273,7 @@ ), ); - if (project_check_access($node->nid, 'administer releases')) { + if (project_user_access($node->nid, 'administer releases')) { $links['project_release']['links']['add_new_release'] = l(t('Add new release'), 'node/add/project_release/'. $node->nid); $links['project_release']['links']['administer_releases'] = l(t('Administer releases'), 'node/'. $node->nid .'/edit/releases'); } diff -u release/includes/release_node_form.inc release/includes/release_node_form.inc --- release/includes/release_node_form.inc 16 Aug 2010 20:17:48 -0000 +++ release/includes/release_node_form.inc 16 Aug 2010 21:12:32 -0000 @@ -24,7 +24,7 @@ } // Make sure this user should have permissions to add releases for // the requested project - if (!project_check_access($project, 'administer releases')) { + if (!project_user_access($project, 'administer releases')) { drupal_access_denied(); module_invoke_all('exit'); exit;