X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDifferenceEngine.php;h=8d96e3d4769a11a722ce8339610c0ac6629a052c;hb=72a4abe588a7511ed5a92a5e30f889c60d824c1a;hp=dc61864465d5023e1f856be50a43eba97440867d;hpb=2157b6afbf14548af01d01cbfe87998027d0614a;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php index dc61864465..8d96e3d476 100644 --- a/includes/DifferenceEngine.php +++ b/includes/DifferenceEngine.php @@ -1,58 +1,62 @@ mTitle = $titleObj; + wfDebug("DifferenceEngine old '$old' new '$new' rcid '$rcid'\n"); - if ( 'prev' == $new ) { + 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 ); + $this->mOldid = $this->mTitle->getPreviousRevisionID( $this->mNewid ); - } elseif ( 'next' == $new ) { + } 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". @@ -66,12 +70,11 @@ class DifferenceEngine { $this->mRcidMarkPatrolled = intval($rcid); # force it to be an integer } - function showDiffPage() { - global $wgUser, $wgTitle, $wgOut, $wgContLang, $wgOnlySysopsCanPatrol, - $wgUseExternalEditor, $wgUseRCPatrol; + function showDiffPage( $diffOnly = false ) { + global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol; $fname = 'DifferenceEngine::showDiffPage'; wfProfileIn( $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. @@ -79,8 +82,8 @@ class DifferenceEngine { global $wgInputEncoding,$wgServer,$wgScript,$wgLang; $wgOut->disable(); header ( "Content-type: application/x-external-editor; charset=".$wgInputEncoding ); - $url1=$wgTitle->getFullURL("action=raw&oldid=".$this->mOldid); - $url2=$wgTitle->getFullURL("action=raw&oldid=".$this->mNewid); + $url1=$this->mTitle->getFullURL("action=raw&oldid=".$this->mOldid); + $url2=$this->mTitle->getFullURL("action=raw&oldid=".$this->mNewid); $special=$wgLang->getNsText(NS_SPECIAL); $control=<<setArticleFlag( false ); + if ( ! $this->loadRevisionData() ) { + $t = $this->mTitle->getPrefixedText() . " (Diff: {$this->mOldid}, {$this->mNewid})"; + $mtext = wfMsg( 'missingarticle', "$t" ); + $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) ); + $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(); + $this->renderNewRevision(); // should we respect $diffOnly here or not? wfProfileOut( $fname ); return; } - $t = $wgTitle->getPrefixedText() . " (Diff: {$this->mOldid}, " . - "{$this->mNewid})"; - $mtext = wfMsg( 'missingarticle', $t ); - - $wgOut->setArticleFlag( false ); - if ( ! $this->loadText() ) { - $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) ); - $wgOut->addHTML( $mtext ); - wfProfileOut( $fname ); - return; - } $wgOut->suppressQuickbar(); $oldTitle = $this->mOldPage->getPrefixedText(); @@ -131,7 +140,7 @@ CONTROL; $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(); @@ -141,63 +150,84 @@ CONTROL; } $sk = $wgUser->getSkin(); - $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->newRev->isCurrent() && $wgUser->isAllowed('rollback') ) { - $rollback = '   [' . $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'rollbacklink' ), - 'action=rollback&from=' . urlencode($this->mNewUser) . - '&token=' . urlencode( $wgUser->editToken( array( $wgTitle->getPrefixedText(), $this->mNewUser ) ) ) ) . - ']'; + + if ( $this->mNewRev->isCurrent() && $wgUser->isAllowed('rollback') ) { + $rollback = '   ' . $sk->generateRollback( $this->mNewRev ); } else { $rollback = ''; } - if ( $wgUseRCPatrol && $this->mRcidMarkPatrolled != 0 && $wgUser->isLoggedIn() && - ( $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, wfMsgHtml( 'previousdiff' ), + $prevlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'previousdiff' ), 'diff=prev&oldid='.$this->mOldid, '', '', 'id="differences-prevlink"' ); - if ( $this->newRev->isCurrent() ) { - $nextlink = ''; + if ( $this->mNewRev->isCurrent() ) { + $nextlink = ' '; } else { - $nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsgHtml( 'nextdiff' ), + $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; + $oldminor = ''; + $newminor = ''; + + if ($this->mOldRev->mMinorEdit == 1) { + $oldminor = wfElement( 'span', array( 'class' => 'minor' ), + wfMsg( 'minoreditletter') ) . ' '; + } + + if ($this->mNewRev->mMinorEdit == 1) { + $newminor = wfElement( 'span', array( 'class' => 'minor' ), + wfMsg( 'minoreditletter') ) . ' '; + } + + $oldHeader = "{$this->mOldtitle}
" . + $sk->revUserTools( $this->mOldRev ) . "
" . + $oldminor . $sk->revComment( $this->mOldRev, !$diffOnly ) . "
" . + $prevlink; + $newHeader = "{$this->mNewtitle}
" . + $sk->revUserTools( $this->mNewRev ) . " $rollback
" . + $newminor . $sk->revComment( $this->mNewRev, !$diffOnly ) . "
" . + $nextlink . $patrol; + + $this->showDiff( $oldHeader, $newHeader ); + + if ( !$diffOnly ) + $this->renderNewRevision(); + + wfProfileOut( $fname ); + } + + /** + * Show the new revision of the page. + */ + function renderNewRevision() { + global $wgOut; + $fname = 'DifferenceEngine::renderNewRevision'; + wfProfileIn( $fname ); - DifferenceEngine::showDiff( $this->mOldtext, $this->mNewtext, - $oldHeader, $newHeader ); $wgOut->addHTML( "

