1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462
|
<?php // -*-php-*-
rcs_id('$Id: diff.php,v 1.55 2007/06/01 06:32:13 rurban Exp $');
// diff.php
//
// PhpWiki diff output code.
//
// Copyright (C) 2000, 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
// You may copy this code freely under the conditions of the GPL.
//
require_once('lib/difflib.php');
require_once('lib/HtmlElement.php');
class _HWLDF_WordAccumulator {
function _HWLDF_WordAccumulator () {
$this->_lines = array();
$this->_line = false;
$this->_group = false;
$this->_tag = '~begin';
}
function _flushGroup ($new_tag) {
if ($this->_group !== false) {
if (!$this->_line)
$this->_line = HTML();
$this->_line->pushContent($this->_tag
? new HtmlElement($this->_tag,
$this->_group)
: $this->_group);
}
$this->_group = '';
$this->_tag = $new_tag;
}
function _flushLine ($new_tag) {
$this->_flushGroup($new_tag);
if ($this->_line)
$this->_lines[] = $this->_line;
$this->_line = HTML();
}
function addWords ($words, $tag = '') {
if ($tag != $this->_tag)
$this->_flushGroup($tag);
foreach ($words as $word) {
// new-line should only come as first char of word.
if (!$word)
continue;
if ($word[0] == "\n") {
$this->_group .= " ";
$this->_flushLine($tag);
$word = substr($word, 1);
}
assert(!strstr($word, "\n"));
$this->_group .= $word;
}
}
function getLines() {
$this->_flushLine('~done');
return $this->_lines;
}
}
class WordLevelDiff extends MappedDiff
{
function WordLevelDiff ($orig_lines, $final_lines) {
list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
list ($final_words, $final_stripped) = $this->_split($final_lines);
$this->MappedDiff($orig_words, $final_words,
$orig_stripped, $final_stripped);
}
function _split($lines) {
// FIXME: fix POSIX char class.
if (!preg_match_all('/ ( [^\S\n]+ | [[:alnum:]]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
implode("\n", $lines),
$m)) {
return array(array(''), array(''));
}
return array($m[0], $m[1]);
}
function orig () {
$orig = new _HWLDF_WordAccumulator;
foreach ($this->edits as $edit) {
if ($edit->type == 'copy')
$orig->addWords($edit->orig);
elseif ($edit->orig)
$orig->addWords($edit->orig, 'del');
}
return $orig->getLines();
}
function _final () {
$final = new _HWLDF_WordAccumulator;
foreach ($this->edits as $edit) {
if ($edit->type == 'copy')
$final->addWords($edit->final);
elseif ($edit->final)
$final->addWords($edit->final, 'ins');
}
return $final->getLines();
}
}
/**
* HTML unified diff formatter.
*
* This class formats a diff into a CSS-based
* unified diff format.
*
* Within groups of changed lines, diffs are highlit
* at the character-diff level.
*/
class HtmlUnifiedDiffFormatter extends UnifiedDiffFormatter
{
function HtmlUnifiedDiffFormatter($context_lines = 4) {
$this->UnifiedDiffFormatter($context_lines);
}
function _start_diff() {
$this->_top = HTML::div(array('class' => 'diff'));
}
function _end_diff() {
$val = $this->_top;
unset($this->_top);
return $val;
}
function _start_block($header) {
$this->_block = HTML::div(array('class' => 'block'),
HTML::tt($header));
}
function _end_block() {
$this->_top->pushContent($this->_block);
unset($this->_block);
}
function _lines($lines, $class, $prefix = false, $elem = false) {
if (!$prefix)
$prefix = HTML::raw(' ');
$div = HTML::div(array('class' => 'difftext'));
foreach ($lines as $line) {
if ($elem)
$line = new HtmlElement($elem, $line);
$div->pushContent(HTML::div(array('class' => $class),
HTML::tt(array('class' => 'prefix'),
$prefix),
$line, HTML::raw(' ')));
}
$this->_block->pushContent($div);
}
function _context($lines) {
$this->_lines($lines, 'context');
}
function _deleted($lines) {
$this->_lines($lines, 'deleted', '-', 'del');
}
function _added($lines) {
$this->_lines($lines, 'added', '+', 'ins');
}
function _changed($orig, $final) {
$diff = new WordLevelDiff($orig, $final);
$this->_lines($diff->orig(), 'original', '-');
$this->_lines($diff->_final(), 'final', '+');
}
}
/**
* HTML table-based unified diff formatter.
*
* This class formats a diff into a table-based
* unified diff format. (Similar to what was produced
* by previous versions of PhpWiki.)
*
* Within groups of changed lines, diffs are highlit
* at the character-diff level.
*/
class TableUnifiedDiffFormatter extends HtmlUnifiedDiffFormatter
{
function TableUnifiedDiffFormatter($context_lines = 4) {
$this->HtmlUnifiedDiffFormatter($context_lines);
}
function _start_diff() {
$this->_top = HTML::table(array('width' => '100%',
'class' => 'diff',
'cellspacing' => 1,
'cellpadding' => 1,
'border' => 1));
}
function _start_block($header) {
$this->_block = HTML::table(array('width' => '100%',
'class' => 'block',
'cellspacing' => 0,
'cellpadding' => 1,
'border' => 0),
HTML::tr(HTML::td(array('colspan' => 2),
HTML::tt($header))));
}
function _end_block() {
$this->_top->pushContent(HTML::tr(HTML::td($this->_block)));
unset($this->_block);
}
function _lines($lines, $class, $prefix = false, $elem = false) {
if (!$prefix)
$prefix = HTML::raw(' ');
$prefix = HTML::td(array('class' => 'prefix',
'width' => "1%"), $prefix);
foreach ($lines as $line) {
if (! trim($line))
$line = HTML::raw(' ');
elseif ($elem)
$line = new HtmlElement($elem, $line);
$this->_block->pushContent(HTML::tr(array('valign' => 'top'),
$prefix,
HTML::td(array('class' => $class),
$line)));
}
}
}
/////////////////////////////////////////////////////////////////
function PageInfoRow ($label, $rev, &$request, $is_current = false)
{
global $WikiTheme;
$row = HTML::tr(HTML::td(array('align' => 'right'), $label));
if ($rev) {
$author = $rev->get('author');
$dbi = $request->getDbh();
$iswikipage = (isWikiWord($author) && $dbi->isWikiPage($author));
$authorlink = $iswikipage ? WikiLink($author) : $author;
$version = $rev->getVersion();
$linked_version = WikiLink($rev, 'existing', $version);
if ($is_current)
$revertbutton = HTML();
else
$revertbutton = $WikiTheme->makeActionButton(array('action' => 'revert',
'version' => $version),
false, $rev);
$row->pushContent(HTML::td(fmt("version %s", $linked_version)),
HTML::td($WikiTheme->getLastModifiedMessage($rev,
false)),
HTML::td(fmt("by %s", $authorlink)),
HTML::td($revertbutton)
);
} else {
$row->pushContent(HTML::td(array('colspan' => '4'), _("None")));
}
return $row;
}
function showDiff (&$request) {
$pagename = $request->getArg('pagename');
if (is_array($versions = $request->getArg('versions'))) {
// Version selection from pageinfo.php display:
rsort($versions);
list ($version, $previous) = $versions;
}
else {
$version = $request->getArg('version');
$previous = $request->getArg('previous');
}
// abort if page doesn't exist
$dbi = $request->getDbh();
$page = $request->getPage();
$current = $page->getCurrentRevision(false);
if ($current->getVersion() < 1) {
$html = HTML::div(array('class'=>'wikitext','id'=>'difftext'),
HTML::p(fmt("I'm sorry, there is no such page as %s.",
WikiLink($pagename, 'unknown'))));
require_once('lib/Template.php');
GeneratePage($html, sprintf(_("Diff: %s"), $pagename), false);
return; //early return
}
if ($version) {
if (!($new = $page->getRevision($version)))
NoSuchRevision($request, $page, $version);
$new_version = fmt("version %d", $version);
}
else {
$new = $current;
$new_version = _("current version");
}
if (preg_match('/^\d+$/', $previous)) {
if ( !($old = $page->getRevision($previous)) )
NoSuchRevision($request, $page, $previous);
$old_version = fmt("version %d", $previous);
$others = array('major', 'minor', 'author');
}
else {
switch ($previous) {
case 'author':
$old = $new;
while ($old = $page->getRevisionBefore($old)) {
if ($old->get('author') != $new->get('author'))
break;
}
$old_version = _("revision by previous author");
$others = array('major', 'minor');
break;
case 'minor':
$previous='minor';
$old = $page->getRevisionBefore($new);
$old_version = _("previous revision");
$others = array('major', 'author');
break;
case 'major':
default:
$old = $new;
while ($old && $old->get('is_minor_edit'))
$old = $page->getRevisionBefore($old);
if ($old)
$old = $page->getRevisionBefore($old);
$old_version = _("predecessor to the previous major change");
$others = array('minor', 'author');
break;
}
}
$new_link = WikiLink($new, '', $new_version);
$old_link = $old ? WikiLink($old, '', $old_version) : $old_version;
$page_link = WikiLink($page);
$html = HTML::div(array('class'=>'wikitext','id'=>'difftext'),
HTML::p(fmt("Differences between %s and %s of %s.",
$new_link, $old_link, $page_link)));
$otherdiffs = HTML::p(_("Other diffs:"));
$label = array('major' => _("Previous Major Revision"),
'minor' => _("Previous Revision"),
'author'=> _("Previous Author"));
foreach ($others as $other) {
$args = array('action' => 'diff', 'previous' => $other);
if ($version)
$args['version'] = $version;
if (count($otherdiffs->getContent()) > 1)
$otherdiffs->pushContent(", ");
else
$otherdiffs->pushContent(" ");
$otherdiffs->pushContent(Button($args, $label[$other]));
}
$html->pushContent($otherdiffs);
if ($old and $old->getVersion() == 0)
$old = false;
$html->pushContent(HTML::Table(PageInfoRow(_("Newer page:"), $new,
$request, empty($version)),
PageInfoRow(_("Older page:"), $old,
$request, false)));
if ($new && $old) {
$diff = new Diff($old->getContent(), $new->getContent());
if ($diff->isEmpty()) {
$html->pushContent(HTML::hr(),
HTML::p('[', _("Versions are identical"),
']'));
}
else {
// New CSS formatted unified diffs (ugly in NS4).
$fmt = new HtmlUnifiedDiffFormatter;
// Use this for old table-formatted diffs.
//$fmt = new TableUnifiedDiffFormatter;
$html->pushContent($fmt->format($diff));
}
$html->pushContent(HTML::hr(), HTML::h1($new_version));
require_once("lib/BlockParser.php");
$html->pushContent(TransformText($new,$new->get('markup'),$pagename));
}
require_once('lib/Template.php');
GeneratePage($html, sprintf(_("Diff: %s"), $pagename), $new);
}
// $Log: diff.php,v $
// Revision 1.55 2007/06/01 06:32:13 rurban
// fix basepage for external links
//
// Revision 1.54 2007/01/02 13:18:16 rurban
// omit want_content if not necessary
//
// Revision 1.53 2006/12/02 13:58:27 rurban
// Fix MonoBook layout (id content forbidden here)
// Add new revision to the bottom of the diff as in mediawiki.
//
// Revision 1.52 2005/04/01 14:45:14 rurban
// fix dirty side-effect: dont printf too early bypassing ob_buffering.
// fixes MSIE.
//
// Revision 1.51 2005/02/04 15:26:57 rurban
// need div=content for blog
//
// Revision 1.50 2005/02/04 13:44:45 rurban
// prevent from php5 nameclash
//
// Revision 1.49 2004/11/21 11:59:19 rurban
// remove final \n to be ob_cache independent
//
// Revision 1.48 2004/06/14 11:31:36 rurban
// renamed global $Theme to $WikiTheme (gforge nameclash)
// inherit PageList default options from PageList
// default sortby=pagename
// use options in PageList_Selectable (limit, sortby, ...)
// added action revert, with button at action=diff
// added option regex to WikiAdminSearchReplace
//
// Revision 1.47 2004/06/08 13:51:57 rurban
// some comments only
//
// Revision 1.46 2004/05/01 15:59:29 rurban
// nothing changed
//
// Revision 1.45 2004/01/25 03:57:15 rurban
// use isWikiWord()
//
// Revision 1.44 2003/02/17 02:17:31 dairiki
// Fix so that action=diff will work when the most recent version
// of a page has been "deleted".
//
// Revision 1.43 2003/01/29 19:17:37 carstenklapp
// Bugfix for   showing on diff page.
//
// Revision 1.42 2003/01/11 23:05:04 carstenklapp
// Tweaked diff formatting.
//
// Revision 1.41 2003/01/08 02:23:02 carstenklapp
// Don't perform a diff when the page doesn't exist (such as a
// nonexistant calendar day/sub-page)
//
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
?>
|