diff options
Diffstat (limited to 'includes/DifferenceEngine.php')
| -rw-r--r-- | includes/DifferenceEngine.php | 367 |
1 files changed, 182 insertions, 185 deletions
diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php index 9aa17bbb..0b4028cb 100644 --- a/includes/DifferenceEngine.php +++ b/includes/DifferenceEngine.php @@ -1,8 +1,6 @@ <?php /** - * See diff.doc - * @todo indicate where diff.doc can be found. - * @addtogroup DifferenceEngine + * @defgroup DifferenceEngine DifferenceEngine */ /** @@ -15,8 +13,7 @@ define( 'MW_DIFF_VERSION', '1.11a' ); /** * @todo document - * @public - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ class DifferenceEngine { /**#@+ @@ -40,7 +37,7 @@ class DifferenceEngine { * @param $rcid Integer: ??? FIXME (default 0) * @param $refreshCache boolean If set, refreshes the diff cache */ - function DifferenceEngine( $titleObj = null, $old = 0, $new = 0, $rcid = 0, $refreshCache = false ) { + function __construct( $titleObj = null, $old = 0, $new = 0, $rcid = 0, $refreshCache = false ) { $this->mTitle = $titleObj; wfDebug("DifferenceEngine old '$old' new '$new' rcid '$rcid'\n"); @@ -72,10 +69,13 @@ class DifferenceEngine { $this->mRefreshCache = $refreshCache; } + function getTitle() { + return $this->mTitle; + } + function showDiffPage( $diffOnly = false ) { global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol; - $fname = 'DifferenceEngine::showDiffPage'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); # If external diffs are enabled both globally and for the user, # we'll use the application/x-external-editor interface to call @@ -108,13 +108,14 @@ CONTROL; $wgOut->setArticleFlag( false ); if ( ! $this->loadRevisionData() ) { - $t = $this->mTitle->getPrefixedText() . " (Diff: {$this->mOldid}, {$this->mNewid})"; + $t = $this->mTitle->getPrefixedText(); + $d = wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid ); $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) ); - $wgOut->addWikiMsg( 'missingarticle', "<nowiki>$t</nowiki>" ); - wfProfileOut( $fname ); + $wgOut->addWikiMsg( 'missing-article', "<nowiki>$t</nowiki>", $d ); + wfProfileOut( __METHOD__ ); return; } - + wfRunHooks( 'DiffViewHeader', array( $this, $this->mOldRev, $this->mNewRev ) ); if ( $this->mNewRev->isCurrent() ) { @@ -127,7 +128,7 @@ CONTROL; if ( $this->mOldid === false ) { $this->showFirstRevision(); $this->renderNewRevision(); // should we respect $diffOnly here or not? - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return; } @@ -146,18 +147,20 @@ CONTROL; if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) { $wgOut->loginToUse(); $wgOut->output(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); exit; } $sk = $wgUser->getSkin(); - if ( $this->mNewRev->isCurrent() && $wgUser->isAllowed('rollback') ) { + // Check if page is editable + $editable = $this->mNewRev->getTitle()->userCan( 'edit' ); + if ( $editable && $this->mNewRev->isCurrent() && $wgUser->isAllowed( 'rollback' ) ) { $rollback = ' ' . $sk->generateRollback( $this->mNewRev ); } else { $rollback = ''; } - + // Prepare a change patrol link, if applicable if( $wgUseRCPatrol && $wgUser->isAllowed( 'patrol' ) ) { // If we've been given an explicit change identifier, use it; saves time @@ -186,11 +189,11 @@ CONTROL; } // Build the link if( $rcid ) { - $patrol = ' [' . $sk->makeKnownLinkObj( + $patrol = ' <span class="patrollink">[' . $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'markaspatrolleddiff' ), "action=markpatrolled&rcid={$rcid}" - ) . ']'; + ) . ']</span>'; } else { $patrol = ''; } @@ -211,21 +214,19 @@ CONTROL; $newminor = ''; if ($this->mOldRev->mMinorEdit == 1) { - $oldminor = wfElement( 'span', array( 'class' => 'minor' ), - wfMsg( 'minoreditletter') ) . ' '; + $oldminor = Xml::span( wfMsg( 'minoreditletter'), 'minor' ) . ' '; } if ($this->mNewRev->mMinorEdit == 1) { - $newminor = wfElement( 'span', array( 'class' => 'minor' ), - wfMsg( 'minoreditletter') ) . ' '; + $newminor = Xml::span( wfMsg( 'minoreditletter'), 'minor' ) . ' '; } - + $rdel = ''; $ldel = ''; if( $wgUser->isAllowed( 'deleterevision' ) ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) { // If revision was hidden from sysops - $ldel = wfMsgHtml('rev-delundel'); + $ldel = wfMsgHtml('rev-delundel'); } else { $ldel = $sk->makeKnownLinkObj( $revdel, wfMsgHtml('rev-delundel'), @@ -239,10 +240,10 @@ CONTROL; // We don't currently handle well changing the top revision's settings if( $this->mNewRev->isCurrent() ) { // If revision was hidden from sysops - $rdel = wfMsgHtml('rev-delundel'); + $rdel = wfMsgHtml('rev-delundel'); } else if( !$this->mNewRev->userCan( Revision::DELETED_RESTRICTED ) ) { // If revision was hidden from sysops - $rdel = wfMsgHtml('rev-delundel'); + $rdel = wfMsgHtml('rev-delundel'); } else { $rdel = $sk->makeKnownLinkObj( $revdel, wfMsgHtml('rev-delundel'), @@ -269,7 +270,7 @@ CONTROL; if ( !$diffOnly ) $this->renderNewRevision(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } /** @@ -277,8 +278,7 @@ CONTROL; */ function renderNewRevision() { global $wgOut; - $fname = 'DifferenceEngine::renderNewRevision'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" ); #add deleted rev tag if needed @@ -316,7 +316,7 @@ CONTROL; $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting ); } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } /** @@ -325,18 +325,16 @@ CONTROL; */ function showFirstRevision() { global $wgOut, $wgUser; - - $fname = 'DifferenceEngine::showFirstRevision'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); # Get article text from the DB # if ( ! $this->loadNewText() ) { - $t = $this->mTitle->getPrefixedText() . " (Diff: {$this->mOldid}, " . - "{$this->mNewid})"; + $t = $this->mTitle->getPrefixedText(); + $d = wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid ); $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) ); - $wgOut->addWikiMsg( 'missingarticle', "<nowiki>$t</nowiki>" ); - wfProfileOut( $fname ); + $wgOut->addWikiMsg( 'missing-article', "<nowiki>$t</nowiki>", $d ); + wfProfileOut( __METHOD__ ); return; } if ( $this->mNewRev->isCurrent() ) { @@ -348,7 +346,7 @@ CONTROL; if ( !( $this->mTitle->userCanRead() ) ) { $wgOut->loginToUse(); $wgOut->output(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); exit; } @@ -367,7 +365,7 @@ CONTROL; $wgOut->setSubtitle( wfMsg( 'difference' ) ); $wgOut->setRobotpolicy( 'noindex,nofollow' ); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } /** @@ -378,7 +376,7 @@ CONTROL; global $wgOut; $diff = $this->getDiff( $otitle, $ntitle ); if ( $diff === false ) { - $wgOut->addWikiMsg( 'missingarticle', "<nowiki>(fixme, bug)</nowiki>" ); + $wgOut->addWikiMsg( 'missing-article', "<nowiki>(fixme, bug)</nowiki>", '' ); return false; } else { $this->showDiffStyle(); @@ -386,14 +384,14 @@ CONTROL; return true; } } - + /** * Add style sheets and supporting JS for diff display. */ function showDiffStyle() { global $wgStylePath, $wgStyleVersion, $wgOut; $wgOut->addStyle( 'common/diff.css' ); - + // JS is needed to detect old versions of Mozilla to work around an annoyance bug. $wgOut->addScript( "<script type=\"text/javascript\" src=\"$wgStylePath/common/diff.js?$wgStyleVersion\"></script>" ); } @@ -422,9 +420,13 @@ CONTROL; */ function getDiffBody() { global $wgMemc; - $fname = 'DifferenceEngine::getDiffBody'; - wfProfileIn( $fname ); - + wfProfileIn( __METHOD__ ); + // Check if the diff should be hidden from this user + if ( $this->mOldRev && !$this->mOldRev->userCan(Revision::DELETED_TEXT) ) { + return ''; + } else if ( $this->mNewRev && !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) { + return ''; + } // Cacheable? $key = false; if ( $this->mOldid && $this->mNewid ) { @@ -436,7 +438,7 @@ CONTROL; wfIncrStats( 'diff_cache_hit' ); $difftext = $this->localiseLineNumbers( $difftext ); $difftext .= "\n<!-- diff cache key $key -->\n"; - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $difftext; } } // don't try to load but save the result @@ -444,23 +446,14 @@ CONTROL; // Loadtext is permission safe, this just clears out the diff if ( !$this->loadText() ) { - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return false; - } else if ( $this->mOldRev && !$this->mOldRev->userCan(Revision::DELETED_TEXT) ) { - return ''; - } else if ( $this->mNewRev && !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) { - return ''; } $difftext = $this->generateDiffBody( $this->mOldtext, $this->mNewtext ); - + // Save to cache for 7 days - // Only do this for public revs, otherwise an admin can view the diff and a non-admin can nab it! - if ( $this->mOldRev && $this->mOldRev->isDeleted(Revision::DELETED_TEXT) ) { - wfIncrStats( 'diff_uncacheable' ); - } else if ( $this->mNewRev && $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) { - wfIncrStats( 'diff_uncacheable' ); - } else if ( $key !== false && $difftext !== false ) { + if ( $key !== false && $difftext !== false ) { wfIncrStats( 'diff_cache_miss' ); $wgMemc->set( $key, $difftext, 7*86400 ); } else { @@ -470,7 +463,7 @@ CONTROL; if ( $difftext !== false ) { $difftext = $this->localiseLineNumbers( $difftext ); } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $difftext; } @@ -480,11 +473,10 @@ CONTROL; */ function generateDiffBody( $otext, $ntext ) { global $wgExternalDiffEngine, $wgContLang; - $fname = 'DifferenceEngine::generateDiffBody'; $otext = str_replace( "\r\n", "\n", $otext ); $ntext = str_replace( "\r\n", "\n", $ntext ); - + if ( $wgExternalDiffEngine == 'wikidiff' ) { # For historical reasons, external diff engine expects # input text to be HTML-escaped already @@ -493,20 +485,22 @@ CONTROL; if( !function_exists( 'wikidiff_do_diff' ) ) { dl('php_wikidiff.so'); } - return $wgContLang->unsegementForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) ); + return $wgContLang->unsegementForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) ) . + $this->debug( 'wikidiff1' ); } - + if ( $wgExternalDiffEngine == 'wikidiff2' ) { # Better external diff engine, the 2 may some day be dropped # This one does the escaping and segmenting itself if ( !function_exists( 'wikidiff2_do_diff' ) ) { - wfProfileIn( "$fname-dl" ); + wfProfileIn( __METHOD__ . "-dl" ); @dl('php_wikidiff2.so'); - wfProfileOut( "$fname-dl" ); + wfProfileOut( __METHOD__ . "-dl" ); } if ( function_exists( 'wikidiff2_do_diff' ) ) { wfProfileIn( 'wikidiff2_do_diff' ); $text = wikidiff2_do_diff( $otext, $ntext, 2 ); + $text .= $this->debug( 'wikidiff2' ); wfProfileOut( 'wikidiff2_do_diff' ); return $text; } @@ -519,12 +513,12 @@ CONTROL; $tempFile1 = fopen( $tempName1, "w" ); if ( !$tempFile1 ) { - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return false; } $tempFile2 = fopen( $tempName2, "w" ); if ( !$tempFile2 ) { - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return false; } fwrite( $tempFile1, $otext ); @@ -532,22 +526,42 @@ CONTROL; fclose( $tempFile1 ); fclose( $tempFile2 ); $cmd = wfEscapeShellArg( $wgExternalDiffEngine, $tempName1, $tempName2 ); - wfProfileIn( "$fname-shellexec" ); + wfProfileIn( __METHOD__ . "-shellexec" ); $difftext = wfShellExec( $cmd ); - wfProfileOut( "$fname-shellexec" ); + $difftext .= $this->debug( "external $wgExternalDiffEngine" ); + wfProfileOut( __METHOD__ . "-shellexec" ); unlink( $tempName1 ); unlink( $tempName2 ); return $difftext; } - + # Native PHP diff $ota = explode( "\n", $wgContLang->segmentForDiff( $otext ) ); $nta = explode( "\n", $wgContLang->segmentForDiff( $ntext ) ); $diffs = new Diff( $ota, $nta ); $formatter = new TableDiffFormatter(); - return $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) ); + return $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) ) . + $this->debug(); + } + + /** + * Generate a debug comment indicating diff generating time, + * server node, and generator backend. + */ + protected function debug( $generator="internal" ) { + global $wgShowHostnames, $wgNodeName; + $data = array( $generator ); + if( $wgShowHostnames ) { + $data[] = $wgNodeName; + } + $data[] = wfTimestamp( TS_DB ); + return "<!-- diff generator: " . + implode( " ", + array_map( + "htmlspecialchars", + $data ) ) . + " -->\n"; } - /** * Replace line numbers with the text in the user's language @@ -562,19 +576,19 @@ CONTROL; return wfMsgExt( 'lineno', array('parseinline'), $wgLang->formatNum( $matches[1] ) ); } - + /** * If there are revisions between the ones being compared, return a note saying so. */ function getMultiNotice() { if ( !is_object($this->mOldRev) || !is_object($this->mNewRev) ) return ''; - + if( !$this->mOldPage->equals( $this->mNewPage ) ) { // Comparing two different pages? Count would be meaningless. return ''; } - + $oldid = $this->mOldRev->getId(); $newid = $this->mNewRev->getId(); if ( $oldid > $newid ) { @@ -601,7 +615,7 @@ CONTROL; <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> - <tr> + <tr valign='top'> <td colspan='2' class='diff-otitle'>{$otitle}</td> <td colspan='2' class='diff-ntitle'>{$ntitle}</td> </tr> @@ -647,28 +661,31 @@ CONTROL; : Revision::newFromTitle( $this->mTitle ); if( !$this->mNewRev instanceof Revision ) return false; - + // Update the new revision ID in case it was 0 (makes life easier doing UI stuff) $this->mNewid = $this->mNewRev->getId(); - + + // Check if page is editable + $editable = $this->mNewRev->getTitle()->userCan( 'edit' ); + // Set assorted variables $timestamp = $wgLang->timeanddate( $this->mNewRev->getTimestamp(), true ); $this->mNewPage = $this->mNewRev->getTitle(); if( $this->mNewRev->isCurrent() ) { - $newLink = $this->mNewPage->escapeLocalUrl(); + $newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid ); $this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) ); $newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit' ); - $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a> ($timestamp)" - . " (<a href='$newEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)"; + $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a> ($timestamp)"; + $this->mNewtitle .= " (<a href='$newEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)"; } else { $newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid ); $newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mNewid ); $this->mPagetitle = wfMsgHTML( 'revisionasof', $timestamp ); - $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a>" - . " (<a href='$newEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)"; + $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a>"; + $this->mNewtitle .= " (<a href='$newEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)"; } if ( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) { $this->mNewtitle = "<span class='history-deleted'>{$this->mPagetitle}</span>"; @@ -703,18 +720,19 @@ CONTROL; $oldLink = $this->mOldPage->escapeLocalUrl( 'oldid=' . $this->mOldid ); $oldEdit = $this->mOldPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mOldid ); $this->mOldPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t ) ); - + $this->mOldtitle = "<a href='$oldLink'>{$this->mOldPagetitle}</a>" - . " (<a href='$oldEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)"; + . " (<a href='$oldEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)"; // Add an "undo" link $newUndo = $this->mNewPage->escapeLocalUrl( 'action=edit&undoafter=' . $this->mOldid . '&undo=' . $this->mNewid); - if ( $this->mNewRev->userCan(Revision::DELETED_TEXT) ) + if( $editable && !$this->mOldRev->isDeleted( Revision::DELETED_TEXT ) && !$this->mNewRev->isDeleted( Revision::DELETED_TEXT ) ) { $this->mNewtitle .= " (<a href='$newUndo'>" . htmlspecialchars( wfMsg( 'editundo' ) ) . "</a>)"; - - if ( !$this->mOldRev->userCan(Revision::DELETED_TEXT) ) { - $this->mOldtitle = "<span class='history-deleted'>{$this->mOldPagetitle}</span>"; - } else if ( $this->mOldRev->isDeleted(Revision::DELETED_TEXT) ) { - $this->mOldtitle = '<span class="history-deleted">'.$this->mOldtitle.'</span>'; + } + + if( !$this->mOldRev->userCan( Revision::DELETED_TEXT ) ) { + $this->mOldtitle = '<span class="history-deleted">' . $this->mOldPagetitle . '</span>'; + } else if( $this->mOldRev->isDeleted( Revision::DELETED_TEXT ) ) { + $this->mOldtitle = '<span class="history-deleted">' . $this->mOldtitle . '</span>'; } } @@ -780,7 +798,7 @@ define('USE_ASSERTS', function_exists('assert')); /** * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ class _DiffOp { var $type; @@ -803,7 +821,7 @@ class _DiffOp { /** * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ class _DiffOp_Copy extends _DiffOp { var $type = 'copy'; @@ -823,7 +841,7 @@ class _DiffOp_Copy extends _DiffOp { /** * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ class _DiffOp_Delete extends _DiffOp { var $type = 'delete'; @@ -841,7 +859,7 @@ class _DiffOp_Delete extends _DiffOp { /** * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ class _DiffOp_Add extends _DiffOp { var $type = 'add'; @@ -859,7 +877,7 @@ class _DiffOp_Add extends _DiffOp { /** * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ class _DiffOp_Change extends _DiffOp { var $type = 'change'; @@ -896,15 +914,13 @@ class _DiffOp_Change extends _DiffOp { * * @author Geoffrey T. Dairiki, Tim Starling * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ -class _DiffEngine -{ +class _DiffEngine { const MAX_XREF_LENGTH = 10000; function diff ($from_lines, $to_lines) { - $fname = '_DiffEngine::diff'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $n_from = sizeof($from_lines); $n_to = sizeof($to_lines); @@ -991,7 +1007,7 @@ class _DiffEngine elseif ($add) $edits[] = new _DiffOp_Add($add); } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $edits; } @@ -1024,8 +1040,7 @@ class _DiffEngine * of the portions it is going to specify. */ function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) { - $fname = '_DiffEngine::_diag'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $flip = false; if ($xlim - $xoff > $ylim - $yoff) { @@ -1051,7 +1066,7 @@ class _DiffEngine $numer = $xlim - $xoff + $nchunks - 1; $x = $xoff; for ($chunk = 0; $chunk < $nchunks; $chunk++) { - wfProfileIn( "$fname-chunk" ); + wfProfileIn( __METHOD__ . "-chunk" ); if ($chunk > 0) for ($i = 0; $i <= $this->lcs; $i++) $ymids[$i][$chunk-1] = $this->seq[$i]; @@ -1085,7 +1100,7 @@ class _DiffEngine } } } - wfProfileOut( "$fname-chunk" ); + wfProfileOut( __METHOD__ . "-chunk" ); } $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff); @@ -1097,19 +1112,18 @@ class _DiffEngine } $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return array($this->lcs, $seps); } function _lcs_pos ($ypos) { - $fname = '_DiffEngine::_lcs_pos'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $end = $this->lcs; if ($end == 0 || $ypos > $this->seq[$end]) { $this->seq[++$this->lcs] = $ypos; $this->in_seq[$ypos] = 1; - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $this->lcs; } @@ -1127,7 +1141,7 @@ class _DiffEngine $this->in_seq[$this->seq[$end]] = false; $this->seq[$end] = $ypos; $this->in_seq[$ypos] = 1; - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $end; } @@ -1143,8 +1157,7 @@ class _DiffEngine * All line numbers are origin-0 and discarded lines are not counted. */ function _compareseq ($xoff, $xlim, $yoff, $ylim) { - $fname = '_DiffEngine::_compareseq'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); // Slide down the bottom initial diagonal. while ($xoff < $xlim && $yoff < $ylim @@ -1187,7 +1200,7 @@ class _DiffEngine $pt1 = $pt2; } } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } /* Adjust inserts/deletes of identical lines to join changes @@ -1203,8 +1216,7 @@ class _DiffEngine * This is extracted verbatim from analyze.c (GNU diffutils-2.7). */ function _shift_boundaries ($lines, &$changed, $other_changed) { - $fname = '_DiffEngine::_shift_boundaries'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $i = 0; $j = 0; @@ -1309,7 +1321,7 @@ class _DiffEngine USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]'); } } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } } @@ -1317,7 +1329,7 @@ class _DiffEngine * Class representing a 'diff' between two sequences of strings. * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ class Diff { @@ -1427,8 +1439,7 @@ class Diff * This is here only for debugging purposes. */ function _check ($from_lines, $to_lines) { - $fname = 'Diff::_check'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); if (serialize($from_lines) != serialize($this->orig())) trigger_error("Reconstructed original doesn't match", E_USER_ERROR); if (serialize($to_lines) != serialize($this->closing())) @@ -1450,14 +1461,14 @@ class Diff $lcs = $this->lcs(); trigger_error('Diff okay: LCS = '.$lcs, E_USER_NOTICE); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } } /** * @todo document, bad name. * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ class MappedDiff extends Diff { @@ -1485,9 +1496,8 @@ class MappedDiff extends Diff * have the same number of elements as $to_lines. */ function MappedDiff($from_lines, $to_lines, - $mapped_from_lines, $mapped_to_lines) { - $fname = 'MappedDiff::MappedDiff'; - wfProfileIn( $fname ); + $mapped_from_lines, $mapped_to_lines) { + wfProfileIn( __METHOD__ ); assert(sizeof($from_lines) == sizeof($mapped_from_lines)); assert(sizeof($to_lines) == sizeof($mapped_to_lines)); @@ -1508,7 +1518,7 @@ class MappedDiff extends Diff $yi += sizeof($closing); } } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } } @@ -1520,10 +1530,9 @@ class MappedDiff extends Diff * to obtain fancier outputs. * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ -class DiffFormatter -{ +class DiffFormatter { /** * Number of leading context "lines" to preserve. * @@ -1547,8 +1556,7 @@ class DiffFormatter * @return string The formatted output. */ function format($diff) { - $fname = 'DiffFormatter::format'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $xi = $yi = 1; $block = false; @@ -1602,13 +1610,12 @@ class DiffFormatter $block); $end = $this->_end_diff(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $end; } function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) { - $fname = 'DiffFormatter::_block'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen)); foreach ($edits as $edit) { if ($edit->type == 'copy') @@ -1623,7 +1630,7 @@ class DiffFormatter trigger_error('Unknown edit type', E_USER_ERROR); } $this->_end_block(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } function _start_diff() { @@ -1677,14 +1684,13 @@ class DiffFormatter /** * A formatter that outputs unified diffs - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ -class UnifiedDiffFormatter extends DiffFormatter -{ +class UnifiedDiffFormatter extends DiffFormatter { var $leading_context_lines = 2; var $trailing_context_lines = 2; - + function _added($lines) { $this->_lines($lines, '+'); } @@ -1702,21 +1708,17 @@ class UnifiedDiffFormatter extends DiffFormatter /** * A pseudo-formatter that just passes along the Diff::$edits array - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ -class ArrayDiffFormatter extends DiffFormatter -{ - function format($diff) - { +class ArrayDiffFormatter extends DiffFormatter { + function format($diff) { $oldline = 1; $newline = 1; $retval = array(); foreach($diff->edits as $edit) - switch($edit->type) - { + switch($edit->type) { case 'add': - foreach($edit->closing as $l) - { + foreach($edit->closing as $l) { $retval[] = array( 'action' => 'add', 'new'=> $l, @@ -1725,8 +1727,7 @@ class ArrayDiffFormatter extends DiffFormatter } break; case 'delete': - foreach($edit->orig as $l) - { + foreach($edit->orig as $l) { $retval[] = array( 'action' => 'delete', 'old' => $l, @@ -1735,8 +1736,7 @@ class ArrayDiffFormatter extends DiffFormatter } break; case 'change': - foreach($edit->orig as $i => $l) - { + foreach($edit->orig as $i => $l) { $retval[] = array( 'action' => 'change', 'old' => $l, @@ -1751,7 +1751,7 @@ class ArrayDiffFormatter extends DiffFormatter $newline += count($edit->orig); } return $retval; - } + } } /** @@ -1759,12 +1759,12 @@ class ArrayDiffFormatter extends DiffFormatter * */ -define('NBSP', ' '); // iso-8859-x non-breaking space. +define('NBSP', ' '); // iso-8859-x non-breaking space. /** * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ class _HWLDF_WordAccumulator { function _HWLDF_WordAccumulator () { @@ -1777,10 +1777,10 @@ class _HWLDF_WordAccumulator { function _flushGroup ($new_tag) { if ($this->_group !== '') { if ($this->_tag == 'ins') - $this->_line .= '<ins class="diffchange">' . + $this->_line .= '<ins class="diffchange diffchange-inline">' . htmlspecialchars ( $this->_group ) . '</ins>'; elseif ($this->_tag == 'del') - $this->_line .= '<del class="diffchange">' . + $this->_line .= '<del class="diffchange diffchange-inline">' . htmlspecialchars ( $this->_group ) . '</del>'; else $this->_line .= htmlspecialchars ( $this->_group ); @@ -1825,27 +1825,24 @@ class _HWLDF_WordAccumulator { /** * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ -class WordLevelDiff extends MappedDiff -{ +class WordLevelDiff extends MappedDiff { const MAX_LINE_LENGTH = 10000; function WordLevelDiff ($orig_lines, $closing_lines) { - $fname = 'WordLevelDiff::WordLevelDiff'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); list ($orig_words, $orig_stripped) = $this->_split($orig_lines); list ($closing_words, $closing_stripped) = $this->_split($closing_lines); $this->MappedDiff($orig_words, $closing_words, - $orig_stripped, $closing_stripped); - wfProfileOut( $fname ); + $orig_stripped, $closing_stripped); + wfProfileOut( __METHOD__ ); } function _split($lines) { - $fname = 'WordLevelDiff::_split'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $words = array(); $stripped = array(); @@ -1872,13 +1869,12 @@ class WordLevelDiff extends MappedDiff } } } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return array($words, $stripped); } function orig () { - $fname = 'WordLevelDiff::orig'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $orig = new _HWLDF_WordAccumulator; foreach ($this->edits as $edit) { @@ -1888,13 +1884,12 @@ class WordLevelDiff extends MappedDiff $orig->addWords($edit->orig, 'del'); } $lines = $orig->getLines(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $lines; } function closing () { - $fname = 'WordLevelDiff::closing'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $closing = new _HWLDF_WordAccumulator; foreach ($this->edits as $edit) { @@ -1904,24 +1899,30 @@ class WordLevelDiff extends MappedDiff $closing->addWords($edit->closing, 'ins'); } $lines = $closing->getLines(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $lines; } } /** - * Wikipedia Table style diff formatter. + * Wikipedia Table style diff formatter. * @todo document * @private - * @addtogroup DifferenceEngine + * @ingroup DifferenceEngine */ -class TableDiffFormatter extends DiffFormatter -{ +class TableDiffFormatter extends DiffFormatter { function TableDiffFormatter() { $this->leading_context_lines = 2; $this->trailing_context_lines = 2; } + public static function escapeWhiteSpace( $msg ) { + $msg = preg_replace( '/^ /m', ' ', $msg ); + $msg = preg_replace( '/ $/m', ' ', $msg ); + $msg = preg_replace( '/ /', ' ', $msg ); + return $msg; + } + function _block_header( $xbeg, $xlen, $ybeg, $ylen ) { $r = '<tr><td colspan="2" class="diff-lineno"><!--LINE '.$xbeg."--></td>\n" . '<td colspan="2" class="diff-lineno"><!--LINE '.$ybeg."--></td></tr>\n"; @@ -1952,11 +1953,11 @@ class TableDiffFormatter extends DiffFormatter function contextLine( $line ) { return $this->wrapLine( ' ', 'diff-context', $line ); } - + private function wrapLine( $marker, $class, $line ) { if( $line !== '' ) { // The <div> wrapper is needed for 'overflow: auto' style to scroll properly - $line = "<div>$line</div>"; + $line = Xml::tags( 'div', null, $this->escapeWhiteSpace( $line ) ); } return "<td class='diff-marker'>$marker</td><td class='$class'>$line</td>"; } @@ -1990,8 +1991,7 @@ class TableDiffFormatter extends DiffFormatter } function _changed( $orig, $closing ) { - $fname = 'TableDiffFormatter::_changed'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $diff = new WordLevelDiff( $orig, $closing ); $del = $diff->orig(); @@ -2009,9 +2009,6 @@ class TableDiffFormatter extends DiffFormatter echo '<tr>' . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n"; } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } } - - - |