Slowly merge in a few rev_deleted checks

[lhc/web/wiklou.git] / includes / SpecialUndelete.php

diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index 4680ca1..51b71d0 100644 (file)
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -57,7 +57,7 @@ class PageArchive {
                $title = Title::newFromText( $prefix );
                if( $title ) {
                        $ns = $title->getNamespace();
-                       $encPrefix = $dbr->escapeLike( $title->getDbKey() );
+                       $encPrefix = $dbr->escapeLike( $title->getDBkey() );
                } else {
                        // Prolly won't work too good
                        // @todo handle bare namespace names cleanly?
@@ -132,7 +132,7 @@ class PageArchive {
                                        'fa_user',
                                        'fa_user_text',
                                        'fa_timestamp' ),
-                               array( 'fa_name' => $this->title->getDbKey() ),
+                               array( 'fa_name' => $this->title->getDBkey() ),
                                __METHOD__,
                                array( 'ORDER BY' => 'fa_timestamp DESC' ) );
                        $ret = $dbr->resultObject( $res );
@@ -174,7 +174,7 @@ class PageArchive {
                                'ar_text_id',
                                'ar_len' ),
                        array( 'ar_namespace' => $this->title->getNamespace(),
-                              'ar_title' => $this->title->getDbkey(),
+                              'ar_title' => $this->title->getDBkey(),
                               'ar_timestamp' => $dbr->timestamp( $timestamp ) ),
                        __METHOD__ );
                if( $row ) {
@@ -212,7 +212,7 @@ class PageArchive {
                $row = $dbr->selectRow( 'archive',
                        'ar_timestamp',
                        array( 'ar_namespace' => $this->title->getNamespace(),
-                              'ar_title' => $this->title->getDbkey(),
+                              'ar_title' => $this->title->getDBkey(),
                               'ar_timestamp < ' .
                                                $dbr->addQuotes( $dbr->timestamp( $timestamp ) ) ),
                        __METHOD__,
@@ -225,7 +225,7 @@ class PageArchive {
                        array( 'rev_id', 'rev_timestamp' ),
                        array(
                                'page_namespace' => $this->title->getNamespace(),
-                               'page_title' => $this->title->getDbkey(),
+                               'page_title' => $this->title->getDBkey(),
                                'page_id = rev_page',
                                'rev_timestamp < ' .
                                                $dbr->addQuotes( $dbr->timestamp( $timestamp ) ) ),
@@ -312,7 +312,8 @@ class PageArchive {
         * @param string $comment
         * @param array $fileVersions
         *
-        * @return true on success.
+        * @return array(number of file revisions restored, number of image revisions restored, log message)
+        * on success, false on failure
         */
        function undelete( $timestamps, $comment = '', $fileVersions = array() ) {
                // If both the set of text revisions and file revisions are empty,
@@ -332,6 +333,8 @@ class PageArchive {
                
                if( $restoreText ) {
                        $textRestored = $this->undeleteRevisions( $timestamps );
+                       if($textRestored === false) // It must be one of UNDELETE_*
+                               return false;
                } else {
                        $textRestored = 0;
                }
@@ -341,14 +344,14 @@ class PageArchive {
                $log = new LogPage( 'delete' );
                
                if( $textRestored && $filesRestored ) {
-                       $reason = wfMsgForContent( 'undeletedrevisions-files',
+                       $reason = wfMsgExt( 'undeletedrevisions-files', array( 'content', 'parsemag' ),
                                $wgContLang->formatNum( $textRestored ),
                                $wgContLang->formatNum( $filesRestored ) );
                } elseif( $textRestored ) {
-                       $reason = wfMsgForContent( 'undeletedrevisions',
+                       $reason = wfMsgExt( 'undeletedrevisions', array( 'content', 'parsemag' ),
                                $wgContLang->formatNum( $textRestored ) );
                } elseif( $filesRestored ) {
-                       $reason = wfMsgForContent( 'undeletedfiles',
+                       $reason = wfMsgExt( 'undeletedfiles', array( 'content', 'parsemag' ),
                                $wgContLang->formatNum( $filesRestored ) );
                } else {
                        wfDebug( "Undelete: nothing undeleted...\n" );
@@ -359,11 +362,7 @@ class PageArchive {
                        $reason .= ": {$comment}";
                $log->addEntry( 'restore', $this->title, $reason );
 
-               if ( $this->fileStatus && !$this->fileStatus->ok ) {
-                       return false;
-               } else {
-                       return true;
-               }
+               return array($textRestored, $filesRestored, $reason);
        }
        
        /**
@@ -375,9 +374,12 @@ class PageArchive {
         * @param string $comment
         * @param array $fileVersions
         *
-        * @return int number of revisions restored
+        * @return mixed number of revisions restored or false on failure
         */
        private function undeleteRevisions( $timestamps ) {
+               if ( wfReadOnly() )
+                       return false;
+
                $restoreAll = empty( $timestamps );
                
                $dbw = wfGetDB( DB_MASTER );
@@ -429,6 +431,7 @@ class PageArchive {
                                'ar_minor_edit',
                                'ar_flags',
                                'ar_text_id',
+                               'ar_page_id',
                                'ar_len' ),
                        /* WHERE */ array(
                                'ar_namespace' => $this->title->getNamespace(),
@@ -473,7 +476,12 @@ class PageArchive {
                                ) );
                        $revision->insertOn( $dbw );
                        $restored++;
+                       
+                       wfRunHooks( 'ArticleRevisionUndeleted', array( &$this->title, $revision, $row->ar_page_id ) );
                }
+               // Was anything restored at all?
+               if($restored == 0)
+                       return 0;
 
                if( $revision ) {
                        // Attach the latest revision to the page...
@@ -491,8 +499,14 @@ class PageArchive {
                                wfRunHooks( 'ArticleUndelete', array( &$this->title, false ) );
                                Article::onArticleEdit( $this->title );
                        }
+
+                       if( $this->title->getNamespace() == NS_IMAGE ) {
+                               $update = new HTMLCacheUpdate( $this->title, 'imagelinks' );
+                               $update->doUpdate();
+                       }
                } else {
-                       # Something went terribly wrong!
+                       // Revision couldn't be created. This is very weird
+                       return self::UNDELETE_UNKNOWNERR;
                }
 
                # Now that it's safely stored, take it out of the archive
@@ -537,7 +551,7 @@ class UndeleteForm {
                if( $par != "" ) {
                        $this->mTarget = $par;
                }
-               if ( $wgUser->isAllowed( 'delete' ) && !$wgUser->isBlocked() ) {
+               if ( $wgUser->isAllowed( 'undelete' ) && !$wgUser->isBlocked() ) {
                        $this->mAllowed = true;
                } else {
                        $this->mAllowed = false;
@@ -600,7 +614,7 @@ class UndeleteForm {
 
        function showSearchForm() {
                global $wgOut, $wgScript;
-               $wgOut->addWikiText( wfMsg( 'undelete-header' ) );
+               $wgOut->addWikiMsg( 'undelete-header' );
                
                $wgOut->addHtml(
                        Xml::openElement( 'form', array(
@@ -623,11 +637,11 @@ class UndeleteForm {
                global $wgLang, $wgContLang, $wgUser, $wgOut;
                
                if( $result->numRows() == 0 ) {
-                       $wgOut->addWikiText( wfMsg( 'undelete-no-results' ) );
+                       $wgOut->addWikiMsg( 'undelete-no-results' );
                        return;
                }
 
-               $wgOut->addWikiText( wfMsg( "undeletepagetext" ) );
+               $wgOut->addWikiMsg( "undeletepagetext" );
 
                $sk = $wgUser->getSkin();
                $undelete = SpecialPage::getTitleFor( 'Undelete' );
@@ -658,22 +672,20 @@ class UndeleteForm {
                $rev = $archive->getRevision( $timestamp );
                
                if( !$rev ) {
-                       $wgOut->addWikiTexT( wfMsg( 'undeleterevision-missing' ) );
+                       $wgOut->addWikiMsg( 'undeleterevision-missing' );
                        return;
                }
                
                $wgOut->setPageTitle( wfMsg( 'undeletepage' ) );
                
                $link = $skin->makeKnownLinkObj(
-                       $self,
-                       htmlspecialchars( $this->mTargetObj->getPrefixedText() ),
-                       'target=' . $this->mTargetObj->getPrefixedUrl()
+                       SpecialPage::getTitleFor( 'Undelete', $this->mTargetObj->getPrefixedDBkey() ),
+                       htmlspecialchars( $this->mTargetObj->getPrefixedText() )
                );
-               $time = htmlspecialchars( $wgLang->timeAndDate( $timestamp ) );
+               $time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) );
                $user = $skin->userLink( $rev->getUser(), $rev->getUserText() )
                        . $skin->userToolLinks( $rev->getUser(), $rev->getUserText() );
-                       
-               
+
                if( $this->mDiff ) {
                        $previousRev = $archive->getPreviousRevision( $timestamp );
                        if( $previousRev ) {
@@ -684,7 +696,7 @@ class UndeleteForm {
                                        $wgOut->addHtml( '<hr />' );
                                }
                        } else {
-                               $wgOut->addHtml( 'No previous revision found.' );
+                               $wgOut->addHtml( wfMsgHtml( 'undelete-nodiff' ) );
                        }
                }
                
@@ -785,7 +797,7 @@ class UndeleteForm {
                        '<div id="mw-diff-otitle1"><strong>' .
                                $sk->makeLinkObj( $targetPage,
                                        wfMsgHtml( 'revisionasof',
-                                               $wgLang->timeanddate( $rev->getTimestamp() ) ),
+                                               $wgLang->timeanddate( $rev->getTimestamp(), true ) ),
                                        $targetQuery ) .
                                ( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) .
                        '</strong></div>' .
@@ -830,14 +842,14 @@ class UndeleteForm {
                /*
                $text = $archive->getLastRevisionText();
                if( is_null( $text ) ) {
-                       $wgOut->addWikiText( wfMsg( "nohistory" ) );
+                       $wgOut->addWikiMsg( "nohistory" );
                        return;
                }
                */
                if ( $this->mAllowed ) {
-                       $wgOut->addWikiText( wfMsg( "undeletehistory" ) );
+                       $wgOut->addWikiMsg( "undeletehistory" );
                } else {
-                       $wgOut->addWikiText( wfMsg( "undeletehistorynoadmin" ) );
+                       $wgOut->addWikiMsg( "undeletehistorynoadmin" );
                }
 
                # List all stored revisions
@@ -971,7 +983,7 @@ class UndeleteForm {
                        $revisions->free();
                        $wgOut->addHTML("</ul>");
                } else {
-                       $wgOut->addWikiText( wfMsg( "nohistory" ) );
+                       $wgOut->addWikiMsg( "nohistory" );
                }
 
                if( $haveFiles ) {
@@ -1030,6 +1042,10 @@ class UndeleteForm {
 
        function undelete() {
                global $wgOut, $wgUser;
+               if ( wfReadOnly() ) {
+                       $wgOut->readOnlyPage();
+                       return;
+               }
                if( !is_null( $this->mTargetObj ) ) {
                        $archive = new PageArchive( $this->mTargetObj );
                        
@@ -1038,7 +1054,12 @@ class UndeleteForm {
                                $this->mComment,
                                $this->mFileVersions );
 
-                       if( $ok ) {
+                       if( is_array($ok) ) {
+                               if ( $ok[1] ) // Undeleted file count
+                                       wfRunHooks( 'FileUndeleteComplete', array(
+                                               $this->mTargetObj, $this->mFileVersions, 
+                                               $wgUser, $this->mComment) );
+                       
                                $skin = $wgUser->getSkin();
                                $link = $skin->makeKnownLinkObj( $this->mTargetObj );
                                $wgOut->addHtml( wfMsgWikiHtml( 'undeletedpage', $link ) );
@@ -1057,5 +1078,3 @@ class UndeleteForm {
                return false;
        }
 }
-
-