}
public function execute( $par ) {
- global $wgUser, $wgOut, $wgRequest;
-
# Check for database lock
if ( wfReadOnly() ) {
- $wgOut->readOnlyPage();
- return;
+ throw new ReadOnlyError;
}
$this->setHeaders();
$this->outputHeader();
- $target = !is_null( $par ) ? $par : $wgRequest->getVal( 'target' );
+ $request = $this->getRequest();
+ $target = !is_null( $par ) ? $par : $request->getVal( 'target' );
// Yes, the use of getVal() and getText() is wanted, see bug 20365
- $oldTitleText = $wgRequest->getVal( 'wpOldTitle', $target );
- $newTitleText = $wgRequest->getText( 'wpNewTitle' );
+ $oldTitleText = $request->getVal( 'wpOldTitle', $target );
+ $newTitleText = $request->getText( 'wpNewTitle' );
$this->oldTitle = Title::newFromText( $oldTitleText );
$this->newTitle = Title::newFromText( $newTitleText );
if( is_null( $this->oldTitle ) ) {
- $wgOut->showErrorPage( 'notargettitle', 'notargettext' );
- return;
+ throw new ErrorPageError( 'notargettitle', 'notargettext' );
}
if( !$this->oldTitle->exists() ) {
- $wgOut->showErrorPage( 'nopagetitle', 'nopagetext' );
- return;
+ throw new ErrorPageError( 'nopagetitle', 'nopagetext' );
}
+ $user = $this->getUser();
+
# Check rights
- $permErrors = $this->oldTitle->getUserPermissionsErrors( 'move', $wgUser );
+ $permErrors = $this->oldTitle->getUserPermissionsErrors( 'move', $user );
if( !empty( $permErrors ) ) {
- $wgOut->showPermissionsErrorPage( $permErrors );
+ $this->getOutput()->showPermissionsErrorPage( $permErrors );
return;
}
- $def = !$wgRequest->wasPosted();
+ $def = !$request->wasPosted();
- $this->reason = $wgRequest->getText( 'wpReason' );
- $this->moveTalk = $wgRequest->getBool( 'wpMovetalk', $def );
- $this->fixRedirects = $wgRequest->getBool( 'wpFixRedirects', $def );
- $this->leaveRedirect = $wgRequest->getBool( 'wpLeaveRedirect', $def );
- $this->moveSubpages = $wgRequest->getBool( 'wpMovesubpages', false );
- $this->deleteAndMove = $wgRequest->getBool( 'wpDeleteAndMove' ) && $wgRequest->getBool( 'wpConfirm' );
- $this->moveOverShared = $wgRequest->getBool( 'wpMoveOverSharedFile', false );
- $this->watch = $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn();
+ $this->reason = $request->getText( 'wpReason' );
+ $this->moveTalk = $request->getBool( 'wpMovetalk', $def );
+ $this->fixRedirects = $request->getBool( 'wpFixRedirects', $def );
+ $this->leaveRedirect = $request->getBool( 'wpLeaveRedirect', $def );
+ $this->moveSubpages = $request->getBool( 'wpMovesubpages', false );
+ $this->deleteAndMove = $request->getBool( 'wpDeleteAndMove' ) && $request->getBool( 'wpConfirm' );
+ $this->moveOverShared = $request->getBool( 'wpMoveOverSharedFile', false );
+ $this->watch = $request->getCheck( 'wpWatch' ) && $user->isLoggedIn();
- if ( 'submit' == $wgRequest->getVal( 'action' ) && $wgRequest->wasPosted()
- && $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
+ if ( 'submit' == $request->getVal( 'action' ) && $request->wasPosted()
+ && $user->matchEditToken( $request->getVal( 'wpEditToken' ) ) ) {
$this->doSubmit();
} else {
$this->showForm( '' );
* OutputPage::wrapWikiMsg().
*/
function showForm( $err ) {
- global $wgOut, $wgUser, $wgContLang, $wgFixDoubleRedirects;
-
- $skin = $this->getSkin();
+ global $wgContLang, $wgFixDoubleRedirects, $wgMaximumMovedPages;
- $oldTitleLink = $skin->link( $this->oldTitle );
+ $this->getSkin()->setRelevantTitle( $this->oldTitle );
- $wgOut->setPagetitle( wfMsg( 'move-page', $this->oldTitle->getPrefixedText() ) );
- $skin->setRelevantTitle( $this->oldTitle );
+ $oldTitleLink = Linker::link( $this->oldTitle );
- $wgOut->addModules( 'mediawiki.special.movePage' );
+ $out = $this->getOutput();
+ $out->setPagetitle( wfMsg( 'move-page', $this->oldTitle->getPrefixedText() ) );
+ $out->addModules( 'mediawiki.special.movePage' );
$newTitle = $this->newTitle;
}
}
- if ( !empty($err) && $err[0] == 'articleexists' && $wgUser->isAllowed( 'delete' ) ) {
- $wgOut->addWikiMsg( 'delete_and_move_text', $newTitle->getPrefixedText() );
+ $user = $this->getUser();
+
+ if ( !empty($err) && $err[0] == 'articleexists' && $user->isAllowed( 'delete' ) ) {
+ $out->addWikiMsg( 'delete_and_move_text', $newTitle->getPrefixedText() );
$movepagebtn = wfMsg( 'delete_and_move' );
$submitVar = 'wpDeleteAndMove';
$confirm = "
$err = '';
} else {
if ($this->oldTitle->getNamespace() == NS_USER && !$this->oldTitle->isSubpage() ) {
- $
wgOut->wrapWikiMsg( "<div class=\"error mw-moveuserpage-warning\">\n$1\n</div>", 'moveuserpage-warning' );
+ $
out->wrapWikiMsg( "<div class=\"error mw-moveuserpage-warning\">\n$1\n</div>", 'moveuserpage-warning' );
}
- $wgOut->addWikiMsg( $wgFixDoubleRedirects ? 'movepagetext' :
+ $out->addWikiMsg( $wgFixDoubleRedirects ? 'movepagetext' :
'movepagetext-noredirectfixer' );
$movepagebtn = wfMsg( 'movepagebtn' );
$submitVar = 'wpMove';
$confirm = false;
}
- if ( !empty($err) && $err[0] == 'file-exists-sharedrepo' && $wgUser->isAllowed( 'reupload-shared' ) ) {
- $wgOut->addWikiMsg( 'move-over-sharedrepo', $newTitle->getPrefixedText() );
+ if ( !empty($err) && $err[0] == 'file-exists-sharedrepo' && $user->isAllowed( 'reupload-shared' ) ) {
+ $out->addWikiMsg( 'move-over-sharedrepo', $newTitle->getPrefixedText() );
$submitVar = 'wpMoveOverSharedFile';
$err = '';
}
}
if ( $considerTalk ) {
- $wgOut->addWikiMsg( 'movepagetalktext' );
+ $out->addWikiMsg( 'movepagetalktext' );
}
- $token = htmlspecialchars( $wgUser->editToken() );
+ $token = htmlspecialchars( $user->editToken() );
if ( !empty($err) ) {
- $wgOut->setSubtitle( wfMsg( 'formerror' ) );
+ $out->setSubtitle( wfMsg( 'formerror' ) );
if( $err[0] == 'hookaborted' ) {
$hookErr = $err[1];
$errMsg = "<p><strong class=\"error\">$hookErr</strong></p>\n";
- $wgOut->addHTML( $errMsg );
+ $out->addHTML( $errMsg );
} else {
- $
wgOut->wrapWikiMsg( "<p><strong class=\"error\">\n$1\n</strong></p>", $err );
+ $
out->wrapWikiMsg( "<p><strong class=\"error\">\n$1\n</strong></p>", $err );
}
}
$noticeMsg = 'protectedpagemovewarning';
$classes[] = 'mw-textarea-protected';
}
- $
wgOut->addHTML( "<div class='mw-warning-with-logexcerpt'>\n" );
- $wgOut->addWikiMsg( $noticeMsg );
- LogEventsList::showLogExtract( $wgOut, 'protect', $this->oldTitle->getPrefixedText(), '', array( 'lim' => 1 ) );
- $wgOut->addHTML( "</div>\n" );
+ $
out->addHTML( "<div class='mw-warning-with-logexcerpt'>\n" );
+ $out->addWikiMsg( $noticeMsg );
+ LogEventsList::showLogExtract( $out, 'protect', $this->oldTitle->getPrefixedText(), '', array( 'lim' => 1 ) );
+ $out->addHTML( "</div>\n" );
}
- $wgOut->addHTML(
+ $out->addHTML(
Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalURL( 'action=submit' ), 'id' => 'movepage' ) ) .
Xml::openElement( 'fieldset' ) .
Xml::element( 'legend', null, wfMsg( 'move-page-legend' ) ) .
);
if( $considerTalk ) {
- $wgOut->addHTML( "
+ $out->addHTML( "
<tr>
<td></td>
<td class='mw-input'>" .
);
}
- if ( $wgUser->isAllowed( 'suppressredirect' ) ) {
- $wgOut->addHTML( "
+ if ( $user->isAllowed( 'suppressredirect' ) ) {
+ $out->addHTML( "
<tr>
<td></td>
<td class='mw-input' >" .
}
if ( $hasRedirects ) {
- $wgOut->addHTML( "
+ $out->addHTML( "
<tr>
<td></td>
<td class='mw-input' >" .
}
if( ($this->oldTitle->hasSubpages() || $this->oldTitle->getTalkPage()->hasSubpages())
- && $this->oldTitle->userCan( 'move-subpages' ) )
+ && !count( $this->oldTitle->getUserPermissionsErrors( 'move-subpages', $user ) ) )
{
- global $wgMaximumMovedPages, $wgLang;
-
- $wgOut->addHTML( "
+ $out->addHTML( "
<tr>
<td></td>
<td class=\"mw-input\">" .
? 'move-subpages'
: 'move-talk-subpages' ),
array( 'parseinline' ),
- $wgLang->formatNum( $wgMaximumMovedPages ),
+ $this->getLang()->formatNum( $wgMaximumMovedPages ),
# $2 to allow use of PLURAL in message.
$wgMaximumMovedPages
)
);
}
- $watchChecked = $wgUser->isLoggedIn() && ($this->watch || $wgUser->getBoolOption( 'watchmoves' )
+ $watchChecked = $user->isLoggedIn() && ($this->watch || $user->getBoolOption( 'watchmoves' )
|| $this->oldTitle->userIsWatching());
# Don't allow watching if user is not logged in
- if( $wgUser->isLoggedIn() ) {
- $wgOut->addHTML( "
+ if( $user->isLoggedIn() ) {
+ $out->addHTML( "
<tr>
<td></td>
<td class='mw-input'>" .
</tr>");
}
- $wgOut->addHTML( "
+ $out->addHTML( "
{$confirm}
<tr>
<td> </td>
"\n"
);
- $this->showLogFragment( $this->oldTitle, $wgOut );
- $this->showSubpages( $this->oldTitle, $wgOut );
+ $this->showLogFragment( $this->oldTitle );
+ $this->showSubpages( $this->oldTitle );
}
function doSubmit() {
- global $wgOut, $wgUser, $wgMaximumMovedPages, $wgLang;
- global $wgFixDoubleRedirects;
+ global $wgMaximumMovedPages, $wgFixDoubleRedirects, $wgDeleteRevisionsLimit;
- if ( $wgUser->pingLimiter( 'move' ) ) {
- $wgOut->rateLimited();
- return;
+ $user = $this->getUser();
+
+ if ( $user->pingLimiter( 'move' ) ) {
+ throw new ThrottledError;
}
$ot = $this->oldTitle;
$nt = $this->newTitle;
# Delete to make way if requested
- if ( $wgUser->isAllowed( 'delete' ) && $this->deleteAndMove ) {
+ if ( $user->isAllowed( 'delete' ) && $this->deleteAndMove ) {
$article = new Article( $nt );
# Disallow deletions of big articles
$bigHistory = $article->isBigDeletion();
- if( $bigHistory && !$nt->userCan( 'bigdelete' ) ) {
- global $wgDeleteRevisionsLimit;
- $this->showForm( array('delete-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) );
+ if( $bigHistory && count( $nt->getUserPermissionsErrors( 'bigdelete', $user ) ) ) {
+ $this->showForm( array('delete-toobig', $this->getLang()->formatNum( $wgDeleteRevisionsLimit ) ) );
return;
}
# Show a warning if the target file exists on a shared repo
if ( $nt->getNamespace() == NS_FILE
- && !( $this->moveOverShared && $wgUser->isAllowed( 'reupload-shared' ) )
+ && !( $this->moveOverShared && $user->isAllowed( 'reupload-shared' ) )
&& !RepoGroup::singleton()->getLocalRepo()->findFile( $nt )
&& wfFindFile( $nt ) )
{
}
- if ( $wgUser->isAllowed( 'suppressredirect' ) ) {
+ if ( $user->isAllowed( 'suppressredirect' ) ) {
$createRedirect = $this->leaveRedirect;
} else {
$createRedirect = true;
wfRunHooks( 'SpecialMovepageAfterMove', array( &$this, &$ot, &$nt ) );
- $wgOut->setPagetitle( wfMsg( 'pagemovedsub' ) );
+ $out = $this->getOutput();
+ $out->setPagetitle( wfMsg( 'pagemovedsub' ) );
$oldUrl = $ot->getFullUrl( 'redirect=no' );
$newUrl = $nt->getFullUrl();
$newLink = "<span class='plainlinks'>[$newUrl $newText]</span>";
$msgName = $createRedirect ? 'movepage-moved-redirect' : 'movepage-moved-noredirect';
- $wgOut->addWikiMsg( 'movepage-moved', $oldLink, $newLink, $oldText, $newText );
- $wgOut->addWikiMsg( $msgName );
+ $out->addWikiMsg( 'movepage-moved', $oldLink, $newLink, $oldText, $newText );
+ $out->addWikiMsg( $msgName );
# Now we move extra pages we've been asked to move: subpages and talk
# pages. First, if the old page or the new page is a talk page, we
$this->moveTalk = false;
}
- if( !$ot->userCan( 'move-subpages' ) ) {
+ if ( count( $ot->getUserPermissionsErrors( 'move-subpages', $user ) ) ) {
$this->moveSubpages = false;
}
}
$extraOutput = array();
- $skin = $this->getSkin();
$count = 1;
foreach( $extraPages as $oldSubpage ) {
if( $ot->equals( $oldSubpage ) ) {
# be longer than 255 characters.
$newSubpage = Title::makeTitleSafe( $newNs, $newPageName );
if( !$newSubpage ) {
- $oldLink = $skin->linkKnown( $oldSubpage );
+ $oldLink = Linker::linkKnown( $oldSubpage );
$extraOutput []= wfMsgHtml( 'movepage-page-unmoved', $oldLink,
htmlspecialchars(Title::makeName( $newNs, $newPageName )));
continue;
# This was copy-pasted from Renameuser, bleh.
if ( $newSubpage->exists() && !$oldSubpage->isValidMoveTarget( $newSubpage ) ) {
- $link = $skin->linkKnown( $newSubpage );
+ $link = Linker::linkKnown( $newSubpage );
$extraOutput []= wfMsgHtml( 'movepage-page-exists', $link );
} else {
$success = $oldSubpage->moveTo( $newSubpage, true, $this->reason, $createRedirect );
if ( $this->fixRedirects ) {
DoubleRedirectJob::fixRedirects( 'move', $oldSubpage, $newSubpage );
}
- $oldLink = $skin->linkKnown(
+ $oldLink = Linker::linkKnown(
$oldSubpage,
null,
array(),
array( 'redirect' => 'no' )
);
- $newLink = $skin->linkKnown( $newSubpage );
+ $newLink = Linker::linkKnown( $newSubpage );
$extraOutput []= wfMsgHtml( 'movepage-page-moved', $oldLink, $newLink );
++$count;
if( $count >= $wgMaximumMovedPages ) {
- $extraOutput []= wfMsgExt( 'movepage-max-pages', array( 'parsemag', 'escape' ), $wgLang->formatNum( $wgMaximumMovedPages ) );
+ $extraOutput []= wfMsgExt( 'movepage-max-pages', array( 'parsemag', 'escape' ), $this->getLang()->formatNum( $wgMaximumMovedPages ) );
break;
}
} else {
- $oldLink = $skin->linkKnown( $oldSubpage );
- $newLink = $skin->link( $newSubpage );
+ $oldLink = Linker::linkKnown( $oldSubpage );
+ $newLink = Linker::link( $newSubpage );
$extraOutput []= wfMsgHtml( 'movepage-page-unmoved', $oldLink, $newLink );
}
}
}
if( $extraOutput !== array() ) {
- $
wgOut->addHTML( "<ul>\n<li>" . implode( "</li>\n<li>", $extraOutput ) . "</li>\n</ul>" );
+ $
out->addHTML( "<ul>\n<li>" . implode( "</li>\n<li>", $extraOutput ) . "</li>\n</ul>" );
}
# Deal with watches (we don't watch subpages)
- if( $this->watch && $wgUser->isLoggedIn() ) {
- $wgUser->addWatch( $ot );
- $wgUser->addWatch( $nt );
+ if( $this->watch && $user->isLoggedIn() ) {
+ $user->addWatch( $ot );
+ $user->addWatch( $nt );
} else {
- $wgUser->removeWatch( $ot );
- $wgUser->removeWatch( $nt );
+ $user->removeWatch( $ot );
+ $user->removeWatch( $nt );
}
# Re-clear the file redirect cache, which may have been polluted by
}
}
- function showLogFragment( $title, &$out ) {
+ function showLogFragment( $title ) {
+ $out = $this->getOutput();
$out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'move' ) ) );
LogEventsList::showLogExtract( $out, 'move', $title->getPrefixedText() );
}
- function showSubpages( $title, $out ) {
- global $wgUser, $wgLang;
-
+ function showSubpages( $title ) {
if( !MWNamespace::hasSubpages( $title->getNamespace() ) )
return;
$subpages = $title->getSubpages();
$count = $subpages instanceof TitleArray ? $subpages->count() : 0;
+ $out = $this->getOutput();
$out->wrapWikiMsg( '== $1 ==', array( 'movesubpage', $count ) );
# No subpages.
return;
}
- $out->addWikiMsg( 'movesubpagetext', $wgLang->formatNum( $count ) );
- $skin = $this->getSkin();
+ $out->addWikiMsg( 'movesubpagetext', $this->getLang()->formatNum( $count ) );
$out->addHTML( "<ul>\n" );
foreach( $subpages as $subpage ) {
- $link = $skin->link( $subpage );
+ $link = Linker::link( $subpage );
$out->addHTML( "<li>$link</li>\n" );
}
$out->addHTML( "</ul>\n" );
dépôts / lhc / web / wiklou.git / blobdiff