Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: DuaelFr/Terraludis
base: fb515a1cb4
...
head fork: DuaelFr/Terraludis
compare: d476afe2ad
  • 12 commits
  • 35 files changed
  • 0 commit comments
  • 1 contributor
Showing with 3,868 additions and 54 deletions.
  1. +12 −0 .gitignore
  2. +1 −1  sites/all/modules/ctools/includes/export.inc
  3. +1,329 −0 sites/all/modules/diff/DiffEngine.php
  4. +274 −0 sites/all/modules/diff/LICENSE.txt
  5. +86 −0 sites/all/modules/diff/diff.css
  6. +12 −0 sites/all/modules/diff/diff.info
  7. +351 −0 sites/all/modules/diff/diff.module
  8. +435 −0 sites/all/modules/diff/diff.pages.inc
  9. +326 −0 sites/all/modules/diff/diff.theme.inc
  10. +78 −0 sites/all/modules/diff/includes/node.inc
  11. +41 −0 sites/all/modules/diff/readme.txt
  12. BIN  sites/terraludis.org/files/default_images/groupe_icon.png
  13. +15 −0 sites/terraludis.org/modules/features/duael_dev/duael_dev.features.inc
  14. +29 −0 sites/terraludis.org/modules/features/duael_dev/duael_dev.info
  15. +7 −0 sites/terraludis.org/modules/features/duael_dev/duael_dev.module
  16. +56 −0 sites/terraludis.org/modules/features/duael_dev/duael_dev.strongarm.inc
  17. +3 −2 sites/terraludis.org/modules/features/tl_actualites/tl_actualites.features.field.inc
  18. +7 −6 sites/terraludis.org/modules/features/tl_actualites/tl_actualites.info
  19. +80 −10 sites/terraludis.org/modules/features/tl_actualites/tl_actualites.views_default.inc
  20. +80 −0 sites/terraludis.org/modules/features/tl_univers/tl_univers.features.field.inc
  21. +45 −18 sites/terraludis.org/modules/features/tl_univers/tl_univers.features.uuid_node.inc
  22. +1 −1  sites/terraludis.org/modules/features/tl_univers/tl_univers.field_group.inc
  23. +9 −7 sites/terraludis.org/modules/features/tl_univers/tl_univers.info
  24. +1 −0  sites/terraludis.org/modules/og/includes/og.views.inc
  25. +18 −0 sites/terraludis.org/modules/og/includes/views/og_handler_filter_group_audience_gid.inc
  26. +1 −0  sites/terraludis.org/modules/og/og.info
  27. +45 −0 sites/terraludis.org/modules/og_checkboxes/README.txt
  28. +6 −0 sites/terraludis.org/modules/og_checkboxes/og_checkboxes.info
  29. +266 −0 sites/terraludis.org/modules/og_checkboxes/og_checkboxes.module
  30. +42 −0 sites/terraludis.org/modules/tl_hacks/og_handler_filter_group_audience_gid_tl.inc
  31. +1 −0  sites/terraludis.org/modules/tl_hacks/tl_hacks.info
  32. +72 −1 sites/terraludis.org/modules/tl_hacks/tl_hacks.module
  33. +19 −7 sites/terraludis.org/themes/tl_ruban/js/scripts.js
  34. +119 −0 sites/terraludis.org/themes/tl_ruban/template.php
  35. +1 −1  sites/terraludis.org/themes/tl_ruban/tl_ruban.info
