X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialUndelete.php;h=51b8083f7a4a363666e490d845af4be26f57d985;hb=0731560daf69a64b30eafe37e68e4e415a938aee;hp=549e30f1ffdea8286808f62445221df1323dff8e;hpb=57d8f4b73798dc078d3b913d39e3bf8af8ea1ac8;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index 549e30f1ff..51b8083f7a 100644
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -1,205 +1,465 @@
-mDbkeyform;
- $namespace = $t->mNamespace;
- if( isset( $timestamp ) ) {
- return doUndeleteShowRevision( $namespace, $title, $timestamp );
- }
- if( isset( $action ) and isset( $restore) and $action == "submit" ) {
- return doUndeleteArticle( $namespace, $title );
- }
- return doUndeleteShowHistory( $namespace, $title );
- }
-
- # List undeletable articles
- $sql = "SELECT ar_namespace,ar_title, COUNT(*) AS count FROM archive GROUP BY ar_namespace,ar_title ORDER BY ar_namespace,ar_title";
- $res = wfQuery( $sql, DB_READ );
-
- $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
- $wgOut->addWikiText( wfMsg( "undeletepagetext" ) );
-
- $special = $wgLang->getNsText( Namespace::getSpecial() );
- $sk = $wgUser->getSkin();
- $wgOut->addHTML( "\n" );
- while ($row = wfFetchObject( $res )) {
- $n = ($row->ar_namespace ?
- ($wgLang->getNsText( $row->ar_namespace ) . ":") : "").
- $row->ar_title;
-
- $wgOut->addHTML( "- " .
- $sk->makeKnownLink( $wgLang->specialPage( "Undelete" ),
- $n, "target=" . urlencode($n) ) . " " .
- wfMsg( "undeleterevisions", $row->count ) );
- }
- $wgOut->addHTML( "
\n" );
-
- return $ret;
-}
+setPagetitle( wfMsg( "undeletepage" ) );
- $wgOut->addWikiText( "(" . wfMsg( "undeleterevision", $wgLang->date($timestamp, true) )
- . ")\n
\n" . Article::getRevisionText( $row, "ar_" ) );
-
- return 0;
+ $form = new UndeleteForm( $wgRequest, $par );
+ $form->execute();
}
-/* private */ function doUndeleteShowHistory( $namespace, $title ) {
- global $wgLang, $wgUser, $wgOut, $action, $target, $timestamp, $restore;
-
- $sk = $wgUser->getSkin();
- $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+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
+ * namespace/title. Can be called staticaly.
+ *
+ * @return ResultWrapper
+ */
+ /* static */ function &listAllPages() {
+ $dbr =& wfGetDB( DB_SLAVE );
+ $archive = $dbr->tableName( 'archive' );
- $sql = "SELECT ar_minor_edit,ar_timestamp,ar_user,ar_user_text,ar_comment
- FROM archive WHERE ar_namespace={$namespace} AND ar_title=\"{$title}\"
- ORDER BY ar_timestamp DESC";
- $ret = wfQuery( $sql, DB_READ );
+ $sql = "SELECT ar_namespace,ar_title, COUNT(*) AS count FROM $archive " .
+ "GROUP BY ar_namespace,ar_title ORDER BY ar_namespace,ar_title";
- if( wfNumRows( $ret ) == 0 ) {
- $wgOut->addWikiText( wfMsg( "nohistory" ) );
- return 0;
+ return $dbr->resultObject( $dbr->query( $sql, 'PageArchive::listAllPages' ) );
}
- $wgOut->addWikiText( wfMsg( "undeletehistory" ) . "\n
\n" . $row->ar_text );
-
- $action = wfLocalUrlE( $wgLang->specialPage( "Undelete" ), "action=submit" );
- $wgOut->addHTML("
-
");
-
- $log = wfGetSQL("cur", "cur_text", "cur_namespace=4 AND cur_title=\"".wfMsg("dellogpage")."\"" );
- if(preg_match("/^(.*".
- preg_quote( ($namespace ? ($wgLang->getNsText($namespace) . ":") : "")
- . str_replace("_", " ", $title), "/" ).".*)$/m", $log, $m)) {
- $wgOut->addWikiText( $m[1] );
- }
-
- $special = $wgLang->getNsText( Namespace::getSpecial() );
- $wgOut->addHTML("");
- while( $row = wfFetchObject( $ret ) ) {
- $wgOut->addHTML( "- " .
- $sk->makeKnownLink( $wgLang->specialPage( "Undelete" ),
- $wgLang->timeanddate( $row->ar_timestamp, true ),
- "target=" . urlencode($target) . "×tamp={$row->ar_timestamp}" ) . " " .
- ". . {$row->ar_user_text}" .
- " (" . htmlspecialchars($row->ar_comment) . ")\n");
-
- }
- $wgOut->addHTML("
");
-
- return 0;
-}
+ /**
+ * 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() {
+ $dbr =& wfGetDB( DB_SLAVE );
+ return $dbr->resultObject( $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' ) ) );
+ }
-/* private */ function doUndeleteArticle( $namespace, $title )
- {
- global $wgUser, $wgOut, $wgLang, $target, $wgDeferredUpdateList;
+ /**
+ * 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', 'ar_text_id' ),
+ array( 'ar_namespace' => $this->title->getNamespace(),
+ 'ar_title' => $this->title->getDbkey(),
+ 'ar_timestamp' => $dbr->timestamp( $timestamp ) ),
+ $fname );
+ 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.
+ $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.
+ *
+ * If there are no archived revisions for the page, returns NULL.
+ *
+ * @return string
+ */
+ function getLastRevisionText() {
+ $dbr =& wfGetDB( DB_SLAVE );
+ $row = $dbr->selectRow( 'archive',
+ array( 'ar_text', 'ar_flags' ),
+ array( 'ar_namespace' => $this->title->getNamespace(),
+ 'ar_title' => $this->title->getDBkey() ),
+ 'PageArchive::getLastRevisionText',
+ array( 'ORDER BY' => 'ar_timestamp DESC' ) );
+ if( $row ) {
+ return Revision::getRevisionText( $row, "ar_" );
+ } else {
+ return NULL;
+ }
+ }
+
+ /**
+ * Quick check if any archived revisions are present for the page.
+ * @return bool
+ */
+ function isDeleted() {
+ $dbr =& wfGetDB( DB_SLAVE );
+ $n = $dbr->selectField( 'archive', 'COUNT(ar_title)',
+ array( 'ar_namespace' => $this->title->getNamespace(),
+ 'ar_title' => $this->title->getDBkey() ) );
+ return ($n > 0);
+ }
+
+ /**
+ * This is the meaty bit -- restores archived revisions of the given page
+ * to the cur/old tables. If the page currently exists, all revisions will
+ * be stuffed into old, otherwise the most recent will go into cur.
+ * The deletion log will be updated with an undeletion notice.
+ *
+ * Returns true on success.
+ *
+ * @param array $timestamps Pass an empty array to restore all revisions, otherwise list the ones to undelete.
+ * @return bool
+ */
+ function undelete( $timestamps ) {
+ global $wgUser, $wgOut, $wgLang, $wgDeferredUpdateList;
+ global $wgUseSquid, $wgInternalServer, $wgLinkCache;
+ global $wgDBtype;
$fname = "doUndeleteArticle";
+ $restoreAll = empty( $timestamps );
+ $restoreRevisions = count( $timestamps );
- if ( "" == $title ) {
- $wgOut->fatalError( wfMsg( "cannotundelete" ) );
- return;
+ $dbw =& wfGetDB( DB_MASTER );
+ 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;
}
- $t = addslashes($title);
-
- # Move article and history from the "archive" table
- $sql = "SELECT COUNT(*) AS count FROM cur WHERE cur_namespace={$namespace} AND cur_title='{$t}'";
- $res = wfQuery( $sql, DB_READ );
- $row = wfFetchObject( $res );
- $now = wfTimestampNow();
-
- if( $row->count == 0) {
- # Have to create new article...
- $sql = "SELECT ar_text,ar_timestamp,ar_flags FROM archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' ORDER BY ar_timestamp DESC LIMIT 1";
- $res = wfQuery( $sql, DB_READ, $fname );
- $s = wfFetchObject( $res );
- $max = $s->ar_timestamp;
- $redirect = MagicWord::get( MAG_REDIRECT );
- $redir = $redirect->matchStart( $s->ar_text ) ? 1 : 0;
-
- $sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text," .
- "cur_comment,cur_user,cur_user_text,cur_timestamp,inverse_timestamp,cur_minor_edit,cur_is_redirect,cur_random,cur_touched)" .
- "SELECT ar_namespace,ar_title,ar_text,ar_comment," .
- "ar_user,ar_user_text,ar_timestamp,99999999999999-ar_timestamp,ar_minor_edit,{$redir},RAND(),'{$now}' FROM archive " .
- "WHERE ar_namespace={$namespace} AND ar_title='{$t}' AND ar_timestamp={$max}";
- wfQuery( $sql, DB_WRITE, $fname );
- $newid = wfInsertId();
- $oldones = "AND ar_timestamp<{$max}";
+
+ if( $restoreAll ) {
+ $oldones = '1'; # All revisions...
} else {
- # If already exists, put history entirely into old table
- $oldones = "";
- $newid = 0;
+ $oldts = implode( ',',
+ array_map( array( &$dbw, 'addQuotes' ),
+ array_map( array( &$dbw, 'timestamp' ),
+ $timestamps ) ) );
- # 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}'";
- wfQuery( $sql, DB_WRITE, $fname );
-
- # FIXME: Sometimes restored entries will be _newer_ than the current version.
- # We should merge.
+ $oldones = "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}";
- wfQuery( $sql, DB_WRITE, $fname );
-
- # Finally, clean up the link tables
- if( $newid ) {
- # Create a dummy OutputPage to update the outgoing links
- # This works at the moment due to good luck. It may stop working in the
- # future. Damn globals.
- $dummyOut = new OutputPage();
- $to = Title::newFromDBKey( $target );
- $res = wfQuery( "SELECT cur_text FROM cur WHERE cur_id={$newid} " .
- "AND cur_namespace={$namespace}", DB_READ, $fname );
- $row = wfFetchObject( $res );
- $text = $row->cur_text;
- $dummyOut->addWikiText( $text );
- wfFreeResult( $res );
-
- $u = new LinksUpdate( $newid, $to->getPrefixedDBkey() );
- array_push( $wgDeferredUpdateList, $u );
-
- global $wgEnablePersistentLC;
- if ( $wgEnablePersistentLC ) {
- // Purge related entries in links cache on undelete, to heal broken links
- $ptitle = wfStrencode( $to->getPrefixedDBkey() );
- wfQuery("DELETE linkscc FROM linkscc,brokenlinks ".
- "WHERE lcc_pageid=bl_from AND bl_to='{$ptitle}'", DB_WRITE);
+ /**
+ * 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 ) ) {
+ $revision = new Revision( array(
+ 'page' => $pageId,
+ 'id' => $row->ar_rev_id,
+ 'text' => 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,
+ ) );
+ $revision->insertOn( $dbw );
+ }
+
+ 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.
}
- #TODO: SearchUpdate, etc.
+
+ if( $newid ) {
+ Article::onArticleCreate( $this->title );
+ } else {
+ Article::onArticleEdit( $this->title );
+ }
+ } else {
+ # Something went terribly worong!
}
# Now that it's safely stored, take it out of the archive
- $sql = "DELETE FROM archive WHERE ar_namespace={$namespace} AND " .
- "ar_title='{$t}'";
- wfQuery( $sql, DB_WRITE, $fname );
+ $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 = '';
+ } else {
+ $reason = wfMsgForContent( 'undeletedrevisions', $restoreRevisions );
+ }
+ $log->addEntry( 'restore', $this->title, $reason );
+
+ return true;
+ }
+}
+
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+class UndeleteForm {
+ var $mAction, $mTarget, $mTimestamp, $mRestore, $mTargetObj;
+ var $mTargetTimestamp;
+ 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() &&
+ $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
+ if( $par != "" ) {
+ $this->mTarget = $par;
+ }
+ if ( $this->mTarget !== "" ) {
+ $this->mTargetObj = Title::newFromURL( $this->mTarget );
+ } else {
+ $this->mTargetObj = NULL;
+ }
+ if( $this->mRestore ) {
+ $timestamps = array();
+ foreach( $_REQUEST as $key => $val ) {
+ if( preg_match( '/^ts(\d{14})$/', $key, $matches ) ) {
+ array_push( $timestamps, $matches[1] );
+ }
+ }
+ rsort( $timestamps );
+ $this->mTargetTimestamp = $timestamps;
+ }
+ }
+
+ function execute() {
+ if( is_null( $this->mTargetObj ) ) {
+ return $this->showList();
+ }
+ if( $this->mTimestamp !== "" ) {
+ return $this->showRevision( $this->mTimestamp );
+ }
+ if( $this->mRestore && $this->mAction == "submit" ) {
+ return $this->undelete();
+ }
+ return $this->showHistory();
+ }
+
+ /* private */ function showList() {
+ global $wgLang, $wgContLang, $wgUser, $wgOut;
+ $fname = "UndeleteForm::showList";
+
+ # List undeletable articles
+ $result = PageArchive::listAllPages();
+
+ $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+ $wgOut->addWikiText( wfMsg( "undeletepagetext" ) );
+
+ $sk = $wgUser->getSkin();
+ $undelete =& Title::makeTitle( NS_SPECIAL, 'Undelete' );
+ $wgOut->addHTML( "\n" );
+ while( $row = $result->fetchObject() ) {
+ $n = ($row->ar_namespace ?
+ ($wgContLang->getNsText( $row->ar_namespace ) . ":") : "").
+ $row->ar_title;
+ $link = $sk->makeKnownLinkObj( $undelete,
+ htmlspecialchars( $n ), "target=" . urlencode( $n ) );
+ $revisions = htmlspecialchars( wfMsg( "undeleterevisions",
+ $wgLang->formatNum( $row->count ) ) );
+ $wgOut->addHTML( "- $link $revisions
\n" );
+ }
+ $result->free();
+ $wgOut->addHTML( "
\n" );
+
+ return true;
+ }
+
+ /* private */ function showRevision( $timestamp ) {
+ global $wgLang, $wgUser, $wgOut;
+ $fname = "UndeleteForm::showRevision";
+
+ if(!preg_match("/[0-9]{14}/",$timestamp)) return 0;
+
+ $archive =& new PageArchive( $this->mTargetObj );
+ $text = $archive->getRevisionText( $timestamp );
+
+ $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+ $wgOut->addWikiText( "(" . wfMsg( "undeleterevision",
+ $wgLang->date( $timestamp ) ) . ")\n
\n" . $text );
+ }
+
+ /* private */ function showHistory() {
+ global $wgLang, $wgUser, $wgOut;
+
+ $sk = $wgUser->getSkin();
+ $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+
+ $archive = new PageArchive( $this->mTargetObj );
+ $text = $archive->getLastRevisionText();
+ if( is_null( $text ) ) {
+ $wgOut->addWikiText( wfMsg( "nohistory" ) );
+ return;
+ }
+ $wgOut->addWikiText( wfMsg( "undeletehistory" ) . "\n----\n" . $text );
+
+ # 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") );
+ $token = htmlspecialchars( $wgUser->editToken() );
+
+ $wgOut->addHTML("
+ ");
- # Touch the log?
- $log = new LogPage( wfMsg( "dellogpage" ), wfMsg( "dellogpagetext" ) );
- $log->addEntry( wfMsg( "undeletedarticle", $target ), "" );
+ return true;
+ }
+
+ function undelete() {
+ global $wgOut;
+ if( !is_null( $this->mTargetObj ) ) {
+ $archive = new PageArchive( $this->mTargetObj );
+ if( $archive->undelete( $this->mTargetTimestamp ) ) {
+ $wgOut->addWikiText( wfMsg( "undeletedtext", $this->mTarget ) );
- $wgOut->addWikiText( wfMsg( "undeletedtext", $target ) );
- return 0;
+ if (NS_IMAGE == $this->mTargetObj->getNamespace()) {
+ /* refresh image metadata cache */
+ new Image( $this->mTargetObj );
+ }
+
+ return true;
+ }
+ }
+ $wgOut->fatalError( wfMsg( "cannotundelete" ) );
+ return false;
}
+}
+
?>