X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialUndelete.php;h=68e35b777d6e34906a8b22cca078d6f9783b7ec7;hb=0800a2fe7ffeba966120a78e856ed286f926c5e4;hp=3795e7d681587a0acbda95083dda056496664315;hpb=9a4d62c4f52d322f77e6eed55a3034d1091b9f9e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 3795e7d681..68e35b777d 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -80,6 +80,11 @@ class PageArchive { return self::listPages( $dbr, $conds ); } + /** + * @param $dbr DatabaseBase + * @param $condition + * @return bool|ResultWrapper + */ protected static function listPages( $dbr, $condition ) { return $dbr->resultObject( $dbr->select( @@ -111,7 +116,7 @@ class PageArchive { $res = $dbr->select( 'archive', array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', - 'ar_comment', 'ar_len', 'ar_deleted', 'ar_rev_id' + 'ar_comment', 'ar_len', 'ar_deleted', 'ar_rev_id', 'ar_sha1' ), array( 'ar_namespace' => $this->title->getNamespace(), 'ar_title' => $this->title->getDBkey() ), @@ -182,10 +187,12 @@ class PageArchive { 'ar_flags', 'ar_text_id', 'ar_deleted', - 'ar_len' ), + 'ar_len', + 'ar_sha1', + ), array( 'ar_namespace' => $this->title->getNamespace(), - 'ar_title' => $this->title->getDBkey(), - 'ar_timestamp' => $dbr->timestamp( $timestamp ) ), + 'ar_title' => $this->title->getDBkey(), + 'ar_timestamp' => $dbr->timestamp( $timestamp ) ), __METHOD__ ); if( $row ) { return Revision::newFromArchiveRow( $row, array( 'page' => $this->title->getArticleId() ) ); @@ -393,7 +400,11 @@ class PageArchive { $dbw = wfGetDB( DB_MASTER ); # Does this page already exist? We'll have to update it... - $article = new Article( $this->title ); + $article = WikiPage::factory( $this->title ); + # Load latest data for the current page (bug 31179) + $article->loadPageData( 'fromdbmaster' ); + $oldcountable = $article->isCountable(); + $options = 'FOR UPDATE'; // lock page $page = $dbw->selectRow( 'page', array( 'page_id', 'page_latest' ), @@ -451,7 +462,8 @@ class PageArchive { 'ar_text_id', 'ar_deleted', 'ar_page_id', - 'ar_len' ), + 'ar_len', + 'ar_sha1' ), /* WHERE */ array( 'ar_namespace' => $this->title->getNamespace(), 'ar_title' => $this->title->getDBkey(), @@ -526,20 +538,17 @@ class PageArchive { return 0; } + $created = (bool)$newid; + // Attach the latest revision to the page... $wasnew = $article->updateIfNewerOn( $dbw, $revision, $previousRevId ); - if ( $newid || $wasnew ) { + if ( $created || $wasnew ) { // Update site stats, link tables, etc - $article->createUpdates( $revision ); + $user = User::newFromName( $revision->getRawUserText(), false ); + $article->doEditUpdates( $revision, $user, array( 'created' => $created, 'oldcountable' => $oldcountable ) ); } - if( $newid ) { - wfRunHooks( 'ArticleUndelete', array( &$this->title, true, $comment ) ); - Article::onArticleCreate( $this->title ); - } else { - wfRunHooks( 'ArticleUndelete', array( &$this->title, false, $comment ) ); - Article::onArticleEdit( $this->title ); - } + wfRunHooks( 'ArticleUndelete', array( &$this->title, $created, $comment ) ); if( $this->title->getNamespace() == NS_FILE ) { $update = new HTMLCacheUpdate( $this->title, 'imagelinks' ); @@ -562,45 +571,55 @@ class PageArchive { * @ingroup SpecialPage */ class SpecialUndelete extends SpecialPage { - var $mAction, $mTarget, $mTimestamp, $mRestore, $mInvert, $mTargetObj, $mFile; - var $mTargetTimestamp, $mAllowed, $mCanView, $mComment, $mToken, $mRequest; + var $mAction, $mTarget, $mTimestamp, $mRestore, $mInvert, $mFilename; + var $mTargetTimestamp, $mAllowed, $mCanView, $mComment, $mToken; + + /** + * @var Title + */ + var $mTargetObj; - function __construct( $request = null ) { + function __construct() { parent::__construct( 'Undelete', 'deletedhistory' ); + } + + function loadRequest( $par ) { + $request = $this->getRequest(); + $user = $this->getUser(); - if ( $request === null ) { - global $wgRequest; - $this->mRequest = $wgRequest; + $this->mAction = $request->getVal( 'action' ); + if ( $par !== null && $par !== '' ) { + $this->mTarget = $par; } else { - $this->mRequest = $request; + $this->mTarget = $request->getVal( 'target' ); } - } - - function loadRequest() { - global $wgUser; - $this->mAction = $this->mRequest->getVal( 'action' ); - $this->mTarget = $this->mRequest->getVal( 'target' ); - $this->mSearchPrefix = $this->mRequest->getText( 'prefix' ); - $time = $this->mRequest->getVal( 'timestamp' ); + $this->mTargetObj = null; + if ( $this->mTarget !== null && $this->mTarget !== '' ) { + $this->mTargetObj = Title::newFromURL( $this->mTarget ); + } + $this->mSearchPrefix = $request->getText( 'prefix' ); + $time = $request->getVal( 'timestamp' ); $this->mTimestamp = $time ? wfTimestamp( TS_MW, $time ) : ''; - $this->mFile = $this->mRequest->getVal( 'file' ); - - $posted = $this->mRequest->wasPosted() && - $wgUser->matchEditToken( $this->mRequest->getVal( 'wpEditToken' ) ); - $this->mRestore = $this->mRequest->getCheck( 'restore' ) && $posted; - $this->mInvert = $this->mRequest->getCheck( 'invert' ) && $posted; - $this->mPreview = $this->mRequest->getCheck( 'preview' ) && $posted; - $this->mDiff = $this->mRequest->getCheck( 'diff' ); - $this->mComment = $this->mRequest->getText( 'wpComment' ); - $this->mUnsuppress = $this->mRequest->getVal( 'wpUnsuppress' ) && $wgUser->isAllowed( 'suppressrevision' ); - $this->mToken = $this->mRequest->getVal( 'token' ); - - if ( $wgUser->isAllowed( 'undelete' ) && !$wgUser->isBlocked() ) { + $this->mFilename = $request->getVal( 'file' ); + + $posted = $request->wasPosted() && + $user->matchEditToken( $request->getVal( 'wpEditToken' ) ); + $this->mRestore = $request->getCheck( 'restore' ) && $posted; + $this->mInvert = $request->getCheck( 'invert' ) && $posted; + $this->mPreview = $request->getCheck( 'preview' ) && $posted; + $this->mDiff = $request->getCheck( 'diff' ); + $this->mDiffOnly = $request->getBool( 'diffonly', $this->getUser()->getOption( 'diffonly' ) ); + $this->mComment = $request->getText( 'wpComment' ); + $this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $user->isAllowed( 'suppressrevision' ); + $this->mToken = $request->getVal( 'token' ); + + if ( $user->isAllowed( 'undelete' ) && !$user->isBlocked() ) { $this->mAllowed = true; // user can restore $this->mCanView = true; // user can view content - } elseif ( $wgUser->isAllowed( 'deletedtext' ) ) { + } elseif ( $user->isAllowed( 'deletedtext' ) ) { $this->mAllowed = false; // user cannot restore $this->mCanView = true; // user can view content + $this->mRestore = false; } else { // user can only view the list of revisions $this->mAllowed = false; $this->mCanView = false; @@ -611,7 +630,7 @@ class SpecialUndelete extends SpecialPage { if( $this->mRestore || $this->mInvert ) { $timestamps = array(); $this->mFileVersions = array(); - foreach( $_REQUEST as $key => $val ) { + foreach( $request->getValues() as $key => $val ) { $matches = array(); if( preg_match( '/^ts(\d{14})$/', $key, $matches ) ) { array_push( $timestamps, $matches[1] ); @@ -627,90 +646,65 @@ class SpecialUndelete extends SpecialPage { } function execute( $par ) { - global $wgOut, $wgUser; + $this->checkPermissions(); + $user = $this->getUser(); $this->setHeaders(); - if ( !$this->userCanExecute( $wgUser ) ) { - $this->displayRestrictionError(); - return; - } $this->outputHeader(); - $this->loadRequest(); + $this->loadRequest( $par ); - if ( $this->mAllowed ) { - $wgOut->setPageTitle( wfMsg( 'undeletepage' ) ); - } else { - $wgOut->setPageTitle( wfMsg( 'viewdeletedpage' ) ); - } + $out = $this->getOutput(); - if( $par != '' ) { - $this->mTarget = $par; - } - if ( $this->mTarget !== '' ) { - $this->mTargetObj = Title::newFromURL( $this->mTarget ); - $wgUser->getSkin()->setRelevantTitle( $this->mTargetObj ); - } else { - $this->mTargetObj = null; - } + if ( is_null( $this->mTargetObj ) ) { + $out->addWikiMsg( 'undelete-header' ); - if( is_null( $this->mTargetObj ) ) { # Not all users can just browse every deleted page from the list - if( $wgUser->isAllowed( 'browsearchive' ) ) { + if ( $user->isAllowed( 'browsearchive' ) ) { $this->showSearchForm(); - - # List undeletable articles - if( $this->mSearchPrefix ) { - $result = PageArchive::listPagesByPrefix( $this->mSearchPrefix ); - $this->showList( $result ); - } - } else { - $wgOut->addWikiMsg( 'undelete-header' ); } return; } - if( $this->mTimestamp !== '' ) { - return $this->showRevision( $this->mTimestamp ); + + if ( $this->mAllowed ) { + $out->setPageTitle( $this->msg( 'undeletepage' ) ); + } else { + $out->setPageTitle( $this->msg( 'viewdeletedpage' ) ); } - if( $this->mFile !== null ) { - $file = new ArchivedFile( $this->mTargetObj, '', $this->mFile ); + + $this->getSkin()->setRelevantTitle( $this->mTargetObj ); + + if ( $this->mTimestamp !== '' ) { + $this->showRevision( $this->mTimestamp ); + } elseif ( $this->mFilename !== null ) { + $file = new ArchivedFile( $this->mTargetObj, '', $this->mFilename ); // Check if user is allowed to see this file if ( !$file->exists() ) { - $wgOut->addWikiMsg( 'filedelete-nofile', $this->mFile ); - return; - } else if( !$file->userCan( File::DELETED_FILE ) ) { + $out->addWikiMsg( 'filedelete-nofile', $this->mFilename ); + } elseif ( !$file->userCan( File::DELETED_FILE, $user ) ) { if( $file->isDeleted( File::DELETED_RESTRICTED ) ) { - $wgOut->permissionRequired( 'suppressrevision' ); + throw new PermissionsError( 'suppressrevision' ); } else { - $wgOut->permissionRequired( 'deletedtext' ); + throw new PermissionsError( 'deletedtext' ); } - return false; - } elseif ( !$wgUser->matchEditToken( $this->mToken, $this->mFile ) ) { - $this->showFileConfirmationForm( $this->mFile ); - return false; + } elseif ( !$user->matchEditToken( $this->mToken, $this->mFilename ) ) { + $this->showFileConfirmationForm( $this->mFilename ); } else { - return $this->showFile( $this->mFile ); - } - } - if( $this->mRestore && $this->mAction == 'submit' ) { - global $wgUploadMaintenance; - if( $wgUploadMaintenance && $this->mTargetObj && $this->mTargetObj->getNamespace() == NS_FILE ) { - $wgOut->wrapWikiMsg( "
\n$1\n
\n", array( 'filedelete-maintenance' ) ); - return; + $this->showFile( $this->mFilename ); } - return $this->undelete(); - } - if( $this->mInvert && $this->mAction == 'submit' ) { - return $this->showHistory(); + } elseif ( $this->mRestore && $this->mAction == 'submit' ) { + $this->undelete(); + } else { + $this->showHistory(); } - return $this->showHistory(); } function showSearchForm() { - global $wgOut, $wgScript; - $wgOut->addWikiMsg( 'undelete-header' ); + global $wgScript; - $wgOut->addHTML( + $out = $this->getOutput(); + $out->setPageTitle( $this->msg( 'undelete-search-title' ) ); + $out->addHTML( Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ) . @@ -724,25 +718,35 @@ class SpecialUndelete extends SpecialPage { Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ) ); + + # List undeletable articles + if( $this->mSearchPrefix ) { + $result = PageArchive::listPagesByPrefix( $this->mSearchPrefix ); + $this->showList( $result ); + } } - // Generic list of deleted pages + /** + * Generic list of deleted pages + * + * @param $result ResultWrapper + * @return bool + */ private function showList( $result ) { - global $wgLang, $wgUser, $wgOut; + $out = $this->getOutput(); if( $result->numRows() == 0 ) { - $wgOut->addWikiMsg( 'undelete-no-results' ); + $out->addWikiMsg( 'undelete-no-results' ); return; } - $wgOut->addWikiMsg( 'undeletepagetext', $wgLang->formatNum( $result->numRows() ) ); + $out->addWikiMsg( 'undeletepagetext', $this->getLanguage()->formatNum( $result->numRows() ) ); - $sk = $wgUser->getSkin(); $undelete = $this->getTitle(); - $wgOut->addHTML( "\n" ); return true; } private function showRevision( $timestamp ) { - global $wgLang, $wgUser, $wgOut; - - $skin = $wgUser->getSkin(); - if( !preg_match( '/[0-9]{14}/', $timestamp ) ) { return 0; } @@ -772,83 +772,84 @@ class SpecialUndelete extends SpecialPage { wfRunHooks( 'UndeleteForm::showRevision', array( &$archive, $this->mTargetObj ) ); $rev = $archive->getRevision( $timestamp ); + $out = $this->getOutput(); + $user = $this->getUser(); + if( !$rev ) { - $wgOut->addWikiMsg( 'undeleterevision-missing' ); + $out->addWikiMsg( 'undeleterevision-missing' ); return; } if( $rev->isDeleted( Revision::DELETED_TEXT ) ) { - if( !$rev->userCan( Revision::DELETED_TEXT ) ) { - $wgOut->wrapWikiMsg( "
\n$1\n
\n", 'rev-deleted-text-permission' ); + if( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) { + $out->wrapWikiMsg( "
\n$1\n
\n", 'rev-deleted-text-permission' ); return; } else { - $wgOut->wrapWikiMsg( "
\n$1\n
\n", 'rev-deleted-text-view' ); - $wgOut->addHTML( '
' ); + $out->wrapWikiMsg( "
\n$1\n
\n", 'rev-deleted-text-view' ); + $out->addHTML( '
' ); // and we are allowed to see... } } - $wgOut->setPageTitle( wfMsg( 'undeletepage' ) ); - - $link = $skin->linkKnown( - $this->getTitle( $this->mTargetObj->getPrefixedDBkey() ), - htmlspecialchars( $this->mTargetObj->getPrefixedText() ) - ); - if( $this->mDiff ) { $previousRev = $archive->getPreviousRevision( $timestamp ); if( $previousRev ) { $this->showDiff( $previousRev, $rev ); - if( $wgUser->getOption( 'diffonly' ) ) { + if( $this->mDiffOnly ) { return; } else { - $wgOut->addHTML( '
' ); + $out->addHTML( '
' ); } } else { - $wgOut->addWikiMsg( 'undelete-nodiff' ); + $out->addWikiMsg( 'undelete-nodiff' ); } } + $link = Linker::linkKnown( + $this->getTitle( $this->mTargetObj->getPrefixedDBkey() ), + htmlspecialchars( $this->mTargetObj->getPrefixedText() ) + ); + // date and time are separate parameters to facilitate localisation. // $time is kept for backward compat reasons. - $time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) ); - $d = htmlspecialchars( $wgLang->date( $timestamp, true ) ); - $t = htmlspecialchars( $wgLang->time( $timestamp, true ) ); - $user = $skin->revUserTools( $rev ); + $time = $this->getLanguage()->timeAndDate( $timestamp, true ); + $d = $this->getLanguage()->date( $timestamp, true ); + $t = $this->getLanguage()->time( $timestamp, true ); + $userLink = Linker::revUserTools( $rev ); if( $this->mPreview ) { $openDiv = '
'; } else { $openDiv = '
'; } - $wgOut->addHTML( $openDiv ); + $out->addHTML( $openDiv ); // Revision delete links if ( !$this->mDiff ) { - $revdel = $this->revDeleteLink( $rev ); + $revdel = Linker::getRevDeleteLink( $user, $rev, $this->mTargetObj ); if ( $revdel ) { - $wgOut->addHTML( $revdel ); + $out->addHTML( "$revdel " ); } } - $wgOut->addWikiMsgArray( 'undelete-revision', array( $link, $time, $user, $d, $t ), array( 'replaceafter' ) ); - $wgOut->addHTML( '
' ); + $out->addHTML( wfMessage( 'undelete-revision' )->rawParams( $link )->params( + $time )->rawParams( $userLink )->params( $d, $t )->parse() . '
' ); wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) ); if( $this->mPreview ) { // Hide [edit]s - $popts = $wgOut->parserOptions(); + $popts = $out->parserOptions(); $popts->setEditSection( false ); - $wgOut->parserOptions( $popts ); - $wgOut->addWikiTextTitleTidy( $rev->getText( Revision::FOR_THIS_USER ), $this->mTargetObj, true ); + $out->parserOptions( $popts ); + $out->addWikiTextTitleTidy( $rev->getText( Revision::FOR_THIS_USER, $user ), $this->mTargetObj, true ); } - $wgOut->addHTML( + $out->addHTML( Xml::element( 'textarea', array( 'readonly' => 'readonly', - 'cols' => intval( $wgUser->getOption( 'cols' ) ), - 'rows' => intval( $wgUser->getOption( 'rows' ) ) ), - $rev->getText( Revision::FOR_THIS_USER ) . "\n" ) . + 'cols' => intval( $user->getOption( 'cols' ) ), + 'rows' => intval( $user->getOption( 'rows' ) ) ), + $rev->getText( Revision::FOR_THIS_USER, $user ) . "\n" ) . Xml::openElement( 'div' ) . Xml::openElement( 'form', array( 'method' => 'post', @@ -864,7 +865,7 @@ class SpecialUndelete extends SpecialPage { Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'wpEditToken', - 'value' => $wgUser->editToken() ) ) . + 'value' => $user->getEditToken() ) ) . Xml::element( 'input', array( 'type' => 'submit', 'name' => 'preview', @@ -877,50 +878,6 @@ class SpecialUndelete extends SpecialPage { Xml::closeElement( 'div' ) ); } - /** - * Get a revision-deletion link, or disabled link, or nothing, depending - * on user permissions & the settings on the revision. - * - * Will use forward-compatible revision ID in the Special:RevDelete link - * if possible, otherwise the timestamp-based ID which may break after - * undeletion. - * - * @param Revision $rev - * @return string HTML fragment - */ - function revDeleteLink( $rev ) { - global $wgUser; - $canHide = $wgUser->isAllowed( 'deleterevision' ); - if( $canHide || ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) { - $skin = $wgUser->getSkin(); - if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { - $revdlink = $skin->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops - } else { - if ( $rev->getId() ) { - // RevDelete links using revision ID are stable across - // page deletion and undeletion; use when possible. - $query = array( - 'type' => 'revision', - 'target' => $this->mTargetObj->getPrefixedDBkey(), - 'ids' => $rev->getId() - ); - } else { - // Older deleted entries didn't save a revision ID. - // We have to refer to these by timestamp, ick! - $query = array( - 'type' => 'archive', - 'target' => $this->mTargetObj->getPrefixedDBkey(), - 'ids' => $rev->getTimestamp() - ); - } - return $skin->revDeleteLink( $query, - $rev->isDeleted( File::DELETED_RESTRICTED ), $canHide ); - } - } else { - return ''; - } - } - /** * Build a diff display between this and the previous either deleted * or non-deleted edit. @@ -930,11 +887,9 @@ class SpecialUndelete extends SpecialPage { * @return String: HTML */ function showDiff( $previousRev, $currentRev ) { - global $wgOut; - - $diffEngine = new DifferenceEngine( $previousRev->getTitle() ); + $diffEngine = new DifferenceEngine( $this->getContext() ); $diffEngine->showDiffStyle(); - $wgOut->addHTML( + $this->getOutput()->addHTML( "
" . "" . "" . @@ -962,42 +917,42 @@ class SpecialUndelete extends SpecialPage { * @return string */ private function diffHeader( $rev, $prefix ) { - global $wgUser, $wgLang; - $sk = $wgUser->getSkin(); $isDeleted = !( $rev->getId() && $rev->getTitle() ); if( $isDeleted ) { - /// @todo Fixme: $rev->getTitle() is null for deleted revs...? + /// @todo FIXME: $rev->getTitle() is null for deleted revs...? $targetPage = $this->getTitle(); $targetQuery = array( 'target' => $this->mTargetObj->getPrefixedText(), 'timestamp' => wfTimestamp( TS_MW, $rev->getTimestamp() ) ); } else { - /// @todo Fixme getId() may return non-zero for deleted revs... + /// @todo FIXME: getId() may return non-zero for deleted revs... $targetPage = $rev->getTitle(); $targetQuery = array( 'oldid' => $rev->getId() ); } // Add show/hide deletion links if available - $del .= $this->revDeleteLink( $rev ); + $rdel = Linker::getRevDeleteLink( $this->getUser(), $rev, $this->mTargetObj ); + if ( $rdel ) $rdel = " $rdel"; return '
' . - $sk->link( + Linker::link( $targetPage, - wfMsgHtml( + wfMsgExt( 'revisionasof', - htmlspecialchars( $wgLang->timeanddate( $rev->getTimestamp(), true ) ), - htmlspecialchars( $wgLang->date( $rev->getTimestamp(), true ) ), - htmlspecialchars( $wgLang->time( $rev->getTimestamp(), true ) ) + array( 'escape' ), + $this->getLanguage()->timeanddate( $rev->getTimestamp(), true ), + $this->getLanguage()->date( $rev->getTimestamp(), true ), + $this->getLanguage()->time( $rev->getTimestamp(), true ) ), array(), $targetQuery ) . '
' . '
' . - $sk->revUserTools( $rev ) . '
' . + Linker::revUserTools( $rev ) . '
' . '
' . '
' . - $sk->revComment( $rev ) . $del . '
' . + Linker::revComment( $rev ) . $rdel . '
' . '
'; } @@ -1005,19 +960,18 @@ class SpecialUndelete extends SpecialPage { * Show a form confirming whether a tokenless user really wants to see a file */ private function showFileConfirmationForm( $key ) { - global $wgOut, $wgUser, $wgLang; - $file = new ArchivedFile( $this->mTargetObj, '', $this->mFile ); - $wgOut->addWikiMsg( 'undelete-show-file-confirm', + $file = new ArchivedFile( $this->mTargetObj, '', $this->mFilename ); + $this->getOutput()->addWikiMsg( 'undelete-show-file-confirm', $this->mTargetObj->getText(), - $wgLang->date( $file->getTimestamp() ), - $wgLang->time( $file->getTimestamp() ) ); - $wgOut->addHTML( + $this->getLanguage()->date( $file->getTimestamp() ), + $this->getLanguage()->time( $file->getTimestamp() ) ); + $this->getOutput()->addHTML( Xml::openElement( 'form', array( 'method' => 'POST', 'action' => $this->getTitle()->getLocalURL( 'target=' . urlencode( $this->mTarget ) . '&file=' . urlencode( $key ) . - '&token=' . urlencode( $wgUser->editToken( $key ) ) ) + '&token=' . urlencode( $this->getUser()->getEditToken( $key ) ) ) ) ) . Xml::submitButton( wfMsg( 'undelete-show-file-submit' ) ) . @@ -1029,35 +983,28 @@ class SpecialUndelete extends SpecialPage { * Show a deleted file version requested by the visitor. */ private function showFile( $key ) { - global $wgOut, $wgRequest; - $wgOut->disable(); + $this->getOutput()->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' ); + $response = $this->getRequest()->response(); + $response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' ); + $response->header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' ); + $response->header( 'Pragma: no-cache' ); - global $IP; - require_once( "$IP/includes/StreamFile.php" ); $repo = RepoGroup::singleton()->getLocalRepo(); $path = $repo->getZonePath( 'deleted' ) . '/' . $repo->getDeletedHashPath( $key ) . $key; - wfStreamFile( $path ); + StreamFile::stream( $path ); } private function showHistory() { - global $wgUser, $wgOut; - - $sk = $wgUser->getSkin(); + $out = $this->getOutput(); if( $this->mAllowed ) { - $wgOut->setPageTitle( wfMsg( 'undeletepage' ) ); - } else { - $wgOut->setPageTitle( wfMsg( 'viewdeletedpage' ) ); + $out->addModules( 'mediawiki.special.undelete' ); } - - $wgOut->wrapWikiMsg( + $out->wrapWikiMsg( "
\n$1\n
\n", array( 'undeletepagetitle', $this->mTargetObj->getPrefixedText() ) ); @@ -1067,18 +1014,18 @@ class SpecialUndelete extends SpecialPage { /* $text = $archive->getLastRevisionText(); if( is_null( $text ) ) { - $wgOut->addWikiMsg( 'nohistory' ); + $out->addWikiMsg( 'nohistory' ); return; } */ - $wgOut->addHTML( '
' ); + $out->addHTML( '
' ); if ( $this->mAllowed ) { - $wgOut->addWikiMsg( 'undeletehistory' ); - $wgOut->addWikiMsg( 'undeleterevdel' ); + $out->addWikiMsg( 'undeletehistory' ); + $out->addWikiMsg( 'undeleterevdel' ); } else { - $wgOut->addWikiMsg( 'undeletehistorynoadmin' ); + $out->addWikiMsg( 'undeletehistorynoadmin' ); } - $wgOut->addHTML( '
' ); + $out->addHTML( '
' ); # List all stored revisions $revisions = $archive->listRevisions(); @@ -1111,22 +1058,22 @@ class SpecialUndelete extends SpecialPage { $action = $this->getTitle()->getLocalURL( array( 'action' => 'submit' ) ); # Start the form here $top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'undelete' ) ); - $wgOut->addHTML( $top ); + $out->addHTML( $top ); } # Show relevant lines from the deletion log: - $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) . "\n" ); - LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTargetObj->getPrefixedText() ); + $out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) . "\n" ); + LogEventsList::showLogExtract( $out, 'delete', $this->mTargetObj ); # Show relevant lines from the suppression log: - if( $wgUser->isAllowed( 'suppressionlog' ) ) { - $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'suppress' ) ) . "\n" ); - LogEventsList::showLogExtract( $wgOut, 'suppress', $this->mTargetObj->getPrefixedText() ); + if( $this->getUser()->isAllowed( 'suppressionlog' ) ) { + $out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'suppress' ) ) . "\n" ); + LogEventsList::showLogExtract( $out, 'suppress', $this->mTargetObj ); } if( $this->mAllowed && ( $haveRevisions || $haveFiles ) ) { # Format the user-visible controls (comment field, submission button) # in a nice little table - if( $wgUser->isAllowed( 'suppressrevision' ) ) { + if( $this->getUser()->isAllowed( 'suppressrevision' ) ) { $unsuppressBox = " @@ -1158,7 +1105,6 @@ class SpecialUndelete extends SpecialPage { " . @@ -1166,51 +1112,49 @@ class SpecialUndelete extends SpecialPage { Xml::closeElement( 'table' ) . Xml::closeElement( 'fieldset' ); - $wgOut->addHTML( $table ); + $out->addHTML( $table ); } - $wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'history' ) ) . "\n" ); + $out->addHTML( Xml::element( 'h2', null, wfMsg( 'history' ) ) . "\n" ); if( $haveRevisions ) { # The page's stored (deleted) history: - $wgOut->addHTML( '' ); } else { - $wgOut->addWikiMsg( 'nohistory' ); + $out->addWikiMsg( 'nohistory' ); } if( $haveFiles ) { - $wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'filehist' ) ) . "\n" ); - $wgOut->addHTML( '' ); } if ( $this->mAllowed ) { # Slip in the hidden controls here $misc = Html::hidden( 'target', $this->mTarget ); - $misc .= Html::hidden( 'wpEditToken', $wgUser->editToken() ); + $misc .= Html::hidden( 'wpEditToken', $this->getUser()->getEditToken() ); $misc .= Xml::closeElement( 'form' ); - $wgOut->addHTML( $misc ); + $out->addHTML( $misc ); } return true; } - private function formatRevisionRow( $row, $earliestLiveTime, $remaining, $sk ) { - global $wgLang; - + private function formatRevisionRow( $row, $earliestLiveTime, $remaining ) { $rev = Revision::newFromArchiveRow( $row, array( 'page' => $this->mTargetObj->getArticleId() ) ); $stxt = ''; @@ -1233,12 +1177,12 @@ class SpecialUndelete extends SpecialPage { if( $this->mCanView ) { $titleObj = $this->getTitle(); # Last link - if( !$rev->userCan( Revision::DELETED_TEXT ) ) { - $pageLink = htmlspecialchars( $wgLang->timeanddate( $ts, true ) ); + if( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) { + $pageLink = htmlspecialchars( $this->getLanguage()->timeanddate( $ts, true ) ); $last = wfMsgHtml( 'diff' ); - } else if( $remaining > 0 || ( $earliestLiveTime && $ts > $earliestLiveTime ) ) { - $pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk ); - $last = $sk->linkKnown( + } elseif( $remaining > 0 || ( $earliestLiveTime && $ts > $earliestLiveTime ) ) { + $pageLink = $this->getPageLink( $rev, $titleObj, $ts ); + $last = Linker::linkKnown( $titleObj, wfMsgHtml( 'diff' ), array(), @@ -1249,68 +1193,69 @@ class SpecialUndelete extends SpecialPage { ) ); } else { - $pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk ); + $pageLink = $this->getPageLink( $rev, $titleObj, $ts ); $last = wfMsgHtml( 'diff' ); } } else { - $pageLink = htmlspecialchars( $wgLang->timeanddate( $ts, true ) ); + $pageLink = htmlspecialchars( $this->getLanguage()->timeanddate( $ts, true ) ); $last = wfMsgHtml( 'diff' ); } // User links - $userLink = $sk->revUserTools( $rev ); + $userLink = Linker::revUserTools( $rev ); // Revision text size $size = $row->ar_len; if( !is_null( $size ) ) { - $stxt = $sk->formatRevisionSize( $size ); + $stxt = Linker::formatRevisionSize( $size ); } // Edit summary - $comment = $sk->revComment( $rev ); + $comment = Linker::revComment( $rev ); // Revision delete links - $revdlink = $this->revDeleteLink( $rev ); + $revdlink = Linker::getRevDeleteLink( $this->getUser(), $rev, $this->mTargetObj ); return "
  • $checkBox $revdlink ($last) $pageLink . . $userLink $stxt $comment
    • "; } - private function formatFileRow( $row, $sk ) { - global $wgUser, $wgLang; - + private function formatFileRow( $row ) { $file = ArchivedFile::newFromRow( $row ); $ts = wfTimestamp( TS_MW, $row->fa_timestamp ); if( $this->mAllowed && $row->fa_storage_key ) { $checkBox = Xml::check( 'fileid' . $row->fa_id ); $key = urlencode( $row->fa_storage_key ); - $pageLink = $this->getFileLink( $file, $this->getTitle(), $ts, $key, $sk ); + $pageLink = $this->getFileLink( $file, $this->getTitle(), $ts, $key ); } else { $checkBox = ''; - $pageLink = $wgLang->timeanddate( $ts, true ); + $pageLink = $this->getLanguage()->timeanddate( $ts, true ); } - $userLink = $this->getFileUser( $file, $sk ); + $userLink = $this->getFileUser( $file ); $data = wfMsg( 'widthheight', - $wgLang->formatNum( $row->fa_width ), - $wgLang->formatNum( $row->fa_height ) ) . + $this->getLanguage()->formatNum( $row->fa_width ), + $this->getLanguage()->formatNum( $row->fa_height ) ) . ' (' . - wfMsg( 'nbytes', $wgLang->formatNum( $row->fa_size ) ) . + wfMsg( 'nbytes', $this->getLanguage()->formatNum( $row->fa_size ) ) . ')'; $data = htmlspecialchars( $data ); - $comment = $this->getFileComment( $file, $sk ); + $comment = $this->getFileComment( $file ); + // Add show/hide deletion links if available - $canHide = $wgUser->isAllowed( 'deleterevision' ); - if( $canHide || ( $file->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) { - if( !$file->userCan( File::DELETED_RESTRICTED ) ) { - $revdlink = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops + $user = $this->getUser(); + $canHide = $user->isAllowed( 'deleterevision' ); + if( $canHide || ( $file->getVisibility() && $user->isAllowed( 'deletedhistory' ) ) ) { + if( !$file->userCan( File::DELETED_RESTRICTED, $user ) ) { + $revdlink = Linker::revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops } else { $query = array( 'type' => 'filearchive', 'target' => $this->mTargetObj->getPrefixedDBkey(), 'ids' => $row->fa_id ); - $revdlink = $sk->revDeleteLink( $query, + $revdlink = Linker::revDeleteLink( $query, $file->isDeleted( File::DELETED_RESTRICTED ), $canHide ); } } else { $revdlink = ''; } + return "
  • $checkBox $revdlink $pageLink . . $userLink $data $comment
    • \n"; } @@ -1318,18 +1263,15 @@ class SpecialUndelete extends SpecialPage { * Fetch revision text link if it's available to all users * * @param $rev Revision - * @param $sk Skin * @return string */ - function getPageLink( $rev, $titleObj, $ts, $sk ) { - global $wgLang; - - $time = htmlspecialchars( $wgLang->timeanddate( $ts, true ) ); + function getPageLink( $rev, $titleObj, $ts ) { + $time = htmlspecialchars( $this->getLanguage()->timeanddate( $ts, true ) ); - if( !$rev->userCan( Revision::DELETED_TEXT ) ) { + if( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) { return '' . $time . ''; } else { - $link = $sk->linkKnown( + $link = Linker::linkKnown( $titleObj, $time, array(), @@ -1349,23 +1291,20 @@ class SpecialUndelete extends SpecialPage { * Fetch image view link if it's available to all users * * @param $file File - * @param $sk Skin * @return String: HTML fragment */ - function getFileLink( $file, $titleObj, $ts, $key, $sk ) { - global $wgLang, $wgUser; - - if( !$file->userCan( File::DELETED_FILE ) ) { - return '' . $wgLang->timeanddate( $ts, true ) . ''; + function getFileLink( $file, $titleObj, $ts, $key ) { + if( !$file->userCan( File::DELETED_FILE, $this->getUser() ) ) { + return '' . $this->getLanguage()->timeanddate( $ts, true ) . ''; } else { - $link = $sk->linkKnown( + $link = Linker::linkKnown( $titleObj, - $wgLang->timeanddate( $ts, true ), + $this->getLanguage()->timeanddate( $ts, true ), array(), array( 'target' => $this->mTargetObj->getPrefixedText(), 'file' => $key, - 'token' => $wgUser->editToken( $key ) + 'token' => $this->getUser()->getEditToken( $key ) ) ); if( $file->isDeleted( File::DELETED_FILE ) ) { @@ -1379,15 +1318,14 @@ class SpecialUndelete extends SpecialPage { * Fetch file's user id if it's available to this user * * @param $file File - * @param $sk Skin * @return String: HTML fragment */ - function getFileUser( $file, $sk ) { - if( !$file->userCan( File::DELETED_USER ) ) { + function getFileUser( $file ) { + if( !$file->userCan( File::DELETED_USER, $this->getUser() ) ) { return '' . wfMsgHtml( 'rev-deleted-user' ) . ''; } else { - $link = $sk->userLink( $file->getRawUser(), $file->getRawUserText() ) . - $sk->userToolLinks( $file->getRawUser(), $file->getRawUserText() ); + $link = Linker::userLink( $file->getRawUser(), $file->getRawUserText() ) . + Linker::userToolLinks( $file->getRawUser(), $file->getRawUserText() ); if( $file->isDeleted( File::DELETED_USER ) ) { $link = '' . $link . ''; } @@ -1399,15 +1337,14 @@ class SpecialUndelete extends SpecialPage { * Fetch file upload comment if it's available to this user * * @param $file File - * @param $sk Skin * @return String: HTML fragment */ - function getFileComment( $file, $sk ) { - if( !$file->userCan( File::DELETED_COMMENT ) ) { + function getFileComment( $file ) { + if( !$file->userCan( File::DELETED_COMMENT, $this->getUser() ) ) { return '' . wfMsgHtml( 'rev-deleted-comment' ) . ''; } else { - $link = $sk->commentBlock( $file->getRawDescription() ); + $link = Linker::commentBlock( $file->getRawDescription() ); if( $file->isDeleted( File::DELETED_COMMENT ) ) { $link = '' . $link . ''; } @@ -1416,43 +1353,44 @@ class SpecialUndelete extends SpecialPage { } function undelete() { - global $wgOut, $wgUser; + global $wgUploadMaintenance; + + if ( $wgUploadMaintenance && $this->mTargetObj->getNamespace() == NS_FILE ) { + throw new ErrorPageError( 'undelete-error', 'filedelete-maintenance' ); + } + if ( wfReadOnly() ) { - $wgOut->readOnlyPage(); - return; + throw new ReadOnlyError; } - if( !is_null( $this->mTargetObj ) ) { - $archive = new PageArchive( $this->mTargetObj ); - wfRunHooks( 'UndeleteForm::undelete', array( &$archive, $this->mTargetObj ) ); - $ok = $archive->undelete( - $this->mTargetTimestamp, - $this->mComment, - $this->mFileVersions, - $this->mUnsuppress ); - - if( is_array( $ok ) ) { - if ( $ok[1] ) { // Undeleted file count - wfRunHooks( 'FileUndeleteComplete', array( - $this->mTargetObj, $this->mFileVersions, - $wgUser, $this->mComment ) ); - } - $skin = $wgUser->getSkin(); - $link = $skin->linkKnown( $this->mTargetObj ); - $wgOut->addWikiMsgArray( 'undeletedpage', array( $link ), array( 'replaceafter' ) ); - } else { - $wgOut->showFatalError( wfMsg( 'cannotundelete' ) ); - $wgOut->addWikiMsg( 'undeleterevdel' ); + $out = $this->getOutput(); + $archive = new PageArchive( $this->mTargetObj ); + wfRunHooks( 'UndeleteForm::undelete', array( &$archive, $this->mTargetObj ) ); + $ok = $archive->undelete( + $this->mTargetTimestamp, + $this->mComment, + $this->mFileVersions, + $this->mUnsuppress ); + + if( is_array( $ok ) ) { + if ( $ok[1] ) { // Undeleted file count + wfRunHooks( 'FileUndeleteComplete', array( + $this->mTargetObj, $this->mFileVersions, + $this->getUser(), $this->mComment ) ); } - // Show file deletion warnings and errors - $status = $archive->getFileStatus(); - if( $status && !$status->isGood() ) { - $wgOut->addWikiText( $status->getWikiText( 'undelete-error-short', 'undelete-error-long' ) ); - } + $link = Linker::linkKnown( $this->mTargetObj ); + $out->addHTML( $this->msg( 'undeletedpage' )->rawParams( $link )->parse() ); } else { - $wgOut->showFatalError( wfMsg( 'cannotundelete' ) ); + $out->setPageTitle( $this->msg( 'undelete-error' ) ); + $out->addWikiMsg( 'cannotundelete' ); + $out->addWikiMsg( 'undeleterevdel' ); + } + + // Show file deletion warnings and errors + $status = $archive->getFileStatus(); + if( $status && !$status->isGood() ) { + $out->addWikiText( $status->getWikiText( 'undelete-error-short', 'undelete-error-long' ) ); } - return false; } }
       " . 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::submitButton( wfMsg( 'undeleteinvert' ), array( 'name' => 'invert', 'id' => 'mw-undelete-invert' ) ) . "