View
12 .gitignore
@@ -4,3 +4,15 @@ sites/*/settings*.php
# Ignore paths that contain user-generated content.
sites/*/files
sites/*/private
+
+# Ignore tmp files
+tmp/*
+!tmp/.htaccess
+
+# Ignore eclipse files
+.buildpath
+.project
+.settings
+
+# Ignore OS-X files
+.DS_Store
View
2  sites/all/modules/ctools/includes/export.inc
@@ -834,7 +834,7 @@ function ctools_var_export($var, $prefix = '') {
// magic method __set_state() leaving the export broken. This
// workaround avoids this by casting the object as an array for
// export and casting it back to an object when evaluated.
- $output .= '(object) ' . ctools_var_export((array) $var, $prefix);
+ $output = '(object) ' . ctools_var_export((array) $var, $prefix);
}
else if (is_bool($var)) {
$output = $var ? 'TRUE' : 'FALSE';
View
1,329 sites/all/modules/diff/DiffEngine.php
@@ -0,0 +1,1329 @@
+<?php
+
+/**
+ * @file
+ * A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+ *
+ * Copyright (C) 2000, 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
+ * You may copy this code freely under the conditions of the GPL.
+ */
+
+define('USE_ASSERTS', FALSE);
+
+/**
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class _DiffOp {
+ var $type;
+ var $orig;
+ var $closing;
+
+ function reverse() {
+ trigger_error('pure virtual', E_USER_ERROR);
+ }
+
+ function norig() {
+ return $this->orig ? sizeof($this->orig) : 0;
+ }
+
+ function nclosing() {
+ return $this->closing ? sizeof($this->closing) : 0;
+ }
+}
+
+/**
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class _DiffOp_Copy extends _DiffOp {
+ var $type = 'copy';
+
+ function _DiffOp_Copy($orig, $closing = FALSE) {
+ if (!is_array($closing)) {
+ $closing = $orig;
+ }
+ $this->orig = $orig;
+ $this->closing = $closing;
+ }
+
+ function reverse() {
+ return new _DiffOp_Copy($this->closing, $this->orig);
+ }
+}
+
+/**
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class _DiffOp_Delete extends _DiffOp {
+ var $type = 'delete';
+
+ function _DiffOp_Delete($lines) {
+ $this->orig = $lines;
+ $this->closing = FALSE;
+ }
+
+ function reverse() {
+ return new _DiffOp_Add($this->orig);
+ }
+}
+
+/**
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class _DiffOp_Add extends _DiffOp {
+ var $type = 'add';
+
+ function _DiffOp_Add($lines) {
+ $this->closing = $lines;
+ $this->orig = FALSE;
+ }
+
+ function reverse() {
+ return new _DiffOp_Delete($this->closing);
+ }
+}
+
+/**
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class _DiffOp_Change extends _DiffOp {
+ var $type = 'change';
+
+ function _DiffOp_Change($orig, $closing) {
+ $this->orig = $orig;
+ $this->closing = $closing;
+ }
+
+ function reverse() {
+ return new _DiffOp_Change($this->closing, $this->orig);
+ }
+}
+
+
+/**
+ * Class used internally by Diff to actually compute the diffs.
+ *
+ * The algorithm used here is mostly lifted from the perl module
+ * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
+ * http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
+ *
+ * More ideas are taken from:
+ * http://www.ics.uci.edu/~eppstein/161/960229.html
+ *
+ * Some ideas are (and a bit of code) are from from analyze.c, from GNU
+ * diffutils-2.7, which can be found at:
+ * ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
+ *
+ * closingly, some ideas (subdivision by NCHUNKS > 2, and some optimizations)
+ * are my own.
+ *
+ * Line length limits for robustness added by Tim Starling, 2005-08-31
+ *
+ * @author Geoffrey T. Dairiki, Tim Starling
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class _DiffEngine {
+ function MAX_XREF_LENGTH() {
+ return 10000;
+ }
+
+ function diff($from_lines, $to_lines) {
+
+ $n_from = sizeof($from_lines);
+ $n_to = sizeof($to_lines);
+
+ $this->xchanged = $this->ychanged = array();
+ $this->xv = $this->yv = array();
+ $this->xind = $this->yind = array();
+ unset($this->seq);
+ unset($this->in_seq);
+ unset($this->lcs);
+
+ // Skip leading common lines.
+ for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
+ if ($from_lines[$skip] !== $to_lines[$skip]) {
+ break;
+ }
+ $this->xchanged[$skip] = $this->ychanged[$skip] = FALSE;
+ }
+ // Skip trailing common lines.
+ $xi = $n_from;
+ $yi = $n_to;
+ for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
+ if ($from_lines[$xi] !== $to_lines[$yi]) {
+ break;
+ }
+ $this->xchanged[$xi] = $this->ychanged[$yi] = FALSE;
+ }
+
+ // Ignore lines which do not exist in both files.
+ for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+ $xhash[$this->_line_hash($from_lines[$xi])] = 1;
+ }
+
+ for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
+ $line = $to_lines[$yi];
+ if ($this->ychanged[$yi] = empty($xhash[$this->_line_hash($line)])) {
+ continue;
+ }
+ $yhash[$this->_line_hash($line)] = 1;
+ $this->yv[] = $line;
+ $this->yind[] = $yi;
+ }
+ for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+ $line = $from_lines[$xi];
+ if ($this->xchanged[$xi] = empty($yhash[$this->_line_hash($line)])) {
+ continue;
+ }
+ $this->xv[] = $line;
+ $this->xind[] = $xi;
+ }
+
+ // Find the LCS.
+ $this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
+
+ // Merge edits when possible
+ $this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged);
+ $this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
+
+ // Compute the edit operations.
+ $edits = array();
+ $xi = $yi = 0;
+ while ($xi < $n_from || $yi < $n_to) {
+ USE_ASSERTS && assert($yi < $n_to || $this->xchanged[$xi]);
+ USE_ASSERTS && assert($xi < $n_from || $this->ychanged[$yi]);
+
+ // Skip matching "snake".
+ $copy = array();
+ while ( $xi < $n_from && $yi < $n_to && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+ $copy[] = $from_lines[$xi++];
+ ++$yi;
+ }
+ if ($copy) {
+ $edits[] = new _DiffOp_Copy($copy);
+ }
+ // Find deletes & adds.
+ $delete = array();
+ while ($xi < $n_from && $this->xchanged[$xi]) {
+ $delete[] = $from_lines[$xi++];
+ }
+ $add = array();
+ while ($yi < $n_to && $this->ychanged[$yi]) {
+ $add[] = $to_lines[$yi++];
+ }
+ if ($delete && $add) {
+ $edits[] = new _DiffOp_Change($delete, $add);
+ }
+ elseif ($delete) {
+ $edits[] = new _DiffOp_Delete($delete);
+ }
+ elseif ($add) {
+ $edits[] = new _DiffOp_Add($add);
+ }
+ }
+ return $edits;
+ }
+
+ /**
+ * Returns the whole line if it's small enough, or the MD5 hash otherwise.
+ */
+ function _line_hash($line) {
+ if (strlen($line) > $this->MAX_XREF_LENGTH()) {
+ return md5($line);
+ }
+ else {
+ return $line;
+ }
+ }
+
+
+ /**
+ * Divide the Largest Common Subsequence (LCS) of the sequences
+ * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
+ * sized segments.
+ *
+ * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an
+ * array of NCHUNKS+1 (X, Y) indexes giving the diving points between
+ * sub sequences. The first sub-sequence is contained in [X0, X1),
+ * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note
+ * that (X0, Y0) == (XOFF, YOFF) and
+ * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
+ *
+ * This function assumes that the first lines of the specified portions
+ * of the two files do not match, and likewise that the last lines do not
+ * match. The caller must trim matching lines from the beginning and end
+ * of the portions it is going to specify.
+ */
+ function _diag($xoff, $xlim, $yoff, $ylim, $nchunks) {
+ $flip = FALSE;
+
+ if ($xlim - $xoff > $ylim - $yoff) {
+ // Things seems faster (I'm not sure I understand why)
+ // when the shortest sequence in X.
+ $flip = TRUE;
+ list($xoff, $xlim, $yoff, $ylim) = array($yoff, $ylim, $xoff, $xlim);
+ }
+
+ if ($flip) {
+ for ($i = $ylim - 1; $i >= $yoff; $i--) {
+ $ymatches[$this->xv[$i]][] = $i;
+ }
+ }
+ else {
+ for ($i = $ylim - 1; $i >= $yoff; $i--) {
+ $ymatches[$this->yv[$i]][] = $i;
+ }
+ }
+ $this->lcs = 0;
+ $this->seq[0]= $yoff - 1;
+ $this->in_seq = array();
+ $ymids[0] = array();
+
+ $numer = $xlim - $xoff + $nchunks - 1;
+ $x = $xoff;
+ for ($chunk = 0; $chunk < $nchunks; $chunk++) {
+ if ($chunk > 0) {
+ for ($i = 0; $i <= $this->lcs; $i++) {
+ $ymids[$i][$chunk-1] = $this->seq[$i];
+ }
+ }
+
+ $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
+ for ( ; $x < $x1; $x++) {
+ $line = $flip ? $this->yv[$x] : $this->xv[$x];
+ if (empty($ymatches[$line])) {
+ continue;
+ }
+ $matches = $ymatches[$line];
+ reset($matches);
+ while (list ($junk, $y) = each($matches)) {
+ if (empty($this->in_seq[$y])) {
+ $k = $this->_lcs_pos($y);
+ USE_ASSERTS && assert($k > 0);
+ $ymids[$k] = $ymids[$k-1];
+ break;
+ }
+ }
+ while (list ($junk, $y) = each($matches)) {
+ if ($y > $this->seq[$k-1]) {
+ USE_ASSERTS && assert($y < $this->seq[$k]);
+ // Optimization: this is a common case:
+ // next match is just replacing previous match.
+ $this->in_seq[$this->seq[$k]] = FALSE;
+ $this->seq[$k] = $y;
+ $this->in_seq[$y] = 1;
+ }
+ elseif (empty($this->in_seq[$y])) {
+ $k = $this->_lcs_pos($y);
+ USE_ASSERTS && assert($k > 0);
+ $ymids[$k] = $ymids[$k-1];
+ }
+ }
+ }
+ }
+
+ $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
+ $ymid = $ymids[$this->lcs];
+ for ($n = 0; $n < $nchunks - 1; $n++) {
+ $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+ $y1 = $ymid[$n] + 1;
+ $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+ }
+ $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
+
+ return array($this->lcs, $seps);
+ }
+
+ function _lcs_pos($ypos) {
+
+ $end = $this->lcs;
+ if ($end == 0 || $ypos > $this->seq[$end]) {
+ $this->seq[++$this->lcs] = $ypos;
+ $this->in_seq[$ypos] = 1;
+ return $this->lcs;
+ }
+
+ $beg = 1;
+ while ($beg < $end) {
+ $mid = (int)(($beg + $end) / 2);
+ if ($ypos > $this->seq[$mid]) {
+ $beg = $mid + 1;
+ }
+ else {
+ $end = $mid;
+ }
+ }
+
+ USE_ASSERTS && assert($ypos != $this->seq[$end]);
+
+ $this->in_seq[$this->seq[$end]] = FALSE;
+ $this->seq[$end] = $ypos;
+ $this->in_seq[$ypos] = 1;
+ return $end;
+ }
+
+ /**
+ * Find LCS of two sequences.
+ *
+ * The results are recorded in the vectors $this->{x,y}changed[], by
+ * storing a 1 in the element for each line that is an insertion
+ * or deletion (ie. is not in the LCS).
+ *
+ * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.
+ *
+ * Note that XLIM, YLIM are exclusive bounds.
+ * All line numbers are origin-0 and discarded lines are not counted.
+ */
+ function _compareseq($xoff, $xlim, $yoff, $ylim) {
+
+ // Slide down the bottom initial diagonal.
+ while ($xoff < $xlim && $yoff < $ylim && $this->xv[$xoff] == $this->yv[$yoff]) {
+ ++$xoff;
+ ++$yoff;
+ }
+
+ // Slide up the top initial diagonal.
+ while ($xlim > $xoff && $ylim > $yoff && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
+ --$xlim;
+ --$ylim;
+ }
+
+ if ($xoff == $xlim || $yoff == $ylim) {
+ $lcs = 0;
+ }
+ else {
+ // This is ad hoc but seems to work well.
+ //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
+ //$nchunks = max(2, min(8, (int)$nchunks));
+ $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
+ list($lcs, $seps)
+ = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
+ }
+
+ if ($lcs == 0) {
+ // X and Y sequences have no common subsequence:
+ // mark all changed.
+ while ($yoff < $ylim) {
+ $this->ychanged[$this->yind[$yoff++]] = 1;
+ }
+ while ($xoff < $xlim) {
+ $this->xchanged[$this->xind[$xoff++]] = 1;
+ }
+ }
+ else {
+ // Use the partitions to split this problem into subproblems.
+ reset($seps);
+ $pt1 = $seps[0];
+ while ($pt2 = next($seps)) {
+ $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+ $pt1 = $pt2;
+ }
+ }
+ }
+
+ /**
+ * Adjust inserts/deletes of identical lines to join changes
+ * as much as possible.
+ *
+ * We do something when a run of changed lines include a
+ * line at one end and has an excluded, identical line at the other.
+ * We are free to choose which identical line is included.
+ * `compareseq' usually chooses the one at the beginning,
+ * but usually it is cleaner to consider the following identical line
+ * to be the "change".
+ *
+ * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
+ */
+ function _shift_boundaries($lines, &$changed, $other_changed) {
+ $i = 0;
+ $j = 0;
+
+ USE_ASSERTS && assert('sizeof($lines) == sizeof($changed)');
+ $len = sizeof($lines);
+ $other_len = sizeof($other_changed);
+
+ while (1) {
+ /*
+ * Scan forwards to find beginning of another run of changes.
+ * Also keep track of the corresponding point in the other file.
+ *
+ * Throughout this code, $i and $j are adjusted together so that
+ * the first $i elements of $changed and the first $j elements
+ * of $other_changed both contain the same number of zeros
+ * (unchanged lines).
+ * Furthermore, $j is always kept so that $j == $other_len or
+ * $other_changed[$j] == FALSE.
+ */
+ while ($j < $other_len && $other_changed[$j]) {
+ $j++;
+ }
+ while ($i < $len && ! $changed[$i]) {
+ USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
+ $i++;
+ $j++;
+ while ($j < $other_len && $other_changed[$j]) {
+ $j++;
+ }
+ }
+
+ if ($i == $len) {
+ break;
+ }
+ $start = $i;
+
+ // Find the end of this run of changes.
+ while (++$i < $len && $changed[$i]) {
+ continue;
+ }
+
+ do {
+ /*
+ * Record the length of this run of changes, so that
+ * we can later determine whether the run has grown.
+ */
+ $runlength = $i - $start;
+
+ /*
+ * Move the changed region back, so long as the
+ * previous unchanged line matches the last changed one.
+ * This merges with previous changed regions.
+ */
+ while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
+ $changed[--$start] = 1;
+ $changed[--$i] = FALSE;
+ while ($start > 0 && $changed[$start - 1]) {
+ $start--;
+ }
+ USE_ASSERTS && assert('$j > 0');
+ while ($other_changed[--$j]) {
+ continue;
+ }
+ USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
+ }
+
+ /*
+ * Set CORRESPONDING to the end of the changed run, at the last
+ * point where it corresponds to a changed run in the other file.
+ * CORRESPONDING == LEN means no such point has been found.
+ */
+ $corresponding = $j < $other_len ? $i : $len;
+
+ /*
+ * Move the changed region forward, so long as the
+ * first changed line matches the following unchanged one.
+ * This merges with following changed regions.
+ * Do this second, so that if there are no merges,
+ * the changed region is moved forward as far as possible.
+ */
+ while ($i < $len && $lines[$start] == $lines[$i]) {
+ $changed[$start++] = FALSE;
+ $changed[$i++] = 1;
+ while ($i < $len && $changed[$i]) {
+ $i++;
+ }
+ USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
+ $j++;
+ if ($j < $other_len && $other_changed[$j]) {
+ $corresponding = $i;
+ while ($j < $other_len && $other_changed[$j]) {
+ $j++;
+ }
+ }
+ }
+ } while ($runlength != $i - $start);
+
+ /*
+ * If possible, move the fully-merged run of changes
+ * back to a corresponding run in the other file.
+ */
+ while ($corresponding < $i) {
+ $changed[--$start] = 1;
+ $changed[--$i] = 0;
+ USE_ASSERTS && assert('$j > 0');
+ while ($other_changed[--$j]) {
+ continue;
+ }
+ USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
+ }
+ }
+ }
+}
+
+/**
+ * Class representing a 'diff' between two sequences of strings.
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class Diff {
+ var $edits;
+
+ /**
+ * Constructor.
+ * Computes diff between sequences of strings.
+ *
+ * @param $from_lines array An array of strings.
+ * (Typically these are lines from a file.)
+ * @param $to_lines array An array of strings.
+ */
+ function Diff($from_lines, $to_lines) {
+ $eng = new _DiffEngine;
+ $this->edits = $eng->diff($from_lines, $to_lines);
+ //$this->_check($from_lines, $to_lines);
+ }
+
+ /**
+ * Compute reversed Diff.
+ *
+ * SYNOPSIS:
+ *
+ * $diff = new Diff($lines1, $lines2);
+ * $rev = $diff->reverse();
+ * @return object A Diff object representing the inverse of the
+ * original diff.
+ */
+ function reverse() {
+ $rev = $this;
+ $rev->edits = array();
+ foreach ($this->edits as $edit) {
+ $rev->edits[] = $edit->reverse();
+ }
+ return $rev;
+ }
+
+ /**
+ * Check for empty diff.
+ *
+ * @return bool True iff two sequences were identical.
+ */
+ function isEmpty() {
+ foreach ($this->edits as $edit) {
+ if ($edit->type != 'copy') {
+ return FALSE;
+ }
+ }
+ return TRUE;
+ }
+
+ /**
+ * Compute the length of the Longest Common Subsequence (LCS).
+ *
+ * This is mostly for diagnostic purposed.
+ *
+ * @return int The length of the LCS.
+ */
+ function lcs() {
+ $lcs = 0;
+ foreach ($this->edits as $edit) {
+ if ($edit->type == 'copy') {
+ $lcs += sizeof($edit->orig);
+ }
+ }
+ return $lcs;
+ }
+
+ /**
+ * Get the original set of lines.
+ *
+ * This reconstructs the $from_lines parameter passed to the
+ * constructor.
+ *
+ * @return array The original sequence of strings.
+ */
+ function orig() {
+ $lines = array();
+
+ foreach ($this->edits as $edit) {
+ if ($edit->orig) {
+ array_splice($lines, sizeof($lines), 0, $edit->orig);
+ }
+ }
+ return $lines;
+ }
+
+ /**
+ * Get the closing set of lines.
+ *
+ * This reconstructs the $to_lines parameter passed to the
+ * constructor.
+ *
+ * @return array The sequence of strings.
+ */
+ function closing() {
+ $lines = array();
+
+ foreach ($this->edits as $edit) {
+ if ($edit->closing) {
+ array_splice($lines, sizeof($lines), 0, $edit->closing);
+ }
+ }
+ return $lines;
+ }
+
+ /**
+ * Check a Diff for validity.
+ *
+ * This is here only for debugging purposes.
+ */
+ function _check($from_lines, $to_lines) {
+ if (serialize($from_lines) != serialize($this->orig())) {
+ trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
+ }
+ if (serialize($to_lines) != serialize($this->closing())) {
+ trigger_error("Reconstructed closing doesn't match", E_USER_ERROR);
+ }
+
+ $rev = $this->reverse();
+ if (serialize($to_lines) != serialize($rev->orig())) {
+ trigger_error("Reversed original doesn't match", E_USER_ERROR);
+ }
+ if (serialize($from_lines) != serialize($rev->closing())) {
+ trigger_error("Reversed closing doesn't match", E_USER_ERROR);
+ }
+
+
+ $prevtype = 'none';
+ foreach ($this->edits as $edit) {
+ if ( $prevtype == $edit->type ) {
+ trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+ }
+ $prevtype = $edit->type;
+ }
+
+ $lcs = $this->lcs();
+ trigger_error('Diff okay: LCS = '. $lcs, E_USER_NOTICE);
+ }
+}
+
+/**
+ * FIXME: bad name.
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class MappedDiff extends Diff {
+ /**
+ * Constructor.
+ *
+ * Computes diff between sequences of strings.
+ *
+ * This can be used to compute things like
+ * case-insensitve diffs, or diffs which ignore
+ * changes in white-space.
+ *
+ * @param $from_lines array An array of strings.
+ * (Typically these are lines from a file.)
+ *
+ * @param $to_lines array An array of strings.
+ *
+ * @param $mapped_from_lines array This array should
+ * have the same size number of elements as $from_lines.
+ * The elements in $mapped_from_lines and
+ * $mapped_to_lines are what is actually compared
+ * when computing the diff.
+ *
+ * @param $mapped_to_lines array This array should
+ * have the same number of elements as $to_lines.
+ */
+ function MappedDiff($from_lines, $to_lines, $mapped_from_lines, $mapped_to_lines) {
+
+ assert(sizeof($from_lines) == sizeof($mapped_from_lines));
+ assert(sizeof($to_lines) == sizeof($mapped_to_lines));
+
+ $this->Diff($mapped_from_lines, $mapped_to_lines);
+
+ $xi = $yi = 0;
+ for ($i = 0; $i < sizeof($this->edits); $i++) {
+ $orig = &$this->edits[$i]->orig;
+ if (is_array($orig)) {
+ $orig = array_slice($from_lines, $xi, sizeof($orig));
+ $xi += sizeof($orig);
+ }
+
+ $closing = &$this->edits[$i]->closing;
+ if (is_array($closing)) {
+ $closing = array_slice($to_lines, $yi, sizeof($closing));
+ $yi += sizeof($closing);
+ }
+ }
+ }
+}
+
+/**
+ * A class to format Diffs
+ *
+ * This class formats the diff in classic diff format.
+ * It is intended that this class be customized via inheritance,
+ * to obtain fancier outputs.
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class DiffFormatter {
+ /**
+ * Should a block header be shown?
+ */
+ var $show_header = TRUE;
+
+ /**
+ * Number of leading context "lines" to preserve.
+ *
+ * This should be left at zero for this class, but subclasses
+ * may want to set this to other values.
+ */
+ var $leading_context_lines = 0;
+
+ /**
+ * Number of trailing context "lines" to preserve.
+ *
+ * This should be left at zero for this class, but subclasses
+ * may want to set this to other values.
+ */
+ var $trailing_context_lines = 0;
+
+ /**
+ * Format a diff.
+ *
+ * @param $diff object A Diff object.
+ * @return string The formatted output.
+ */
+ function format($diff) {
+
+ $xi = $yi = 1;
+ $block = FALSE;
+ $context = array();
+
+ $nlead = $this->leading_context_lines;
+ $ntrail = $this->trailing_context_lines;
+
+ $this->_start_diff();
+
+ foreach ($diff->edits as $edit) {
+ if ($edit->type == 'copy') {
+ if (is_array($block)) {
+ if (sizeof($edit->orig) <= $nlead + $ntrail) {
+ $block[] = $edit;
+ }
+ else {
+ if ($ntrail) {
+ $context = array_slice($edit->orig, 0, $ntrail);
+ $block[] = new _DiffOp_Copy($context);
+ }
+ $this->_block($x0, $ntrail + $xi - $x0, $y0, $ntrail + $yi - $y0, $block);
+ $block = FALSE;
+ }
+ }
+ $context = $edit->orig;
+ }
+ else {
+ if (! is_array($block)) {
+ $context = array_slice($context, sizeof($context) - $nlead);
+ $x0 = $xi - sizeof($context);
+ $y0 = $yi - sizeof($context);
+ $block = array();
+ if ($context) {
+ $block[] = new _DiffOp_Copy($context);
+ }
+ }
+ $block[] = $edit;
+ }
+
+ if ($edit->orig) {
+ $xi += sizeof($edit->orig);
+ }
+ if ($edit->closing) {
+ $yi += sizeof($edit->closing);
+ }
+ }
+
+ if (is_array($block)) {
+ $this->_block($x0, $xi - $x0, $y0, $yi - $y0, $block);
+ }
+ $end = $this->_end_diff();
+ return $end;
+ }
+
+ function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) {
+ $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
+ foreach ($edits as $edit) {
+ if ($edit->type == 'copy') {
+ $this->_context($edit->orig);
+ }
+ elseif ($edit->type == 'add') {
+ $this->_added($edit->closing);
+ }
+ elseif ($edit->type == 'delete') {
+ $this->_deleted($edit->orig);
+ }
+ elseif ($edit->type == 'change') {
+ $this->_changed($edit->orig, $edit->closing);
+ }
+ else {
+ trigger_error('Unknown edit type', E_USER_ERROR);
+ }
+ }
+ $this->_end_block();
+ }
+
+ function _start_diff() {
+ ob_start();
+ }
+
+ function _end_diff() {
+ $val = ob_get_contents();
+ ob_end_clean();
+ return $val;
+ }
+
+ function _block_header($xbeg, $xlen, $ybeg, $ylen) {
+ if ($xlen > 1) {
+ $xbeg .= "," . ($xbeg + $xlen - 1);
+ }
+ if ($ylen > 1) {
+ $ybeg .= "," . ($ybeg + $ylen - 1);
+ }
+
+ return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+ }
+
+ function _start_block($header) {
+ if ($this->show_header) {
+ echo $header . "\n";
+ }
+ }
+
+ function _end_block() {
+ }
+
+ function _lines($lines, $prefix = ' ') {
+ foreach ($lines as $line) {
+ echo "$prefix $line\n";
+ }
+ }
+
+ function _context($lines) {
+ $this->_lines($lines);
+ }
+
+ function _added($lines) {
+ $this->_lines($lines, '>');
+ }
+ function _deleted($lines) {
+ $this->_lines($lines, '<');
+ }
+
+ function _changed($orig, $closing) {
+ $this->_deleted($orig);
+ echo "---\n";
+ $this->_added($closing);
+ }
+}
+
+
+/**
+ * Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
+ *
+ */
+
+define('NBSP', '&#160;'); // iso-8859-x non-breaking space.
+
+/**
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class _HWLDF_WordAccumulator {
+ function _HWLDF_WordAccumulator() {
+ $this->_lines = array();
+ $this->_line = '';
+ $this->_group = '';
+ $this->_tag = '';
+ }
+
+ function _flushGroup($new_tag) {
+ if ($this->_group !== '') {
+ if ($this->_tag == 'mark') {
+ $this->_line .= '<span class="diffchange">'. check_plain($this->_group) .'</span>';
+ }
+ else {
+ $this->_line .= check_plain($this->_group);
+ }
+ }
+ $this->_group = '';
+ $this->_tag = $new_tag;
+ }
+
+ function _flushLine($new_tag) {
+ $this->_flushGroup($new_tag);
+ if ($this->_line != '') {
+ array_push($this->_lines, $this->_line);
+ }
+ else {
+ // make empty lines visible by inserting an NBSP
+ array_push($this->_lines, NBSP);
+ }
+ $this->_line = '';
+ }
+
+ function addWords($words, $tag = '') {
+ if ($tag != $this->_tag) {
+ $this->_flushGroup($tag);
+ }
+ foreach ($words as $word) {
+ // new-line should only come as first char of word.
+ if ($word == '') {
+ continue;
+ }
+ if ($word[0] == "\n") {
+ $this->_flushLine($tag);
+ $word = substr($word, 1);
+ }
+ assert(!strstr($word, "\n"));
+ $this->_group .= $word;
+ }
+ }
+
+ function getLines() {
+ $this->_flushLine('~done');
+ return $this->_lines;
+ }
+}
+
+/**
+ * @todo document
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class WordLevelDiff extends MappedDiff {
+ function MAX_LINE_LENGTH() {
+ return 10000;
+ }
+
+ function WordLevelDiff($orig_lines, $closing_lines) {
+ list($orig_words, $orig_stripped) = $this->_split($orig_lines);
+ list($closing_words, $closing_stripped) = $this->_split($closing_lines);
+
+ $this->MappedDiff($orig_words, $closing_words, $orig_stripped, $closing_stripped);
+ }
+
+ function _split($lines) {
+ $words = array();
+ $stripped = array();
+ $first = TRUE;
+ foreach ($lines as $line) {
+ // If the line is too long, just pretend the entire line is one big word
+ // This prevents resource exhaustion problems
+ if ( $first ) {
+ $first = FALSE;
+ }
+ else {
+ $words[] = "\n";
+ $stripped[] = "\n";
+ }
+ if ( strlen( $line ) > $this->MAX_LINE_LENGTH() ) {
+ $words[] = $line;
+ $stripped[] = $line;
+ }
+ else {
+ if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs', $line, $m)) {
+ $words = array_merge($words, $m[0]);
+ $stripped = array_merge($stripped, $m[1]);
+ }
+ }
+ }
+ return array($words, $stripped);
+ }
+
+ function orig() {
+ $orig = new _HWLDF_WordAccumulator;
+
+ foreach ($this->edits as $edit) {
+ if ($edit->type == 'copy') {
+ $orig->addWords($edit->orig);
+ }
+ elseif ($edit->orig) {
+ $orig->addWords($edit->orig, 'mark');
+ }
+ }
+ $lines = $orig->getLines();
+ return $lines;
+ }
+
+ function closing() {
+ $closing = new _HWLDF_WordAccumulator;
+
+ foreach ($this->edits as $edit) {
+ if ($edit->type == 'copy') {
+ $closing->addWords($edit->closing);
+ }
+ elseif ($edit->closing) {
+ $closing->addWords($edit->closing, 'mark');
+ }
+ }
+ $lines = $closing->getLines();
+ return $lines;
+ }
+}
+
+/**
+ * Diff formatter which uses Drupal theme functions.
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class DrupalDiffFormatter extends DiffFormatter {
+
+ var $rows;
+
+ function DrupalDiffFormatter() {
+ $this->leading_context_lines = 2;
+ $this->trailing_context_lines = 2;
+ }
+
+ function _start_diff() {
+ $this->rows = array();
+ }
+
+ function _end_diff() {
+ return $this->rows;
+ }
+
+ function _block_header($xbeg, $xlen, $ybeg, $ylen) {
+ return array(
+ array(
+ 'data' => theme('diff_header_line', array('lineno' => $xbeg)),
+ 'colspan' => 2,
+ ),
+ array(
+ 'data' => theme('diff_header_line', array('lineno' => $ybeg)),
+ 'colspan' => 2,
+ )
+ );
+ }
+
+ function _start_block($header) {
+ if ($this->show_header) {
+ $this->rows[] = $header;
+ }
+ }
+
+ function _end_block() {
+ }
+
+ function _lines($lines, $prefix=' ', $color='white') {
+ }
+
+ /**
+ * Note: you should HTML-escape parameter before calling this.
+ */
+ function addedLine($line) {
+ return array(
+ '+',
+ array(
+ 'data' => theme('diff_content_line', array('line' => $line)),
+ 'class' => 'diff-addedline',
+ )
+ );
+ }
+
+ /**
+ * Note: you should HTML-escape parameter before calling this.
+ */
+ function deletedLine($line) {
+ return array(
+ '-',
+ array(
+ 'data' => theme('diff_content_line', array('line' => $line)),
+ 'class' => 'diff-deletedline',
+ )
+ );
+ }
+
+ /**
+ * Note: you should HTML-escape parameter before calling this.
+ */
+ function contextLine($line) {
+ return array(
+ '&nbsp;',
+ array(
+ 'data' => theme('diff_content_line', array('line' => $line)),
+ 'class' => 'diff-context',
+ )
+ );
+ }
+
+ function emptyLine() {
+ return array(
+ '&nbsp;',
+ theme('diff_empty_line', array('line' => '&nbsp;')),
+ );
+ }
+
+ function _added($lines) {
+ foreach ($lines as $line) {
+ $this->rows[] = array_merge($this->emptyLine(), $this->addedLine(check_plain($line)));
+ }
+ }
+
+ function _deleted($lines) {
+ foreach ($lines as $line) {
+ $this->rows[] = array_merge($this->deletedLine(check_plain($line)), $this->emptyLine());
+ }
+ }
+
+ function _context($lines) {
+ foreach ($lines as $line) {
+ $this->rows[] = array_merge($this->contextLine(check_plain($line)), $this->contextLine(check_plain($line)));
+ }
+ }
+
+ function _changed($orig, $closing) {
+ $diff = new WordLevelDiff($orig, $closing);
+ $del = $diff->orig();
+ $add = $diff->closing();
+
+ // Notice that WordLevelDiff returns HTML-escaped output.
+ // Hence, we will be calling addedLine/deletedLine without HTML-escaping.
+
+ while ($line = array_shift($del)) {
+ $aline = array_shift( $add );
+ $this->rows[] = array_merge($this->deletedLine($line), $this->addedLine($aline));
+ }
+ foreach ($add as $line) { // If any leftovers
+ $this->rows[] = array_merge($this->emptyLine(), $this->addedLine($line));
+ }
+ }
+}
+
+/**
+ * Drupal inline Diff formatter.
+ * @private
+ * @subpackage DifferenceEngine
+ */
+class DrupalDiffInline {
+ var $a;
+ var $b;
+
+ /**
+ * Constructor.
+ */
+ function __construct($a, $b) {
+ $this->a = $a;
+ $this->b = $b;
+ }
+
+ /**
+ * Render differences inline using HTML markup.
+ */
+ function render() {
+ $a = preg_split('/(<[^>]+?>| )/', $this->a, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $b = preg_split('/(<[^>]+?>| )/', $this->b, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $diff = new Diff($a, $b);
+ $diff->edits = $this->process_edits($diff->edits);
+
+ // Assemble highlighted output
+ $output = '';
+ foreach ($diff->edits as $chunk) {
+ switch ($chunk->type) {
+ case 'copy':
+ $output .= implode('', $chunk->closing);
+ break;
+ case 'delete':
+ foreach ($chunk->orig as $i => $piece) {
+ if (strpos($piece, '<') === 0 && substr($piece, strlen($piece) - 1) === '>') {
+ $output .= $piece;
+ }
+ else {
+ $output .= theme('diff_inline_chunk', array('text' => $piece, 'type' => $chunk->type));
+ }
+ }
+ break;
+ default:
+ $chunk->closing = $this->process_chunk($chunk->closing);
+ foreach ($chunk->closing as $i => $piece) {
+ if ($piece === ' ' || (strpos($piece, '<') === 0 && substr($piece, strlen($piece) - 1) === '>' && strtolower(substr($piece, 1, 3)) != 'img')) {
+ $output .= $piece;
+ }
+ else {
+ $output .= theme('diff_inline_chunk', array('text' => $piece, 'type' => $chunk->type));
+ }
+ }
+ break;
+ }
+ }
+ return $output;
+ }
+
+ /**
+ * Merge chunk segments between tag delimiters.
+ */
+ function process_chunk($chunk) {
+ $processed = array();
+ $j = 0;
+ foreach ($chunk as $i => $piece) {
+ $next = isset($chunk[$i+1]) ? $chunk[$i+1] : NULL;
+ if (strpos($piece, '<') === 0 && substr($piece, strlen($piece) - 1) === '>') {
+ $processed[$j] = $piece;
+ $j++;
+ }
+ else if (isset($next) && strpos($next, '<') === 0 && substr($next, strlen($next) - 1) === '>') {
+ $processed[$j] .= $piece;
+ $j++;
+ }
+ else {
+ $processed[$j] .= $piece;
+ }
+ }
+ return $processed;
+ }
+
+ /**
+ * Merge copy and equivalent edits into intelligible chunks.
+ */
+ function process_edits($edits) {
+ $processed = array();
+ $current = array_shift($edits);
+
+ // Make two passes -- first merge space delimiter copies back into their originals.
+ while ($chunk = array_shift($edits)) {
+ if ($chunk->type == 'copy' && $chunk->orig === array(' ')) {
+ $current->orig = array_merge((array) $current->orig, (array) $chunk->orig);
+ $current->closing = array_merge((array) $current->closing, (array) $chunk->closing);
+ }
+ else {
+ $processed[] = $current;
+ $current = $chunk;
+ }
+ }
+ $processed[] = $current;
+
+ // Initial setup
+ $edits = $processed;
+ $processed = array();
+ $current = array_shift($edits);
+
+ // Second, merge equivalent chunks into each other.
+ while ($chunk = array_shift($edits)) {
+ if ($current->type == $chunk->type) {
+ $current->orig = array_merge((array) $current->orig, (array) $chunk->orig);
+ $current->closing = array_merge((array) $current->closing, (array) $chunk->closing);
+ }
+ else {
+ $processed[] = $current;
+ $current = $chunk;
+ }
+ }
+ $processed[] = $current;
+
+ return $processed;
+ }
+}
View
274 sites/all/modules/diff/LICENSE.txt
@@ -0,0 +1,274 @@
+GNU GENERAL PUBLIC LICENSE
+
+ Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
+Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
+verbatim copies of this license document, but changing it is not allowed.
+
+ Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public License
+applies to most of the Free Software Foundation's software and to any other
+program whose authors commit to using it. (Some other Free Software
+Foundation software is covered by the GNU Library General Public License
+instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this service if
+you wish), that you receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free programs; and that
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have. You must make
+sure that they, too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients
+to know that what they have is not the original, so that any problems
+introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that redistributors of a free program will individually
+obtain patent licenses, in effect making the program proprietary. To prevent
+this, we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+ MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms
+of this General Public License. The "Program", below, refers to any such
+program or work, and a "work based on the Program" means either the
+Program or any derivative work under copyright law: that is to say, a work
+containing the Program or a portion of it, either verbatim or with
+modifications and/or translated into another language. (Hereinafter, translation
+is included without limitation in the term "modification".) Each licensee is
+addressed as "you".
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made
+by running the Program). Whether that is true depends on what the Program
+does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it,
+thus forming a work based on the Program, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you
+also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that
+you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in
+part contains or is derived from the Program or any part thereof, to be
+licensed as a whole at no charge to all third parties under the terms of this
+License.
+
+c) If the modified program normally reads commands interactively when run,
+you must cause it, when started running for such interactive use in the most
+ordinary way, to print or display an announcement including an appropriate
+copyright notice and a notice that there is no warranty (or else, saying that
+you provide a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this License.
+(Exception: if the Program itself is interactive but does not normally print such
+an announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be
+reasonably considered independent and separate works in themselves, then
+this License, and its terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same sections as part
+of a whole which is a work based on the Program, the distribution of the
+whole must be on the terms of this License, whose permissions for other
+licensees extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to
+work written entirely by you; rather, the intent is to exercise the right to
+control the distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the scope
+of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1
+and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2 above
+on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give
+any third party, for a charge no more than your cost of physically performing
+source distribution, a complete machine-readable copy of the corresponding
+source code, to be distributed under the terms of Sections 1 and 2 above on
+a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute
+corresponding source code. (This alternative is allowed only for
+noncommercial distribution and only if you received the program in object
+code or executable form with such an offer, in accord with Subsection b
+above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation and
+installation of the executable. However, as a special exception, the source
+code distributed need not include anything that is normally distributed (in
+either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to
+copy from a designated place, then offering equivalent access to copy the
+source code from the same place counts as distribution of the source code,
+even though third parties are not compelled to copy the source along with the
+object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy,
+modify, sublicense or distribute the Program is void, and will automatically
+terminate your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the
+Program or its derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or distributing the
+Program (or any work based on the Program), you indicate your acceptance
+of this License to do so, and all its terms and conditions for copying,
+distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these terms and
+conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
+that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In such
+case, this License incorporates the limitation as if written in the body of this
+License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will be
+similar in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that
+version or of any later version published by the Free Software Foundation. If
+the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make
+exceptions for this. Our decision will be guided by the two goals of
+preserving the free status of all derivatives of our free software and of
+promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
+PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
+AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
+ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
+LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE OR LOSSES
+SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
+IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
View
86 sites/all/modules/diff/diff.css
@@ -0,0 +1,86 @@
+
+html.js .diff-js-hidden { display:none; }
+
+/**
+ * Inline diff metadata
+ */
+.diff-inline-metadata {
+ padding:4px;
+ border:1px solid #ddd;
+ background:#fff;
+ margin:0px 0px 10px;
+ }
+
+.diff-inline-legend { font-size:11px; }
+
+.diff-inline-legend span,
+.diff-inline-legend label { margin-right:5px; }
+
+/**
+ * Inline diff markup
+ */
+span.diff-deleted { color:#ccc; }
+span.diff-deleted img { border: solid 2px #ccc; }
+span.diff-changed { background:#ffb; }
+span.diff-changed img { border:solid 2px #ffb; }
+span.diff-added { background:#cfc; }
+span.diff-added img { border: solid 2px #cfc; }
+
+/**
+ * Traditional split diff theming
+ */
+table.diff {
+ border-spacing: 4px;
+ margin-bottom: 20px;
+ table-layout: fixed;
+ width: 100%;
+}
+table.diff tr.even, table.diff tr.odd {
+ background-color: inherit;
+ border: none;
+}
+td.diff-prevlink {
+ text-align: left;
+}
+td.diff-nextlink {
+ text-align: right;
+}
+td.diff-section-title, div.diff-section-title {
+ background-color: #f0f0ff;
+ font-size: 0.83em;
+ font-weight: bold;
+ padding: 0.1em 1em;
+}
+td.diff-deletedline {
+ background-color: #ffa;
+ width: 50%;
+}
+td.diff-addedline {
+ background-color: #afa;
+ width: 50%;
+}
+td.diff-context {
+ background-color: #fafafa;
+}
+span.diffchange {
+ color: #f00;
+ font-weight: bold;
+}
+
+table.diff col.diff-marker {
+ width: 1.4em;
+}
+table.diff col.diff-content {
+ width: 50%;
+}
+table.diff th {
+ padding-right: inherit;
+}
+table.diff td div {
+ overflow: auto;
+ padding: 0.1ex 0.5em;
+ word-wrap: break-word;
+}
+table.diff td {
+ padding: 0.1ex 0.4em;
+}
View
12 sites/all/modules/diff/diff.info
@@ -0,0 +1,12 @@
+name = Diff
+description = Show difference between node revisions.
+core = 7.x
+
+files[] = DiffEngine.php
+
+; Information added by drupal.org packaging script on 2011-07-21
+version = "7.x-2.0"
+core = "7.x"
+project = "diff"
+datestamp = "1311239815"
+
View
351 sites/all/modules/diff/diff.module
@@ -0,0 +1,351 @@
+<?php
+
+/**
+ * @file
+ * Provides functionality to show a diff between two node revisions.
+ */
+
+/**
+ * Number of items on one page of the revision list.
+ */
+define('REVISION_LIST_SIZE', 50);
+
+/**
+ * Implementation of hook_help().
+ */
+function diff_help($path, $arg) {
+ switch ($path) {
+ case 'admin/help#diff':
+ $output = '<p>'. 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'))) .'</p>';
+ return $output;
+ case 'node/%/revisions/%/view':
+ // the following string is copied from string copied from node_help('node/%/revisions')
+ return '<p>'. t('The revisions let you track differences between multiple versions of a post.') .'</p>';
+ case 'node/%/revisions/view/%/%':
+ return '<p>'. t('Comparing two revisions:') .'</p>';
+ }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+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'.
+ */
+ $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,
+ 'access callback' => 'diff_node_revision_access',
+ 'access arguments' => array(1),
+ 'file' => 'diff.pages.inc',
+ );
+ $items['node/%node/revisions/view'] = array(
+ 'title' => 'Diff',
+ 'page callback' => 'diff_diffs_show',
+ 'page arguments' => array(1, 4, 5),
+ 'type' => MENU_LOCAL_TASK,
+ 'access callback' => 'diff_node_revision_access',
+ 'access arguments' => array(1),
+ 'tab_parent' => 'node/%/revisions/list',
+ 'file' => 'diff.pages.inc',
+ );
+ $items['node/%node/revisions/view/latest'] = array(
+ 'title' => 'Show latest diff',
+ 'page callback' => 'diff_latest',
+ 'page arguments' => array(1),
+ 'type' => MENU_LOCAL_TASK,
+ 'access callback' => 'diff_node_revision_access',
+ 'access arguments' => array(1),
+ 'tab_parent' => 'node/%/revisions/view',
+ 'file' => 'diff.pages.inc',
+ );
+ return $items;
+}
+
+/**
+ * Implementation of hook_menu_alter().
+ */
+function diff_menu_alter(&$callbacks) {
+ // 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';
+
+ $callbacks['node/%node/revisions/%/view']['tab_parent'] = 'node/%/revisions/list';
+ $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;
+}
+
+/**
+ * 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');
+ return $may_revision_this_type && _node_revision_access($node, $op);
+}
+
+/**
+ * Implements hook_block_info().
+ */
+function diff_block_info() {
+ return array('inline' => array('info' => t('Inline diff')));
+}
+
+/**
+ * Implements hook_block_view().
+ */
+function diff_block_view($delta) {
+ if ($delta === 'inline' && user_access('view revisions') && $node = menu_get_object()) {
+ $block = array();
+ $revisions = node_revision_list($node);
+ if (count($revisions) > 1) {
+ $block['subject'] = t('Highlight changes');
+ $block['content'] = drupal_get_form('diff_inline_form', $node, $revisions);
+ }
+ return $block;
+ }
+}
+
+/**
+ * Implementation of hook_nodeapi().
+ */
+function diff_node_view_alter(&$build) {
+ $node = $build['#node'];
+ if (user_access('view revisions') && variable_get('show_diff_inline_'. $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');
+ $old_vid = _diff_get_previous_vid(node_revision_list($node), $node->vid);
+ // $node->content = array('#value' => diff_inline_show($node, $old_vid));
+ $build = array('#markup' => diff_inline_show($node, $old_vid));
+ }
+ $build['#prefix'] = isset($build['#prefix']) ? "<div id='diff-inline-{$node->nid}'>" . $build['#prefix'] : "<div id='diff-inline-{$node->nid}'>";
+ $build['#suffix'] = isset($build['#suffix']) ? $build['#suffix'] . "</div>" : "</div>";
+ }
+}
+
+/**
+ * Implements hook_form_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')
+ );
+ }
+ }
+}
+
+/**
+ * Implements hook_form_alter() for node_type_form.
+ */
+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.
+ $form['diff'] = array(
+ '#title' => t('Diff'),
+ '#type' => 'fieldset',
+ '#group' => 'additional_settings',
+ '#tree' => FALSE,
+ );
+ $form['diff']['show_preview_changes'] = 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),
+ );
+ $form['diff']['show_diff_inline'] = 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),
+ );
+ $form['diff']['enable_revisions_page'] = 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),
+ );
+ }
+}
+
+/**
+ * Callback if 'View changes' is pressed.
+ */
+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);
+ $cols = _diff_default_cols();
+ $header = _diff_default_header();
+ $changes = theme('diff_table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => 'diff'), 'cols' => $cols));
+
+ // Prepend diff to edit form
+ $form_state['node_preview'] = $changes;
+ $form_state['rebuild'] = TRUE;
+}
+
+/**
+ * Implementation of hook_theme().
+ */
+function diff_theme() {
+ return array(
+ 'diff_node_revisions' => array(
+ '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',
+ ),
+ 'diff_content_line' => array(
+ 'arguments' => array('line' => NULL),
+ 'file' => 'diff.theme.inc',
+ ),
+ 'diff_empty_line' => array(
+ 'arguments' => array('line' => NULL),
+ 'file' => 'diff.theme.inc',
+ ),
+ 'diff_inline_form' => array(
+ 'render element' => 'form',
+ 'file' => 'diff.theme.inc',
+ ),
+ 'diff_inline_metadata' => array(
+ 'arguments' => array('node' => NULL),
+ 'file' => 'diff.theme.inc',
+ ),
+ 'diff_inline_chunk' => array(
+ 'arguments' => array('text' => '', 'type' => NULL),
+ 'file' => 'diff.theme.inc',
+ ),
+ );
+}
+
+/**
+ * Render a diff of two strings to a $rows array suitable for use with
+ * theme('table') or theme('diff_table').
+ *
+ * @param string $a
+ * The source string to compare from.
+ * @param string $b
+ * The target string to compare to.
+ * @param boolean $show_header
+ * Display diff context headers, e.g. "Line x".
+ * @return
+ * Array of rows usable with theme('table').
+ */
+function diff_get_rows($a, $b, $show_header = FALSE) {
+ $a = is_array($a) ? $a : explode("\n", $a);
+ $b = is_array($b) ? $b : explode("\n", $b);
+
+ module_load_include('php', 'diff', 'DiffEngine');
+ $formatter = new DrupalDiffFormatter();
+ $formatter->show_header = $show_header;
+ $diff = new Diff($a, $b);
+ return $formatter->format($diff);
+}
+
+/**
+ * Render a diff of two strings into HTML markup indicating additions, changes
+ * and deletions.
+ *
+ * @param string $a
+ * The source string to compare from.
+ * @param string $b
+ * The target string to compare to.
+ * @return
+ * String containing HTML markup.
+ */
+function diff_get_inline($a, $b) {
+ module_load_include('php', 'diff', 'DiffEngine');
+ $diff = new DrupalDiffInline($a, $b);
+ return $diff->render();
+}
+
+/**
+ * Form builder: Inline diff controls.
+ */
+function diff_inline_form($form, $form_state, $node, $revisions) {
+ $form = array();
+ $form['node'] = array(
+ '#type' => 'value',
+ '#value' => $node
+ );
+ $form['revision'] = array(
+ '#type' => 'select',
+ '#options' => array(0 => '< '. t('No highlighting') . ' >'),
+ '#default_value' => (arg(2) === 'revisions' && arg(3) === $node->vid) ? $node->vid : 0,
+ '#ajax' => array(
+ 'callback' => 'diff_inline_ajax',
+ 'wrapper' => "diff-inline-{$node->nid}",
+ 'method' => 'replace',
+ ),
+ );
+ foreach ($revisions as $revision) {
+ $form['revision']['#options'][$revision->vid] = t('@revision by @name', array(
+ '@revision' => format_date($revision->timestamp, 'short'),
+ '@name' => $revision->name,
+ ));
+ }
+ $form['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('View'),
+ '#submit' => array('diff_inline_form_submit'),
+ '#attributes' => array('class' => array('diff-js-hidden')),
+ );
+ return $form;
+}
+
+/**
+ * AHAH callback for rendering the inline diff of a node.
+ */
+function diff_inline_ajax($form, $form_state) {
+ module_load_include('inc', 'diff', 'diff.pages');
+ $node = $form['node']['#value'];
+ $vid = isset($form_state['values']['revision']) ? $form_state['values']['revision'] : 0;
+ return "<div id='diff-inline-{$node->nid}'>" . diff_inline_show($node, $vid) . "</div>";
+}
+
+/**
+ * Form submission handler for diff_inline_form() for JS-disabled clients.
+ */
+function diff_inline_form_submit(&$form, &$form_state) {
+ if (isset($form_state['values']['revision'], $form_state['values']['node'])) {
+ $node = $form_state['values']['node'];
+ $vid = $form_state['values']['revision'];
+ $form_state['redirect'] = "node/{$node->nid}/revisions/{$vid}/view";
+ }
+}
View
435 sites/all/modules/diff/diff.pages.inc
@@ -0,0 +1,435 @@
+<?php
+
+/**
+ * @file
+ * Menu callbacks for hook_menu().
+ */
+
+/**
+ * Menu callback - show latest diff for a given node.
+ */
+function diff_latest($node) {
+ $revisions = node_revision_list($node);
+ $new = array_shift($revisions);
+ $old = array_shift($revisions);
+ drupal_goto("node/{$node->nid}/revisions/view/{$old->vid}/{$new->vid}");
+}
+
+/**
+ * Generate an overview table of older revisions of a node and provide
+ * an input form to select two revisions for a comparison.
+ */
+function diff_diffs_overview($node) {
+ drupal_set_title(t('Revisions for @title', array('@title' => $node->title)));
+ return drupal_get_form('diff_node_revisions', $node);
+}
+
+/**
+ * Input form to select two revisions.
+ *
+ * @param $node
+ * Node whose revisions are displayed for selection.
+ */
+function diff_node_revisions($form, $form_state, $node) {
+ global $form_values;
+ // $form = array();
+
+ $form['nid'] = array(
+ '#type' => 'hidden',
+ '#value' => $node->nid,
+ );
+
+ $revision_list = node_revision_list($node);
+
+ if (count($revision_list) > REVISION_LIST_SIZE) {
+ // If the list of revisions is longer than the number shown on one page split the array.
+ $page = isset($_GET['page']) ? $_GET['page'] : '0';
+ $revision_chunks = array_chunk(node_revision_list($node), REVISION_LIST_SIZE);
+ $revisions = $revision_chunks[$page];
+ // Set up global pager variables as would 'pager_query' do.
+ // These variables are then used in the theme('pager') call later.
+ global $pager_page_array, $pager_total, $pager_total_items;
+ $pager_total_items[0] = count($revision_list);
+ $pager_total[0] = ceil(count($revision_list) / REVISION_LIST_SIZE);
+ $pager_page_array[0] = max(0, min($page, ((int)$pager_total[0]) - 1));
+ }
+ else {
+ $revisions = $revision_list;
+ }
+
+ $revert_permission = FALSE;
+ if ((user_access('revert revisions') || user_access('administer nodes')) && node_access('update', $node)) {
+ $revert_permission = TRUE;
+ }
+ $delete_permission = FALSE;
+ if ((user_access('delete revisions') || user_access('administer nodes')) && node_access('delete', $node)) {
+ $delete_permission = TRUE;
+ }
+
+ foreach ($revisions as $revision) {
+ $operations = array();
+ $revision_ids[$revision->vid] = '';
+
+ 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 != '') ? '<p class="revision-log">'. filter_xss($revision->log) .'</p>' : ''),
+ );
+ }
+ else {
+ $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 != '') ? '<p class="revision-log">'. filter_xss($revision->log) .'</p>' : '')
+ );
+ if ($revert_permission) {
+ $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"));
+ }
+ // Set a dummy, even if the user has no permission for the other
+ // operations, so that we can check if the operations array is
+ // empty to know if the row denotes the current revision.
+ $operations[] = array();
+ }
+ $form['operations'][$revision->vid] = $operations;
+
+ }
+ $new_vid = key($revision_ids);
+ next($revision_ids);
+ $old_vid = key($revision_ids);
+ $form['diff']['old'] = array(
+ '#type' => 'radios',
+ '#options' => $revision_ids,
+ '#default_value' => $old_vid
+ );
+ $form['diff']['new'] = array(
+ '#type' => 'radios',
+ '#options' => $revision_ids,
+ '#default_value' => $new_vid
+ );
+ $form['submit'] = array('#type' => 'submit', '#value' => t('Show diff'));
+
+ if (count($revision_list) > REVISION_LIST_SIZE) {
+ $form['#suffix'] = theme('pager');
+ }
+
+ return $form;
+}