From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 3 May 2012 13:01:35 +0200 Subject: Update to MediaWiki 1.19.0 --- includes/specials/SpecialDeletedContributions.php | 200 ++++++++++------------ 1 file changed, 93 insertions(+), 107 deletions(-) (limited to 'includes/specials/SpecialDeletedContributions.php') diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php index 65858482..3498a16d 100644 --- a/includes/specials/SpecialDeletedContributions.php +++ b/includes/specials/SpecialDeletedContributions.php @@ -31,11 +31,11 @@ class DeletedContribsPager extends IndexPager { var $messages, $target; var $namespace = '', $mDb; - function __construct( $target, $namespace = false ) { - parent::__construct(); + function __construct( IContextSource $context, $target, $namespace = false ) { + parent::__construct( $context ); $msgs = array( 'deletionlog', 'undeleteviewlink', 'diff' ); foreach( $msgs as $msg ) { - $this->messages[$msg] = wfMsgExt( $msg, array( 'escapenoentities') ); + $this->messages[$msg] = $this->msg( $msg )->escaped(); } $this->target = $target; $this->namespace = $namespace; @@ -49,13 +49,13 @@ class DeletedContribsPager extends IndexPager { } function getQueryInfo() { - global $wgUser; list( $index, $userCond ) = $this->getUserCond(); $conds = array_merge( $userCond, $this->getNamespaceCond() ); + $user = $this->getUser(); // Paranoia: avoid brute force searches (bug 17792) - if( !$wgUser->isAllowed( 'deletedhistory' ) ) { + if( !$user->isAllowed( 'deletedhistory' ) ) { $conds[] = $this->mDb->bitAnd('ar_deleted',Revision::DELETED_USER) . ' = 0'; - } elseif( !$wgUser->isAllowed( 'suppressrevision' ) ) { + } elseif( !$user->isAllowed( 'suppressrevision' ) ) { $conds[] = $this->mDb->bitAnd('ar_deleted',Revision::SUPPRESSED_USER) . ' != ' . Revision::SUPPRESSED_USER; } @@ -92,25 +92,24 @@ class DeletedContribsPager extends IndexPager { } function getNavigationBar() { - global $wgLang; - if ( isset( $this->mNavigationBar ) ) { return $this->mNavigationBar; } - $fmtLimit = $wgLang->formatNum( $this->mLimit ); + $lang = $this->getLanguage(); + $fmtLimit = $lang->formatNum( $this->mLimit ); $linkTexts = array( - 'prev' => wfMsgExt( 'pager-newer-n', array( 'escape', 'parsemag' ), $fmtLimit ), - 'next' => wfMsgExt( 'pager-older-n', array( 'escape', 'parsemag' ), $fmtLimit ), - 'first' => wfMsgHtml( 'histlast' ), - 'last' => wfMsgHtml( 'histfirst' ) + 'prev' => $this->msg( 'pager-newer-n', $fmtLimit )->escaped(), + 'next' => $this->msg( 'pager-older-n', $fmtLimit )->escaped(), + 'first' => $this->msg( 'histlast' )->escaped(), + 'last' => $this->msg( 'histfirst' )->escaped() ); $pagingLinks = $this->getPagingLinks( $linkTexts ); $limitLinks = $this->getLimitLinks(); - $limits = $wgLang->pipeList( $limitLinks ); + $limits = $lang->pipeList( $limitLinks ); - $this->mNavigationBar = "(" . $wgLang->pipeList( array( $pagingLinks['first'], $pagingLinks['last'] ) ) . ") " . - wfMsgExt( 'viewprevnext', array( 'parsemag', 'escape', 'replaceafter' ), $pagingLinks['prev'], $pagingLinks['next'], $limits ); + $this->mNavigationBar = "(" . $lang->pipeList( array( $pagingLinks['first'], $pagingLinks['last'] ) ) . ") " . + $this->msg( 'viewprevnext' )->rawParams( $pagingLinks['prev'], $pagingLinks['next'], $limits )->escaped(); return $this->mNavigationBar; } @@ -133,11 +132,8 @@ class DeletedContribsPager extends IndexPager { * @todo This would probably look a lot nicer in a table. */ function formatRow( $row ) { - global $wgUser, $wgLang; wfProfileIn( __METHOD__ ); - $sk = $this->getSkin(); - $rev = new Revision( array( 'id' => $row->ar_rev_id, 'comment' => $row->ar_comment, @@ -153,7 +149,7 @@ class DeletedContribsPager extends IndexPager { $undelete = SpecialPage::getTitleFor( 'Undelete' ); $logs = SpecialPage::getTitleFor( 'Log' ); - $dellog = $sk->linkKnown( + $dellog = Linker::linkKnown( $logs, $this->messages['deletionlog'], array(), @@ -163,13 +159,15 @@ class DeletedContribsPager extends IndexPager { ) ); - $reviewlink = $sk->linkKnown( + $reviewlink = Linker::linkKnown( SpecialPage::getTitleFor( 'Undelete', $page->getPrefixedDBkey() ), $this->messages['undeleteviewlink'] ); - if( $wgUser->isAllowed('deletedtext') ) { - $last = $sk->linkKnown( + $user = $this->getUser(); + + if( $user->isAllowed('deletedtext') ) { + $last = Linker::linkKnown( $undelete, $this->messages['diff'], array(), @@ -183,13 +181,13 @@ class DeletedContribsPager extends IndexPager { $last = $this->messages['diff']; } - $comment = $sk->revComment( $rev ); - $date = htmlspecialchars( $wgLang->timeanddate( $rev->getTimestamp(), true ) ); + $comment = Linker::revComment( $rev ); + $date = htmlspecialchars( $this->getLanguage()->userTimeAndDate( $rev->getTimestamp(), $user ) ); - if( !$wgUser->isAllowed('undelete') || !$rev->userCan(Revision::DELETED_TEXT) ) { + if( !$user->isAllowed( 'undelete' ) || !$rev->userCan( Revision::DELETED_TEXT, $user ) ) { $link = $date; // unusable link } else { - $link = $sk->linkKnown( + $link = Linker::linkKnown( $undelete, $date, array(), @@ -204,7 +202,7 @@ class DeletedContribsPager extends IndexPager { $link = '' . $link . ''; } - $pagelink = $sk->link( $page ); + $pagelink = Linker::link( $page ); if( $rev->isMinor() ) { $mflag = ChangesList::flag( 'minor' ); @@ -213,33 +211,21 @@ class DeletedContribsPager extends IndexPager { } // Revision delete link - $canHide = $wgUser->isAllowed( 'deleterevision' ); - if( $canHide || ($rev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) { - if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { - $del = $this->mSkin->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops - } else { - $query = array( - 'type' => 'archive', - 'target' => $page->getPrefixedDbkey(), - 'ids' => $rev->getTimestamp() ); - $del = $this->mSkin->revDeleteLink( $query, - $rev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide ) . ' '; - } - } else { - $del = ''; - } + $del = Linker::getRevDeleteLink( $user, $rev, $page ); + if ( $del ) $del .= ' '; $tools = Html::rawElement( 'span', array( 'class' => 'mw-deletedcontribs-tools' ), - wfMsg( 'parentheses', $wgLang->pipeList( array( $last, $dellog, $reviewlink ) ) ) + $this->msg( 'parentheses' )->rawParams( $this->getLanguage()->pipeList( + array( $last, $dellog, $reviewlink ) ) )->escaped() ); $ret = "{$del}{$link} {$tools} . . {$mflag} {$pagelink} {$comment}"; # Denote if username is redacted for this edit if( $rev->isDeleted( Revision::DELETED_USER ) ) { - $ret .= " " . wfMsgHtml('rev-deleted-user-contribs') . ""; + $ret .= " " . $this->msg( 'rev-deleted-user-contribs' )->escaped() . ""; } $ret = Html::rawElement( 'li', array(), $ret ) . "\n"; @@ -272,64 +258,65 @@ class DeletedContributionsPage extends SpecialPage { * @param $par String: (optional) user name of the user for which to show the contributions */ function execute( $par ) { - global $wgUser; + global $wgQueryPageDefaultLimit; $this->setHeaders(); - if ( !$this->userCanExecute( $wgUser ) ) { + $user = $this->getUser(); + + if ( !$this->userCanExecute( $user ) ) { $this->displayRestrictionError(); return; } - global $wgOut, $wgRequest; - - $wgOut->setPageTitle( wfMsgExt( 'deletedcontributions-title', array( 'parsemag' ) ) ); + $request = $this->getRequest(); + $out = $this->getOutput(); + $out->setPageTitle( $this->msg( 'deletedcontributions-title' ) ); $options = array(); - if ( isset( $par ) ) { + if ( $par !== null ) { $target = $par; } else { - $target = $wgRequest->getVal( 'target' ); + $target = $request->getVal( 'target' ); } if ( !strlen( $target ) ) { - $wgOut->addHTML( $this->getForm( '' ) ); + $out->addHTML( $this->getForm( '' ) ); return; } - $options['limit'] = $wgRequest->getInt( 'limit', 50 ); + $options['limit'] = $request->getInt( 'limit', $wgQueryPageDefaultLimit ); $options['target'] = $target; - $nt = Title::makeTitleSafe( NS_USER, $target ); - if ( !$nt ) { - $wgOut->addHTML( $this->getForm( '' ) ); + $userObj = User::newFromName( $target, false ); + if ( !$userObj ) { + $out->addHTML( $this->getForm( '' ) ); return; } - $id = User::idFromName( $nt->getText() ); - $target = $nt->getText(); - $wgOut->setSubtitle( $this->getSubTitle( $nt, $id ) ); + $target = $userObj->getName(); + $out->addSubtitle( $this->getSubTitle( $userObj ) ); - if ( ( $ns = $wgRequest->getVal( 'namespace', null ) ) !== null && $ns !== '' ) { + if ( ( $ns = $request->getVal( 'namespace', null ) ) !== null && $ns !== '' ) { $options['namespace'] = intval( $ns ); } else { $options['namespace'] = ''; } - $wgOut->addHTML( $this->getForm( $options ) ); + $out->addHTML( $this->getForm( $options ) ); - $pager = new DeletedContribsPager( $target, $options['namespace'] ); + $pager = new DeletedContribsPager( $this->getContext(), $target, $options['namespace'] ); if ( !$pager->getNumRows() ) { - $wgOut->addWikiMsg( 'nocontribs' ); + $out->addWikiMsg( 'nocontribs' ); return; } # Show a message about slave lag, if applicable $lag = wfGetLB()->safeGetLag( $pager->getDatabase() ); if( $lag > 0 ) - $wgOut->showLagWarning( $lag ); + $out->showLagWarning( $lag ); - $wgOut->addHTML( + $out->addHTML( '

' . $pager->getNavigationBar() . '

' . $pager->getBody() . '

' . $pager->getNavigationBar() . '

' ); @@ -341,44 +328,40 @@ class DeletedContributionsPage extends SpecialPage { ? 'sp-contributions-footer-anon' : 'sp-contributions-footer'; - if( !wfMessage( $message )->isDisabled() ) { - $wgOut->wrapWikiMsg( "
\n$1\n
", array( $message, $target ) ); + if( !$this->msg( $message )->isDisabled() ) { + $out->wrapWikiMsg( "
\n$1\n
", array( $message, $target ) ); } } } /** * Generates the subheading with links - * @param $nt Title object for the target - * @param $id Integer: User ID for the target + * @param $userObj User object for the target * @return String: appropriately-escaped HTML to be output literally * @todo FIXME: Almost the same as contributionsSub in SpecialContributions.php. Could be combined. */ - function getSubTitle( $nt, $id ) { - global $wgLang, $wgUser, $wgOut; - - $sk = $this->getSkin(); - - if ( $id === null ) { - $user = htmlspecialchars( $nt->getText() ); + function getSubTitle( $userObj ) { + if ( $userObj->isAnon() ) { + $user = htmlspecialchars( $userObj->getName() ); } else { - $user = $sk->link( $nt, htmlspecialchars( $nt->getText() ) ); + $user = Linker::link( $userObj->getUserPage(), htmlspecialchars( $userObj->getName() ) ); } - $userObj = User::newFromName( $nt->getText(), /* check for username validity not needed */ false ); + $nt = $userObj->getUserPage(); + $id = $userObj->getID(); $talk = $nt->getTalkPage(); if( $talk ) { # Talk page link - $tools[] = $sk->link( $talk, wfMsgHtml( 'sp-contributions-talk' ) ); + $tools[] = Linker::link( $talk, $this->msg( 'sp-contributions-talk' )->escaped() ); if( ( $id !== null ) || ( $id === null && IP::isIPAddress( $nt->getText() ) ) ) { - if( $wgUser->isAllowed( 'block' ) ) { # Block / Change block / Unblock links + if( $this->getUser()->isAllowed( 'block' ) ) { # Block / Change block / Unblock links if ( $userObj->isBlocked() ) { - $tools[] = $sk->linkKnown( # Change block link + $tools[] = Linker::linkKnown( # Change block link SpecialPage::getTitleFor( 'Block', $nt->getDBkey() ), - wfMsgHtml( 'change-blocklink' ) + $this->msg( 'change-blocklink' )->escaped() ); - $tools[] = $sk->linkKnown( # Unblock link + $tools[] = Linker::linkKnown( # Unblock link SpecialPage::getTitleFor( 'BlockList' ), - wfMsgHtml( 'unblocklink' ), + $this->msg( 'unblocklink' )->escaped(), array(), array( 'action' => 'unblock', @@ -387,16 +370,16 @@ class DeletedContributionsPage extends SpecialPage { ); } else { # User is not blocked - $tools[] = $sk->linkKnown( # Block link + $tools[] = Linker::linkKnown( # Block link SpecialPage::getTitleFor( 'Block', $nt->getDBkey() ), - wfMsgHtml( 'blocklink' ) + $this->msg( 'blocklink' )->escaped() ); } } # Block log link - $tools[] = $sk->linkKnown( + $tools[] = Linker::linkKnown( SpecialPage::getTitleFor( 'Log' ), - wfMsgHtml( 'sp-contributions-blocklog' ), + $this->msg( 'sp-contributions-blocklog' )->escaped(), array(), array( 'type' => 'block', @@ -405,37 +388,39 @@ class DeletedContributionsPage extends SpecialPage { ); } # Other logs link - $tools[] = $sk->linkKnown( + $tools[] = Linker::linkKnown( SpecialPage::getTitleFor( 'Log' ), - wfMsgHtml( 'sp-contributions-logs' ), + $this->msg( 'sp-contributions-logs' )->escaped(), array(), array( 'user' => $nt->getText() ) ); # Link to contributions - $tools[] = $sk->linkKnown( + $tools[] = Linker::linkKnown( SpecialPage::getTitleFor( 'Contributions', $nt->getDBkey() ), - wfMsgHtml( 'sp-deletedcontributions-contribs' ) + $this->msg( 'sp-deletedcontributions-contribs' )->escaped() ); # Add a link to change user rights for privileged users $userrightsPage = new UserrightsPage(); + $userrightsPage->setContext( $this->getContext() ); if( $id !== null && $userrightsPage->userCanChangeRights( User::newFromId( $id ) ) ) { - $tools[] = $sk->linkKnown( + $tools[] = Linker::linkKnown( SpecialPage::getTitleFor( 'Userrights', $nt->getDBkey() ), - wfMsgHtml( 'sp-contributions-userrights' ) + $this->msg( 'sp-contributions-userrights' )->escaped() ); } wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) ); - $links = $wgLang->pipeList( $tools ); + $links = $this->getLanguage()->pipeList( $tools ); // Show a note if the user is blocked and display the last block log entry. if ( $userObj->isBlocked() ) { + $out = $this->getOutput(); // LogEventsList::showLogExtract() wants the first parameter by ref LogEventsList::showLogExtract( - $wgOut, + $out, 'block', - $nt->getPrefixedText(), + $nt, '', array( 'lim' => 1, @@ -444,7 +429,7 @@ class DeletedContributionsPage extends SpecialPage { 'sp-contributions-blocked-notice', $nt->getText() # Support GENDER in 'sp-contributions-blocked-notice' ), - 'offset' => '' # don't use $wgRequest parameter offset + 'offset' => '' # don't use $this->getRequest() parameter offset ) ); } @@ -454,10 +439,11 @@ class DeletedContributionsPage extends SpecialPage { // languages that want to put the "for" bit right after $user but before // $links. If 'contribsub' is around, use it for reverse compatibility, // otherwise use 'contribsub2'. - if( wfEmptyMsg( 'contribsub' ) ) { - return wfMsgHtml( 'contribsub2', $user, $links ); + $oldMsg = $this->msg( 'contribsub' ); + if ( $oldMsg->exists() ) { + return $oldMsg->rawParams( "$user ($links)" ); } else { - return wfMsgHtml( 'contribsub', "$user ($links)" ); + return $this->msg( 'contribsub2' )->rawParams( $user, $links ); } } @@ -468,7 +454,7 @@ class DeletedContributionsPage extends SpecialPage { function getForm( $options ) { global $wgScript; - $options['title'] = SpecialPage::getTitleFor( 'DeletedContributions' )->getPrefixedText(); + $options['title'] = $this->getTitle()->getPrefixedText(); if ( !isset( $options['target'] ) ) { $options['target'] = ''; } else { @@ -497,15 +483,15 @@ class DeletedContributionsPage extends SpecialPage { } $f .= Xml::openElement( 'fieldset' ) . - Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) . - Xml::tags( 'label', array( 'for' => 'target' ), wfMsgExt( 'sp-contributions-username', 'parseinline' ) ) . ' ' . + Xml::element( 'legend', array(), $this->msg( 'sp-contributions-search' )->text() ) . + Xml::tags( 'label', array( 'for' => 'target' ), $this->msg( 'sp-contributions-username' )->parse() ) . ' ' . Html::input( 'target', $options['target'], 'text', array( 'size' => '20', 'required' => '' ) + ( $options['target'] ? array() : array( 'autofocus' ) ) ) . ' '. - Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' . + Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) . ' ' . Xml::namespaceSelector( $options['namespace'], '' ) . ' ' . - Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) . + Xml::submitButton( $this->msg( 'sp-contributions-submit' )->text() ) . Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ); return $f; -- cgit v1.2.3-54-g00ecf