X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialUndelete.php;h=c08a77701a0dcff76b9bbc04c9177a780d387fd0;hb=bb8cd7e72ead26ab34eed7e35beeb7ed3502e8f6;hp=7d55e0a21ecc90505ae1fc9599ab2e9a5b2512fb;hpb=5c13a000cecefc99bc945911672d52a7f26a3042;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php index 7d55e0a21e..c08a77701a 100644 --- a/includes/SpecialUndelete.php +++ b/includes/SpecialUndelete.php @@ -1,55 +1,96 @@ execute(); } /** - * - * @package MediaWiki - * @subpackage SpecialPage + * Used to show archived pages and eventually restore them. + * @addtogroup SpecialPage */ class PageArchive { - var $title; + protected $title; + var $fileStatus; - function PageArchive( &$title ) { + function __construct( $title ) { if( is_null( $title ) ) { - wfDebugDieBacktrace( 'Archiver() given a null title.'); + throw new MWException( 'Archiver() given a null title.'); } - $this->title =& $title; + $this->title = $title; } /** * List all deleted pages recorded in the archive table. Returns result * wrapper with (ar_namespace, ar_title, count) fields, ordered by page - * namespace/title. Can be called staticaly. + * namespace/title. * * @return ResultWrapper */ - /* static */ function listAllPages() { - $dbr =& wfGetDB( DB_SLAVE ); - $archive = $dbr->tableName( 'archive' ); - - $sql = "SELECT ar_namespace,ar_title, COUNT(*) AS count FROM $archive " . - "GROUP BY ar_namespace,ar_title ORDER BY ar_namespace,ar_title"; - - return $dbr->resultObject( $dbr->query( $sql, 'PageArchive::listAllPages' ) ); + public static function listAllPages() { + $dbr = wfGetDB( DB_SLAVE ); + return self::listPages( $dbr, '' ); + } + + /** + * List deleted pages recorded in the archive table matching the + * given title prefix. + * Returns result wrapper with (ar_namespace, ar_title, count) fields. + * + * @return ResultWrapper + */ + public static function listPagesByPrefix( $prefix ) { + $dbr = wfGetDB( DB_SLAVE ); + + $title = Title::newFromText( $prefix ); + if( $title ) { + $ns = $title->getNamespace(); + $encPrefix = $dbr->escapeLike( $title->getDBkey() ); + } else { + // Prolly won't work too good + // @todo handle bare namespace names cleanly? + $ns = 0; + $encPrefix = $dbr->escapeLike( $prefix ); + } + $conds = array( + 'ar_namespace' => $ns, + "ar_title LIKE '$encPrefix%'", + ); + return self::listPages( $dbr, $conds ); } + protected static function listPages( $dbr, $condition ) { + return $dbr->resultObject( + $dbr->select( + array( 'archive' ), + array( + 'ar_namespace', + 'ar_title', + 'COUNT(*) AS count', + ), + $condition, + __METHOD__, + array( + 'GROUP BY' => 'ar_namespace,ar_title', + 'ORDER BY' => 'ar_namespace,ar_title', + 'LIMIT' => 100, + ) + ) + ); + } + /** * List the revisions of the given page. Returns result wrapper with * (ar_minor_edit, ar_timestamp, ar_user, ar_user_text, ar_comment) fields. @@ -57,9 +98,9 @@ class PageArchive { * @return ResultWrapper */ function listRevisions() { - $dbr =& wfGetDB( DB_SLAVE ); + $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( 'archive', - array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment' ), + array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment', 'ar_len' ), array( 'ar_namespace' => $this->title->getNamespace(), 'ar_title' => $this->title->getDBkey() ), 'PageArchive::listRevisions', @@ -67,42 +108,161 @@ class PageArchive { $ret = $dbr->resultObject( $res ); return $ret; } + + /** + * List the deleted file revisions for this page, if it's a file page. + * Returns a result wrapper with various filearchive fields, or null + * if not a file page. + * + * @return ResultWrapper + * @todo Does this belong in Image for fuller encapsulation? + */ + function listFiles() { + if( $this->title->getNamespace() == NS_IMAGE ) { + $dbr = wfGetDB( DB_SLAVE ); + $res = $dbr->select( 'filearchive', + array( + 'fa_id', + 'fa_name', + 'fa_storage_key', + 'fa_size', + 'fa_width', + 'fa_height', + 'fa_description', + 'fa_user', + 'fa_user_text', + 'fa_timestamp' ), + array( 'fa_name' => $this->title->getDBkey() ), + __METHOD__, + array( 'ORDER BY' => 'fa_timestamp DESC' ) ); + $ret = $dbr->resultObject( $res ); + return $ret; + } + return null; + } /** * Fetch (and decompress if necessary) the stored text for the deleted * revision of the page with the given timestamp. * * @return string + * @deprecated Use getRevision() for more flexible information */ function getRevisionText( $timestamp ) { - $fname = 'PageArchive::getRevisionText'; - $dbr =& wfGetDB( DB_SLAVE ); + $rev = $this->getRevision( $timestamp ); + return $rev ? $rev->getText() : null; + } + + /** + * Return a Revision object containing data for the deleted revision. + * Note that the result *may* or *may not* have a null page ID. + * @param string $timestamp + * @return Revision + */ + function getRevision( $timestamp ) { + $dbr = wfGetDB( DB_SLAVE ); $row = $dbr->selectRow( 'archive', - array( 'ar_text', 'ar_flags', 'ar_text_id' ), + array( + 'ar_rev_id', + 'ar_text', + 'ar_comment', + 'ar_user', + 'ar_user_text', + 'ar_timestamp', + 'ar_minor_edit', + 'ar_flags', + 'ar_text_id', + 'ar_len' ), array( 'ar_namespace' => $this->title->getNamespace(), - 'ar_title' => $this->title->getDbkey(), + 'ar_title' => $this->title->getDBkey(), 'ar_timestamp' => $dbr->timestamp( $timestamp ) ), - $fname ); - return $this->getTextFromRow( $row ); + __METHOD__ ); + if( $row ) { + return new Revision( array( + 'page' => $this->title->getArticleId(), + 'id' => $row->ar_rev_id, + 'text' => ($row->ar_text_id + ? null + : Revision::getRevisionText( $row, 'ar_' ) ), + 'comment' => $row->ar_comment, + 'user' => $row->ar_user, + 'user_text' => $row->ar_user_text, + 'timestamp' => $row->ar_timestamp, + 'minor_edit' => $row->ar_minor_edit, + 'text_id' => $row->ar_text_id ) ); + } else { + return null; + } + } + + /** + * Return the most-previous revision, either live or deleted, against + * the deleted revision given by timestamp. + * + * May produce unexpected results in case of history merges or other + * unusual time issues. + * + * @param string $timestamp + * @return Revision or null + */ + function getPreviousRevision( $timestamp ) { + $dbr = wfGetDB( DB_SLAVE ); + + // Check the previous deleted revision... + $row = $dbr->selectRow( 'archive', + 'ar_timestamp', + array( 'ar_namespace' => $this->title->getNamespace(), + 'ar_title' => $this->title->getDBkey(), + 'ar_timestamp < ' . + $dbr->addQuotes( $dbr->timestamp( $timestamp ) ) ), + __METHOD__, + array( + 'ORDER BY' => 'ar_timestamp DESC', + 'LIMIT' => 1 ) ); + $prevDeleted = $row ? wfTimestamp( TS_MW, $row->ar_timestamp ) : false; + + $row = $dbr->selectRow( array( 'page', 'revision' ), + array( 'rev_id', 'rev_timestamp' ), + array( + 'page_namespace' => $this->title->getNamespace(), + 'page_title' => $this->title->getDBkey(), + 'page_id = rev_page', + 'rev_timestamp < ' . + $dbr->addQuotes( $dbr->timestamp( $timestamp ) ) ), + __METHOD__, + array( + 'ORDER BY' => 'rev_timestamp DESC', + 'LIMIT' => 1 ) ); + $prevLive = $row ? wfTimestamp( TS_MW, $row->rev_timestamp ) : false; + $prevLiveId = $row ? intval( $row->rev_id ) : null; + + if( $prevLive && $prevLive > $prevDeleted ) { + // Most prior revision was live + return Revision::newFromId( $prevLiveId ); + } elseif( $prevDeleted ) { + // Most prior revision was deleted + return $this->getRevision( $prevDeleted ); + } else { + // No prior revision on this page. + return null; + } } /** * Get the text from an archive row containing ar_text, ar_flags and ar_text_id */ function getTextFromRow( $row ) { - $fname = 'PageArchive::getTextFromRow'; - if( is_null( $row->ar_text_id ) ) { // An old row from MediaWiki 1.4 or previous. // Text is embedded in this row in classic compression format. return Revision::getRevisionText( $row, "ar_" ); } else { // New-style: keyed to the text storage backend. - $dbr =& wfGetDB( DB_SLAVE ); + $dbr = wfGetDB( DB_SLAVE ); $text = $dbr->selectRow( 'text', array( 'old_text', 'old_flags' ), array( 'old_id' => $row->ar_text_id ), - $fname ); + __METHOD__ ); return Revision::getRevisionText( $text ); } } @@ -117,7 +277,7 @@ class PageArchive { * @return string */ function getLastRevisionText() { - $dbr =& wfGetDB( DB_SLAVE ); + $dbr = wfGetDB( DB_SLAVE ); $row = $dbr->selectRow( 'archive', array( 'ar_text', 'ar_flags', 'ar_text_id' ), array( 'ar_namespace' => $this->title->getNamespace(), @@ -136,44 +296,102 @@ class PageArchive { * @return bool */ function isDeleted() { - $dbr =& wfGetDB( DB_SLAVE ); + $dbr = wfGetDB( DB_SLAVE ); $n = $dbr->selectField( 'archive', 'COUNT(ar_title)', array( 'ar_namespace' => $this->title->getNamespace(), 'ar_title' => $this->title->getDBkey() ) ); return ($n > 0); } + /** + * Restore the given (or all) text and file revisions for the page. + * Once restored, the items will be removed from the archive tables. + * The deletion log will be updated with an undeletion notice. + * + * @param array $timestamps Pass an empty array to restore all revisions, otherwise list the ones to undelete. + * @param string $comment + * @param array $fileVersions + * + * @return array(number of file revisions restored, number of image revisions restored, log message) + * on success, false on failure + */ + function undelete( $timestamps, $comment = '', $fileVersions = array() ) { + // If both the set of text revisions and file revisions are empty, + // restore everything. Otherwise, just restore the requested items. + $restoreAll = empty( $timestamps ) && empty( $fileVersions ); + + $restoreText = $restoreAll || !empty( $timestamps ); + $restoreFiles = $restoreAll || !empty( $fileVersions ); + + if( $restoreFiles && $this->title->getNamespace() == NS_IMAGE ) { + $img = wfLocalFile( $this->title ); + $this->fileStatus = $img->restore( $fileVersions ); + $filesRestored = $this->fileStatus->successCount; + } else { + $filesRestored = 0; + } + + if( $restoreText ) { + $textRestored = $this->undeleteRevisions( $timestamps ); + if($textRestored === false) // It must be one of UNDELETE_* + return false; + } else { + $textRestored = 0; + } + + // Touch the log! + global $wgContLang; + $log = new LogPage( 'delete' ); + + if( $textRestored && $filesRestored ) { + $reason = wfMsgExt( 'undeletedrevisions-files', array( 'content', 'parsemag' ), + $wgContLang->formatNum( $textRestored ), + $wgContLang->formatNum( $filesRestored ) ); + } elseif( $textRestored ) { + $reason = wfMsgExt( 'undeletedrevisions', array( 'content', 'parsemag' ), + $wgContLang->formatNum( $textRestored ) ); + } elseif( $filesRestored ) { + $reason = wfMsgExt( 'undeletedfiles', array( 'content', 'parsemag' ), + $wgContLang->formatNum( $filesRestored ) ); + } else { + wfDebug( "Undelete: nothing undeleted...\n" ); + return false; + } + + if( trim( $comment ) != '' ) + $reason .= ": {$comment}"; + $log->addEntry( 'restore', $this->title, $reason ); + + return array($textRestored, $filesRestored, $reason); + } + /** * This is the meaty bit -- restores archived revisions of the given page * to the cur/old tables. If the page currently exists, all revisions will * be stuffed into old, otherwise the most recent will go into cur. - * The deletion log will be updated with an undeletion notice. - * - * Returns true on success. * * @param array $timestamps Pass an empty array to restore all revisions, otherwise list the ones to undelete. - * @return bool + * @param string $comment + * @param array $fileVersions + * + * @return mixed number of revisions restored or false on failure */ - function undelete( $timestamps ) { - global $wgDeferredUpdateList, $wgParser, $wgDBtype; + private function undeleteRevisions( $timestamps ) { + if ( wfReadOnly() ) + return false; - $fname = "doUndeleteArticle"; $restoreAll = empty( $timestamps ); - $restoreRevisions = count( $timestamps ); - - $dbw =& wfGetDB( DB_MASTER ); - extract( $dbw->tableNames( 'page', 'archive' ) ); + + $dbw = wfGetDB( DB_MASTER ); # Does this page already exist? We'll have to update it... $article = new Article( $this->title ); - $options = ( $wgDBtype == 'PostgreSQL' ) - ? '' // pg doesn't support this? - : 'FOR UPDATE'; + $options = 'FOR UPDATE'; $page = $dbw->selectRow( 'page', array( 'page_id', 'page_latest' ), array( 'page_namespace' => $this->title->getNamespace(), 'page_title' => $this->title->getDBkey() ), - $fname, + __METHOD__, $options ); if( $page ) { # Page already exists. Import the history, and if necessary @@ -212,17 +430,24 @@ class PageArchive { 'ar_timestamp', 'ar_minor_edit', 'ar_flags', - 'ar_text_id' ), + 'ar_text_id', + 'ar_page_id', + 'ar_len' ), /* WHERE */ array( 'ar_namespace' => $this->title->getNamespace(), 'ar_title' => $this->title->getDBkey(), $oldones ), - $fname, + __METHOD__, /* options */ array( 'ORDER BY' => 'ar_timestamp' ) ); + if( $dbw->numRows( $result ) < count( $timestamps ) ) { + wfDebug( __METHOD__.": couldn't find all requested rows\n" ); + return false; + } + $revision = null; - $newRevId = $previousRevId; + $restored = 0; while( $row = $dbw->fetchObject( $result ) ) { if( $row->ar_text_id ) { @@ -247,33 +472,36 @@ class PageArchive { 'timestamp' => $row->ar_timestamp, 'minor_edit' => $row->ar_minor_edit, 'text_id' => $row->ar_text_id, + 'len' => $row->ar_len ) ); - $newRevId = $revision->insertOn( $dbw ); + $revision->insertOn( $dbw ); + $restored++; + + wfRunHooks( 'ArticleRevisionUndeleted', array( &$this->title, $revision, $row->ar_page_id ) ); } + // Was anything restored at all? + if($restored == 0) + return 0; if( $revision ) { - # FIXME: Update latest if newer as well... - if( $newid ) { - # FIXME: update article count if changed... - $article->updateRevisionOn( $dbw, $revision, $previousRevId ); - - # Finally, clean up the link tables - $options = new ParserOptions; - $parserOutput = $wgParser->parse( $revision->getText(), $this->title, $options, - true, true, $newRevId ); - $u = new LinksUpdate( $this->title, $parserOutput ); - $u->doUpdate(); + // Attach the latest revision to the page... + $wasnew = $article->updateIfNewerOn( $dbw, $revision, $previousRevId ); - #TODO: SearchUpdate, etc. + if( $newid || $wasnew ) { + // Update site stats, link tables, etc + $article->createUpdates( $revision ); } if( $newid ) { + wfRunHooks( 'ArticleUndelete', array( &$this->title, true ) ); Article::onArticleCreate( $this->title ); } else { + wfRunHooks( 'ArticleUndelete', array( &$this->title, false ) ); Article::onArticleEdit( $this->title ); } } else { - # Something went terribly wrong! + // Revision couldn't be created. This is very weird + return self::UNDELETE_UNKNOWNERR; } # Now that it's safely stored, take it out of the archive @@ -282,45 +510,43 @@ class PageArchive { 'ar_namespace' => $this->title->getNamespace(), 'ar_title' => $this->title->getDBkey(), $oldones ), - $fname ); - - # Touch the log! - $log = new LogPage( 'delete' ); - if( $restoreAll ) { - $reason = ''; - } else { - $reason = wfMsgForContent( 'undeletedrevisions', $restoreRevisions ); - } - $log->addEntry( 'restore', $this->title, $reason ); + __METHOD__ ); - return true; + return $restored; } + + function getFileStatus() { return $this->fileStatus; } } /** - * - * @package MediaWiki - * @subpackage SpecialPage + * The HTML form for Special:Undelete, which allows users with the appropriate + * permissions to view and restore deleted content. + * @addtogroup SpecialPage */ class UndeleteForm { var $mAction, $mTarget, $mTimestamp, $mRestore, $mTargetObj; - var $mTargetTimestamp, $mAllowed; + var $mTargetTimestamp, $mAllowed, $mComment; - function UndeleteForm( &$request, $par = "" ) { + function UndeleteForm( $request, $par = "" ) { global $wgUser; - $this->mAction = $request->getText( 'action' ); - $this->mTarget = $request->getText( 'target' ); - $this->mTimestamp = $request->getText( 'timestamp' ); + $this->mAction = $request->getVal( 'action' ); + $this->mTarget = $request->getVal( 'target' ); + $this->mSearchPrefix = $request->getText( 'prefix' ); + $time = $request->getVal( 'timestamp' ); + $this->mTimestamp = $time ? wfTimestamp( TS_MW, $time ) : ''; + $this->mFile = $request->getVal( 'file' ); $posted = $request->wasPosted() && $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) ); $this->mRestore = $request->getCheck( 'restore' ) && $posted; $this->mPreview = $request->getCheck( 'preview' ) && $posted; + $this->mDiff = $request->getCheck( 'diff' ); + $this->mComment = $request->getText( 'wpComment' ); if( $par != "" ) { $this->mTarget = $par; } - if ( $wgUser->isAllowed( 'delete' ) && !$wgUser->isBlocked() ) { + if ( $wgUser->isAllowed( 'undelete' ) && !$wgUser->isBlocked() ) { $this->mAllowed = true; } else { $this->mAllowed = false; @@ -334,10 +560,16 @@ class UndeleteForm { } if( $this->mRestore ) { $timestamps = array(); + $this->mFileVersions = array(); foreach( $_REQUEST as $key => $val ) { + $matches = array(); if( preg_match( '/^ts(\d{14})$/', $key, $matches ) ) { array_push( $timestamps, $matches[1] ); } + + if( preg_match( '/^fileid(\d+)$/', $key, $matches ) ) { + $this->mFileVersions[] = intval( $matches[1] ); + } } rsort( $timestamps ); $this->mTargetTimestamp = $timestamps; @@ -345,45 +577,78 @@ class UndeleteForm { } function execute() { - + global $wgOut; + if ( $this->mAllowed ) { + $wgOut->setPagetitle( wfMsg( "undeletepage" ) ); + } else { + $wgOut->setPagetitle( wfMsg( "viewdeletedpage" ) ); + } + if( is_null( $this->mTargetObj ) ) { - return $this->showList(); + $this->showSearchForm(); + + # List undeletable articles + if( $this->mSearchPrefix ) { + $result = PageArchive::listPagesByPrefix( + $this->mSearchPrefix ); + $this->showList( $result ); + } + return; } if( $this->mTimestamp !== '' ) { return $this->showRevision( $this->mTimestamp ); } + if( $this->mFile !== null ) { + return $this->showFile( $this->mFile ); + } if( $this->mRestore && $this->mAction == "submit" ) { return $this->undelete(); } return $this->showHistory(); } - /* private */ function showList() { - global $wgLang, $wgContLang, $wgUser, $wgOut; - $fname = "UndeleteForm::showList"; - - # List undeletable articles - $result = PageArchive::listAllPages(); + function showSearchForm() { + global $wgOut, $wgScript; + $wgOut->addWikiText( wfMsg( 'undelete-header' ) ); + + $wgOut->addHtml( + Xml::openElement( 'form', array( + 'method' => 'get', + 'action' => $wgScript ) ) . + '
' . + Xml::element( 'legend', array(), + wfMsg( 'undelete-search-box' ) ) . + Xml::hidden( 'title', + SpecialPage::getTitleFor( 'Undelete' )->getPrefixedDbKey() ) . + Xml::inputLabel( wfMsg( 'undelete-search-prefix' ), + 'prefix', 'prefix', 20, + $this->mSearchPrefix ) . + Xml::submitButton( wfMsg( 'undelete-search-submit' ) ) . + '
' . + '' ); + } - if ( $this->mAllowed ) { - $wgOut->setPagetitle( wfMsg( "undeletepage" ) ); - } else { - $wgOut->setPagetitle( wfMsg( "viewdeletedpage" ) ); + /* private */ function showList( $result ) { + global $wgLang, $wgContLang, $wgUser, $wgOut; + + if( $result->numRows() == 0 ) { + $wgOut->addWikiText( wfMsg( 'undelete-no-results' ) ); + return; } + $wgOut->addWikiText( wfMsg( "undeletepagetext" ) ); $sk = $wgUser->getSkin(); - $undelete =& Title::makeTitle( NS_SPECIAL, 'Undelete' ); + $undelete = SpecialPage::getTitleFor( 'Undelete' ); $wgOut->addHTML( "\n" ); @@ -393,30 +658,58 @@ class UndeleteForm { /* private */ function showRevision( $timestamp ) { global $wgLang, $wgUser, $wgOut; - $fname = "UndeleteForm::showRevision"; + $self = SpecialPage::getTitleFor( 'Undelete' ); + $skin = $wgUser->getSkin(); if(!preg_match("/[0-9]{14}/",$timestamp)) return 0; - $archive =& new PageArchive( $this->mTargetObj ); - $text = $archive->getRevisionText( $timestamp ); + $archive = new PageArchive( $this->mTargetObj ); + $rev = $archive->getRevision( $timestamp ); + + if( !$rev ) { + $wgOut->addWikiTexT( wfMsg( 'undeleterevision-missing' ) ); + return; + } + + $wgOut->setPageTitle( wfMsg( 'undeletepage' ) ); + + $link = $skin->makeKnownLinkObj( + SpecialPage::getTitleFor( 'Undelete', $this->mTargetObj->getPrefixedDBkey() ), + htmlspecialchars( $this->mTargetObj->getPrefixedText() ) + ); + $time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) ); + $user = $skin->userLink( $rev->getUser(), $rev->getUserText() ) + . $skin->userToolLinks( $rev->getUser(), $rev->getUserText() ); - $wgOut->setPagetitle( wfMsg( "undeletepage" ) ); - $wgOut->addWikiText( "(" . wfMsg( "undeleterevision", - $wgLang->date( $timestamp ) ) . ")\n" ); + if( $this->mDiff ) { + $previousRev = $archive->getPreviousRevision( $timestamp ); + if( $previousRev ) { + $this->showDiff( $previousRev, $rev ); + if( $wgUser->getOption( 'diffonly' ) ) { + return; + } else { + $wgOut->addHtml( '
' ); + } + } else { + $wgOut->addHtml( wfMsgHtml( 'undelete-nodiff' ) ); + } + } + + $wgOut->addHtml( '

' . wfMsgHtml( 'undelete-revision', $link, $time, $user ) . '

' ); + + wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) ); if( $this->mPreview ) { $wgOut->addHtml( "
\n" ); - $wgOut->addWikiText( $text ); + $wgOut->addWikiTextTitleTidy( $rev->getText(), $this->mTargetObj, false ); } - - $self = Title::makeTitle( NS_SPECIAL, "Undelete" ); - + $wgOut->addHtml( wfElement( 'textarea', array( - 'readonly' => true, + 'readonly' => 'readonly', 'cols' => intval( $wgUser->getOption( 'cols' ) ), 'rows' => intval( $wgUser->getOption( 'rows' ) ) ), - $text ) . + $rev->getText() . "\n" ) . wfOpenElement( 'div' ) . wfOpenElement( 'form', array( 'method' => 'post', @@ -424,7 +717,7 @@ class UndeleteForm { wfElement( 'input', array( 'type' => 'hidden', 'name' => 'target', - 'value' => $this->mTargetObj->getPrefixedUrl() ) ) . + 'value' => $this->mTargetObj->getPrefixedDbKey() ) ) . wfElement( 'input', array( 'type' => 'hidden', 'name' => 'timestamp', @@ -434,18 +727,104 @@ class UndeleteForm { 'name' => 'wpEditToken', 'value' => $wgUser->editToken() ) ) . wfElement( 'input', array( - 'type' => 'hidden', + 'type' => 'submit', 'name' => 'preview', - 'value' => '1' ) ) . + 'value' => wfMsg( 'showpreview' ) ) ) . wfElement( 'input', array( + 'name' => 'diff', 'type' => 'submit', - 'value' => wfMsg( 'preview' ) ) ) . + 'value' => wfMsg( 'showdiff' ) ) ) . wfCloseElement( 'form' ) . wfCloseElement( 'div' ) ); } + + /** + * Build a diff display between this and the previous either deleted + * or non-deleted edit. + * @param Revision $previousRev + * @param Revision $currentRev + * @return string HTML + */ + function showDiff( $previousRev, $currentRev ) { + global $wgOut, $wgUser; + + $diffEngine = new DifferenceEngine(); + $diffEngine->showDiffStyle(); + $wgOut->addHtml( + "
" . + "" . + "" . + "" . + "" . + "" . + "" . + "" . + "" . + "" . + $diffEngine->generateDiffBody( + $previousRev->getText(), $currentRev->getText() ) . + "
" . + $this->diffHeader( $previousRev ) . + "" . + $this->diffHeader( $currentRev ) . + "
" . + "
\n" ); + + } + + private function diffHeader( $rev ) { + global $wgUser, $wgLang, $wgLang; + $sk = $wgUser->getSkin(); + $isDeleted = !( $rev->getId() && $rev->getTitle() ); + if( $isDeleted ) { + /// @fixme $rev->getTitle() is null for deleted revs...? + $targetPage = SpecialPage::getTitleFor( 'Undelete' ); + $targetQuery = 'target=' . + $this->mTargetObj->getPrefixedUrl() . + '×tamp=' . + wfTimestamp( TS_MW, $rev->getTimestamp() ); + } else { + /// @fixme getId() may return non-zero for deleted revs... + $targetPage = $rev->getTitle(); + $targetQuery = 'oldid=' . $rev->getId(); + } + return + '
' . + $sk->makeLinkObj( $targetPage, + wfMsgHtml( 'revisionasof', + $wgLang->timeanddate( $rev->getTimestamp(), true ) ), + $targetQuery ) . + ( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) . + '
' . + '
' . + $sk->revUserTools( $rev ) . '
' . + '
' . + '
' . + $sk->revComment( $rev ) . '
' . + '
'; + } + + /** + * Show a deleted file version requested by the visitor. + */ + function showFile( $key ) { + global $wgOut, $wgRequest; + $wgOut->disable(); + + # We mustn't allow the output to be Squid cached, otherwise + # if an admin previews a deleted image, and it's cached, then + # a user without appropriate permissions can toddle off and + # nab the image, and Squid will serve it + $wgRequest->response()->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' ); + $wgRequest->response()->header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' ); + $wgRequest->response()->header( 'Pragma: no-cache' ); + + $store = FileStore::get( 'deleted' ); + $store->stream( $key ); + } /* private */ function showHistory() { - global $wgLang, $wgUser, $wgOut; + global $wgLang, $wgContLang, $wgUser, $wgOut; $sk = $wgUser->getSkin(); if ( $this->mAllowed ) { @@ -455,11 +834,13 @@ class UndeleteForm { } $archive = new PageArchive( $this->mTargetObj ); + /* $text = $archive->getLastRevisionText(); if( is_null( $text ) ) { $wgOut->addWikiText( wfMsg( "nohistory" ) ); return; } + */ if ( $this->mAllowed ) { $wgOut->addWikiText( wfMsg( "undeletehistory" ) ); } else { @@ -468,88 +849,222 @@ class UndeleteForm { # List all stored revisions $revisions = $archive->listRevisions(); + $files = $archive->listFiles(); - if ( $this->mAllowed ) { - $titleObj = Title::makeTitle( NS_SPECIAL, "Undelete" ); - $action = $titleObj->escapeLocalURL( "action=submit" ); - $encTarget = htmlspecialchars( $this->mTarget ); - $button = htmlspecialchars( wfMsg("undeletebtn") ); - $token = htmlspecialchars( $wgUser->editToken() ); + $haveRevisions = $revisions && $revisions->numRows() > 0; + $haveFiles = $files && $files->numRows() > 0; + + # Batch existence check on user and talk pages + if( $haveRevisions ) { + $batch = new LinkBatch(); + while( $row = $revisions->fetchObject() ) { + $batch->addObj( Title::makeTitleSafe( NS_USER, $row->ar_user_text ) ); + $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->ar_user_text ) ); + } + $batch->execute(); + $revisions->seek( 0 ); + } + if( $haveFiles ) { + $batch = new LinkBatch(); + while( $row = $files->fetchObject() ) { + $batch->addObj( Title::makeTitleSafe( NS_USER, $row->fa_user_text ) ); + $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->fa_user_text ) ); + } + $batch->execute(); + $files->seek( 0 ); + } - $wgOut->addHTML(" -
- - - - "); + if ( $this->mAllowed ) { + $titleObj = SpecialPage::getTitleFor( "Undelete" ); + $action = $titleObj->getLocalURL( "action=submit" ); + # Start the form here + $top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'undelete' ) ); + $wgOut->addHtml( $top ); } # Show relevant lines from the deletion log: $wgOut->addHTML( "

" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "

\n" ); - require_once( 'SpecialLog.php' ); - $logViewer =& new LogViewer( + $logViewer = new LogViewer( new LogReader( new FauxRequest( - array( 'page' => $this->mTargetObj->getPrefixedText(), - 'type' => 'delete' ) ) ) ); + array( + 'page' => $this->mTargetObj->getPrefixedText(), + 'type' => 'delete' + ) + ) + ), LogViewer::NO_ACTION_LINK + ); $logViewer->showList( $wgOut ); - # The page's stored (deleted) history: + if( $this->mAllowed && ( $haveRevisions || $haveFiles ) ) { + # Format the user-visible controls (comment field, submission button) + # in a nice little table + $align = $wgContLang->isRtl() ? 'left' : 'right'; + $table = + Xml::openElement( 'fieldset' ) . + Xml::openElement( 'table' ) . + " + " . + wfMsgWikiHtml( 'undeleteextrahelp' ) . + " + + + " . + Xml::label( wfMsg( 'undeletecomment' ), 'wpComment' ) . + " + " . + Xml::input( 'wpComment', 50, $this->mComment ) . + " + + +   + " . + Xml::submitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore', 'id' => 'mw-undelete-submit' ) ) . + Xml::element( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ), 'id' => 'mw-undelete-reset' ) ) . + " + " . + Xml::closeElement( 'table' ) . + Xml::closeElement( 'fieldset' ); + + $wgOut->addHtml( $table ); + } + $wgOut->addHTML( "

" . htmlspecialchars( wfMsg( "history" ) ) . "

\n" ); - $wgOut->addHTML(""); + if ( $this->mAllowed ) { - $wgOut->addHTML( "\n
" ); + # Slip in the hidden controls here + $misc = Xml::hidden( 'target', $this->mTarget ); + $misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() ); + $misc .= Xml::closeElement( 'form' ); + $wgOut->addHtml( $misc ); } return true; } + + private function getEarliestTime( $title ) { + $dbr = wfGetDB( DB_SLAVE ); + if( $title->exists() ) { + $min = $dbr->selectField( 'revision', + 'MIN(rev_timestamp)', + array( 'rev_page' => $title->getArticleId() ), + __METHOD__ ); + return wfTimestampOrNull( TS_MW, $min ); + } + return null; + } function undelete() { - global $wgOut; + global $wgOut, $wgUser; + if ( wfReadOnly() ) { + $wgOut->readOnlyPage(); + return; + } if( !is_null( $this->mTargetObj ) ) { $archive = new PageArchive( $this->mTargetObj ); - if( $archive->undelete( $this->mTargetTimestamp ) ) { - $wgOut->addWikiText( wfMsg( "undeletedtext", $this->mTarget ) ); + + $ok = $archive->undelete( + $this->mTargetTimestamp, + $this->mComment, + $this->mFileVersions ); - if (NS_IMAGE == $this->mTargetObj->getNamespace()) { - /* refresh image metadata cache */ - new Image( $this->mTargetObj ); - } + if( is_array($ok) ) { + $skin = $wgUser->getSkin(); + $link = $skin->makeKnownLinkObj( $this->mTargetObj ); + $wgOut->addHtml( wfMsgWikiHtml( 'undeletedpage', $link ) ); + } else { + $wgOut->showFatalError( wfMsg( "cannotundelete" ) ); + } - return true; + // Show file deletion warnings and errors + $status = $archive->getFileStatus(); + if ( $status && !$status->isGood() ) { + $wgOut->addWikiText( $status->getWikiText( 'undelete-error-short', 'undelete-error-long' ) ); } + } else { + $wgOut->showFatalError( wfMsg( "cannotundelete" ) ); } - $wgOut->fatalError( wfMsg( "cannotundelete" ) ); return false; } } - -?>