<?php
-
/**
- * Special page allowing users with the appropriate permissions to view
- * and restore deleted content
+ * Implements Special:Undelete
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
*
* @file
* @ingroup SpecialPage
*/
-/**
- * Constructor
- */
-function wfSpecialUndelete( $par ) {
- global $wgRequest;
-
- $form = new UndeleteForm( $wgRequest, $par );
- $form->execute();
-}
-
/**
* Used to show archived pages and eventually restore them.
+ *
* @ingroup SpecialPage
*/
class PageArchive {
+
+ /**
+ * @var Title
+ */
protected $title;
var $fileStatus;
function __construct( $title ) {
if( is_null( $title ) ) {
- throw new MWException( 'Archiver() given a null title.');
+ throw new MWException( __METHOD__ . ' given a null title.' );
}
$this->title = $title;
}
* given title prefix.
* Returns result wrapper with (ar_namespace, ar_title, count) fields.
*
+ * @param $prefix String: title prefix
* @return ResultWrapper
*/
public static function listPagesByPrefix( $prefix ) {
$title = Title::newFromText( $prefix );
if( $title ) {
$ns = $title->getNamespace();
- $encPrefix = $dbr->escapeLike( $title->getDBkey() );
+ $prefix = $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%'",
+ 'ar_title' . $dbr->buildLike( $prefix, $dbr->anyString() ),
);
return self::listPages( $dbr, $conds );
}
$res = $dbr->select( 'archive',
array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment', 'ar_len', 'ar_deleted' ),
array( 'ar_namespace' => $this->title->getNamespace(),
- 'ar_title' => $this->title->getDBkey() ),
+ 'ar_title' => $this->title->getDBkey() ),
'PageArchive::listRevisions',
array( 'ORDER BY' => 'ar_timestamp DESC' ) );
$ret = $dbr->resultObject( $res );
* Fetch (and decompress if necessary) the stored text for the deleted
* revision of the page with the given timestamp.
*
- * @return string
+ * @param $timestamp String
+ * @return String
* @deprecated Use getRevision() for more flexible information
*/
function getRevisionText( $timestamp ) {
/**
* 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
+ *
+ * @param $timestamp String
* @return Revision
*/
function getRevision( $timestamp ) {
'ar_deleted',
'ar_len' ),
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 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,
- 'deleted' => $row->ar_deleted,
- 'len' => $row->ar_len) );
+ return Revision::newFromArchiveRow( $row, array( 'page' => $this->title->getArticleId() ) );
} else {
return null;
}
* May produce unexpected results in case of history merges or other
* unusual time issues.
*
- * @param string $timestamp
+ * @param $timestamp String
* @return Revision or null
*/
function getPreviousRevision( $timestamp ) {
$row = $dbr->selectRow( 'archive',
'ar_timestamp',
array( 'ar_namespace' => $this->title->getNamespace(),
- 'ar_title' => $this->title->getDBkey(),
- 'ar_timestamp < ' .
+ 'ar_title' => $this->title->getDBkey(),
+ 'ar_timestamp < ' .
$dbr->addQuotes( $dbr->timestamp( $timestamp ) ) ),
__METHOD__,
array(
/**
* Get the text from an archive row containing ar_text, ar_flags and ar_text_id
+ *
+ * @param $row Object: database row
+ * @return Revision
*/
function getTextFromRow( $row ) {
if( is_null( $row->ar_text_id ) ) {
*
* If there are no archived revisions for the page, returns NULL.
*
- * @return string
+ * @return String
*/
function getLastRevisionText() {
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow( 'archive',
array( 'ar_text', 'ar_flags', 'ar_text_id' ),
array( 'ar_namespace' => $this->title->getNamespace(),
- 'ar_title' => $this->title->getDBkey() ),
- 'PageArchive::getLastRevisionText',
+ 'ar_title' => $this->title->getDBkey() ),
+ __METHOD__,
array( 'ORDER BY' => 'ar_timestamp DESC' ) );
if( $row ) {
return $this->getTextFromRow( $row );
} else {
- return NULL;
+ return null;
}
}
/**
* Quick check if any archived revisions are present for the page.
- * @return bool
+ *
+ * @return Boolean
*/
function isDeleted() {
$dbr = wfGetDB( DB_SLAVE );
$n = $dbr->selectField( 'archive', 'COUNT(ar_title)',
array( 'ar_namespace' => $this->title->getNamespace(),
- 'ar_title' => $this->title->getDBkey() ) );
+ 'ar_title' => $this->title->getDBkey() ) );
return ($n > 0);
}
* 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
- * @param bool $unsuppress
+ * @param $timestamps Array: pass an empty array to restore all revisions, otherwise list the ones to undelete.
+ * @param $comment String
+ * @param $fileVersions Array
+ * @param $unsuppress Boolean
*
* @return array(number of file revisions restored, number of image revisions restored, log message)
* on success, false on failure
if( $restoreFiles && $this->title->getNamespace() == NS_FILE ) {
$img = wfLocalFile( $this->title );
$this->fileStatus = $img->restore( $fileVersions, $unsuppress );
+ if ( !$this->fileStatus->isOk() ) {
+ return false;
+ }
$filesRestored = $this->fileStatus->successCount;
} else {
$filesRestored = 0;
}
if( $restoreText ) {
- $textRestored = $this->undeleteRevisions( $timestamps, $unsuppress );
- if($textRestored === false) // It must be one of UNDELETE_*
+ $textRestored = $this->undeleteRevisions( $timestamps, $unsuppress, $comment );
+ if( $textRestored === false ) { // It must be one of UNDELETE_*
return false;
+ }
} else {
$textRestored = 0;
}
}
if( trim( $comment ) != '' )
- $reason .= ": {$comment}";
+ $reason .= wfMsgForContent( 'colon-separator' ) . $comment;
$log->addEntry( 'restore', $this->title, $reason );
return array($textRestored, $filesRestored, $reason);
* 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.
*
- * @param array $timestamps Pass an empty array to restore all revisions, otherwise list the ones to undelete.
- * @param string $comment
- * @param array $fileVersions
- * @param bool $unsuppress, remove all ar_deleted/fa_deleted restrictions of seletected revs
+ * @param $timestamps Array: pass an empty array to restore all revisions, otherwise list the ones to undelete.
+ * @param $comment String
+ * @param $unsuppress Boolean: remove all ar_deleted/fa_deleted restrictions of seletected revs
*
- * @return mixed number of revisions restored or false on failure
+ * @return Mixed: number of revisions restored or false on failure
*/
- private function undeleteRevisions( $timestamps, $unsuppress = false ) {
+ private function undeleteRevisions( $timestamps, $unsuppress = false, $comment = '' ) {
if ( wfReadOnly() )
return false;
$restoreAll = empty( $timestamps );
# Does this page already exist? We'll have to update it...
$article = new Article( $this->title );
- $options = 'FOR UPDATE';
+ $options = 'FOR UPDATE'; // lock page
$page = $dbw->selectRow( 'page',
array( 'page_id', 'page_latest' ),
array( 'page_namespace' => $this->title->getNamespace(),
- 'page_title' => $this->title->getDBkey() ),
+ 'page_title' => $this->title->getDBkey() ),
__METHOD__,
- $options );
+ $options
+ );
if( $page ) {
$makepage = false;
# Page already exists. Import the history, and if necessary
$oldones ),
__METHOD__,
/* options */ array( 'ORDER BY' => 'ar_timestamp' )
- );
+ );
$ret = $dbw->resultObject( $result );
$rev_count = $dbw->numRows( $result );
+ if( !$rev_count ) {
+ wfDebug( __METHOD__.": no revisions to restore\n" );
+ return false; // ???
+ }
+
+ $ret->seek( $rev_count - 1 ); // move to last
+ $row = $ret->fetchObject(); // get newest archived rev
+ $ret->seek( 0 ); // move back
if( $makepage ) {
+ // Check the state of the newest to-be version...
+ if( !$unsuppress && ($row->ar_deleted & Revision::DELETED_TEXT) ) {
+ return false; // we can't leave the current revision like this!
+ }
+ // Safe to insert now...
$newid = $article->insertOn( $dbw );
$pageId = $newid;
+ } else {
+ // Check if a deleted revision will become the current revision...
+ if( $row->ar_timestamp > $previousTimestamp ) {
+ // Check the state of the newest to-be version...
+ if( !$unsuppress && ($row->ar_deleted & Revision::DELETED_TEXT) ) {
+ return false; // we can't leave the current revision like this!
+ }
+ }
}
$revision = null;
$restored = 0;
- while( $row = $ret->fetchObject() ) {
- if( $row->ar_text_id ) {
- // Revision was deleted in 1.5+; text is in
- // the regular text table, use the reference.
- // Specify null here so the so the text is
- // dereferenced for page length info if needed.
- $revText = null;
- } else {
- // Revision was deleted in 1.4 or earlier.
- // Text is squashed into the archive row, and
- // a new text table entry will be created for it.
- $revText = Revision::getRevisionText( $row, 'ar_' );
- }
+ foreach ( $ret as $row ) {
// Check for key dupes due to shitty archive integrity.
if( $row->ar_rev_id ) {
$exists = $dbw->selectField( 'revision', '1', array('rev_id' => $row->ar_rev_id), __METHOD__ );
if( $exists ) continue; // don't throw DB errors
}
-
- $revision = new Revision( array(
- 'page' => $pageId,
- 'id' => $row->ar_rev_id,
- 'text' => $revText,
- '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,
- 'deleted' => $unsuppress ? 0 : $row->ar_deleted,
- 'len' => $row->ar_len
+ // Insert one revision at a time...maintaining deletion status
+ // unless we are specifically removing all restrictions...
+ $revision = Revision::newFromArchiveRow( $row,
+ array(
+ 'page' => $pageId,
+ 'deleted' => $unsuppress ? 0 : $row->ar_deleted
) );
+
$revision->insertOn( $dbw );
$restored++;
'ar_title' => $this->title->getDBkey(),
$oldones ),
__METHOD__ );
-
+
// Was anything restored at all?
if( $restored == 0 )
return 0;
if( $newid || $wasnew ) {
// Update site stats, link tables, etc
$article->createUpdates( $revision );
- // We don't handle well with top revision deleted
- if( $revision->getVisibility() ) {
- $dbw->update( 'revision',
- array( 'rev_deleted' => 0 ),
- array( 'rev_id' => $revision->getId() ),
- __METHOD__
- );
- }
}
if( $newid ) {
- wfRunHooks( 'ArticleUndelete', array( &$this->title, true ) );
+ wfRunHooks( 'ArticleUndelete', array( &$this->title, true, $comment ) );
Article::onArticleCreate( $this->title );
} else {
- wfRunHooks( 'ArticleUndelete', array( &$this->title, false ) );
+ wfRunHooks( 'ArticleUndelete', array( &$this->title, false, $comment ) );
Article::onArticleEdit( $this->title );
}
}
} else {
// Revision couldn't be created. This is very weird
- return self::UNDELETE_UNKNOWNERR;
+ wfDebug( "Undelete: unknown error...\n" );
+ return false;
}
return $restored;
}
+ /**
+ * @return Status
+ */
function getFileStatus() { return $this->fileStatus; }
}
/**
- * The HTML form for Special:Undelete, which allows users with the appropriate
- * permissions to view and restore deleted content.
+ * Special page allowing users with the appropriate permissions to view
+ * and restore deleted content.
+ *
* @ingroup SpecialPage
*/
-class UndeleteForm {
+class SpecialUndelete extends SpecialPage {
var $mAction, $mTarget, $mTimestamp, $mRestore, $mInvert, $mTargetObj;
- var $mTargetTimestamp, $mAllowed, $mComment, $mToken;
+ var $mTargetTimestamp, $mAllowed, $mCanView, $mComment, $mToken, $mRequest;
+
+ function __construct( $request = null ) {
+ parent::__construct( 'Undelete', 'deletedhistory' );
- function UndeleteForm( $request, $par = "" ) {
+ if ( $request === null ) {
+ global $wgRequest;
+ $this->mRequest = $wgRequest;
+ } else {
+ $this->mRequest = $request;
+ }
+ }
+
+ function loadRequest() {
global $wgUser;
- $this->mAction = $request->getVal( 'action' );
- $this->mTarget = $request->getVal( 'target' );
- $this->mSearchPrefix = $request->getText( 'prefix' );
- $time = $request->getVal( 'timestamp' );
+ $this->mAction = $this->mRequest->getVal( 'action' );
+ $this->mTarget = $this->mRequest->getVal( 'target' );
+ $this->mSearchPrefix = $this->mRequest->getText( 'prefix' );
+ $time = $this->mRequest->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->mInvert = $request->getCheck( 'invert' ) && $posted;
- $this->mPreview = $request->getCheck( 'preview' ) && $posted;
- $this->mDiff = $request->getCheck( 'diff' );
- $this->mComment = $request->getText( 'wpComment' );
- $this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $wgUser->isAllowed( 'suppressrevision' );
- $this->mToken = $request->getVal( 'token' );
-
- if( $par != "" ) {
- $this->mTarget = $par;
- }
+ $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->mAllowed = true;
- } else {
+ $this->mAllowed = true; // user can restore
+ $this->mCanView = true; // user can view content
+ } elseif ( $wgUser->isAllowed( 'deletedtext' ) ) {
+ $this->mAllowed = false; // user cannot restore
+ $this->mCanView = true; // user can view content
+ } else { // user can only view the list of revisions
$this->mAllowed = false;
+ $this->mCanView = false;
$this->mTimestamp = '';
$this->mRestore = false;
}
- if ( $this->mTarget !== "" ) {
- $this->mTargetObj = Title::newFromURL( $this->mTarget );
- } else {
- $this->mTargetObj = NULL;
- }
+
if( $this->mRestore || $this->mInvert ) {
$timestamps = array();
$this->mFileVersions = array();
}
}
- function execute() {
+ function execute( $par ) {
global $wgOut, $wgUser;
+
+ $this->setHeaders();
+ if ( !$this->userCanExecute( $wgUser ) ) {
+ $this->displayRestrictionError();
+ return;
+ }
+ $this->outputHeader();
+
+ $this->loadRequest();
+
if ( $this->mAllowed ) {
$wgOut->setPagetitle( wfMsg( "undeletepage" ) );
} else {
$wgOut->setPagetitle( wfMsg( "viewdeletedpage" ) );
}
+ 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 ) ) {
# Not all users can just browse every deleted page from the list
if( $wgUser->isAllowed( 'browsearchive' ) ) {
if( $this->mFile !== null ) {
$file = new ArchivedFile( $this->mTargetObj, '', $this->mFile );
// Check if user is allowed to see this file
- if( !$file->userCan( File::DELETED_FILE ) ) {
- $wgOut->permissionRequired( 'suppressrevision' );
+ if ( !$file->exists() ) {
+ $wgOut->addWikiMsg( 'filedelete-nofile', $this->mFile );
+ return;
+ } else if( !$file->userCan( File::DELETED_FILE ) ) {
+ if( $file->isDeleted( File::DELETED_RESTRICTED ) ) {
+ $wgOut->permissionRequired( 'suppressrevision' );
+ } else {
+ $wgOut->permissionRequired( 'deletedtext' );
+ }
return false;
} elseif ( !$wgUser->matchEditToken( $this->mToken, $this->mFile ) ) {
$this->showFileConfirmationForm( $this->mFile );
}
}
if( $this->mRestore && $this->mAction == "submit" ) {
+ global $wgUploadMaintenance;
+ if( $wgUploadMaintenance && $this->mTargetObj && $this->mTargetObj->getNamespace() == NS_FILE ) {
+ $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>\n", array( 'filedelete-maintenance' ) );
+ return;
+ }
return $this->undelete();
}
if( $this->mInvert && $this->mAction == "submit" ) {
'method' => 'get',
'action' => $wgScript ) ) .
Xml::fieldset( wfMsg( 'undelete-search-box' ) ) .
- Xml::hidden( 'title',
- SpecialPage::getTitleFor( 'Undelete' )->getPrefixedDbKey() ) .
+ Html::hidden( 'title',
+ $this->getTitle()->getPrefixedDbKey() ) .
Xml::inputLabel( wfMsg( 'undelete-search-prefix' ),
'prefix', 'prefix', 20,
$this->mSearchPrefix ) . ' ' .
// Generic list of deleted pages
private function showList( $result ) {
- global $wgLang, $wgContLang, $wgUser, $wgOut;
+ global $wgLang, $wgUser, $wgOut;
if( $result->numRows() == 0 ) {
$wgOut->addWikiMsg( 'undelete-no-results' );
$wgOut->addWikiMsg( 'undeletepagetext', $wgLang->formatNum( $result->numRows() ) );
$sk = $wgUser->getSkin();
- $undelete = SpecialPage::getTitleFor( 'Undelete' );
+ $undelete = $this->getTitle();
$wgOut->addHTML( "<ul>\n" );
- while( $row = $result->fetchObject() ) {
+ foreach ( $result as $row ) {
$title = Title::makeTitleSafe( $row->ar_namespace, $row->ar_title );
- $link = $sk->makeKnownLinkObj( $undelete, htmlspecialchars( $title->getPrefixedText() ),
- 'target=' . $title->getPrefixedUrl() );
+ $link = $sk->linkKnown(
+ $undelete,
+ htmlspecialchars( $title->getPrefixedText() ),
+ array(),
+ array( 'target' => $title->getPrefixedText() )
+ );
$revs = wfMsgExt( 'undeleterevisions',
array( 'parseinline' ),
$wgLang->formatNum( $row->count ) );
private function showRevision( $timestamp ) {
global $wgLang, $wgUser, $wgOut;
- $self = SpecialPage::getTitleFor( 'Undelete' );
+
$skin = $wgUser->getSkin();
if(!preg_match("/[0-9]{14}/",$timestamp)) return 0;
if( $rev->isDeleted(Revision::DELETED_TEXT) ) {
if( !$rev->userCan(Revision::DELETED_TEXT) ) {
- $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-permission' );
+ $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-permission' );
return;
} else {
- $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-view' );
- $wgOut->addHTML( '<br/>' );
+ $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-view' );
+ $wgOut->addHTML( '<br />' );
// and we are allowed to see...
}
}
$wgOut->setPageTitle( wfMsg( 'undeletepage' ) );
- $link = $skin->makeKnownLinkObj(
- SpecialPage::getTitleFor( 'Undelete', $this->mTargetObj->getPrefixedDBkey() ),
+ $link = $skin->linkKnown(
+ $this->getTitle( $this->mTargetObj->getPrefixedDBkey() ),
htmlspecialchars( $this->mTargetObj->getPrefixedText() )
);
} else {
$openDiv = '<div id="mw-undelete-revision">';
}
+ $wgOut->addHTML( $openDiv );
- $wgOut->addHTML( $openDiv . wfMsgWikiHtml( 'undelete-revision', $link, $time, $user, $d, $t ) . '</div>' );
+ // Revision delete links
+ $canHide = $wgUser->isAllowed( 'deleterevision' );
+ if ( !$this->mDiff && ( $canHide || ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) ) {
+ if( !$rev->userCan(Revision::DELETED_RESTRICTED ) ) {
+ $wgOut->addHTML( $skin->revDeleteLinkDisabled( $canHide ) ); // revision was hidden from sysops
+ } else {
+ $query = array(
+ 'type' => 'archive',
+ 'target' => $this->mTargetObj->getPrefixedDBkey(),
+ 'ids' => $rev->getTimestamp()
+ );
+ $wgOut->addHTML( $skin->revDeleteLink( $query,
+ $rev->isDeleted( File::DELETED_RESTRICTED ), $canHide ) );
+ }
+ }
+
+ $wgOut->addWikiMsgArray( 'undelete-revision', array( $link, $time, $user, $d, $t ), array( 'replaceafter' ) );
+ $wgOut->addHTML( '</div>' );
wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) );
if( $this->mPreview ) {
Xml::openElement( 'div' ) .
Xml::openElement( 'form', array(
'method' => 'post',
- 'action' => $self->getLocalURL( "action=submit" ) ) ) .
+ 'action' => $this->getTitle()->getLocalURL( array( 'action' => 'submit' ) ) ) ) .
Xml::element( 'input', array(
'type' => 'hidden',
'name' => 'target',
/**
* Build a diff display between this and the previous either deleted
* or non-deleted edit.
- * @param Revision $previousRev
- * @param Revision $currentRev
- * @return string HTML
+ *
+ * @param $previousRev Revision
+ * @param $currentRev Revision
+ * @return String: HTML
*/
function showDiff( $previousRev, $currentRev ) {
global $wgOut;
- $diffEngine = new DifferenceEngine();
+ $diffEngine = new DifferenceEngine( $previousRev->getTitle() );
$diffEngine->showDiffStyle();
$wgOut->addHTML(
"<div>" .
$diffEngine->generateDiffBody(
$previousRev->getText(), $currentRev->getText() ) .
"</table>" .
- "</div>\n" );
-
+ "</div>\n"
+ );
}
+ /**
+ * @param $rev Revision
+ * @param $prefix
+ * @return string
+ */
private function diffHeader( $rev, $prefix ) {
- global $wgUser, $wgLang, $wgLang;
+ global $wgUser, $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() );
+ /// @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 {
- /// @fixme getId() may return non-zero for deleted revs...
+ /// @todo Fixme getId() may return non-zero for deleted revs...
$targetPage = $rev->getTitle();
- $targetQuery = 'oldid=' . $rev->getId();
+ $targetQuery = array( 'oldid' => $rev->getId() );
+ }
+ // Add show/hide deletion links if available
+ $canHide = $wgUser->isAllowed( 'deleterevision' );
+ if( $canHide || ($rev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) {
+ $del = ' ';
+ if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
+ $del .= $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
+ } else {
+ $query = array(
+ 'type' => 'archive',
+ 'target' => $this->mTargetObj->getPrefixedDbkey(),
+ 'ids' => $rev->getTimestamp()
+ );
+ $del .= $sk->revDeleteLink( $query,
+ $rev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
+ }
+ } else {
+ $del = '';
}
return
'<div id="mw-diff-'.$prefix.'title1"><strong>' .
- $sk->makeLinkObj( $targetPage,
- wfMsgHtml( 'revisionasof',
- $wgLang->timeanddate( $rev->getTimestamp(), true ) ),
- $targetQuery ) .
- ( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) .
+ $sk->link(
+ $targetPage,
+ wfMsgHtml(
+ 'revisionasof',
+ htmlspecialchars( $wgLang->timeanddate( $rev->getTimestamp(), true ) ),
+ htmlspecialchars( $wgLang->date( $rev->getTimestamp(), true ) ),
+ htmlspecialchars( $wgLang->time( $rev->getTimestamp(), true ) )
+ ),
+ array(),
+ $targetQuery
+ ) .
'</strong></div>' .
'<div id="mw-diff-'.$prefix.'title2">' .
- $sk->revUserTools( $rev ) . '<br/>' .
+ $sk->revUserTools( $rev ) . '<br />' .
'</div>' .
'<div id="mw-diff-'.$prefix.'title3">' .
- $sk->revComment( $rev ) . '<br/>' .
+ $sk->revComment( $rev ) . $del . '<br />' .
'</div>';
}
$this->mTargetObj->getText(),
$wgLang->date( $file->getTimestamp() ),
$wgLang->time( $file->getTimestamp() ) );
- $wgOut->addHTML(
- Xml::openElement( 'form', array(
+ $wgOut->addHTML(
+ Xml::openElement( 'form', array(
'method' => 'POST',
- 'action' => SpecialPage::getTitleFor( 'Undelete' )->getLocalUrl(
+ 'action' => $this->getTitle()->getLocalUrl(
'target=' . urlencode( $this->mTarget ) .
'&file=' . urlencode( $key ) .
'&token=' . urlencode( $wgUser->editToken( $key ) ) )
$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 );
+ global $IP;
+ require_once( "$IP/includes/StreamFile.php" );
+ $repo = RepoGroup::singleton()->getLocalRepo();
+ $path = $repo->getZonePath( 'deleted' ) . '/' . $repo->getDeletedHashPath( $key ) . $key;
+ wfStreamFile( $path );
}
private function showHistory( ) {
- global $wgLang, $wgUser, $wgOut;
+ global $wgUser, $wgOut;
$sk = $wgUser->getSkin();
if( $this->mAllowed ) {
$wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
}
- $wgOut->addWikiMsg( 'undeletepagetitle', $this->mTargetObj->getPrefixedText() );
+ $wgOut->wrapWikiMsg( "<div class='mw-undelete-pagetitle'>\n$1\n</div>\n", array ( 'undeletepagetitle', $this->mTargetObj->getPrefixedText() ) );
$archive = new PageArchive( $this->mTargetObj );
/*
return;
}
*/
+ $wgOut->addHTML( '<div class="mw-undelete-history">' );
if ( $this->mAllowed ) {
$wgOut->addWikiMsg( "undeletehistory" );
$wgOut->addWikiMsg( "undeleterevdel" );
} else {
$wgOut->addWikiMsg( "undeletehistorynoadmin" );
}
+ $wgOut->addHTML( '</div>' );
# List all stored revisions
$revisions = $archive->listRevisions();
# Batch existence check on user and talk pages
if( $haveRevisions ) {
$batch = new LinkBatch();
- while( $row = $revisions->fetchObject() ) {
+ foreach ( $revisions as $row ) {
$batch->addObj( Title::makeTitleSafe( NS_USER, $row->ar_user_text ) );
$batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->ar_user_text ) );
}
}
if( $haveFiles ) {
$batch = new LinkBatch();
- while( $row = $files->fetchObject() ) {
+ foreach ( $files as $row ) {
$batch->addObj( Title::makeTitleSafe( NS_USER, $row->fa_user_text ) );
$batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->fa_user_text ) );
}
}
if ( $this->mAllowed ) {
- $titleObj = SpecialPage::getTitleFor( "Undelete" );
- $action = $titleObj->getLocalURL( "action=submit" );
+ $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 );
if( $wgUser->isAllowed( 'suppressrevision' ) ) {
$unsuppressBox =
"<tr>
- <td> </td>
+ <td> </td>
<td class='mw-input'>" .
Xml::checkLabel( wfMsg('revdelete-unsuppress'), 'wpUnsuppress',
'mw-undelete-unsuppress', $this->mUnsuppress ).
Xml::fieldset( wfMsg( 'undelete-fieldset-title' ) ) .
Xml::openElement( 'table', array( 'id' => 'mw-undelete-table' ) ) .
"<tr>
- <td colspan='2'>" .
- wfMsgWikiHtml( 'undeleteextrahelp' ) .
+ <td colspan='2' class='mw-undelete-extrahelp'>" .
+ wfMsgExt( 'undeleteextrahelp', 'parse' ) .
"</td>
</tr>
<tr>
"</td>
</tr>
<tr>
- <td> </td>
+ <td> </td>
<td class='mw-submit'>" .
Xml::submitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore', 'id' => 'mw-undelete-submit' ) ) . ' ' .
Xml::element( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ), 'id' => 'mw-undelete-reset' ) ) . ' ' .
if( $haveRevisions ) {
# The page's stored (deleted) history:
$wgOut->addHTML("<ul>");
- $target = urlencode( $this->mTarget );
$remaining = $revisions->numRows();
$earliestLiveTime = $this->mTargetObj->getEarliestRevTime();
- while( $row = $revisions->fetchObject() ) {
+ foreach ( $revisions as $row ) {
$remaining--;
$wgOut->addHTML( $this->formatRevisionRow( $row, $earliestLiveTime, $remaining, $sk ) );
}
if( $haveFiles ) {
$wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'filehist' ) ) . "\n" );
$wgOut->addHTML( "<ul>" );
- while( $row = $files->fetchObject() ) {
+ foreach ( $files as $row ) {
$wgOut->addHTML( $this->formatFileRow( $row, $sk ) );
}
$files->free();
if ( $this->mAllowed ) {
# Slip in the hidden controls here
- $misc = Xml::hidden( 'target', $this->mTarget );
- $misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
+ $misc = Html::hidden( 'target', $this->mTarget );
+ $misc .= Html::hidden( 'wpEditToken', $wgUser->editToken() );
$misc .= Xml::closeElement( 'form' );
$wgOut->addHTML( $misc );
}
private function formatRevisionRow( $row, $earliestLiveTime, $remaining, $sk ) {
global $wgUser, $wgLang;
- $rev = new Revision( array(
- 'page' => $this->mTargetObj->getArticleId(),
- 'comment' => $row->ar_comment,
- 'user' => $row->ar_user,
- 'user_text' => $row->ar_user_text,
- 'timestamp' => $row->ar_timestamp,
- 'minor_edit' => $row->ar_minor_edit,
- 'deleted' => $row->ar_deleted,
- 'len' => $row->ar_len ) );
-
+ $rev = Revision::newFromArchiveRow( $row,
+ array( 'page' => $this->mTargetObj->getArticleId() ) );
$stxt = '';
$ts = wfTimestamp( TS_MW, $row->ar_timestamp );
+ // Build checkboxen...
if( $this->mAllowed ) {
- if( $this->mInvert){
+ if( $this->mInvert ) {
if( in_array( $ts, $this->mTargetTimestamp ) ) {
$checkBox = Xml::check( "ts$ts");
} else {
} else {
$checkBox = Xml::check( "ts$ts" );
}
- $titleObj = SpecialPage::getTitleFor( "Undelete" );
- $pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk );
+ } else {
+ $checkBox = '';
+ }
+ // 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) ) {
- $last = $sk->makeKnownLinkObj( $titleObj, wfMsgHtml('diff'),
- "target=" . $this->mTargetObj->getPrefixedUrl() . "×tamp=$ts&diff=prev" );
+ $pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk );
+ $last = $sk->linkKnown(
+ $titleObj,
+ wfMsgHtml('diff'),
+ array(),
+ array(
+ 'target' => $this->mTargetObj->getPrefixedText(),
+ 'timestamp' => $ts,
+ 'diff' => 'prev'
+ )
+ );
} else {
+ $pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk );
$last = wfMsgHtml('diff');
}
} else {
- $checkBox = '';
- $pageLink = $wgLang->timeanddate( $ts, true );
+ $pageLink = htmlspecialchars( $wgLang->timeanddate( $ts, true ) );
$last = wfMsgHtml('diff');
}
+ // User links
$userLink = $sk->revUserTools( $rev );
-
- if(!is_null($size = $row->ar_len)) {
+ // Revision text size
+ if( !is_null($size = $row->ar_len) ) {
$stxt = $sk->formatRevisionSize( $size );
}
+ // Edit summary
$comment = $sk->revComment( $rev );
- $revdlink = '';
- if( $wgUser->isAllowed( 'deleterevision' ) ) {
+ // Revision delete links
+ $canHide = $wgUser->isAllowed( 'deleterevision' );
+ if( $canHide || ($rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' )) ) {
if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
- // If revision was hidden from sysops
- $revdlink = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ),
- '('.wfMsgHtml('rev-delundel').')' );
+ $revdlink = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
} else {
- $query = array( 'target' => $this->mTargetObj->getPrefixedUrl(),
- 'artimestamp' => $ts
+ $query = array(
+ 'type' => 'archive',
+ 'target' => $this->mTargetObj->getPrefixedDBkey(),
+ 'ids' => $ts
);
- $revdlink = $sk->revDeleteLink( $query, $rev->isDeleted( Revision::DELETED_RESTRICTED ) );
+ $revdlink = $sk->revDeleteLink( $query,
+ $rev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
}
+ } else {
+ $revdlink = '';
}
-
return "<li>$checkBox $revdlink ($last) $pageLink . . $userLink $stxt $comment</li>";
}
if( $this->mAllowed && $row->fa_storage_key ) {
$checkBox = Xml::check( "fileid" . $row->fa_id );
$key = urlencode( $row->fa_storage_key );
- $target = urlencode( $this->mTarget );
- $titleObj = SpecialPage::getTitleFor( "Undelete" );
- $pageLink = $this->getFileLink( $file, $titleObj, $ts, $key, $sk );
+ $pageLink = $this->getFileLink( $file, $this->getTitle(), $ts, $key, $sk );
} else {
$checkBox = '';
$pageLink = $wgLang->timeanddate( $ts, true );
}
- $userLink = $this->getFileUser( $file, $sk );
+ $userLink = $this->getFileUser( $file, $sk );
$data =
wfMsg( 'widthheight',
$wgLang->formatNum( $row->fa_width ),
')';
$data = htmlspecialchars( $data );
$comment = $this->getFileComment( $file, $sk );
- $revdlink = '';
- if( $wgUser->isAllowed( 'deleterevision' ) ) {
- if( !$file->userCan(File::DELETED_RESTRICTED ) ) {
- // If revision was hidden from sysops
- $revdlink = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.wfMsgHtml('rev-delundel').')' );
+ // 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
} else {
- $query = array( 'target' => $this->mTargetObj->getPrefixedUrl(),
- 'fileid' => $row->fa_id
+ $query = array(
+ 'type' => 'filearchive',
+ 'target' => $this->mTargetObj->getPrefixedDBkey(),
+ 'ids' => $row->fa_id
);
- $revdlink = $sk->revDeleteLink( $query, $file->isDeleted( File::DELETED_RESTRICTED ) );
+ $revdlink = $sk->revDeleteLink( $query,
+ $file->isDeleted( File::DELETED_RESTRICTED ), $canHide );
}
+ } else {
+ $revdlink = '';
}
return "<li>$checkBox $revdlink $pageLink . . $userLink $data $comment</li>\n";
}
/**
* 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;
- if( !$rev->userCan(Revision::DELETED_TEXT) ) {
- return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
+ $time = htmlspecialchars( $wgLang->timeanddate( $ts, true ) );
+
+ if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
+ return '<span class="history-deleted">' . $time . '</span>';
} else {
- $link = $sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ),
- "target=".$this->mTargetObj->getPrefixedUrl()."×tamp=$ts" );
+ $link = $sk->linkKnown(
+ $titleObj,
+ $time,
+ array(),
+ array(
+ 'target' => $this->mTargetObj->getPrefixedText(),
+ 'timestamp' => $ts
+ )
+ );
if( $rev->isDeleted(Revision::DELETED_TEXT) )
$link = '<span class="history-deleted">' . $link . '</span>';
return $link;
/**
* Fetch image view link if it's available to all users
- * @return string
+ *
+ * @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) ) {
+ if( !$file->userCan( File::DELETED_FILE ) ) {
return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
} else {
- $link = $sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ),
- "target=".$this->mTargetObj->getPrefixedUrl().
- "&file=$key" .
- "&token=" . urlencode( $wgUser->editToken( $key ) ) );
+ $link = $sk->linkKnown(
+ $titleObj,
+ $wgLang->timeanddate( $ts, true ),
+ array(),
+ array(
+ 'target' => $this->mTargetObj->getPrefixedText(),
+ 'file' => $key,
+ 'token' => $wgUser->editToken( $key )
+ )
+ );
if( $file->isDeleted(File::DELETED_FILE) )
$link = '<span class="history-deleted">' . $link . '</span>';
return $link;
/**
* Fetch file's user id if it's available to this user
- * @return string
+ *
+ * @param $file File
+ * @param $sk Skin
+ * @return String: HTML fragment
*/
function getFileUser( $file, $sk ) {
- if( !$file->userCan(File::DELETED_USER) ) {
+ if( !$file->userCan( File::DELETED_USER ) ) {
return '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
} else {
$link = $sk->userLink( $file->getRawUser(), $file->getRawUserText() ) .
$sk->userToolLinks( $file->getRawUser(), $file->getRawUserText() );
- if( $file->isDeleted(File::DELETED_USER) )
+ if( $file->isDeleted( File::DELETED_USER ) )
$link = '<span class="history-deleted">' . $link . '</span>';
return $link;
}
/**
* Fetch file upload comment if it's available to this user
- * @return string
+ *
+ * @param $file File
+ * @param $sk Skin
+ * @return String: HTML fragment
*/
function getFileComment( $file, $sk ) {
- if( !$file->userCan(File::DELETED_COMMENT) ) {
+ if( !$file->userCan( File::DELETED_COMMENT ) ) {
return '<span class="history-deleted"><span class="comment">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span></span>';
} else {
$link = $sk->commentBlock( $file->getRawDescription() );
$wgUser, $this->mComment) );
$skin = $wgUser->getSkin();
- $link = $skin->makeKnownLinkObj( $this->mTargetObj );
- $wgOut->addHTML( wfMsgWikiHtml( 'undeletedpage', $link ) );
+ $link = $skin->linkKnown( $this->mTargetObj );
+ $wgOut->addWikiMsgArray( 'undeletedpage', array( $link ), array( 'replaceafter' ) );
} else {
$wgOut->showFatalError( wfMsg( "cannotundelete" ) );
- $wgOut->addHTML( '<p>' . wfMsgHtml( "undeleterevdel" ) . '</p>' );
+ $wgOut->addWikiMsg( 'undeleterevdel' );
}
// Show file deletion warnings and errors
dépôts / lhc / web / wiklou.git / blobdiff