@@ -257,46 +260,48 @@ public function Text_MappedDiff($from_lines, $to_lines,
*
* @access private
*/
-class Text_Diff_Engine_xdiff
-{
-
- public function diff($from_lines, $to_lines)
- {
- /* Convert the two input arrays into strings for xdiff processing. */
- $from_string = implode("\n", $from_lines);
- $to_string = implode("\n", $to_lines);
-
- /* Diff the two strings and convert the result to an array. */
- $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
- $diff = explode("\n", $diff);
-
- /* Walk through the diff one line at a time. We build the $edits
- * array of diff operations by reading the first character of the
- * xdiff output (which is in the "unified diff" format).
- *
- * Note that we don't have enough information to detect "changed"
- * lines using this approach, so we can't add Text_Diff_Op_changed
- * instances to the $edits array. The result is still perfectly
- * valid, albeit a little less descriptive and efficient. */
- $edits = array();
- foreach ($diff as $line) {
- switch ($line[0]) {
- case ' ':
- $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
- break;
-
- case '+':
- $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
- break;
-
- case '-':
- $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
- break;
- }
- }
-
- return $edits;
- }
+class Text_Diff_Engine_xdiff {
+ /**
+ * @param $from_lines
+ * @param $to_lines
+ *
+ * @return array
+ */
+
+ public function diff( $from_lines, $to_lines ) {
+ /* Convert the two input arrays into strings for xdiff processing. */
+ $from_string = implode( "\n", $from_lines );
+ $to_string = implode( "\n", $to_lines );
+
+ /* Diff the two strings and convert the result to an array. */
+ $diff = xdiff_string_diff( $from_string, $to_string, count( $to_lines ) );
+ $diff = explode( "\n", $diff );
+
+ /* Walk through the diff one line at a time. We build the $edits
+ * array of diff operations by reading the first character of the
+ * xdiff output (which is in the "unified diff" format).
+ *
+ * Note that we don't have enough information to detect "changed"
+ * lines using this approach, so we can't add Text_Diff_Op_changed
+ * instances to the $edits array. The result is still perfectly
+ * valid, albeit a little less descriptive and efficient. */
+ $edits = [];
+ foreach ( $diff as $line ) {
+ switch ( $line[0] ) {
+ case ' ':
+ $edits[] = new Text_Diff_Op_copy( [ mb_substr( $line, 1 ) ] );
+ break;
+ case '+':
+ $edits[] = new Text_Diff_Op_add( [ mb_substr( $line, 1 ) ] );
+ break;
+ case '-':
+ $edits[] = new Text_Diff_Op_delete( [ mb_substr( $line, 1 ) ] );
+ break;
+ }
+ }
+
+ return $edits;
+ }
}
/**
@@ -305,10 +310,10 @@ public function diff($from_lines, $to_lines)
*
* 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
+ * https://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
+ * https://www.ics.uci.edu/~eppstein/161/960229.html
*
* Some ideas (and a bit of code) are taken from analyze.c, of GNU
* diffutils-2.7, which can be found at:
@@ -323,412 +328,441 @@ public function diff($from_lines, $to_lines)
*
* @access private
*/
-class Text_Diff_Engine_native
-{
-
- public function diff($from_lines, $to_lines)
- {
- $n_from = count($from_lines);
- $n_to = count($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[$from_lines[$xi]] = 1;
- }
- for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
- $line = $to_lines[$yi];
- if (($this->ychanged[$yi] = empty($xhash[$line]))) {
- continue;
- }
- $yhash[$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[$line]))) {
- continue;
- }
- $this->xv[] = $line;
- $this->xind[] = $xi;
- }
-
- // Find the LCS.
- $this->_compareseq(0, count($this->xv), 0, count($this->yv));
-
- // Merge edits when possible.
- $this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
- $this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);
-
- // Compute the edit operations.
- $edits = array();
- $xi = $yi = 0;
- while ($xi < $n_from || $yi < $n_to) {
- assert($yi < $n_to || $this->xchanged[$xi]);
- 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 Text_Diff_Op_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 Text_Diff_Op_change($delete, $add);
- } elseif ($delete) {
- $edits[] = new Text_Diff_Op_delete($delete);
- } elseif ($add) {
- $edits[] = new Text_Diff_Op_add($add);
- }
- }
-
- return $edits;
- }
-
- /**
- * Divides 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.
- */
- public 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 is 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];
- foreach ($matches as $y) {
- if (empty($this->in_seq[$y])) {
- $k = $this->_lcsPos($y);
- assert($k > 0);
- $ymids[$k] = $ymids[$k - 1];
- break;
- }
- }
-
- while (list($junk, $y) = each($matches)) {
- if ($y > $this->seq[$k - 1]) {
- // assert($y < $this->seq[$k]); // GIJ Patched
- /* 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->_lcsPos($y);
- 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);
- }
-
- public function _lcsPos($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;
- }
- }
-
- assert($ypos != $this->seq[$end]);
-
- $this->in_seq[$this->seq[$end]] = false;
- $this->seq[$end] = $ypos;
- $this->in_seq[$ypos] = 1;
- return $end;
- }
-
- /**
- * Finds 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.
- */
- public 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;
- }
- }
- }
-
- /**
- * Adjusts 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).
- */
- public function _shiftBoundaries($lines, &$changed, $other_changed)
- {
- $i = 0;
- $j = 0;
-
- assert('count($lines) == count($changed)');
- $len = count($lines);
- $other_len = count($other_changed);
-
- while (1) {
- /* Scan forward to find the 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]) {
- 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--;
- }
- assert('$j > 0');
- while ($other_changed[--$j]) {
- continue;
- }
- 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++;
- }
-
- 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;
- assert('$j > 0');
- while ($other_changed[--$j]) {
- continue;
- }
- assert('$j >= 0 && !$other_changed[$j]');
- }
- }
- }
+class Text_Diff_Engine_native {
+ /**
+ * @param $from_lines
+ * @param $to_lines
+ *
+ * @return array
+ */
+
+ public function diff( $from_lines, $to_lines ) {
+ $n_from = count( $from_lines );
+ $n_to = count( $to_lines );
+
+ $this->xchanged = $this->ychanged = [];
+ $this->xv = $this->yv = [];
+ $this->xind = $this->yind = [];
+
+ unset( $this->seq, $this->in_seq, $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[ $from_lines[ $xi ] ] = 1;
+ }
+ for ( $yi = $skip; $yi < $n_to - $endskip; $yi ++ ) {
+ $line = $to_lines[ $yi ];
+ if ( ( $this->ychanged[ $yi ] = empty( $xhash[ $line ] ) ) ) {
+ continue;
+ }
+ $yhash[ $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[ $line ] ) ) ) {
+ continue;
+ }
+ $this->xv[] = $line;
+ $this->xind[] = $xi;
+ }
+
+ // Find the LCS.
+ $this->_compareseq( 0, count( $this->xv ), 0, count( $this->yv ) );
+
+ // Merge edits when possible.
+ $this->_shiftBoundaries( $from_lines, $this->xchanged, $this->ychanged );
+ $this->_shiftBoundaries( $to_lines, $this->ychanged, $this->xchanged );
+
+ // Compute the edit operations.
+ $edits = [];
+ $xi = $yi = 0;
+ while ( $xi < $n_from || $yi < $n_to ) {
+ assert( $yi < $n_to || $this->xchanged[ $xi ] );
+ assert( $xi < $n_from || $this->ychanged[ $yi ] );
+
+ // Skip matching "snake".
+ $copy = [];
+ while ( $xi < $n_from && $yi < $n_to
+ && ! $this->xchanged[ $xi ]
+ && ! $this->ychanged[ $yi ] ) {
+ $copy[] = $from_lines[ $xi ++ ];
+ ++ $yi;
+ }
+ if ( $copy ) {
+ $edits[] = new Text_Diff_Op_copy( $copy );
+ }
+
+ // Find deletes & adds.
+ $delete = [];
+ while ( $xi < $n_from && $this->xchanged[ $xi ] ) {
+ $delete[] = $from_lines[ $xi ++ ];
+ }
+
+ $add = [];
+ while ( $yi < $n_to && $this->ychanged[ $yi ] ) {
+ $add[] = $to_lines[ $yi ++ ];
+ }
+
+ if ( $delete && $add ) {
+ $edits[] = new Text_Diff_Op_change( $delete, $add );
+ } elseif ( $delete ) {
+ $edits[] = new Text_Diff_Op_delete( $delete );
+ } elseif ( $add ) {
+ $edits[] = new Text_Diff_Op_add( $add );
+ }
+ }
+
+ return $edits;
+ }
+
+ /**
+ * Divides 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.
+ *
+ * @param $xoff
+ * @param $xlim
+ * @param $yoff
+ * @param $ylim
+ * @param $nchunks
+ *
+ * @return array
+ */
+ public 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 is in X. */
+ $flip = true;
+
+ list( $xoff, $xlim, $yoff, $ylim ) = [ $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 = [];
+ $ymids[0] = [];
+
+ $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 ];
+ foreach ( $matches as $y ) {
+ if ( empty( $this->in_seq[ $y ] ) ) {
+ $k = $this->_lcsPos( $y );
+ assert( $k > 0 );
+ $ymids[ $k ] = $ymids[ $k - 1 ];
+ break;
+ }
+ }
+
+ while ( list( $junk, $y ) = each( $matches ) ) {
+ if ( $y > $this->seq[ $k - 1 ] ) {
+ // assert($y < $this->seq[$k]); // GIJ Patched
+ /* 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->_lcsPos( $y );
+ assert( $k > 0 );
+ $ymids[ $k ] = $ymids[ $k - 1 ];
+ }
+ }
+ }
+ }
+
+ $seps[] = $flip ? [ $yoff, $xoff ] : [ $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 ? [ $y1, $x1 ] : [ $x1, $y1 ];
+ }
+ $seps[] = $flip ? [ $ylim, $xlim ] : [ $xlim, $ylim ];
+
+ return [ $this->lcs, $seps ];
+ }
+
+ /**
+ * @param $ypos
+ *
+ * @return int
+ */
+
+ public function _lcsPos( $ypos ) {
+ $end = $this->lcs;
+ if ( 0 == $end || $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;
+ }
+ }
+
+ assert( $ypos != $this->seq[ $end ] );
+
+ $this->in_seq[ $this->seq[ $end ] ] = false;
+ $this->seq[ $end ] = $ypos;
+ $this->in_seq[ $ypos ] = 1;
+
+ return $end;
+ }
+
+ /**
+ * Finds 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.
+ *
+ * @param $xoff
+ * @param $xlim
+ * @param $yoff
+ * @param $ylim
+ */
+ public 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 ( 0 == $lcs ) {
+ /* 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;
+ }
+ }
+ }
+
+ /**
+ * Adjusts 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).
+ *
+ * @param $lines
+ * @param $changed
+ * @param $other_changed
+ */
+ public function _shiftBoundaries( $lines, &$changed, $other_changed ) {
+ $i = 0;
+ $j = 0;
+
+ assert( count( $lines ) == count( $changed ) );
+ $len = count( $lines );
+ $other_len = count( $other_changed );
+
+ while ( 1 ) {
+ /* Scan forward to find the 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 ] ) {
+
+ 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 --;
+ }
+ assert( $j > 0 );
+ while ( $other_changed[ -- $j ] ) {
+ continue;
+ }
+ 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 ++;
+ }
+
+ 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;
+ assert( $j > 0 );
+ while ( $other_changed[ -- $j ] ) {
+ continue;
+ }
+ assert( $j >= 0 && !$other_changed[$j] );
+ }
+ }
+ }
}
/**
@@ -737,26 +771,30 @@ public function _shiftBoundaries($lines, &$changed, $other_changed)
*
* @access private
*/
-class Text_Diff_Op
-{
-
- public $orig;
- public $final;
-
- public function reverse()
- {
- trigger_error('Abstract method', E_USER_ERROR);
- }
-
- public function norig()
- {
- return $this->orig ? count($this->orig) : 0;
- }
-
- public function nfinal()
- {
- return $this->final ? count($this->final) : 0;
- }
+class Text_Diff_Op {
+
+ public $orig;
+ public $final;
+
+ public function reverse() {
+ trigger_error( 'Abstract method', E_USER_ERROR );
+ }
+
+ /**
+ * @return int|void
+ */
+
+ public function norig() {
+ return $this->orig ? count( $this->orig ) : 0;
+ }
+
+ /**
+ * @return int|void
+ */
+
+ public function nfinal() {
+ return $this->final ? count( $this->final ) : 0;
+ }
}
/**
@@ -765,22 +803,29 @@ public function nfinal()
*
* @access private
*/
-class Text_Diff_Op_copy extends Text_Diff_Op
-{
-
- public function Text_Diff_Op_copy($orig, $final = false)
- {
- if (!is_array($final)) {
- $final = $orig;
- }
- $this->orig = $orig;
- $this->final = $final;
- }
-
- public function &reverse()
- {
- return $reverse = new Text_Diff_Op_copy($this->final, $this->orig);
- }
+class Text_Diff_Op_copy extends Text_Diff_Op {
+ /**
+ * Text_Diff_Op_copy constructor.
+ *
+ * @param $orig
+ * @param bool $final
+ */
+
+ public function __construct( $orig, $final = false ) {
+ if ( ! is_array( $final ) ) {
+ $final = $orig;
+ }
+ $this->orig = $orig;
+ $this->final = $final;
+ }
+
+ /**
+ * @return \Text_Diff_Op_copy
+ */
+
+ public function &reverse() {
+ return $reverse = new self( $this->final, $this->orig );
+ }
}
/**
@@ -789,19 +834,25 @@ public function &reverse()
*
* @access private
*/
-class Text_Diff_Op_delete extends Text_Diff_Op
-{
-
- public function Text_Diff_Op_delete($lines)
- {
- $this->orig = $lines;
- $this->final = false;
- }
-
- public function &reverse()
- {
- return $reverse = new Text_Diff_Op_add($this->orig);
- }
+class Text_Diff_Op_delete extends Text_Diff_Op {
+ /**
+ * Text_Diff_Op_delete constructor.
+ *
+ * @param $lines
+ */
+
+ public function __construct( $lines ) {
+ $this->orig = $lines;
+ $this->final = false;
+ }
+
+ /**
+ * @return \Text_Diff_Op_add
+ */
+
+ public function &reverse() {
+ return $reverse = new Text_Diff_Op_add( $this->orig );
+ }
}
/**
@@ -810,19 +861,25 @@ public function &reverse()
*
* @access private
*/
-class Text_Diff_Op_add extends Text_Diff_Op
-{
-
- public function Text_Diff_Op_add($lines)
- {
- $this->final = $lines;
- $this->orig = false;
- }
-
- public function &reverse()
- {
- return $reverse = new Text_Diff_Op_delete($this->final);
- }
+class Text_Diff_Op_add extends Text_Diff_Op {
+ /**
+ * Text_Diff_Op_add constructor.
+ *
+ * @param $lines
+ */
+
+ public function __construct( $lines ) {
+ $this->final = $lines;
+ $this->orig = false;
+ }
+
+ /**
+ * @return \Text_Diff_Op_delete
+ */
+
+ public function &reverse() {
+ return $reverse = new Text_Diff_Op_delete( $this->final );
+ }
}
/**
@@ -831,17 +888,24 @@ public function &reverse()
*
* @access private
*/
-class Text_Diff_Op_change extends Text_Diff_Op
-{
-
- public function Text_Diff_Op_change($orig, $final)
- {
- $this->orig = $orig;
- $this->final = $final;
- }
-
- public function &reverse()
- {
- return $reverse = new Text_Diff_Op_change($this->final, $this->orig);
- }
+class Text_Diff_Op_change extends Text_Diff_Op {
+ /**
+ * Text_Diff_Op_change constructor.
+ *
+ * @param $orig
+ * @param $final
+ */
+
+ public function __construct( $orig, $final ) {
+ $this->orig = $orig;
+ $this->final = $final;
+ }
+
+ /**
+ * @return \Text_Diff_Op_change
+ */
+
+ public function &reverse() {
+ return $reverse = new self( $this->final, $this->orig );
+ }
}
diff --git a/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php b/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php
index 77883bf..d630a8e 100644
--- a/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php
+++ b/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php
@@ -9,203 +9,255 @@
*
* @package Text_Diff
*/
-class Text_Diff_Renderer
-{
-
- /**
- * 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.
- */
- public $_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.
- */
- public $_trailing_context_lines = 0;
-
- /**
- * Constructor.
- */
-//HACK by domifara
-// function Text_Diff_Renderer($params = array())
- public function __construct($params = array())
- {
- foreach ($params as $param => $value) {
- $v = '_' . $param;
- if (isset($this->$v)) {
- $this->$v = $value;
- }
- }
- }
-
- /**
- * Get any renderer parameters.
- *
- * @return array All parameters of this renderer object.
- */
- public function getParams()
- {
- $params = array();
- foreach (get_object_vars($this) as $k => $v) {
- if ($k{0} == '_') {
- $params[substr($k, 1)] = $v;
- }
- }
-
- return $params;
- }
-
- /**
- * Renders a diff.
- *
- * @param Text_Diff $diff A Text_Diff object.
- *
- * @return string The formatted output.
- */
- public function render($diff)
- {
- $xi = $yi = 1;
- $block = false;
- $context = array();
-
- $nlead = $this->_leading_context_lines;
- $ntrail = $this->_trailing_context_lines;
-
- $output = $this->_startDiff();
-
- foreach ($diff->getDiff() as $edit) {
- if (is_a($edit, 'Text_Diff_Op_copy')) {
- if (is_array($block)) {
- if (count($edit->orig) <= $nlead + $ntrail) {
- $block[] = $edit;
- } else {
- if ($ntrail) {
- $context = array_slice($edit->orig, 0, $ntrail);
- $block[] = new Text_Diff_Op_copy($context);
- }
- $output .= $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, count($context) - $nlead);
- $x0 = $xi - count($context);
- $y0 = $yi - count($context);
- $block = array();
- if ($context) {
- $block[] = new Text_Diff_Op_copy($context);
- }
- }
- $block[] = $edit;
- }
-
- if ($edit->orig) {
- $xi += count($edit->orig);
- }
- if ($edit->final) {
- $yi += count($edit->final);
- }
- }
-
- if (is_array($block)) {
- $output .= $this->_block($x0, $xi - $x0,
- $y0, $yi - $y0,
- $block);
- }
-
- return $output . $this->_endDiff();
- }
-
- public function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
- {
- $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
-
- foreach ($edits as $edit) {
- switch (strtolower(get_class($edit))) {
- case 'text_diff_op_copy':
- $output .= $this->_context($edit->orig);
- break;
-
- case 'text_diff_op_add':
- $output .= $this->_added($edit->final);
- break;
-
- case 'text_diff_op_delete':
- $output .= $this->_deleted($edit->orig);
- break;
-
- case 'text_diff_op_change':
- $output .= $this->_changed($edit->orig, $edit->final);
- break;
- }
- }
-
- return $output . $this->_endBlock();
- }
-
- public function _startDiff()
- {
- return '';
- }
-
- public function _endDiff()
- {
- return '';
- }
-
- public function _blockHeader($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;
- }
-
- public function _startBlock($header)
- {
- return $header . "\n";
- }
-
- public function _endBlock()
- {
- return '';
- }
-
- public function _lines($lines, $prefix = ' ')
- {
- return $prefix . implode("\n$prefix", $lines) . "\n";
- }
-
- public function _context($lines)
- {
- return $this->_lines($lines);
- }
-
- public function _added($lines)
- {
- return $this->_lines($lines, '>');
- }
-
- public function _deleted($lines)
- {
- return $this->_lines($lines, '<');
- }
-
- public function _changed($orig, $final)
- {
- return $this->_deleted($orig) . "---\n" . $this->_added($final);
- }
+class Text_Diff_Renderer {
+
+ /**
+ * 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.
+ */
+ public $_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.
+ */
+ public $_trailing_context_lines = 0;
+
+ /**
+ * Constructor.
+ *
+ * @param array $params
+ */
+
+ //HACK by domifara
+
+ public function __construct( $params = [] ) {
+ foreach ( $params as $param => $value ) {
+ $v = '_' . $param;
+ if ( isset( $this->$v ) ) {
+ $this->$v = $value;
+ }
+ }
+ }
+
+ /**
+ * Get any renderer parameters.
+ *
+ * @return array All parameters of this renderer object.
+ */
+ public function getParams() {
+ $params = [];
+ foreach ( get_object_vars( $this ) as $k => $v ) {
+ if ( '_' == $k[0] ) {
+ $params[ mb_substr( $k, 1 ) ] = $v;
+ }
+ }
+
+ return $params;
+ }
+
+ /**
+ * Renders a diff.
+ *
+ * @param Text_Diff $diff A Text_Diff object.
+ *
+ * @return string The formatted output.
+ */
+ public function render( $diff ) {
+ $xi = $yi = 1;
+ $block = false;
+ $context = [];
+
+ $nlead = $this->_leading_context_lines;
+ $ntrail = $this->_trailing_context_lines;
+
+ $output = $this->_startDiff();
+
+ foreach ( $diff->getDiff() as $edit ) {
+ if ( is_a( $edit, 'Text_Diff_Op_copy' ) ) {
+ if ( is_array( $block ) ) {
+ if ( count( $edit->orig ) <= $nlead + $ntrail ) {
+ $block[] = $edit;
+ } else {
+ if ( $ntrail ) {
+ $context = array_slice( $edit->orig, 0, $ntrail );
+ $block[] = new Text_Diff_Op_copy( $context );
+ }
+
+ $output .= $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, count( $context ) - $nlead );
+ $x0 = $xi - count( $context );
+ $y0 = $yi - count( $context );
+ $block = [];
+ if ( $context ) {
+ $block[] = new Text_Diff_Op_copy( $context );
+ }
+ }
+ $block[] = $edit;
+ }
+
+ if ( $edit->orig ) {
+ $xi += count( $edit->orig );
+ }
+ if ( $edit->final ) {
+ $yi += count( $edit->final );
+ }
+ }
+
+ if ( is_array( $block ) ) {
+ $output .= $this->_block( $x0, $xi - $x0, $y0, $yi - $y0, $block );
+ }
+
+ return $output . $this->_endDiff();
+ }
+
+ /**
+ * @param $xbeg
+ * @param $xlen
+ * @param $ybeg
+ * @param $ylen
+ * @param $edits
+ *
+ * @return string
+ */
+
+ public function _block( $xbeg, $xlen, $ybeg, $ylen, $edits ) {
+ $output = $this->_startBlock( $this->_blockHeader( $xbeg, $xlen, $ybeg, $ylen ) );
+
+ foreach ( $edits as $edit ) {
+ switch ( mb_strtolower( get_class( $edit ) ) ) {
+ case 'text_diff_op_copy':
+ $output .= $this->_context( $edit->orig );
+ break;
+ case 'text_diff_op_add':
+ $output .= $this->_added( $edit->final );
+ break;
+ case 'text_diff_op_delete':
+ $output .= $this->_deleted( $edit->orig );
+ break;
+ case 'text_diff_op_change':
+ $output .= $this->_changed( $edit->orig, $edit->final );
+ break;
+ }
+ }
+
+ return $output . $this->_endBlock();
+ }
+
+ /**
+ * @return string
+ */
+
+ public function _startDiff() {
+ return '';
+ }
+
+ /**
+ * @return string
+ */
+
+ public function _endDiff() {
+ return '';
+ }
+
+ /**
+ * @param $xbeg
+ * @param $xlen
+ * @param $ybeg
+ * @param $ylen
+ *
+ * @return string
+ */
+
+ public function _blockHeader( $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;
+ }
+
+ /**
+ * @param $header
+ *
+ * @return string
+ */
+
+ public function _startBlock( $header ) {
+ return $header . "\n";
+ }
+
+ /**
+ * @return string
+ */
+
+ public function _endBlock() {
+ return '';
+ }
+
+ /**
+ * @param $lines
+ * @param string $prefix
+ *
+ * @return string
+ */
+
+ public function _lines( $lines, $prefix = ' ' ) {
+ return $prefix . implode( "\n$prefix", $lines ) . "\n";
+ }
+
+ /**
+ * @param $lines
+ *
+ * @return string
+ */
+
+ public function _context( $lines ) {
+ return $this->_lines( $lines );
+ }
+
+ /**
+ * @param $lines
+ *
+ * @return string
+ */
+
+ public function _added( $lines ) {
+ return $this->_lines( $lines, '>' );
+ }
+
+ /**
+ * @param $lines
+ *
+ * @return string
+ */
+
+ public function _deleted( $lines ) {
+ return $this->_lines( $lines, '<' );
+ }
+
+ /**
+ * @param $orig
+ * @param $final
+ *
+ * @return string
+ */
+
+ public function _changed( $orig, $final ) {
+ return $this->_deleted( $orig ) . "---\n" . $this->_added( $final );
+ }
}
diff --git a/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_inline.php b/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_inline.php
index 228a11a..1b402da 100644
--- a/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_inline.php
+++ b/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_inline.php
@@ -2,151 +2,232 @@
/**
* "Inline" diff renderer.
*
- * This class renders diffs in the Wiki-style "inline" format.
+ * $Horde: framework/Text_Diff/Diff/Renderer/inline.php,v 1.4.10.16 2009/07/24 13:25:29 jan Exp $
+ *
+ * Copyright 2004-2009 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you did
+ * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
+ *
+ * @author Ciprian Popovici
+ * @package Text_Diff
+ */
+
+/** Text_Diff_Renderer */
+if ( ! class_exists( 'Text_Diff_Renderer' ) ) {
+ require_once 'Text/Diff/Renderer.php';
+}
+
+/**
+ * "Inline" diff renderer.
*
- * $Horde: framework/Text_Diff/Diff/Renderer/inline.php,v 1.14 2005/07/22 19:45:15 chuck Exp $
+ * This class renders diffs in the Wiki-style "inline" format.
*
* @author Ciprian Popovici
* @package Text_Diff
*/
-class Text_Diff_Renderer_inline extends Text_Diff_Renderer
-{
-
- /**
- * Number of leading context "lines" to preserve.
- */
- public $_leading_context_lines = 10000;
-
- /**
- * Number of trailing context "lines" to preserve.
- */
- public $_trailing_context_lines = 10000;
-
- /**
- * Prefix for inserted text.
- */
- public $_ins_prefix = '';
-
- /**
- * Suffix for inserted text.
- */
- public $_ins_suffix = '';
-
- /**
- * Prefix for deleted text.
- */
- public $_del_prefix = '';
-
- /**
- * Suffix for deleted text.
- */
- public $_del_suffix = '';
-
- /**
- * Header for each change block.
- */
- public $_block_header = '';
-
- /**
- * What are we currently splitting on? Used to recurse to show word-level
- * changes.
- */
- public $_split_level = 'lines';
-
- public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
- {
- return $this->_block_header;
- }
-
- public function _startBlock($header)
- {
- return $header;
- }
-
- public function _lines($lines, $prefix = ' ', $encode = true)
- {
- if ($encode) {
- array_walk($lines, array(&$this, '_encode'));
- }
-
- if ($this->_split_level == 'words') {
- return implode('', $lines);
- } else {
- return implode("\n", $lines) . "\n";
- }
- }
-
- public function _added($lines)
- {
- array_walk($lines, array(&$this, '_encode'));
- $lines[0] = $this->_ins_prefix . $lines[0];
- $lines[count($lines) - 1] .= $this->_ins_suffix;
- return $this->_lines($lines, ' ', false);
- }
-
- public function _deleted($lines, $words = false)
- {
- array_walk($lines, array(&$this, '_encode'));
- $lines[0] = $this->_del_prefix . $lines[0];
- $lines[count($lines) - 1] .= $this->_del_suffix;
- return $this->_lines($lines, ' ', false);
- }
-
- public function _changed($orig, $final)
- {
- /* If we've already split on words, don't try to do so again - just
- * display. */
- if ($this->_split_level == 'words') {
- $prefix = '';
- while ($orig[0] !== false && $final[0] !== false &&
- substr($orig[0], 0, 1) == ' ' &&
- substr($final[0], 0, 1) == ' ') {
- $prefix .= substr($orig[0], 0, 1);
- $orig[0] = substr($orig[0], 1);
- $final[0] = substr($final[0], 1);
- }
- return $prefix . $this->_deleted($orig) . $this->_added($final);
- }
-
- $text1 = implode("\n", $orig);
- $text2 = implode("\n", $final);
-
- /* Non-printing newline marker. */
- $nl = "\0";
-
- /* We want to split on word boundaries, but we need to
- * preserve whitespace as well. Therefore we split on words,
- * but include all blocks of whitespace in the wordlist. */
- $diff = new Text_Diff($this->_splitOnWords($text1, $nl),
- $this->_splitOnWords($text2, $nl));
-
- /* Get the diff in inline format. */
- $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
- array('split_level' => 'words')));
-
- /* Run the diff and get the output. */
- return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
- }
-
- public function _splitOnWords($string, $newlineEscape = "\n")
- {
- $words = array();
- $length = strlen($string);
- $pos = 0;
-
- while ($pos < $length) {
- // Eat a word with any preceding whitespace.
- $spaces = strspn(substr($string, $pos), " \n");
- $nextpos = strcspn(substr($string, $pos + $spaces), " \n");
- $words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
- $pos += $spaces + $nextpos;
- }
-
- return $words;
- }
-
- public function _encode(&$string)
- {
- $string = htmlspecialchars($string);
- }
+class Text_Diff_Renderer_inline extends Text_Diff_Renderer {
+ /**
+ * Number of leading context "lines" to preserve.
+ */
+
+ public $_leading_context_lines = 10000;
+
+ /**
+ * Number of trailing context "lines" to preserve.
+ */
+
+ public $_trailing_context_lines = 10000;
+
+ /**
+ * Prefix for inserted text.
+ */
+
+ public $_ins_prefix = '';
+
+ /**
+ * Suffix for inserted text.
+ */
+
+ public $_ins_suffix = '';
+
+ /**
+ * Prefix for deleted text.
+ */
+
+ public $_del_prefix = '';
+
+ /**
+ * Suffix for deleted text.
+ */
+
+ public $_del_suffix = '';
+
+ /**
+ * Header for each change block.
+ */
+
+ public $_block_header = '';
+
+ /**
+ * What are we currently splitting on? Used to recurse to show word-level
+ * changes.
+ */
+
+ public $_split_level = 'lines';
+
+ /**
+ * @param $xbeg
+ * @param $xlen
+ * @param $ybeg
+ * @param $ylen
+ *
+ * @return string
+ */
+
+ public function _blockHeader( $xbeg, $xlen, $ybeg, $ylen ) {
+ return $this->_block_header;
+ }
+
+ /**
+ * @param $header
+ *
+ * @return mixed
+ */
+
+ public function _startBlock( $header ) {
+ return $header;
+ }
+
+ /**
+ * @param $lines
+ * @param string $prefix
+ * @param bool $encode
+ *
+ * @return string
+ */
+
+ public function _lines($lines, $prefix = ' ', bool $encode = true ) {
+ if ( $encode ) {
+ array_walk( $lines, [ &$this, '_encode' ] );
+ }
+
+ if ( 'words' == $this->_split_level ) {
+ return implode( '', $lines );
+ }
+
+ return implode( "\n", $lines ) . "\n";
+ }
+
+ /**
+ * @param $lines
+ *
+ * @return string
+ */
+
+ public function _added( $lines ) {
+ array_walk( $lines, [ &$this, '_encode' ] );
+
+ $lines[0] = $this->_ins_prefix . $lines[0];
+ $lines[ count( $lines ) - 1 ] .= $this->_ins_suffix;
+
+ return $this->_lines( $lines, ' ', false );
+ }
+
+ /**
+ * @param $lines
+ * @param bool $words
+ *
+ * @return string
+ */
+
+ public function _deleted( $lines, $words = false ) {
+ array_walk( $lines, [ &$this, '_encode' ] );
+
+ $lines[0] = $this->_del_prefix . $lines[0];
+ $lines[ count( $lines ) - 1 ] .= $this->_del_suffix;
+
+ return $this->_lines( $lines, ' ', false );
+ }
+
+ /**
+ * @param $orig
+ * @param $final
+ *
+ * @return string
+ */
+
+ public function _changed( $orig, $final ) {
+ /* If we've already split on words, don't try to do so again - just
+ * display. */
+ if ( $this->_split_level == 'words' ) {
+ $prefix = '';
+
+ while ( false !== $orig[0] && false !== $final[0]
+ && ' ' == mb_substr( $orig[0], 0, 1 )
+ && ' ' == mb_substr( $final[0], 0, 1 ) ) {
+ $prefix .= mb_substr( $orig[0], 0, 1 );
+
+ $orig[0] = mb_substr( $orig[0], 1 );
+
+ $final[0] = mb_substr( $final[0], 1 );
+ }
+
+ return $prefix . $this->_deleted( $orig ) . $this->_added( $final );
+ }
+
+ $text1 = implode( "\n", $orig );
+ $text2 = implode( "\n", $final );
+
+ /* Non-printing newline marker. */
+ $nl = "\0";
+
+ /* We want to split on word boundaries, but we need to
+ * preserve whitespace as well. Therefore we split on words,
+ * but include all blocks of whitespace in the wordlist. */
+
+ $diff = new Text_Diff( $this->_splitOnWords( $text1, $nl ), $this->_splitOnWords( $text2, $nl ) );
+
+ /* Get the diff in inline format. */
+
+ $renderer = new self( array_merge( $this->getParams(), [ 'split_level' => 'words' ] ) );
+
+ /* Run the diff and get the output. */
+
+ return str_replace( $nl, "\n", $renderer->render( $diff ) ) . "\n";
+ }
+
+ /**
+ * @param $string
+ * @param string $newlineEscape
+ *
+ * @return array
+ */
+
+ public function _splitOnWords($string, string $newlineEscape = "\n" ) {
+ $words = [];
+
+ $length = mb_strlen( $string );
+
+ $pos = 0;
+
+ while ( $pos < $length ) {
+ // Eat a word with any preceding whitespace.
+
+ $spaces = strspn( mb_substr( $string, $pos ), " \n" );
+
+ $nextpos = strcspn( mb_substr( $string, $pos + $spaces ), " \n" );
+
+ $words[] = str_replace( "\n", $newlineEscape, mb_substr( $string, $pos, $spaces + $nextpos ) );
+
+ $pos += $spaces + $nextpos;
+ }
+
+ return $words;
+ }
+
+ public function _encode( &$string ) {
+ $string = htmlspecialchars( $string, ENT_QUOTES | ENT_HTML5 );
+ }
+
}
diff --git a/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_unified.php b/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_unified.php
index cd8c8a4..1c04a4b 100644
--- a/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_unified.php
+++ b/xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_unified.php
@@ -8,42 +8,66 @@
*
* @package Text_Diff
*/
-class Text_Diff_Renderer_unified extends Text_Diff_Renderer
-{
-
- /**
- * Number of leading context "lines" to preserve.
- */
- public $_leading_context_lines = 4;
-
- /**
- * Number of trailing context "lines" to preserve.
- */
- public $_trailing_context_lines = 4;
-
- public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
- {
- if ($xlen != 1) {
- $xbeg .= ',' . $xlen;
- }
- if ($ylen != 1) {
- $ybeg .= ',' . $ylen;
- }
- return "@@ -$xbeg +$ybeg @@";
- }
-
- public function _added($lines)
- {
- return $this->_lines($lines, '+');
- }
-
- public function _deleted($lines)
- {
- return $this->_lines($lines, '-');
- }
-
- public function _changed($orig, $final)
- {
- return $this->_deleted($orig) . $this->_added($final);
- }
+class Text_Diff_Renderer_unified extends Text_Diff_Renderer {
+
+ /**
+ * Number of leading context "lines" to preserve.
+ */
+ public $_leading_context_lines = 4;
+
+ /**
+ * Number of trailing context "lines" to preserve.
+ */
+ public $_trailing_context_lines = 4;
+
+ /**
+ * @param $xbeg
+ * @param $xlen
+ * @param $ybeg
+ * @param $ylen
+ *
+ * @return string
+ */
+
+ public function _blockHeader( $xbeg, $xlen, $ybeg, $ylen ) {
+ if ( 1 != $xlen ) {
+ $xbeg .= ',' . $xlen;
+ }
+ if ( 1 != $ylen ) {
+ $ybeg .= ',' . $ylen;
+ }
+
+ return "@@ -$xbeg +$ybeg @@";
+ }
+
+ /**
+ * @param $lines
+ *
+ * @return string
+ */
+
+ public function _added( $lines ) {
+ return $this->_lines( $lines, '+' );
+ }
+
+ /**
+ * @param $lines
+ *
+ * @return string
+ */
+
+ public function _deleted( $lines ) {
+ return $this->_lines( $lines, '-' );
+ }
+
+ /**
+ * @param $orig
+ * @param $final
+ *
+ * @return string
+ */
+
+ public function _changed( $orig, $final ) {
+ return $this->_deleted( $orig ) . $this->_added( $final );
+ }
}
diff --git a/xoops_trust_path/libs/altsys/include/admin_in_theme.inc.php b/xoops_trust_path/libs/altsys/include/admin_in_theme.inc.php
index b5bd5e3..37ad800 100644
--- a/xoops_trust_path/libs/altsys/include/admin_in_theme.inc.php
+++ b/xoops_trust_path/libs/altsys/include/admin_in_theme.inc.php
@@ -1,30 +1,43 @@
", $tmp_s, 2) ;
- if (empty($tmp_s)) {
- define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
- return $s ;
- }
-
- list($tmp_s, $tmp_after) = explode("", $tmp_s) ;
- if (empty($tmp_after)) {
- define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
- return $s ;
- }
-
- $xoops_admin_contents = $former_outputs . substr(strrev(strstr(strrev($tmp_s), strrev(''))), 0, -6) ;
-
- return '' ;
+/**
+ * Altsys library (UI-Components) for D3 modules
+ *
+ * @package Altsys
+ * @version XCL 2.3.1
+ * @author Other authors Gigamaster, 2020 XCL PHP7
+ * @author Gijoe (Peak)
+ * @copyright (c) 2005-2022 Author
+ * @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt
+ */
+
+function altsys_admin_in_theme( $s ) {
+ global $xoops_admin_contents;
+
+ $xoops_admin_contents = '';
+
+ if ( defined( 'ALTSYS_DONT_USE_ADMIN_IN_THEME' ) ) {
+ return $s;
+ }
+
+ // check whether cp_functions.php is loaded
+ if ( ! defined( 'XOOPS_CPFUNC_LOADED' ) ) {
+ define( 'ALTSYS_DONT_USE_ADMIN_IN_THEME', 1 );
+
+ return $s;
+ }
+
+ //!Fix redirect
+ //strpos - Find the position of the first occurrence of a substring in a string
+ //mb_strstr - Finds first occurrence of a string within another
+ //if (strpos($s, '", $tmp_s, 2 );
+ if ( empty( $tmp_s ) ) {
+ define( 'ALTSYS_DONT_USE_ADMIN_IN_THEME', 1 );
+
+ return $s;
+ }
+
+ [ $tmp_s, $tmp_after ] = explode( " | ", $tmp_s );
+ if ( empty( $tmp_after ) ) {
+ define( 'ALTSYS_DONT_USE_ADMIN_IN_THEME', 1 );
+
+ return $s;
+ }
+
+ $xoops_admin_contents = $former_outputs . substr( strrev( strstr( strrev( $tmp_s ), strrev( '' ) ) ), 0, - 6 );
+
+ return '';
}
-function altsys_admin_in_theme_in_last($contents = null)
-{
- global $xoops_admin_contents , $xoopsConfig , $xoopsModule , $xoopsUser , $xoopsUserIsAdmin , $xoopsLogger , $altsysModuleConfig , $altsysModuleId ;
-
- if (! isset($contents)) {
- while (ob_get_level()) {
- ob_end_flush() ;
- }
- } else {
- $xoops_admin_contents = $contents ;
- }
-
- if (! isset($xoops_admin_contents)) {
- return ;
- }
- if (defined('ALTSYS_DONT_USE_ADMIN_IN_THEME')) {
- return ;
- }
-
- if (! is_object($xoopsUser)) {
- exit ;
- }
-
- // language files
- if (file_exists(dirname(dirname(__FILE__)).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php')) {
- include_once dirname(dirname(__FILE__)).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php' ;
- } else {
- include_once dirname(dirname(__FILE__)).'/language/english/admin_in_theme.php' ;
- }
-
- // set the theme
- $xoopsConfig['theme_set'] = $altsysModuleConfig['admin_in_theme'] ;
-
- // language files under the theme
- $original_error_level = error_reporting() ;
- error_reporting($original_error_level & ~ E_NOTICE) ;
- if (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php')) {
- include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php' ;
- } elseif (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php')) {
- include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php' ;
- }
- error_reporting($original_error_level) ;
-
- include dirname(__FILE__).'/admin_in_theme_header.inc.php' ;
-
-/* // include adminmenu
- include XOOPS_CACHE_PATH.'/adminmenu.php' ;
-
- // admin permissions
- $moduleperm_handler =& xoops_gethandler('groupperm');
- $admin_mids = $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups());
- $module_handler =& xoops_gethandler('module');
- $modules = $module_handler->getObjects(new Criteria('mid', "(".implode(',', $admin_mids).")", 'IN'), true);
- $admin_mids = array_keys($modules);
-
- // menu items &= admin permissions
- $xoops_admin_menu_ft = array_flip( array_intersect( array_flip( $xoops_admin_menu_ft ) , $admin_mids ) ) ;
- $xoops_admin_menu_ml = array_flip( array_intersect( array_flip( $xoops_admin_menu_ml ) , $admin_mids ) ) ;
- $xoops_admin_menu_sd = array_flip( array_intersect( array_flip( $xoops_admin_menu_sd ) , $admin_mids ) ) ;
-
- // adminmenu as a block
- $admin_menu_block_contents = '' ;
- $admin_menu_block = array( array(
- 'title' => 'Admin Menu' ,
- 'content' => $admin_menu_block_contents ,
- 'weight' => 0 ,
- ) ) ;
- $lblocks = $xoopsTpl->get_template_vars( 'xoops_lblocks' ) ;
- if( ! is_array( $lblocks ) ) $lblocks = array() ;
- $xoopsTpl->assign( 'xoops_lblocks' , array_merge( $admin_menu_block , $lblocks ) ) ;
-
- // javascripts
- $xoops_admin_menu_js .= '
- var thresholdY = 15;
- var ordinata_margin = 20;
- function moveLayers() {'.implode("\n",$xoops_admin_menu_ml).'}
- function shutdown() {'.implode("\n",$xoops_admin_menu_sd).'}' ; */
-
- // appendix (core specific css etc)
- $xoops_module_header = '' ;
- if (altsys_get_core_type() == ALTSYS_CORE_TYPE_XCL21) {
- $xoops_module_header .= ''."\n" ;
- if (is_object(@$xoopsModule)) {
- $xoops_module_header .= ''."\n" ;
- }
- }
-
- // assignment
- $xoopsTpl->assign(array(
- 'xoops_theme' => $xoopsConfig['theme_set'],
- 'xoops_imageurl' => XOOPS_THEME_URL.'/'.$xoopsConfig['theme_set'].'/',
- 'xoops_themecss'=> xoops_getcss($xoopsConfig['theme_set']),
- 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES),
- 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
- 'xoops_showlblock' => 1,
-// 'xoops_js' => '//-->
+
+ ' . sprintf( $this->messages['fmt_prompt4repost'], $this->getErrors() ) . $table . $form . ' |