<?php
-
-function wfSpecialBlockip()
-{
+/**
+ * Constructor for Special:Blockip page
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ * Constructor
+ */
+function wfSpecialBlockip() {
global $wgUser, $wgOut, $wgRequest;
- if ( ! $wgUser->isSysop() ) {
+ if ( ! $wgUser->isAllowed('block') ) {
$wgOut->sysopRequired();
return;
}
$ipb = new IPBlockForm();
$action = $wgRequest->getVal( 'action' );
- if ( "success" == $action ) { $ipb->showSuccess(); }
- else if ( $wgRequest->wasPosted() && "submit" == $action ) { $ipb->doSubmit(); }
- else { $ipb->showForm( "" ); }
+ 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 {
var $BlockAddress, $BlockExpiry, $BlockReason;
global $wgRequest;
$this->BlockAddress = $wgRequest->getVal( 'wpBlockAddress', $wgRequest->getVal( 'ip' ) );
$this->BlockReason = $wgRequest->getText( 'wpBlockReason' );
- $this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry' );
+ $this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry', wfMsg('ipbotheroption') );
+ $this->BlockOther = $wgRequest->getVal( 'wpBlockOther', '' );
}
- function showForm( $err )
- {
- global $wgOut, $wgUser, $wgLang, $wgDefaultBlockExpiry;
- global $wgRequest;
+ function showForm( $err ) {
+ global $wgOut, $wgUser, $wgLang;
+ global $wgRequest, $wgSysopUserBans;
- $wgOut->setPagetitle( wfMsg( "blockip" ) );
- $wgOut->addWikiText( wfMsg( "blockiptext" ) );
+ $wgOut->setPagetitle( htmlspecialchars( wfMsg( 'blockip' ) ) );
+ $wgOut->addWikiText( wfMsg( 'blockiptext' ) );
- if ( is_null( $this->BlockExpiry ) || $this->BlockExpiry === "" ) {
- $this->BlockExpiry = $wgDefaultBlockExpiry;
+ if($wgSysopUserBans) {
+ $mIpaddress = htmlspecialchars( wfMsg( 'ipadressorusername' ) );
+ } else {
+ $mIpaddress = htmlspecialchars( wfMsg( 'ipaddress' ) );
}
-
- $mIpaddress = wfMsg( "ipaddress" );
- $mIpbexpiry = wfMsg( "ipbexpiry" );
- $mIpbreason = wfMsg( "ipbreason" );
- $mIpbsubmit = wfMsg( "ipbsubmit" );
- $titleObj = Title::makeTitle( NS_SPECIAL, "Blockip" );
+ $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( "<p><font color='red' size='+1'>{$err}</font>\n" );
+ $wgOut->setSubtitle( wfMsg( 'formerror' ) );
+ $wgOut->addHTML( "<p class='error'>{$err}</p>\n" );
}
$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 = "<option value=\"other\">$mIpbothertime</option>";
+ 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>";
+ }
+
+ $token = htmlspecialchars( $wgUser->editToken() );
- $wgOut->addHTML( "<p>
+ $wgOut->addHTML( "
<form id=\"blockip\" method=\"post\" action=\"{$action}\">
-<table border=0><tr>
-<td align=\"right\">{$mIpaddress}:</td>
-<td align=\"left\">
-<input tabindex=1 type=text size=20 name=\"wpBlockAddress\" value=\"{$scBlockAddress}\">
-</td></tr><tr>
-<td align=\"right\">{$mIpbexpiry}:</td>
-<td align=\"left\">
-<input tabindex=2 type=text size=20 name=\"wpBlockExpiry\" value=\"{$scBlockExpiry}\">
-</td></tr><tr>
-<td align=\"right\">{$mIpbreason}:</td>
-<td align=\"left\">
-<input tabindex=3 type=text size=40 name=\"wpBlockReason\" value=\"{$scBlockReason}\">
-</td></tr><tr>
-<td> </td><td align=\"left\">
-<input tabindex=4 type=submit name=\"wpBlock\" value=\"{$mIpbsubmit}\">
-</td></tr></table>
+ <table border='0'>
+ <tr>
+ <td align=\"right\">{$mIpaddress}:</td>
+ <td align=\"left\">
+ <input tabindex='1' type='text' size='20' name=\"wpBlockAddress\" value=\"{$scBlockAddress}\" />
+ </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>
+ ");
+ }
+ $wgOut->addHTML("
+ </tr>
+ <tr id='wpBlockOther'>
+ <td align=\"right\">{$mIpbother}:</td>
+ <td align=\"left\">
+ <input tabindex='3' type='text' size='40' name=\"wpBlockOther\" value=\"{$scBlockOtherTime}\" />
+ </td>
+ </tr>
+ <tr>
+ <td align=\"right\">{$mIpbreason}:</td>
+ <td align=\"left\">
+ <input tabindex='3' type='text' size='40' name=\"wpBlockReason\" value=\"{$scBlockReason}\" />
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td align=\"left\">
+ <input tabindex='4' type='submit' name=\"wpBlock\" value=\"{$mIpbsubmit}\" />
+ </td>
+ </tr>
+ </table>
+ <input type='hidden' name='wpEditToken' value=\"{$token}\" />
</form>\n" );
}
- function doSubmit()
- {
+ function doSubmit() {
global $wgOut, $wgUser, $wgLang;
global $wgSysopUserBans, $wgSysopRangeBans;
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" ) );
+ $this->showForm( wfMsg( 'ip_range_invalid' ) );
return;
}
$this->BlockAddress = Block::normaliseRange( $this->BlockAddress );
} else {
# Range block illegal
- $this->showForm( wfMsg( "range_block_disabled" ) );
+ $this->showForm( wfMsg( 'range_block_disabled' ) );
return;
}
} else {
if ( $wgSysopUserBans ) {
$userId = User::idFromName( $this->BlockAddress );
if ( $userId == 0 ) {
- $this->showForm( wfMsg( "nosuchuser", htmlspecialchars( $this->BlockAddress ) ) );
+ $this->showForm( wfMsg( 'nosuchusershort', htmlspecialchars( $this->BlockAddress ) ) );
return;
}
} else {
- $this->showForm( wfMsg( "badipaddress" ) );
+ $this->showForm( wfMsg( 'badipaddress' ) );
return;
}
}
}
- if ( $this->BlockExpiry == "infinite" || $this->BlockExpiry == "indefinite" ) {
+ $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( $this->BlockExpiry );
+ $expiry = strtotime( $expirestr );
if ( $expiry < 0 ) {
- $this->showForm( wfMsg( "ipb_expiry_invalid" ) );
+ $this->showForm( wfMsg( 'ipb_expiry_invalid' ) );
return;
}
- $expiry = wfUnix2Timestamp( $expiry );
-
- }
+ $expiry = wfTimestamp( TS_MW, $expiry );
-
- if ( "" == $this->BlockReason ) {
- $this->showForm( wfMsg( "noblockreason" ) );
- return;
}
# Create block
# Note: for a user block, ipb_address is only for display purposes
$ban = new Block( $this->BlockAddress, $userId, $wgUser->getID(),
- wfStrencode( $this->BlockReason ), wfTimestampNow(), 0, $expiry );
- $ban->insert();
-
- # Make log entry
- $log = new LogPage( wfMsg( "blocklogpage" ), wfMsg( "blocklogtext" ) );
- $action = wfMsg( "blocklogentry", $this->BlockAddress, $this->BlockExpiry );
- $log->addEntry( $action, $this->BlockReason );
-
- # Report to the user
- $titleObj = Title::makeTitle( NS_SPECIAL, "Blockip" );
- $wgOut->redirect( $titleObj->getFullURL( "action=success&ip={$this->BlockAddress}" ) );
+ $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", $this->BlockAddress );
+ $wgOut->setPagetitle( wfMsg( 'blockip' ) );
+ $wgOut->setSubtitle( wfMsg( 'blockipsuccesssub' ) );
+ $text = wfMsg( 'blockipsuccesstext', $this->BlockAddress );
$wgOut->addWikiText( $text );
}
}
dépôts / lhc / web / wiklou.git / blobdiff