* remove end of line whitespace
[lhc/web/wiklou.git] / includes / SpecialMergeHistory.php
index e0de5cc..96c487b 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Special page allowing users with the appropriate permissions to 
+ * Special page allowing users with the appropriate permissions to
  * merge article histories, with some restrictions
  *
  * @addtogroup SpecialPage
@@ -28,12 +28,12 @@ class MergehistoryForm {
 
        function MergehistoryForm( $request, $par = "" ) {
                global $wgUser;
-               
+
                $this->mAction = $request->getVal( 'action' );
                $this->mTarget = $request->getVal( 'target' );
                $this->mDest = $request->getVal( 'dest' );
                $this->mSubmitted = $request->getBool( 'submitted' );
-               
+
                $this->mTargetID = intval( $request->getVal( 'targetID' ) );
                $this->mDestID = intval( $request->getVal( 'destID' ) );
                $this->mTimestamp = $request->getVal( 'mergepoint' );
@@ -41,7 +41,7 @@ class MergehistoryForm {
                        $this->mTimestamp = '';
                }
                $this->mComment = $request->getText( 'wpComment' );
-               
+
                $this->mMerge = $request->wasPosted() && $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
                // target page
                if( $this->mSubmitted ) {
@@ -51,10 +51,10 @@ class MergehistoryForm {
                        $this->mTargetObj = null;
                        $this->mDestObj = null;
                }
-               
+
                $this->preCacheMessages();
        }
-       
+
        /**
         * As we use the same small set of messages in various methods and that
         * they are called often, we call them once and save them in $this->message
@@ -68,9 +68,9 @@ class MergehistoryForm {
 
        function execute() {
                global $wgOut, $wgUser;
-               
+
                $wgOut->setPagetitle( wfMsgHtml( "mergehistory" ) );
-               
+
                if( $this->mTargetID && $this->mDestID && $this->mAction=="submit" && $this->mMerge ) {
                        return $this->merge();
                }
@@ -110,9 +110,9 @@ class MergehistoryForm {
 
        function showMergeForm() {
                global $wgOut, $wgScript;
-               
+
                $wgOut->addWikiMsg( 'mergehistory-header' );
-               
+
                $wgOut->addHtml(
                        Xml::openElement( 'form', array(
                                'method' => 'get',
@@ -122,8 +122,8 @@ class MergehistoryForm {
                                wfMsg( 'mergehistory-box' ) ) .
                        Xml::hidden( 'title',
                                SpecialPage::getTitleFor( 'Mergehistory' )->getPrefixedDbKey() ) .
-                       Xml::hidden( 'submitted', '1' ) . 
-                       Xml::hidden( 'mergepoint', $this->mTimestamp ) . 
+                       Xml::hidden( 'submitted', '1' ) .
+                       Xml::hidden( 'mergepoint', $this->mTimestamp ) .
                        Xml::openElement( 'table' ) .
                        "<tr>
                                <td>".Xml::label( wfMsg( 'mergehistory-from' ), 'target' )."</td>
@@ -143,7 +143,7 @@ class MergehistoryForm {
                global $wgLang, $wgContLang, $wgUser, $wgOut;
 
                $this->sk = $wgUser->getSkin();
-               
+
                $wgOut->setPagetitle( wfMsg( "mergehistory" ) );
 
                $this->showMergeForm();
@@ -206,7 +206,7 @@ class MergehistoryForm {
                # Show relevant lines from the deletion log:
                $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'merge' ) ) . "</h2>\n" );
                LogEventsList::showLogExtract( $wgOut, 'merge', $this->mTargetObj->getPrefixedText() );
-               
+
                # When we submit, go by page ID to avoid some nasty but unlikely collisions.
                # Such would happen if a page was renamed after the form loaded, but before submit
                $misc = Xml::hidden( 'targetID', $this->mTargetObj->getArticleID() );
@@ -219,33 +219,33 @@ class MergehistoryForm {
 
                return true;
        }
-       
+
        function formatRevisionRow( $row ) {
                global $wgUser, $wgLang;
-               
+
                $rev = new Revision( $row );
-               
-               $stxt = ''; 
+
+               $stxt = '';
                $last = $this->message['last'];
-               
+
                $ts = wfTimestamp( TS_MW, $row->rev_timestamp );
                $checkBox = wfRadio( "mergepoint", $ts, false );
-               
-               $pageLink = $this->sk->makeKnownLinkObj( $rev->getTitle(), 
+
+               $pageLink = $this->sk->makeKnownLinkObj( $rev->getTitle(),
                        htmlspecialchars( $wgLang->timeanddate( $ts ) ), 'oldid=' . $rev->getID() );
                if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
                        $pageLink = '<span class="history-deleted">' . $pageLink . '</span>';
                }
-               
+
                # Last link
                if( !$rev->userCan( Revision::DELETED_TEXT ) )
                        $last = $this->message['last'];
                else if( isset($this->prevId[$row->rev_id]) )
-                       $last = $this->sk->makeKnownLinkObj( $rev->getTitle(), $this->message['last'], 
+                       $last = $this->sk->makeKnownLinkObj( $rev->getTitle(), $this->message['last'],
                                "diff=" . $row->rev_id . "&oldid=" . $this->prevId[$row->rev_id] );
-               
+
                $userLink = $this->sk->revUserTools( $rev );
-               
+
                if(!is_null($size = $row->rev_len)) {
                        if($size == 0)
                                $stxt = wfMsgHtml('historyempty');
@@ -253,7 +253,7 @@ class MergehistoryForm {
                                $stxt = wfMsgHtml('historysize', $wgLang->formatNum( $size ) );
                }
                $comment = $this->sk->revComment( $rev );
-               
+
                return "<li>$checkBox ($last) $pageLink . . $userLink $stxt $comment</li>";
        }
 
@@ -263,11 +263,11 @@ class MergehistoryForm {
         */
        function getPageLink( $row, $titleObj, $ts, $target ) {
                global $wgLang;
-               
+
                if( !$this->userCan($row, Revision::DELETED_TEXT) ) {
                        return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
                } else {
-                       $link = $this->sk->makeKnownLinkObj( $titleObj, 
+                       $link = $this->sk->makeKnownLinkObj( $titleObj,
                                $wgLang->timeanddate( $ts, true ), "target=$target&timestamp=$ts" );
                        if( $this->isDeleted($row, Revision::DELETED_TEXT) )
                                $link = '<span class="history-deleted">' . $link . '</span>';
@@ -277,8 +277,8 @@ class MergehistoryForm {
 
        function merge() {
                global $wgOut, $wgUser;
-               # Get the titles directly from the IDs, in case the target page params 
-               # were spoofed. The queries are done based on the IDs, so it's best to 
+               # Get the titles directly from the IDs, in case the target page params
+               # were spoofed. The queries are done based on the IDs, so it's best to
                # keep it consistent...
                $targetTitle = Title::newFromID( $this->mTargetID );
                $destTitle = Title::newFromID( $this->mDestID );
@@ -301,7 +301,7 @@ class MergehistoryForm {
                        return false;
                }
                # Get the latest timestamp of the source
-               $lasttimestamp = $dbw->selectField( array('page','revision'), 
+               $lasttimestamp = $dbw->selectField( array('page','revision'),
                        'rev_timestamp',
                        array('page_id' => $this->mTargetID, 'page_latest = rev_id' ),
                        __METHOD__ );
@@ -324,20 +324,20 @@ class MergehistoryForm {
                        array( 'rev_page' => $this->mTargetID,
                                $timewhere ),
                        __METHOD__ );
-               
+
                $count = $dbw->affectedRows();
                # Make the source page a redirect if no revisions are left
-               $haveRevisions = $dbw->selectField( 'revision', 
+               $haveRevisions = $dbw->selectField( 'revision',
                        'rev_timestamp',
                        array( 'rev_page' => $this->mTargetID  ),
                        __METHOD__,
                        array( 'FOR UPDATE' ) );
                if( !$haveRevisions ) {
                        if( $this->mComment ) {
-                               $comment = wfMsgForContent( 'mergehistory-comment', $targetTitle->getPrefixedText(), 
+                               $comment = wfMsgForContent( 'mergehistory-comment', $targetTitle->getPrefixedText(),
                                        $destTitle->getPrefixedText(), $this->mComment );
                        } else {
-                               $comment = wfMsgForContent( 'mergehistory-autocomment', $targetTitle->getPrefixedText(), 
+                               $comment = wfMsgForContent( 'mergehistory-autocomment', $targetTitle->getPrefixedText(),
                                        $destTitle->getPrefixedText() );
                        }
                        $mwRedir = MagicWord::get( 'redirect' );
@@ -370,14 +370,14 @@ class MergehistoryForm {
                }
                # Update our logs
                $log = new LogPage( 'merge' );
-               $log->addEntry( 'merge', $targetTitle, $this->mComment, 
+               $log->addEntry( 'merge', $targetTitle, $this->mComment,
                        array($destTitle->getPrefixedText(),$TimestampLimit) );
-               
+
                $wgOut->addHtml( wfMsgExt( 'mergehistory-success', array('parseinline'),
                        $targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count ) );
-               
+
                wfRunHooks( 'ArticleMergeComplete', array( $targetTitle, $destTitle ) );
-               
+
                return true;
        }
 }
@@ -390,16 +390,16 @@ class MergeHistoryPager extends ReverseChronologicalPager {
                $this->mConds = $conds;
                $this->title = $source;
                $this->articleID = $source->getArticleID();
-               
+
                $dbr = wfGetDB( DB_SLAVE );
                $maxtimestamp = $dbr->selectField( 'revision', 'MIN(rev_timestamp)',
                        array('rev_page' => $dest->getArticleID() ),
                        __METHOD__ );
-               $this->maxTimestamp = $maxtimestamp; 
-               
+               $this->maxTimestamp = $maxtimestamp;
+
                parent::__construct();
        }
-       
+
        function getStartBody() {
                wfProfileIn( __METHOD__ );
                # Do a link batch query
@@ -410,23 +410,23 @@ class MergeHistoryPager extends ReverseChronologicalPager {
                while( $row = $this->mResult->fetchObject() ) {
                        $batch->addObj( Title::makeTitleSafe( NS_USER, $row->rev_user_text ) );
                        $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->rev_user_text ) );
-                       
+
                        $rev_id = isset($rev_id) ? $rev_id : $row->rev_id;
                        if( $rev_id > $row->rev_id )
                                $this->mForm->prevId[$rev_id] = $row->rev_id;
                        else if( $rev_id < $row->rev_id )
                                $this->mForm->prevId[$row->rev_id] = $rev_id;
-                       
+
                        $rev_id = $row->rev_id;
                }
-               
+
                $batch->execute();
                $this->mResult->seek( 0 );
 
                wfProfileOut( __METHOD__ );
                return '';
        }
-       
+
        function formatRow( $row ) {
                $block = new Block;
                return $this->mForm->formatRevisionRow( $row );
@@ -436,10 +436,10 @@ class MergeHistoryPager extends ReverseChronologicalPager {
                $conds = $this->mConds;
                $conds['rev_page'] = $this->articleID;
                $conds[] = "rev_timestamp < {$this->maxTimestamp}";
-               
+
                return array(
                        'tables' => array('revision'),
-                       'fields' => array( 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text', 'rev_comment', 
+                       'fields' => array( 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text', 'rev_comment',
                                 'rev_id', 'rev_page', 'rev_text_id', 'rev_len', 'rev_deleted' ),
                        'conds' => $conds
                );