<?php
/**
- *
+ * @todo document
* @package MediaWiki
* @subpackage SpecialPage
*/
+/** */
require_once( 'Revision.php' );
/**
*/
class PageArchive {
var $title;
-
+
function PageArchive( &$title ) {
if( is_null( $title ) ) {
wfDebugDieBacktrace( 'Archiver() given a null title.');
}
$this->title =& $title;
}
-
+
/**
* List all deleted pages recorded in the archive table. Returns result
* wrapper with (ar_namespace, ar_title, count) fields, ordered by page
*
* @return ResultWrapper
*/
- /* static */ function &listAllPages() {
+ /* static */ function listAllPages() {
$dbr =& wfGetDB( DB_SLAVE );
$archive = $dbr->tableName( 'archive' );
- $sql = "SELECT ar_namespace,ar_title, COUNT(*) AS count FROM $archive " .
+ $sql = "SELECT ar_namespace,ar_title, COUNT(*) AS count FROM $archive " .
"GROUP BY ar_namespace,ar_title ORDER BY ar_namespace,ar_title";
return $dbr->resultObject( $dbr->query( $sql, 'PageArchive::listAllPages' ) );
}
-
+
/**
* List the revisions of the given page. Returns result wrapper with
* (ar_minor_edit, ar_timestamp, ar_user, ar_user_text, ar_comment) fields.
*
* @return ResultWrapper
*/
- function &listRevisions() {
+ function listRevisions() {
$dbr =& wfGetDB( DB_SLAVE );
- return $dbr->resultObject( $dbr->select( 'archive',
+ $res = $dbr->select( 'archive',
array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment' ),
array( 'ar_namespace' => $this->title->getNamespace(),
'ar_title' => $this->title->getDBkey() ),
'PageArchive::listRevisions',
- array( 'ORDER BY' => 'ar_timestamp DESC' ) ) );
+ array( 'ORDER BY' => 'ar_timestamp DESC' ) );
+ $ret = $dbr->resultObject( $res );
+ return $ret;
}
-
+
/**
* Fetch (and decompress if necessary) the stored text for the deleted
* revision of the page with the given timestamp.
* @return string
*/
function getRevisionText( $timestamp ) {
+ $fname = 'PageArchive::getRevisionText';
$dbr =& wfGetDB( DB_SLAVE );
$row = $dbr->selectRow( 'archive',
- array( 'ar_text', 'ar_flags' ),
+ array( 'ar_text', 'ar_flags', 'ar_text_id' ),
array( 'ar_namespace' => $this->title->getNamespace(),
'ar_title' => $this->title->getDbkey(),
- 'ar_timestamp' => $dbr->timestamp( $timestamp ) ) );
- return Revision::getRevisionText( $row, "ar_" );
+ 'ar_timestamp' => $dbr->timestamp( $timestamp ) ),
+ $fname );
+ return $this->getTextFromRow( $row );
+ }
+
+ /**
+ * Get the text from an archive row containing ar_text, ar_flags and ar_text_id
+ */
+ function getTextFromRow( $row ) {
+ $fname = 'PageArchive::getTextFromRow';
+
+ if( is_null( $row->ar_text_id ) ) {
+ // An old row from MediaWiki 1.4 or previous.
+ // Text is embedded in this row in classic compression format.
+ return Revision::getRevisionText( $row, "ar_" );
+ } else {
+ // New-style: keyed to the text storage backend.
+ $dbr =& wfGetDB( DB_SLAVE );
+ $text = $dbr->selectRow( 'text',
+ array( 'old_text', 'old_flags' ),
+ array( 'old_id' => $row->ar_text_id ),
+ $fname );
+ return Revision::getRevisionText( $text );
+ }
}
-
+
+
/**
* Fetch (and decompress if necessary) the stored text of the most
* recently edited deleted revision of the page.
function getLastRevisionText() {
$dbr =& wfGetDB( DB_SLAVE );
$row = $dbr->selectRow( 'archive',
- array( 'ar_text', 'ar_flags' ),
+ array( 'ar_text', 'ar_flags', 'ar_text_id' ),
array( 'ar_namespace' => $this->title->getNamespace(),
'ar_title' => $this->title->getDBkey() ),
'PageArchive::getLastRevisionText',
- 'ORDER BY ar_timestamp DESC LIMIT 1' );
+ array( 'ORDER BY' => 'ar_timestamp DESC' ) );
if( $row ) {
- return Revision::getRevisionText( $row, "ar_" );
+ return $this->getTextFromRow( $row );
} else {
return NULL;
}
}
-
+
/**
* Quick check if any archived revisions are present for the page.
* @return bool
'ar_title' => $this->title->getDBkey() ) );
return ($n > 0);
}
-
+
/**
* This is the meaty bit -- restores archived revisions of the given page
* to the cur/old tables. If the page currently exists, all revisions will
* @return bool
*/
function undelete( $timestamps ) {
- global $wgUser, $wgOut, $wgLang, $wgDeferredUpdateList;
- global $wgUseSquid, $wgInternalServer, $wgLinkCache;
+ global $wgDeferredUpdateList, $wgLinkCache, $wgDBtype;
$fname = "doUndeleteArticle";
$restoreAll = empty( $timestamps );
$restoreRevisions = count( $timestamps );
$dbw =& wfGetDB( DB_MASTER );
- extract( $dbw->tableNames( 'cur', 'archive', 'old' ) );
- $namespace = $this->title->getNamespace();
- $ttl = $this->title->getDBkey();
- $t = $dbw->strencode( $ttl );
-
- # Move article and history from the "archive" table
- $sql = "SELECT COUNT(*) AS count FROM $cur WHERE cur_namespace={$namespace} AND cur_title='{$t}'";
- global $wgDBtype;
- if( $wgDBtype != 'PostgreSQL' ) { # HACKHACKHACKHACK
- $sql .= ' FOR UPDATE';
+ extract( $dbw->tableNames( 'page', 'archive' ) );
+
+ # Does this page already exist? We'll have to update it...
+ $article = new Article( $this->title );
+ $options = ( $wgDBtype == 'PostgreSQL' )
+ ? '' // pg doesn't support this?
+ : 'FOR UPDATE';
+ $page = $dbw->selectRow( 'page',
+ array( 'page_id', 'page_latest' ),
+ array( 'page_namespace' => $this->title->getNamespace(),
+ 'page_title' => $this->title->getDBkey() ),
+ $fname,
+ $options );
+ if( $page ) {
+ # Page already exists. Import the history, and if necessary
+ # we'll update the latest revision field in the record.
+ $newid = 0;
+ $pageId = $page->page_id;
+ $previousRevId = $page->page_latest;
+ $previousTimestamp = $page->rev_timestamp;
+ } else {
+ # Have to create a new article...
+ $newid = $article->insertOn( $dbw );
+ $pageId = $newid;
+ $previousRevId = 0;
+ $previousTimestamp = 0;
}
- $res = $dbw->query( $sql, $fname );
- $row = $dbw->fetchObject( $res );
- $now = wfTimestampNow();
-
- if( $row->count == 0) {
- # Have to create new article...
- $sql = "SELECT ar_text,ar_comment,ar_user,ar_user_text,ar_timestamp,ar_minor_edit,ar_flags FROM $archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' ";
- if( !$restoreAll ) {
- $max = $dbw->addQuotes( $dbw->timestamp( array_shift( $timestamps ) ) );
- $sql .= "AND ar_timestamp={$max} ";
- }
- $sql .= "ORDER BY ar_timestamp DESC LIMIT 1 FOR UPDATE";
- $res = $dbw->query( $sql, $fname );
- $s = $dbw->fetchObject( $res );
- if( $restoreAll ) {
- $max = $s->ar_timestamp;
- }
- $text = Revision::getRevisionText( $s, "ar_" );
-
- $redirect = MagicWord::get( MAG_REDIRECT );
- $redir = $redirect->matchStart( $text ) ? 1 : 0;
-
- $rand = wfRandom();
- $dbw->insert( 'cur', array(
- 'cur_id' => $dbw->nextSequenceValue( 'cur_cur_id_seq' ),
- 'cur_namespace' => $namespace,
- 'cur_title' => $ttl,
- 'cur_text' => $text,
- 'cur_comment' => $s->ar_comment,
- 'cur_user' => $s->ar_user,
- 'cur_timestamp' => $s->ar_timestamp,
- 'cur_minor_edit' => $s->ar_minor_edit,
- 'cur_user_text' => $s->ar_user_text,
- 'cur_is_redirect' => $redir,
- 'cur_random' => $rand,
- 'cur_touched' => $dbw->timestamp( $now ),
- 'inverse_timestamp' => wfInvertTimestamp( wfTimestamp( TS_MW, $s->ar_timestamp ) ),
- ), $fname );
-
- $newid = $dbw->insertId();
- if( $restoreAll ) {
- $oldones = "AND ar_timestamp<" . $dbw->addQuotes( $dbw->timestamp( $max ) );
- }
+
+ if( $restoreAll ) {
+ $oldones = '1 = 1'; # All revisions...
} else {
- # If already exists, put history entirely into old table
- $oldones = "";
- $newid = 0;
-
- # But to make the history list show up right, we need to touch it.
- $sql = "UPDATE $cur SET cur_touched='{$now}' WHERE cur_namespace={$namespace} AND cur_title='{$t}'";
- $dbw->query( $sql, $fname );
-
- # FIXME: Sometimes restored entries will be _newer_ than the current version.
- # We should merge.
+ $oldts = implode( ',',
+ array_map( array( &$dbw, 'addQuotes' ),
+ array_map( array( &$dbw, 'timestamp' ),
+ $timestamps ) ) );
+
+ $oldones = "ar_timestamp IN ( {$oldts} )";
}
-
- if( !$restoreAll ) {
- $oldts = array();
- foreach( $timestamps as $ts ) {
- array_push( $oldts, $dbw->addQuotes( $dbw->timestamp( $ts ) ) );
+
+ /**
+ * Restore each revision...
+ */
+ $result = $dbw->select( 'archive',
+ /* fields */ array(
+ 'ar_rev_id',
+ 'ar_text',
+ 'ar_comment',
+ 'ar_user',
+ 'ar_user_text',
+ 'ar_timestamp',
+ 'ar_minor_edit',
+ 'ar_flags',
+ 'ar_text_id' ),
+ /* WHERE */ array(
+ 'ar_namespace' => $this->title->getNamespace(),
+ 'ar_title' => $this->title->getDBkey(),
+ $oldones ),
+ $fname,
+ /* options */ array(
+ 'ORDER BY' => 'ar_timestamp' )
+ );
+ $revision = null;
+ while( $row = $dbw->fetchObject( $result ) ) {
+ 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_' );
}
- $oldts = join( ",", $oldts );
- $oldones = "AND ar_timestamp IN ( {$oldts} )";
- }
- $sql = "INSERT INTO $old (old_namespace,old_title,old_text," .
- "old_comment,old_user,old_user_text,old_timestamp,inverse_timestamp,old_minor_edit," .
- "old_flags) SELECT ar_namespace,ar_title,ar_text,ar_comment," .
- "ar_user,ar_user_text,ar_timestamp,99999999999999-ar_timestamp,ar_minor_edit,ar_flags " .
- "FROM $archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' {$oldones}";
- if( $restoreAll || !empty( $oldts ) ) {
- $dbw->query( $sql, $fname );
+ $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,
+ ) );
+ $revision->insertOn( $dbw );
}
- # Finally, clean up the link tables
- if( $newid ) {
- $wgLinkCache = new LinkCache();
- # Select for update
- $wgLinkCache->forUpdate( true );
- # Create a dummy OutputPage to update the outgoing links
- $dummyOut = new OutputPage();
- $dummyOut->addWikiText( $text );
-
- $u = new LinksUpdate( $newid, $this->title->getPrefixedDBkey() );
- array_push( $wgDeferredUpdateList, $u );
-
- Article::onArticleCreate( $this->title );
-
- #TODO: SearchUpdate, etc.
- }
+ if( $revision ) {
+ # FIXME: Update latest if newer as well...
+ if( $newid ) {
+ # FIXME: update article count if changed...
+ $article->updateRevisionOn( $dbw, $revision, $previousRevId );
+
+ # Finally, clean up the link tables
+ $wgLinkCache = new LinkCache();
+ # Select for update
+ $wgLinkCache->forUpdate( true );
+
+ # Create a dummy OutputPage to update the outgoing links
+ $dummyOut = new OutputPage();
+ $dummyOut->addWikiText( $revision->getText() );
+
+ $u = new LinksUpdate( $newid, $this->title->getPrefixedDBkey() );
+ array_push( $wgDeferredUpdateList, $u );
+
+ #TODO: SearchUpdate, etc.
+ }
- # Now that it's safely stored, take it out of the archive
- $sql = "DELETE FROM $archive WHERE ar_namespace={$namespace} AND " .
- "ar_title='{$t}'";
- if( !$restoreAll ) {
- $sql .= " AND ar_timestamp IN ( {$oldts}";
if( $newid ) {
- if( !empty( $oldts ) ) $sql .= ",";
- $sql .= $max;
+ Article::onArticleCreate( $this->title );
+ } else {
+ Article::onArticleEdit( $this->title );
}
- $sql .= ")";
+ } else {
+ # Something went terribly worong!
}
- $dbw->query( $sql, $fname );
-
- # Touch the log?
+ # Now that it's safely stored, take it out of the archive
+ $dbw->delete( 'archive',
+ /* WHERE */ array(
+ 'ar_namespace' => $this->title->getNamespace(),
+ 'ar_title' => $this->title->getDBkey(),
+ $oldones ),
+ $fname );
+
+ # Touch the log!
$log = new LogPage( 'delete' );
if( $restoreAll ) {
- $reason = "";
+ $reason = '';
} else {
- $reason = wfMsg( 'undeletedrevisions', $restoreRevisions );
+ $reason = wfMsgForContent( 'undeletedrevisions', $restoreRevisions );
}
$log->addEntry( 'restore', $this->title, $reason );
-
+
return true;
}
}
*/
class UndeleteForm {
var $mAction, $mTarget, $mTimestamp, $mRestore, $mTargetObj;
- var $mTargetTimestamp;
+ var $mTargetTimestamp, $mAllowed;
function UndeleteForm( &$request, $par = "" ) {
+ global $wgUser;
$this->mAction = $request->getText( 'action' );
$this->mTarget = $request->getText( 'target' );
$this->mTimestamp = $request->getText( 'timestamp' );
- $this->mRestore = $request->getCheck( 'restore' ) && $request->wasPosted();
+ $this->mRestore = $request->getCheck( 'restore' ) &&
+ $request->wasPosted() &&
+ $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
if( $par != "" ) {
$this->mTarget = $par;
}
+ if ( $wgUser->isAllowed( 'delete' ) ) {
+ $this->mAllowed = true;
+ } else {
+ $this->mAllowed = false;
+ $this->mTimestamp = '';
+ $this->mRestore = false;
+ }
if ( $this->mTarget !== "" ) {
$this->mTargetObj = Title::newFromURL( $this->mTarget );
} else {
}
function execute() {
+
if( is_null( $this->mTargetObj ) ) {
return $this->showList();
}
- if( $this->mTimestamp !== "" ) {
+ if( $this->mTimestamp !== '' ) {
return $this->showRevision( $this->mTimestamp );
}
if( $this->mRestore && $this->mAction == "submit" ) {
/* private */ function showList() {
global $wgLang, $wgContLang, $wgUser, $wgOut;
$fname = "UndeleteForm::showList";
-
- # List undeletable articles
+
+ # List undeletable articles
$result = PageArchive::listAllPages();
-
- $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+
+ if ( $this->mAllowed ) {
+ $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+ } else {
+ $wgOut->setPagetitle( wfMsg( "viewdeletedpage" ) );
+ }
$wgOut->addWikiText( wfMsg( "undeletepagetext" ) );
$sk = $wgUser->getSkin();
$undelete =& Title::makeTitle( NS_SPECIAL, 'Undelete' );
$wgOut->addHTML( "<ul>\n" );
while( $row = $result->fetchObject() ) {
- $n = ($row->ar_namespace ?
+ $n = ($row->ar_namespace ?
($wgContLang->getNsText( $row->ar_namespace ) . ":") : "").
$row->ar_title;
$link = $sk->makeKnownLinkObj( $undelete,
}
$result->free();
$wgOut->addHTML( "</ul>\n" );
-
+
return true;
}
-
+
/* private */ function showRevision( $timestamp ) {
global $wgLang, $wgUser, $wgOut;
$fname = "UndeleteForm::showRevision";
$archive =& new PageArchive( $this->mTargetObj );
$text = $archive->getRevisionText( $timestamp );
-
+
$wgOut->setPagetitle( wfMsg( "undeletepage" ) );
$wgOut->addWikiText( "(" . wfMsg( "undeleterevision",
$wgLang->date( $timestamp ) ) . ")\n<hr />\n" . $text );
/* private */ function showHistory() {
global $wgLang, $wgUser, $wgOut;
-
+
$sk = $wgUser->getSkin();
- $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+ if ( $this->mAllowed ) {
+ $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+ } else {
+ $wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
+ }
$archive = new PageArchive( $this->mTargetObj );
$text = $archive->getLastRevisionText();
$wgOut->addWikiText( wfMsg( "nohistory" ) );
return;
}
- $wgOut->addWikiText( wfMsg( "undeletehistory" ) . "\n----\n" . $text );
+ if ( $this->mAllowed ) {
+ $wgOut->addWikiText( wfMsg( "undeletehistory" ) . "\n----\n" . $text );
+ } else {
+ $wgOut->addWikiText( wfMsg( "undeletehistorynoadmin" ) );
+ }
# List all stored revisions
$revisions = $archive->listRevisions();
-
- $titleObj = Title::makeTitle( NS_SPECIAL, "Undelete" );
- $action = $titleObj->escapeLocalURL( "action=submit" );
- $encTarget = htmlspecialchars( $this->mTarget );
- $button = htmlspecialchars( wfMsg("undeletebtn") );
-
- $wgOut->addHTML("
- <form id=\"undelete\" method=\"post\" action=\"{$action}\">
- <input type=\"hidden\" name=\"target\" value=\"{$encTarget}\" />
- <input type=\"submit\" name=\"restore\" value=\"{$button}\" />
- ");
+
+ if ( $this->mAllowed ) {
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Undelete" );
+ $action = $titleObj->escapeLocalURL( "action=submit" );
+ $encTarget = htmlspecialchars( $this->mTarget );
+ $button = htmlspecialchars( wfMsg("undeletebtn") );
+ $token = htmlspecialchars( $wgUser->editToken() );
+
+ $wgOut->addHTML("
+ <form id=\"undelete\" method=\"post\" action=\"{$action}\">
+ <input type=\"hidden\" name=\"target\" value=\"{$encTarget}\" />
+ <input type=\"submit\" name=\"restore\" value=\"{$button}\" />
+ <input type='hidden' name='wpEditToken' value=\"{$token}\" />
+ ");
+ }
# Show relevant lines from the deletion log:
$wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
array( 'page' => $this->mTargetObj->getPrefixedText(),
'type' => 'delete' ) ) ) );
$logViewer->showList( $wgOut );
-
+
# The page's stored (deleted) history:
$wgOut->addHTML( "<h2>" . htmlspecialchars( wfMsg( "history" ) ) . "</h2>\n" );
$wgOut->addHTML("<ul>");
$target = urlencode( $this->mTarget );
while( $row = $revisions->fetchObject() ) {
$ts = wfTimestamp( TS_MW, $row->ar_timestamp );
- $checkBox = "<input type=\"checkbox\" name=\"ts$ts\" value=\"1\" />";
- $pageLink = $sk->makeKnownLinkObj( $titleObj,
- $wgLang->timeanddate( $row->ar_timestamp, true ),
- "target=$target×tamp=$ts" );
+ if ( $this->mAllowed ) {
+ $checkBox = "<input type=\"checkbox\" name=\"ts$ts\" value=\"1\" />";
+ $pageLink = $sk->makeKnownLinkObj( $titleObj,
+ $wgLang->timeanddate( $ts, true ),
+ "target=$target×tamp=$ts" );
+ } else {
+ $checkBox = '';
+ $pageLink = $wgLang->timeanddate( $ts, true );
+ }
$userLink = htmlspecialchars( $row->ar_user_text );
if( $row->ar_user ) {
$userLink = $sk->makeKnownLinkObj(
Title::makeTitle( NS_USER, $row->ar_user_text ),
$userLink );
+ } else {
+ $userLink = $sk->makeKnownLinkObj(
+ Title::makeTitle( NS_SPECIAL, 'Contributions' ),
+ $userLink, 'target=' . $row->ar_user_text );
}
- $comment = $sk->formatComment( $row->ar_comment );
- $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink (<i>$comment</i>)</li>\n" );
+ $comment = $sk->commentBlock( $row->ar_comment );
+ $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink $comment</li>\n" );
}
$revisions->free();
- $wgOut->addHTML("</ul>\n</form>");
-
+ $wgOut->addHTML("</ul>");
+ if ( $this->mAllowed ) {
+ $wgOut->addHTML( "\n</form>" );
+ }
+
return true;
}
$archive = new PageArchive( $this->mTargetObj );
if( $archive->undelete( $this->mTargetTimestamp ) ) {
$wgOut->addWikiText( wfMsg( "undeletedtext", $this->mTarget ) );
+
+ if (NS_IMAGE == $this->mTargetObj->getNamespace()) {
+ /* refresh image metadata cache */
+ new Image( $this->mTargetObj );
+ }
+
return true;
}
}