(bug 1331) Add "next page" link to bottom of Special:Allpages in chunk mode

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

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 4ca376b..626922b 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -46,15 +46,13 @@ class IPBlockForm {
                $this->BlockReason = $wgRequest->getText( 'wpBlockReason' );
                $this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry', wfMsg('ipbotheroption') );
                $this->BlockOther = $wgRequest->getVal( 'wpBlockOther', '' );
-               $this->BlockAnonOnly = $wgRequest->getBool( 'wpAnonOnly' );
 
                # Unchecked checkboxes are not included in the form data at all, so having one 
                # that is true by default is a bit tricky
-               if ( $wgRequest->wasPosted() ) {
-                       $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', false );
-               } else {
-                       $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', true );
-               }
+               $byDefault = !$wgRequest->wasPosted();
+               $this->BlockAnonOnly = $wgRequest->getBool( 'wpAnonOnly', $byDefault );
+               $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', $byDefault );
+               $this->BlockEnableAutoblock = $wgRequest->getBool( 'wpEnableAutoblock', $byDefault );
        }
 
        function showForm( $err ) {
@@ -73,9 +71,7 @@ class IPBlockForm {
                $mIpbothertime = wfMsgHtml( 'ipbotheroption' );
                $mIpbreason = wfMsgHtml( 'ipbreason' );
                $mIpbsubmit = wfMsgHtml( 'ipbsubmit' );
-               $mIpbanononly = wfMsgHtml( 'ipbanononly' );
-               $mIpbcreateaccount = wfMsgHtml( 'ipbcreateaccount' );
-               $titleObj = Title::makeTitle( NS_SPECIAL, 'Blockip' );
+               $titleObj = SpecialPage::getTitleFor( 'Blockip' );
                $action = $titleObj->escapeLocalURL( "action=submit" );
 
                if ( "" != $err ) {
@@ -84,12 +80,9 @@ class IPBlockForm {
                }
 
                $scBlockAddress = htmlspecialchars( $this->BlockAddress );
-               $scBlockExpiry = htmlspecialchars( $this->BlockExpiry );
                $scBlockReason = htmlspecialchars( $this->BlockReason );
                $scBlockOtherTime = htmlspecialchars( $this->BlockOther );
                $scBlockExpiryOptions = htmlspecialchars( wfMsgForContent( 'ipboptions' ) );
-               $anonOnlyChecked = $this->BlockAnonOnly ? 'checked' : '';
-               $createAccountChecked = $this->BlockCreateAccount ? 'checked' : '';
 
                $showblockoptions = $scBlockExpiryOptions != '-';
                if (!$showblockoptions)
@@ -146,31 +139,44 @@ class IPBlockForm {
                <tr>
                        <td>&nbsp;</td>
                        <td align=\"left\">
-                               <label>
-                               <input type='checkbox' name='wpAnonOnly' value='1' $anonOnlyChecked />
-                               {$mIpbanononly}
-                               </label>
+                               " . wfCheckLabel( wfMsg( 'ipbanononly' ),
+                                       'wpAnonOnly', 'wpAnonOnly', $this->BlockAnonOnly,
+                                       array( 'tabindex' => 4 ) ) . "
                        </td>
                </tr>
                <tr>
                        <td>&nbsp;</td>
                        <td align=\"left\">
-                               <label>
-                               <input type='checkbox' name='wpCreateAccount' value='1' $createAccountChecked />
-                               {$mIpbcreateaccount}
-                               </label>
+                               " . wfCheckLabel( wfMsg( 'ipbcreateaccount' ),
+                                       'wpCreateAccount', 'wpCreateAccount', $this->BlockCreateAccount,
+                                       array( 'tabindex' => 5 ) ) . "
                        </td>
                </tr>
+                <tr>
+                        <td>&nbsp;</td>
+                        <td align=\"left\">
+                                " . wfCheckLabel( wfMsg( 'ipbenableautoblock' ),
+                                        'wpEnableAutoblock', 'wpEnableAutoblock', $this->BlockEnableAutoblock,
+                                        array( 'tabindex' => 6 ) ) . "
+                        </td>
+                </tr>
                <tr>
                        <td style='padding-top: 1em'>&nbsp;</td>
                        <td style='padding-top: 1em' align=\"left\">
-                               <input tabindex='4' type='submit' name=\"wpBlock\" value=\"{$mIpbsubmit}\" />
+                               <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() {
@@ -182,6 +188,7 @@ class IPBlockForm {
 
                # 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 ) {
@@ -197,8 +204,12 @@ class IPBlockForm {
                        } else {
                                # Username block
                                if ( $wgSysopUserBans ) {
-                                       $userId = User::idFromName( $this->BlockAddress );
-                                       if ( $userId == 0 ) {
+                                       $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;
                                        }
@@ -237,7 +248,7 @@ class IPBlockForm {
 
                $block = new Block( $this->BlockAddress, $userId, $wgUser->getID(),
                        $this->BlockReason, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly, 
-                       $this->BlockCreateAccount );
+                       $this->BlockCreateAccount, $this->BlockEnableAutoblock );
 
                if (wfRunHooks('BlockIp', array(&$block, &$wgUser))) {
 
@@ -255,7 +266,7 @@ class IPBlockForm {
                          $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 ) ) );
                }
@@ -269,6 +280,14 @@ class IPBlockForm {
                $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 );
+       }
+       
 }
 
 ?>