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/SpecialUnblock.php | 209 +++++++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100644 includes/specials/SpecialUnblock.php (limited to 'includes/specials/SpecialUnblock.php') diff --git a/includes/specials/SpecialUnblock.php b/includes/specials/SpecialUnblock.php new file mode 100644 index 00000000..521c1775 --- /dev/null +++ b/includes/specials/SpecialUnblock.php @@ -0,0 +1,209 @@ +userCanExecute( $wgUser ) ) { + $this->displayRestrictionError(); + return; + } + + # Check for database lock + if( wfReadOnly() ) { + throw new ReadOnlyError; + } + + list( $this->target, $this->type ) = SpecialBlock::getTargetAndType( $par, $wgRequest ); + $this->block = Block::newFromTarget( $this->target ); + + # bug 15810: blocked admins should have limited access here. This won't allow sysops + # to remove autoblocks on themselves, but they should have ipblock-exempt anyway + $status = SpecialBlock::checkUnblockSelf( $this->target ); + if ( $status !== true ) { + throw new ErrorPageError( 'badaccess', $status ); + } + + $wgOut->setPageTitle( wfMsg( 'unblockip' ) ); + $wgOut->addModules( 'mediawiki.special' ); + + $form = new HTMLForm( $this->getFields(), $this->getContext() ); + $form->setWrapperLegend( wfMsg( 'unblockip' ) ); + $form->setSubmitCallback( array( __CLASS__, 'processUnblock' ) ); + $form->setSubmitText( wfMsg( 'ipusubmit' ) ); + $form->addPreText( wfMsgExt( 'unblockiptext', 'parse' ) ); + + if( $form->show() ){ + switch( $this->type ){ + case Block::TYPE_USER: + case Block::TYPE_IP: + $wgOut->addWikiMsg( 'unblocked', $this->target ); + break; + case Block::TYPE_RANGE: + $wgOut->addWikiMsg( 'unblocked-range', $this->target ); + break; + case Block::TYPE_ID: + case Block::TYPE_AUTO: + $wgOut->addWikiMsg( 'unblocked-id', $this->target ); + break; + } + } + } + + protected function getFields(){ + $fields = array( + 'Target' => array( + 'type' => 'text', + 'label-message' => 'ipadressorusername', + 'tabindex' => '1', + 'size' => '45', + 'required' => true, + ), + 'Name' => array( + 'type' => 'info', + 'label-message' => 'ipadressorusername', + ), + 'Reason' => array( + 'type' => 'text', + 'label-message' => 'ipbreason', + ) + ); + + if( $this->block instanceof Block ){ + list( $target, $type ) = $this->block->getTargetAndType(); + + # Autoblocks are logged as "autoblock #123 because the IP was recently used by + # User:Foo, and we've just got any block, auto or not, that applies to a target + # the user has specified. Someone could be fishing to connect IPs to autoblocks, + # so don't show any distinction between unblocked IPs and autoblocked IPs + if( $type == Block::TYPE_AUTO && $this->type == Block::TYPE_IP ){ + $fields['Target']['default'] = $this->target; + unset( $fields['Name'] ); + + } else { + $fields['Target']['default'] = $target; + $fields['Target']['type'] = 'hidden'; + switch( $type ){ + case Block::TYPE_USER: + case Block::TYPE_IP: + $skin = $this->getSkin(); + $fields['Name']['default'] = $skin->link( + $target->getUserPage(), + $target->getName() + ); + $fields['Name']['raw'] = true; + break; + + case Block::TYPE_RANGE: + $fields['Name']['default'] = $target; + break; + + case Block::TYPE_AUTO: + $fields['Name']['default'] = $this->block->getRedactedName(); + $fields['Name']['raw'] = true; + # Don't expose the real target of the autoblock + $fields['Target']['default'] = "#{$this->target}"; + break; + } + } + + } else { + $fields['Target']['default'] = $this->target; + unset( $fields['Name'] ); + } + return $fields; + } + + /** + * Process the form + * @return Array( Array(message key, parameters) ) on failure, True on success + */ + public static function processUnblock( array $data ){ + global $wgUser; + + $target = $data['Target']; + $block = Block::newFromTarget( $data['Target'] ); + + if( !$block instanceof Block ){ + return array( array( 'ipb_cant_unblock', $target ) ); + } + + # If the specified IP is a single address, and the block is a range block, don't + # unblock the whole range. + list( $target, $type ) = SpecialBlock::getTargetAndType( $target ); + if( $block->getType() == Block::TYPE_RANGE && $type == Block::TYPE_IP ) { + $range = $block->getTarget(); + return array( array( 'ipb_blocked_as_range', $target, $range ) ); + } + + # If the name was hidden and the blocking user cannot hide + # names, then don't allow any block removals... + if( !$wgUser->isAllowed( 'hideuser' ) && $block->mHideName ) { + return array( 'unblock-hideuser' ); + } + + # Delete block + if ( !$block->delete() ) { + return array( 'ipb_cant_unblock', htmlspecialchars( $block->getTarget() ) ); + } + + # Unset _deleted fields as needed + if( $block->mHideName ) { + # Something is deeply FUBAR if this is not a User object, but who knows? + $id = $block->getTarget() instanceof User + ? $block->getTarget()->getID() + : User::idFromName( $block->getTarget() ); + + RevisionDeleteUser::unsuppressUserName( $block->getTarget(), $id ); + } + + # Redact the name (IP address) for autoblocks + if ( $block->getType() == Block::TYPE_AUTO ) { + $page = Title::makeTitle( NS_USER, '#' . $block->getId() ); + } else { + $page = $block->getTarget() instanceof User + ? $block->getTarget()->getUserpage() + : Title::makeTitle( NS_USER, $block->getTarget() ); + } + + # Make log entry + $log = new LogPage( 'block' ); + $log->addEntry( 'unblock', $page, $data['Reason'] ); + + return true; + } +} -- cgit v1.2.2