| Line 17 | Line 17 |
|---|
}
/**
|
}
/**
|
* Code from pear.php.net, Text_Diff-0.2.1 (beta) package
| * Code from pear.php.net, Text_Diff-1.1.0 package
|
* http://pear.php.net/package/Text_Diff/
*
* Modified by phpBB Group to meet our coding standards
| * http://pear.php.net/package/Text_Diff/
*
* Modified by phpBB Group to meet our coding standards
|
| Line 27 | Line 27 |
|---|
*
* This class renders the diff in classic diff format. It is intended that
* this class be customized via inheritance, to obtain fancier outputs.
|
*
* This class renders the diff in classic diff format. It is intended that
* this class be customized via inheritance, to obtain fancier outputs.
|
| | *
* Copyright 2004-2008 The Horde Project (http://www.horde.org/)
|
*
* @package diff
*/
| *
* @package diff
*/
|
| Line 105 | Line 107 |
|---|
unset($diff3);
|
unset($diff3);
|
$diff = &new diff($diff_1, $diff_2);
| $diff = new diff($diff_1, $diff_2);
|
}
$nlead = $this->_leading_context_lines;
| }
$nlead = $this->_leading_context_lines;
|
| Line 116 | Line 118 |
|---|
foreach ($diffs as $i => $edit)
{
|
foreach ($diffs as $i => $edit)
{
|
| | // If these are unchanged (copied) lines, and we want to keep leading or trailing context lines, extract them from the copy block.
|
if (is_a($edit, 'diff_op_copy'))
{
|
if (is_a($edit, 'diff_op_copy'))
{
|
| | // Do we have any diff blocks yet?
|
if (is_array($block))
{
|
if (is_array($block))
{
|
| | // How many lines to keep as context from the copy block.
|
$keep = ($i == sizeof($diffs) - 1) ? $ntrail : $nlead + $ntrail;
if (sizeof($edit->orig) <= $keep)
{
|
$keep = ($i == sizeof($diffs) - 1) ? $ntrail : $nlead + $ntrail;
if (sizeof($edit->orig) <= $keep)
{
|
| | // We have less lines in the block than we want for context => keep the whole block.
|
$block[] = $edit;
}
else
{
if ($ntrail)
{
|
$block[] = $edit;
}
else
{
if ($ntrail)
{
|
| | // Create a new block with as many lines as we need for the trailing context.
|
$context = array_slice($edit->orig, 0, $ntrail);
|
$context = array_slice($edit->orig, 0, $ntrail);
|
$block[] = &new diff_op_copy($context);
| $block[] = new diff_op_copy($context);
|
}
$output .= $this->_block($x0, $ntrail + $xi - $x0, $y0, $ntrail + $yi - $y0, $block);
$block = false;
}
}
|
}
$output .= $this->_block($x0, $ntrail + $xi - $x0, $y0, $ntrail + $yi - $y0, $block);
$block = false;
}
}
|
| | // Keep the copy block as the context for the next block.
|
$context = $edit->orig;
}
else
{
|
$context = $edit->orig;
}
else
{
|
| | // Don't we have any diff blocks yet?
|
if (!is_array($block))
{
|
if (!is_array($block))
{
|
| | // Extract context lines from the preceding copy block.
|
$context = array_slice($context, sizeof($context) - $nlead);
$x0 = $xi - sizeof($context);
$y0 = $yi - sizeof($context);
| $context = array_slice($context, sizeof($context) - $nlead);
$x0 = $xi - sizeof($context);
$y0 = $yi - sizeof($context);
|
| Line 150 | Line 160 |
|---|
if ($context)
{
|
if ($context)
{
|
$block[] = &new diff_op_copy($context);
| $block[] = new diff_op_copy($context);
|
}
}
$block[] = $edit;
| }
}
$block[] = $edit;
|
| Line 217 | Line 227 |
|---|
if ($ylen > 1)
{
$ybeg .= ',' . ($ybeg + $ylen - 1);
|
if ($ylen > 1)
{
$ybeg .= ',' . ($ybeg + $ylen - 1);
|
| | }
// this matches the GNU Diff behaviour
if ($xlen && !$ylen)
{
$ybeg--;
}
else if (!$xlen)
{
$xbeg--;
|
}
return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
| }
return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
|
| Line 449 | Line 469 |
|---|
$splitted_text_1 = $this->_split_on_words($text1, $nl);
$splitted_text_2 = $this->_split_on_words($text2, $nl);
|
$splitted_text_1 = $this->_split_on_words($text1, $nl);
$splitted_text_2 = $this->_split_on_words($text2, $nl);
|
$diff = &new diff($splitted_text_1, $splitted_text_2);
| $diff = new diff($splitted_text_1, $splitted_text_2);
|
unset($splitted_text_1, $splitted_text_2);
// Get the diff in inline format.
|
unset($splitted_text_1, $splitted_text_2);
// Get the diff in inline format.
|
$renderer = &new diff_renderer_inline(array_merge($this->get_params(), array('split_level' => 'words')));
| $renderer = new diff_renderer_inline(array_merge($this->get_params(), array('split_level' => 'words')));
|
// Run the diff and get the output.
return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
|
// Run the diff and get the output.
return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
|
| Line 516 | Line 536 |
|---|
*/
function get_diff_content($diff)
{
|
*/
function get_diff_content($diff)
{
|
return '<textarea style="height: 290px;" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
| return '<textarea style="height: 290px;" rows="15" cols="76" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
|
}
function _block_header($xbeg, $xlen, $ybeg, $ylen)
| }
function _block_header($xbeg, $xlen, $ybeg, $ylen)
|
