diff options
Diffstat (limited to 'includes/SpecialBlockip.php')
| -rw-r--r-- | includes/SpecialBlockip.php | 69 |
1 files changed, 45 insertions, 24 deletions
diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php index 5f47fa13..942ebe8b 100644 --- a/includes/SpecialBlockip.php +++ b/includes/SpecialBlockip.php @@ -43,6 +43,7 @@ function wfSpecialBlockip( $par ) { */ class IPBlockForm { var $BlockAddress, $BlockExpiry, $BlockReason; +# var $BlockEmail; function IPBlockForm( $par ) { global $wgRequest, $wgUser; @@ -60,12 +61,13 @@ 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 ); # Re-check user's rights to hide names, very serious, defaults to 0 - $this->BlockHideName = $wgRequest->getBool( 'wpHideName', 0 ) && $wgUser->isAllowed( 'hideuser' ); + $this->BlockHideName = ( $wgRequest->getBool( 'wpHideName', 0 ) && $wgUser->isAllowed( 'hideuser' ) ) ? 1 : 0; } function showForm( $err ) { - global $wgOut, $wgUser, $wgSysopUserBans; + global $wgOut, $wgUser, $wgSysopUserBans, $wgContLang; $wgOut->setPagetitle( wfMsg( 'blockip' ) ); $wgOut->addWikiText( wfMsg( 'blockiptext' ) ); @@ -84,6 +86,7 @@ class IPBlockForm { $titleObj = SpecialPage::getTitleFor( 'Blockip' ); $action = $titleObj->escapeLocalURL( "action=submit" ); + $alignRight = $wgContLang->isRtl() ? 'left' : 'right'; if ( "" != $err ) { $wgOut->setSubtitle( wfMsgHtml( 'formerror' ) ); @@ -141,7 +144,7 @@ class IPBlockForm { $blockReasonList .= $optgroup; } - $token = htmlspecialchars( $wgUser->editToken() ); + $token = $wgUser->editToken(); global $wgStylePath, $wgStyleVersion; $wgOut->addHTML( " @@ -150,8 +153,8 @@ class IPBlockForm { <form id=\"blockip\" method=\"post\" action=\"{$action}\"> <table border='0'> <tr> - <td align=\"right\">{$mIpaddress}:</td> - <td align=\"left\"> + <td align=\"$alignRight\">{$mIpaddress}</td> + <td> " . Xml::input( 'wpBlockAddress', 45, $this->BlockAddress, array( 'tabindex' => '1', @@ -162,8 +165,8 @@ class IPBlockForm { <tr>"); if ($showblockoptions) { $wgOut->addHTML(" - <td align=\"right\">{$mIpbexpiry}:</td> - <td align=\"left\"> + <td align=\"$alignRight\">{$mIpbexpiry}</td> + <td> <select tabindex='2' id='wpBlockExpiry' name=\"wpBlockExpiry\" onchange=\"considerChangingExpiryFocus()\"> $blockExpiryFormOptions </select> @@ -173,8 +176,8 @@ class IPBlockForm { $wgOut->addHTML(" </tr> <tr id='wpBlockOther'> - <td align=\"right\">{$mIpbother}:</td> - <td align=\"left\"> + <td align=\"$alignRight\">{$mIpbother}</td> + <td> " . Xml::input( 'wpBlockOther', 45, $this->BlockOther, array( 'tabindex' => '3', 'id' => 'mw-bi-other' ) ) . " </td> @@ -182,8 +185,8 @@ class IPBlockForm { if ( $blockReasonList != '' ) { $wgOut->addHTML(" <tr> - <td align=\"right\">{$mIpbreasonother}:</td> - <td align=\"left\"> + <td align=\"$alignRight\">{$mIpbreasonother}</td> + <td> <select tabindex='4' id=\"wpBlockReasonList\" name=\"wpBlockReasonList\"> $blockReasonList </select> @@ -192,15 +195,16 @@ class IPBlockForm { } $wgOut->addHTML(" <tr id=\"wpBlockReason\"> - <td align=\"right\">{$mIpbreason}:</td> - <td align=\"left\"> + <td align=\"$alignRight\">{$mIpbreason}</td> + <td> " . Xml::input( 'wpBlockReason', 45, $this->BlockReason, - array( 'tabindex' => '5', 'id' => 'mw-bi-reason' ) ) . " + array( 'tabindex' => '5', 'id' => 'mw-bi-reason', + 'maxlength'=> '200' ) ) . " </td> </tr> <tr id='wpAnonOnlyRow'> <td> </td> - <td align=\"left\"> + <td> " . wfCheckLabel( wfMsgHtml( 'ipbanononly' ), 'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly, array( 'tabindex' => '6' ) ) . " @@ -208,7 +212,7 @@ class IPBlockForm { </tr> <tr id='wpCreateAccountRow'> <td> </td> - <td align=\"left\"> + <td> " . wfCheckLabel( wfMsgHtml( 'ipbcreateaccount' ), 'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount, array( 'tabindex' => '7' ) ) . " @@ -216,7 +220,7 @@ class IPBlockForm { </tr> <tr id='wpEnableAutoblockRow'> <td> </td> - <td align=\"left\"> + <td> " . wfCheckLabel( wfMsgHtml( 'ipbenableautoblock' ), 'wpEnableAutoblock', 'wpEnableAutoblock', $this->BlockEnableAutoblock, array( 'tabindex' => '8' ) ) . " @@ -228,7 +232,7 @@ class IPBlockForm { $wgOut->addHTML(" <tr> <td> </td> - <td align=\"left\"> + <td> " . wfCheckLabel( wfMsgHtml( 'ipbhidename' ), 'wpHideName', 'wpHideName', $this->BlockHideName, array( 'tabindex' => '9' ) ) . " @@ -236,12 +240,27 @@ class IPBlockForm { </tr> "); } + + global $wgSysopEmailBans; + + if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) { + $wgOut->addHTML(" + <tr id='wpEnableEmailBan'> + <td> </td> + <td> + " . wfCheckLabel( wfMsgHtml( 'ipbemailban' ), + 'wpEmailBan', 'wpEmailBan', $this->BlockEmail, + array( 'tabindex' => '10' )) . " + </td> + </tr> + "); + } $wgOut->addHTML(" <tr> <td style='padding-top: 1em'> </td> - <td style='padding-top: 1em' align=\"left\"> - " . Xml::submitButton( wfMsgHtml( 'ipbsubmit' ), - array( 'name' => 'wpBlock', 'tabindex' => '10' ) ) . " + <td style='padding-top: 1em'> + " . Xml::submitButton( wfMsg( 'ipbsubmit' ), + array( 'name' => 'wpBlock', 'tabindex' => '11' ) ) . " </td> </tr> </table>" . @@ -354,10 +373,10 @@ class IPBlockForm { # Create block # Note: for a user block, ipb_address is only for display purposes - $block = new Block( $this->BlockAddress, $userId, $wgUser->getID(), $reasonstr, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly, - $this->BlockCreateAccount, $this->BlockEnableAutoblock, $this->BlockHideName); + $this->BlockCreateAccount, $this->BlockEnableAutoblock, $this->BlockHideName, + $this->BlockEmail); if (wfRunHooks('BlockIp', array(&$block, &$wgUser))) { @@ -418,6 +437,8 @@ class IPBlockForm { $flags[] = 'nocreate'; if( !$this->BlockEnableAutoblock ) $flags[] = 'noautoblock'; + if ( $this->BlockEmail ) + $flags[] = 'noemail'; return implode( ',', $flags ); } @@ -471,4 +492,4 @@ class IPBlockForm { } } } -?> + |