X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FSpecialUndelete.php;h=695c8c29343bd6342fe02ddf34d3b8d2b7701ded;hb=513df4bf9ed98366a0105393a1a9f12ef7ed87e7;hp=fc0aa337fb7dcd021db139f3c6c38d9bcde8c0d7;hpb=1c0dcc995d27eff708ee27c6c645b2e9a43a6ce2;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php index fc0aa337fb..695c8c2934 100644 --- a/includes/SpecialUndelete.php +++ b/includes/SpecialUndelete.php @@ -1,13 +1,13 @@ title =& $title; } - + /** * List all deleted pages recorded in the archive table. Returns result * wrapper with (ar_namespace, ar_title, count) fields, ordered by page @@ -40,32 +40,67 @@ class PageArchive { * * @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; } + /** + * 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. @@ -73,15 +108,43 @@ class PageArchive { * @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 ); + 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. @@ -93,18 +156,18 @@ class PageArchive { 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 @@ -116,33 +179,88 @@ class PageArchive { 'ar_title' => $this->title->getDBkey() ) ); return ($n > 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; + } /** * 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 + * @param string $comment + * @param array $fileVersions + * + * @return int number of revisions restored */ - function undelete( $timestamps ) { - global $wgUser, $wgOut, $wgLang, $wgDeferredUpdateList; - global $wgUseSquid, $wgInternalServer, $wgLinkCache; - global $wgDBtype; + private function undeleteRevisions( $timestamps ) { + global $wgParser, $wgDBtype; - $fname = "doUndeleteArticle"; + $fname = __CLASS__ . '::' . __FUNCTION__; $restoreAll = empty( $timestamps ); - $restoreRevisions = count( $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 == 'PostgreSQL' ) + $options = ( $wgDBtype == 'postgres' ) ? '' // pg doesn't support this? : 'FOR UPDATE'; $page = $dbw->selectRow( 'page', @@ -157,26 +275,24 @@ class PageArchive { $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; } - + if( $restoreAll ) { - $oldones = '1'; # All revisions... + $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... */ @@ -189,7 +305,8 @@ class PageArchive { 'ar_user_text', 'ar_timestamp', 'ar_minor_edit', - 'ar_flags' ), + 'ar_flags', + 'ar_text_id' ), /* WHERE */ array( 'ar_namespace' => $this->title->getNamespace(), 'ar_title' => $this->title->getDBkey(), @@ -198,50 +315,66 @@ class PageArchive { /* 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' => Revision::getRevisionText( $row, 'ar_' ), + '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 ); + $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->getId(), $previousRevId, - Article::isRedirect( $revision->getText() ) ); - + $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() ); + $options = new ParserOptions; + $parserOutput = $wgParser->parse( $revision->getText(), $this->title, $options, + true, true, $newRevId ); + $u = new LinksUpdate( $this->title, $parserOutput ); + $u->doUpdate(); - $u = new LinksUpdate( $newid, $this->title->getPrefixedDBkey() ); - array_push( $wgDeferredUpdateList, $u ); - #TODO: SearchUpdate, etc. } - + if( $newid ) { Article::onArticleCreate( $this->title ); } else { Article::onArticleEdit( $this->title ); } } else { - # Something went terribly worong! + # Something went terribly wrong! } # Now that it's safely stored, take it out of the archive @@ -251,18 +384,10 @@ class PageArchive { 'ar_title' => $this->title->getDBkey(), $oldones ), $fname ); - - # Touch the log! - $log = new LogPage( 'delete' ); - if( $restoreAll ) { - $reason = ""; - } else { - $reason = wfMsg( 'undeletedrevisions', $restoreRevisions ); - } - $log->addEntry( 'restore', $this->title, $reason ); - - return true; + + return $restored; } + } /** @@ -272,19 +397,31 @@ class PageArchive { */ class UndeleteForm { var $mAction, $mTarget, $mTimestamp, $mRestore, $mTargetObj; - var $mTargetTimestamp; + 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->mRestore = $request->getCheck( 'restore' ) && - $request->wasPosted() && + $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 { @@ -292,10 +429,15 @@ class UndeleteForm { } 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; @@ -303,12 +445,16 @@ class UndeleteForm { } function execute() { + if( is_null( $this->mTargetObj ) ) { return $this->showList(); } - if( $this->mTimestamp !== "" ) { + 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(); } @@ -318,32 +464,36 @@ class UndeleteForm { /* 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( "\n" ); - + return true; } - + /* private */ function showRevision( $timestamp ) { global $wgLang, $wgUser, $wgOut; $fname = "UndeleteForm::showRevision"; @@ -352,41 +502,120 @@ class UndeleteForm { $archive =& new PageArchive( $this->mTargetObj ); $text = $archive->getRevisionText( $timestamp ); - + $wgOut->setPagetitle( wfMsg( "undeletepage" ) ); $wgOut->addWikiText( "(" . wfMsg( "undeleterevision", - $wgLang->date( $timestamp ) ) . ")\n
\n" . $text ); + $wgLang->date( $timestamp ) ) . ")\n" ); + + if( $this->mPreview ) { + $wgOut->addHtml( "
\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' ) ); + } + + /** + * 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; - + $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(); + /* if( is_null( $text ) ) { $wgOut->addWikiText( wfMsg( "nohistory" ) ); return; } - $wgOut->addWikiText( wfMsg( "undeletehistory" ) . "\n----\n" . $text ); + */ + if ( $this->mAllowed ) { + $wgOut->addWikiText( wfMsg( "undeletehistory" ) ); + } else { + $wgOut->addWikiText( wfMsg( "undeletehistorynoadmin" ) ); + } # List all stored revisions $revisions = $archive->listRevisions(); + $files = $archive->listFiles(); - $titleObj = Title::makeTitle( NS_SPECIAL, "Undelete" ); - $action = $titleObj->escapeLocalURL( "action=submit" ); - $encTarget = htmlspecialchars( $this->mTarget ); - $button = htmlspecialchars( wfMsg("undeletebtn") ); - $token = htmlspecialchars( $wgUser->editToken() ); + $haveRevisions = $revisions && $revisions->numRows() > 0; + $haveFiles = $files && $files->numRows() > 0; - $wgOut->addHTML(" -
- - - - "); + # 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 ); + } + + 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 ); + } # Show relevant lines from the deletion log: $wgOut->addHTML( "

" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "

\n" ); @@ -395,45 +624,112 @@ class UndeleteForm { new LogReader( new FauxRequest( array( 'page' => $this->mTargetObj->getPrefixedText(), - 'type' => 'delete' ) ) ) ); + 'type' => 'delete' ) ) ) ); $logViewer->showList( $wgOut ); - # The page's stored (deleted) history: + if( $this->mAllowed && ( $haveRevisions || $haveFiles ) ) { + # Format the user-visible controls (comment field, submission button) + # in a nice little table + $table = '
'; + $table .= ''; + $table .= ''; + $table .= ''; + $table .= '
' . wfMsgWikiHtml( 'undeleteextrahelp' ) . '
' . wfMsgHtml( 'undeletecomment' ) . '' . wfInput( 'wpComment', 50, $this->mComment ) . '
 '; + $table .= wfSubmitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore' ) ); + $table .= wfElement( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ) ) ); + $table .= '
'; + $wgOut->addHtml( $table ); + } + $wgOut->addHTML( "

" . htmlspecialchars( wfMsg( "history" ) ) . "

\n" ); - $wgOut->addHTML("\n
"); + if ( $this->mAllowed ) { + # Slip in the hidden controls here + $misc = wfHidden( 'target', $this->mTarget ); + $misc .= wfHidden( 'wpEditToken', $wgUser->editToken() ); + $wgOut->addHtml( $misc . '' ); + } + return true; } function undelete() { - global $wgOut; + global $wgOut, $wgUser; if( !is_null( $this->mTargetObj ) ) { $archive = new PageArchive( $this->mTargetObj ); - if( $archive->undelete( $this->mTargetTimestamp ) ) { - $wgOut->addWikiText( wfMsg( "undeletedtext", $this->mTarget ) ); + $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->fatalError( wfMsg( "cannotundelete" ) ); + $wgOut->showFatalError( wfMsg( "cannotundelete" ) ); return false; } }