* (bug 10636) Update Thai translation

[lhc/web/wiklou.git] / includes / SpecialBlockip.php

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index b434c0a..942ebe8 100644 (file)
--- 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,6 +61,7 @@ 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' ) ) ? 1 : 0;
        }
@@ -142,7 +144,7 @@ class IPBlockForm {
                        $blockReasonList .= $optgroup;
                }
 
-               $token = htmlspecialchars( $wgUser->editToken() );
+               $token = $wgUser->editToken();
 
                global $wgStylePath, $wgStyleVersion;
                $wgOut->addHTML( "
@@ -238,12 +240,27 @@ class IPBlockForm {
                        </tr>
                        ");
                }
+
+               global $wgSysopEmailBans;
+
+               if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
+                       $wgOut->addHTML("
+                       <tr id='wpEnableEmailBan'>
+                       <td>&nbsp;</td>
+                               <td>
+                                       " . wfCheckLabel( wfMsgHtml( 'ipbemailban' ),
+                                                       'wpEmailBan', 'wpEmailBan', $this->BlockEmail,
+                                                               array( 'tabindex' => '10' )) . "
+                               </td>
+                       </tr>
+                       ");
+               }
                $wgOut->addHTML("
                <tr>
                        <td style='padding-top: 1em'>&nbsp;</td>
                        <td style='padding-top: 1em'>
                                " . Xml::submitButton( wfMsg( 'ipbsubmit' ),
-                                                       array( 'name' => 'wpBlock', 'tabindex' => '10' ) ) . "
+                                                       array( 'name' => 'wpBlock', 'tabindex' => '11' ) ) . "
                        </td>
                </tr>
        </table>" .
@@ -356,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))) {
 
@@ -420,6 +437,8 @@ class IPBlockForm {
                        $flags[] = 'nocreate';
                if( !$this->BlockEnableAutoblock )
                        $flags[] = 'noautoblock';
+               if ( $this->BlockEmail )
+                       $flags[] = 'noemail';
                return implode( ',', $flags );
        }
 
@@ -473,4 +492,4 @@ class IPBlockForm {
                }
        }
 }
-?>
+