This table provides a summary of the field type support found on the system. It is recommended that you use global settings whenever possible to configure field comparison settings.
'), + ); + + $header = array(t('Type'), t('Module'), t('Operations')); + $rows = array(); + + // Skip field types which have no widget types. + $field_types = field_info_field_types(); + $widgets = array(); + foreach (field_info_widget_types() as $name => $widget_type) { + foreach ($widget_type['field types'] as $widget_field_type) { + if (isset($field_types[$widget_field_type])) { + $widgets[$widget_field_type][$name] = $widget_type['label']; + } + } + } + + foreach ($field_types as $field_name => $field_type) { + if (!empty($widgets[$field_name])) { + $row = array(); + $row[] = t('@field_label (%field_type)', array( + '@field_label' => $field_type['label'], + '%field_type' => $field_name, + )); + $row[] = $field_type['module']; + $row[] = l(t('Global settings'), 'admin/config/content/diff/fields/' . $field_name); + $rows[] = $row; + } + } + + $build['category_table'] = array( + '#theme' => 'table', + '#header' => $header, + '#rows' => $rows, + '#empty' => t('The system has no configurable fields.'), + ); + return $build; +} + +/** + * Menu form callback for the field settings. + */ +function diff_admin_global_field_settings($form, $form_state, $type) { + module_load_include('diff.inc', 'diff'); + + $field_types = field_info_field_types(); + if (!isset($field_types[$type])) { + drupal_set_message(t('Invalid field type.'), 'error'); + drupal_goto('admin/config/content/diff/fields'); + } + $field_type = $field_types[$type]; + + // Set the title to give more context to this page. + drupal_set_title(t('Global settings for %label fields', array( + '%label' => $field_type['label'], + )), PASS_THROUGH); + + $variable_name = "diff_{$field_type['module']}_field_{$type}_default_options"; + $settings = variable_get($variable_name, array()); + $settings = _diff_field_default_settings($field_type['module'], $type, $settings); + $func = $field_type['module'] . '_field_diff_options_form'; + if (function_exists($func) && $options_form = $func($type, $settings)) { + $form[$variable_name] = $options_form; + } + $form[$variable_name]['#tree'] = TRUE; + + diff_global_settings_form($form[$variable_name], $form_state, $type, $settings); + return system_settings_form($form); +} diff --git a/diff.api.php b/diff.api.php new file mode 100644 index 0000000..507293a --- /dev/null +++ b/diff.api.php @@ -0,0 +1,181 @@ + $type->title_label, + '#old' => array($old_entity->title), + '#new' => array($new_entity->title), + '#weight' => -5, + '#settings' => array( + 'show_header' => FALSE, + ), + ); + } +} + +/** + * Allow modules to alter a comparison about entities. + * + * @param array $entity_diffs + * An array of entity differences. + * @param array $context + * An associative array containing: + * - entity_type: The entity type; e.g., 'node' or 'user'. + * - old_entity: The older entity. + * - new_entity: The newer entity. + * - view_mode: The view mode to use. Defaults to FALSE. + * + * @see hook_entity_diff() + */ +function hook_entity_diff_alter($entity_diffs, $context) { +} + +/** + * Callback to the module that defined the field to prepare items comparison. + * + * This allows the module to alter all items prior to rendering the comparative + * values. It is mainly used to bulk load entities to reduce overheads + * associated with loading entities individually. + * + * @param array $old_items + * An array of field items from the older revision. + * @param array $new_items + * An array of field items from the newer revision. + * @param array $context + * An associative array containing: + * - entity_type: The entity type; e.g., 'node' or 'user'. + * - bundle: The bundle name. + * - field: The field that the items belong to. + * - instance: The instance that the items belong to. + * - language: The language associated with $items. + * - old_entity: The older entity. + * - new_entity: The newer entity. + * + * @see MODULE_field_diff_view() + */ +function MODULE_field_diff_view_prepare(&$old_items, &$new_items, $context) { + $fids = array(); + foreach (array_merge_recursive($old_items, $new_items) as $info) { + $fids[$info['fid']] = $info['fid']; + } + // A single load is much faster than individual loads. + $files = file_load_multiple($fids); + + // For ease of processing, store a reference of the entity on the item array. + foreach ($old_items as $delta => $info) { + $old_items[$delta]['file'] = isset($files[$info['fid']]) ? $files[$info['fid']] : NULL; + } + foreach ($new_items as $delta => $info) { + $new_items[$delta]['file'] = isset($files[$info['fid']]) ? $files[$info['fid']] : NULL; + } +} + +/** + * Callback to the module that defined the field to generate items comparisons. + * + * @param array $items + * An array of field items from the entity. + * @param array $context + * An associative array containing: + * - entity: The entity being compared. + * - entity_type: The entity type; e.g., 'node' or 'user'. + * - bundle: The bundle name. + * - field: The field that the items belong to. + * - instance: The instance that the items belong to. + * - language: The language associated with $items. + * - old_entity: The older entity. + * - new_entity: The newer entity. + * + * @see MODULE_field_diff_view_prepare() + */ +function MODULE_field_diff_view($items, $context) { + $diff_items = array(); + foreach ($items as $delta => $item) { + if (isset($item['file'])) { + $diff_items[$delta] = $item['file']->filename . ' [fid: ' . $item['fid'] . ']'; + } + } + + return $diff_items; +} + +/** + * Allow other modules to interact with MODULE_field_diff_view_prepare(). + * + * @param array $old_items + * An array of field items from the older revision. + * @param array $new_items + * An array of field items from the newer revision. + * @param array $context + * An associative array containing: + * - entity_type: The entity type; e.g., 'node' or 'user'. + * - bundle: The bundle name. + * - field: The field that the items belong to. + * - instance: The instance that the items belong to. + * - language: The language associated with $items. + * - old_entity: The older entity. + * - new_entity: The newer entity. + * + * @see MODULE_field_diff_view_prepare() + */ +function hook_field_diff_view_prepare_alter($old_items, $new_items, $context) { + +} + +/** + * Allow other modules to interact with MODULE_field_diff_view(). + * + * @param array $values + * An array of field items from the entity ready for comparison. + * @param array $items + * An array of field items from the entity. + * @param array $context + * An associative array containing: + * - entity: The entity being compared. + * - entity_type: The entity type; e.g., 'node' or 'user'. + * - bundle: The bundle name. + * - field: The field that the items belong to. + * - instance: The instance that the items belong to. + * - language: The language associated with $items. + * - old_entity: The older entity. + * - new_entity: The newer entity. + * + * @see MODULE_field_diff_view() + */ +function hook_field_diff_view_alter($values, $items, $context) { + +} + +/** + * @} End of "addtogroup hooks". + */ diff --git a/diff.diff.inc b/diff.diff.inc new file mode 100644 index 0000000..35d29a6 --- /dev/null +++ b/diff.diff.inc @@ -0,0 +1,414 @@ += 5.3.0) date_diff() function or the Dates modules implementation. + * + * @param object $old_entity + * The older node revision. + * @param object $new_entity + * The newer node revision. + * @param array $context + * An associative array containing: + * - entity_type: The entity type; e.g., 'node' or 'user'. + * - old_entity: The older entity. + * - new_entity: The newer entity. + * - view_mode: The view mode to use. Defaults to FALSE. + */ +function diff_entity_diff($old_entity, $new_entity, $context) { + $return = array(); + + $entity_type = $context['entity_type']; + $info = entity_get_info($entity_type); + if (!empty($info['fieldable'])) { + $return = diff_entity_fields_diff($old_entity, $new_entity, $context); + } + + return $return; +} + +/** + * Internal callback to handle fieldable entities. + * + * Field comparison is handled for core modules, but is expandable to any other + * fields if the module defines MODULE_field_diff_view(). + * + * @param object $old_entity + * The older entity entity revision. + * @param object $new_entity + * The newer entity entity revision. + * @param array $context + * An associative array containing: + * - entity_type: The entity type; e.g., 'node' or 'user'. + * - old_entity: The older entity. + * - new_entity: The newer entity. + * - view_mode: The view mode to use. Defaults to FALSE. + * + * @return array + * An associative array of values keyed by the field name and delta value. + */ +function diff_entity_fields_diff($old_entity, $new_entity, $context) { + $result = array(); + + $entity_type = $context['entity_type']; + $view_mode = $context['view_mode']; + + $field_context = $context; + + // Custom settings must be checked to prevent pulling out view mode settings + // for Diff standard / complete if not enabled. + $actual_mode = FALSE; + list(,, $bundle_name) = entity_extract_ids($entity_type, $new_entity); + $instances = field_info_instances($entity_type, $bundle_name); + if (!empty($view_mode)) { + $view_mode_settings = field_view_mode_settings($entity_type, $bundle_name); + $actual_mode = (!empty($view_mode_settings[$view_mode]['custom_settings'])) ? $view_mode : 'default'; + } + $field_context['custom_settings'] = $actual_mode && $actual_mode == $view_mode; + $field_context['old_entity'] = $old_entity; + $field_context['new_entity'] = $new_entity; + $field_context['bundle_name'] = $bundle_name; + + foreach ($instances as $instance) { + // Any view mode is supported in relation to hiding fields, but only if + // selected (todo see if this is a valid option). + if ($actual_mode && $instance['display'][$actual_mode]['type'] == 'hidden') { + continue; + } + $field_name = $instance['field_name']; + $field = field_info_field($field_name); + $field_context['field'] = $field; + $field_context['instance'] = $instance; + $field_context['display'] = $instance['display'][$actual_mode]; + + // We provide a loose check on the field access. + if (field_access('view', $field, $entity_type) || field_access('edit', $field, $entity_type)) { + $langcode = field_language($entity_type, $new_entity, $field_name); + + $field_context['language'] = $langcode; + $field_context['field'] = $field; + $field_context['instance'] = $instance; + + $old_items = array(); + if (!empty($old_entity->{$field_name}[$langcode])) { + $old_items = $old_entity->{$field_name}[$langcode]; + } + + $new_items = array(); + if (!empty($new_entity->{$field_name}[$langcode])) { + $new_items = $new_entity->{$field_name}[$langcode]; + } + + // Load files containing the field callbacks. + _diff_autoload($field); + + $field_context['settings'] = diff_get_field_instance_settings($field_context); + + // Reference fields can optionally prepare objects in bulk to reduce + // overheads related to multiple database calls. If a field considers + // that the delta values is meaningless, they can order and rearrange + // to provide cleaner results. + $func = $field['module'] . '_field_diff_view_prepare'; + if (function_exists($func)) { + $func = $func($old_items, $new_items, $field_context); + } + // Allow other modules to act safely on behalf of the core field module. + drupal_alter('field_diff_view_prepare', $old_items, $new_items, $field_context); + + // These functions compiles the items into comparable arrays of strings. + $func = $field['module'] . '_field_diff_view'; + if (!function_exists($func)) { + $func = 'diff_field_diff_view'; + } + + // These callbacks should be independent of revision. + $old_context = $field_context; + $old_context['entity'] = $old_entity; + $old_values = $func($old_items, $old_context); + $new_context = $field_context; + $new_context['entity'] = $new_entity; + $new_values = $func($new_items, $new_context); + + // Allow other modules to act safely on behalf of the core field module. + drupal_alter('field_diff_view', $old_values, $old_items, $old_context); + drupal_alter('field_diff_view', $new_values, $new_items, $new_context); + + $max = max(array(count($old_values), count($new_values))); + if ($max) { + $result[$field_name] = array( + '#name' => $instance['label'], + '#old' => array(), + '#new' => array(), + '#settings' => $field_context['settings'], + ); + for ($delta = 0; $delta < $max; $delta++) { + if (isset($old_values[$delta])) { + $result[$field_name]['#old'][] = is_array($old_values[$delta]) ? implode("\n", $old_values[$delta]) : $old_values[$delta]; + } + if (isset($new_values[$delta])) { + $result[$field_name]['#new'][] = is_array($new_values[$delta]) ? implode("\n", $new_values[$delta]) : $new_values[$delta]; + } + } + $result[$field_name]['#old'] = implode("\n", $result[$field_name]['#old']); + $result[$field_name]['#new'] = implode("\n", $result[$field_name]['#new']); + + if ($actual_mode) { + $result[$field_name]['#weight'] = $instance['display'][$actual_mode]['weight']; + } + + } + } + } + return $result; +} + +/** + * A generic handler for parsing field values. + * + * This callback can only handle the most basic of fields that populates the + * safe_value during field load or use the value column for data storage. + * + * @param array $items + * An array of field items. + * @param array $context + * An associative array containing: + * - entity: The entity that the items belong to. + * - entity_type: The entity type; e.g., 'node' or 'user'. + * - bundle: The bundle name. + * - field: The field that the items belong to. + * - instance: The instance that the items belong to. + * - language: The language associated with $items. + * - old_entity: The older entity. + * - new_entity: The newer entity. + * + * @return array + * An array of strings representing the value, keyed by delta index. + */ +function diff_field_diff_view($items, $context) { + $diff_items = array(); + foreach ($items as $delta => $item) { + if (isset($item['safe_value'])) { + if (is_scalar($item['safe_value'])) { + $diff_items[$delta] = (string) $item['safe_value']; + } + else { + $diff_items[$delta] = (string) implode("\n", $item['safe_value']); + } + } + elseif (isset($item['value'])) { + if (is_scalar($item['value'])) { + $diff_items[$delta] = (string) $item['value']; + } + else { + $diff_items[$delta] = (string) implode("\n", $item['value']); + } + } + } + return $diff_items; +} + +/** + * Helper function to get the settings for a given field or formatter. + * + * This will parse the field display formatter settings if the view mode is + * set to either Diff standard or Diff complete. These then have any new + * global settings added, followed by any field default settings. + * + * @param array $context + * This will get the settings for a field. + * - field (required): The field that the items belong to. + * + * And optionally include these to parse the display settings. + * - entity: The entity that we are looking up. + * - instance: The instance that the items belong to. + * - view_mode: The view mode to use. Defaults to FALSE. + * + * @return array + * The settings for this field or formatter. + */ +function diff_get_field_instance_settings($context) { + // This only pulls out custom settings for fields that are using the two + // diff view modes. This is done to match the UI that only alters these + // two view modes. + $display_settings = array(); + if (!empty($context['view_mode'])) { + $entity_type = $context['instance']['entity_type']; + $bundle = $context['instance']['bundle']; + $view_mode_settings = field_view_mode_settings($entity_type, $bundle); + $actual_mode = (!empty($view_mode_settings[$context['view_mode']]['custom_settings'])) ? $view_mode : 'default'; + if (diff_supported_view_mode($actual_mode)) { + // Should we directly use the instance settings or the hooked version? + // $display = $context['instance']['display'][$actual_mode]; + $display = field_get_display($context['instance'], $context['view_mode'], $context['entity']); + $display_settings = $display['settings']; + } + } + $display_settings += array( + 'diff_custom' => 0, + 'diff_custom_settings' => array(), + ); + + $field = $context['field']; + + // Load files containing the field callbacks. + _diff_autoload($field); + + // Update saved settings from the global settings for this field type. + $settings = variable_get("diff_{$field['module']}_field_{$field['type']}_default_options", array()); + if (!empty($display_settings['diff_custom'])) { + // Merge any additional global settings into the field formatter settings. + $display_settings['diff_custom_settings'] += $settings; + $settings = $display_settings['diff_custom_settings']; + } + $settings = _diff_field_default_settings($field['module'], $field['type'], $settings); + + return $settings; +} + +/** + * Helper function to initiate any global form elements. + */ +function diff_global_settings_form(&$subform, $form_state, $type, $settings) { + $subform['show_header'] = array( + '#type' => 'checkbox', + '#title' => t('Show field title'), + '#default_value' => $settings['show_header'], + '#weight' => -5, + ); + $subform['markdown'] = array( + '#type' => 'select', + '#title' => t('Markdown callback'), + '#default_value' => $settings['markdown'], + '#options' => array( + 'drupal_html_to_text' => t('Drupal HTML to Text'), + 'filter_xss' => t('Filter XSS (some tags)'), + 'diff_filter_xss' => t('Filter XSS (all tags)'), + ), + '#description' => t('These provide ways to clean markup tags to make comparisons easier to read.'), + '#empty_option' => t('- Do not process -'), + ); + $subform['line_counter'] = array( + '#type' => 'radios', + '#title' => t('Line counter'), + '#default_value' => $settings['line_counter'], + '#description' => t('This outputs the (approximate) line numbers as a heading before every change.'), + '#options' => array( + '' => t('None. Counter ignore and not incremented.'), + 'hidden' => t('Count lines but do not show line headers.'), + 'line' => t('Count and show lines, restarting counter at 0.'), + 'line_continuous' => t('Count and show lines, incrementing counter from last item.'), + ), + ); + + /* +This would be cool, but to do anything else than inline with the text appears +to be very hard, requiring a refactoring of both the modules API but also the +DiffFormatter and Diff classes. Diff 8.x-4.x maybe. + + $subform['show_delta'] = array( + '#type' => 'checkbox', + '#title' => t('Show delta values'), + '#default_value' => $settings['show_delta'], + ); + $subform['delta_format'] = array( + '#type' => 'radios', + '#title' => t('Delta insertion method'), + '#default_value' => $settings['delta_format'], + '#options' => array( + 'inline' => t('Prefix to item'), + 'row' => t('Individual row'), + ), + '#states' => array( + 'invisible' => array( + "input[id$='show-delta']" => array('checked' => FALSE), + ), + ), + ); + */ +} + +/** + * Helper function to populate the settings array. + */ +function _diff_field_default_settings($module, $field_type, $settings = array()) { + // Load files containing the field callbacks. + _diff_autoload($module); + + // Populate any missing values from CALLBACK_field_diff_default_options(). + $func = $module . '_field_diff_default_options'; + if (function_exists($func)) { + $settings += $func($field_type); + } + + // Global settings. + $settings += array( + 'markdown' => '', + 'line_counter' => '', + 'show_header' => 1, + // Can we? This seems too hard to track in the DiffFormatter as all we + // have is a string or an array of strings. + //'show_delta' => 0, + //'delta_format' => 'row', + ); + return $settings; +} + +/** + * Private helper function to load field includes. + * + * @param array|string $field_or_module + * The field definition array or the module that implements the field. + */ +function _diff_autoload($field_or_module) { + $includes = &drupal_static(__FUNCTION__, FALSE); + if (!$includes) { + $includes = array( + 'file' => module_exists('file'), + 'image' => module_exists('image'), + 'list' => module_exists('list'), + 'taxonomy' => module_exists('taxonomy'), + 'text' => module_exists('text'), + ); + } + + $module = is_string($field_or_module) ? $field_or_module : $field_or_module['module']; + + // Since field hooks are not real hooks, we manually load the field modules + // MODULE.diff.inc. We handle the five core field defining modules. + if (!isset($includes[$module])) { + module_load_include('diff.inc', $module); + $includes[$module] = 0; + } + elseif (!empty($includes[$module])) { + module_load_include('inc', 'diff', 'includes/' . $module); + $includes[$module] = 0; + } +} + +/** + * Helper function to parse out the state in the diff results. + */ +function diff_extract_state($diff, $state = 'raw') { + $states = array( + 0 => NULL, + 1 => NULL, + ); + if (isset($diff['#states'][$state])) { + if (isset($diff['#states'][$state]['#old'])) { + $states[0] = $diff['#states'][$state]['#old']; + } + if (isset($diff['#states'][$state]['#new'])) { + $states[1] = $diff['#states'][$state]['#new']; + } + } + return $states; +} diff --git a/diff.info b/diff.info index fe26242..c62ccaa 100644 --- a/diff.info +++ b/diff.info @@ -3,3 +3,7 @@ description = Show difference between node revisions. core = 7.x files[] = DiffEngine.php + +; This would support Module supports if it ever gets ported. +; The module Field formatter settings enables field formatter alter hooks. +recommends[] = field_formatter_settings diff --git a/diff.install b/diff.install new file mode 100644 index 0000000..e40e2d0 --- /dev/null +++ b/diff.install @@ -0,0 +1,84 @@ +condition('name', db_like($prefix) . '%', 'LIKE') + ->execute(); + } + + // Delete global variables. + variable_del('diff_trailing_context_lines'); + variable_del('diff_leading_context_lines'); + variable_del('diff_theme'); + + variable_del('diff_file_field_default_options'); + variable_del('diff_image_field_default_options'); + variable_del('diff_taxonomy_field_default_options'); + variable_del('diff_list_field_default_options'); + variable_del('diff_text_field_text_default_options'); + variable_del('diff_text_field_text_long_default_options'); + variable_del('diff_text_field_text_with_summary_default_options'); +} + +/** + * Updates the existing system variables to target the entity type and bundle. + */ +function diff_update_7201() { + $node_types = array_keys(node_type_get_types()); + foreach ($node_types as $bundle) { + $type_variables = array( + 'show_preview_changes', + 'enable_revisions_page', + 'show_diff_inline', + ); + foreach ($type_variables as $prefix) { + $setting = variable_get($prefix . '_' . $bundle, NULL); + if (isset($setting)) { + variable_del($prefix . '_' . $bundle); + variable_set('diff_' . $prefix . '_node_' . $bundle, $setting); + } + } + } +} + +/** + * This checks that the right display view mode is selected. + */ +function diff_update_7202() { + $node_types = array_keys(node_type_get_types()); + foreach ($node_types as $bundle) { + // For each type we look for a custom full view mode. If found, we need to + // set the diff view modes to this to ensure that there is minimal change + // in the front end functionality. + $view_mode_settings = field_view_mode_settings('node', $bundle); + if (!empty($view_mode_settings['full']['custom_settings'])) { + variable_set('diff_view_mode_inline_node_' . $node_type, 'full'); + } + } +} + +/** + * Register new administration menu items. + */ +function diff_update_7203() { + variable_set('menu_rebuild_needed', TRUE); + variable_set('diff_script_revisioning', ''); +} diff --git a/diff.module b/diff.module index a9c200a..d8d4d3b 100644 --- a/diff.module +++ b/diff.module @@ -11,6 +11,27 @@ define('REVISION_LIST_SIZE', 50); /** + * Exposed sorting options. + * + * No sorting means sorting by delta value for fields. + */ +define('DIFF_SORT_NONE', '0'); + +/** + * Exposed sorting options. + * + * This normally sorts by the rendered comparison. + */ +define('DIFF_SORT_VALUE', '1'); + +/** + * Exposed sorting options. + * + * It is up to the field / entity to decide how to handle the sort. + */ +define('DIFF_SORT_CUSTOM', '-1'); + +/** * Implements hook_help(). */ function diff_help($path, $arg) { @@ -19,7 +40,7 @@ function diff_help($path, $arg) { $output = '' . t('The diff module overwrites the normal revisions view. The revisions table is enhanced with a possibility to view the difference between two node revisions. Users with the %view_revisions permission will also be able to view the changes between any two selected revisions. You may disable this for individual content types on the content type configuration page. This module also provides a nifty %preview_changes button while editing a post.', array('%preview_changes' => t('View changes'), '%view_revisions' => t('view revisions'))) . '
'; return $output; case 'node/%/revisions/%/view': - // the following string is copied from string copied from node_help('node/%/revisions') + // The translated strings should match node_help('node/%/revisions'). return '' . t('The revisions let you track differences between multiple versions of a post.') . '
'; case 'node/%/revisions/view/%/%': return '' . t('Comparing two revisions:') . '
'; @@ -27,24 +48,41 @@ function diff_help($path, $arg) { } /** + * The various states that are available. + */ +function diff_avaiable_states($entity_type = NULL) { + $states = array( + 'raw' => t('Standard'), + 'raw_plain' => t('Marked down'), + ); + + return $states; +} + +/** * Implements hook_menu(). + * + * @todo: Review this. */ function diff_menu() { $items = array(); /** - * By using MENU_LOCAL_TASK (and 'tab_parent') we can get the various revision-views to - * show the View|Edit|Revision-tabs of the node on top, and have the Revisions-tab open. - * To avoid creating/showing any extra tabs or sub-tabs (tasks below top level) for the - * various paths (i.e. "Diff", "Show latest" and "Show a specific revision") that need - * a revision-id (vid) parameter, we make sure to set 'tab_parent' a bit odd. - * This solution may not be the prettiest one, but by avoiding having two _LOCAL_TASKs - * sharing a parent that can be accessed by its full path, it seems to work as desired. - * Breadcrumbs work decently, at least the node link is among the crumbs. For some reason - * any breadcrumbs "before/above" the node is only seen at 'node/%node/revisions/%/view'. + * By using MENU_LOCAL_TASK (and 'tab_parent') we can get the various + * revision-views to show the View|Edit|Revision-tabs of the node on top, + * and have the Revisions-tab open. To avoid creating/showing any extra tabs + * or sub-tabs (tasks below top level) for the various paths (i.e. "Diff", + * "Show latest" and "Show a specific revision") that need a revision-id (vid) + * parameter, we make sure to set 'tab_parent' a bit odd. This solution may + * not be the prettiest one, but by avoiding having two _LOCAL_TASKs sharing + * a parent that can be accessed by its full path, it seems to work as + * desired. Breadcrumbs work decently, at least the node link is among the + * crumbs. For some reason any breadcrumbs "before/above" the node is only + * seen at 'node/%node/revisions/%/view'. */ + + // Not used directly, but was created to get the other menu items to work. $items['node/%node/revisions/list'] = array( - // Not used directly, but was created to get the other menu items to work well 'title' => 'List revisions', 'page callback' => 'diff_diffs_overview', 'type' => MENU_DEFAULT_LOCAL_TASK, @@ -62,6 +100,7 @@ function diff_menu() { 'tab_parent' => 'node/%/revisions/list', 'file' => 'diff.pages.inc', ); + $items['node/%node/revisions/view/latest'] = array( 'title' => 'Show latest diff', 'page callback' => 'diff_latest', @@ -72,6 +111,72 @@ function diff_menu() { 'tab_parent' => 'node/%/revisions/view', 'file' => 'diff.pages.inc', ); + + // Administrative settings. + $items['admin/config/content/diff'] = array( + 'title' => 'Diff', + 'description' => 'Diff settings.', + 'file' => 'diff.admin.inc', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('diff_admin_settings'), + 'access arguments' => array('administer site configuration'), + ); + $items['admin/config/content/diff/settings'] = array( + 'title' => 'Settings', + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10, + ); + $items['admin/config/content/diff/fields'] = array( + 'title' => 'Fields', + 'description' => 'Field support and settings overview.', + 'file' => 'diff.admin.inc', + 'page callback' => 'diff_admin_field_overview', + 'access arguments' => array('administer site configuration'), + 'type' => MENU_LOCAL_TASK, + ); + $items['admin/config/content/diff/fields/%'] = array( + 'title' => 'Global field settings', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('diff_admin_global_field_settings', 5), + 'access arguments' => array('administer site configuration'), + 'type' => MENU_VISIBLE_IN_BREADCRUMB, + 'file' => 'diff.admin.inc', + ); + + $items['admin/config/content/diff/entities'] = array( + 'title' => 'Entities', + 'description' => 'Entity settings.', + 'file' => 'diff.admin.inc', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('diff_admin_global_entity_settings', 'node'), + 'access arguments' => array('administer site configuration'), + 'type' => MENU_LOCAL_TASK, + ); + + $items['admin/config/content/diff/entities/node'] = array( + 'title' => 'Node', + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10, + ); + + // Safely restriction from core Field UI module. + if (defined('MAINTENANCE_MODE')) { + return $items; + } + // Create tabs for all entities. + foreach (entity_get_info() as $entity_type => $entity_info) { + if ($entity_type == 'node') { + continue; + } + $items['admin/config/content/diff/entities/' . $entity_type] = array( + 'title' => $entity_info['label'], + 'file' => 'diff.admin.inc', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('diff_admin_global_entity_settings', $entity_type), + 'access arguments' => array('administer site configuration'), + 'type' => MENU_LOCAL_TASK, + ); + } return $items; } @@ -79,7 +184,7 @@ function diff_menu() { * Implements hook_menu_alter(). */ function diff_menu_alter(&$callbacks) { - // Overwrite the default 'Revisions' page + // Overwrite the default 'Revisions' page. $callbacks['node/%node/revisions']['page callback'] = 'diff_diffs_overview'; $callbacks['node/%node/revisions']['module'] = 'diff'; $callbacks['node/%node/revisions']['file'] = 'diff.pages.inc'; @@ -88,30 +193,78 @@ function diff_menu_alter(&$callbacks) { $callbacks['node/%node/revisions/%/revert']['tab_parent'] = 'node/%/revisions/%/view'; $callbacks['node/%node/revisions/%/delete']['tab_parent'] = 'node/%/revisions/%/view'; - $callbacks['node/%node/revisions']['access callback'] = - $callbacks['node/%node/revisions/%/view']['access callback'] = - $callbacks['node/%node/revisions/%/revert']['access callback'] = - $callbacks['node/%node/revisions/%/delete']['access callback'] = 'diff_node_revision_access'; - return; + $callbacks['node/%node/revisions']['access callback'] + = $callbacks['node/%node/revisions/%/view']['access callback'] + = $callbacks['node/%node/revisions/%/revert']['access callback'] + = $callbacks['node/%node/revisions/%/delete']['access callback'] = 'diff_node_revision_access'; } /** * Implements hook_admin_paths_alter(). */ function diff_admin_paths_alter(&$paths) { - // Treat all user pages as administrative. - $paths['node/*/revisions/view/*/*'] = TRUE; + // By default, treat all diff pages as administrative. + if (variable_get('diff_admin_path_node', 1)) { + $paths['node/*/revisions/view/*/*'] = TRUE; + } } /** * Access callback for the node revisions page. */ function diff_node_revision_access($node, $op = 'view') { - $may_revision_this_type = variable_get('enable_revisions_page_' . $node->type, TRUE) || user_access('administer nodes'); + $may_revision_this_type = variable_get('diff_enable_revisions_page_node_' . $node->type, TRUE) || user_access('administer nodes'); return $may_revision_this_type && _node_revision_access($node, $op); } /** + * Implements hook_hook_info(). + */ +function diff_hook_info() { + $hooks['entity_diff'] = array( + 'group' => 'diff', + ); + $hooks['diff'] = array( + 'group' => 'diff', + ); + $hooks['field_diff_view_prepare_alter'] = array( + 'group' => 'diff', + ); + $hooks['field_diff_view_alter'] = array( + 'group' => 'diff', + ); + + return $hooks; +} + +/** + * Implements hook_entity_info_alter(). + * + * Although the module only provides an UI for comparing nodes, it has an + * extendable API for any entity, so we supply two view modes for all entities. + * - diff_standard: This view mode is used to tell the module how to compare + * individual fields. This is used on the revisions page. + * - diff_complete: The view mode is used to compare the entire entity as a + * single rendered string. This is used by the inline block. + */ +function diff_entity_info_alter(&$entity_info) { + foreach (array_keys($entity_info) as $entity_type) { + if (!empty($entity_info[$entity_type]['view modes'])) { + $entity_info[$entity_type]['view modes'] += array( + 'diff_standard' => array( + 'label' => t('Diff standard'), + 'custom settings' => FALSE, + ), + 'diff_complete' => array( + 'label' => t('Diff complete'), + 'custom settings' => FALSE, + ), + ); + } + } +} + +/** * Implements hook_block_info(). */ function diff_block_info() { @@ -134,11 +287,11 @@ function diff_block_view($delta) { } /** - * Implements hook_nodeapi(). + * Implements hook_node_view_alter(). */ function diff_node_view_alter(&$build) { $node = $build['#node']; - if (user_access('view revisions') && variable_get('show_diff_inline_' . $node->type, FALSE)) { + if (user_access('view revisions') && variable_get('diff_show_diff_inline_node_' . $node->type, FALSE)) { // Ugly but cheap way to check that we are viewing a node's revision page. if (arg(2) === 'revisions' && arg(3) === $node->vid) { module_load_include('inc', 'diff', 'diff.pages'); @@ -152,78 +305,150 @@ function diff_node_view_alter(&$build) { } /** - * Implements hook_form_alter(). + * Implements hook_form_BASE_FORM_ID_alter(). */ -function diff_form_alter(&$form, &$form_state, $form_id) { - if (!empty($form['#node_edit_form'])) { - // Add a 'View changes' button on the node edit form. - if (variable_get('show_preview_changes_' . $form['type']['#value'], TRUE) && $form['nid']['#value'] > 0) { - $form['actions']['preview_changes'] = array( - '#type' => 'submit', - '#value' => t('View changes'), - '#weight' => 12, - '#submit' => array('diff_node_form_build_preview_changes') - ); - } +function diff_form_node_form_alter(&$form, $form_state) { + // Add a 'View changes' button on the node edit form. + $node = $form['#node']; + if (variable_get('diff_show_preview_changes_node_' . $node->type, TRUE) && !empty($node->nid)) { + $form['actions']['preview_changes'] = array( + '#type' => 'submit', + '#value' => t('View changes'), + '#weight' => 12, + '#submit' => array('diff_node_form_build_preview_changes'), + ); } } /** - * Implements hook_form_alter() for node_type_form. + * Implements hook_form_BASE_FORM_ID_alter(). */ function diff_form_node_type_form_alter(&$form, $form_state) { if (isset($form['type'])) { - // Node type edit form. - // Add checkbox to activate 'View changes' button per node type. + $type = $form['#node_type']; $form['diff'] = array( '#title' => t('Diff'), '#type' => 'fieldset', '#group' => 'additional_settings', '#tree' => FALSE, ); - $form['diff']['show_preview_changes'] = array( + $form['diff']['diff_show_preview_changes_node'] = array( '#type' => 'checkbox', '#title' => t('Show %preview_changes button on node edit form', array('%preview_changes' => t('View changes'))), '#weight' => 10, - '#default_value' => variable_get('show_preview_changes_' . $form['#node_type']->type, TRUE), + '#default_value' => variable_get('diff_show_preview_changes_node_' . $type->type, TRUE), ); - $form['diff']['remove_markup_default'] = array( - '#type' => 'checkbox', - '#title' => t('Remove markup by default when comparing body text'), - '#weight' => 10, - '#default_value' => variable_get('remove_markup_default_'. $form['#node_type']->type, FALSE), - ); - $form['diff']['show_diff_inline'] = array( + $form['diff']['diff_show_diff_inline_node'] = array( '#type' => 'checkbox', '#title' => t('Show diffs inline for this content type'), '#description' => t("You must enable the 'Inline diff' block to use this feature"), '#weight' => 10, - '#default_value' => variable_get('show_diff_inline_' . $form['#node_type']->type, FALSE), + '#default_value' => variable_get('diff_show_diff_inline_node_' . $type->type, FALSE), ); - $form['diff']['enable_revisions_page'] = array( + $form['diff']['diff_enable_revisions_page_node'] = array( '#type' => 'checkbox', '#title' => t('Enable the %revisions page for this content type', array('%revisions' => t('Revisions'))), '#weight' => 11, - '#default_value' => variable_get('enable_revisions_page_' . $form['#node_type']->type, TRUE), + '#default_value' => variable_get('diff_enable_revisions_page_node_' . $type->type, TRUE), + ); + $form['diff']['diff_view_mode_standard_node'] = array( + '#type' => 'checkbox', + '#title' => t('Use %view_mode view mode when doing standard field comparisons', array('%view_mode' => t('Diff standard'))), + '#description' => t('You need to enable this view mode in the @type_label types %custom_display_settings to control settings other than just what fields are shown. Once enabled you can configure many of the diff options used to compare these fields.
If it is not selected, all compatable fields will be compared using default settings.
', array( + '@type_label' => $type->name, + '%custom_display_settings' => t('Custom display settings'), + )), + '#weight' => 12, + '#default_value' => variable_get('diff_view_mode_standard_node_' . $type->type, FALSE), + ); + $options = array(); + $info = entity_get_info('node'); + foreach ($info['view modes'] as $view_mode => $view_mode_info) { + $options[$view_mode] = $view_mode_info['label']; + } + $form['diff']['diff_view_mode_preview_node'] = array( + '#type' => 'select', + '#title' => t('Standard comparison preview'), + '#description' => t('This governs the %current view mode when doing standard comparisons.', array( + '%current' => t('Current revision:'), + )), + '#options' => $options, + '#weight' => 13, + '#default_value' => variable_get('diff_view_mode_preview_node_' . $type->type, 'full'), + '#empty_value' => '', + '#empty_option' => t('- Do not display -'), + ); + $form['diff']['diff_view_mode_inline_node'] = array( + '#type' => 'select', + '#title' => t('Inline diff view mode'), + '#description' => t('This governs what view mode is used to compare and display content in this block.'), + '#options' => $options, + '#weight' => 14, + '#default_value' => variable_get('diff_view_mode_inline_node_' . $type->type, 'diff_complete'), ); } } /** - * Callback if 'View changes' is pressed. + * Implements hook_node_type_update(). + * + * This tracks the diff settings in case the node content type is renamed. + */ +function diff_node_type_update($info) { + if (!empty($info->old_type) && $info->old_type != $info->type) { + $type_variables = array( + 'diff_show_preview_changes_node', + 'diff_enable_revisions_page_node', + 'diff_show_diff_inline_node', + 'diff_view_mode_standard_node', + 'diff_view_mode_inline_node', + 'diff_view_mode_preview_node', + ); + foreach ($type_variables as $prefix) { + $setting = variable_get($prefix . '_' . $info->old_type, NULL); + if (isset($setting)) { + variable_del($prefix . '_' . $info->old_type); + variable_set($prefix . '_' . $info->type, $setting); + } + } + } +} + +/** + * Implements hook_node_type_delete(). + */ +function diff_node_type_delete($info) { + variable_del('diff_show_preview_changes_node_' . $info->type); + variable_del('diff_enable_revisions_page_node_' . $info->type); + variable_del('diff_show_diff_inline_node_' . $info->type); + variable_del('diff_view_mode_standard_node_' . $info->type); + variable_del('diff_view_mode_inline_node_' . $info->type); + variable_del('diff_view_mode_preview_node_' . $info->type); +} + +/** + * Submit handler for the 'View changes' action. + * + * @see node_form_build_preview() */ function diff_node_form_build_preview_changes($form, &$form_state) { module_load_include('inc', 'diff', 'diff.pages'); $old_node = clone node_load($form_state['values']['nid']); $node = node_form_submit_build_node($form, $form_state); - // Create diff of old node and edited node - $rows = _diff_body_rows($old_node, $node, variable_get('remove_markup_default_'. $node->type, FALSE)); - $cols = _diff_default_cols(); - $header = _diff_default_header(); - $changes = theme('diff_table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => 'diff'), 'cols' => $cols)); + // Create diff of old node and edited node. + $rows = _diff_body_rows($old_node, $node); + + $header = _diff_default_header(t('Original'), t('Changes')); + $changes = theme('table__diff__preview', array( + 'header' => $header, + 'rows' => $rows, + 'attributes' => array('class' => 'diff'), + 'colgroups' => _diff_default_cols(), + 'sticky' => FALSE, + )); - // Prepend diff to edit form + // Prepend diff to edit form. $form_state['node_preview'] = $changes; $form_state['rebuild'] = TRUE; } @@ -237,10 +462,6 @@ function diff_theme() { 'render element' => 'form', 'file' => 'diff.theme.inc', ), - 'diff_table' => array( - 'arguments' => array('header' => NULL, 'rows' => NULL, 'attributes' => array(), 'caption' => NULL, 'cols' => array()), - 'file' => 'diff.theme.inc', - ), 'diff_header_line' => array( 'arguments' => array('lineno' => NULL), 'file' => 'diff.theme.inc', @@ -269,8 +490,7 @@ function diff_theme() { } /** - * Render a diff of two strings to a $rows array suitable for use with - * theme('table') or theme('diff_table'). + * Render the table rows for theme('table'). * * @param string $a * The source string to compare from. @@ -278,33 +498,42 @@ function diff_theme() { * The target string to compare to. * @param boolean $show_header * Display diff context headers, e.g. "Line x". - * @return + * @param array $line_stats + * This structure tracks line numbers across multiple calls to DiffFormatter. + * + * @return array * Array of rows usable with theme('table'). */ -function diff_get_rows($a, $b, $show_header = FALSE) { +function diff_get_rows($a, $b, $show_header = FALSE, &$line_stats = NULL) { $a = is_array($a) ? $a : explode("\n", $a); $b = is_array($b) ? $b : explode("\n", $b); - module_load_include('php', 'diff', 'DiffEngine'); + if (!isset($line_stats)) { + $line_stats = array( + 'counter' => array('x' => 0, 'y' => 0), + 'offset' => array('x' => 0, 'y' => 0), + ); + } $formatter = new DrupalDiffFormatter(); + // Header is the line counter. $formatter->show_header = $show_header; + $formatter->line_stats = &$line_stats; $diff = new Diff($a, $b); return $formatter->format($diff); } /** - * Render a diff of two strings into HTML markup indicating additions, changes - * and deletions. + * Render and markup a diff of two strings into HTML markup. * * @param string $a * The source string to compare from. * @param string $b * The target string to compare to. - * @return + * + * @return string * String containing HTML markup. */ function diff_get_inline($a, $b) { - module_load_include('php', 'diff', 'DiffEngine'); $diff = new DrupalDiffInline($a, $b); return $diff->render(); } @@ -316,7 +545,7 @@ function diff_inline_form($form, $form_state, $node, $revisions) { $form = array(); $form['node'] = array( '#type' => 'value', - '#value' => $node + '#value' => $node, ); $form['revision'] = array( '#type' => 'select', @@ -363,3 +592,132 @@ function diff_inline_form_submit(&$form, &$form_state) { $form_state['redirect'] = "node/{$node->nid}/revisions/{$vid}/view"; } } + +/** + * A helper function to normalise system differences. + * + * This handles differences in: + * - line endings: Mac, Windows and UNIX all use different line endings. + */ +function diff_normalise_text($text) { + if (variable_get('diff_normalise_text', 0) && drupal_strlen($text)) { + // Convert all Windows and Mac newlines to a single newline, so diff only + // need to deal with one possibility. + $text = str_replace(array("\r\n", "\r"), "\n", $text); + } + return $text; +} + +/** + * A wrapper function for filter_xss() to exclude all tags. + */ +function diff_filter_xss($string) { + return filter_xss($string, array()); +} + +/** + * Implements hook_field_formatter_info_alter(). + * + * This adds the additional settings that are used by the module if the view + * mode is used. + * + * This require the Field formatter settings (field_formatter_settings) module. + */ +function diff_field_formatter_info_alter(&$formatters) { + foreach ($formatters as $formatter => $info) { + $settings = &$formatters[$formatter]['settings']; + $settings += array( + 'diff_custom' => 0, + 'diff_custom_settings' => array(), + ); + } +} + +/** + * Implements hook_field_formatter_settings_form_alter(). + * + * This require the Field formatter settings (field_formatter_settings) module. + */ +function diff_field_formatter_settings_form_alter(array &$settings_form, array $context) { + if (diff_supported_view_mode($context['view_mode'])) { + module_load_include('diff.inc', 'diff'); + $field = $context['field']; + $instance = $context['instance']; + $display = $instance['display'][$context['view_mode']]; + $display['settings'] += array( + 'diff_custom' => 0, + 'diff_custom_settings' => array(), + ); + + $settings_form['diff_custom'] = array( + '#type' => 'checkbox', + '#title' => t('Enable custom Diff settings'), + '#default_value' => $display['settings']['diff_custom'], + ); + $settings_form['diff_custom_settings'] = array( + '#type' => 'container', + '#states' => array( + 'visible' => array( + ':input[name="fields[' . $field['field_name'] . '][settings_edit_form][settings][diff_custom]"]' => array('checked' => TRUE), + ), + ), + ); + + // This will handle the autoload for the field module. + $diff_settings = diff_get_field_instance_settings($context); + $func = $field['module'] . '_field_diff_options_form'; + if (function_exists($func) && $options_form = $func($field['type'], $diff_settings)) { + $settings_form['diff_custom_settings'] += $options_form; + } + diff_global_settings_form($settings_form['diff_custom_settings'], $form_state, $type, $settings); + } +} + +/** + * Implements hook_field_formatter_settings_summary_alter(). + * + * This require the Field formatter settings (field_formatter_settings) module. + */ +function diff_field_formatter_settings_summary_alter(&$summary, array $context) { + if (diff_supported_view_mode($context['view_mode'])) { + $field = $context['field']; + $display = $context['instance']['display'][$context['view_mode']]; + + $summary = empty($summary) ? '' : $summary . '' . filter_xss($revision->log) . '
' : ''; if ($revision->current_vid > 0) { $form['info'][$revision->vid] = array( '#markup' => t('!date by !username', array( '!date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid"), - '!username' => theme('username', array('account' => $revision)))) - . (($revision->log != '') ? '' . filter_xss($revision->log) . '
' : ''), + '!username' => theme('username', array('account' => $revision)))) . $revision_log, ); } else { + $diff_date = l(format_date($revision->timestamp, 'small'), "node/$node->nid/revisions/$revision->vid/view"); $form['info'][$revision->vid] = array( '#markup' => t('!date by !username', array( - '!date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid/revisions/$revision->vid/view"), - '!username' => theme('username', array('account' => $revision)))) - . (($revision->log != '') ? '' . filter_xss($revision->log) . '
' : '') + '!date' => $diff_date, + '!username' => theme('username', array('account' => $revision))) + ) . $revision_log, ); if ($revert_permission) { - $operations[] = array('#markup' => l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert")); + $operations[] = array( + '#markup' => l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert"), + ); } if ($delete_permission) { - $operations[] = array('#markup' => l(t('delete'), "node/$node->nid/revisions/$revision->vid/delete")); + $operations[] = array( + '#markup' => l(t('delete'), "node/$node->nid/revisions/$revision->vid/delete"), + ); } // Set a dummy, even if the user has no permission for the other // operations, so that we can check if the operations array is @@ -106,19 +107,20 @@ function diff_node_revisions($form, $form_state, $node) { $form['diff']['old'] = array( '#type' => 'radios', '#options' => $revision_ids, - '#default_value' => $old_vid + '#default_value' => $old_vid, ); $form['diff']['new'] = array( '#type' => 'radios', '#options' => $revision_ids, - '#default_value' => $new_vid + '#default_value' => $new_vid, ); + $form['submit'] = array('#type' => 'submit', '#value' => t('Show diff')); if (count($revision_list) > REVISION_LIST_SIZE) { $form['#suffix'] = theme('pager'); } - + $form['#attached'] = diff_build_attachments(TRUE); return $form; } @@ -126,10 +128,10 @@ function diff_node_revisions($form, $form_state, $node) { * Submit code for input form to select two revisions. */ function diff_node_revisions_submit($form, &$form_state) { - // the ids are ordered so the old revision is always on the left + // The ids are ordered so the old revision is always on the left. $old_vid = min($form_state['values']['old'], $form_state['values']['new']); $new_vid = max($form_state['values']['old'], $form_state['values']['new']); - $form_state['redirect'] = 'node/' . $form_state['values']['nid'] . '/revisions/view/' . $old_vid . '/' . $new_vid; + $form_state['redirect'] = 'node/' . $form_state['values']['nid'] . '/revisions/view/' . $old_vid . '/' . $new_vid; } /** @@ -138,46 +140,50 @@ function diff_node_revisions_submit($form, &$form_state) { function diff_node_revisions_validate($form, &$form_state) { $old_vid = $form_state['values']['old']; $new_vid = $form_state['values']['new']; - if ($old_vid==$new_vid || !$old_vid || !$new_vid) { + if ($old_vid == $new_vid || !$old_vid || !$new_vid) { form_set_error('diff', t('Select different revisions to compare.')); } } /** - * Create output string for a comparison of 'node' between - * versions 'old_vid' and 'new_vid'. + * Create a comparison for the node between versions 'old_vid' and 'new_vid'. * - * @param $node + * @param object $node * Node on which to perform comparison - * @param $old_vid + * @param integer $old_vid * Version ID of the old revision. - * @param $new_vid + * @param integer $new_vid * Version ID of the new revision. - * @param $remove_markup - * Strip markup before doing the diff */ -function diff_diffs_show($node, $old_vid, $new_vid, $remove_markup = NULL) { - - // Set same title as on the 'Revisions' tab for consistency - drupal_set_title(t('Revisions for @title', array('@title' => $node->title))); +function diff_diffs_show($node, $old_vid, $new_vid, $state = NULL) { + // Attaches the CSS. + $build['#attached'] = diff_build_attachments(); + + $default_state = variable_get('diff_default_state_node', 'raw'); + $state = str_replace('-', '_', $state); + if ($state && !in_array($state, diff_avaiable_states())) { + $states = $default_state; + } + if (empty($state)) { + $state = $default_state; + } + // Same title as the 'Revisions' tab. Blocked by non-page requests. + if (node_is_page($node)) { + drupal_set_title(t('Revisions for @title', array('@title' => $node->title))); + } $node_revisions = node_revision_list($node); $old_node = node_load($node->nid, $old_vid); $new_node = node_load($node->nid, $new_vid); - // Set default for remove markup if not set - if ($remove_markup == NULL) { - $remove_markup = variable_get('remove_markup_default_'. $node->type, FALSE); - } - - // Generate table header (date, username, logmessage). + // Generate table header (date, username, log message). $old_header = t('!date by !username', array( - '!date' => l(format_date($old_node->revision_timestamp), "node/$node->nid/revisions/$old_node->vid/view"), + '!date' => l(format_date($old_node->revision_timestamp), "node/$node->nid/revisions/$old_node->vid/view", array('absolute' => 1)), '!username' => theme('username', array('account' => $node_revisions[$old_vid])), )); $new_header = t('!date by !username', array( - '!date' => l(format_date($new_node->revision_timestamp), "node/$node->nid/revisions/$new_node->vid/view"), + '!date' => l(format_date($new_node->revision_timestamp), "node/$node->nid/revisions/$new_node->vid/view", array('absolute' => 1)), '!username' => theme('username', array('account' => $node_revisions[$new_vid])), )); @@ -185,143 +191,199 @@ function diff_diffs_show($node, $old_vid, $new_vid, $remove_markup = NULL) { $new_log = $new_node->log != '' ? '' . filter_xss($new_node->log) . '
' : ''; // Generate previous diff/next diff links. + $nav_suffix = ($default_state != $state) ? '/' . str_replace('_', '-', $state) : ''; $next_vid = _diff_get_next_vid($node_revisions, $new_vid); if ($next_vid) { - $next_link = l(t('next diff >'), 'node/' . $node->nid . '/revisions/view/' . $new_vid . '/' . $next_vid); + $next_link = l(t('next diff >'), 'node/' . $node->nid . '/revisions/view/' . $new_vid . '/' . $next_vid . $nav_suffix, array('absolute' => 1)); } else { $next_link = ''; } $prev_vid = _diff_get_previous_vid($node_revisions, $old_vid); if ($prev_vid) { - $prev_link = l(t('< previous diff'), 'node/' . $node->nid . '/revisions/view/' . $prev_vid . '/' . $old_vid); + $prev_link = l(t('< previous diff'), 'node/' . $node->nid . '/revisions/view/' . $prev_vid . '/' . $old_vid . $nav_suffix, array('absolute' => 1)); } else { $prev_link = ''; } - $cols = _diff_default_cols(); $header = _diff_default_header($old_header, $new_header); $rows = array(); if ($old_log || $new_log) { - $rows[] = array( + $rows['logs'] = array( array( 'data' => $old_log, - 'colspan' => 2 + 'colspan' => 2, ), array( 'data' => $new_log, - 'colspan' => 2 - ) + 'colspan' => 2, + ), ); } - $rows[] = array( + $rows['navigation'] = array( array( 'data' => $prev_link, 'class' => array('diff-prevlink'), - 'colspan' => 2 + 'colspan' => 2, ), array( 'data' => $next_link, 'class' => array('diff-nextlink'), - 'colspan' => 2 - ) + 'colspan' => 2, + ), ); - if ($remove_markup) { - $show_hide_markup_link= l(t('Show Markup'), 'node/'. $node->nid .'/revisions/view/'. $old_vid .'/'. $new_vid .'/0'); + $links = array(); + foreach (diff_avaiable_states('node') as $alternative_state => $label) { + if ($alternative_state == $state) { + // @todo: Should we show both or just alternatives? + } + $links[$alternative_state] = array( + 'title' => $label, + 'href' => "node/{$node->nid}/revisions/view/{$old_vid}/{$new_vid}" . ($alternative_state == $default_state ? '' : '/' . str_replace('_', '-', $alternative_state)), + ); } - else { - $show_hide_markup_link = l(t('Hide Markup'), 'node/'. $node->nid .'/revisions/view/'. $old_vid .'/'. $new_vid .'/1'); + if (count($links) > 1) { + $state_links = theme('links', array( + 'links' => $links, + 'attributes' => array('class' => array('links', 'inline')), + )); + $rows['states'] = array( + array( + 'data' => $state_links, + 'class' => 'diff-links', + 'colspan' => 4, + ), + ); } - $rows[] = array( - array( - 'data' => $show_hide_markup_link, - 'class' => 'diff-prevlink', - 'colspan' => 4, - ) + $rows = array_merge($rows, _diff_body_rows($old_node, $new_node, $state)); + + $build['diff_table'] = array( + '#theme' => 'table__diff__standard', + '#header' => $header, + '#rows' => $rows, + '#attributes' => array('class' => array('diff')), + '#colgroups' => _diff_default_cols(), + '#sticky' => FALSE, ); - $rows = array_merge($rows, _diff_body_rows($old_node, $new_node, $remove_markup)); - $output = theme('diff_table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('diff')), 'cols' => $cols)); - - if ($node->vid == $new_vid) { - $output .= '