{$this->mPagetitle}

\n" ); + #add deleted rev tag if needed + if ( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) { + $wgOut->addWikiText( wfMsg( 'rev-deleted-text-permission' ) ); + } - if( !$this->newRev->isCurrent() ) { - $oldEditSectionSetting = $wgOut->mParserOptions->setEditSection( false ); + if( !$this->mNewRev->isCurrent() ) { + $oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false ); } - $wgOut->addWikiText( $this->mNewtext ); - if( !$this->newRev->isCurrent() ) { - $wgOut->mParserOptions->setEditSection( $oldEditSectionSetting ); + + $this->loadNewText(); + if( is_object( $this->mNewRev ) ) { + $wgOut->setRevisionId( $this->mNewRev->getId() ); + } + + $wgOut->addWikiTextTidy( $this->mNewtext ); + + if( !$this->mNewRev->isCurrent() ) { + $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting ); } wfProfileOut( $fname ); @@ -208,29 +238,29 @@ CONTROL; * contrast to normal "old revision" display style. */ function showFirstRevision() { - global $wgOut, $wgTitle, $wgUser, $wgLang; + 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 ); @@ -241,127 +271,391 @@ CONTROL; # $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, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' ); - $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' ); - - - # Show current revision - # - $wgOut->addHTML( "

{$this->mPagetitle}

