From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- includes/specials/SpecialMergeHistory.php | 210 +++++++++++++++++++----------- 1 file changed, 134 insertions(+), 76 deletions(-) (limited to 'includes/specials/SpecialMergeHistory.php') diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php index 43b4ef6a..88e90ee5 100644 --- a/includes/specials/SpecialMergeHistory.php +++ b/includes/specials/SpecialMergeHistory.php @@ -29,14 +29,23 @@ */ class SpecialMergeHistory extends SpecialPage { var $mAction, $mTarget, $mDest, $mTimestamp, $mTargetID, $mDestID, $mComment; + + /** + * @var Title + */ var $mTargetObj, $mDestObj; public function __construct() { parent::__construct( 'MergeHistory', 'mergehistory' ); } + /** + * @param $request WebRequest + * @return void + */ private function loadRequestParams( $request ) { global $wgUser; + $this->mAction = $request->getVal( 'action' ); $this->mTarget = $request->getVal( 'target' ); $this->mDest = $request->getVal( 'dest' ); @@ -45,7 +54,7 @@ class SpecialMergeHistory extends SpecialPage { $this->mTargetID = intval( $request->getVal( 'targetID' ) ); $this->mDestID = intval( $request->getVal( 'destID' ) ); $this->mTimestamp = $request->getVal( 'mergepoint' ); - if( !preg_match("/[0-9]{14}/",$this->mTimestamp) ) { + if( !preg_match( '/[0-9]{14}/', $this->mTimestamp ) ) { $this->mTimestamp = ''; } $this->mComment = $request->getText( 'wpComment' ); @@ -73,7 +82,7 @@ class SpecialMergeHistory extends SpecialPage { } } - function execute( $par ) { + public function execute( $par ) { global $wgOut, $wgRequest, $wgUser; if ( wfReadOnly() ) { @@ -91,7 +100,7 @@ class SpecialMergeHistory extends SpecialPage { $this->setHeaders(); $this->outputHeader(); - if( $this->mTargetID && $this->mDestID && $this->mAction=="submit" && $this->mMerge ) { + if( $this->mTargetID && $this->mDestID && $this->mAction == 'submit' && $this->mMerge ) { return $this->merge(); } @@ -109,14 +118,14 @@ class SpecialMergeHistory extends SpecialPage { ); } - if ( !$this->mDestObj instanceof Title) { + if ( !$this->mDestObj instanceof Title ) { $errors[] = wfMsgExt( 'mergehistory-invalid-destination', array( 'parse' ) ); } elseif( !$this->mDestObj->exists() ) { $errors[] = wfMsgExt( 'mergehistory-no-destination', array( 'parse' ), wfEscapeWikiText( $this->mDestObj->getPrefixedText() ) ); } - + if ( $this->mTargetObj && $this->mDestObj && $this->mTargetObj->equals( $this->mDestObj ) ) { $errors[] = wfMsgExt( 'mergehistory-same-destination', array( 'parse' ) ); } @@ -146,37 +155,47 @@ class SpecialMergeHistory extends SpecialPage { Html::hidden( 'submitted', '1' ) . Html::hidden( 'mergepoint', $this->mTimestamp ) . Xml::openElement( 'table' ) . - " - ".Xml::label( wfMsg( 'mergehistory-from' ), 'target' )." - ".Xml::input( 'target', 30, $this->mTarget, array('id'=>'target') )." + ' + ' . Xml::label( wfMsg( 'mergehistory-from' ), 'target' ) . ' + ' . Xml::input( 'target', 30, $this->mTarget, array( 'id' => 'target' ) ) . ' - ".Xml::label( wfMsg( 'mergehistory-into' ), 'dest' )." - ".Xml::input( 'dest', 30, $this->mDest, array('id'=>'dest') )." - " . + ' . Xml::label( wfMsg( 'mergehistory-into' ), 'dest' ) . ' + ' . Xml::input( 'dest', 30, $this->mDest, array( 'id' => 'dest' ) ) . ' + ' . Xml::submitButton( wfMsg( 'mergehistory-go' ) ) . - "" . + '' . Xml::closeElement( 'table' ) . '' . - '' ); + '' + ); } private function showHistory() { global $wgUser, $wgOut; - $this->sk = $wgUser->getSkin(); + $this->sk = $this->getSkin(); - $wgOut->setPagetitle( wfMsg( "mergehistory" ) ); + $wgOut->setPageTitle( wfMsg( 'mergehistory' ) ); $this->showMergeForm(); # List all stored revisions - $revisions = new MergeHistoryPager( $this, array(), $this->mTargetObj, $this->mDestObj ); + $revisions = new MergeHistoryPager( + $this, array(), $this->mTargetObj, $this->mDestObj + ); $haveRevisions = $revisions && $revisions->getNumRows() > 0; $titleObj = $this->getTitle(); $action = $titleObj->getLocalURL( array( 'action' => 'submit' ) ); # Start the form here - $top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'merge' ) ); + $top = Xml::openElement( + 'form', + array( + 'method' => 'post', + 'action' => $action, + 'id' => 'merge' + ) + ); $wgOut->addHTML( $top ); if( $haveRevisions ) { @@ -184,43 +203,46 @@ class SpecialMergeHistory extends SpecialPage { # in a nice little table $table = Xml::openElement( 'fieldset' ) . - wfMsgExt( 'mergehistory-merge', array('parseinline'), + wfMsgExt( 'mergehistory-merge', array( 'parseinline' ), $this->mTargetObj->getPrefixedText(), $this->mDestObj->getPrefixedText() ) . Xml::openElement( 'table', array( 'id' => 'mw-mergehistory-table' ) ) . - " - " . + ' + ' . Xml::label( wfMsg( 'mergehistory-reason' ), 'wpComment' ) . - " - " . - Xml::input( 'wpComment', 50, $this->mComment, array('id' => 'wpComment') ) . - " + ' + ' . + Xml::input( 'wpComment', 50, $this->mComment, array( 'id' => 'wpComment' ) ) . + '   - " . + ' . Xml::submitButton( wfMsg( 'mergehistory-submit' ), array( 'name' => 'merge', 'id' => 'mw-merge-submit' ) ) . - " - " . + ' + ' . Xml::closeElement( 'table' ) . Xml::closeElement( 'fieldset' ); $wgOut->addHTML( $table ); } - $wgOut->addHTML( "

" . wfMsgHtml( "mergehistory-list" ) . "

\n" ); + $wgOut->addHTML( + '

' . + wfMsgHtml( 'mergehistory-list' ) . "

\n" + ); if( $haveRevisions ) { $wgOut->addHTML( $revisions->getNavigationBar() ); - $wgOut->addHTML( "' ); $wgOut->addHTML( $revisions->getNavigationBar() ); } else { - $wgOut->addWikiMsg( "mergehistory-empty" ); + $wgOut->addWikiMsg( 'mergehistory-empty' ); } # Show relevant lines from the deletion log: - $wgOut->addHTML( "

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

\n" ); + $wgOut->addHTML( '

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

\n" ); LogEventsList::showLogExtract( $wgOut, 'merge', $this->mTargetObj->getPrefixedText() ); # When we submit, go by page ID to avoid some nasty but unlikely collisions. @@ -245,7 +267,7 @@ class SpecialMergeHistory extends SpecialPage { $last = $this->message['last']; $ts = wfTimestamp( TS_MW, $row->rev_timestamp ); - $checkBox = Xml::radio( "mergepoint", $ts, false ); + $checkBox = Xml::radio( 'mergepoint', $ts, false ); $pageLink = $this->sk->linkKnown( $rev->getTitle(), @@ -258,9 +280,9 @@ class SpecialMergeHistory extends SpecialPage { } # Last link - if( !$rev->userCan( Revision::DELETED_TEXT ) ) + if( !$rev->userCan( Revision::DELETED_TEXT ) ) { $last = $this->message['last']; - else if( isset($this->prevId[$row->rev_id]) ) + } elseif( isset( $this->prevId[$row->rev_id] ) ) { $last = $this->sk->linkKnown( $rev->getTitle(), $this->message['last'], @@ -270,10 +292,12 @@ class SpecialMergeHistory extends SpecialPage { 'oldid' => $this->prevId[$row->rev_id] ) ); + } $userLink = $this->sk->revUserTools( $rev ); - if(!is_null($size = $row->rev_len)) { + $size = $row->rev_len; + if( !is_null( $size ) ) { $stxt = $this->sk->formatRevisionSize( $size ); } $comment = $this->sk->revComment( $rev ); @@ -288,8 +312,9 @@ class SpecialMergeHistory extends SpecialPage { function getPageLink( $row, $titleObj, $ts, $target ) { global $wgLang; - if( !$this->userCan($row, Revision::DELETED_TEXT) ) { - return '' . $wgLang->timeanddate( $ts, true ) . ''; + if( !$this->userCan( $row, Revision::DELETED_TEXT ) ) { + return '' . + $wgLang->timeanddate( $ts, true ) . ''; } else { $link = $this->sk->linkKnown( $titleObj, @@ -300,8 +325,9 @@ class SpecialMergeHistory extends SpecialPage { 'timestamp' => $ts ) ); - if( $this->isDeleted($row, Revision::DELETED_TEXT) ) + if( $this->isDeleted( $row, Revision::DELETED_TEXT ) ) { $link = '' . $link . ''; + } return $link; } } @@ -313,63 +339,80 @@ class SpecialMergeHistory extends SpecialPage { # keep it consistent... $targetTitle = Title::newFromID( $this->mTargetID ); $destTitle = Title::newFromID( $this->mDestID ); - if( is_null($targetTitle) || is_null($destTitle) ) + if( is_null( $targetTitle ) || is_null( $destTitle ) ) { return false; // validate these - if( $targetTitle->getArticleId() == $destTitle->getArticleId() ) + } + if( $targetTitle->getArticleId() == $destTitle->getArticleId() ) { return false; + } # Verify that this timestamp is valid # Must be older than the destination page $dbw = wfGetDB( DB_MASTER ); # Get timestamp into DB format - $this->mTimestamp = $this->mTimestamp ? $dbw->timestamp($this->mTimestamp) : ''; + $this->mTimestamp = $this->mTimestamp ? $dbw->timestamp( $this->mTimestamp ) : ''; # Max timestamp should be min of destination page - $maxtimestamp = $dbw->selectField( 'revision', 'MIN(rev_timestamp)', - array('rev_page' => $this->mDestID ), - __METHOD__ ); + $maxtimestamp = $dbw->selectField( + 'revision', + 'MIN(rev_timestamp)', + array( 'rev_page' => $this->mDestID ), + __METHOD__ + ); # Destination page must exist with revisions if( !$maxtimestamp ) { - $wgOut->addWikiMsg('mergehistory-fail'); + $wgOut->addWikiMsg( 'mergehistory-fail' ); 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__ ); + array( 'page_id' => $this->mTargetID, 'page_latest = rev_id' ), + __METHOD__ + ); # $this->mTimestamp must be older than $maxtimestamp if( $this->mTimestamp >= $maxtimestamp ) { - $wgOut->addWikiMsg('mergehistory-fail'); + $wgOut->addWikiMsg( 'mergehistory-fail' ); return false; } # Update the revisions if( $this->mTimestamp ) { $timewhere = "rev_timestamp <= {$this->mTimestamp}"; - $TimestampLimit = wfTimestamp(TS_MW,$this->mTimestamp); + $timestampLimit = wfTimestamp( TS_MW, $this->mTimestamp ); } else { $timewhere = "rev_timestamp <= {$maxtimestamp}"; - $TimestampLimit = wfTimestamp(TS_MW,$lasttimestamp); + $timestampLimit = wfTimestamp( TS_MW, $lasttimestamp ); } # Do the moving... - $dbw->update( 'revision', + $dbw->update( + 'revision', array( 'rev_page' => $this->mDestID ), - array( 'rev_page' => $this->mTargetID, - $timewhere ), - __METHOD__ ); + 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' ) ); + array( 'FOR UPDATE' ) + ); if( !$haveRevisions ) { if( $this->mComment ) { - $comment = wfMsgForContent( 'mergehistory-comment', $targetTitle->getPrefixedText(), - $destTitle->getPrefixedText(), $this->mComment ); + $comment = wfMsgForContent( + 'mergehistory-comment', + $targetTitle->getPrefixedText(), + $destTitle->getPrefixedText(), + $this->mComment + ); } else { - $comment = wfMsgForContent( 'mergehistory-autocomment', $targetTitle->getPrefixedText(), - $destTitle->getPrefixedText() ); + $comment = wfMsgForContent( + 'mergehistory-autocomment', + $targetTitle->getPrefixedText(), + $destTitle->getPrefixedText() + ); } $mwRedir = MagicWord::get( 'redirect' ); $redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $destTitle->getPrefixedText() . "]]\n"; @@ -389,22 +432,26 @@ class SpecialMergeHistory extends SpecialPage { 'pl_from' => $this->mDestID, 'pl_namespace' => $destTitle->getNamespace(), 'pl_title' => $destTitle->getDBkey() ), - __METHOD__ ); + __METHOD__ + ); } else { $targetTitle->invalidateCache(); // update histories } $destTitle->invalidateCache(); // update histories # Check if this did anything if( !$count ) { - $wgOut->addWikiMsg('mergehistory-fail'); + $wgOut->addWikiMsg( 'mergehistory-fail' ); return false; } # Update our logs $log = new LogPage( 'merge' ); - $log->addEntry( 'merge', $targetTitle, $this->mComment, - array($destTitle->getPrefixedText(),$TimestampLimit) ); + $log->addEntry( + 'merge', $targetTitle, $this->mComment, + array( $destTitle->getPrefixedText(), $timestampLimit ) + ); - $wgOut->addHTML( wfMsgExt( 'mergehistory-success', array('parseinline'), + $wgOut->addHTML( + wfMsgExt( 'mergehistory-success', array('parseinline'), $targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count ) ); wfRunHooks( 'ArticleMergeComplete', array( $targetTitle, $destTitle ) ); @@ -423,14 +470,21 @@ class MergeHistoryPager extends ReverseChronologicalPager { $this->articleID = $source->getArticleID(); $dbr = wfGetDB( DB_SLAVE ); - $maxtimestamp = $dbr->selectField( 'revision', 'MIN(rev_timestamp)', - array('rev_page' => $dest->getArticleID() ), - __METHOD__ ); + $maxtimestamp = $dbr->selectField( + 'revision', + 'MIN(rev_timestamp)', + array( 'rev_page' => $dest->getArticleID() ), + __METHOD__ + ); $this->maxTimestamp = $maxtimestamp; parent::__construct(); } + function getTitle() { + return SpecialPage::getTitleFor( 'Contributions' ); + } + function getStartBody() { wfProfileIn( __METHOD__ ); # Do a link batch query @@ -442,11 +496,12 @@ class MergeHistoryPager extends ReverseChronologicalPager { $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 ) + $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 ) + } elseif( $rev_id < $row->rev_id ) { $this->mForm->prevId[$row->rev_id] = $rev_id; + } $rev_id = $row->rev_id; } @@ -468,9 +523,12 @@ class MergeHistoryPager extends ReverseChronologicalPager { $conds[] = 'page_id = rev_page'; $conds[] = "rev_timestamp < {$this->maxTimestamp}"; return array( - 'tables' => array('revision','page'), - 'fields' => array( 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text', 'rev_comment', - 'rev_id', 'rev_page', 'rev_parent_id', 'rev_text_id', 'rev_len', 'rev_deleted' ), + 'tables' => array( 'revision', 'page' ), + 'fields' => array( + 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text', + 'rev_comment', 'rev_id', 'rev_page', 'rev_parent_id', + 'rev_text_id', 'rev_len', 'rev_deleted' + ), 'conds' => $conds ); } -- cgit v1.2.3-54-g00ecf