? content_access_d7_2.patch Index: content_access.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/content_access/Attic/content_access.admin.inc,v retrieving revision 1.1.2.24 diff -u -p -r1.1.2.24 content_access.admin.inc --- content_access.admin.inc 19 Jul 2010 11:40:11 -0000 1.1.2.24 +++ content_access.admin.inc 16 Sep 2010 21:26:42 -0000 @@ -13,14 +13,14 @@ define('CONTENT_ACCESS_MASS_UPDATE_THRES /** * Per node settings page. */ -function content_access_page(&$form_state, $node) { - drupal_set_title(t('Access control for %title', array('%title' => $node->title))); +function content_access_page($form, &$form_state, $node) { + drupal_set_title(t('Access control for "' ). $node->title.'"'); foreach (_content_access_get_operations() as $op) { $defaults[$op] = content_access_per_node_setting($op, $node); } - $form = content_access_role_based_form($defaults); + $form = content_access_role_based_form( $form, $defaults); // Add a after_build handler that disables checkboxes, which are enforced by permissions. $form['per_role']['#after_build'] = array('content_access_force_permissions'); @@ -35,7 +35,7 @@ function content_access_page(&$form_stat ); foreach (array('view', 'update', 'delete') as $op) { $acl_id = content_access_get_acl_id($node, $op); - acl_node_add_acl($node->nid, $acl_id, $op == 'view', $op == 'update', $op == 'delete', content_access_get_settings('priority', $node->type)); + acl_node_add_acl($node->nid, $acl_id, (int)($op == 'view'), (int)($op == 'update'), (int)($op == 'delete'), content_access_get_settings('priority', $node->type)); $form['acl'][$op] = acl_edit_form($acl_id, t('Grant !op access', array('!op' => $op))); $form['acl'][$op]['#collapsed'] = !isset($_POST['acl_'. $acl_id]) && !unserialize($form['acl'][$op]['user_list']['#default_value']); } @@ -58,7 +58,7 @@ function content_access_page(&$form_stat if (!$node->status) { drupal_set_message(t("Warning: Your content is not published, so this settings are not taken into account as long as the content remains unpublished."), 'error'); } - + return $form; } @@ -70,6 +70,7 @@ function content_access_page_submit($for // Set the settings so that further calls will return this settings. $settings[$op] = array_keys(array_filter($form_state['values'][$op])); } + // Save per-node settings. content_access_save_per_node_settings($node, $settings); @@ -96,7 +97,9 @@ function content_access_page_reset($form /** * Per content type administration page form. */ -function content_access_admin_settings(&$form_state, $type) { +function content_access_admin_settings( $form, &$form_state, $typeobject ) { + $type = $typeobject->type; + $form_state['type'] = $type; // Add role based per content type settings @@ -104,14 +107,14 @@ function content_access_admin_settings(& foreach (_content_access_get_operations() as $op) { $defaults[$op] = content_access_get_settings($op, $type); } - $form = content_access_role_based_form($defaults); + $form = content_access_role_based_form( $form, $defaults); // Per node: $form['node'] = array( '#type' => 'fieldset', '#title' => t('Per content node access control settings'), '#collapsible' => TRUE, - '#description' => t('Optionally you can enable per content node access control settings. If enabled, a new tab for the content access settings appears when viewing content. You have to configure permission to access these settings at the !permissions page.', array('!permissions' => l(t('permissions'), 'admin/user/permissions'))), + '#description' => t('Optionally you can enable per content node access control settings. If enabled, a new tab for the content access settings appears when viewing content. You have to configure permission to access these settings at the !permissions page.', array('!permissions' => l(t('permissions'), 'admin/people/permissions'))), ); $form['node']['per_node'] = array( '#type' => 'checkbox', @@ -142,13 +145,22 @@ function content_access_admin_settings(& function content_access_admin_settings_submit($form, &$form_state) { // Where possible let the drupal permissions system handle access control. $permissions = content_access_get_permissions_by_role(); + + $roles = user_roles(); + foreach (array('update', 'update_own', 'delete', 'delete_own') as $op) { foreach ($form_state['values'][$op] as $rid => $value) { - $permissions[$rid][ content_access_get_permission_by_op($op, $form_state['type']) ] = $value; + $permission = content_access_get_permission_by_op($op, $form_state['type']); + if( $value ) { + $permissions[$rid][] = $permission; + } else { + $permissions[$rid] = array_diff( $permissions[$rid], array( $permission )); + } } // Don't save the setting, so its default value (get permission) is applied always. unset($form_state['values'][$op]); } + content_access_save_permissions($permissions); // Update content access settings @@ -176,7 +188,9 @@ function content_access_admin_settings_s } if (content_access_mass_update(array($type))) { - drupal_set_message(t('Permissions have been successfully rebuilt for the content type @types.', array('@types' => node_get_types('name', $type)))); + drupal_set_message( + t('Permissions have been successfully rebuilt for the content type @types.', + array('@types' => node_type_get_name( $type)))); } } @@ -191,14 +205,19 @@ function content_access_admin_settings_s * Whether the operation has been processed successfully (TRUE) or postponed (FALSE). */ function content_access_mass_update($types) { - $count = db_result(db_query("SELECT COUNT(DISTINCT nid) FROM {node} WHERE type IN (". db_placeholders($types, 'text') .")", $types)); + $q = db_select( "node", 'n' ) + ->fields( 'n', array( 'nid' )) + ->condition( 'n.type', $types, 'IN' ); + + $count = $q->countQuery()->execute()->fetchField(); + node_access_needs_rebuild(TRUE); // If there not too much nodes affected, try to do it. - if ($count <= CONTENT_ACCESS_MASS_UPDATE_THRESHOLD) { - $result = db_query("SELECT nid FROM {node} WHERE type IN (". db_placeholders($types, 'text') .")", $types); - while ($node = db_fetch_object($result)) { - node_access_acquire_grants(node_load($node->nid)); + if ( $count <= CONTENT_ACCESS_MASS_UPDATE_THRESHOLD) { + $records = $q->execute(); + foreach( $records as $node ) { + node_access_acquire_grants(node_load($node->nid)); } cache_clear_all(); @@ -212,12 +231,18 @@ function content_access_mass_update($typ * Gets the permissions for the role of the given id. */ function content_access_get_permissions_by_role() { - $result = db_query('SELECT r.rid, p.perm FROM {role} r LEFT JOIN {permission} p ON r.rid = p.rid'); $permissions = array(); - while ($role = db_fetch_object($result)) { - $permissions[$role->rid] = array_filter(drupal_map_assoc(explode(', ', $role->perm))); + $result = db_query('SELECT r.rid, p.permission FROM {role} r LEFT JOIN {role_permission} p ON r.rid = p.rid'); + foreach( $result as $rolepermission ) { + if( ! isset( $permissions[ $rolepermission->rid ] )) { + $permissions[ $rolepermission->rid ] = array(); + } + + $permissions[ $rolepermission->rid ][] = $rolepermission->permission; + } - return $permissions; + + return $permissions; } /** @@ -225,10 +250,17 @@ function content_access_get_permissions_ */ function content_access_save_permissions($permissions) { foreach ($permissions as $rid => $perms) { - $perms = array_filter($perms); - db_query('DELETE FROM {permission} WHERE rid = %d', $rid); - if (count($perms)) { - db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, implode(', ', array_keys($perms))); + $perms = array_unique( array_filter($perms)); + db_query('DELETE FROM {role_permission} WHERE rid = :rid', array( 'rid' => $rid )); + foreach( $perms as $permission ) { + if( ! is_numeric( $permission )) { // Not sure if it is ever could be true now. Used to happen. + db_insert( 'role_permission' ) + ->fields( array( + 'rid' => $rid, + 'permission' => $permission + )) + ->execute(); + } } } // Make sure new permissions are applied immediately. @@ -241,7 +273,7 @@ function content_access_save_permissions * @param $defaults * Array of defaults for all operations. */ -function content_access_role_based_form($defaults = array()) { +function content_access_role_based_form($form, $defaults = array()) { // Make sure defaults are set properly foreach (_content_access_get_operations() as $op) { @@ -264,7 +296,7 @@ function content_access_role_based_form( '#options' => $roles, '#title' => t('View any content'), '#default_value' => $defaults['view'], - '#process' => array('expand_checkboxes', 'content_access_disable_checkboxes'), + '#process' => array('form_process_checkboxes', 'content_access_disable_checkboxes'), ); $form['per_role']['update'] = array('#type' => 'checkboxes', '#prefix' => '