X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialBlockip.php;h=0f503d27ef7ae31786544c7ed52983cdbd9a3813;hb=000f346c1b541bd8643d901990a69b6a66847d1e;hp=27729f2b825c53b3cf35223e9581dfb9ff7903fe;hpb=9150412fe7954093af3506fab1d5c7af86db98e5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 27729f2b82..0f503d27ef 100644
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -2,7 +2,8 @@
 /**
  * Constructor for Special:Blockip page
  *
- * @addtogroup SpecialPage
+ * @file
+ * @ingroup SpecialPage
  */
 
 /**
@@ -37,19 +38,21 @@ function wfSpecialBlockip( $par ) {
 }
 
 /**
- * Form object
+ * Form object for the Special:Blockip page.
  *
- * @addtogroup 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', '' );
 
@@ -59,29 +62,33 @@ 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 );
+		$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 = 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" );
 
 		if ( "" != $err ) {
 			$wgOut->setSubtitle( wfMsgHtml( 'formerror' ) );
-			$wgOut->addHTML( "<p class='error'>{$err}</p>\n" );
+			$wgOut->addHTML( Xml::tags( 'p', array( 'class' => 'error' ), $err ) );
 		}
 
 		$scBlockExpiryOptions = wfMsgForContent( 'ipboptions' );
@@ -90,99 +97,164 @@ class IPBlockForm {
 		if (!$showblockoptions)
 			$mIpbother = $mIpbexpiry;
 
-		$blockExpiryFormOptions = "<option value=\"other\">$mIpbothertime</option>";
+		$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 .= "<option value=\"$value\"$selected>$show</option>";
+			$blockExpiryFormOptions .= Xml::option( $show, $value, $this->BlockExpiry === $value ? true : false ) . "\n";
 		}
 
-		$token = htmlspecialchars( $wgUser->editToken() );
+		$reasonDropDown = Xml::listDropDown( 'wpBlockReasonList',
+			wfMsgForContent( 'ipbreason-dropdown' ),
+			wfMsgForContent( 'ipbreasonotherlist' ), '', 'wpBlockDropDown', 4 );
 
 		global $wgStylePath, $wgStyleVersion;
-		$wgOut->addHTML( "
-<script type=\"text/javascript\" src=\"$wgStylePath/common/block.js?$wgStyleVersion\">
-</script>
-<form id=\"blockip\" method=\"post\" action=\"{$action}\">
-	<table border='0'>
-		<tr>
-			<td align=\"right\">{$mIpaddress}:</td>
-			<td align=\"left\">
-				" . Xml::input( 'wpBlockAddress', 45, $this->BlockAddress,
-					array(
-						'tabindex' => '1',
-						'id' => 'mw-bi-target',
-						'onchange' => 'updateBlockOptions()' ) ) . "
-			</td>
-		</tr>
-		<tr>");
-		if ($showblockoptions) {
+		$wgOut->addHTML(
+			Xml::tags( 'script', array( 'type' => 'text/javascript', 'src' => "$wgStylePath/common/block.js?$wgStyleVersion" ), '' ) .
+			Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( "action=submit" ), 'id' => 'blockip' ) ) .
+			Xml::openElement( 'fieldset' ) .
+			Xml::element( 'legend', null, wfMsg( 'blockip-legend' ) ) .
+			Xml::openElement( 'table', array ( 'border' => '0', 'id' => 'mw-blockip-table' ) ) .
+			"<tr>
+				<td class='mw-label'>
+					{$mIpaddress}
+				</td>
+				<td class='mw-input'>" .
+					Xml::input( 'wpBlockAddress', 45, $this->BlockAddress,
+						array(
+							'tabindex' => '1',
+							'id' => 'mw-bi-target',
+							'onchange' => 'updateBlockOptions()' ) ). "
+				</td>
+			</tr>
+			<tr>"
+		);
+		if ( $showblockoptions ) {
 			$wgOut->addHTML("
-			<td align=\"right\">{$mIpbexpiry}:</td>
-			<td align=\"left\">
-				<select tabindex='2' id='wpBlockExpiry' name=\"wpBlockExpiry\" onchange=\"considerChangingExpiryFocus()\">
-					$blockExpiryFormOptions
-				</select>
-			</td>
-			");
+				<td class='mw-label'>
+					{$mIpbexpiry}
+				</td>
+				<td class='mw-input'>" .
+					Xml::tags( 'select',
+						array(
+							'id' => 'wpBlockExpiry',
+							'name' => 'wpBlockExpiry',
+							'onchange' => 'considerChangingExpiryFocus()',
+							'tabindex' => '2' ),
+						$blockExpiryFormOptions ) .
+				"</td>"
+			);
 		}
 		$wgOut->addHTML("
-		</tr>
-		<tr id='wpBlockOther'>
-			<td align=\"right\">{$mIpbother}:</td>
-			<td align=\"left\">
-				" . Xml::input( 'wpBlockOther', 45, $this->BlockOther,
-					array( 'tabindex' => '3', 'id' => 'mw-bi-other' ) ) . "
-			</td>
-		</tr>
-		<tr>
-			<td align=\"right\">{$mIpbreason}:</td>
-			<td align=\"left\">
-				" . Xml::input( 'wpBlockReason', 45, $this->BlockReason,
-					array( 'tabindex' => '3', 'id' => 'mw-bi-reason' ) ) . "
-			</td>
-		</tr>
-		<tr id='wpAnonOnlyRow'>
-			<td>&nbsp;</td>
-			<td align=\"left\">
-				" . wfCheckLabel( wfMsg( 'ipbanononly' ),
-					'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly,
-					array( 'tabindex' => 4 ) ) . "
-			</td>
-		</tr>
-		<tr id='wpCreateAccountRow'>
-			<td>&nbsp;</td>
-			<td align=\"left\">
-				" . wfCheckLabel( wfMsg( 'ipbcreateaccount' ),
-					'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount,
-					array( 'tabindex' => 5 ) ) . "
-			</td>
-		</tr>
-		<tr id='wpEnableAutoblockRow'>
-			<td>&nbsp;</td>
-			<td align=\"left\">
-				" . wfCheckLabel( wfMsg( 'ipbenableautoblock' ),
+			</tr>
+			<tr id='wpBlockOther'>
+				<td class='mw-label'>
+					{$mIpbother}
+				</td>
+				<td class='mw-input'>" .
+					Xml::input( 'wpBlockOther', 45, $this->BlockOther,
+						array( 'tabindex' => '3', 'id' => 'mw-bi-other' ) ) . "
+				</td>
+			</tr>
+			<tr>
+				<td class='mw-label'>
+					{$mIpbreasonother}
+				</td>
+				<td class='mw-input'>
+					{$reasonDropDown}
+				</td>
+			</tr>
+			<tr id=\"wpBlockReason\">
+				<td class='mw-label'>
+					{$mIpbreason}
+				</td>
+				<td class='mw-input'>" .
+					Xml::input( 'wpBlockReason', 45, $this->BlockReason,
+						array( 'tabindex' => '5', 'id' => 'mw-bi-reason', 'maxlength'=> '200' ) ) . "
+				</td>
+			</tr>
+			<tr id='wpAnonOnlyRow'>
+				<td>&nbsp;</td>
+				<td class='mw-input'>" .
+				Xml::checkLabel( wfMsg( 'ipbanononly' ),
+						'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly,
+						array( 'tabindex' => '6' ) ) . "
+				</td>
+			</tr>
+			<tr id='wpCreateAccountRow'>
+				<td>&nbsp;</td>
+				<td class='mw-input'>" .
+					Xml::checkLabel( wfMsg( 'ipbcreateaccount' ),
+						'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount,
+						array( 'tabindex' => '7' ) ) . "
+				</td>
+			</tr>
+			<tr id='wpEnableAutoblockRow'>
+				<td>&nbsp;</td>
+				<td class='mw-input'>" .
+					Xml::checkLabel( wfMsg( 'ipbenableautoblock' ),
 						'wpEnableAutoblock', 'wpEnableAutoblock', $this->BlockEnableAutoblock,
-							array( 'tabindex' => 6 ) ) . "
-			</td>
-		</tr>
-		<tr>
-			<td style='padding-top: 1em'>&nbsp;</td>
-			<td style='padding-top: 1em' align=\"left\">
-				" . Xml::submitButton( wfMsg( 'ipbsubmit' ),
-							array( 'name' => 'wpBlock', 'tabindex' => '7' ) ) . "
-			</td>
-		</tr>
-	</table>" .
-	Xml::hidden( 'wpEditToken', $token ) .
-"</form>
-<script type=\"text/javascript\">updateBlockOptions()</script>
-\n" );
+						array( 'tabindex' => '8' ) ) . "
+				</td>
+			</tr>"
+		);
+
+		global $wgSysopEmailBans;
+		if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
+			$wgOut->addHTML("
+				<tr id='wpEnableEmailBan'>
+					<td>&nbsp;</td>
+					<td class='mw-input'>" .
+						Xml::checkLabel( wfMsg( 'ipbemailban' ),
+							'wpEmailBan', 'wpEmailBan', $this->BlockEmail,
+							array( 'tabindex' => '9' )) . "
+					</td>
+				</tr>"
+			);
+		}
+
+		// Allow some users to hide name from block log, blocklist and listusers
+		if ( $wgUser->isAllowed( 'hideuser' ) ) {
+			$wgOut->addHTML("
+				<tr id='wpEnableHideUser'>
+					<td>&nbsp;</td>
+					<td class='mw-input'>" .
+						Xml::checkLabel( wfMsg( 'ipbhidename' ),
+							'wpHideName', 'wpHideName', $this->BlockHideName,
+							array( 'tabindex' => '10' ) ) . "
+					</td>
+				</tr>"
+			);
+		}
+		
+		# Watchlist their user page?
+		$wgOut->addHTML("
+			<tr id='wpEnableWatchUser'>
+				<td>&nbsp;</td>
+				<td class='mw-input'>" .
+					Xml::checkLabel( wfMsg( 'ipbwatchuser' ),
+						'wpWatchUser', 'wpWatchUser', $this->BlockWatchUser,
+						array( 'tabindex' => '11' ) ) . "
+				</td>
+			</tr>"
+		);
+
+		$wgOut->addHTML("
+			<tr>
+				<td style='padding-top: 1em'>&nbsp;</td>
+				<td  class='mw-submit' style='padding-top: 1em'>" .
+					Xml::submitButton( wfMsg( 'ipbsubmit' ),
+						array( 'name' => 'wpBlock', 'tabindex' => '12' ) ) . "
+				</td>
+			</tr>" .
+			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() );
 
@@ -196,8 +268,14 @@ class IPBlockForm {
 		}
 	}
 
-	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;
 		# Expand valid IPv6 addresses, usernames are left as is
@@ -206,35 +284,31 @@ class IPBlockForm {
 		$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 ) ) {
 			$matches = array();
 		  	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
@@ -242,26 +316,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' ) {
@@ -271,8 +350,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 );
@@ -280,17 +358,19 @@ 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 ( $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));
@@ -300,16 +380,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) ? 'suppress' : '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() {
@@ -317,15 +416,13 @@ 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 );
+		$out->addHtml( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) );
+		LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText() );
 	}
 
 	/**
@@ -343,6 +440,8 @@ class IPBlockForm {
 			$flags[] = 'nocreate';
 		if( !$this->BlockEnableAutoblock )
 			$flags[] = 'noautoblock';
+		if ( $this->BlockEmail )
+			$flags[] = 'noemail';
 		return implode( ',', $flags );
 	}
 
@@ -354,6 +453,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 '<p class="mw-ipb-conveniencelinks">' . implode( ' | ', $links ) . '</p>';
@@ -395,4 +495,3 @@ class IPBlockForm {
 		}
 	}
 }
-?>