|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @package diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @version $Id: renderer.php 8766 2008-08-16 22:24:54Z aptx $
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @copyright (c) 2006 phpBB Group
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @ignore
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (!defined('IN_PHPBB'))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
exit;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Code from pear.php.net, Text_Diff-1.0.0 package
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* http://pear.php.net/package/Text_Diff/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Modified by phpBB Group to meet our coding standards
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* and being able to integrate into phpBB
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* A class to render Diffs in different formats.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* This class renders the diff in classic diff format. It is intended that
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* this class be customized via inheritance, to obtain fancier outputs.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Copyright 2004-2008 The Horde Project (http://www.horde.org/)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @package diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
class diff_renderer
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Number of leading context "lines" to preserve.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* This should be left at zero for this class, but subclasses may want to
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* set this to other values.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_leading_context_lines = 0;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Number of trailing context "lines" to preserve.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* This should be left at zero for this class, but subclasses may want to
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* set this to other values.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_trailing_context_lines = 0;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Constructor.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function diff_renderer($params = array())
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
foreach ($params as $param => $value)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$v = '_' . $param;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (isset($this->$v))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->$v = $value;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Get any renderer parameters.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @return array All parameters of this renderer object.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function get_params()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$params = array();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
foreach (get_object_vars($this) as $k => $v)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($k[0] == '_')
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$params[substr($k, 1)] = $v;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $params;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Renders a diff.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @param diff &$diff A diff object.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @return string The formatted output.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function render(&$diff)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$xi = $yi = 1;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$block = false;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$context = array();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Create a new diff object if it is a 3-way diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (is_a($diff, 'diff3'))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$diff3 = &$diff;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$diff_1 = $diff3->get_original();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$diff_2 = $diff3->merged_output();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
unset($diff3);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$diff = new diff($diff_1, $diff_2);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$nlead = $this->_leading_context_lines;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$ntrail = $this->_trailing_context_lines;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output = $this->_start_diff();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$diffs = $diff->get_diff();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
foreach ($diffs as $i => $edit)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// If these are unchanged (copied) lines, and we want to keep leading or trailing context lines, extract them from the copy block.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (is_a($edit, 'diff_op_copy'))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Do we have any diff blocks yet?
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (is_array($block))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// How many lines to keep as context from the copy block.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$keep = ($i == sizeof($diffs) - 1) ? $ntrail : $nlead + $ntrail;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (sizeof($edit->orig) <= $keep)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// We have less lines in the block than we want for context => keep the whole block.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$block[] = $edit;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($ntrail)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Create a new block with as many lines as we need for the trailing context.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$context = array_slice($edit->orig, 0, $ntrail);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$block[] = new diff_op_copy($context);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= $this->_block($x0, $ntrail + $xi - $x0, $y0, $ntrail + $yi - $y0, $block);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$block = false;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Keep the copy block as the context for the next block.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$context = $edit->orig;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Don't we have any diff blocks yet?
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (!is_array($block))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Extract context lines from the preceding copy block.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$context = array_slice($context, sizeof($context) - $nlead);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$x0 = $xi - sizeof($context);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$y0 = $yi - sizeof($context);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$block = array();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($context)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$block[] = new diff_op_copy($context);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$block[] = $edit;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$xi += ($edit->orig) ? sizeof($edit->orig) : 0;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$yi += ($edit->final) ? sizeof($edit->final) : 0;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (is_array($block))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= $this->_block($x0, $xi - $x0, $y0, $yi - $y0, $block);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $output . $this->_end_diff();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output = $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
foreach ($edits as $edit)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
switch (get_class($edit))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'diff_op_copy':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= $this->_context($edit->orig);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'diff_op_add':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= $this->_added($edit->final);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'diff_op_delete':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= $this->_deleted($edit->orig);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'diff_op_change':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= $this->_changed($edit->orig, $edit->final);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $output . $this->_end_block();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _start_diff()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _end_diff()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _block_header($xbeg, $xlen, $ybeg, $ylen)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($xlen > 1)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$xbeg .= ',' . ($xbeg + $xlen - 1);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($ylen > 1)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$ybeg .= ',' . ($ybeg + $ylen - 1);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// this matches the GNU Diff behaviour
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($xlen && !$ylen)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$ybeg--;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else if (!$xlen)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$xbeg--;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _start_block($header)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $header . "\n";
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _end_block()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _lines($lines, $prefix = ' ')
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $prefix . implode("\n$prefix", $lines) . "\n";
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _context($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_lines($lines, ' ');
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _added($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_lines($lines, '> ');
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _deleted($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_lines($lines, '< ');
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _changed($orig, $final)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_deleted($orig) . "---\n" . $this->_added($final);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Our function to get the diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function get_diff_content($diff)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->render($diff);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Renders a unified diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @package diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
class diff_renderer_unified extends diff_renderer
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_leading_context_lines = 4;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_trailing_context_lines = 4;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Our function to get the diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function get_diff_content($diff)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return nl2br($this->render($diff));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _block_header($xbeg, $xlen, $ybeg, $ylen)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($xlen != 1)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$xbeg .= ',' . $xlen;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($ylen != 1)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$ybeg .= ',' . $ylen;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '<big class="info">@@ -' . $xbeg . ' +' . $ybeg . ' @@</big> ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _context($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '' . htmlspecialchars($this->_lines($lines, ' ')) . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _added($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '' . htmlspecialchars($this->_lines($lines, '+')) . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _deleted($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '' . htmlspecialchars($this->_lines($lines, '-')) . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _changed($orig, $final)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_deleted($orig) . $this->_added($final);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _start_diff()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$start = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $start;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _end_diff()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _end_block()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* "Inline" diff renderer.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* This class renders diffs in the Wiki-style "inline" format.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @author Ciprian Popovici
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @package diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
class diff_renderer_inline extends diff_renderer
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_leading_context_lines = 10000;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_trailing_context_lines = 10000;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Prefix and suffix for inserted text
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_ins_prefix = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_ins_suffix = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Prefix and suffix for deleted text
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_del_prefix = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_del_suffix = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_block_head = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// What are we currently splitting on? Used to recurse to show word-level
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_split_level = 'lines';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Our function to get the diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function get_diff_content($diff)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '' . nl2br($this->render($diff)) . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _start_diff()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _end_diff()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _block_header($xbeg, $xlen, $ybeg, $ylen)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_block_head;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _start_block($header)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $header;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _lines($lines, $prefix = ' ', $encode = true)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($encode)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
array_walk($lines, array(&$this, '_encode'));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($this->_split_level == 'words')
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return implode('', $lines);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return implode("\n", $lines) . "\n";
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _added($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
array_walk($lines, array(&$this, '_encode'));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$lines[0] = $this->_ins_prefix . $lines[0];
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$lines[sizeof($lines) - 1] .= $this->_ins_suffix;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_lines($lines, ' ', false);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _deleted($lines, $words = false)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
array_walk($lines, array(&$this, '_encode'));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$lines[0] = $this->_del_prefix . $lines[0];
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$lines[sizeof($lines) - 1] .= $this->_del_suffix;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_lines($lines, ' ', false);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _changed($orig, $final)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// If we've already split on words, don't try to do so again - just display.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($this->_split_level == 'words')
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$prefix = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
while ($orig[0] !== false && $final[0] !== false && substr($orig[0], 0, 1) == ' ' && substr($final[0], 0, 1) == ' ')
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$prefix .= substr($orig[0], 0, 1);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$orig[0] = substr($orig[0], 1);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$final[0] = substr($final[0], 1);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $prefix . $this->_deleted($orig) . $this->_added($final);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$text1 = implode("\n", $orig);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$text2 = implode("\n", $final);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Non-printing newline marker.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$nl = "\0";
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// We want to split on word boundaries, but we need to preserve whitespace as well.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Therefore we split on words, but include all blocks of whitespace in the wordlist.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$splitted_text_1 = $this->_split_on_words($text1, $nl);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$splitted_text_2 = $this->_split_on_words($text2, $nl);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$diff = new diff($splitted_text_1, $splitted_text_2);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
unset($splitted_text_1, $splitted_text_2);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Get the diff in inline format.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$renderer = new diff_renderer_inline(array_merge($this->get_params(), array('split_level' => 'words')));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Run the diff and get the output.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _split_on_words($string, $newline_escape = "\n")
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Ignore \0; otherwise the while loop will never finish.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$string = str_replace("\0", '', $string);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$words = array();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$length = strlen($string);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$pos = 0;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$tab_there = true;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
while ($pos < $length)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Check for tabs... do not include them
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($tab_there && substr($string, $pos, 1) === "\t")
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$words[] = "\t";
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$pos++;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
continue;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$tab_there = false;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Eat a word with any preceding whitespace.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$spaces = strspn(substr($string, $pos), " \n");
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$nextpos = strcspn(substr($string, $pos + $spaces), " \n");
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$words[] = str_replace("\n", $newline_escape, substr($string, $pos, $spaces + $nextpos));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$pos += $spaces + $nextpos;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $words;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _encode(&$string)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$string = htmlspecialchars($string);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* "raw" diff renderer.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* This class could be used to output a raw unified patch file
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @package diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
class diff_renderer_raw extends diff_renderer
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_leading_context_lines = 4;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_trailing_context_lines = 4;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Our function to get the diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function get_diff_content($diff)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '<textarea style="height: 290px;" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _block_header($xbeg, $xlen, $ybeg, $ylen)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($xlen != 1)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$xbeg .= ',' . $xlen;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($ylen != 1)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$ybeg .= ',' . $ylen;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '@@ -' . $xbeg . ' +' . $ybeg . ' @@';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _context($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_lines($lines, ' ');
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _added($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_lines($lines, '+');
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _deleted($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_lines($lines, '-');
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _changed($orig, $final)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_deleted($orig) . $this->_added($final);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* "chora (Horde)" diff renderer - similar style.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* This renderer class is a modified human_readable function from the Horde Framework.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* @package diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
class diff_renderer_side_by_side extends diff_renderer
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_leading_context_lines = 3;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $_trailing_context_lines = 3;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $lines = array();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Hold the left and right columns of lines for change blocks.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $cols;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $state;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
var $data = false;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
/**
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
* Our function to get the diff
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function get_diff_content($diff)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
global $user;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
<caption>
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
' . $user->lang['LINE_UNMODIFIED'] . '
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
' . $user->lang['LINE_ADDED'] . '
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
' . $user->lang['LINE_MODIFIED'] . '
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
' . $user->lang['LINE_REMOVED'] . '
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
</caption>
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->render($diff);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Is the diff empty?
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (!sizeof($this->lines))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '' . $user->lang['NO_VISIBLE_CHANGES'] . '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Iterate through every header block of changes
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
foreach ($this->lines as $header)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '' . $user->lang['LINE'] . ' ' . $header['oldline'] . '' . $user->lang['LINE'] . ' ' . $header['newline'] . '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Each header block consists of a number of changes (add, remove, change).
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$current_context = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
foreach ($header['contents'] as $change)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (!empty($current_context) && $change['type'] != 'empty')
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$line = $current_context;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$current_context = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '' . ((strlen($line)) ? $line : ' ') . '
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
' . ((strlen($line)) ? $line : ' ') . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
switch ($change['type'])
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'add':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$line = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
foreach ($change['lines'] as $_line)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$line .= htmlspecialchars($_line) . ' ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= ' ' . ((strlen($line)) ? $line : ' ') . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'remove':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$line = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
foreach ($change['lines'] as $_line)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$line .= htmlspecialchars($_line) . ' ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '' . ((strlen($line)) ? $line : ' ') . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'empty':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$current_context .= htmlspecialchars($change['line']) . ' ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'change':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Pop the old/new stacks one by one, until both are empty.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$oldsize = sizeof($change['old']);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$newsize = sizeof($change['new']);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$left = $right = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
for ($row = 0, $row_max = max($oldsize, $newsize); $row < $row_max; ++$row)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$left .= isset($change['old'][$row]) ? htmlspecialchars($change['old'][$row]) : '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$left .= ' ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$right .= isset($change['new'][$row]) ? htmlspecialchars($change['new'][$row]) : '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$right .= ' ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (!empty($left))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '' . $left . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else if ($row < $oldsize)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= ' ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= ' ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (!empty($right))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '' . $right . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else if ($row < $newsize)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= ' ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= ' ';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if (!empty($current_context))
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$line = $current_context;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$current_context = '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '' . ((strlen($line)) ? $line : ' ') . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '' . ((strlen($line)) ? $line : ' ') . '
';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$output .= '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $output;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _start_diff()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->lines = array();
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->data = false;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->cols = array(array(), array());
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->state = 'empty';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _end_diff()
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Just flush any remaining entries in the columns stack.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
switch ($this->state)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'add':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->data['contents'][] = array('type' => 'add', 'lines' => $this->cols[0]);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'remove':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// We have some removal lines pending in our stack, so flush them.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->data['contents'][] = array('type' => 'remove', 'lines' => $this->cols[0]);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'change':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// We have both remove and addition lines, so this is a change block.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->data['contents'][] = array('type' => 'change', 'old' => $this->cols[0], 'new' => $this->cols[1]);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($this->data !== false)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->lines[] = $this->data;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _block_header($xbeg, $xlen, $ybeg, $ylen)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Push any previous header information to the return stack.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($this->data !== false)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->lines[] = $this->data;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->data = array('type' => 'header', 'oldline' => $xbeg, 'newline' => $ybeg, 'contents' => array());
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->state = 'dump';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _added($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
array_walk($lines, array(&$this, '_perform_add'));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _perform_add($line)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($this->state == 'empty')
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return '';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// This is just an addition line.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
if ($this->state == 'dump' || $this->state == 'add')
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// Start adding to the addition stack.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->cols[0][] = $line;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->state = 'add';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
else
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// This is inside a change block, so start accumulating lines.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->state = 'change';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->cols[1][] = $line;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _deleted($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
array_walk($lines, array(&$this, '_perform_delete'));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _perform_delete($line)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// This is a removal line.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->state = 'remove';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->cols[0][] = $line;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _context($lines)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
array_walk($lines, array(&$this, '_perform_context'));
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _perform_context($line)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// An empty block with no action.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
switch ($this->state)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'add':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->data['contents'][] = array('type' => 'add', 'lines' => $this->cols[0]);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'remove':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// We have some removal lines pending in our stack, so flush them.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->data['contents'][] = array('type' => 'remove', 'lines' => $this->cols[0]);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
case 'change':
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
// We have both remove and addition lines, so this is a change block.
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->data['contents'][] = array('type' => 'change', 'old' => $this->cols[0], 'new' => $this->cols[1]);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
break;
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->cols = array(array(), array());
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->data['contents'][] = array('type' => 'empty', 'line' => $line);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
$this->state = 'dump';
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
function _changed($orig, $final)
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
{
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
return $this->_deleted($orig) . $this->_added($final);
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
|
|
![](https://seccdn.libravatar.org/avatar/6547be6a776b3f31e43b7f4b6dd82ebcede0f2d11be196e3a70e28760a760a3c?s=16&d=retro) |
d6e8d8 |
?>
|