',
+ '#prefix' => '
',
'#suffix' => '
',
'#options' => $roles,
'#title' => t('View own content'),
@@ -345,8 +400,14 @@
* Formapi #after_build callback, that disables checkboxes for roles without access to content.
*/
function content_access_force_permissions($element, &$form_state) {
+ $type = isset( $form_state['node'] ) ? $form_state['node']->type : $form_state['type'] ;
foreach (array('update', 'update_own', 'delete', 'delete_own') as $op) {
- foreach (content_access_get_settings($op, $form_state['node']->type) as $rid) {
+ foreach (content_access_get_settings($op, $type) as $rid) {
+
+// debug( content_access_get_permission_access(content_access_get_permission_by_op($op, $type)), $op . ' - ' . $type . ' = '. content_access_get_permission_by_op($op, $type));
+
+// foreach( content_access_get_permission_access(content_access_get_permission_by_op($op, $type)) as $rid ) {
+
$element[$op][$rid]['#disabled'] = TRUE;
$element[$op][$rid]['#attributes']['disabled'] = 'disabled';
$element[$op][$rid]['#value'] = TRUE;
@@ -392,11 +453,23 @@
}
/**
+ * Gets the content access acl id of the node.
+ */
+function content_access_get_acl_id($node, $op) {
+ $acl_id = acl_get_id_by_name('content_access', $op .'_'. $node->nid);
+ if (!$acl_id) {
+ // Create one:
+ $acl_id = acl_create_new_acl('content_access', $op .'_'. $node->nid);
+ }
+ return $acl_id;
+}
+
+/**
* Detaches all our ACLs for the nodes of the given type.
*/
function _content_access_remove_acls($type) {
- $result = db_query("SELECT n.nid FROM {node} n WHERE type = '%s'", $type);
- while ($node = db_fetch_object($result)) {
+ $result = db_query("SELECT n.nid FROM {node} n WHERE type = ':type'", array( 'type' => $type));
+ foreach( $result as $node ) {
acl_node_clear_acls($node->nid, 'content_access');
}
}
Index: content_access.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_access/Attic/content_access.css,v
retrieving revision 1.1
diff -u -r1.1 content_access.css
--- content_access.css 17 May 2007 20:32:07 -0000 1.1
+++ content_access.css 2 Sep 2010 14:30:41 -0000
@@ -5,3 +5,7 @@
float: left;
overflow: hide;
}
+
+.content_access-div.new-row {
+ clear: left;
+}
Index: content_access.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_access/Attic/content_access.info,v
retrieving revision 1.1.4.1
diff -u -r1.1.4.1 content_access.info
--- content_access.info 30 Jun 2008 08:56:27 -0000 1.1.4.1
+++ content_access.info 2 Sep 2010 14:30:41 -0000
@@ -2,4 +2,9 @@
name = Content Access
description = Provides flexible content access control
package = Access control
-core = "6.x"
\ No newline at end of file
+core = "7.x"
+
+files[] = content_access.module
+files[] = content_access.install
+files[] = content_access.admin.inc
+files[] = content_access.rules.inc
Index: content_access.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_access/Attic/content_access.install,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 content_access.install
--- content_access.install 28 Oct 2008 13:36:17 -0000 1.1.4.3
+++ content_access.install 2 Sep 2010 14:30:41 -0000
@@ -6,7 +6,8 @@
*/
function content_access_install() {
// Create tables.
- drupal_install_schema('content_access');
+ // happen automatically in D7
+ // drupal_install_schema('content_access');
}
/**
@@ -15,7 +16,8 @@
function content_access_uninstall() {
variable_del('content_access_settings');
// Remove tables.
- drupal_uninstall_schema('content_access');
+ // happen automatically in D7
+ // drupal_uninstall_schema('content_access');
}
/**
Index: content_access.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_access/Attic/content_access.module,v
retrieving revision 1.1.2.9.2.22
diff -u -r1.1.2.9.2.22 content_access.module
--- content_access.module 2 Sep 2010 13:13:33 -0000 1.1.2.9.2.22
+++ content_access.module 2 Sep 2010 14:30:41 -0000
@@ -1,10 +1,36 @@
TRUE,
+ );
+ return $paths;
+}
+
/**
* Implementation of hook_menu().
@@ -13,21 +39,23 @@
$items = array();
$items['node/%node/access'] = array(
- 'title' => 'Access control',
+ 'title' => 'Access Control',
'page callback' => 'drupal_get_form',
'page arguments' => array('content_access_page', 1),
'access callback' => 'content_access_node_page_access',
'access arguments' => array(1),
'file' => 'content_access.admin.inc',
+ 'theme callback' => '_node_custom_theme',
'weight' => 3,
'type' => MENU_LOCAL_TASK
);
- foreach (node_get_types('types', NULL, TRUE) as $type) {
+/*
+ foreach (node_type_get_types() as $type) {
$type_url_str = str_replace('_', '-', $type->type);
- $items['admin/content/node-type/'. $type_url_str .'/access'] = array(
- 'title' => 'Access control',
- 'description' => 'Configure content access control.',
+ $items['admin/structure/types/manage/'. $type_url_str .'/access'] = array(
+ 'title' => t('Access:'.$type->type),
+ 'description' => t('Configure content access control.'),
'page callback' => 'drupal_get_form',
'page arguments' => array('content_access_admin_settings', $type->type),
'access callback' => 'content_access_admin_settings_access',
@@ -37,28 +65,26 @@
'weight' => 1,
);
}
+ */
+ $items['admin/structure/types/manage/%node_type/access'] = array(
+ 'title' => t('Access Control'),
+ 'description' => t('Configure content access control.'),
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('content_access_admin_settings', 4 ),
+ 'access callback' => 'content_access_admin_settings_access',
+ 'access arguments' => array(),
+ 'type' => MENU_LOCAL_TASK,
+ 'file' => 'content_access.admin.inc',
+ 'theme callback' => '_node_custom_theme',
+ 'weight' => 1,
+ );
return $items;
}
-/**
- * Implementation of hook_init().
- *
- * Make node access settings page use admin theme if appropriate.
- *
- * @see system_init()
- */
-function content_access_init() {
- // Use the administrative theme if the user is looking at a page at node/%/access
- if (variable_get('node_admin_theme', '0') && arg(0) == 'node' && arg(2) == 'access') {
- global $custom_theme;
- $custom_theme = variable_get('admin_theme', '0');
- drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'module');
- }
-}
-
function content_access_node_page_access($node) {
global $user;
- return content_access_get_settings('per_node', $node->type) && user_access('grant content access') || content_access_get_settings('per_node', $node->type) && (user_access('grant own content access') && ($user->uid == $node->uid));
+ return content_access_get_settings('per_node', $node->type) && user_access('grant content access') ||
+ content_access_get_settings('per_node', $node->type) && (user_access('grant own content access') && ($user->uid == $node->uid));
}
function content_access_admin_settings_access() {
@@ -68,8 +94,11 @@
/**
* Implementation of hook_perm().
*/
-function content_access_perm() {
- return array('grant content access', 'grant own content access');
+function content_access_permission() {
+ return array(
+ 'grant content access' => array( 'title' => 'Grant Content Access', 'description' => 'View and modify content access for any nodes' ),
+ 'grant own content access' => array( 'title' =>'Grant Own Content Access', 'description' => 'View and modify content access for own nodes' )
+ );
}
/**
@@ -101,11 +130,13 @@
foreach ($grants as $rid => $grant) {
$grants[$rid] = content_access_proccess_grant($grant, $rid, $node);
}
+
// Care for the author grant.
$grant = array();
foreach (array('view', 'update', 'delete') as $op) {
// Get all roles that have access to use $op on this node.
$any_roles = drupal_map_assoc(content_access_per_node_setting($op, $node));
+ $any_roles = $any_roles ? $any_roles : array();
$any_roles += ($op != 'view') ? content_access_get_settings($op, $node->type) : array();
$grant['grant_'. $op] = content_access_own_op($node, $any_roles, content_access_get_rids_per_node_op($op .'_own', $node));
}
@@ -127,6 +158,7 @@
else {
content_access_optimize_grants($grants, $node);
}
+
return $grants;
}
@@ -183,6 +215,7 @@
}
if (!isset($type)) {
$settings = content_access_get_settings();
+
return isset($settings[$return]) ? $settings[$return] : array();
}
return array();
@@ -216,12 +249,14 @@
* Defines default values for settings.
*/
function content_access_get_setting_defaults($setting, $type) {
+ global $user;
+
switch ($setting) {
default:
return array();
case 'view':
case 'view_own':
- return array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID);
+ return content_access_get_permission_access(content_access_get_permission_by_op($setting, $type));
case 'update':
case 'update_own':
case 'delete':
@@ -229,6 +264,8 @@
return content_access_get_permission_access(content_access_get_permission_by_op($setting, $type));
case 'priority':
return 0;
+ case 'per_node' :
+ return array();
}
}
@@ -254,6 +291,10 @@
switch ($op) {
default:
return FALSE;
+ case 'view':
+ return 'view any '. $type .' content';
+ case 'view_own':
+ return 'view own '. $type .' content';
case 'update':
return 'edit any '. $type .' content';
case 'update_own':
@@ -317,8 +358,9 @@
if (!isset($roles[$node->uid])) {
$roles[$node->uid] = $node->uid ? array(DRUPAL_AUTHENTICATED_RID) : array(DRUPAL_ANONYMOUS_RID);
- $result = db_query('SELECT rid FROM {users_roles} WHERE uid = %d', $node->uid);
- while ($role = db_fetch_object($result)) {
+ $result = db_query('SELECT rid FROM {users_roles} WHERE uid = ?', array($node->uid));
+// while ($role = db_fetch_object($result)) {
+ foreach( $result as $role ) {
$roles[$node->uid][] = $role->rid;
}
}
@@ -343,9 +385,12 @@
*/
function content_access_get_rids_per_node_op($op, $node) {
$rids = content_access_per_node_setting($op, $node);
+
if ($permission = content_access_get_permission_by_op($op, $node->type)) {
$perm_roles = content_access_get_permission_access($permission);
+
$rids = array_diff($rids, $perm_roles);
+
if (in_array(DRUPAL_AUTHENTICATED_RID, $perm_roles)) {
return in_array(DRUPAL_ANONYMOUS_RID, $rids) ? array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID) : array(DRUPAL_AUTHENTICATED_RID);
}
@@ -386,10 +431,23 @@
* Saves custom per node settings in the own content_access table.
*/
function content_access_save_per_node_settings($node, $settings) {
- db_query("UPDATE {content_access} SET settings = '%s' WHERE nid = %d", serialize($settings), $node->nid);
- if (!db_affected_rows()) {
- db_query("INSERT INTO {content_access} (nid, settings) VALUES(%d, '%s')", $node->nid, serialize($settings));
- }
+// db_query("UPDATE {content_access} SET settings = '?' WHERE nid = ?", array(serialize($settings), $node->nid));
+
+
+ $result = FALSE;
+ foreach( db_query('select nid as count from {content_access} where nid = :nid ', array( 'nid' => $node->nid )) as $record ) {
+ $result = TRUE;
+ db_update( 'content_access' )
+ ->condition( 'nid', $node->nid )
+ ->fields(array( 'settings' => serialize($settings)))
+ ->execute();
+ }
+
+ if ($result === FALSE ) {
+ db_insert( 'content_access' )
+ ->fields( array( 'nid' => $node->nid, 'settings' => serialize( $settings )))
+ ->execute();
+ }
// Make content_access_per_node_setting() use the new settings
content_access_per_node_setting(NULL, $node, $settings);
}
@@ -398,7 +456,7 @@
* Deletes all custom per node settings, so that content type defaults are used again.
*/
function content_access_delete_per_node_settings($node) {
- db_query("DELETE FROM {content_access} WHERE nid = %d", $node->nid);
+ db_query("DELETE FROM {content_access} WHERE nid = :nid", array( 'nid' => $node->nid));
// Clear the cache.
content_access_per_node_setting(NULL, $node, FALSE);
// Delete possible acl settings
@@ -411,18 +469,6 @@
}
/**
- * Gets the content access acl id of the node.
- */
-function content_access_get_acl_id($node, $op) {
- $acl_id = acl_get_id_by_name('content_access', $op .'_'. $node->nid);
- if (!$acl_id) {
- // Create one:
- $acl_id = acl_create_new_acl('content_access', $op .'_'. $node->nid);
- }
- return $acl_id;
-}
-
-/**
* Gets the per node settings of a node.
*
* @note
@@ -430,11 +476,13 @@
* it will return an empty array.
*/
function content_access_get_per_node_settings($node) {
- $settings = db_result(db_query("SELECT settings FROM {content_access} WHERE nid = %d", $node->nid));
- if (!$settings) {
- return array();
+foreach( db_query("SELECT settings FROM {content_access} WHERE nid = ?", array( $node->nid)) as $record ) {
+ $settings = $record->settings;
+ if (!$settings) {
+ return array();
+ }
+ return unserialize($settings);
}
- return unserialize($settings);
}
/**
@@ -486,7 +534,15 @@
* Implementation of hook_node_type():
* Update settings on node type name change.
*/
+ function content_access_node_type_delete( $info) {
+ content_access_node_type( 'delete', $info );
+ }
+ function content_access_node_type_update( $info) {
+ content_access_node_type( 'update', $info );
+ }
+
function content_access_node_type($op, $info) {
+
switch ($op) {
case 'delete':
$settings = content_access_get_settings();
@@ -543,4 +599,4 @@
*/
function _content_access_get_operations() {
return array('view', 'view_own', 'update', 'update_own', 'delete', 'delete_own');
-}
\ No newline at end of file
+}
Index: content_access.rules.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_access/Attic/content_access.rules.inc,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 content_access.rules.inc
--- content_access.rules.inc 31 Jul 2009 09:09:46 -0000 1.1.2.6
+++ content_access.rules.inc 2 Sep 2010 14:30:41 -0000
@@ -42,44 +42,49 @@
function content_access_rules_action_info() {
$items = array(
'content_access_action_grant_node_permissions' => array(
- 'label' => t('Grant content permissions by role'),
- 'arguments' => array(
+ 'label' => t('Grant content permissions by role'),
+ 'parameter' => array(
'node' => array('type' => 'node', 'label' => t('Content')),
),
- 'module' => 'Content access',
+ 'group' => 'Content access',
+ 'base' => 'content_access_action_grant_node_permissions'
),
'content_access_action_revoke_node_permissions' => array(
'label' => t('Revoke content permissions by role'),
- 'arguments' => array(
+ 'parameter' => array(
'node' => array('type' => 'node', 'label' => t('Content')),
),
- 'module' => 'Content access',
+ 'group' => 'Content access',
+ 'base' => 'content_access_action_revoke_node_permissions'
),
'content_access_action_reset_node_permissions' => array(
'label' => t('Reset content permissions'),
- 'arguments' => array(
+ 'parameter' => array(
'node' => array('type' => 'node', 'label' => t('Content')),
),
- 'module' => 'Content access',
+ 'group' => 'Content access',
+ 'base' => 'content_access_action_reset_node_permissions'
),
);
if (module_exists('acl')) {
$items += array(
'content_access_action_acl_grant_access' => array(
'label' => t('Grant access for a user'),
- 'arguments' => array(
+ 'parameter' => array(
'node' => array('type' => 'node', 'label' => t('Content')),
'user' => array('type' => 'user', 'label' => t('User')),
),
- 'module' => 'Content access',
+ 'group' => 'Content access',
+ 'base' => 'content_access_action_acl_grant_access'
),
'content_access_action_acl_revoke_access' => array(
'label' => t('Revoke access for a user'),
- 'arguments' => array(
+ 'parameter' => array(
'node' => array('type' => 'node', 'label' => t('Content')),
'user' => array('type' => 'user', 'label' => t('User')),
),
- 'module' => 'Content access',
+ 'group' => 'Content access',
+ 'base' => 'content_access_action_acl_revoke_access'
),
);
}