/**
* Constructor
*/
-function wfSpecialBlockip() {
+function wfSpecialBlockip( $par ) {
global $wgUser, $wgOut, $wgRequest;
- if ( ! $wgUser->isAllowed('block') ) {
- $wgOut->sysopRequired();
+ if( !$wgUser->isAllowed( 'block' ) ) {
+ $wgOut->permissionRequired( 'block' );
return;
}
- $ipb = new IPBlockForm();
+
+ $ipb = new IPBlockForm( $par );
$action = $wgRequest->getVal( 'action' );
if ( 'success' == $action ) {
class IPBlockForm {
var $BlockAddress, $BlockExpiry, $BlockReason;
- function IPBlockForm() {
+ function IPBlockForm( $par ) {
global $wgRequest;
- $this->BlockAddress = $wgRequest->getVal( 'wpBlockAddress', $wgRequest->getVal( 'ip' ) );
+
+ $this->BlockAddress = $wgRequest->getVal( 'wpBlockAddress', $wgRequest->getVal( 'ip', $par ) );
$this->BlockReason = $wgRequest->getText( 'wpBlockReason' );
- $this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry' );
+ $this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry', wfMsg('ipbotheroption') );
+ $this->BlockOther = $wgRequest->getVal( 'wpBlockOther', '' );
+
+ # Unchecked checkboxes are not included in the form data at all, so having one
+ # that is true by default is a bit tricky
+ $byDefault = !$wgRequest->wasPosted();
+ $this->BlockAnonOnly = $wgRequest->getBool( 'wpAnonOnly', $byDefault );
+ $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', $byDefault );
+ $this->BlockEnableAutoblock = $wgRequest->getBool( 'wpEnableAutoblock', $byDefault );
}
-
+
function showForm( $err ) {
- global $wgOut, $wgUser, $wgLang, $wgBlockExpiryOptions;
- global $wgRequest;
+ global $wgOut, $wgUser, $wgSysopUserBans;
- $wgOut->setPagetitle( htmlspecialchars( wfMsg( 'blockip' ) ) );
- $wgOut->addWikiText( htmlspecialchars( wfMsg( 'blockiptext' ) ) );
+ $wgOut->setPagetitle( wfMsg( 'blockip' ) );
+ $wgOut->addWikiText( wfMsg( 'blockiptext' ) );
- $mIpaddress = htmlspecialchars( wfMsg( 'ipaddress' ) );
- $mIpbexpiry = htmlspecialchars( wfMsg( 'ipbexpiry' ) );
- $mIpbreason = htmlspecialchars( wfMsg( 'ipbreason' ) );
- $mIpbsubmit = htmlspecialchars( wfMsg( 'ipbsubmit' ) );
- $titleObj = Title::makeTitle( NS_SPECIAL, 'Blockip' );
+ if($wgSysopUserBans) {
+ $mIpaddress = wfMsgHtml( 'ipadressorusername' );
+ } else {
+ $mIpaddress = wfMsgHtml( 'ipaddress' );
+ }
+ $mIpbexpiry = wfMsgHtml( 'ipbexpiry' );
+ $mIpbother = wfMsgHtml( 'ipbother' );
+ $mIpbothertime = wfMsgHtml( 'ipbotheroption' );
+ $mIpbreason = wfMsgHtml( 'ipbreason' );
+ $mIpbsubmit = wfMsgHtml( 'ipbsubmit' );
+ $titleObj = SpecialPage::getTitleFor( 'Blockip' );
$action = $titleObj->escapeLocalURL( "action=submit" );
if ( "" != $err ) {
- $wgOut->setSubtitle( htmlspecialchars( wfMsg( 'formerror' ) ) );
+ $wgOut->setSubtitle( wfMsgHtml( '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' ) );
- $blockExpiryFormOptions = join("</option><option>", split(",", $wgBlockExpiryOptions));
- $blockExpiryFormOptions = "<option>" . $blockExpiryFormOptions . "</option>";
+ $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( "
<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}\" />
+ <input tabindex='1' type='text' size='40' name=\"wpBlockAddress\" value=\"{$scBlockAddress}\" />
</td>
</tr>
- <tr>
+ <tr>");
+ if ($showblockoptions) {
+ $wgOut->addHTML("
<td align=\"right\">{$mIpbexpiry}:</td>
<td align=\"left\">
- <select tabindex='2' name=\"wpBlockExpiry\">
+ <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>
<tr>
<td> </td>
<td align=\"left\">
- <input tabindex='4' type='submit' name=\"wpBlock\" value=\"{$mIpbsubmit}\" />
+ " . wfCheckLabel( wfMsg( 'ipbanononly' ),
+ 'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly,
+ array( 'tabindex' => 4 ) ) . "
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td align=\"left\">
+ " . wfCheckLabel( wfMsg( 'ipbcreateaccount' ),
+ 'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount,
+ array( 'tabindex' => 5 ) ) . "
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td align=\"left\">
+ " . wfCheckLabel( wfMsg( 'ipbenableautoblock' ),
+ 'wpEnableAutoblock', 'wpEnableAutoblock', $this->BlockEnableAutoblock,
+ array( 'tabindex' => 6 ) ) . "
+ </td>
+ </tr>
+ <tr>
+ <td style='padding-top: 1em'> </td>
+ <td style='padding-top: 1em' align=\"left\">
+ <input tabindex='7' type='submit' name=\"wpBlock\" value=\"{$mIpbsubmit}\" />
</td>
</tr>
</table>
<input type='hidden' name='wpEditToken' value=\"{$token}\" />
</form>\n" );
+ $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 ) );
+ }
+
}
function doSubmit() {
- global $wgOut, $wgUser, $wgLang;
- global $wgSysopUserBans, $wgSysopRangeBans;
-
+ global $wgOut, $wgUser, $wgSysopUserBans, $wgSysopRangeBans;
+
$userId = 0;
$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 ) ) {
+ $matches = array();
if ( preg_match( "/^($rxIP)\\/(\\d{1,2})$/", $this->BlockAddress, $matches ) ) {
if ( $wgSysopRangeBans ) {
if ( $matches[2] > 31 || $matches[2] < 16 ) {
}
} else {
# Username block
- if ( $wgSysopUserBans ) {
- $userId = User::idFromName( $this->BlockAddress );
- if ( $userId == 0 ) {
+ if ( $wgSysopUserBans ) {
+ $user = User::newFromName( $this->BlockAddress );
+ if( !is_null( $user ) && $user->getID() ) {
+ # Use canonical name
+ $this->BlockAddress = $user->getName();
+ $userId = $user->getID();
+ } else {
$this->showForm( wfMsg( 'nosuchusershort', htmlspecialchars( $this->BlockAddress ) ) );
return;
}
}
}
- if ( $this->BlockExpiry == 'infinite' || $this->BlockExpiry == 'indefinite' ) {
- $expiry = '';
+ $expirestr = $this->BlockExpiry;
+ if( $expirestr == 'other' )
+ $expirestr = $this->BlockOther;
+
+ if (strlen($expirestr) == 0) {
+ $this->showForm( wfMsg( 'ipb_expiry_invalid' ) );
+ return;
+ }
+
+ if ( $expirestr == 'infinite' || $expirestr == 'indefinite' ) {
+ $expiry = Block::infinity();
} else {
- # Convert GNU-style date, returns -1 on error
- $expiry = strtotime( $this->BlockExpiry );
+ # Convert GNU-style date, on error returns -1 for PHP <5.1 and false for PHP >=5.1
+ $expiry = strtotime( $expirestr );
- if ( $expiry < 0 ) {
+ if ( $expiry < 0 || $expiry === false ) {
$this->showForm( wfMsg( 'ipb_expiry_invalid' ) );
return;
}
-
- $expiry = wfTimestamp( TS_MW, $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(),
- $this->BlockReason, wfTimestampNow(), 0, $expiry );
-
- if (wfRunHooks('BlockIp', array(&$ban, &$wgUser))) {
-
- $ban->insert();
-
- wfRunHooks('BlockIpComplete', array($ban, $wgUser));
-
+ $block = new Block( $this->BlockAddress, $userId, $wgUser->getID(),
+ $this->BlockReason, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly,
+ $this->BlockCreateAccount, $this->BlockEnableAutoblock );
+
+ if (wfRunHooks('BlockIp', array(&$block, &$wgUser))) {
+
+ if ( !$block->insert() ) {
+ $this->showForm( wfMsg( 'ipb_already_blocked',
+ htmlspecialchars( $this->BlockAddress ) ) );
+ return;
+ }
+
+ wfRunHooks('BlockIpComplete', array($block, $wgUser));
+
# Make log entry
$log = new LogPage( 'block' );
- $log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ),
- $this->BlockReason, $this->BlockExpiry );
+ $log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ),
+ $this->BlockReason, $expirestr );
# Report to the user
- $titleObj = Title::makeTitle( NS_SPECIAL, 'Blockip' );
+ $titleObj = SpecialPage::getTitleFor( 'Blockip' );
$wgOut->redirect( $titleObj->getFullURL( 'action=success&ip=' .
urlencode( $this->BlockAddress ) ) );
}
}
function showSuccess() {
- global $wgOut, $wgUser;
+ global $wgOut;
$wgOut->setPagetitle( wfMsg( 'blockip' ) );
$wgOut->setSubtitle( wfMsg( 'blockipsuccesssub' ) );
$text = wfMsg( 'blockipsuccesstext', $this->BlockAddress );
$wgOut->addWikiText( $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 );
+ }
+
}
?>
dépôts / lhc / web / wiklou.git / blobdiff