\n" ); - $wgOut->addWikiText( $this->mNewtext ); + $wgOut->setRobotpolicy( 'noindex,nofollow' ); 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->addStyle( 'common/diff.css' ); + $wgOut->addHTML( $diff ); + return true; + } } - - function getDiff( $otext, $ntext, $otitle, $ntitle ) { - global $wgUseExternalDiffEngine, $wgContLang; - $out = " - - - - - - "; - $otext = $wgContLang->segmentForDiff($otext); - $ntext = $wgContLang->segmentForDiff($ntext); - $difftext=''; - if ( $wgUseExternalDiffEngine ) { + + /** + * 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 { + $multi = $this->getMultiNotice(); + return $this->addHeader( $body, $otitle, $ntitle, $multi ); + } + } + + /** + * Get the diff table body, without header + * Results are cached + * Returns false on error + */ + function getDiffBody() { + global $wgMemc; + $fname = 'DifferenceEngine::getDiffBody'; + wfProfileIn( $fname ); + + // Cacheable? + $key = false; + if ( $this->mOldid && $this->mNewid ) { + // Try cache + $key = wfMemcKey( 'diff', 'version', MW_DIFF_VERSION, '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; + } + } + + #loadtext is permission safe, this just clears out the diff + if ( !$this->loadText() ) { + wfProfileOut( $fname ); + 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 + 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 = str_replace( "\r\n", "\n", htmlspecialchars ( $otext ) ); - $ntext = str_replace( "\r\n", "\n", htmlspecialchars ( $ntext ) ); + $otext = htmlspecialchars ( $wgContLang->segmentForDiff( $otext ) ); + $ntext = htmlspecialchars ( $wgContLang->segmentForDiff( $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 ); + 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] ) ); + } + + + /** + * 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 ) { + $tmp = $oldid; $oldid = $newid; $newid = $tmp; + } + + $n = $this->mTitle->countRevisionsBetween( $oldid, $newid ); + if ( !$n ) + return ''; + + return wfMsgExt( 'diff-multi', array( 'parseinline' ), $n ); + } + + + /** + * Add the header to a diff body + */ + function addHeader( $diff, $otitle, $ntitle, $multi = '' ) { + global $wgOut; + + if ( $this->mOldRev && $this->mOldRev->isDeleted(Revision::DELETED_TEXT) ) { + $otitle = ''.$otitle.''; } - $difftext = $wgContLang->unsegmentForDiff($difftext); - $out .= $difftext."
{$otitle}{$ntitle}
\n"; - return $out; + if ( $this->mNewRev && $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) { + $ntitle = ''.$ntitle.''; + } + $header = " + + + + + + + + + + "; + + if ( $multi != '' ) + $header .= ""; + + return $header . $diff . "
{$otitle}{$ntitle}
{$multi}
"; + } + + /** + * Use specified text instead of loading from the database + */ + function setText( $oldText, $newText ) { + $this->mOldtext = $oldText; + $this->mNewtext = $newText; + $this->mTextLoaded = 2; } /** - * Load the text of the articles to compare. If newid is 0, then compare + * 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). - */ - function loadText() { - global $wgTitle, $wgOut, $wgLang; - $fname = 'DifferenceEngine::loadText'; + * + * 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( is_null( $this->newRev ) ) { + + if( is_null( $this->mNewRev ) ) { return false; } - - if( $this->newRev->isCurrent() ) { - $wgOut->setArticleFlag( true ); - $this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) ); - $this->mNewPage = $wgTitle; + + // 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' ) ) . ")"; + //now that we considered old rev, we can make undo link (bug 8133, multi-edit undo) + $newUndo = $this->mNewPage->escapeLocalUrl( 'action=edit&undoafter=' . $this->mOldid . '&undo=' . $this->mNewid); + $this->mNewtitle .= " (" . htmlspecialchars( wfMsg( 'editundo' ) ) . ")"; + } + + 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(); - $this->mOldid = $this->oldRev->getId(); + // Whether it succeeds or fails, we don't want to try again + $this->mTextLoaded = 2; } - if( is_null( $this->oldRev ) ) { + + if ( !$this->loadRevisionData() ) { return false; } - - $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->mOldRev ) { + // FIXME: permission tests + $this->mOldtext = $this->mOldRev->revText(); + if ( $this->mOldtext === false ) { + return false; + } + } + if ( $this->mNewRev ) { + $this->mNewtext = $this->mNewRev->revText(); + 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) @@ -374,9 +668,8 @@ define('USE_ASSERTS', function_exists('assert')); /** * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class _DiffOp { var $type; @@ -398,9 +691,8 @@ class _DiffOp { /** * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class _DiffOp_Copy extends _DiffOp { var $type = 'copy'; @@ -419,9 +711,8 @@ class _DiffOp_Copy extends _DiffOp { /** * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class _DiffOp_Delete extends _DiffOp { var $type = 'delete'; @@ -438,9 +729,8 @@ class _DiffOp_Delete extends _DiffOp { /** * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class _DiffOp_Add extends _DiffOp { var $type = 'add'; @@ -457,9 +747,8 @@ class _DiffOp_Add extends _DiffOp { /** * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class _DiffOp_Change extends _DiffOp { var $type = 'change'; @@ -495,16 +784,17 @@ class _DiffOp_Change extends _DiffOp { * Line length limits for robustness added by Tim Starling, 2005-08-31 * * @author Geoffrey T. Dairiki, Tim Starling - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class _DiffEngine { + const MAX_XREF_LENGTH = 10000; + function diff ($from_lines, $to_lines) { $fname = '_DiffEngine::diff'; wfProfileIn( $fname ); - + $n_from = sizeof($from_lines); $n_to = sizeof($to_lines); @@ -517,14 +807,14 @@ 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; } @@ -533,7 +823,7 @@ class _DiffEngine 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[$this->_line_hash($line)])) ) @@ -598,13 +888,13 @@ class _DiffEngine * 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 ) { + if ( strlen( $line ) > self::MAX_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 @@ -641,12 +931,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++) { @@ -654,7 +944,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]; @@ -669,7 +959,7 @@ class _DiffEngine $ymids[$k] = $ymids[$k-1]; break; } - while (list ($junk, $y) = each($matches)) { + while (list ( /* $junk */, $y) = each($matches)) { if ($y > $this->seq[$k-1]) { USE_ASSERTS && assert($y < $this->seq[$k]); // Optimization: this is a common case: @@ -686,7 +976,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++) { @@ -695,7 +985,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); } @@ -703,7 +993,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; @@ -720,9 +1010,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; @@ -744,7 +1034,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]) { @@ -806,11 +1096,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. @@ -825,30 +1115,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. @@ -864,14 +1154,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. @@ -884,7 +1174,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]) { @@ -894,7 +1184,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. @@ -915,9 +1205,8 @@ class _DiffEngine /** * Class representing a 'diff' between two sequences of strings. * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class Diff { @@ -1055,11 +1344,9 @@ class Diff } /** - * FIXME: bad name. - * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @todo document, bad name. + * @private + * @addtogroup DifferenceEngine */ class MappedDiff extends Diff { @@ -1090,7 +1377,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)); @@ -1121,9 +1408,8 @@ class MappedDiff extends Diff * It is intended that this class be customized via inheritance, * to obtain fancier outputs. * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class DiffFormatter { @@ -1288,9 +1574,8 @@ define('NBSP', ' '); // iso-8859-x non-breaking space. /** * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class _HWLDF_WordAccumulator { function _HWLDF_WordAccumulator () { @@ -1302,9 +1587,12 @@ class _HWLDF_WordAccumulator { function _flushGroup ($new_tag) { if ($this->_group !== '') { - if ($this->_tag == 'mark') - $this->_line .= '' . - htmlspecialchars ( $this->_group ) . ''; + if ($this->_tag == 'ins') + $this->_line .= '' . + htmlspecialchars ( $this->_group ) . ''; + elseif ($this->_tag == 'del') + $this->_line .= '' . + htmlspecialchars ( $this->_group ) . ''; else $this->_line .= htmlspecialchars ( $this->_group ); } @@ -1347,16 +1635,17 @@ class _HWLDF_WordAccumulator { /** * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class WordLevelDiff extends MappedDiff { + const MAX_LINE_LENGTH = 10000; + 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); @@ -1381,12 +1670,13 @@ class WordLevelDiff extends MappedDiff $words[] = "\n"; $stripped[] = "\n"; } - if ( strlen( $line ) > MAX_DIFF_LINE ) { + if ( strlen( $line ) > self::MAX_LINE_LENGTH ) { $words[] = $line; $stripped[] = $line; } else { + $m = array(); if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs', - $line, $m)) + $line, $m)) { $words = array_merge( $words, $m[0] ); $stripped = array_merge( $stripped, $m[1] ); @@ -1406,7 +1696,7 @@ class WordLevelDiff extends MappedDiff if ($edit->type == 'copy') $orig->addWords($edit->orig); elseif ($edit->orig) - $orig->addWords($edit->orig, 'mark'); + $orig->addWords($edit->orig, 'del'); } $lines = $orig->getLines(); wfProfileOut( $fname ); @@ -1422,7 +1712,7 @@ class WordLevelDiff extends MappedDiff if ($edit->type == 'copy') $closing->addWords($edit->closing); elseif ($edit->closing) - $closing->addWords($edit->closing, 'mark'); + $closing->addWords($edit->closing, 'ins'); } $lines = $closing->getLines(); wfProfileOut( $fname ); @@ -1433,9 +1723,8 @@ class WordLevelDiff extends MappedDiff /** * Wikipedia Table style diff formatter. * @todo document - * @access private - * @package MediaWiki - * @subpackage DifferenceEngine + * @private + * @addtogroup DifferenceEngine */ class TableDiffFormatter extends DiffFormatter { @@ -1445,16 +1734,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; } @@ -1466,17 +1751,25 @@ class TableDiffFormatter extends DiffFormatter # HTML-escape parameter before calling this function addedLine( $line ) { - return "+{$line}"; + return $this->wrapLine( '+', 'diff-addedline', $line ); } # HTML-escape parameter before calling this function deletedLine( $line ) { - return "-{$line}"; + return $this->wrapLine( '-', 'diff-deletedline', $line ); } # HTML-escape parameter before calling this function contextLine( $line ) { - return " {$line}"; + return $this->wrapLine( ' ', 'diff-context', $line ); + } + + private function wrapLine( $marker, $class, $line ) { + if( $line !== '' ) { + // The
wrapper is needed for 'overflow: auto' style to scroll properly + $line = "
$line
"; + } + return "$marker$line"; } function emptyLine() { @@ -1508,7 +1801,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();