X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialBlockip.php;h=d45603572d2fa37d9d131b87020b8f5f2ec7193c;hb=5516fef269e71b5962afa34bd7e7403b13b57d12;hp=567fd824253b5c5edf3998d48bf82f6dd081507b;hpb=5941189de0c2a55ba8964eaefbfc5f95fecdbaf8;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 567fd82425..d45603572d 100644
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -2,8 +2,8 @@
/**
* Constructor for Special:Blockip page
*
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @file
+ * @ingroup SpecialPage
*/
/**
@@ -12,6 +12,13 @@
function wfSpecialBlockip( $par ) {
global $wgUser, $wgOut, $wgRequest;
+ # Can't block when the database is locked
+ if( wfReadOnly() ) {
+ $wgOut->readOnlyPage();
+ return;
+ }
+
+ # Permission check
if( !$wgUser->isAllowed( 'block' ) ) {
$wgOut->permissionRequired( 'block' );
return;
@@ -31,239 +38,369 @@ function wfSpecialBlockip( $par ) {
}
/**
- * Form object
+ * Form object for the Special:Blockip page.
*
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @ingroup 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', '' );
- $this->BlockAnonOnly = $wgRequest->getBool( 'wpAnonOnly' );
- # Unchecked checkboxes are not included in the form data at all, so having one
+ # Unchecked checkboxes are not included in the form data at all, so having one
# that is true by default is a bit tricky
- if ( $wgRequest->wasPosted() ) {
- $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', false );
- } else {
- $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', true );
- }
+ $byDefault = !$wgRequest->wasPosted();
+ $this->BlockAnonOnly = $wgRequest->getBool( 'wpAnonOnly', $byDefault );
+ $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', $byDefault );
+ $this->BlockEnableAutoblock = $wgRequest->getBool( 'wpEnableAutoblock', $byDefault );
+ $this->BlockEmail = $wgRequest->getBool( 'wpEmailBan', false );
+ $this->BlockWatchUser = $wgRequest->getBool( 'wpWatchUser', 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;
$wgOut->setPagetitle( wfMsg( 'blockip' ) );
- $wgOut->addWikiText( wfMsg( 'blockiptext' ) );
+ $wgOut->addWikiMsg( 'blockiptext' );
if($wgSysopUserBans) {
- $mIpaddress = wfMsgHtml( 'ipadressorusername' );
+ $mIpaddress = Xml::label( wfMsg( 'ipadressorusername' ), 'mw-bi-target' );
} else {
- $mIpaddress = wfMsgHtml( 'ipaddress' );
+ $mIpaddress = Xml::label( wfMsg( 'ipaddress' ), 'mw-bi-target' );
}
- $mIpbexpiry = wfMsgHtml( 'ipbexpiry' );
- $mIpbother = wfMsgHtml( 'ipbother' );
- $mIpbothertime = wfMsgHtml( 'ipbotheroption' );
- $mIpbreason = wfMsgHtml( 'ipbreason' );
- $mIpbsubmit = wfMsgHtml( 'ipbsubmit' );
+ $mIpbexpiry = Xml::label( wfMsg( 'ipbexpiry' ), 'wpBlockExpiry' );
+ $mIpbother = Xml::label( wfMsg( 'ipbother' ), 'mw-bi-other' );
+ $mIpbreasonother = Xml::label( wfMsg( 'ipbreason' ), 'wpBlockReasonList' );
+ $mIpbreason = Xml::label( wfMsg( 'ipbotherreason' ), 'mw-bi-reason' );
+
$titleObj = SpecialPage::getTitleFor( 'Blockip' );
- $action = $titleObj->escapeLocalURL( "action=submit" );
if ( "" != $err ) {
$wgOut->setSubtitle( wfMsgHtml( 'formerror' ) );
- $wgOut->addHTML( "{$err}
\n" );
+ $wgOut->addHTML( Xml::tags( 'p', array( 'class' => 'error' ), $err ) );
}
- $scBlockAddress = htmlspecialchars( $this->BlockAddress );
- $scBlockExpiry = htmlspecialchars( $this->BlockExpiry );
- $scBlockReason = htmlspecialchars( $this->BlockReason );
- $scBlockOtherTime = htmlspecialchars( $this->BlockOther );
- $scBlockExpiryOptions = htmlspecialchars( wfMsgForContent( 'ipboptions' ) );
+ $scBlockExpiryOptions = wfMsgForContent( 'ipboptions' );
$showblockoptions = $scBlockExpiryOptions != '-';
if (!$showblockoptions)
$mIpbother = $mIpbexpiry;
- $blockExpiryFormOptions = "";
+ $blockExpiryFormOptions = Xml::option( wfMsg( 'ipbotheroption' ), 'other' );
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 .= "";
+ $blockExpiryFormOptions .= Xml::option( $show, $value, $this->BlockExpiry === $value ? true : false ) . "\n";
}
- $token = htmlspecialchars( $wgUser->editToken() );
-
- $wgOut->addHTML( "
-\n" );
+
+
+ |
+ {$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' ) ) . "
+ |
+
+
+ | |
+ " .
+ Xml::checkLabel( wfMsg( 'ipbanononly' ),
+ 'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly,
+ array( 'tabindex' => '6' ) ) . "
+ |
+
+
+ | |
+ " .
+ Xml::checkLabel( wfMsg( 'ipbcreateaccount' ),
+ 'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount,
+ array( 'tabindex' => '7' ) ) . "
+ |
+
+
+ | |
+ " .
+ Xml::checkLabel( wfMsg( 'ipbenableautoblock' ),
+ 'wpEnableAutoblock', 'wpEnableAutoblock', $this->BlockEnableAutoblock,
+ array( 'tabindex' => '8' ) ) . "
+ |
+
"
+ );
+
+ global $wgSysopEmailBans;
+ if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
+ $wgOut->addHTML("
+
+ | |
+ " .
+ Xml::checkLabel( wfMsg( 'ipbemailban' ),
+ 'wpEmailBan', 'wpEmailBan', $this->BlockEmail,
+ array( 'tabindex' => '9' )) . "
+ |
+
"
+ );
+ }
+
+ // Allow some users to hide name from block log, blocklist and listusers
+ if ( $wgUser->isAllowed( 'hideuser' ) ) {
+ $wgOut->addHTML("
+
+ | |
+ " .
+ Xml::checkLabel( wfMsg( 'ipbhidename' ),
+ 'wpHideName', 'wpHideName', $this->BlockHideName,
+ array( 'tabindex' => '10' ) ) . "
+ |
+
"
+ );
+ }
+
+ # Watchlist their user page?
+ $wgOut->addHTML("
+
+ | |
+ " .
+ Xml::checkLabel( wfMsg( 'ipbwatchuser' ),
+ 'wpWatchUser', 'wpWatchUser', $this->BlockWatchUser,
+ array( 'tabindex' => '11' ) ) . "
+ |
+
"
+ );
+
+ $wgOut->addHTML("
+
+ | |
+ " .
+ Xml::submitButton( wfMsg( 'ipbsubmit' ),
+ array( 'name' => 'wpBlock', 'tabindex' => '12' ) ) . "
+ |
+
" .
+ Xml::closeElement( 'table' ) .
+ Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
+ Xml::closeElement( 'fieldset' ) .
+ Xml::closeElement( 'form' ) .
+ Xml::tags( 'script', array( 'type' => 'text/javascript' ), 'updateBlockOptions()' ) . "\n"
+ );
+
+ $wgOut->addHtml( $this->getConvenienceLinks() );
$user = User::newFromName( $this->BlockAddress );
if( is_object( $user ) ) {
$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 );
- $rxIP = '\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}';
+ # Expand valid IPv6 addresses, usernames are left as is
+ $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}';
+ $rxIP = "($rxIP4|$rxIP6)";
# Check for invalid specifications
- if ( ! preg_match( "/^$rxIP$/", $this->BlockAddress ) ) {
- if ( preg_match( "/^($rxIP)\\/(\\d{1,2})$/", $this->BlockAddress, $matches ) ) {
+ if ( !preg_match( "/^$rxIP$/", $this->BlockAddress ) ) {
+ $matches = array();
+ if ( preg_match( "/^($rxIP4)\\/(\\d{1,2})$/", $this->BlockAddress, $matches ) ) {
+ # IPv4
if ( $wgSysopRangeBans ) {
- if ( $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] < 64 || $matches[2] > 128 ) {
+ return array('ip_range_invalid');
+ }
+ $this->BlockAddress = Block::normaliseRange( $this->BlockAddress );
+ } else {
+ # Range block illegal
+ return array('range_block_disabled');
}
} else {
# Username block
if ( $wgSysopUserBans ) {
$user = User::newFromName( $this->BlockAddress );
- if( !is_null( $user ) && $user->getID() ) {
+ if( !is_null( $user ) && $user->getId() ) {
# Use canonical name
+ $userId = $user->getId();
$this->BlockAddress = $user->getName();
- $userId = $user->getID();
} 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' ) {
- $expiry = Block::infinity();
- } else {
- # Convert GNU-style date, on error returns -1 for PHP <5.1 and false for PHP >=5.1
- $expiry = strtotime( $expirestr );
-
- if ( $expiry < 0 || $expiry === false ) {
- $this->showForm( wfMsg( 'ipb_expiry_invalid' ) );
- return;
- }
-
- $expiry = wfTimestamp( TS_MW, $expiry );
+
+ if ( false === ($expiry = Block::parseExpiryInput( $expirestr )) ) {
+ // Bad expiry.
+ return array('ipb_expiry_invalid');
}
# Create block
# Note: for a user block, ipb_address is only for display purposes
+ $block = new Block( $this->BlockAddress, $userId, $wgUser->getId(),
+ $reasonstr, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly,
+ $this->BlockCreateAccount, $this->BlockEnableAutoblock, $this->BlockHideName,
+ $this->BlockEmail);
- $block = new Block( $this->BlockAddress, $userId, $wgUser->getID(),
- $this->BlockReason, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly,
- $this->BlockCreateAccount );
-
+ if ( $this->BlockWatchUser ) {
+ $wgUser->addWatch ( Title::makeTitle( NS_USER, $this->BlockAddress ) );
+ }
+
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));
- # Make log entry
- $log = new LogPage( 'block' );
+ # Prepare log parameters
+ $logParams = array();
+ $logParams[] = $expirestr;
+ $logParams[] = $this->blockLogFlags();
+
+ # Make log entry, if the name is hidden, put it in the oversight log
+ $log_type = ($this->BlockHideName) ? 'suppress' : 'block';
+ $log = new LogPage( $log_type );
$log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ),
- $this->BlockReason, $expirestr );
+ $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() {
@@ -271,17 +408,82 @@ 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' ) ) );
- $request = new FauxRequest( array( 'page' => $title->getPrefixedText(), 'type' => 'block' ) );
- $viewer = new LogViewer( new LogReader( $request ) );
- $viewer->showList( $out );
+
+ function showLogFragment( $out, $title ) {
+ $out->addHtml( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) );
+ LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText() );
}
-
-}
-?>
+ /**
+ * Return a comma-delimited list of "flags" to be passed to the log
+ * reader for this block, to provide more information in the logs
+ *
+ * @return array
+ */
+ private function blockLogFlags() {
+ $flags = array();
+ 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 );
+ }
+
+ /**
+ * Builds unblock and block list links
+ *
+ * @return string
+ */
+ 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 ) . '
';
+ }
+
+ /**
+ * Build a convenient link to unblock the given username or IP
+ * address, if available; otherwise link to a blank unblock
+ * form
+ *
+ * @param $skin Skin to use
+ * @return string
+ */
+ private function getUnblockLink( $skin ) {
+ $list = SpecialPage::getTitleFor( 'Ipblocklist' );
+ if( $this->BlockAddress ) {
+ $addr = htmlspecialchars( strtr( $this->BlockAddress, '_', ' ' ) );
+ return $skin->makeKnownLinkObj( $list, wfMsgHtml( 'ipb-unblock-addr', $addr ),
+ 'action=unblock&ip=' . urlencode( $this->BlockAddress ) );
+ } else {
+ return $skin->makeKnownLinkObj( $list, wfMsgHtml( 'ipb-unblock' ), 'action=unblock' );
+ }
+ }
+
+ /**
+ * Build a convenience link to the block list
+ *
+ * @param $skin Skin to use
+ * @return string
+ */
+ private function getBlockListLink( $skin ) {
+ $list = SpecialPage::getTitleFor( 'Ipblocklist' );
+ if( $this->BlockAddress ) {
+ $addr = htmlspecialchars( strtr( $this->BlockAddress, '_', ' ' ) );
+ return $skin->makeKnownLinkObj( $list, wfMsgHtml( 'ipb-blocklist-addr', $addr ),
+ 'ip=' . urlencode( $this->BlockAddress ) );
+ } else {
+ return $skin->makeKnownLinkObj( $list, wfMsgHtml( 'ipb-blocklist' ) );
+ }
+ }
+}