diff --git a/field_permissions.module b/field_permissions.module
index ce14ee0..b69e48f 100644
--- a/field_permissions.module
+++ b/field_permissions.module
@@ -59,39 +59,10 @@ function field_permissions_menu() {
'type' => MENU_LOCAL_TASK,
'weight' => 0,
);
-
- // @todo: what to do with non-node objects?
-/*
- $items['admin/structure/field_permissions/troubleshooting'] = array(
- 'title' => 'Troubleshooting',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('field_permissions_troubleshooting_form'),
- 'access arguments' => array('administer field permissions'),
- 'file' => 'includes/admin.inc',
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 10,
- );
- $items['field_permissions/autocomplete'] = array(
- 'title' => 'Field permissions autocomplete',
- 'page callback' => 'field_permissions_autocomplete',
- 'access arguments' => array('administer field permissions'),
- 'file' => 'includes/admin.inc',
- 'type' => MENU_CALLBACK,
- );
-//*/
return $items;
}
/**
- * Implementation of hook_theme().
- */
-function field_permissions_theme() {
- return array(
- 'field_permissions_troubleshooting_form' => array('render element' => 'form', 'file' => 'includes/admin.inc'),
- );
-}
-
-/**
* Implementation of hook_permission().
*/
function field_permissions_permission() {
diff --git a/includes/admin.inc b/includes/admin.inc
index b1cd5af..0e5f0ae 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -424,323 +424,3 @@ function field_permissions_overview() {
}
return $output;
}
-
-/**
- * Menu callback; Field permissions autocomplete.
- */
-function field_permissions_autocomplete($type = '', $string = '') {
- $matches = array();
- if (!empty($string)) {
- if ($type == 'nodes') {
- $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title FROM {node} n WHERE LOWER(n.title) LIKE LOWER('%%%s%%') ORDER BY n.title"), $string, 0, 10);
- while ($row = db_fetch_object($result)) {
- $matches[$row->title ." [nid:$row->nid]"] = ''. check_plain($row->title) . '
';
- }
- }
- elseif ($type == 'users') {
- $result = db_query_range("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%') AND uid <> 0 ORDER BY name", $string, 0, 10);
- while ($row = db_fetch_object($result)) {
- $matches[$row->name] = check_plain($row->name);
- }
- }
- }
- drupal_json($matches);
-}
-
-/**
- * Function used by uasort to sort structured arrays by title.
- */
-function _field_permissions_sort_fields($a, $b) {
- $a_text = (is_array($a) && isset($a['widget']['label'])) ? $a['widget']['label'] : '';
- $b_text = (is_array($b) && isset($b['widget']['label'])) ? $b['widget']['label'] : '';
- return strcasecmp($a_text, $b_text);
-}
-
-/**
- * Menu callback; Field permissions troubleshooting form.
- */
-function field_permissions_troubleshooting_form(&$form_state, $nid = NULL, $field_name = NULL, $uid = NULL) {
-//print ''. check_plain(var_export($rows, TRUE)) .'
';
- $form = array();
- $form['options'] = array(
- '#type' => 'fieldset',
- '#title' => t('Report options'),
- );
- $node = (!empty($nid) ? node_load($nid) : NULL);
- $form['options']['node'] = array(
- '#type' => 'textfield',
- '#title' => t('Node'),
- '#default_value' => (!empty($node->nid) ? $node->title ." [nid:$node->nid]" : ''),
- '#autocomplete_path' => 'field_permissions/autocomplete/nodes',
- '#required' => TRUE,
- '#description' => t('Select the node that you want to check access to.'),
- );
- if (!empty($node->nid)) {
- $form['#node'] = $node;
- }
-
- if (empty($node->type)) {
- $form['options']['next'] = array(
- '#type' => 'submit',
- '#value' => t('Next'),
- );
- return $form;
- }
-
- $content_type = content_types($node->type);
- $content_fields = $content_type['fields'];
- uasort($content_fields, '_field_permissions_sort_fields');
- $fields = array('' => '-- '. t('Select field') .' --');
- foreach ($content_fields as $field) {
- $fields[$field['field_name']] = t('@field-label (@field-name)', array('@field-label' => $field['widget']['label'], '@field-name' => $field['field_name']));
- }
- $field = (!empty($field_name) && !empty($content_fields[$field_name]) ? $content_fields[$field_name] : NULL);
- $form['options']['field'] = array(
- '#type' => 'select',
- '#title' => t('Field'),
- '#options' => $fields,
- '#default_value' => (!empty($field) ? $field_name : NULL),
- '#description' => t('Emulate access to the given node.'),
- '#description' => t('Select the field on the selected node that you want to check access to.'),
- );
- $form['#field'] = $field;
-
- $account = (!empty($uid) ? user_load($uid) : ($uid == 0 ? drupal_anonymous_user() : NULL));
- $form['options']['user'] = array(
- '#type' => 'textfield',
- '#title' => t('User'),
- '#size' => 30,
- '#maxlength' => 60,
- '#default_value' => (!empty($account->name) ? $account->name : ''),
- '#autocomplete_path' => 'field_permissions/autocomplete/users',
- '#description' => t('Select the user that you want to check. Access to the specified node will be checked using all different roles assigned to this user. Leave blank to check for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))),
- );
- $form['#account'] = (!empty($account->uid) ? $account : NULL);
-
- if (!empty($form['#field'])) {
- $form['options']['#collapsible'] = $form['options']['#collapsed'] = TRUE;
- }
- $form['options']['node']['#disabled'] = TRUE;
- $form['options']['node']['#value'] = $form['options']['node']['#default_value'];
-
- $form['options']['check'] = array(
- '#type' => 'submit',
- '#value' => t('Check'),
- );
- $form['options']['reset'] = array(
- '#type' => 'submit',
- '#value' => t('Reset'),
- );
-
- if (!empty($form['#field'])) {
- if (!isset($account->uid)) {
- $account = drupal_anonymous_user();
- $account->name = variable_get('anonymous', t('Anonymous'));
- }
- if ($node->uid == $account->uid) {
- $node_author = $account->name;
- }
- else {
- $node_account = user_load($node->uid);
- $node_author = $node_account->name;
- }
- $nodetype_name = node_get_types('name', $node->type);
- if (module_exists('i18ncontent')) {
- $nodetype_name = tt("nodetype:type:$node->type:name", $nodetype_name);
- }
- $form['report'] = array(
- '#type' => 'fieldset',
- '#title' => t('Report'),
- '#description' => t('This report simulates different operations to access the field %field-label in the node %node-title (nid: @node-nid), created by %node-author (uid: @node-uid), or creation of nodes of type %node-type, for each role assigned to user %user-name (uid: @uid). Move the mouse over each status icon to review detailed information about each test.', array(
- '%field-label' => (!empty($field['widget']['label']) ? $field['widget']['label'] : $field['field_name']),
- '%node-title' => $node->title,
- '@node-nid' => $node->nid,
- '%node-author' => $node_author,
- '@node-uid' => $node->uid,
- '%node-type' => $nodetype_name,
- '%user-name' => $account->name,
- '@uid' => $account->uid,
- )),
- );
- }
-
- return $form;
-}
-
-/**
- * Validate callback for the Field permissions troubleshooting form.
- */
-function field_permissions_troubleshooting_form_validate($form, &$form_state) {
- if ($form_state['values']['op'] == t('Reset')) {
- return;
- }
-
- // Validate the node.
- $value = $form_state['values']['node'];
- preg_match('`^(?:\s*|(.*) )?\[\s*nid\s*:\s*([0-9]+)\s*\]\s*$`', $value, $matches);
- if (empty($matches)) {
- // No explicit nid.
- if (!($node = node_load(array('title' => $value)))) {
- form_set_error('node', t('Node: found no valid post with that title.'));
- return;
- }
- }
- else {
- // Explicit [nid:n].
- list(, $title, $nid) = $matches;
- if (($node = node_load($nid)) && !empty($title) && trim($title) != trim($node->title)) {
- form_set_error('node', t('Node: title mismatch. Please check your selection.'));
- return;
- }
- elseif (empty($node->nid)) {
- form_set_error('node', t('Node: found no valid post with that title.'));
- return;
- }
- }
- $form_state['values']['nid'] = $node->nid;
-
- // Validate the field against the node type.
- if (!empty($form['options']['field'])) {
- if (empty($form_state['values']['field'])) {
- form_set_error('field', t('Field: please, select a field.'));
- return;
- }
- else {
- $content_type = content_types($node->type);
- if (empty($content_type['fields'][$form_state['values']['field']])) {
- form_set_error('field', t('Field: %field does not exist in the selected node type.', array('%field' => $form['options']['field']['#options'][$form_state['values']['field']])));
- return;
- }
- }
- }
-
- // Validate the user.
- if (!empty($form_state['values']['user'])) {
- if (!($account = user_load(array('name' => $form_state['values']['user'])))) {
- form_set_error('user', t('User: user %name cannot be found.', array('%name' => $form_state['values']['user'])));
- return;
- }
- $form_state['values']['uid'] = $account->uid;
- }
-}
-
-/**
- * Submit callback for the Field permissions troubleshooting form.
- */
-function field_permissions_troubleshooting_form_submit($form, &$form_state) {
- $url = 'admin/structure/field_permissions/troubleshooting';
- if ($form_state['values']['op'] != t('Reset')) {
- $url .= '/'. $form_state['values']['nid'] .'/'. $form_state['values']['field'];
- if (!empty($form_state['values']['uid'])) {
- $url .= '/'. $form_state['values']['uid'];
- }
- }
- $form_state['redirect'] = $url;
-}
-
-/**
- * Render the Field permissions troubleshooting form.
- */
-function theme_field_permissions_troubleshooting_form($form) {
- // Stop rendering if form has errors or no options have been supplied.
- if (form_get_errors() || empty($form['#node']) || empty($form['#field'])) {
- return drupal_render($form);
- }
-
- // Send javascript and stylesheets used for the troubleshooting report.
- $module_path = drupal_get_path('module', 'field_permissions');
- drupal_add_css($module_path .'/css/field_permissions.admin.css');
- drupal_add_js($module_path .'/js/field_permissions.tooltip.js');
-
- // Check access to the given field in the given node by the selected user.
- $base_node = &$form['#node'];
- $field = &$form['#field'];
-
- $base_account = (!empty($form['#account']) ? $form['#account'] : drupal_anonymous_user());
- $modules = module_implements('field_access');
- $permissions_list = field_permissions_list();
- $user_roles = ($base_account->uid == 1 ? array(-1 => t('site administrator (uid: 1)')) : $base_account->roles);
-
- $headers = array(t('User role'));
- foreach ($permissions_list as $permission_type => $permission_info) {
- $headers[] = array('data' => $permission_info['label'], 'class' => 'field-permissions-header');
- }
- $rows = array();
- foreach ($user_roles as $rid => $role_name) {
- $row = array(check_plain($role_name));
- foreach ($permissions_list as $permission_type => $permission_info) {
- // Prepare the user account.
- if ($rid == DRUPAL_ANONYMOUS_RID) {
- $testing_account = drupal_anonymous_user();
- $testing_account->name = variable_get('anonymous', t('Anonymous'));
- }
- else {
- $testing_account = drupal_clone($base_account);
- $testing_account->roles = array(DRUPAL_AUTHENTICATED_RID => $testing_account->roles[DRUPAL_AUTHENTICATED_RID]);
- if ($testing_account->uid != 1 && $rid != DRUPAL_AUTHENTICATED_RID) {
- $testing_account->roles[$rid] = $role_name;
- }
- }
- // Reset the static storage in user_access().
- user_access('access content', $testing_account, TRUE);
-
- // Prepare the node.
- $testing_node = drupal_clone($base_node);
-
- // Prepare the results.
- $results = array();
- $result = TRUE;
-
- if ($permission_type == 'view' || $permission_type == 'view own') {
- $op = 'view';
- $result = $results['node_access(view)'] = node_access('view', $testing_node, $testing_account);
- }
- else {
- $op = 'edit';
- if ($permission_type == 'create') {
- unset($testing_node->nid);
- $result = $results['node_access(create)'] = node_access('create', $testing_node->type, $testing_account);
- }
- else {
- $result = $results['node_access(update)'] = node_access('update', $testing_node, $testing_account);
- }
- }
-
- // Check access to field only when node access is granted.
- if ($result !== FALSE) {
- foreach ($modules as $module) {
- $key = $module .'_field_access('. $op .')';
- $results[$key] = module_invoke($module, 'field_access', $op, $field, $testing_account, $testing_node);
- if ($results[$key] === FALSE) {
- $result = FALSE;
- }
- }
- }
-
- if ($result !== FALSE) {
- $status = 'on';
- $title = t('Access allowed');
- }
- else {
- $status = 'off';
- $title = t('Access denied');
- }
- $icon = '';
- $items = array();
- foreach ($results as $key => $result) {
- $items[] = $key .': '. check_plain(strtoupper(var_export($result, TRUE)));
- }
- $items = (!empty($items) ? ''. theme('item_list', $items, t('Detailed results for %role -vs- %operation', array('%role' => $role_name, '%operation' => $permission_info['label']))) .'
' : '');
- $row[] = array('data' => $icon . $items, 'class' => 'field-permissions-cell');
- }
- $rows[] = $row;
- }
-
- $form['report']['table'] = array(
- '#type' => 'markup',
- '#value' => theme('table', $headers, $rows),
- );
- $output = drupal_render($form);
-
- return $output;
-}