* Set default disabled values for DjVu render options
[lhc/web/wiklou.git] / includes / SpecialUndelete.php
index ac2ff9c..0efdc1b 100644 (file)
 <?php
 
-function wfSpecialUndelete( $par )
-{
-    global $wgLang, $wgUser, $wgOut, $action, $target, $timestamp, $restore;
-    
-       if( $par != "" ) $target = $par;
-    if( isset($target ) ) {
-       $t = Title::newFromURL( $target );
-       $title = $t->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( "<ul>\n" );
-    while ($row = wfFetchObject( $res )) {
-       $n = ($row->ar_namespace ? 
-               ($wgLang->getNsText( $row->ar_namespace ) . ":") : "").
-               $row->ar_title;
-
-       $wgOut->addHTML( "<li>" .
-         $sk->makeKnownLink( $wgLang->specialPage( "Undelete" ),
-          $n, "target=" . urlencode($n) ) . " " .
-                 wfMsg( "undeleterevisions", $row->count ) );
-    }
-    $wgOut->addHTML( "</ul>\n" );
-    
-    return $ret;    
-}
+/**
+ * Special page allowing users with the appropriate permissions to view
+ * and restore deleted content
+ *
+ * @package MediaWiki
+ * @subpackage Special pages
+ */
+
+/**
+ *
+ */
+function wfSpecialUndelete( $par ) {
+    global $wgRequest;
 
-/* private */ function doUndeleteShowRevision( $namespace, $title, $timestamp ) {
-    global $wgLang, $wgUser, $wgOut, $action, $target, $timestamp, $restore;
-    
-    if(!preg_match("/[0-9]{14}/",$timestamp)) return 0;
-    
-    $sql = "SELECT ar_text,ar_flags FROM archive WHERE ar_namespace={$namespace} AND ar_title=\"{$title}\" AND ar_timestamp={$timestamp}";
-    $ret = wfQuery( $sql, DB_READ );
-    $row = wfFetchObject( $ret );
-    
-    $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
-    $wgOut->addWikiText( "(" . wfMsg( "undeleterevision", $wgLang->date($timestamp, true) )
-      . ")\n<hr>\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 ) ) {
+                       throw new MWException( '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_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() {
+               $dbr =& wfGetDB( DB_SLAVE );
+               $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' ) );
+               $ret = $dbr->resultObject( $res );
+               return $ret;
+       }
+       
+       /**
+        * List the deleted file revisions for this page, if it's a file page.
+        * Returns a result wrapper with various filearchive fields, or null
+        * if not a file page.
+        *
+        * @return ResultWrapper
+        * @fixme Does this belong in Image for fuller encapsulation?
+        */
+       function listFiles() {
+               $fname = __CLASS__ . '::' . __FUNCTION__;
+               if( $this->title->getNamespace() == NS_IMAGE ) {
+                       $dbr =& wfGetDB( DB_SLAVE );
+                       $res = $dbr->select( 'filearchive',
+                               array(
+                                       'fa_id',
+                                       'fa_name',
+                                       'fa_storage_key',
+                                       'fa_size',
+                                       'fa_width',
+                                       'fa_height',
+                                       'fa_description',
+                                       'fa_user',
+                                       'fa_user_text',
+                                       'fa_timestamp' ),
+                               array( 'fa_name' => $this->title->getDbKey() ),
+                               $fname,
+                               array( 'ORDER BY' => 'fa_timestamp DESC' ) );
+                       $ret = $dbr->resultObject( $res );
+                       return $ret;
+               }
+               return null;
+       }
+
+       /**
+        * 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( $row ) {
+                       return $this->getTextFromRow( $row );
+               } else {
+                       return null;
+               }
+       }
+
+       /**
+        * 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.
+        *
+        * 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', 'ar_text_id' ),
+                       array( 'ar_namespace' => $this->title->getNamespace(),
+                              'ar_title' => $this->title->getDBkey() ),
+                       'PageArchive::getLastRevisionText',
+                       array( 'ORDER BY' => 'ar_timestamp DESC' ) );
+               if( $row ) {
+                       return $this->getTextFromRow( $row );
+               } else {
+                       return NULL;
+               }
+       }
 
-    $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 );
+       /**
+        * 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);
+       }
 
-       if( wfNumRows( $ret ) == 0 ) {
-               $wgOut->addWikiText( wfMsg( "nohistory" ) );
-               return 0;
+       /**
+        * Restore the given (or all) text and file revisions for the page.
+        * 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
+        *
+        * @return true on success.
+        */
+       function undelete( $timestamps, $comment = '', $fileVersions = array() ) {
+               // If both the set of text revisions and file revisions are empty,
+               // restore everything. Otherwise, just restore the requested items.
+               $restoreAll = empty( $timestamps ) && empty( $fileVersions );
+               
+               $restoreText = $restoreAll || !empty( $timestamps );
+               $restoreFiles = $restoreAll || !empty( $fileVersions );
+               
+               if( $restoreFiles && $this->title->getNamespace() == NS_IMAGE ) {
+                       $img = new Image( $this->title );
+                       $filesRestored = $img->restore( $fileVersions );
+               } else {
+                       $filesRestored = 0;
+               }
+               
+               if( $restoreText ) {
+                       $textRestored = $this->undeleteRevisions( $timestamps );
+               } else {
+                       $textRestored = 0;
+               }
+               
+               // Touch the log!
+               global $wgContLang;
+               $log = new LogPage( 'delete' );
+               
+               if( $textRestored && $filesRestored ) {
+                       $reason = wfMsgForContent( 'undeletedrevisions-files',
+                               $wgContLang->formatNum( $textRestored ),
+                               $wgContLang->formatNum( $filesRestored ) );
+               } elseif( $textRestored ) {
+                       $reason = wfMsgForContent( 'undeletedrevisions',
+                               $wgContLang->formatNum( $textRestored ) );
+               } elseif( $filesRestored ) {
+                       $reason = wfMsgForContent( 'undeletedfiles',
+                               $wgContLang->formatNum( $filesRestored ) );
+               } else {
+                       wfDebug( "Undelete: nothing undeleted...\n" );
+                       return false;
+               }
+               
+               if( trim( $comment ) != '' )
+                       $reason .= ": {$comment}";
+               $log->addEntry( 'restore', $this->title, $reason );
+               
+               return true;
        }
        
-    $wgOut->addWikiText( wfMsg( "undeletehistory" ) . "\n<hr>\n" . $row->ar_text );
-
-       $action = wfLocalUrlE( $wgLang->specialPage( "Undelete" ), "action=submit" );
-       $wgOut->addHTML("<p>
-<form id=\"undelete\" method=\"post\" action=\"{$action}\">
-<input type=hidden name=\"target\" value=\"{$target}\">
-<input type=submit name=\"restore\" value=\"".wfMsg("undeletebtn")."\">
-</form>");
-
-    $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("<ul>");
-    while( $row = wfFetchObject( $ret ) ) {
-        $wgOut->addHTML( "<li>" .
-         $sk->makeKnownLink( $wgLang->specialPage( "Undelete" ),
-          $wgLang->timeanddate( $row->ar_timestamp, true ),
-          "target=" . urlencode($target) . "&timestamp={$row->ar_timestamp}" ) . " " .
-         ". . {$row->ar_user_text}" .
-          " <i>(" . htmlspecialchars($row->ar_comment) . "</i>)\n");
-
-    }
-    $wgOut->addHTML("</ul>");
-    
-       return 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.
+        *
+        * @param array $timestamps Pass an empty array to restore all revisions, otherwise list the ones to undelete.
+        * @param string $comment
+        * @param array $fileVersions
+        *
+        * @return int number of revisions restored
+        */
+       private function undeleteRevisions( $timestamps ) {
+               global $wgParser, $wgDBtype;
+
+               $fname = __CLASS__ . '::' . __FUNCTION__;
+               $restoreAll = empty( $timestamps );
+               
+               $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 == 'postgres' )
+                       ? '' // 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;
+               } else {
+                       # Have to create a new article...
+                       $newid  = $article->insertOn( $dbw );
+                       $pageId = $newid;
+                       $previousRevId = 0;
+               }
+
+               if( $restoreAll ) {
+                       $oldones = '1 = 1'; # All revisions...
+               } else {
+                       $oldts = implode( ',',
+                               array_map( array( &$dbw, 'addQuotes' ),
+                                       array_map( array( &$dbw, 'timestamp' ),
+                                               $timestamps ) ) );
+
+                       $oldones = "ar_timestamp IN ( {$oldts} )";
+               }
+
+               /**
+                * 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' )
+                       );
+               if( $dbw->numRows( $result ) < count( $timestamps ) ) {
+                       wfDebug( "$fname: couldn't find all requested rows\n" );
+                       return false;
+               }
+               
+               $revision = null;
+               $newRevId = $previousRevId;
+               $restored = 0;
+
+               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_' );
+                       }
+                       $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,
+                               ) );
+                       $newRevId = $revision->insertOn( $dbw );
+                       $restored++;
+               }
+
+               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
+                               $options = new ParserOptions;
+                               $parserOutput = $wgParser->parse( $revision->getText(), $this->title, $options,
+                                       true, true, $newRevId );
+                               $u = new LinksUpdate( $this->title, $parserOutput );
+                               $u->doUpdate();
+
+                               #TODO: SearchUpdate, etc.
+                       }
+
+                       if( $newid ) {
+                               Article::onArticleCreate( $this->title );
+                       } else {
+                               Article::onArticleEdit( $this->title );
+                       }
+               } else {
+                       # Something went terribly wrong!
+               }
+
+               # 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 );
+
+               return $restored;
+       }
+
 }
+
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+class UndeleteForm {
+       var $mAction, $mTarget, $mTimestamp, $mRestore, $mTargetObj;
+       var $mTargetTimestamp, $mAllowed, $mComment;
+
+       function UndeleteForm( &$request, $par = "" ) {
+               global $wgUser;
+               $this->mAction = $request->getText( 'action' );
+               $this->mTarget = $request->getText( 'target' );
+               $this->mTimestamp = $request->getText( 'timestamp' );
+               $this->mFile = $request->getVal( 'file' );
+               
+               $posted = $request->wasPosted() &&
+                       $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
+               $this->mRestore = $request->getCheck( 'restore' ) && $posted;
+               $this->mPreview = $request->getCheck( 'preview' ) && $posted;
+               $this->mComment = $request->getText( 'wpComment' );
+               
+               if( $par != "" ) {
+                       $this->mTarget = $par;
+               }
+               if ( $wgUser->isAllowed( 'delete' ) && !$wgUser->isBlocked() ) {
+                       $this->mAllowed = true;
+               } else {
+                       $this->mAllowed = false;
+                       $this->mTimestamp = '';
+                       $this->mRestore = false;
+               }
+               if ( $this->mTarget !== "" ) {
+                       $this->mTargetObj = Title::newFromURL( $this->mTarget );
+               } else {
+                       $this->mTargetObj = NULL;
+               }
+               if( $this->mRestore ) {
+                       $timestamps = array();
+                       $this->mFileVersions = array();
+                       foreach( $_REQUEST as $key => $val ) {
+                               if( preg_match( '/^ts(\d{14})$/', $key, $matches ) ) {
+                                       array_push( $timestamps, $matches[1] );
+                               }
+                               
+                               if( preg_match( '/^fileid(\d+)$/', $key, $matches ) ) {
+                                       $this->mFileVersions[] = intval( $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->mFile !== null ) {
+                       return $this->showFile( $this->mFile );
+               }
+               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();
+
+               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() ) {
+                       $title = Title::makeTitleSafe( $row->ar_namespace, $row->ar_title );
+                       $link = $sk->makeKnownLinkObj( $undelete, htmlspecialchars( $title->getPrefixedText() ), 'target=' . $title->getPrefixedUrl() );
+                       $revs = wfMsgHtml( 'undeleterevisions', $wgLang->formatNum( $row->count ) );
+                       $wgOut->addHtml( "<li>{$link} ({$revs})</li>\n" );
+               }
+               $result->free();
+               $wgOut->addHTML( "</ul>\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" );
+               
+               if( $this->mPreview ) {
+                       $wgOut->addHtml( "<hr />\n" );
+                       $wgOut->addWikiText( $text );
+               }
+               
+               $self = Title::makeTitle( NS_SPECIAL, "Undelete" );
+               
+               $wgOut->addHtml(
+                       wfElement( 'textarea', array(
+                                       'readonly' => true,
+                                       'cols' => intval( $wgUser->getOption( 'cols' ) ),
+                                       'rows' => intval( $wgUser->getOption( 'rows' ) ) ),
+                               $text . "\n" ) .
+                       wfOpenElement( 'div' ) .
+                       wfOpenElement( 'form', array(
+                               'method' => 'post',
+                               'action' => $self->getLocalURL( "action=submit" ) ) ) .
+                       wfElement( 'input', array(
+                               'type' => 'hidden',
+                               'name' => 'target',
+                               'value' => $this->mTargetObj->getPrefixedDbKey() ) ) .
+                       wfElement( 'input', array(
+                               'type' => 'hidden',
+                               'name' => 'timestamp',
+                               'value' => $timestamp ) ) .
+                       wfElement( 'input', array(
+                               'type' => 'hidden',
+                               'name' => 'wpEditToken',
+                               'value' => $wgUser->editToken() ) ) .
+                       wfElement( 'input', array(
+                               'type' => 'hidden',
+                               'name' => 'preview',
+                               'value' => '1' ) ) .
+                       wfElement( 'input', array(
+                               'type' => 'submit',
+                               'value' => wfMsg( 'showpreview' ) ) ) .
+                       wfCloseElement( 'form' ) .
+                       wfCloseElement( 'div' ) );
+       }
        
-/* private */ function doUndeleteArticle( $namespace, $title )
-       {
-               global $wgUser, $wgOut, $wgLang, $target, $wgDeferredUpdateList;
-               global  $wgUseSquid, $wgInternalServer;
+       /**
+        * Show a deleted file version requested by the visitor.
+        */
+       function showFile( $key ) {
+               global $wgOut;
+               $wgOut->disable();
+               
+               $store = FileStore::get( 'deleted' );
+               $store->stream( $key );
+       }
+
+       /* private */ function showHistory() {
+               global $wgLang, $wgUser, $wgOut;
 
-               $fname = "doUndeleteArticle";
+               $sk = $wgUser->getSkin();
+               if ( $this->mAllowed ) {
+                       $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
+               } else {
+                       $wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
+               }
 
-               if ( "" == $title ) {
-                       $wgOut->fatalError( wfMsg( "cannotundelete" ) );
+               $archive = new PageArchive( $this->mTargetObj );
+               $text = $archive->getLastRevisionText();
+               /*
+               if( is_null( $text ) ) {
+                       $wgOut->addWikiText( wfMsg( "nohistory" ) );
                        return;
                }
-               $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 ( $this->mAllowed ) {
+                       $wgOut->addWikiText( wfMsg( "undeletehistory" ) );
                } 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}'";
-                       wfQuery( $sql, DB_WRITE, $fname );
-                       
-                       # FIXME: Sometimes restored entries will be _newer_ than the current version.
-                       # We should merge.
-               }
-               
-               $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 );
-                               
-                       Article::onArticleCreate( $to );
+                       $wgOut->addWikiText( wfMsg( "undeletehistorynoadmin" ) );
+               }
 
-                       # Squid purging
-                       if ( $wgUseSquid ) {
-                               /* this needs to be done after LinksUpdate */
-                               $u = new SquidUpdate($to);
-                               array_push( $wgDeferredUpdateList, $u );
+               # List all stored revisions
+               $revisions = $archive->listRevisions();
+               $files = $archive->listFiles();
+               
+               $haveRevisions = $revisions && $revisions->numRows() > 0;
+               $haveFiles = $files && $files->numRows() > 0;
+               
+               # Batch existence check on user and talk pages
+               if( $haveRevisions ) {
+                       $batch = new LinkBatch();
+                       while( $row = $revisions->fetchObject() ) {
+                               $batch->addObj( Title::makeTitleSafe( NS_USER, $row->ar_user_text ) );
+                               $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->ar_user_text ) );
+                       }
+                       $batch->execute();
+                       $revisions->seek( 0 );
+               }
+               if( $haveFiles ) {
+                       $batch = new LinkBatch();
+                       while( $row = $files->fetchObject() ) {
+                               $batch->addObj( Title::makeTitleSafe( NS_USER, $row->fa_user_text ) );
+                               $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->fa_user_text ) );
                        }
+                       $batch->execute();
+                       $files->seek( 0 );
+               }
 
-                       #TODO: SearchUpdate, etc.
+               if ( $this->mAllowed ) {
+                       $titleObj = Title::makeTitle( NS_SPECIAL, "Undelete" );
+                       $action = $titleObj->getLocalURL( "action=submit" );
+                       # Start the form here
+                       $top = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'undelete' ) );
+                       $wgOut->addHtml( $top );
                }
 
-               # 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 );
+               # Show relevant lines from the deletion log:
+               $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
+               require_once( 'SpecialLog.php' );
+               $logViewer = new LogViewer(
+                       new LogReader(
+                               new FauxRequest(
+                                       array( 'page' => $this->mTargetObj->getPrefixedText(),
+                                                  'type' => 'delete' ) ) ) );
+               $logViewer->showList( $wgOut );
+               
+               if( $this->mAllowed && ( $haveRevisions || $haveFiles ) ) {
+                       # Format the user-visible controls (comment field, submission button)
+                       # in a nice little table
+                       $table = '<fieldset><table><tr>';
+                       $table .= '<td colspan="2">' . wfMsgWikiHtml( 'undeleteextrahelp' ) . '</td></tr><tr>';
+                       $table .= '<td align="right"><strong>' . wfMsgHtml( 'undeletecomment' ) . '</strong></td>';
+                       $table .= '<td>' . wfInput( 'wpComment', 50, $this->mComment ) . '</td>';
+                       $table .= '</tr><tr><td>&nbsp;</td><td>';
+                       $table .= wfSubmitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore' ) );
+                       $table .= wfElement( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ) ) );
+                       $table .= '</td></tr></table></fieldset>';
+                       $wgOut->addHtml( $table );
+               }
+       
+               $wgOut->addHTML( "<h2>" . htmlspecialchars( wfMsg( "history" ) ) . "</h2>\n" );
+               
+               if( $haveRevisions ) {
+                       # The page's stored (deleted) history:
+                       $wgOut->addHTML("<ul>");
+                       $target = urlencode( $this->mTarget );
+                       while( $row = $revisions->fetchObject() ) {
+                               $ts = wfTimestamp( TS_MW, $row->ar_timestamp );
+                               if ( $this->mAllowed ) {
+                                       $checkBox = wfCheck( "ts$ts" );
+                                       $pageLink = $sk->makeKnownLinkObj( $titleObj,
+                                               $wgLang->timeanddate( $ts, true ),
+                                               "target=$target&timestamp=$ts" );
+                               } else {
+                                       $checkBox = '';
+                                       $pageLink = $wgLang->timeanddate( $ts, true );
+                               }
+                               $userLink = $sk->userLink( $row->ar_user, $row->ar_user_text ) . $sk->userToolLinks( $row->ar_user, $row->ar_user_text );
+                               $comment = $sk->commentBlock( $row->ar_comment );
+                               $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink $comment</li>\n" );
+       
+                       }
+                       $revisions->free();
+                       $wgOut->addHTML("</ul>");
+               } else {
+                       $wgOut->addWikiText( wfMsg( "nohistory" ) );
+               }
 
                
-               # Touch the log?
-               $log = new LogPage( wfMsg( "dellogpage" ), wfMsg( "dellogpagetext" ) );
-               $log->addEntry( wfMsg( "undeletedarticle", $target ), "" );
+               if( $haveFiles ) {
+                       $wgOut->addHtml( "<h2>" . wfMsgHtml( 'imghistory' ) . "</h2>\n" );
+                       $wgOut->addHtml( "<ul>" );
+                       while( $row = $files->fetchObject() ) {
+                               $ts = wfTimestamp( TS_MW, $row->fa_timestamp );
+                               if ( $this->mAllowed && $row->fa_storage_key ) {
+                                       $checkBox = wfCheck( "fileid" . $row->fa_id );
+                                       $key = urlencode( $row->fa_storage_key );
+                                       $target = urlencode( $this->mTarget );
+                                       $pageLink = $sk->makeKnownLinkObj( $titleObj,
+                                               $wgLang->timeanddate( $ts, true ),
+                                               "target=$target&file=$key" );
+                               } else {
+                                       $checkBox = '';
+                                       $pageLink = $wgLang->timeanddate( $ts, true );
+                               }
+                               $userLink = $sk->userLink( $row->fa_user, $row->fa_user_text ) . $sk->userToolLinks( $row->fa_user, $row->fa_user_text );
+                               $data =
+                                       wfMsgHtml( 'widthheight',
+                                               $wgLang->formatNum( $row->fa_width ),
+                                               $wgLang->formatNum( $row->fa_height ) ) .
+                                       ' (' .
+                                       wfMsgHtml( 'nbytes', $wgLang->formatNum( $row->fa_size ) ) .
+                                       ')';
+                               $comment = $sk->commentBlock( $row->fa_description );
+                               $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink $data $comment</li>\n" );
+                       }
+                       $files->free();
+                       $wgOut->addHTML( "</ul>" );
+               }
+               
+               if ( $this->mAllowed ) {
+                       # Slip in the hidden controls here
+                       $misc  = wfHidden( 'target', $this->mTarget );
+                       $misc .= wfHidden( 'wpEditToken', $wgUser->editToken() );
+                       $wgOut->addHtml( $misc . '</form>' );
+               }
 
-               $wgOut->addWikiText( wfMsg( "undeletedtext", $target ) );
-               return 0;
+               return true;
        }
+
+       function undelete() {
+               global $wgOut, $wgUser;
+               if( !is_null( $this->mTargetObj ) ) {
+                       $archive = new PageArchive( $this->mTargetObj );
+                       $ok = true;
+                       
+                       $ok = $archive->undelete(
+                               $this->mTargetTimestamp,
+                               $this->mComment,
+                               $this->mFileVersions );
+                       
+                       if( $ok ) {
+                               $skin =& $wgUser->getSkin();
+                               $link = $skin->makeKnownLinkObj( $this->mTargetObj );
+                               $wgOut->addHtml( wfMsgWikiHtml( 'undeletedpage', $link ) );
+                               return true;
+                       }
+               }
+               $wgOut->showFatalError( wfMsg( "cannotundelete" ) );
+               return false;
+       }
+}
+
 ?>