Index: modules/distributor_service/distributor_service.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/content_distribution/modules/distributor_service/distributor_service.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 distributor_service.inc --- modules/distributor_service/distributor_service.inc 18 Dec 2009 21:28:26 -0000 1.1.2.2 +++ modules/distributor_service/distributor_service.inc 21 Dec 2009 21:53:24 -0000 @@ -8,29 +8,6 @@ /** - * Check if the user is allowed to access the node data. - * - */ -function distributor_service_get_access() { - global $user; - if (user_access('get any node distribution data')) { - return TRUE; - } -} - -/** - * Check if the user is allowed to delete the node. - * - */ -function distributor_service_delete_access() { - global $user; - if ((user_access('delete distributed nodes'))) { - return TRUE; - } -} - - -/** * Returns a specified node. * * @param $type Index: modules/distributor_service/distributor_service.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/content_distribution/modules/distributor_service/distributor_service.module,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 distributor_service.module --- modules/distributor_service/distributor_service.module 21 Dec 2009 21:37:50 -0000 1.1.2.4 +++ modules/distributor_service/distributor_service.module 21 Dec 2009 21:53:24 -0000 @@ -22,6 +22,7 @@ function distributor_service_help($path, function distributor_service_perm() { return array( 'get any node distribution data', + 'delete distributed nodes', ); } @@ -35,7 +36,7 @@ function distributor_service_service() { array( '#method' => 'node.getType', '#callback' => 'distributor_service_get_type', - '#access callback' => 'distributor_service_get_access', + '#access arguments' => array('get any node distribution data'), '#file' => array('file' => 'inc', 'module' => 'distributor_service'), '#args' => array( array( @@ -52,7 +53,7 @@ function distributor_service_service() { array( '#method' => 'node.getAllTypes', '#callback' => 'distributor_service_get_all_types', - '#access callback' => 'distributor_service_get_access', + '#access arguments' => array('get any node distribution data'), '#file' => array('file' => 'inc', 'module' => 'distributor_service'), '#args' => array(), '#return' => 'array', @@ -63,7 +64,7 @@ function distributor_service_service() { array( '#method' => 'node.deleteDistributedNode', '#callback' => 'distributor_service_delete_node', - '#access callback' => 'distributor_service_get_access', + '#access arguments' => array('delete distributed nodes'), '#file' => array('file' => 'inc', 'module' => 'distributor_service'), '#args' => array( array(