X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialBlockip.php;h=68dfed7d02547e2b0db0252686fbaf2cca2c5fd0;hb=37b2fff6f57f1a975db780478254425bee1fd553;hp=6851d997e9bd2e0f7bea15e6a67e862fcf3e94d7;hpb=13c17d0cc9cc901c74469ece3c7646f830ca9623;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php index 6851d997e9..68dfed7d02 100644 --- a/includes/SpecialBlockip.php +++ b/includes/SpecialBlockip.php @@ -1,118 +1,237 @@ -isSysop() ) { +isAllowed('block') ) { $wgOut->sysopRequired(); return; } - $fields = array( "wpBlockAddress", "wpBlockReason" ); - wfCleanFormFields( $fields ); $ipb = new IPBlockForm(); - if ( "success" == $action ) { $ipb->showSuccess(); } - else if ( "submit" == $action ) { $ipb->doSubmit(); } - else { $ipb->showForm( "" ); } + $action = $wgRequest->getVal( 'action' ); + if ( 'success' == $action ) { + $ipb->showSuccess(); + } else if ( $wgRequest->wasPosted() && 'submit' == $action && + $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) { + $ipb->doSubmit(); + } else { + $ipb->showForm( '' ); + } } +/** + * Form object + * + * @package MediaWiki + * @subpackage SpecialPage + */ class IPBlockForm { - - function showForm( $err ) - { + var $BlockAddress, $BlockExpiry, $BlockReason; + + function IPBlockForm() { + global $wgRequest; + $this->BlockAddress = $wgRequest->getVal( 'wpBlockAddress', $wgRequest->getVal( 'ip' ) ); + $this->BlockReason = $wgRequest->getText( 'wpBlockReason' ); + $this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry', wfMsg('ipbotheroption') ); + $this->BlockOther = $wgRequest->getVal( 'wpBlockOther', '' ); + } + + function showForm( $err ) { global $wgOut, $wgUser, $wgLang; - global $ip, $wpBlockAddress, $wpBlockReason; - $wpBlockAddress = $_REQUEST["wpBlockAddress"]; - $wpBlockReason = $_REQUEST["wpBlockReason"]; - $ip = $_REQUEST["ip"]; + global $wgRequest, $wgSysopUserBans; - $wgOut->setPagetitle( wfMsg( "blockip" ) ); - $wgOut->addWikiText( wfMsg( "blockiptext" ) ); + $wgOut->setPagetitle( htmlspecialchars( wfMsg( 'blockip' ) ) ); + $wgOut->addWikiText( wfMsg( 'blockiptext' ) ); - if ( ! $wpBlockAddress ) { $wpBlockAddress = $ip; } - $ipa = wfMsg( "ipaddress" ); - $reason = wfMsg( "ipbreason" ); - $ipbs = wfMsg( "ipbsubmit" ); - $action = wfLocalUrlE( $wgLang->specialPage( "Blockip" ), - "action=submit" ); + if($wgSysopUserBans) { + $mIpaddress = htmlspecialchars( wfMsg( 'ipadressorusername' ) ); + } else { + $mIpaddress = htmlspecialchars( wfMsg( 'ipaddress' ) ); + } + $mIpbexpiry = htmlspecialchars( wfMsg( 'ipbexpiry' ) ); + $mIpbother = htmlspecialchars( wfMsg( 'ipbother' ) ); + $mIpbothertime = htmlspecialchars( wfMsg( 'ipbotheroption' ) ); + $mIpbreason = htmlspecialchars( wfMsg( 'ipbreason' ) ); + $mIpbsubmit = htmlspecialchars( wfMsg( 'ipbsubmit' ) ); + $titleObj = Title::makeTitle( NS_SPECIAL, 'Blockip' ); + $action = $titleObj->escapeLocalURL( "action=submit" ); if ( "" != $err ) { - $wgOut->setSubtitle( wfMsg( "formerror" ) ); - $wgOut->addHTML( "

{$err}\n" ); + $wgOut->setSubtitle( wfMsg( 'formerror' ) ); + $wgOut->addHTML( "

{$err}

\n" ); } - $wgOut->addHTML( "

+ + $scBlockAddress = htmlspecialchars( $this->BlockAddress ); + $scBlockExpiry = htmlspecialchars( $this->BlockExpiry ); + $scBlockReason = htmlspecialchars( $this->BlockReason ); + $scBlockOtherTime = htmlspecialchars( $this->BlockOther ); + $scBlockExpiryOptions = htmlspecialchars( wfMsgForContent( 'ipboptions' ) ); + + $showblockoptions = $scBlockExpiryOptions != '-'; + if (!$showblockoptions) + $mIpbother = $mIpbexpiry; + + $blockExpiryFormOptions = ""; + foreach (explode(',', $scBlockExpiryOptions) as $option) { + if ( strpos($option, ":") === false ) $option = "$option:$option"; + list($show, $value) = explode(":", $option); + $show = htmlspecialchars($show); + $value = htmlspecialchars($value); + $selected = ""; + if ($this->BlockExpiry === $value) + $selected = ' selected="selected"'; + $blockExpiryFormOptions .= ""; + } + + $token = htmlspecialchars( $wgUser->editToken() ); + + $wgOut->addHTML( "

- - - - - -
{$ipa}: - -
{$reason}: - -
  - -
+ + + + + + "); + if ($showblockoptions) { + $wgOut->addHTML(" + + + "); + } + $wgOut->addHTML(" + + + + + + + + + + + + + +
{$mIpaddress}: + +
{$mIpbexpiry}: + +
{$mIpbother}: + +
{$mIpbreason}: + +
  + +
+
\n" ); } - function doSubmit() - { + function doSubmit() { global $wgOut, $wgUser, $wgLang; - global $ip, $wpBlockAddress, $wpBlockReason, $wgSysopUserBans; - $wpBlockAddress = $_REQUEST["wpBlockAddress"]; - $wpBlockReason = $_REQUEST["wpBlockReason"]; - $ip = $_REQUEST["ip"]; + global $wgSysopUserBans, $wgSysopRangeBans; $userId = 0; - $wpBlockAddress = trim( $wpBlockAddress ); - - if ( ! preg_match( "/^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$/", - $wpBlockAddress ) ) - { - if ( $wgSysopUserBans ) { - $userId = User::idFromName( $wpBlockAddress ); - if ( $userId == 0 ) { - $this->showForm( wfMsg( "badipaddress" ) ); + $this->BlockAddress = trim( $this->BlockAddress ); + $rxIP = '\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}'; + + # Check for invalid specifications + if ( ! preg_match( "/^$rxIP$/", $this->BlockAddress ) ) { + if ( preg_match( "/^($rxIP)\\/(\\d{1,2})$/", $this->BlockAddress, $matches ) ) { + if ( $wgSysopRangeBans ) { + if ( $matches[2] > 31 || $matches[2] < 16 ) { + $this->showForm( wfMsg( 'ip_range_invalid' ) ); + return; + } + $this->BlockAddress = Block::normaliseRange( $this->BlockAddress ); + } else { + # Range block illegal + $this->showForm( wfMsg( 'range_block_disabled' ) ); return; } } else { - $this->showForm( wfMsg( "badipaddress" ) ); - return; - } + # Username block + if ( $wgSysopUserBans ) { + $userId = User::idFromName( $this->BlockAddress ); + if ( $userId == 0 ) { + $this->showForm( wfMsg( 'nosuchusershort', htmlspecialchars( $this->BlockAddress ) ) ); + return; + } + } else { + $this->showForm( wfMsg( 'badipaddress' ) ); + return; + } + } } - if ( "" == $wpBlockReason ) { - $this->showForm( wfMsg( "noblockreason" ) ); + + $expirestr = $this->BlockExpiry; + if ($expirestr == wfMsg('ipbotheroption')) + $expirestr = $this->BlockOther; + + if (strlen($expirestr) == 0) { + $this->showForm( wfMsg( 'ipb_expiry_invalid' ) ); return; } + + if ( $expirestr == 'infinite' || $expirestr == 'indefinite' ) { + $expiry = ''; + } else { + # Convert GNU-style date, returns -1 on error + $expiry = strtotime( $expirestr ); + + if ( $expiry < 0 ) { + $this->showForm( wfMsg( 'ipb_expiry_invalid' ) ); + return; + } + + $expiry = wfTimestamp( TS_MW, $expiry ); + + } # Create block # Note: for a user block, ipb_address is only for display purposes - $ban = new Block( $wpBlockAddress, $userId, $wgUser->getID(), - wfStrencode( $wpBlockReason ), wfTimestampNow(), 0 ); - $ban->insert(); - - # Make log entry - $log = new LogPage( wfMsg( "blocklogpage" ), wfMsg( "blocklogtext" ) ); - $action = wfMsg( "blocklogentry", $wgBlockAddress ); - $log->addEntry( $action, $wpBlockReason ); - - # Report to the user - $success = wfLocalUrl( $wgLang->specialPage( "Blockip" ), - "action=success&ip={$wpBlockAddress}" ); - $wgOut->redirect( $success ); + + $ban = new Block( $this->BlockAddress, $userId, $wgUser->getID(), + $this->BlockReason, wfTimestampNow(), 0, $expiry ); + + if (wfRunHooks('BlockIp', array(&$ban, &$wgUser))) { + + $ban->insert(); + + wfRunHooks('BlockIpComplete', array($ban, $wgUser)); + + # Make log entry + $log = new LogPage( 'block' ); + $log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ), + $this->BlockReason, $expirestr ); + + # Report to the user + $titleObj = Title::makeTitle( NS_SPECIAL, 'Blockip' ); + $wgOut->redirect( $titleObj->getFullURL( 'action=success&ip=' . + urlencode( $this->BlockAddress ) ) ); + } } - function showSuccess() - { + function showSuccess() { global $wgOut, $wgUser; - $wgOut->setPagetitle( wfMsg( "blockip" ) ); - $wgOut->setSubtitle( wfMsg( "blockipsuccesssub" ) ); - $text = wfMsg( "blockipsuccesstext", $_REQUEST["ip"] ); + $wgOut->setPagetitle( wfMsg( 'blockip' ) ); + $wgOut->setSubtitle( wfMsg( 'blockipsuccesssub' ) ); + $text = wfMsg( 'blockipsuccesstext', $this->BlockAddress ); $wgOut->addWikiText( $text ); } }