X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDifferenceEngine.php;h=6dc82d6b1f81900bbe3ae4abffbc1caac9dd1b43;hb=e7ad7f3d41618b908e806251d9efb64e1e6008d9;hp=3af5767f305381b42b88009742e31c89eadf6318;hpb=2b1127fe90d0122e6650c6c7761aa85707e6201f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php index 3af5767f30..6dc82d6b1f 100644 --- a/includes/DifferenceEngine.php +++ b/includes/DifferenceEngine.php @@ -1,43 +1,59 @@ mTitle = $titleObj; + wfDebug("DifferenceEngine old '$old' new '$new' rcid '$rcid'\n"); + + if ( 'prev' === $new ) { # Show diff between revision $old and the previous one. # Get previous one from DB. # $this->mNewid = intval($old); - $this->mOldid = $wgTitle->getPreviousRevisionID( $this->mNewid ); - - } elseif ( 'next' == $new ) { + $this->mOldid = $this->mTitle->getPreviousRevisionID( $this->mNewid ); + } elseif ( 'next' === $new ) { # Show diff between revision $old and the previous one. # Get previous one from DB. # $this->mOldid = intval($old); - $this->mNewid = $wgTitle->getNextRevisionID( $this->mOldid ); + $this->mNewid = $this->mTitle->getNextRevisionID( $this->mOldid ); if ( false === $this->mNewid ) { # if no result, NewId points to the newest old revision. The only newer # revision is cur, which is "0". @@ -45,39 +61,73 @@ class DifferenceEngine { } } else { - $this->mOldid = intval($old); $this->mNewid = intval($new); } $this->mRcidMarkPatrolled = intval($rcid); # force it to be an integer } - function showDiffPage() - { - global $wgUser, $wgTitle, $wgOut, $wgContLang, $wgOnlySysopsCanPatrol, $wgUseRCPatrol; + function showDiffPage() { + global $wgUser, $wgOut, $wgContLang, $wgUseExternalEditor, $wgUseRCPatrol; $fname = 'DifferenceEngine::showDiffPage'; wfProfileIn( $fname ); - # mOldid is false if the difference engine is called with a "vague" query for - # a diff between a version V and its previous version V' AND the version V - # is the first version of that article. In that case, V' does not exist. - if ( $this->mOldid === false ) { - $this->showFirstRevision(); - wfProfileOut( $fname ); + # If external diffs are enabled both globally and for the user, + # we'll use the application/x-external-editor interface to call + # an external diff tool like kompare, kdiff3, etc. + if($wgUseExternalEditor && $wgUser->getOption('externaldiff')) { + global $wgInputEncoding,$wgServer,$wgScript,$wgLang; + $wgOut->disable(); + header ( "Content-type: application/x-external-editor; charset=".$wgInputEncoding ); + $url1=$this->mTitle->getFullURL("action=raw&oldid=".$this->mOldid); + $url2=$this->mTitle->getFullURL("action=raw&oldid=".$this->mNewid); + $special=$wgLang->getNsText(NS_SPECIAL); + $control=<<getPrefixedText() . " (Diff: {$this->mOldid}, " . + $t = $this->mTitle->getPrefixedText() . " (Diff: {$this->mOldid}, " . "{$this->mNewid})"; - $mtext = wfMsg( 'missingarticle', $t ); + $mtext = wfMsg( 'missingarticle', "$t" ); $wgOut->setArticleFlag( false ); - if ( ! $this->loadText() ) { + if ( ! $this->loadRevisionData() ) { $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) ); - $wgOut->addHTML( $mtext ); + $wgOut->addWikitext( $mtext ); wfProfileOut( $fname ); return; } + + wfRunHooks( 'DiffViewHeader', array( $this, $this->mOldRev, $this->mNewRev ) ); + + if ( $this->mNewRev->isCurrent() ) { + $wgOut->setArticleFlag( true ); + } + + # mOldid is false if the difference engine is called with a "vague" query for + # a diff between a version V and its previous version V' AND the version V + # is the first version of that article. In that case, V' does not exist. + if ( $this->mOldid === false ) { + $this->showFirstRevision(); + wfProfileOut( $fname ); + return; + } + $wgOut->suppressQuickbar(); $oldTitle = $this->mOldPage->getPrefixedText(); @@ -88,7 +138,7 @@ class DifferenceEngine { $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle ); } $wgOut->setSubtitle( wfMsg( 'difference' ) ); - $wgOut->setRobotpolicy( 'noindex,follow' ); + $wgOut->setRobotpolicy( 'noindex,nofollow' ); if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) { $wgOut->loginToUse(); @@ -101,82 +151,87 @@ class DifferenceEngine { $talk = $wgContLang->getNsText( NS_TALK ); $contribs = wfMsg( 'contribslink' ); - $this->mOldComment = $sk->formatComment($this->mOldComment); - $this->mNewComment = $sk->formatComment($this->mNewComment); - - $oldUserLink = $sk->makeLinkObj( Title::makeTitleSafe( NS_USER, $this->mOldUser ), $this->mOldUser ); - $newUserLink = $sk->makeLinkObj( Title::makeTitleSafe( NS_USER, $this->mNewUser ), $this->mNewUser ); - $oldUTLink = $sk->makeLinkObj( Title::makeTitleSafe( NS_USER_TALK, $this->mOldUser ), $talk ); - $newUTLink = $sk->makeLinkObj( Title::makeTitleSafe( NS_USER_TALK, $this->mNewUser ), $talk ); - $oldContribs = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ), $contribs, - 'target=' . urlencode($this->mOldUser) ); - $newContribs = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ), $contribs, - 'target=' . urlencode($this->mNewUser) ); - if ( !$this->mNewid && $wgUser->isAllowed('rollback') ) { - $rollback = '   [' . $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'rollbacklink' ), - 'action=rollback&from=' . urlencode($this->mNewUser) ) . ']'; + if ( $this->mNewRev->isCurrent() && $wgUser->isAllowed('rollback') ) { + $username = $this->mNewRev->getUserText(); + $rollback = '   [' . $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'rollbacklink' ), + 'action=rollback&from=' . urlencode( $username ) . + '&token=' . urlencode( $wgUser->editToken( array( $this->mTitle->getPrefixedText(), $username ) ) ) ) . + ']'; } else { $rollback = ''; } - if ( $wgUseRCPatrol && $this->mRcidMarkPatrolled != 0 && $wgUser->getID() != 0 && - ( $wgUser->isAllowed('rollback') || !$wgOnlySysopsCanPatrol ) ) - { - $patrol = ' [' . $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'markaspatrolleddiff' ), - "action=markpatrolled&rcid={$this->mRcidMarkPatrolled}" ) . ']'; + if( $wgUseRCPatrol && $this->mRcidMarkPatrolled != 0 && $wgUser->isAllowed( 'patrol' ) ) { + $patrol = ' [' . $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'markaspatrolleddiff' ), "action=markpatrolled&rcid={$this->mRcidMarkPatrolled}" ) . ']'; } else { $patrol = ''; } - $prevlink = $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'previousdiff' ), 'diff=prev&oldid='.$this->mOldid ); - if ( $this->mNewid == 0 ) { - $nextlink = ''; + $prevlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'previousdiff' ), + 'diff=prev&oldid='.$this->mOldid, '', '', 'id="differences-prevlink"' ); + if ( $this->mNewRev->isCurrent() ) { + $nextlink = ' '; } else { - $nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid ); + $nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextdiff' ), + 'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' ); } - $oldHeader = "{$this->mOldtitle}
$oldUserLink " . - "($oldUTLink | $oldContribs)
" . $this->mOldComment . - '
' . $prevlink; - $newHeader = "{$this->mNewtitle}
$newUserLink " . - "($newUTLink | $newContribs) $rollback
" . $this->mNewComment . - '
' . $nextlink . $patrol; + $oldHeader = "{$this->mOldtitle}
" . + $sk->revUserTools( $this->mOldRev ) . "
" . + $sk->revComment( $this->mOldRev ) . "
" . + $prevlink; + $newHeader = "{$this->mNewtitle}
" . + $sk->revUserTools( $this->mNewRev ) . " $rollback
" . + $sk->revComment( $this->mNewRev ) . "
" . + $nextlink . $patrol; - DifferenceEngine::showDiff( $this->mOldtext, $this->mNewtext, - $oldHeader, $newHeader ); + $this->showDiff( $oldHeader, $newHeader ); $wgOut->addHTML( "

{$this->mPagetitle}

\n" ); - $wgOut->addWikiText( $this->mNewtext ); + + if( !$this->mNewRev->isCurrent() ) { + $oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false ); + } + + $this->loadNewText(); + if( is_object( $this->mNewRev ) ) { + $wgOut->setRevisionId( $this->mNewRev->getId() ); + } + $wgOut->addSecondaryWikiText( $this->mNewtext ); + + if( !$this->mNewRev->isCurrent() ) { + $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting ); + } wfProfileOut( $fname ); } - # Show the first revision of an article. Uses normal diff headers in contrast to normal - # "old revision" display style. - # - function showFirstRevision() - { - global $wgOut, $wgTitle, $wgUser, $wgLang; + /** + * Show the first revision of an article. Uses normal diff headers in + * contrast to normal "old revision" display style. + */ + function showFirstRevision() { + global $wgOut, $wgUser; $fname = 'DifferenceEngine::showFirstRevision'; wfProfileIn( $fname ); - - $this->mOldid = $this->mNewid; # hack to make loadText() work. - # Get article text from the DB # - if ( ! $this->loadText() ) { - $t = $wgTitle->getPrefixedText() . " (Diff: {$this->mOldid}, " . + if ( ! $this->loadNewText() ) { + $t = $this->mTitle->getPrefixedText() . " (Diff: {$this->mOldid}, " . "{$this->mNewid})"; - $mtext = wfMsg( 'missingarticle', $t ); + $mtext = wfMsg( 'missingarticle', "$t" ); $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) ); - $wgOut->addHTML( $mtext ); + $wgOut->addWikitext( $mtext ); wfProfileOut( $fname ); return; } + if ( $this->mNewRev->isCurrent() ) { + $wgOut->setArticleFlag( true ); + } # Check if user is allowed to look at this page. If not, bail out. # - if ( !( $this->mOldPage->userCanRead() ) ) { + if ( !( $this->mTitle->userCanRead() ) ) { $wgOut->loginToUse(); $wgOut->output(); wfProfileOut( $fname ); @@ -187,120 +242,349 @@ class DifferenceEngine { # $sk = $wgUser->getSkin(); - $uTLink = $sk->makeLinkObj( Title::makeTitleSafe( NS_USER_TALK, $this->mOldUser ), $wgLang->getNsText( NS_TALK ) ); - $userLink = $sk->makeLinkObj( Title::makeTitleSafe( NS_USER, $this->mOldUser ), $this->mOldUser ); - $contribs = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ), wfMsg( 'contribslink' ), - 'target=' . urlencode($this->mOldUser) ); - $nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid ); - $header = "
{$this->mOldtitle}
$userLink " . - "($uTLink | $contribs)
" . $this->mOldComment . - '
' . $nextlink. "
\n"; + $nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' ); + $header = "
{$this->mOldtitle}
" . + $sk->revUserTools( $this->mNewRev ) . "
" . + $sk->revComment( $this->mNewRev ) . "
" . + $nextlink . "
\n"; $wgOut->addHTML( $header ); $wgOut->setSubtitle( wfMsg( 'difference' ) ); - $wgOut->setRobotpolicy( 'noindex,follow' ); + $wgOut->setRobotpolicy( 'noindex,nofollow' ); # Show current revision # $wgOut->addHTML( "

{$this->mPagetitle}

\n" ); - $wgOut->addWikiText( $this->mNewtext ); + if( is_object( $this->mNewRev ) ) { + $wgOut->setRevisionId( $this->mNewRev->getId() ); + } + $wgOut->addSecondaryWikiText( $this->mNewtext ); wfProfileOut( $fname ); } - function showDiff( $otext, $ntext, $otitle, $ntitle ) - { + /** + * Get the diff text, send it to $wgOut + * Returns false if the diff could not be generated, otherwise returns true + */ + function showDiff( $otitle, $ntitle ) { global $wgOut; - $wgOut->addHTML( DifferenceEngine::getDiff( $otext, $ntext, $otitle, $ntitle ) ); + $diff = $this->getDiff( $otitle, $ntitle ); + if ( $diff === false ) { + $wgOut->addWikitext( wfMsg( 'missingarticle', "(fixme, bug)" ) ); + return false; + } else { + $wgOut->addHTML( $diff ); + return true; + } + } + + /** + * Get diff table, including header + * Note that the interface has changed, it's no longer static. + * Returns false on error + */ + function getDiff( $otitle, $ntitle ) { + $body = $this->getDiffBody(); + if ( $body === false ) { + return false; + } else { + return $this->addHeader( $body, $otitle, $ntitle ); + } } - - function getDiff( $otext, $ntext, $otitle, $ntitle ) { - global $wgUseExternalDiffEngine, $wgContLang; + + /** + * Get the diff table body, without header + * Results are cached + * Returns false on error + */ + function getDiffBody() { + global $wgMemc, $wgDBname; + $fname = 'DifferenceEngine::getDiffBody'; + wfProfileIn( $fname ); + + // Cacheable? + $key = false; + if ( $this->mOldid && $this->mNewid ) { + // Try cache + $key = "$wgDBname:diff:oldid:{$this->mOldid}:newid:{$this->mNewid}"; + $difftext = $wgMemc->get( $key ); + if ( $difftext ) { + wfIncrStats( 'diff_cache_hit' ); + $difftext = $this->localiseLineNumbers( $difftext ); + $difftext .= "\n\n"; + wfProfileOut( $fname ); + return $difftext; + } + } + + if ( !$this->loadText() ) { + wfProfileOut( $fname ); + return false; + } + + $difftext = $this->generateDiffBody( $this->mOldtext, $this->mNewtext ); + + // Save to cache for 7 days + if ( $key !== false && $difftext !== false ) { + wfIncrStats( 'diff_cache_miss' ); + $wgMemc->set( $key, $difftext, 7*86400 ); + } else { + wfIncrStats( 'diff_uncacheable' ); + } + // Replace line numbers with the text in the user's language + if ( $difftext !== false ) { + $difftext = $this->localiseLineNumbers( $difftext ); + } + wfProfileOut( $fname ); + return $difftext; + } + + /** + * Generate a diff, no caching + * $otext and $ntext must be already segmented + */ + 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 + $otext = htmlspecialchars ( $wgContLang->segmentForDiff( $otext ) ); + $ntext = htmlspecialchars ( $wgContLang->segmentForDiff( $ntext ) ); + if( !function_exists( 'wikidiff_do_diff' ) ) { + dl('php_wikidiff.so'); + } + return $wgContLang->unsegementForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) ); + } + + 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" ); + @dl('php_wikidiff2.so'); + wfProfileOut( "$fname-dl" ); + } + if ( function_exists( 'wikidiff2_do_diff' ) ) { + wfProfileIn( 'wikidiff2_do_diff' ); + $text = wikidiff2_do_diff( $otext, $ntext, 2 ); + wfProfileOut( 'wikidiff2_do_diff' ); + return $text; + } + } + if ( $wgExternalDiffEngine !== false ) { + # Diff via the shell + global $wgTmpDirectory; + $tempName1 = tempnam( $wgTmpDirectory, 'diff_' ); + $tempName2 = tempnam( $wgTmpDirectory, 'diff_' ); + + $tempFile1 = fopen( $tempName1, "w" ); + if ( !$tempFile1 ) { + wfProfileOut( $fname ); + return false; + } + $tempFile2 = fopen( $tempName2, "w" ); + if ( !$tempFile2 ) { + wfProfileOut( $fname ); + return false; + } + fwrite( $tempFile1, $otext ); + fwrite( $tempFile2, $ntext ); + fclose( $tempFile1 ); + fclose( $tempFile2 ); + $cmd = wfEscapeShellArg( $wgExternalDiffEngine, $tempName1, $tempName2 ); + wfProfileIn( "$fname-shellexec" ); + $difftext = wfShellExec( $cmd ); + wfProfileOut( "$fname-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 ) ); + } + + + /** + * Replace line numbers with the text in the user's language + */ + function localiseLineNumbers( $text ) { + return preg_replace_callback( '//', + array( &$this, 'localiseLineNumbersCb' ), $text ); + } + + function localiseLineNumbersCb( $matches ) { + global $wgLang; + return wfMsgExt( 'lineno', array('parseinline'), $wgLang->formatNum( $matches[1] ) ); + } + + /** + * Add the header to a diff body + */ + function addHeader( $diff, $otitle, $ntitle ) { $out = " + $diff +
{$otitle} {$ntitle}
"; - $otext = $wgContLang->segmentForDiff($otext); - $ntext = $wgContLang->segmentForDiff($ntext); - $difftext=''; - if ( $wgUseExternalDiffEngine ) { - # For historical reasons, external diff engine expects - # input text to be HTML-escaped already - $otext = str_replace( "\r\n", "\n", htmlspecialchars ( $otext ) ); - $ntext = str_replace( "\r\n", "\n", htmlspecialchars ( $ntext ) ); - if( !function_exists( 'wikidiff_do_diff' ) ) { - dl('php_wikidiff.so'); - } - $difftext = wikidiff_do_diff( $otext, $ntext, 2 ); - } else { - $ota = explode( "\n", str_replace( "\r\n", "\n", $otext ) ); - $nta = explode( "\n", str_replace( "\r\n", "\n", $ntext ) ); - $diffs =& new Diff( $ota, $nta ); - $formatter =& new TableDiffFormatter(); - $difftext = $formatter->format( $diffs ); - } - $difftext = $wgContLang->unsegmentForDiff($difftext); - $out .= $difftext."\n"; return $out; } - # Load the text of the articles to compare. If newid is 0, then compare - # the old article in oldid to the current article; if oldid is 0, then - # compare the current article to the immediately previous one (ignoring - # the value of newid). - # - function loadText() - { - global $wgTitle, $wgOut, $wgLang; - $fname = 'DifferenceEngine::loadText'; + /** + * Use specified text instead of loading from the database + */ + function setText( $oldText, $newText ) { + $this->mOldtext = $oldText; + $this->mNewtext = $newText; + $this->mTextLoaded = 2; + } + + /** + * Load revision metadata for the specified articles. If newid is 0, then compare + * the old article in oldid to the current article; if oldid is 0, then + * compare the current article to the immediately previous one (ignoring the + * value of newid). + * + * If oldid is false, leave the corresponding revision object set + * to false. This is impossible via ordinary user input, and is provided for + * API convenience. + */ + function loadRevisionData() { + global $wgLang; + if ( $this->mRevisionsLoaded ) { + return true; + } else { + // Whether it succeeds or fails, we don't want to try again + $this->mRevisionsLoaded = true; + } - $dbr =& wfGetDB( DB_SLAVE ); + // Load the new revision object if( $this->mNewid ) { - $this->newRev =& Revision::newFromId( $this->mNewid ); + $this->mNewRev = Revision::newFromId( $this->mNewid ); } else { - $this->newRev =& Revision::newFromTitle( $wgTitle ); + $this->mNewRev = Revision::newFromTitle( $this->mTitle ); } - - if( $this->newRev->isCurrent() ) { - $this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) ); - $this->mNewPage = $wgTitle; + + if( is_null( $this->mNewRev ) ) { + return false; + } + + // Set assorted variables + $timestamp = $wgLang->timeanddate( $this->mNewRev->getTimestamp(), true ); + $this->mNewPage = $this->mNewRev->getTitle(); + if( $this->mNewRev->isCurrent() ) { $newLink = $this->mNewPage->escapeLocalUrl(); - $this->mNewtitle = "{$this->mPagetitle}"; + $this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) ); + $newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit' ); + + $this->mNewtitle = "{$this->mPagetitle} ($timestamp)" + . " (" . htmlspecialchars( wfMsg( 'editold' ) ) . ")"; + } else { - $this->mNewPage = $this->newRev->getTitle(); - $newLink = $this->mNewPage->escapeLocalUrl ('oldid=' . $this->mNewid ); - $t = $wgLang->timeanddate( $this->newRev->getTimestamp(), true ); - $this->mPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t ) ); - $this->mNewtitle = "{$this->mPagetitle}"; + $newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid ); + $newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mNewid ); + $this->mPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $timestamp ) ); + + $this->mNewtitle = "{$this->mPagetitle}" + . " (" . htmlspecialchars( wfMsg( 'editold' ) ) . ")"; } - + + // Load the old revision object + $this->mOldRev = false; if( $this->mOldid ) { - $this->oldRev =& Revision::newFromId( $this->mOldid ); + $this->mOldRev = Revision::newFromId( $this->mOldid ); + } elseif ( $this->mOldid === 0 ) { + $rev = $this->mNewRev->getPrevious(); + if( $rev ) { + $this->mOldid = $rev->getId(); + $this->mOldRev = $rev; + } else { + // No previous revision; mark to show as first-version only. + $this->mOldid = false; + $this->mOldRev = false; + } + }/* elseif ( $this->mOldid === false ) leave mOldRev false; */ + + if( is_null( $this->mOldRev ) ) { + return false; + } + + if ( $this->mOldRev ) { + $this->mOldPage = $this->mOldRev->getTitle(); + + $t = $wgLang->timeanddate( $this->mOldRev->getTimestamp(), true ); + $oldLink = $this->mOldPage->escapeLocalUrl( 'oldid=' . $this->mOldid ); + $oldEdit = $this->mOldPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mOldid ); + $this->mOldtitle = "" . htmlspecialchars( wfMsg( 'revisionasof', $t ) ) + . " (" . htmlspecialchars( wfMsg( 'editold' ) ) . ")"; + } + + return true; + } + + /** + * Load the text of the revisions, as well as revision data. + */ + function loadText() { + if ( $this->mTextLoaded == 2 ) { + return true; } else { - $this->oldRev =& $this->newRev->getPrevious(); + // Whether it succeeds or fails, we don't want to try again + $this->mTextLoaded = 2; } - - $this->mOldPage = $this->oldRev->getTitle(); - $t = $wgLang->timeanddate( $this->oldRev->getTimestamp(), true ); - $oldLink = $this->mOldPage->escapeLocalUrl( 'oldid=' . $this->mOldid ); - $this->mOldtitle = "" . htmlspecialchars( wfMsg( 'revisionasof', $t ) ) . ''; - - $this->mNewUser = $this->newRev->getUserText(); - $this->mNewComment = $this->newRev->getComment(); - $this->mNewtext = $this->newRev->getText(); - - $this->mOldUser = $this->oldRev->getUserText(); - $this->mOldComment = $this->oldRev->getComment(); - $this->mOldtext = $this->oldRev->getText(); + if ( !$this->loadRevisionData() ) { + return false; + } + if ( $this->mOldRev ) { + // FIXME: permission tests + $this->mOldtext = $this->mOldRev->getText(); + if ( $this->mOldtext === false ) { + return false; + } + } + if ( $this->mNewRev ) { + $this->mNewtext = $this->mNewRev->getText(); + if ( $this->mNewtext === false ) { + return false; + } + } + return true; + } + /** + * Load the text of the new revision, not the old one + */ + function loadNewText() { + if ( $this->mTextLoaded >= 1 ) { + return true; + } else { + $this->mTextLoaded = 1; + } + if ( !$this->loadRevisionData() ) { + return false; + } + $this->mNewtext = $this->mNewRev->getText(); return true; } + + } // A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3) @@ -313,7 +597,9 @@ define('USE_ASSERTS', function_exists('assert')); /** * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class _DiffOp { var $type; @@ -335,7 +621,9 @@ class _DiffOp { /** * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class _DiffOp_Copy extends _DiffOp { var $type = 'copy'; @@ -354,7 +642,9 @@ class _DiffOp_Copy extends _DiffOp { /** * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class _DiffOp_Delete extends _DiffOp { var $type = 'delete'; @@ -371,7 +661,9 @@ class _DiffOp_Delete extends _DiffOp { /** * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class _DiffOp_Add extends _DiffOp { var $type = 'add'; @@ -388,7 +680,9 @@ class _DiffOp_Add extends _DiffOp { /** * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class _DiffOp_Change extends _DiffOp { var $type = 'change'; @@ -421,15 +715,19 @@ class _DiffOp_Change extends _DiffOp { * closingly, some ideas (subdivision by NCHUNKS > 2, and some optimizations) * are my own. * - * @author Geoffrey T. Dairiki - * @access private + * Line length limits for robustness added by Tim Starling, 2005-08-31 + * + * @author Geoffrey T. Dairiki, Tim Starling + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class _DiffEngine { function diff ($from_lines, $to_lines) { $fname = '_DiffEngine::diff'; wfProfileIn( $fname ); - + $n_from = sizeof($from_lines); $n_to = sizeof($to_lines); @@ -442,32 +740,34 @@ class _DiffEngine // Skip leading common lines. for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) { - if ($from_lines[$skip] != $to_lines[$skip]) + if ($from_lines[$skip] !== $to_lines[$skip]) break; $this->xchanged[$skip] = $this->ychanged[$skip] = false; } // Skip trailing common lines. $xi = $n_from; $yi = $n_to; for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) { - if ($from_lines[$xi] != $to_lines[$yi]) + if ($from_lines[$xi] !== $to_lines[$yi]) break; $this->xchanged[$xi] = $this->ychanged[$yi] = false; } // Ignore lines which do not exist in both files. - for ($xi = $skip; $xi < $n_from - $endskip; $xi++) - $xhash[$from_lines[$xi]] = 1; + for ($xi = $skip; $xi < $n_from - $endskip; $xi++) { + $xhash[$this->_line_hash($from_lines[$xi])] = 1; + } + for ($yi = $skip; $yi < $n_to - $endskip; $yi++) { $line = $to_lines[$yi]; - if ( ($this->ychanged[$yi] = empty($xhash[$line])) ) + if ( ($this->ychanged[$yi] = empty($xhash[$this->_line_hash($line)])) ) continue; - $yhash[$line] = 1; + $yhash[$this->_line_hash($line)] = 1; $this->yv[] = $line; $this->yind[] = $yi; } for ($xi = $skip; $xi < $n_from - $endskip; $xi++) { $line = $from_lines[$xi]; - if ( ($this->xchanged[$xi] = empty($yhash[$line])) ) + if ( ($this->xchanged[$xi] = empty($yhash[$this->_line_hash($line)])) ) continue; $this->xv[] = $line; $this->xind[] = $xi; @@ -517,6 +817,17 @@ class _DiffEngine return $edits; } + /** + * Returns the whole line if it's small enough, or the MD5 hash otherwise + */ + function _line_hash( $line ) { + if ( strlen( $line ) > MAX_DIFF_XREF_LENGTH ) { + return md5( $line ); + } else { + return $line; + } + } + /* Divide the Largest Common Subsequence (LCS) of the sequences * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally @@ -553,12 +864,12 @@ class _DiffEngine else for ($i = $ylim - 1; $i >= $yoff; $i--) $ymatches[$this->yv[$i]][] = $i; - + $this->lcs = 0; $this->seq[0]= $yoff - 1; $this->in_seq = array(); $ymids[0] = array(); - + $numer = $xlim - $xoff + $nchunks - 1; $x = $xoff; for ($chunk = 0; $chunk < $nchunks; $chunk++) { @@ -566,7 +877,7 @@ class _DiffEngine if ($chunk > 0) for ($i = 0; $i <= $this->lcs; $i++) $ymids[$i][$chunk-1] = $this->seq[$i]; - + $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks); for ( ; $x < $x1; $x++) { $line = $flip ? $this->yv[$x] : $this->xv[$x]; @@ -598,7 +909,7 @@ class _DiffEngine } wfProfileOut( "$fname-chunk" ); } - + $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff); $ymid = $ymids[$this->lcs]; for ($n = 0; $n < $nchunks - 1; $n++) { @@ -607,7 +918,7 @@ class _DiffEngine $seps[] = $flip ? array($y1, $x1) : array($x1, $y1); } $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim); - + wfProfileOut( $fname ); return array($this->lcs, $seps); } @@ -615,7 +926,7 @@ class _DiffEngine function _lcs_pos ($ypos) { $fname = '_DiffEngine::_lcs_pos'; wfProfileIn( $fname ); - + $end = $this->lcs; if ($end == 0 || $ypos > $this->seq[$end]) { $this->seq[++$this->lcs] = $ypos; @@ -632,9 +943,9 @@ class _DiffEngine else $end = $mid; } - + USE_ASSERTS && assert($ypos != $this->seq[$end]); - + $this->in_seq[$this->seq[$end]] = false; $this->seq[$end] = $ypos; $this->in_seq[$ypos] = 1; @@ -656,7 +967,7 @@ class _DiffEngine function _compareseq ($xoff, $xlim, $yoff, $ylim) { $fname = '_DiffEngine::_compareseq'; wfProfileIn( $fname ); - + // Slide down the bottom initial diagonal. while ($xoff < $xlim && $yoff < $ylim && $this->xv[$xoff] == $this->yv[$yoff]) { @@ -718,11 +1029,11 @@ class _DiffEngine wfProfileIn( $fname ); $i = 0; $j = 0; - + USE_ASSERTS && assert('sizeof($lines) == sizeof($changed)'); $len = sizeof($lines); $other_len = sizeof($other_changed); - + while (1) { /* * Scan forwards to find beginning of another run of changes. @@ -737,30 +1048,30 @@ class _DiffEngine */ while ($j < $other_len && $other_changed[$j]) $j++; - + while ($i < $len && ! $changed[$i]) { USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]'); $i++; $j++; while ($j < $other_len && $other_changed[$j]) $j++; } - + if ($i == $len) break; - + $start = $i; - + // Find the end of this run of changes. while (++$i < $len && $changed[$i]) continue; - + do { /* * Record the length of this run of changes, so that * we can later determine whether the run has grown. */ $runlength = $i - $start; - + /* * Move the changed region back, so long as the * previous unchanged line matches the last changed one. @@ -776,14 +1087,14 @@ class _DiffEngine continue; USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]'); } - + /* * Set CORRESPONDING to the end of the changed run, at the last * point where it corresponds to a changed run in the other file. * CORRESPONDING == LEN means no such point has been found. */ $corresponding = $j < $other_len ? $i : $len; - + /* * Move the changed region forward, so long as the * first changed line matches the following unchanged one. @@ -796,7 +1107,7 @@ class _DiffEngine $changed[$i++] = 1; while ($i < $len && $changed[$i]) $i++; - + USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]'); $j++; if ($j < $other_len && $other_changed[$j]) { @@ -806,7 +1117,7 @@ class _DiffEngine } } } while ($runlength != $i - $start); - + /* * If possible, move the fully-merged run of changes * back to a corresponding run in the other file. @@ -827,7 +1138,9 @@ class _DiffEngine /** * Class representing a 'diff' between two sequences of strings. * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class Diff { @@ -967,7 +1280,9 @@ class Diff /** * FIXME: bad name. * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class MappedDiff extends Diff { @@ -998,7 +1313,7 @@ class MappedDiff extends Diff $mapped_from_lines, $mapped_to_lines) { $fname = 'MappedDiff::MappedDiff'; wfProfileIn( $fname ); - + assert(sizeof($from_lines) == sizeof($mapped_from_lines)); assert(sizeof($to_lines) == sizeof($mapped_to_lines)); @@ -1029,7 +1344,9 @@ class MappedDiff extends Diff * It is intended that this class be customized via inheritance, * to obtain fancier outputs. * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class DiffFormatter { @@ -1194,7 +1511,9 @@ define('NBSP', ' '); // iso-8859-x non-breaking space. /** * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class _HWLDF_WordAccumulator { function _HWLDF_WordAccumulator () { @@ -1251,18 +1570,19 @@ class _HWLDF_WordAccumulator { /** * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class WordLevelDiff extends MappedDiff { function WordLevelDiff ($orig_lines, $closing_lines) { $fname = 'WordLevelDiff::WordLevelDiff'; wfProfileIn( $fname ); - + 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 ); @@ -1271,14 +1591,33 @@ class WordLevelDiff extends MappedDiff function _split($lines) { $fname = 'WordLevelDiff::_split'; wfProfileIn( $fname ); - if (!preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs', - implode("\n", $lines), - $m)) { - wfProfileOut( $fname ); - return array(array(''), array('')); + + $words = array(); + $stripped = array(); + $first = true; + foreach ( $lines as $line ) { + # If the line is too long, just pretend the entire line is one big word + # This prevents resource exhaustion problems + if ( $first ) { + $first = false; + } else { + $words[] = "\n"; + $stripped[] = "\n"; + } + if ( strlen( $line ) > MAX_DIFF_LINE ) { + $words[] = $line; + $stripped[] = $line; + } else { + if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs', + $line, $m)) + { + $words = array_merge( $words, $m[0] ); + $stripped = array_merge( $stripped, $m[1] ); + } + } } wfProfileOut( $fname ); - return array($m[0], $m[1]); + return array($words, $stripped); } function orig () { @@ -1317,7 +1656,9 @@ class WordLevelDiff extends MappedDiff /** * Wikipedia Table style diff formatter. * @todo document - * @access private + * @private + * @package MediaWiki + * @subpackage DifferenceEngine */ class TableDiffFormatter extends DiffFormatter { @@ -1327,16 +1668,12 @@ class TableDiffFormatter extends DiffFormatter } function _block_header( $xbeg, $xlen, $ybeg, $ylen ) { - $l1 = wfMsg( 'lineno', $xbeg ); - $l2 = wfMsg( 'lineno', $ybeg ); - - $r = ''.$l1."\n" . - ''.$l2."\n"; + $r = '\n" . + '\n"; return $r; } function _start_block( $header ) { - global $wgOut; echo $header; } @@ -1390,7 +1727,7 @@ class TableDiffFormatter extends DiffFormatter function _changed( $orig, $closing ) { $fname = 'TableDiffFormatter::_changed'; wfProfileIn( $fname ); - + $diff = new WordLevelDiff( $orig, $closing ); $del = $diff->orig(); $add = $diff->closing();