* (bug 15196) Free external links should be numbered in a localised manner

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

diff --git a/includes/Block.php b/includes/Block.php
index 092b8e8..7efdab9 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -16,7 +16,7 @@
 class Block {
        /* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry,
                                $mRangeStart, $mRangeEnd, $mAnonOnly, $mEnableAutoblock, $mHideName,
-                               $mBlockEmail, $mByName, $mAngryAutoblock;
+                               $mBlockEmail, $mByName, $mAngryAutoblock, $mAllowUsertalk;
        /* private */ var $mNetworkBits, $mIntegerAddr, $mForUpdate, $mFromMaster;
 
        const EB_KEEP_EXPIRED = 1;
@@ -25,7 +25,7 @@ class Block {
 
        function __construct( $address = '', $user = 0, $by = 0, $reason = '',
                $timestamp = '' , $auto = 0, $expiry = '', $anonOnly = 0, $createAccount = 0, $enableAutoblock = 0,
-               $hideName = 0, $blockEmail = 0 )
+               $hideName = 0, $blockEmail = 0, $allowUsertalk = 0 )
        {
                $this->mId = 0;
                # Expand valid IPv6 addresses
@@ -42,6 +42,7 @@ class Block {
                $this->mEnableAutoblock = $enableAutoblock;
                $this->mHideName = $hideName;
                $this->mBlockEmail = $blockEmail;
+               $this->mAllowUsertalk = $allowUsertalk;
                $this->mForUpdate = false;
                $this->mFromMaster = false;
                $this->mByName = false;
@@ -60,7 +61,7 @@ class Block {
         * @param $killExpired bool Delete expired blocks on load
         */
        static function newFromDB( $address, $user = 0, $killExpired = true ) {
-               $block = new Block();
+               $block = new Block;
                $block->load( $address, $user, $killExpired );
                if ( $block->isValid() ) {
                        return $block;
@@ -79,7 +80,7 @@ class Block {
                $dbr = wfGetDB( DB_SLAVE );
                $res = $dbr->resultObject( $dbr->select( 'ipblocks', '*',
                        array( 'ipb_id' => $id ), __METHOD__ ) );
-               $block = new Block();
+               $block = new Block;
                if ( $block->loadFromResult( $res ) ) {
                        return $block;
                } else {
@@ -95,7 +96,7 @@ class Block {
                $this->mAddress = $this->mReason = $this->mTimestamp = '';
                $this->mId = $this->mAnonOnly = $this->mCreateAccount =
                        $this->mEnableAutoblock = $this->mAuto = $this->mUser =
-                       $this->mBy = $this->mHideName = $this->mBlockEmail = 0;
+                       $this->mBy = $this->mHideName = $this->mBlockEmail = $this->mAllowUsertalk = 0;
                $this->mByName = false;
        }
 
@@ -162,8 +163,9 @@ class Block {
                                if ( $user && $this->mAnonOnly ) {
                                        # Block is marked anon-only
                                        # Whitelist this IP address against autoblocks and range blocks
+                                       # (but not account creation blocks -- bug 13611)
                                        if( !$this->mCreateAccount ) {
-                                               $this->clear(); // bug 13611 - keep this data
+                                               $this->clear();
                                        }
                                        return false;
                                } else {
@@ -175,8 +177,9 @@ class Block {
                # Try range block
                if ( $this->loadRange( $address, $killExpired, $user ) ) {
                        if ( $user && $this->mAnonOnly ) {
+                               # Respect account creation blocks on logged-in users -- bug 13611
                                if( !$this->mCreateAccount ) {
-                                       $this->clear(); // bug 13611 - keep this data
+                                       $this->clear();
                                }
                                return false;
                        } else {
@@ -301,6 +304,7 @@ class Block {
                $this->mCreateAccount = $row->ipb_create_account;
                $this->mEnableAutoblock = $row->ipb_enable_autoblock;
                $this->mBlockEmail = $row->ipb_block_email;
+               $this->mAllowUsertalk = $row->ipb_allow_usertalk;
                $this->mHideName = $row->ipb_deleted;
                $this->mId = $row->ipb_id;
                $this->mExpiry = self::decodeExpiry( $row->ipb_expiry );
@@ -336,7 +340,7 @@ class Block {
        /*static*/ function enumBlocks( $callback, $tag, $flags = 0 ) {
                global $wgAntiLockFlags;
 
-               $block = new Block();
+               $block = new Block;
                if ( $flags & Block::EB_FOR_UPDATE ) {
                        $db = wfGetDB( DB_MASTER );
                        if ( $wgAntiLockFlags & ALF_NO_BLOCK_LOCK ) {
@@ -435,7 +439,8 @@ class Block {
                                'ipb_range_start' => $this->mRangeStart,
                                'ipb_range_end' => $this->mRangeEnd,
                                'ipb_deleted'   => $this->mHideName,
-                               'ipb_block_email' => $this->mBlockEmail
+                               'ipb_block_email' => $this->mBlockEmail,
+                               'ipb_allow_usertalk' => $this->mAllowUsertalk
                        ), 'Block::insert', array( 'IGNORE' )
                );
                $affected = $dbw->affectedRows();
@@ -471,7 +476,8 @@ class Block {
                                'ipb_range_start' => $this->mRangeStart,
                                'ipb_range_end' => $this->mRangeEnd,
                                'ipb_deleted'   => $this->mHideName,
-                               'ipb_block_email' => $this->mBlockEmail ),
+                               'ipb_block_email' => $this->mBlockEmail,
+                               'ipb_allow_usertalk' => $this->mAllowUsertalk ),
                        array( 'ipb_id' => $this->mId ),
                        'Block::update' );