+<?php\r
+/**\r
+ * @defgroup DifferenceEngine DifferenceEngine\r
+ */\r
+ \r
+/**\r
+ * Constant to indicate diff cache compatibility.\r
+ * Bump this when changing the diff formatting in a way that\r
+ * fixes important bugs or such to force cached diff views to\r
+ * clear.\r
+ */\r
+define( 'MW_DIFF_VERSION', '1.11a' );\r
+\r
+/**\r
+ * @todo document\r
+ * @ingroup DifferenceEngine\r
+ */\r
+class DifferenceEngine {\r
+ /**#@+\r
+ * @private\r
+ */\r
+ var $mOldid, $mNewid, $mTitle;\r
+ var $mOldtitle, $mNewtitle, $mPagetitle;\r
+ var $mOldtext, $mNewtext;\r
+ var $mOldPage, $mNewPage;\r
+ var $mRcidMarkPatrolled;\r
+ var $mOldRev, $mNewRev;\r
+ var $mRevisionsLoaded = false; // Have the revisions been loaded\r
+ var $mTextLoaded = 0; // How many text blobs have been loaded, 0, 1 or 2?\r
+ var $mCacheHit = false; // Was the diff fetched from cache?\r
+ var $htmldiff;\r
+\r
+ /**\r
+ * Set this to true to add debug info to the HTML output.\r
+ * Warning: this may cause RSS readers to spuriously mark articles as "new"\r
+ * (bug 20601)\r
+ */\r
+ var $enableDebugComment = false;\r
+\r
+ // If true, line X is not displayed when X is 1, for example to increase\r
+ // readability and conserve space with many small diffs.\r
+ protected $mReducedLineNumbers = false;\r
+\r
+ protected $unhide = false;\r
+ /**#@-*/\r
+\r
+ /**\r
+ * Constructor\r
+ * @param $titleObj Title object that the diff is associated with\r
+ * @param $old Integer: old ID we want to show and diff with.\r
+ * @param $new String: either 'prev' or 'next'.\r
+ * @param $rcid Integer: ??? FIXME (default 0)\r
+ * @param $refreshCache boolean If set, refreshes the diff cache\r
+ * @param $htmldiff boolean If set, output using HTMLDiff instead of raw wikicode diff\r
+ * @param $unhide boolean If set, allow viewing deleted revs\r
+ */\r
+ function __construct( $titleObj = null, $old = 0, $new = 0, $rcid = 0,\r
+ $refreshCache = false, $htmldiff = false, $unhide = false )\r
+ {\r
+ if ( $titleObj ) {\r
+ $this->mTitle = $titleObj;\r
+ } else {\r
+ global $wgTitle;\r
+ $this->mTitle = $wgTitle;\r
+ }\r
+ wfDebug("DifferenceEngine old '$old' new '$new' rcid '$rcid'\n");\r
+\r
+ if ( 'prev' === $new ) {\r
+ # Show diff between revision $old and the previous one.\r
+ # Get previous one from DB.\r
+ $this->mNewid = intval($old);\r
+ $this->mOldid = $this->mTitle->getPreviousRevisionID( $this->mNewid );\r
+ } elseif ( 'next' === $new ) {\r
+ # Show diff between revision $old and the next one.\r
+ # Get next one from DB.\r
+ $this->mOldid = intval($old);\r
+ $this->mNewid = $this->mTitle->getNextRevisionID( $this->mOldid );\r
+ if ( false === $this->mNewid ) {\r
+ # if no result, NewId points to the newest old revision. The only newer\r
+ # revision is cur, which is "0".\r
+ $this->mNewid = 0;\r
+ }\r
+ } else {\r
+ $this->mOldid = intval($old);\r
+ $this->mNewid = intval($new);\r
+ wfRunHooks( 'NewDifferenceEngine', array(&$titleObj, &$this->mOldid, &$this->mNewid, $old, $new) ); \r
+ }\r
+ $this->mRcidMarkPatrolled = intval($rcid); # force it to be an integer\r
+ $this->mRefreshCache = $refreshCache;\r
+ $this->htmldiff = $htmldiff;\r
+ $this->unhide = $unhide;\r
+ }\r
+\r
+ function setReducedLineNumbers( $value = true ) {\r
+ $this->mReducedLineNumbers = $value;\r
+ }\r
+\r
+ function getTitle() {\r
+ return $this->mTitle;\r
+ }\r
+ \r
+ function wasCacheHit() {\r
+ return $this->mCacheHit;\r
+ }\r
+ \r
+ function getOldid() {\r
+ return $this->mOldid;\r
+ }\r
+ \r
+ function getNewid() {\r
+ return $this->mNewid;\r
+ }\r
+\r
+ function showDiffPage( $diffOnly = false ) {\r
+ global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol, $wgEnableHtmlDiff;\r
+ wfProfileIn( __METHOD__ );\r
+\r
+\r
+ # If external diffs are enabled both globally and for the user,\r
+ # we'll use the application/x-external-editor interface to call\r
+ # an external diff tool like kompare, kdiff3, etc.\r
+ if($wgUseExternalEditor && $wgUser->getOption('externaldiff')) {\r
+ global $wgInputEncoding,$wgServer,$wgScript,$wgLang;\r
+ $wgOut->disable();\r
+ header ( "Content-type: application/x-external-editor; charset=".$wgInputEncoding );\r
+ $url1=$this->mTitle->getFullURL( array(\r
+ 'action' => 'raw',\r
+ 'oldid' => $this->mOldid\r
+ ) );\r
+ $url2=$this->mTitle->getFullURL( array(\r
+ 'action' => 'raw',\r
+ 'oldid' => $this->mNewid\r
+ ) );\r
+ $special=$wgLang->getNsText(NS_SPECIAL);\r
+ $control=<<<CONTROL\r
+ [Process]\r
+ Type=Diff text\r
+ Engine=MediaWiki\r
+ Script={$wgServer}{$wgScript}\r
+ Special namespace={$special}\r
+\r
+ [File]\r
+ Extension=wiki\r
+ URL=$url1\r
+\r
+ [File 2]\r
+ Extension=wiki\r
+ URL=$url2\r
+CONTROL;\r
+ echo($control);\r
+ return;\r
+ }\r
+\r
+ $wgOut->setArticleFlag( false );\r
+ if ( !$this->loadRevisionData() ) {\r
+ $t = $this->mTitle->getPrefixedText();\r
+ $d = wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );\r
+ $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );\r
+ $wgOut->addWikiMsg( 'missing-article', "<nowiki>$t</nowiki>", $d );\r
+ wfProfileOut( __METHOD__ );\r
+ return;\r
+ }\r
+\r
+ wfRunHooks( 'DiffViewHeader', array( $this, $this->mOldRev, $this->mNewRev ) );\r
+\r
+ if ( $this->mNewRev->isCurrent() ) {\r
+ $wgOut->setArticleFlag( true );\r
+ }\r
+\r
+ # mOldid is false if the difference engine is called with a "vague" query for\r
+ # a diff between a version V and its previous version V' AND the version V\r
+ # is the first version of that article. In that case, V' does not exist.\r
+ if ( $this->mOldid === false ) {\r
+ $this->showFirstRevision();\r
+ $this->renderNewRevision(); // should we respect $diffOnly here or not?\r
+ wfProfileOut( __METHOD__ );\r
+ return;\r
+ }\r
+\r
+ $wgOut->suppressQuickbar();\r
+\r
+ $oldTitle = $this->mOldPage->getPrefixedText();\r
+ $newTitle = $this->mNewPage->getPrefixedText();\r
+ if( $oldTitle == $newTitle ) {\r
+ $wgOut->setPageTitle( $newTitle );\r
+ } else {\r
+ $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle );\r
+ }\r
+ $wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) );\r
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );\r
+\r
+ if ( !$this->mOldPage->userCanRead() || !$this->mNewPage->userCanRead() ) {\r
+ $wgOut->loginToUse();\r
+ $wgOut->output();\r
+ $wgOut->disable();\r
+ wfProfileOut( __METHOD__ );\r
+ return;\r
+ }\r
+\r
+ $sk = $wgUser->getSkin();\r
+\r
+ // Check if page is editable\r
+ $editable = $this->mNewRev->getTitle()->userCan( 'edit' );\r
+ if ( $editable && $this->mNewRev->isCurrent() && $wgUser->isAllowed( 'rollback' ) ) {\r
+ $rollback = ' ' . $sk->generateRollback( $this->mNewRev );\r
+ } else {\r
+ $rollback = '';\r
+ }\r
+\r
+ // Prepare a change patrol link, if applicable\r
+ if( $wgUseRCPatrol && $this->mTitle->userCan('patrol') ) {\r
+ // If we've been given an explicit change identifier, use it; saves time\r
+ if( $this->mRcidMarkPatrolled ) {\r
+ $rcid = $this->mRcidMarkPatrolled;\r
+ $rc = RecentChange::newFromId( $rcid );\r
+ // Already patrolled?\r
+ $rcid = is_object($rc) && !$rc->getAttribute('rc_patrolled') ? $rcid : 0;\r
+ } else {\r
+ // Look for an unpatrolled change corresponding to this diff\r
+ $db = wfGetDB( DB_SLAVE );\r
+ $change = RecentChange::newFromConds(\r
+ array(\r
+ // Redundant user,timestamp condition so we can use the existing index\r
+ 'rc_user_text' => $this->mNewRev->getRawUserText(),\r
+ 'rc_timestamp' => $db->timestamp( $this->mNewRev->getTimestamp() ),\r
+ 'rc_this_oldid' => $this->mNewid,\r
+ 'rc_last_oldid' => $this->mOldid,\r
+ 'rc_patrolled' => 0\r
+ ),\r
+ __METHOD__\r
+ );\r
+ if( $change instanceof RecentChange ) {\r
+ $rcid = $change->mAttribs['rc_id'];\r
+ $this->mRcidMarkPatrolled = $rcid;\r
+ } else {\r
+ // None found\r
+ $rcid = 0;\r
+ }\r
+ }\r
+ // Build the link\r
+ if( $rcid ) {\r
+ $patrol = ' <span class="patrollink">[' . $sk->link(\r
+ $this->mTitle, \r
+ wfMsgHtml( 'markaspatrolleddiff' ),\r
+ array(),\r
+ array(\r
+ 'action' => 'markpatrolled',\r
+ 'rcid' => $rcid\r
+ ),\r
+ array(\r
+ 'known',\r
+ 'noclasses'\r
+ )\r
+ ) . ']</span>';\r
+ } else {\r
+ $patrol = '';\r
+ }\r
+ } else {\r
+ $patrol = '';\r
+ }\r
+\r
+ # Carry over 'diffonly' param via navigation links\r
+ if( $diffOnly != $wgUser->getBoolOption('diffonly') ) {\r
+ $query['diffonly'] = $diffOnly;\r
+ }\r
+\r
+ $htmldiffarg = $this->htmlDiffArgument();\r
+\r
+ if( $htmldiffarg ) {\r
+ $query['htmldiff'] = $htmldiffarg['htmldiff'];\r
+ }\r
+\r
+ # Make "previous revision link"\r
+ $query['diff'] = 'prev';\r
+ $query['oldid'] = $this->mOldid;\r
+\r
+ $prevlink = $sk->link(\r
+ $this->mTitle,\r
+ wfMsgHtml( 'previousdiff' ),\r
+ array(\r
+ 'id' => 'differences-prevlink'\r
+ ),\r
+ $query,\r
+ array(\r
+ 'known',\r
+ 'noclasses'\r
+ )\r
+ );\r
+ # Make "next revision link"\r
+ $query['diff'] = 'next';\r
+ $query['oldid'] = $this->mNewid;\r
+\r
+ if( $this->mNewRev->isCurrent() ) {\r
+ $nextlink = ' ';\r
+ } else {\r
+ $nextlink = $sk->link(\r
+ $this->mTitle,\r
+ wfMsgHtml( 'nextdiff' ),\r
+ array(\r
+ 'id' => 'differences-nextlink'\r
+ ),\r
+ $query,\r
+ array(\r
+ 'known',\r
+ 'noclasses'\r
+ )\r
+ );\r
+ }\r
+\r
+ $oldminor = '';\r
+ $newminor = '';\r
+\r
+ if( $this->mOldRev->isMinor() ) {\r
+ $oldminor = ChangesList::flag( 'minor' );\r
+ }\r
+ if( $this->mNewRev->isMinor() ) {\r
+ $newminor = ChangesList::flag( 'minor' );\r
+ }\r
+\r
+ $rdel = ''; $ldel = '';\r
+ if( $wgUser->isAllowed( 'deletedrevision' ) ) {\r
+ // Don't show useless link to people who cannot hide revisions\r
+ if( $this->mOldRev->getVisibility() || $wgUser->isAllowed( 'deleterevision' ) ) {\r
+ if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) {\r
+ // If revision was hidden from sysops\r
+ $ldel = Xml::tags( 'span', array( 'class' => 'mw-revdelundel-link' ),\r
+ '(' . wfMsgHtml( 'rev-delundel' ) . ')' );\r
+ } else {\r
+ $query = array( \r
+ 'type' => 'revision',\r
+ 'target' => $this->mOldRev->mTitle->getPrefixedDbkey(),\r
+ 'ids' => $this->mOldRev->getId()\r
+ );\r
+ $ldel = $sk->revDeleteLink( $query, $this->mOldRev->isDeleted( Revision::DELETED_RESTRICTED ) );\r
+ }\r
+ $ldel = " $ldel ";\r
+ }\r
+ // Don't show useless link to people who cannot hide revisions\r
+ if( $this->mNewRev->getVisibility() || $wgUser->isAllowed( 'deleterevision' ) ) {\r
+ if( !$this->mNewRev->userCan( Revision::DELETED_RESTRICTED ) ) {\r
+ // If revision was hidden from sysops\r
+ $rdel = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.wfMsgHtml( 'rev-delundel' ).')' );\r
+ } else {\r
+ $query = array( \r
+ 'type' => 'revision',\r
+ 'target' => $this->mNewRev->mTitle->getPrefixedDbkey(),\r
+ 'ids' => $this->mNewRev->getId()\r
+ );\r
+ $rdel = $sk->revDeleteLink( $query, $this->mNewRev->isDeleted( Revision::DELETED_RESTRICTED ) );\r
+ }\r
+ $rdel = " $rdel ";\r
+ }\r
+ }\r
+\r
+ $oldHeader = '<div id="mw-diff-otitle1"><strong>'.$this->mOldtitle.'</strong></div>' .\r
+ '<div id="mw-diff-otitle2">' . $sk->revUserTools( $this->mOldRev, !$this->unhide ) . "</div>" .\r
+ '<div id="mw-diff-otitle3">' . $oldminor . $sk->revComment( $this->mOldRev, !$diffOnly, !$this->unhide ).$ldel."</div>" .\r
+ '<div id="mw-diff-otitle4">' . $prevlink .'</div>';\r
+ $newHeader = '<div id="mw-diff-ntitle1"><strong>'.$this->mNewtitle.'</strong></div>' .\r
+ '<div id="mw-diff-ntitle2">' . $sk->revUserTools( $this->mNewRev, !$this->unhide ) . " $rollback</div>" .\r
+ '<div id="mw-diff-ntitle3">' . $newminor . $sk->revComment( $this->mNewRev, !$diffOnly, !$this->unhide ).$rdel."</div>" .\r
+ '<div id="mw-diff-ntitle4">' . $nextlink . $patrol . '</div>';\r
+\r
+ # Check if this user can see the revisions\r
+ $allowed = $this->mOldRev->userCan(Revision::DELETED_TEXT)\r
+ && $this->mNewRev->userCan(Revision::DELETED_TEXT);\r
+ $deleted = $this->mOldRev->isDeleted(Revision::DELETED_TEXT)\r
+ || $this->mNewRev->isDeleted(Revision::DELETED_TEXT);\r
+ # Output the diff if allowed...\r
+ if( $deleted && (!$this->unhide || !$allowed) ) {\r
+ $this->showDiffStyle();\r
+ $multi = $this->getMultiNotice();\r
+ $wgOut->addHTML( $this->addHeader( '', $oldHeader, $newHeader, $multi ) );\r
+ if( !$allowed ) {\r
+ # Give explanation for why revision is not visible\r
+ $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n",\r
+ array( 'rev-deleted-no-diff' ) );\r
+ } else {\r
+ # Give explanation and add a link to view the diff...\r
+ $link = $this->mTitle->getFullUrl( array(\r
+ 'diff' => $this->mNewid,\r
+ 'oldid' => $this->mOldid,\r
+ 'unhide' => 1\r
+ ) );\r
+ $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n",\r
+ array( 'rev-deleted-unhide-diff', $link ) );\r
+ }\r
+ } else if( $wgEnableHtmlDiff && $this->htmldiff ) {\r
+ $multi = $this->getMultiNotice();\r
+ $wgOut->addHTML( '<div class="diff-switchtype">' . $sk->link(\r
+ $this->mTitle,\r
+ wfMsgHtml( 'wikicodecomparison' ),\r
+ array(\r
+ 'id' => 'differences-switchtype'\r
+ ),\r
+ array(\r
+ 'diff' => $this->mNewid,\r
+ 'oldid' => $this->mOldid,\r
+ 'htmldiff' => 0\r
+ ),\r
+ array(\r
+ 'known',\r
+ 'noclasses'\r
+ )\r
+ ) . '</div>');\r
+ $wgOut->addHTML( $this->addHeader( '', $oldHeader, $newHeader, $multi ) );\r
+ $this->renderHtmlDiff();\r
+ } else {\r
+ if( $wgEnableHtmlDiff ) {\r
+ $wgOut->addHTML( '<div class="diff-switchtype">' . $sk->link(\r
+ $this->mTitle,\r
+ wfMsgHtml( 'visualcomparison' ),\r
+ array(\r
+ 'id' => 'differences-switchtype'\r
+ ),\r
+ array(\r
+ 'diff' => $this->mNewid,\r
+ 'oldid' => $this->mOldid,\r
+ 'htmldiff' => 1\r
+ ),\r
+ array(\r
+ 'known',\r
+ 'noclasses'\r
+ )\r
+ ) . '</div>');\r
+ }\r
+ $this->showDiff( $oldHeader, $newHeader );\r
+ if( !$diffOnly ) {\r
+ $this->renderNewRevision();\r
+ }\r
+ }\r
+ wfProfileOut( __METHOD__ );\r
+ }\r
+\r
+ /**\r
+ * Show the new revision of the page.\r
+ */\r
+ function renderNewRevision() {\r
+ global $wgOut, $wgUser;\r
+ wfProfileIn( __METHOD__ );\r
+\r
+ $wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );\r
+ # Add deleted rev tag if needed\r
+ if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {\r
+ $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-permission' );\r
+ } else if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {\r
+ $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-view' );\r
+ }\r
+\r
+ if( !$this->mNewRev->isCurrent() ) {\r
+ $oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false );\r
+ }\r
+\r
+ $this->loadNewText();\r
+ if( is_object( $this->mNewRev ) ) {\r
+ $wgOut->setRevisionId( $this->mNewRev->getId() );\r
+ }\r
+\r
+ if( $this->mTitle->isCssJsSubpage() || $this->mTitle->isCssOrJsPage() ) {\r
+ // Stolen from Article::view --AG 2007-10-11\r
+ // Give hooks a chance to customise the output\r
+ if( wfRunHooks( 'ShowRawCssJs', array( $this->mNewtext, $this->mTitle, $wgOut ) ) ) {\r
+ // Wrap the whole lot in a <pre> and don't parse\r
+ $m = array();\r
+ preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m );\r
+ $wgOut->addHTML( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );\r
+ $wgOut->addHTML( htmlspecialchars( $this->mNewtext ) );\r
+ $wgOut->addHTML( "\n</pre>\n" );\r
+ }\r
+ } else {\r
+ $wgOut->addWikiTextTidy( $this->mNewtext );\r
+ }\r
+\r
+ if( is_object( $this->mNewRev ) && !$this->mNewRev->isCurrent() ) {\r
+ $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );\r
+ }\r
+ # Add redundant patrol link on bottom...\r
+ if( $this->mRcidMarkPatrolled && $this->mTitle->quickUserCan('patrol') ) {\r
+ $sk = $wgUser->getSkin();\r
+ $wgOut->addHTML(\r
+ "<div class='patrollink'>[" . $sk->link(\r
+ $this->mTitle,\r
+ wfMsgHtml( 'markaspatrolleddiff' ),\r
+ array(),\r
+ array(\r
+ 'action' => 'markpatrolled',\r
+ 'rcid' => $this->mRcidMarkPatrolled\r
+ )\r
+ ) . ']</div>'\r
+ );\r
+ }\r
+\r
+ wfProfileOut( __METHOD__ );\r
+ }\r
+\r
+\r
+ function renderHtmlDiff() {\r
+ global $wgOut, $wgParser, $wgDebugComments;\r
+ wfProfileIn( __METHOD__ );\r
+\r
+ $this->showDiffStyle();\r
+\r
+ $wgOut->addHTML( '<h2>'.wfMsgHtml( 'visual-comparison' )."</h2>\n" );\r
+ #add deleted rev tag if needed\r
+ if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {\r
+ $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-permission' );\r
+ } else if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {\r
+ $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-view' );\r
+ }\r
+\r
+ if( !$this->mNewRev->isCurrent() ) {\r
+ $oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false );\r
+ }\r
+\r
+ $this->loadText();\r
+\r
+ // Old revision\r
+ if( is_object( $this->mOldRev ) ) {\r
+ $wgOut->setRevisionId( $this->mOldRev->getId() );\r
+ }\r
+\r
+ $popts = $wgOut->parserOptions();\r
+ $oldTidy = $popts->setTidy( true );\r
+ $popts->setEditSection( false );\r
+\r
+ $parserOutput = $wgParser->parse( $this->mOldtext, $this->getTitle(), $popts, true, true, $wgOut->getRevisionId() );\r
+ $popts->setTidy( $oldTidy );\r
+\r
+ //only for new?\r
+ //$wgOut->addParserOutputNoText( $parserOutput );\r
+ $oldHtml = $parserOutput->getText();\r
+ wfRunHooks( 'OutputPageBeforeHTML', array( &$wgOut, &$oldHtml ) );\r
+\r
+ // New revision\r
+ if( is_object( $this->mNewRev ) ) {\r
+ $wgOut->setRevisionId( $this->mNewRev->getId() );\r
+ }\r
+\r
+ $popts = $wgOut->parserOptions();\r
+ $oldTidy = $popts->setTidy( true );\r
+\r
+ $parserOutput = $wgParser->parse( $this->mNewtext, $this->getTitle(), $popts, true, true, $wgOut->getRevisionId() );\r
+ $popts->setTidy( $oldTidy );\r
+\r
+ $wgOut->addParserOutputNoText( $parserOutput );\r
+ $newHtml = $parserOutput->getText();\r
+ wfRunHooks( 'OutputPageBeforeHTML', array( &$wgOut, &$newHtml ) );\r
+\r
+ unset($parserOutput, $popts);\r
+\r
+ $differ = new HTMLDiffer(new DelegatingContentHandler($wgOut));\r
+ $differ->htmlDiff($oldHtml, $newHtml);\r
+ if ( $wgDebugComments ) {\r
+ $wgOut->addHTML( "\n<!-- HtmlDiff Debug Output:\n" . HTMLDiffer::getDebugOutput() . " End Debug -->" );\r
+ }\r
+\r
+ wfProfileOut( __METHOD__ );\r
+ }\r
+\r
+ /**\r
+ * Show the first revision of an article. Uses normal diff headers in\r
+ * contrast to normal "old revision" display style.\r
+ */\r
+ function showFirstRevision() {\r
+ global $wgOut, $wgUser;\r
+ wfProfileIn( __METHOD__ );\r
+\r
+ # Get article text from the DB\r
+ #\r
+ if ( ! $this->loadNewText() ) {\r
+ $t = $this->mTitle->getPrefixedText();\r
+ $d = wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );\r
+ $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );\r
+ $wgOut->addWikiMsg( 'missing-article', "<nowiki>$t</nowiki>", $d );\r
+ wfProfileOut( __METHOD__ );\r
+ return;\r
+ }\r
+ if ( $this->mNewRev->isCurrent() ) {\r
+ $wgOut->setArticleFlag( true );\r
+ }\r
+\r
+ # Check if user is allowed to look at this page. If not, bail out.\r
+ #\r
+ if ( !$this->mTitle->userCanRead() ) {\r
+ $wgOut->loginToUse();\r
+ $wgOut->output();\r
+ wfProfileOut( __METHOD__ );\r
+ throw new MWException("Permission Error: you do not have access to view this page");\r
+ }\r
+\r
+ # Prepare the header box\r
+ #\r
+ $sk = $wgUser->getSkin();\r
+\r
+ $next = $this->mTitle->getNextRevisionID( $this->mNewid );\r
+ if( !$next ) {\r
+ $nextlink = '';\r
+ } else {\r
+ $nextlink = '<br/>' . $sk->link(\r
+ $this->mTitle,\r
+ wfMsgHtml( 'nextdiff' ),\r
+ array(\r
+ 'id' => 'differences-nextlink'\r
+ ),\r
+ array(\r
+ 'diff' => 'next',\r
+ 'oldid' => $this->mNewid,\r
+ $this->htmlDiffArgument()\r
+ ),\r
+ array(\r
+ 'known',\r
+ 'noclasses'\r
+ )\r
+ );\r
+ }\r
+ $header = "<div class=\"firstrevisionheader\" style=\"text-align: center\">" .\r
+ $sk->revUserTools( $this->mNewRev ) . "<br/>" . $sk->revComment( $this->mNewRev ) . $nextlink . "</div>\n";\r
+\r
+ $wgOut->addHTML( $header );\r
+\r
+ $wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) );\r
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );\r
+\r
+ wfProfileOut( __METHOD__ );\r
+ }\r
+\r
+ function htmlDiffArgument(){\r
+ global $wgEnableHtmlDiff;\r
+ if($wgEnableHtmlDiff){\r
+ if($this->htmldiff){\r
+ return array( 'htmldiff' => 1 );\r
+ }else{\r
+ return array( 'htmldiff' => 0 );\r
+ }\r
+ }else{\r
+ return array();\r
+ }\r
+ }\r
+\r
+ /**\r
+ * Get the diff text, send it to $wgOut\r
+ * Returns false if the diff could not be generated, otherwise returns true\r
+ */\r
+ function showDiff( $otitle, $ntitle ) {\r
+ global $wgOut;\r
+ $diff = $this->getDiff( $otitle, $ntitle );\r
+ if ( $diff === false ) {\r
+ $wgOut->addWikiMsg( 'missing-article', "<nowiki>(fixme, bug)</nowiki>", '' );\r
+ return false;\r
+ } else {\r
+ $this->showDiffStyle();\r
+ $wgOut->addHTML( $diff );\r
+ return true;\r
+ }\r
+ }\r
+\r
+ /**\r
+ * Add style sheets and supporting JS for diff display.\r
+ */\r
+ function showDiffStyle() {\r
+ global $wgStylePath, $wgStyleVersion, $wgOut;\r
+ $wgOut->addStyle( 'common/diff.css' );\r
+\r
+ // JS is needed to detect old versions of Mozilla to work around an annoyance bug.\r
+ $wgOut->addScript( "<script type=\"text/javascript\" src=\"$wgStylePath/common/diff.js?$wgStyleVersion\"></script>" );\r
+ }\r
+\r
+ /**\r
+ * Get complete diff table, including header\r
+ *\r
+ * @param Title $otitle Old title\r
+ * @param Title $ntitle New title\r
+ * @return mixed\r
+ */\r
+ function getDiff( $otitle, $ntitle ) {\r
+ $body = $this->getDiffBody();\r
+ if ( $body === false ) {\r
+ return false;\r
+ } else {\r
+ $multi = $this->getMultiNotice();\r
+ return $this->addHeader( $body, $otitle, $ntitle, $multi );\r
+ }\r
+ }\r
+\r
+ /**\r
+ * Get the diff table body, without header\r
+ *\r
+ * @return mixed\r
+ */\r
+ function getDiffBody() {\r
+ global $wgMemc;\r
+ wfProfileIn( __METHOD__ );\r
+ $this->mCacheHit = true;\r
+ // Check if the diff should be hidden from this user\r
+ if ( !$this->loadRevisionData() )\r
+ return '';\r
+ if ( $this->mOldRev && !$this->mOldRev->userCan(Revision::DELETED_TEXT) ) {\r
+ return '';\r
+ } else if ( $this->mNewRev && !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {\r
+ return '';\r
+ } else if ( $this->mOldRev && $this->mNewRev && $this->mOldRev->getID() == $this->mNewRev->getID() ) {\r
+ return '';\r
+ }\r
+ // Cacheable?\r
+ $key = false;\r
+ if ( $this->mOldid && $this->mNewid ) {\r
+ $key = wfMemcKey( 'diff', 'version', MW_DIFF_VERSION, 'oldid', $this->mOldid, 'newid', $this->mNewid );\r
+ // Try cache\r
+ if ( !$this->mRefreshCache ) {\r
+ $difftext = $wgMemc->get( $key );\r
+ if ( $difftext ) {\r
+ wfIncrStats( 'diff_cache_hit' );\r
+ $difftext = $this->localiseLineNumbers( $difftext );\r
+ $difftext .= "\n<!-- diff cache key $key -->\n";\r
+ wfProfileOut( __METHOD__ );\r
+ return $difftext;\r
+ }\r
+ } // don't try to load but save the result\r
+ }\r
+ $this->mCacheHit = false;\r
+\r
+ // Loadtext is permission safe, this just clears out the diff\r
+ if ( !$this->loadText() ) {\r
+ wfProfileOut( __METHOD__ );\r
+ return false;\r
+ }\r
+\r
+ $difftext = $this->generateDiffBody( $this->mOldtext, $this->mNewtext );\r
+\r
+ // Save to cache for 7 days\r
+ if ( !wfRunHooks( 'AbortDiffCache', array( &$this ) ) ) {\r
+ wfIncrStats( 'diff_uncacheable' );\r
+ } else if ( $key !== false && $difftext !== false ) {\r
+ wfIncrStats( 'diff_cache_miss' );\r
+ $wgMemc->set( $key, $difftext, 7*86400 );\r
+ } else {\r
+ wfIncrStats( 'diff_uncacheable' );\r
+ }\r
+ // Replace line numbers with the text in the user's language\r
+ if ( $difftext !== false ) {\r
+ $difftext = $this->localiseLineNumbers( $difftext );\r
+ }\r
+ wfProfileOut( __METHOD__ );\r
+ return $difftext;\r
+ }\r
+\r
+ /**\r
+ * Make sure the proper modules are loaded before we try to\r
+ * make the diff\r
+ */\r
+ private function initDiffEngines() {\r
+ global $wgExternalDiffEngine;\r
+ if ( $wgExternalDiffEngine == 'wikidiff' && !function_exists( 'wikidiff_do_diff' ) ) {\r
+ wfProfileIn( __METHOD__ . '-php_wikidiff.so' );\r
+ wfSuppressWarnings();\r
+ dl( 'php_wikidiff.so' );\r
+ wfRestoreWarnings();\r
+ wfProfileOut( __METHOD__ . '-php_wikidiff.so' );\r
+ }\r
+ else if ( $wgExternalDiffEngine == 'wikidiff2' && !function_exists( 'wikidiff2_do_diff' ) ) {\r
+ wfProfileIn( __METHOD__ . '-php_wikidiff2.so' );\r
+ wfSuppressWarnings();\r
+ dl( 'php_wikidiff2.so' );\r
+ wfRestoreWarnings();\r
+ wfProfileOut( __METHOD__ . '-php_wikidiff2.so' );\r
+ }\r
+ }\r
+\r
+ /**\r
+ * Generate a diff, no caching\r
+ * $otext and $ntext must be already segmented\r
+ */\r
+ function generateDiffBody( $otext, $ntext ) {\r
+ global $wgExternalDiffEngine, $wgContLang;\r
+\r
+ $otext = str_replace( "\r\n", "\n", $otext );\r
+ $ntext = str_replace( "\r\n", "\n", $ntext );\r
+\r
+ $this->initDiffEngines();\r
+\r
+ if ( $wgExternalDiffEngine == 'wikidiff' && function_exists( 'wikidiff_do_diff' ) ) {\r
+ # For historical reasons, external diff engine expects\r
+ # input text to be HTML-escaped already\r
+ $otext = htmlspecialchars ( $wgContLang->segmentForDiff( $otext ) );\r
+ $ntext = htmlspecialchars ( $wgContLang->segmentForDiff( $ntext ) );\r
+ return $wgContLang->unsegementForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) ) .\r
+ $this->debug( 'wikidiff1' );\r
+ }\r
+\r
+ if ( $wgExternalDiffEngine == 'wikidiff2' && function_exists( 'wikidiff2_do_diff' ) ) {\r
+ # Better external diff engine, the 2 may some day be dropped\r
+ # This one does the escaping and segmenting itself\r
+ wfProfileIn( 'wikidiff2_do_diff' );\r
+ $text = wikidiff2_do_diff( $otext, $ntext, 2 );\r
+ $text .= $this->debug( 'wikidiff2' );\r
+ wfProfileOut( 'wikidiff2_do_diff' );\r
+ return $text;\r
+ }\r
+ if ( $wgExternalDiffEngine != 'wikidiff3' && $wgExternalDiffEngine !== false ) {\r
+ # Diff via the shell\r
+ global $wgTmpDirectory;\r
+ $tempName1 = tempnam( $wgTmpDirectory, 'diff_' );\r
+ $tempName2 = tempnam( $wgTmpDirectory, 'diff_' );\r
+\r
+ $tempFile1 = fopen( $tempName1, "w" );\r
+ if ( !$tempFile1 ) {\r
+ wfProfileOut( __METHOD__ );\r
+ return false;\r
+ }\r
+ $tempFile2 = fopen( $tempName2, "w" );\r
+ if ( !$tempFile2 ) {\r
+ wfProfileOut( __METHOD__ );\r
+ return false;\r
+ }\r
+ fwrite( $tempFile1, $otext );\r
+ fwrite( $tempFile2, $ntext );\r
+ fclose( $tempFile1 );\r
+ fclose( $tempFile2 );\r
+ $cmd = wfEscapeShellArg( $wgExternalDiffEngine, $tempName1, $tempName2 );\r
+ wfProfileIn( __METHOD__ . "-shellexec" );\r
+ $difftext = wfShellExec( $cmd );\r
+ $difftext .= $this->debug( "external $wgExternalDiffEngine" );\r
+ wfProfileOut( __METHOD__ . "-shellexec" );\r
+ unlink( $tempName1 );\r
+ unlink( $tempName2 );\r
+ return $difftext;\r
+ }\r
+\r
+ # Native PHP diff\r
+ $ota = explode( "\n", $wgContLang->segmentForDiff( $otext ) );\r
+ $nta = explode( "\n", $wgContLang->segmentForDiff( $ntext ) );\r
+ $diffs = new Diff( $ota, $nta );\r
+ $formatter = new TableDiffFormatter();\r
+ return $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) ) .\r
+ $this->debug();\r
+ }\r
+\r
+ /**\r
+ * Generate a debug comment indicating diff generating time,\r
+ * server node, and generator backend.\r
+ */\r
+ protected function debug( $generator="internal" ) {\r
+ global $wgShowHostnames;\r
+ if ( !$this->enableDebugComment ) {\r
+ return '';\r
+ }\r
+ $data = array( $generator );\r
+ if( $wgShowHostnames ) {\r
+ $data[] = wfHostname();\r
+ }\r
+ $data[] = wfTimestamp( TS_DB );\r
+ return "<!-- diff generator: " .\r
+ implode( " ",\r
+ array_map(\r
+ "htmlspecialchars",\r
+ $data ) ) .\r
+ " -->\n";\r
+ }\r
+\r
+ /**\r
+ * Replace line numbers with the text in the user's language\r
+ */\r
+ function localiseLineNumbers( $text ) {\r
+ return preg_replace_callback( '/<!--LINE (\d+)-->/',\r
+ array( &$this, 'localiseLineNumbersCb' ), $text );\r
+ }\r
+\r
+ function localiseLineNumbersCb( $matches ) {\r
+ global $wgLang;\r
+ if ( $matches[1] === '1' && $this->mReducedLineNumbers ) return '';\r
+ return wfMsgExt( 'lineno', 'escape', $wgLang->formatNum( $matches[1] ) );\r
+ }\r
+\r
+\r
+ /**\r
+ * If there are revisions between the ones being compared, return a note saying so.\r
+ */\r
+ function getMultiNotice() {\r
+ if ( !is_object($this->mOldRev) || !is_object($this->mNewRev) )\r
+ return '';\r
+\r
+ if( !$this->mOldPage->equals( $this->mNewPage ) ) {\r
+ // Comparing two different pages? Count would be meaningless.\r
+ return '';\r
+ }\r
+\r
+ $oldid = $this->mOldRev->getId();\r
+ $newid = $this->mNewRev->getId();\r
+ if ( $oldid > $newid ) {\r
+ $tmp = $oldid; $oldid = $newid; $newid = $tmp;\r
+ }\r
+\r
+ $n = $this->mTitle->countRevisionsBetween( $oldid, $newid );\r
+ if ( !$n )\r
+ return '';\r
+\r
+ return wfMsgExt( 'diff-multi', array( 'parseinline' ), $n );\r
+ }\r
+\r
+\r
+ /**\r
+ * Add the header to a diff body\r
+ */\r
+ static function addHeader( $diff, $otitle, $ntitle, $multi = '' ) {\r
+ $colspan = 1;\r
+ $header = "<table class='diff'>";\r
+ if( $diff ) { // Safari/Chrome show broken output if cols not used\r
+ $header .= "\r
+ <col class='diff-marker' />\r
+ <col class='diff-content' />\r
+ <col class='diff-marker' />\r
+ <col class='diff-content' />";\r
+ $colspan = 2;\r
+ }\r
+ $header .= "\r
+ <tr valign='top'>\r
+ <td colspan='$colspan' class='diff-otitle'>{$otitle}</td>\r
+ <td colspan='$colspan' class='diff-ntitle'>{$ntitle}</td>\r
+ </tr>";\r
+\r
+ if ( $multi != '' )\r
+ $header .= "<tr><td colspan='4' align='center' class='diff-multi'>{$multi}</td></tr>";\r
+\r
+ return $header . $diff . "</table>";\r
+ }\r
+\r
+ /**\r
+ * Use specified text instead of loading from the database\r
+ */\r
+ function setText( $oldText, $newText ) {\r
+ $this->mOldtext = $oldText;\r
+ $this->mNewtext = $newText;\r
+ $this->mTextLoaded = 2;\r
+ $this->mRevisionsLoaded = true;\r
+ }\r
+\r
+ /**\r
+ * Load revision metadata for the specified articles. If newid is 0, then compare\r
+ * the old article in oldid to the current article; if oldid is 0, then\r
+ * compare the current article to the immediately previous one (ignoring the\r
+ * value of newid).\r
+ *\r
+ * If oldid is false, leave the corresponding revision object set\r
+ * to false. This is impossible via ordinary user input, and is provided for\r
+ * API convenience.\r
+ */\r
+ function loadRevisionData() {\r
+ global $wgLang, $wgUser;\r
+ if ( $this->mRevisionsLoaded ) {\r
+ return true;\r
+ } else {\r
+ // Whether it succeeds or fails, we don't want to try again\r
+ $this->mRevisionsLoaded = true;\r
+ }\r
+\r
+ // Load the new revision object\r
+ $this->mNewRev = $this->mNewid\r
+ ? Revision::newFromId( $this->mNewid )\r
+ : Revision::newFromTitle( $this->mTitle );\r
+ if( !$this->mNewRev instanceof Revision )\r
+ return false;\r
+\r
+ // Update the new revision ID in case it was 0 (makes life easier doing UI stuff)\r
+ $this->mNewid = $this->mNewRev->getId();\r
+\r
+ // Check if page is editable\r
+ $editable = $this->mNewRev->getTitle()->userCan( 'edit' );\r
+\r
+ // Set assorted variables\r
+ $timestamp = $wgLang->timeanddate( $this->mNewRev->getTimestamp(), true );\r
+ $dateofrev = $wgLang->date( $this->mNewRev->getTimestamp(), true );\r
+ $timeofrev = $wgLang->time( $this->mNewRev->getTimestamp(), true );\r
+ $this->mNewPage = $this->mNewRev->getTitle();\r
+ if( $this->mNewRev->isCurrent() ) {\r
+ $newLink = $this->mNewPage->escapeLocalUrl( array(\r
+ 'oldid' => $this->mNewid\r
+ ) );\r
+ $this->mPagetitle = htmlspecialchars( wfMsg(\r
+ 'currentrev-asof',\r
+ $timestamp,\r
+ $dateofrev,\r
+ $timeofrev\r
+ ) );\r
+ $newEdit = $this->mNewPage->escapeLocalUrl( array(\r
+ 'action' => 'edit'\r
+ ) );\r
+\r
+ $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a>";\r
+ $this->mNewtitle .= " (<a href='$newEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";\r
+ } else {\r
+ $newLink = $this->mNewPage->escapeLocalUrl( array(\r
+ 'oldid' => $this->mNewid\r
+ ) );\r
+ $newEdit = $this->mNewPage->escapeLocalUrl( array(\r
+ 'action' => 'edit',\r
+ 'oldid' => $this->mNewid\r
+ ) );\r
+ $this->mPagetitle = htmlspecialchars( wfMsg(\r
+ 'revisionasof',\r
+ $timestamp,\r
+ $dateofrev,\r
+ $timeofrev\r
+ ) );\r
+\r
+ $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a>";\r
+ $this->mNewtitle .= " (<a href='$newEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";\r
+ }\r
+ if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {\r
+ $this->mNewtitle = "<span class='history-deleted'>{$this->mPagetitle}</span>";\r
+ } else if ( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {\r
+ $this->mNewtitle = "<span class='history-deleted'>{$this->mNewtitle}</span>";\r
+ }\r
+\r
+ // Load the old revision object\r
+ $this->mOldRev = false;\r
+ if( $this->mOldid ) {\r
+ $this->mOldRev = Revision::newFromId( $this->mOldid );\r
+ } elseif ( $this->mOldid === 0 ) {\r
+ $rev = $this->mNewRev->getPrevious();\r
+ if( $rev ) {\r
+ $this->mOldid = $rev->getId();\r
+ $this->mOldRev = $rev;\r
+ } else {\r
+ // No previous revision; mark to show as first-version only.\r
+ $this->mOldid = false;\r
+ $this->mOldRev = false;\r
+ }\r
+ }/* elseif ( $this->mOldid === false ) leave mOldRev false; */\r
+\r
+ if( is_null( $this->mOldRev ) ) {\r
+ return false;\r
+ }\r
+\r
+ if ( $this->mOldRev ) {\r
+ $this->mOldPage = $this->mOldRev->getTitle();\r
+\r
+ $t = $wgLang->timeanddate( $this->mOldRev->getTimestamp(), true );\r
+ $dateofrev = $wgLang->date( $this->mOldRev->getTimestamp(), true );\r
+ $timeofrev = $wgLang->time( $this->mOldRev->getTimestamp(), true );\r
+ $oldLink = $this->mOldPage->escapeLocalUrl( array(\r
+ 'oldid' => $this->mOldid\r
+ ) );\r
+ $oldEdit = $this->mOldPage->escapeLocalUrl( array(\r
+ 'action' => 'edit',\r
+ 'oldid' => $this->mOldid\r
+ ) );\r
+ $this->mOldPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t, $dateofrev, $timeofrev ) );\r
+\r
+ $this->mOldtitle = "<a href='$oldLink'>{$this->mOldPagetitle}</a>"\r
+ . " (<a href='$oldEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";\r
+ // Add an "undo" link\r
+ $newUndo = $this->mNewPage->escapeLocalUrl( array(\r
+ 'action' => 'edit',\r
+ 'undoafter' => $this->mOldid,\r
+ 'undo' => $this->mNewid\r
+ ) );\r
+ $htmlLink = htmlspecialchars( wfMsg( 'editundo' ) );\r
+ $htmlTitle = $wgUser->getSkin()->tooltip( 'undo' );\r
+ if( $editable && !$this->mOldRev->isDeleted( Revision::DELETED_TEXT ) && !$this->mNewRev->isDeleted( Revision::DELETED_TEXT ) ) {\r
+ $this->mNewtitle .= " (<a href='$newUndo' $htmlTitle>" . $htmlLink . "</a>)";\r
+ }\r
+\r
+ if( !$this->mOldRev->userCan( Revision::DELETED_TEXT ) ) {\r
+ $this->mOldtitle = '<span class="history-deleted">' . $this->mOldPagetitle . '</span>';\r
+ } else if( $this->mOldRev->isDeleted( Revision::DELETED_TEXT ) ) {\r
+ $this->mOldtitle = '<span class="history-deleted">' . $this->mOldtitle . '</span>';\r
+ }\r
+ }\r
+\r
+ return true;\r
+ }\r
+\r
+ /**\r
+ * Load the text of the revisions, as well as revision data.\r
+ */\r
+ function loadText() {\r
+ if ( $this->mTextLoaded == 2 ) {\r
+ return true;\r
+ } else {\r
+ // Whether it succeeds or fails, we don't want to try again\r
+ $this->mTextLoaded = 2;\r
+ }\r
+\r
+ if ( !$this->loadRevisionData() ) {\r
+ return false;\r
+ }\r
+ if ( $this->mOldRev ) {\r
+ $this->mOldtext = $this->mOldRev->getText( Revision::FOR_THIS_USER );\r
+ if ( $this->mOldtext === false ) {\r
+ return false;\r
+ }\r
+ }\r
+ if ( $this->mNewRev ) {\r
+ $this->mNewtext = $this->mNewRev->getText( Revision::FOR_THIS_USER );\r
+ if ( $this->mNewtext === false ) {\r
+ return false;\r
+ }\r
+ }\r
+ return true;\r
+ }\r
+\r
+ /**\r
+ * Load the text of the new revision, not the old one\r
+ */\r
+ function loadNewText() {\r
+ if ( $this->mTextLoaded >= 1 ) {\r
+ return true;\r
+ } else {\r
+ $this->mTextLoaded = 1;\r
+ }\r
+ if ( !$this->loadRevisionData() ) {\r
+ return false;\r
+ }\r
+ $this->mNewtext = $this->mNewRev->getText( Revision::FOR_THIS_USER );\r
+ return true;\r
+ }\r
+}\r