X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSpecialBlockip.php;h=32bc430fc738490c59ec0a0089a81a457c98dcc7;hb=1e7e73444a9357be1c58301e8707c029f31f5ef7;hp=41a0f5d7b191333ee14092f1af4ddf71aeb4f8db;hpb=0bbc7cbe3474f7971b04e558eb2a87e935daaa47;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php index 41a0f5d7b1..32bc430fc7 100644 --- a/includes/SpecialBlockip.php +++ b/includes/SpecialBlockip.php @@ -37,19 +37,21 @@ function wfSpecialBlockip( $par ) { } /** - * Form object + * Form object for the Special:Blockip page. * * @addtogroup SpecialPage */ class IPBlockForm { var $BlockAddress, $BlockExpiry, $BlockReason; +# var $BlockEmail; function IPBlockForm( $par ) { - global $wgRequest; + global $wgRequest, $wgUser; $this->BlockAddress = $wgRequest->getVal( 'wpBlockAddress', $wgRequest->getVal( 'ip', $par ) ); $this->BlockAddress = strtr( $this->BlockAddress, '_', ' ' ); $this->BlockReason = $wgRequest->getText( 'wpBlockReason' ); + $this->BlockReasonList = $wgRequest->getText( 'wpBlockReasonList' ); $this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry', wfMsg('ipbotheroption') ); $this->BlockOther = $wgRequest->getVal( 'wpBlockOther', '' ); @@ -59,25 +61,31 @@ class IPBlockForm { $this->BlockAnonOnly = $wgRequest->getBool( 'wpAnonOnly', $byDefault ); $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', $byDefault ); $this->BlockEnableAutoblock = $wgRequest->getBool( 'wpEnableAutoblock', $byDefault ); + $this->BlockEmail = $wgRequest->getBool( 'wpEmailBan', false ); + # Re-check user's rights to hide names, very serious, defaults to 0 + $this->BlockHideName = ( $wgRequest->getBool( 'wpHideName', 0 ) && $wgUser->isAllowed( 'hideuser' ) ) ? 1 : 0; } function showForm( $err ) { - global $wgOut, $wgUser, $wgSysopUserBans; + global $wgOut, $wgUser, $wgSysopUserBans, $wgContLang; $wgOut->setPagetitle( wfMsg( 'blockip' ) ); - $wgOut->addWikiText( wfMsg( 'blockiptext' ) ); + $wgOut->addWikiMsg( 'blockiptext' ); if($wgSysopUserBans) { $mIpaddress = Xml::label( wfMsg( 'ipadressorusername' ), 'mw-bi-target' ); } else { - $mIpaddress = Xml::label( wfMsg( 'ipadress' ), 'mw-bi-target' ); + $mIpaddress = Xml::label( wfMsg( 'ipaddress' ), 'mw-bi-target' ); } $mIpbexpiry = Xml::label( wfMsg( 'ipbexpiry' ), 'wpBlockExpiry' ); $mIpbother = Xml::label( wfMsg( 'ipbother' ), 'mw-bi-other' ); $mIpbothertime = wfMsgHtml( 'ipbotheroption' ); - $mIpbreason = Xml::label( wfMsg( 'ipbreason' ), 'mw-bi-reason' ); + $mIpbreasonother = Xml::label( wfMsg( 'ipbreason' ), 'wpBlockReasonList' ); + $mIpbreason = Xml::label( wfMsg( 'ipbotherreason' ), 'mw-bi-reason' ); + $titleObj = SpecialPage::getTitleFor( 'Blockip' ); $action = $titleObj->escapeLocalURL( "action=submit" ); + $alignRight = $wgContLang->isRtl() ? 'left' : 'right'; if ( "" != $err ) { $wgOut->setSubtitle( wfMsgHtml( 'formerror' ) ); @@ -102,87 +110,133 @@ class IPBlockForm { $blockExpiryFormOptions .= ""; } - $token = htmlspecialchars( $wgUser->editToken() ); + $reasonDropDown = Xml::listDropDown( 'wpBlockReasonList', + wfMsgForContent( 'ipbreason-dropdown' ), + wfMsgForContent( 'ipbreasonotherlist' ), '', 'wpBlockDropDown', 4 ); + + $token = $wgUser->editToken(); global $wgStylePath, $wgStyleVersion; $wgOut->addHTML( " -
- - - - - - "); - if ($showblockoptions) { +" . + Xml::openElement( 'fieldset' ) . + Xml::element( 'legend', null, wfMsg( 'blockip-legend' ) ) . + Xml::openElement( 'table', array ( 'border' => '0', 'id' => 'mw-blockip-table' ) ) . + " + + + + " + ); + if ( $showblockoptions ) { $wgOut->addHTML(" - - - "); + + " + ); } $wgOut->addHTML(" - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - -
{$mIpaddress}: - " . Xml::input( 'wpBlockAddress', 40, $this->BlockAddress, - array( - 'tabindex' => '1', - 'id' => 'mw-bi-target', - 'onchange' => 'updateBlockOptions()' ) ) . " -
{$mIpaddress}" . + Xml::input( 'wpBlockAddress', 45, $this->BlockAddress, + array( + 'tabindex' => '1', + 'id' => 'mw-bi-target', + 'onchange' => 'updateBlockOptions()' ) ). " +
{$mIpbexpiry}: - - {$mIpbexpiry} + +
{$mIpbother}: - " . Xml::input( 'wpBlockOther', 40, $this->BlockOther, - array( 'tabindex' => '3', 'id' => 'mw-bi-other' ) ) . " -
{$mIpbreason}: - " . Xml::input( 'wpBlockReason', 40, $this->BlockReason, - array( 'tabindex' => '3', 'id' => 'mw-bi-reason' ) ) . " -
  - " . wfCheckLabel( wfMsg( 'ipbanononly' ), - 'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly, - array( 'tabindex' => 4 ) ) . " -
  - " . wfCheckLabel( wfMsg( 'ipbcreateaccount' ), - 'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount, - array( 'tabindex' => 5 ) ) . " -
  - " . wfCheckLabel( wfMsg( 'ipbenableautoblock' ), +
{$mIpbother}" . + Xml::input( 'wpBlockOther', 45, $this->BlockOther, + array( 'tabindex' => '3', 'id' => 'mw-bi-other' ) ) . " +
{$mIpbreasonother} + $reasonDropDown +
{$mIpbreason}" . + Xml::input( 'wpBlockReason', 45, $this->BlockReason, + array( 'tabindex' => '5', 'id' => 'mw-bi-reason', 'maxlength'=> '200' ) ) . " +
 " . + wfCheckLabel( wfMsgHtml( 'ipbanononly' ), + 'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly, + array( 'tabindex' => '6' ) ) . " +
 " . + wfCheckLabel( wfMsgHtml( 'ipbcreateaccount' ), + 'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount, + array( 'tabindex' => '7' ) ) . " +
 " . + wfCheckLabel( wfMsgHtml( 'ipbenableautoblock' ), 'wpEnableAutoblock', 'wpEnableAutoblock', $this->BlockEnableAutoblock, - array( 'tabindex' => 6 ) ) . " -
  - " . Xml::submitButton( wfMsg( 'ipbsubmit' ), - array( 'name' => 'wpBlock', 'tabindex' => '7' ) ) . " -
" . - Xml::hidden( 'wpEditToken', $token ) . + array( 'tabindex' => '8' ) ) . " + + " + ); + + global $wgSysopEmailBans; + if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) { + $wgOut->addHTML(" + +   + " . + wfCheckLabel( wfMsgHtml( 'ipbemailban' ), + 'wpEmailBan', 'wpEmailBan', $this->BlockEmail, + array( 'tabindex' => '10' )) . " + + " + ); + } + + // Allow some users to hide name from block log, blocklist and listusers + if ( $wgUser->isAllowed( 'hideuser' ) ) { + $wgOut->addHTML(" + +   + " . + wfCheckLabel( wfMsgHtml( 'ipbhidename' ), + 'wpHideName', 'wpHideName', $this->BlockHideName, + array( 'tabindex' => '9' ) ) . " + + " + ); + } + + $wgOut->addHTML(" + +   + " . + Xml::submitButton( wfMsg( 'ipbsubmit' ), + array( 'name' => 'wpBlock', 'tabindex' => '11' ) ) . " + + " . + Xml::closeElement( 'table' ) . + Xml::hidden( 'wpEditToken', $token ) . + Xml::closeElement( 'fieldset' ) . "
-\n" ); +\n" + ); $wgOut->addHtml( $this->getConvenienceLinks() ); @@ -191,16 +245,23 @@ class IPBlockForm { $this->showLogFragment( $wgOut, $user->getUserPage() ); } elseif( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/', $this->BlockAddress ) ) { $this->showLogFragment( $wgOut, Title::makeTitle( NS_USER, $this->BlockAddress ) ); + } elseif( preg_match( '/^\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}/', $this->BlockAddress ) ) { + $this->showLogFragment( $wgOut, Title::makeTitle( NS_USER, $this->BlockAddress ) ); } } - function doSubmit() { - global $wgOut, $wgUser, $wgSysopUserBans, $wgSysopRangeBans; + /** + * Backend block code. + * $userID and $expiry will be filled accordingly + * @return array(message key, arguments) on failure, empty array on success + */ + function doBlock(&$userId = null, &$expiry = null) + { + global $wgUser, $wgSysopUserBans, $wgSysopRangeBans; $userId = 0; - $this->BlockAddress = trim( $this->BlockAddress ); # Expand valid IPv6 addresses, usernames are left as is - $this->BlockAddress = IP::expandIP( $this->BlockAddress ); + $this->BlockAddress = IP::sanitizeIP( $this->BlockAddress ); # isIPv4() and IPv6() are used for final validation $rxIP4 = '\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}'; $rxIP6 = '\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}'; @@ -212,28 +273,24 @@ class IPBlockForm { if ( preg_match( "/^($rxIP4)\\/(\\d{1,2})$/", $this->BlockAddress, $matches ) ) { # IPv4 if ( $wgSysopRangeBans ) { - if ( !IP::isIPv4( $this->BlockAddress ) || $matches[2] > 31 || $matches[2] < 16 ) { - $this->showForm( wfMsg( 'ip_range_invalid' ) ); - return; + if ( !IP::isIPv4( $this->BlockAddress ) || $matches[2] < 16 || $matches[2] > 32 ) { + return array('ip_range_invalid'); } $this->BlockAddress = Block::normaliseRange( $this->BlockAddress ); } else { # Range block illegal - $this->showForm( wfMsg( 'range_block_disabled' ) ); - return; + return array('range_block_disabled'); } } else if ( preg_match( "/^($rxIP6)\\/(\\d{1,3})$/", $this->BlockAddress, $matches ) ) { # IPv6 if ( $wgSysopRangeBans ) { - if ( !IP::isIPv6( $this->BlockAddress ) || $matches[2] > 127 || $matches[2] < 64 ) { - $this->showForm( wfMsg( 'ip_range_invalid' ) ); - return; + if ( !IP::isIPv6( $this->BlockAddress ) || $matches[2] < 64 || $matches[2] > 128 ) { + return array('ip_range_invalid'); } - $this->BlockAddress = Block::normaliseRange6( $this->BlockAddress ); + $this->BlockAddress = Block::normaliseRange( $this->BlockAddress ); } else { # Range block illegal - $this->showForm( wfMsg( 'range_block_disabled' ) ); - return; + return array('range_block_disabled'); } } else { # Username block @@ -241,26 +298,31 @@ class IPBlockForm { $user = User::newFromName( $this->BlockAddress ); if( !is_null( $user ) && $user->getID() ) { # Use canonical name - $this->BlockAddress = $user->getName(); $userId = $user->getID(); + $this->BlockAddress = $user->getName(); } else { - $this->showForm( wfMsg( 'nosuchusershort', htmlspecialchars( $this->BlockAddress ) ) ); - return; + return array('nosuchusershort', htmlspecialchars( $user ? $user->getName() : $this->BlockAddress ) ); } } else { - $this->showForm( wfMsg( 'badipaddress' ) ); - return; + return array('badipaddress'); } } } + $reasonstr = $this->BlockReasonList; + if ( $reasonstr != 'other' && $this->BlockReason != '') { + // Entry from drop down menu + additional comment + $reasonstr .= ': ' . $this->BlockReason; + } elseif ( $reasonstr == 'other' ) { + $reasonstr = $this->BlockReason; + } + $expirestr = $this->BlockExpiry; if( $expirestr == 'other' ) $expirestr = $this->BlockOther; if (strlen($expirestr) == 0) { - $this->showForm( wfMsg( 'ipb_expiry_invalid' ) ); - return; + return array('ipb_expiry_invalid'); } if ( $expirestr == 'infinite' || $expirestr == 'indefinite' ) { @@ -270,8 +332,7 @@ class IPBlockForm { $expiry = strtotime( $expirestr ); if ( $expiry < 0 || $expiry === false ) { - $this->showForm( wfMsg( 'ipb_expiry_invalid' ) ); - return; + return array('ipb_expiry_invalid'); } $expiry = wfTimestamp( TS_MW, $expiry ); @@ -279,17 +340,15 @@ class IPBlockForm { # Create block # Note: for a user block, ipb_address is only for display purposes - $block = new Block( $this->BlockAddress, $userId, $wgUser->getID(), - $this->BlockReason, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly, - $this->BlockCreateAccount, $this->BlockEnableAutoblock ); + $reasonstr, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly, + $this->BlockCreateAccount, $this->BlockEnableAutoblock, $this->BlockHideName, + $this->BlockEmail); if (wfRunHooks('BlockIp', array(&$block, &$wgUser))) { if ( !$block->insert() ) { - $this->showForm( wfMsg( 'ipb_already_blocked', - htmlspecialchars( $this->BlockAddress ) ) ); - return; + return array('ipb_already_blocked', htmlspecialchars($this->BlockAddress)); } wfRunHooks('BlockIpComplete', array($block, $wgUser)); @@ -299,16 +358,35 @@ class IPBlockForm { $logParams[] = $expirestr; $logParams[] = $this->blockLogFlags(); - # Make log entry - $log = new LogPage( 'block' ); + # Make log entry, if the name is hidden, put it in the oversight log + $log_type = ($this->BlockHideName) ? 'oversight' : 'block'; + $log = new LogPage( $log_type ); $log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ), - $this->BlockReason, $logParams ); + $reasonstr, $logParams ); # Report to the user + return array(); + } + else + return array('hookaborted'); + } + + /** + * UI entry point for blocking + * Wraps around doBlock() + */ + function doSubmit() + { + global $wgOut; + $retval = $this->doBlock(); + if(empty($retval)) { $titleObj = SpecialPage::getTitleFor( 'Blockip' ); $wgOut->redirect( $titleObj->getFullURL( 'action=success&ip=' . urlencode( $this->BlockAddress ) ) ); + return; } + $key = array_shift($retval); + $this->showForm(wfMsgReal($key, $retval)); } function showSuccess() { @@ -316,12 +394,12 @@ class IPBlockForm { $wgOut->setPagetitle( wfMsg( 'blockip' ) ); $wgOut->setSubtitle( wfMsg( 'blockipsuccesssub' ) ); - $text = wfMsg( 'blockipsuccesstext', $this->BlockAddress ); - $wgOut->addWikiText( $text ); + $text = wfMsgExt( 'blockipsuccesstext', array( 'parse' ), $this->BlockAddress ); + $wgOut->addHtml( $text ); } function showLogFragment( $out, $title ) { - $out->addHtml( wfElement( 'h2', NULL, LogPage::logName( 'block' ) ) ); + $out->addHtml( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) ); $request = new FauxRequest( array( 'page' => $title->getPrefixedText(), 'type' => 'block' ) ); $viewer = new LogViewer( new LogReader( $request ) ); $viewer->showList( $out ); @@ -335,12 +413,15 @@ class IPBlockForm { */ private function blockLogFlags() { $flags = array(); - if( $this->BlockAnonOnly ) + if( $this->BlockAnonOnly && IP::isIPAddress( $this->BlockAddress ) ) + // when blocking a user the option 'anononly' is not available/has no effect -> do not write this into log $flags[] = 'anononly'; if( $this->BlockCreateAccount ) $flags[] = 'nocreate'; if( !$this->BlockEnableAutoblock ) $flags[] = 'noautoblock'; + if ( $this->BlockEmail ) + $flags[] = 'noemail'; return implode( ',', $flags ); } @@ -352,6 +433,7 @@ class IPBlockForm { private function getConvenienceLinks() { global $wgUser; $skin = $wgUser->getSkin(); + $links[] = $skin->makeLink ( 'MediaWiki:Ipbreason-dropdown', wfMsgHtml( 'ipb-edit-dropdown' ) ); $links[] = $this->getUnblockLink( $skin ); $links[] = $this->getBlockListLink( $skin ); return '

' . implode( ' | ', $links ) . '

'; @@ -393,4 +475,4 @@ class IPBlockForm { } } } -?> +