' .
- $sk->link(
+ '' .
+ Linker::link(
$targetPage,
- wfMsgHtml(
+ $this->msg(
'revisionasof',
- htmlspecialchars( $wgLang->timeanddate( $rev->getTimestamp(), true ) ),
- htmlspecialchars( $wgLang->date( $rev->getTimestamp(), true ) ),
- htmlspecialchars( $wgLang->time( $rev->getTimestamp(), true ) )
- ),
+ $lang->userTimeAndDate( $rev->getTimestamp(), $user ),
+ $lang->userDate( $rev->getTimestamp(), $user ),
+ $lang->userTime( $rev->getTimestamp(), $user )
+ )->escaped(),
array(),
$targetQuery
) .
'
' .
'' .
- $sk->revUserTools( $rev ) . '
' .
+ Linker::revUserTools( $rev ) . '
' .
'
' .
'' .
- $sk->revComment( $rev ) . $del . '
' .
+ Linker::revComment( $rev ) . $rdel . '
' .
'
';
}
@@ -993,22 +961,24 @@ 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',
+ $out = $this->getOutput();
+ $lang = $this->getLanguage();
+ $user = $this->getUser();
+ $file = new ArchivedFile( $this->mTargetObj, '', $this->mFilename );
+ $out->addWikiMsg( 'undelete-show-file-confirm',
$this->mTargetObj->getText(),
- $wgLang->date( $file->getTimestamp() ),
- $wgLang->time( $file->getTimestamp() ) );
- $wgOut->addHTML(
+ $lang->userDate( $file->getTimestamp(), $user ),
+ $lang->userTime( $file->getTimestamp(), $user ) );
+ $out->addHTML(
Xml::openElement( 'form', array(
'method' => 'POST',
- 'action' => $this->getTitle()->getLocalUrl(
+ 'action' => $this->getTitle()->getLocalURL(
'target=' . urlencode( $this->mTarget ) .
'&file=' . urlencode( $key ) .
- '&token=' . urlencode( $wgUser->editToken( $key ) ) )
+ '&token=' . urlencode( $user->getEditToken( $key ) ) )
)
) .
- Xml::submitButton( wfMsg( 'undelete-show-file-submit' ) ) .
+ Xml::submitButton( $this->msg( 'undelete-show-file-submit' )->text() ) .
''
);
}
@@ -1017,52 +987,49 @@ 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 );
+ $repo->streamFile( $path );
}
- private function showHistory( ) {
- global $wgUser, $wgOut;
-
- $sk = $wgUser->getSkin();
+ private function showHistory() {
+ $out = $this->getOutput();
if( $this->mAllowed ) {
- $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
- } else {
- $wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
+ $out->addModules( 'mediawiki.special.undelete' );
}
-
- $wgOut->wrapWikiMsg( "\n$1\n
\n", array ( 'undeletepagetitle', $this->mTargetObj->getPrefixedText() ) );
+ $out->wrapWikiMsg(
+ "\n$1\n
\n",
+ array( 'undeletepagetitle', $this->mTargetObj->getPrefixedText() )
+ );
$archive = new PageArchive( $this->mTargetObj );
+ wfRunHooks( 'UndeleteForm::showHistory', array( &$archive, $this->mTargetObj ) );
/*
$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( '
| |
" .
- Xml::checkLabel( wfMsg('revdelete-unsuppress'), 'wpUnsuppress',
- 'mw-undelete-unsuppress', $this->mUnsuppress ).
+ Xml::checkLabel( $this->msg( 'revdelete-unsuppress' )->text(),
+ 'wpUnsuppress', 'mw-undelete-unsuppress', $this->mUnsuppress ).
" |
";
} else {
- $unsuppressBox = "";
+ $unsuppressBox = '';
}
$table =
- Xml::fieldset( wfMsg( 'undelete-fieldset-title' ) ) .
+ Xml::fieldset( $this->msg( 'undelete-fieldset-title' )->text() ) .
Xml::openElement( 'table', array( 'id' => 'mw-undelete-table' ) ) .
"
| " .
- Xml::label( wfMsg( 'undeletecomment' ), 'wpComment' ) .
+ Xml::label( $this->msg( 'undeletecomment' )->text(), 'wpComment' ) .
" |
" .
Xml::input( 'wpComment', 50, $this->mComment, array( 'id' => 'wpComment' ) ) .
@@ -1141,60 +1108,57 @@ class SpecialUndelete extends SpecialPage {
|
| |
" .
- 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' ) ) .
+ Xml::submitButton( $this->msg( 'undeletebtn' )->text(), array( 'name' => 'restore', 'id' => 'mw-undelete-submit' ) ) . ' ' .
+ Xml::submitButton( $this->msg( 'undeleteinvert' )->text(), array( 'name' => 'invert', 'id' => 'mw-undelete-invert' ) ) .
" |
" .
$unsuppressBox .
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, $this->msg( 'history' )->text() ) . "\n" );
if( $haveRevisions ) {
# The page's stored (deleted) history:
- $wgOut->addHTML("");
+ $out->addHTML( '' );
$remaining = $revisions->numRows();
$earliestLiveTime = $this->mTargetObj->getEarliestRevTime();
foreach ( $revisions as $row ) {
$remaining--;
- $wgOut->addHTML( $this->formatRevisionRow( $row, $earliestLiveTime, $remaining, $sk ) );
+ $out->addHTML( $this->formatRevisionRow( $row, $earliestLiveTime, $remaining ) );
}
$revisions->free();
- $wgOut->addHTML("
");
+ $out->addHTML( '
' );
} else {
- $wgOut->addWikiMsg( "nohistory" );
+ $out->addWikiMsg( 'nohistory' );
}
if( $haveFiles ) {
- $wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'filehist' ) ) . "\n" );
- $wgOut->addHTML( "" );
+ $out->addHTML( Xml::element( 'h2', null, $this->msg( 'filehist' )->text() ) . "\n" );
+ $out->addHTML( '' );
foreach ( $files as $row ) {
- $wgOut->addHTML( $this->formatFileRow( $row, $sk ) );
+ $out->addHTML( $this->formatFileRow( $row ) );
}
$files->free();
- $wgOut->addHTML( "
" );
+ $out->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 $wgUser, $wgLang;
-
+ private function formatRevisionRow( $row, $earliestLiveTime, $remaining ) {
$rev = Revision::newFromArchiveRow( $row,
array( 'page' => $this->mTargetObj->getArticleId() ) );
$stxt = '';
@@ -1203,7 +1167,7 @@ class SpecialUndelete extends SpecialPage {
if( $this->mAllowed ) {
if( $this->mInvert ) {
if( in_array( $ts, $this->mTargetTimestamp ) ) {
- $checkBox = Xml::check( "ts$ts");
+ $checkBox = Xml::check( "ts$ts" );
} else {
$checkBox = Xml::check( "ts$ts", true );
}
@@ -1213,18 +1177,19 @@ class SpecialUndelete extends SpecialPage {
} else {
$checkBox = '';
}
+ $user = $this->getUser();
// Build page & diff links...
if( $this->mCanView ) {
$titleObj = $this->getTitle();
# Last link
- if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
- $pageLink = htmlspecialchars( $wgLang->timeanddate( $ts, true ) );
- $last = wfMsgHtml('diff');
- } else if( $remaining > 0 || ($earliestLiveTime && $ts > $earliestLiveTime) ) {
- $pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk );
- $last = $sk->linkKnown(
+ if( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
+ $pageLink = htmlspecialchars( $this->getLanguage()->userTimeAndDate( $ts, $user ) );
+ $last = $this->msg( 'diff' )->escaped();
+ } elseif( $remaining > 0 || ( $earliestLiveTime && $ts > $earliestLiveTime ) ) {
+ $pageLink = $this->getPageLink( $rev, $titleObj, $ts );
+ $last = Linker::linkKnown(
$titleObj,
- wfMsgHtml('diff'),
+ $this->msg( 'diff' )->escaped(),
array(),
array(
'target' => $this->mTargetObj->getPrefixedText(),
@@ -1233,82 +1198,64 @@ class SpecialUndelete extends SpecialPage {
)
);
} else {
- $pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk );
- $last = wfMsgHtml('diff');
+ $pageLink = $this->getPageLink( $rev, $titleObj, $ts );
+ $last = $this->msg( 'diff' )->escaped();
}
} else {
- $pageLink = htmlspecialchars( $wgLang->timeanddate( $ts, true ) );
- $last = wfMsgHtml('diff');
+ $pageLink = htmlspecialchars( $this->getLanguage()->userTimeAndDate( $ts, $user ) );
+ $last = $this->msg( 'diff' )->escaped();
}
// User links
- $userLink = $sk->revUserTools( $rev );
+ $userLink = Linker::revUserTools( $rev );
// Revision text size
- if( !is_null($size = $row->ar_len) ) {
- $stxt = $sk->formatRevisionSize( $size );
+ $size = $row->ar_len;
+ if( !is_null( $size ) ) {
+ $stxt = Linker::formatRevisionSize( $size );
}
// Edit summary
- $comment = $sk->revComment( $rev );
+ $comment = Linker::revComment( $rev );
// Revision delete links
- $canHide = $wgUser->isAllowed( 'deleterevision' );
- if( $canHide || ($rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' )) ) {
- if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
- $revdlink = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
- } else {
- $query = array(
- 'type' => 'archive',
- 'target' => $this->mTargetObj->getPrefixedDBkey(),
- 'ids' => $ts
- );
- $revdlink = $sk->revDeleteLink( $query,
- $rev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
- }
- } else {
- $revdlink = '';
- }
+ $revdlink = Linker::getRevDeleteLink( $user, $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 );
+ $user = $this->getUser();
if( $this->mAllowed && $row->fa_storage_key ) {
- $checkBox = Xml::check( "fileid" . $row->fa_id );
+ $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()->userTimeAndDate( $ts, $user );
}
- $userLink = $this->getFileUser( $file, $sk );
- $data =
- wfMsg( 'widthheight',
- $wgLang->formatNum( $row->fa_width ),
- $wgLang->formatNum( $row->fa_height ) ) .
- ' (' .
- wfMsg( 'nbytes', $wgLang->formatNum( $row->fa_size ) ) .
- ')';
- $data = htmlspecialchars( $data );
- $comment = $this->getFileComment( $file, $sk );
+ $userLink = $this->getFileUser( $file );
+ $data = $this->msg( 'widthheight' )->numParams( $row->fa_width, $row->fa_height )->text();
+ $bytes = $this->msg( 'parentheses' )->rawParams( $this->msg( 'nbytes' )->numParams( $row->fa_size )->text() )->plain();
+ $data = htmlspecialchars( $data . ' ' . $bytes );
+ $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
+ $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";
}
@@ -1316,28 +1263,29 @@ class SpecialUndelete extends SpecialPage {
* Fetch revision text link if it's available to all users
*
* @param $rev Revision
- * @param $sk Skin
+ * @param $titleObj Title
+ * @param $ts string Timestamp
* @return string
*/
- function getPageLink( $rev, $titleObj, $ts, $sk ) {
- global $wgLang;
-
- $time = htmlspecialchars( $wgLang->timeanddate( $ts, true ) );
+ function getPageLink( $rev, $titleObj, $ts ) {
+ $user = $this->getUser();
+ $time = $this->getLanguage()->userTimeAndDate( $ts, $user );
- if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
+ if( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
return '' . $time . '';
} else {
- $link = $sk->linkKnown(
+ $link = Linker::linkKnown(
$titleObj,
- $time,
+ htmlspecialchars( $time ),
array(),
array(
'target' => $this->mTargetObj->getPrefixedText(),
'timestamp' => $ts
)
);
- if( $rev->isDeleted(Revision::DELETED_TEXT) )
+ if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
$link = '' . $link . '';
+ }
return $link;
}
}
@@ -1346,27 +1294,32 @@ class SpecialUndelete extends SpecialPage {
* Fetch image view link if it's available to all users
*
* @param $file File
- * @param $sk Skin
+ * @param $titleObj Title
+ * @param $ts string A timestamp
+ * @param $key String: a storage key
+ *
* @return String: HTML fragment
*/
- function getFileLink( $file, $titleObj, $ts, $key, $sk ) {
- global $wgLang, $wgUser;
+ function getFileLink( $file, $titleObj, $ts, $key ) {
+ $user = $this->getUser();
+ $time = $this->getLanguage()->userTimeAndDate( $ts, $user );
- if( !$file->userCan( File::DELETED_FILE ) ) {
- return '' . $wgLang->timeanddate( $ts, true ) . '';
+ if( !$file->userCan( File::DELETED_FILE, $user ) ) {
+ return '' . $time . '';
} else {
- $link = $sk->linkKnown(
+ $link = Linker::linkKnown(
$titleObj,
- $wgLang->timeanddate( $ts, true ),
+ htmlspecialchars( $time ),
array(),
array(
'target' => $this->mTargetObj->getPrefixedText(),
'file' => $key,
- 'token' => $wgUser->editToken( $key )
+ 'token' => $user->getEditToken( $key )
)
);
- if( $file->isDeleted(File::DELETED_FILE) )
+ if( $file->isDeleted( File::DELETED_FILE ) ) {
$link = '' . $link . '';
+ }
return $link;
}
}
@@ -1375,17 +1328,17 @@ 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 ) ) {
- return '' . wfMsgHtml( 'rev-deleted-user' ) . '';
+ function getFileUser( $file ) {
+ if( !$file->userCan( File::DELETED_USER, $this->getUser() ) ) {
+ return '' . $this->msg( 'rev-deleted-user' )->escaped() . '';
} else {
- $link = $sk->userLink( $file->getRawUser(), $file->getRawUserText() ) .
- $sk->userToolLinks( $file->getRawUser(), $file->getRawUserText() );
- if( $file->isDeleted( File::DELETED_USER ) )
+ $link = Linker::userLink( $file->getRawUser(), $file->getRawUserText() ) .
+ Linker::userToolLinks( $file->getRawUser(), $file->getRawUserText() );
+ if( $file->isDeleted( File::DELETED_USER ) ) {
$link = '' . $link . '';
+ }
return $link;
}
}
@@ -1394,56 +1347,60 @@ 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 ) ) {
- return '';
+ function getFileComment( $file ) {
+ if( !$file->userCan( File::DELETED_COMMENT, $this->getUser() ) ) {
+ return '';
} else {
- $link = $sk->commentBlock( $file->getRawDescription() );
- if( $file->isDeleted(File::DELETED_COMMENT) )
+ $link = Linker::commentBlock( $file->getRawDescription() );
+ if( $file->isDeleted( File::DELETED_COMMENT ) ) {
$link = '' . $link . '';
+ }
return $link;
}
}
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 );
- $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' );
- }
- // Show file deletion warnings and errors
- $status = $archive->getFileStatus();
- if( $status && !$status->isGood() ) {
- $wgOut->addWikiText( $status->getWikiText( 'undelete-error-short', 'undelete-error-long' ) );
+ $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 ) );
}
+
+ $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;
}
}