/**
* 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 ) { $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( '' );
+ }
}
/**
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', '' );
}
-
+
function showForm( $err ) {
- global $wgOut, $wgUser, $wgLang, $wgDefaultBlockExpiry;
- global $wgRequest;
+ global $wgOut, $wgUser, $wgRequest, $wgSysopUserBans;
- $wgOut->setPagetitle( htmlspecialchars( wfMsg( 'blockip' ) ) );
- $wgOut->addWikiText( htmlspecialchars( wfMsg( 'blockiptext' ) ) );
+ $wgOut->setPagetitle( wfMsg( 'blockip' ) );
+ $wgOut->addWikiText( wfMsg( 'blockiptext' ) );
- if ( is_null( $this->BlockExpiry ) || $this->BlockExpiry === '' ) {
- $this->BlockExpiry = $wgDefaultBlockExpiry;
+ if($wgSysopUserBans) {
+ $mIpaddress = wfMsgHtml( 'ipadressorusername' );
+ } else {
+ $mIpaddress = wfMsgHtml( 'ipaddress' );
}
-
- $mIpaddress = htmlspecialchars( wfMsg( 'ipaddress' ) );
- $mIpbexpiry = htmlspecialchars( wfMsg( 'ipbexpiry' ) );
- $mIpbreason = htmlspecialchars( wfMsg( 'ipbreason' ) );
- $mIpbsubmit = htmlspecialchars( wfMsg( 'ipbsubmit' ) );
+ $mIpbexpiry = wfMsgHtml( 'ipbexpiry' );
+ $mIpbother = wfMsgHtml( 'ipbother' );
+ $mIpbothertime = wfMsgHtml( 'ipbotheroption' );
+ $mIpbreason = wfMsgHtml( 'ipbreason' );
+ $mIpbsubmit = wfMsgHtml( 'ipbsubmit' );
$titleObj = Title::makeTitle( NS_SPECIAL, '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' ) );
+
+ $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'>
<input tabindex='1' type='text' size='20' name=\"wpBlockAddress\" value=\"{$scBlockAddress}\" />
</td>
</tr>
- <tr>
+ <tr>");
+ if ($showblockoptions) {
+ $wgOut->addHTML("
<td align=\"right\">{$mIpbexpiry}:</td>
<td align=\"left\">
- <input tabindex='2' type='text' size='20' name=\"wpBlockExpiry\" value=\"{$scBlockExpiry}\" />
+ <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>
</tr>
</table>
+ <input type='hidden' name='wpEditToken' value=\"{$token}\" />
</form>\n" );
}
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}';
}
} else {
# Username block
- if ( $wgSysopUserBans ) {
+ if ( $wgSysopUserBans ) {
$userId = User::idFromName( $this->BlockAddress );
if ( $userId == 0 ) {
$this->showForm( wfMsg( 'nosuchusershort', htmlspecialchars( $this->BlockAddress ) ) );
}
}
- if ( $this->BlockExpiry == 'infinite' || $this->BlockExpiry == 'indefinite' ) {
+ $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 = '';
} 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 );
}
-
- 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 );
-
- if (wfRunHooks('BlockIp', $ban, $wgUser)) {
-
+ $ban = new Block( $this->BlockAddress, $userId, $wgUser->getID(),
+ $this->BlockReason, wfTimestampNow(), 0, $expiry );
+
+ if (wfRunHooks('BlockIp', array(&$ban, &$wgUser))) {
+
$ban->insert();
-
- wfRunHooks('BlockIpComplete', $ban, $wgUser);
-
+
+ wfRunHooks('BlockIpComplete', array($ban, $wgUser));
+
# Make log entry
$log = new LogPage( 'block' );
- $log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ), $this->BlockReason );
+ $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='.$this->BlockAddress ) );
+ $wgOut->redirect( $titleObj->getFullURL( 'action=success&ip=' .
+ urlencode( $this->BlockAddress ) ) );
}
}
dépôts / lhc / web / wiklou.git / blobdiff