function wfSpecialBlockip( $par ) {
global $wgUser, $wgOut, $wgRequest;
- if ( ! $wgUser->isAllowed('block') ) {
- $wgOut->sysopRequired();
+ if( !$wgUser->isAllowed( 'block' ) ) {
+ $wgOut->permissionRequired( 'block' );
return;
}
+
$ipb = new IPBlockForm( $par );
$action = $wgRequest->getVal( 'action' );
$this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry', wfMsg('ipbotheroption') );
$this->BlockOther = $wgRequest->getVal( 'wpBlockOther', '' );
}
-
+
function showForm( $err ) {
- global $wgOut, $wgUser, $wgLang;
- global $wgRequest, $wgSysopUserBans;
+ global $wgOut, $wgUser, $wgRequest, $wgSysopUserBans;
$wgOut->setPagetitle( wfMsg( 'blockip' ) );
$wgOut->addWikiText( wfMsg( 'blockiptext' ) );
}
$token = htmlspecialchars( $wgUser->editToken() );
-
+
$wgOut->addHTML( "
<form id=\"blockip\" method=\"post\" action=\"{$action}\">
<table border='0'>
}
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 ( $expirestr == 'infinite' || $expirestr == 'indefinite' ) {
$expiry = '';
} else {
- # Convert GNU-style date, returns -1 on error
+ # 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 );
}
-
+
# Create block
# Note: for a user block, ipb_address is only for display purposes
- $ban = new Block( $this->BlockAddress, $userId, $wgUser->getID(),
+ $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));
-
+
# Make log entry
$log = new LogPage( 'block' );
- $log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ),
+ $log->addEntry( 'block', Title::makeTitle( NS_USER, $this->BlockAddress ),
$this->BlockReason, $expirestr );
# Report to the user