Pasting lines typo in r80025
[lhc/web/wiklou.git] / includes / Block.php
index b9459d5..162188c 100644 (file)
  *
  * @todo This could be used everywhere, but it isn't.
  */
-class Block
-{
+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,8 +24,8 @@ class Block
        const EB_RANGE_ONLY = 4;
 
        function __construct( $address = '', $user = 0, $by = 0, $reason = '',
-               $timestamp = '' , $auto = 0, $expiry = '', $anonOnly = 0, $createAccount = 0, $enableAutoblock = 0,
-               $hideName = 0, $blockEmail = 0 )
+               $timestamp = 0, $auto = 0, $expiry = '', $anonOnly = 0, $createAccount = 0, $enableAutoblock = 0,
+               $hideName = 0, $blockEmail = 0, $allowUsertalk = 0, $byName = false )
        {
                $this->mId = 0;
                # Expand valid IPv6 addresses
@@ -35,7 +34,7 @@ class Block
                $this->mUser = $user;
                $this->mBy = $by;
                $this->mReason = $reason;
-               $this->mTimestamp = wfTimestamp(TS_MW,$timestamp);
+               $this->mTimestamp = wfTimestamp( TS_MW, $timestamp );
                $this->mAuto = $auto;
                $this->mAnonOnly = $anonOnly;
                $this->mCreateAccount = $createAccount;
@@ -43,26 +42,28 @@ class Block
                $this->mEnableAutoblock = $enableAutoblock;
                $this->mHideName = $hideName;
                $this->mBlockEmail = $blockEmail;
+               $this->mAllowUsertalk = $allowUsertalk;
                $this->mForUpdate = false;
                $this->mFromMaster = false;
-               $this->mByName = false;
+               $this->mByName = $byName;
                $this->mAngryAutoblock = false;
                $this->initialiseRange();
        }
 
        /**
         * Load a block from the database, using either the IP address or
-        * userid.
-        * 
+        * user ID. Tries the user ID first, and if that doesn't work, tries
+        * the address.
+        *
+        * @param $address String: IP address of user/anon
+        * @param $user Integer: user id of user
+        * @param $killExpired Boolean: delete expired blocks on load
         * @return Block Object
-        * @param $address string IP address of user/anon
-        * @param $user int User id of user
-        * @param $killExpired bool Delete expired blocks on load
         */
-       static function newFromDB( $address, $user = 0, $killExpired = true )
-       {
-               $block = new Block();
+       public static function newFromDB( $address, $user = 0, $killExpired = true ) {
+               $block = new Block;
                $block->load( $address, $user, $killExpired );
+
                if ( $block->isValid() ) {
                        return $block;
                } else {
@@ -72,15 +73,16 @@ class Block
 
        /**
         * Load a blocked user from their block id.
+        *
+        * @param $id Integer: Block id to search for
         * @return Block object
-        * @param $id int Block id to search for
         */
-       static function newFromID( $id )
-       {
+       public static function newFromID( $id ) {
                $dbr = wfGetDB( DB_SLAVE );
                $res = $dbr->resultObject( $dbr->select( 'ipblocks', '*',
                        array( 'ipb_id' => $id ), __METHOD__ ) );
                $block = new Block;
+
                if ( $block->loadFromResult( $res ) ) {
                        return $block;
                } else {
@@ -88,28 +90,52 @@ class Block
                }
        }
 
+       /**
+        * Check if two blocks are effectively equal
+        *
+        * @return Boolean
+        */
+       public function equals( Block $block ) {
+               return (
+                       $this->mAddress == $block->mAddress
+                       && $this->mUser == $block->mUser
+                       && $this->mAuto == $block->mAuto
+                       && $this->mAnonOnly == $block->mAnonOnly
+                       && $this->mCreateAccount == $block->mCreateAccount
+                       && $this->mExpiry == $block->mExpiry
+                       && $this->mEnableAutoblock == $block->mEnableAutoblock
+                       && $this->mHideName == $block->mHideName
+                       && $this->mBlockEmail == $block->mBlockEmail
+                       && $this->mAllowUsertalk == $block->mAllowUsertalk
+                       && $this->mReason == $block->mReason
+               );
+       }
+
        /**
         * Clear all member variables in the current object. Does not clear
         * the block from the DB.
         */
-       function clear()
-       {
+       public function clear() {
                $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;
        }
 
        /**
-        * Get the DB object and set the reference parameter to the query options
+        * Get the DB object and set the reference parameter to the select options.
+        * The options array will contain FOR UPDATE if appropriate.
+        *
+        * @param $options Array
         * @return Database
         */
-       function &getDBOptions( &$options ) {
+       protected function &getDBOptions( &$options ) {
                global $wgAntiLockFlags;
+
                if ( $this->mForUpdate || $this->mFromMaster ) {
                        $db = wfGetDB( DB_MASTER );
-                       if ( !$this->mForUpdate || ($wgAntiLockFlags & ALF_NO_BLOCK_LOCK) ) {
+                       if ( !$this->mForUpdate || ( $wgAntiLockFlags & ALF_NO_BLOCK_LOCK ) ) {
                                $options = array();
                        } else {
                                $options = array( 'FOR UPDATE' );
@@ -118,27 +144,29 @@ class Block
                        $db = wfGetDB( DB_SLAVE );
                        $options = array();
                }
+
                return $db;
        }
 
        /**
-        * Get a ban from the DB, with either the given address or the given username
+        * Get a block from the DB, with either the given address or the given username
         *
         * @param $address string The IP address of the user, or blank to skip IP blocks
         * @param $user int The user ID, or zero for anonymous users
         * @param $killExpired bool Whether to delete expired rows while loading
+        * @return Boolean: the user is blocked from editing
         *
         */
-       function load( $address = '', $user = 0, $killExpired = true )
-       {
+       public function load( $address = '', $user = 0, $killExpired = true ) {
                wfDebug( "Block::load: '$address', '$user', $killExpired\n" );
 
                $options = array();
-               $db =& $this->getDBOptions( $options );
+               $db = $this->getDBOptions( $options );
 
-               if ( 0 == $user && $address == '' ) {
+               if ( 0 == $user && $address === '' ) {
                        # Invalid user specification, not blocked
                        $this->clear();
+
                        return false;
                }
 
@@ -146,6 +174,7 @@ class Block
                if ( $user ) {
                        $res = $db->resultObject( $db->select( 'ipblocks', '*', array( 'ipb_user' => $user ),
                                __METHOD__, $options ) );
+
                        if ( $this->loadFromResult( $res, $killExpired ) ) {
                                return true;
                        }
@@ -154,14 +183,19 @@ class Block
                # Try IP block
                # TODO: improve performance by merging this query with the autoblock one
                # Slightly tricky while handling killExpired as well
-               if ( $address ) {
+               if ( $address !== '' ) {
                        $conds = array( 'ipb_address' => $address, 'ipb_auto' => 0 );
                        $res = $db->resultObject( $db->select( 'ipblocks', '*', $conds, __METHOD__, $options ) );
+
                        if ( $this->loadFromResult( $res, $killExpired ) ) {
                                if ( $user && $this->mAnonOnly ) {
                                        # Block is marked anon-only
                                        # Whitelist this IP address against autoblocks and range blocks
-                                       $this->clear();
+                                       # (but not account creation blocks -- bug 13611)
+                                       if ( !$this->mCreateAccount ) {
+                                               $this->clear();
+                                       }
+
                                        return false;
                                } else {
                                        return true;
@@ -172,7 +206,11 @@ class Block
                # Try range block
                if ( $this->loadRange( $address, $killExpired, $user ) ) {
                        if ( $user && $this->mAnonOnly ) {
-                               $this->clear();
+                               # Respect account creation blocks on logged-in users -- bug 13611
+                               if ( !$this->mCreateAccount ) {
+                                       $this->clear();
+                               }
+
                                return false;
                        } else {
                                return true;
@@ -182,10 +220,13 @@ class Block
                # Try autoblock
                if ( $address ) {
                        $conds = array( 'ipb_address' => $address, 'ipb_auto' => 1 );
+
                        if ( $user ) {
                                $conds['ipb_anon_only'] = 0;
                        }
+
                        $res = $db->resultObject( $db->select( 'ipblocks', '*', $conds, __METHOD__, $options ) );
+
                        if ( $this->loadFromResult( $res, $killExpired ) ) {
                                return true;
                        }
@@ -198,13 +239,14 @@ class Block
 
        /**
         * Fill in member variables from a result wrapper
-        * @return bool
-        * @param $res ResultWrapper Row from the ipblocks table
-        * @param $killExpired bool Whether to delete expired rows while loading
+        *
+        * @param $res ResultWrapper: row from the ipblocks table
+        * @param $killExpired Boolean: whether to delete expired rows while loading
+        * @return Boolean
         */
-       function loadFromResult( ResultWrapper $res, $killExpired = true )
-       {
+       protected function loadFromResult( ResultWrapper $res, $killExpired = true ) {
                $ret = false;
+
                if ( 0 != $res->numRows() ) {
                        # Get first block
                        $row = $res->fetchObject();
@@ -231,20 +273,22 @@ class Block
                        }
                }
                $res->free();
+
                return $ret;
        }
 
        /**
         * Search the database for any range blocks matching the given address, and
         * load the row if one is found.
-        * @return bool
-        * @param $address string IP address range
-        * @param $killExpired bool Whether to delete expired rows while loading
-        * @param $userid int If not 0, then sets ipb_anon_only
+        *
+        * @param $address String: IP address range
+        * @param $killExpired Boolean: whether to delete expired rows while loading
+        * @param $user Integer: if not 0, then sets ipb_anon_only
+        * @return Boolean
         */
-       function loadRange( $address, $killExpired = true, $user = 0 )
-       {
+       public function loadRange( $address, $killExpired = true, $user = 0 ) {
                $iaddr = IP::toHex( $address );
+
                if ( $iaddr === false ) {
                        # Invalid address
                        return false;
@@ -255,9 +299,9 @@ class Block
                $range = substr( $iaddr, 0, 4 );
 
                $options = array();
-               $db =& $this->getDBOptions( $options );
+               $db = $this->getDBOptions( $options );
                $conds = array(
-                       "ipb_range_start LIKE '$range%'",
+                       'ipb_range_start' . $db->buildLike( $range, $db->anyString() ),
                        "ipb_range_start <= '$iaddr'",
                        "ipb_range_end >= '$iaddr'"
                );
@@ -268,27 +312,20 @@ class Block
 
                $res = $db->resultObject( $db->select( 'ipblocks', '*', $conds, __METHOD__, $options ) );
                $success = $this->loadFromResult( $res, $killExpired );
-               return $success;
-       }
 
-       /**
-        * Determine if a given integer IPv4 address is in a given CIDR network
-        * @deprecated Use IP::isInRange
-        */
-       function isAddressInRange( $addr, $range ) {
-               return IP::isInRange( $addr, $range );
+               return $success;
        }
 
        /**
         * Given a database row from the ipblocks table, initialize
         * member variables
-        * @param $row ResultWrapper A row from the ipblocks table
+        *
+        * @param $row ResultWrapper: a row from the ipblocks table
         */
-       function initFromRow( $row )
-       {
+       public function initFromRow( $row ) {
                $this->mAddress = $row->ipb_address;
                $this->mReason = $row->ipb_reason;
-               $this->mTimestamp = wfTimestamp(TS_MW,$row->ipb_timestamp);
+               $this->mTimestamp = wfTimestamp( TS_MW, $row->ipb_timestamp );
                $this->mUser = $row->ipb_user;
                $this->mBy = $row->ipb_by;
                $this->mAuto = $row->ipb_auto;
@@ -296,24 +333,26 @@ 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 );
+
                if ( isset( $row->user_name ) ) {
                        $this->mByName = $row->user_name;
                } else {
                        $this->mByName = $row->ipb_by_text;
                }
+
                $this->mRangeStart = $row->ipb_range_start;
                $this->mRangeEnd = $row->ipb_range_end;
        }
 
        /**
-        * Once $mAddress has been set, get the range they came from. 
+        * Once $mAddress has been set, get the range they came from.
         * Wrapper for IP::parseRange
         */
-       function initialiseRange()
-       {
+       protected function initialiseRange() {
                $this->mRangeStart = '';
                $this->mRangeEnd = '';
 
@@ -322,114 +361,47 @@ class Block
                }
        }
 
-       /**
-        * Callback with a Block object for every block
-        * @return integer number of blocks;
-        */
-       /*static*/ function enumBlocks( $callback, $tag, $flags = 0 )
-       {
-               global $wgAntiLockFlags;
-
-               $block = new Block();
-               if ( $flags & Block::EB_FOR_UPDATE ) {
-                       $db = wfGetDB( DB_MASTER );
-                       if ( $wgAntiLockFlags & ALF_NO_BLOCK_LOCK ) {
-                               $options = '';
-                       } else {
-                               $options = 'FOR UPDATE';
-                       }
-                       $block->forUpdate( true );
-               } else {
-                       $db = wfGetDB( DB_SLAVE );
-                       $options = '';
-               }
-               if ( $flags & Block::EB_RANGE_ONLY ) {
-                       $cond = " AND ipb_range_start <> ''";
-               } else {
-                       $cond = '';
-               }
-
-               $now = wfTimestampNow();
-
-               list( $ipblocks, $user ) = $db->tableNamesN( 'ipblocks', 'user' );
-
-               $sql = "SELECT $ipblocks.*,user_name FROM $ipblocks,$user " .
-                       "WHERE user_id=ipb_by $cond ORDER BY ipb_timestamp DESC $options";
-               $res = $db->query( $sql, 'Block::enumBlocks' );
-               $num_rows = $db->numRows( $res );
-
-               while ( $row = $db->fetchObject( $res ) ) {
-                       $block->initFromRow( $row );
-                       if ( ( $flags & Block::EB_RANGE_ONLY ) && $block->mRangeStart == '' ) {
-                               continue;
-                       }
-
-                       if ( !( $flags & Block::EB_KEEP_EXPIRED ) ) {
-                               if ( $block->mExpiry && $now > $block->mExpiry ) {
-                                       $block->delete();
-                               } else {
-                                       call_user_func( $callback, $block, $tag );
-                               }
-                       } else {
-                               call_user_func( $callback, $block, $tag );
-                       }
-               }
-               $db->freeResult( $res );
-               return $num_rows;
-       }
-
        /**
         * Delete the row from the IP blocks table.
-        * @return bool
+        *
+        * @return Boolean
         */
-       function delete()
-       {
-               if (wfReadOnly()) {
+       public function delete() {
+               if ( wfReadOnly() ) {
                        return false;
                }
+
                if ( !$this->mId ) {
                        throw new MWException( "Block::delete() now requires that the mId member be filled\n" );
                }
 
                $dbw = wfGetDB( DB_MASTER );
                $dbw->delete( 'ipblocks', array( 'ipb_id' => $this->mId ), __METHOD__ );
+
                return $dbw->affectedRows() > 0;
        }
 
        /**
-       * Insert a block into the block table.
-       * @return bool Whether or not the insertion was successful.
-       */
-       function insert()
-       {
+        * Insert a block into the block table. Will fail if there is a conflicting
+        * block (same name and options) already in the database.
+        *
+        * @return Boolean: whether or not the insertion was successful.
+        */
+       public function insert( $dbw = null ) {
                wfDebug( "Block::insert; timestamp {$this->mTimestamp}\n" );
-               $dbw = wfGetDB( DB_MASTER );
-
-               # Unset ipb_anon_only for user blocks, makes no sense
-               if ( $this->mUser ) {
-                       $this->mAnonOnly = 0;
-               }
 
-               # Unset ipb_enable_autoblock for IP blocks, makes no sense
-               if ( !$this->mUser ) {
-                       $this->mEnableAutoblock = 0;
-                       $this->mBlockEmail = 0; //Same goes for email...
-               }
+               if ( $dbw === null )
+                       $dbw = wfGetDB( DB_MASTER );
 
-               if( !$this->mByName ) {
-                       if( $this->mBy ) {
-                               $this->mByName = User::whoIs( $this->mBy );
-                       } else {
-                               global $wgUser;
-                               $this->mByName = $wgUser->getName();
-                       }
-               }
+               $this->validateBlockParams();
+               $this->initialiseRange();
 
                # Don't collide with expired blocks
                Block::purgeExpired();
 
-               $ipb_id = $dbw->nextSequenceValue('ipblocks_ipb_id_val');
-               $dbw->insert( 'ipblocks',
+               $ipb_id = $dbw->nextSequenceValue( 'ipblocks_ipb_id_seq' );
+               $dbw->insert(
+                       'ipblocks',
                        array(
                                'ipb_id' => $ipb_id,
                                'ipb_address' => $this->mAddress,
@@ -437,7 +409,7 @@ class Block
                                'ipb_by' => $this->mBy,
                                'ipb_by_text' => $this->mByName,
                                'ipb_reason' => $this->mReason,
-                               'ipb_timestamp' => $dbw->timestamp($this->mTimestamp),
+                               'ipb_timestamp' => $dbw->timestamp( $this->mTimestamp ),
                                'ipb_auto' => $this->mAuto,
                                'ipb_anon_only' => $this->mAnonOnly,
                                'ipb_create_account' => $this->mCreateAccount,
@@ -445,37 +417,107 @@ class Block
                                'ipb_expiry' => self::encodeExpiry( $this->mExpiry, $dbw ),
                                'ipb_range_start' => $this->mRangeStart,
                                'ipb_range_end' => $this->mRangeEnd,
-                               'ipb_deleted'   => $this->mHideName,
-                               'ipb_block_email' => $this->mBlockEmail
-                       ), 'Block::insert', array( 'IGNORE' )
+                               'ipb_deleted'   => intval( $this->mHideName ), // typecast required for SQLite
+                               'ipb_block_email' => $this->mBlockEmail,
+                               'ipb_allow_usertalk' => $this->mAllowUsertalk
+                       ),
+                       'Block::insert',
+                       array( 'IGNORE' )
                );
                $affected = $dbw->affectedRows();
 
-               if ($affected)
+               if ( $affected )
                        $this->doRetroactiveAutoblock();
 
-               return $affected;
+               return (bool)$affected;
        }
 
        /**
-       * Retroactively autoblocks the last IP used by the user (if it is a user)
-       * blocked by this Block.
-       * @return bool Whether or not a retroactive autoblock was made.
-       */
-       function doRetroactiveAutoblock() {
+        * Update a block in the DB with new parameters.
+        * The ID field needs to be loaded first.
+        */
+       public function update() {
+               wfDebug( "Block::update; timestamp {$this->mTimestamp}\n" );
+               $dbw = wfGetDB( DB_MASTER );
+
+               $this->validateBlockParams();
+
+               $dbw->update(
+                       'ipblocks',
+                       array(
+                               'ipb_user' => $this->mUser,
+                               'ipb_by' => $this->mBy,
+                               'ipb_by_text' => $this->mByName,
+                               'ipb_reason' => $this->mReason,
+                               'ipb_timestamp' => $dbw->timestamp( $this->mTimestamp ),
+                               'ipb_auto' => $this->mAuto,
+                               'ipb_anon_only' => $this->mAnonOnly,
+                               'ipb_create_account' => $this->mCreateAccount,
+                               'ipb_enable_autoblock' => $this->mEnableAutoblock,
+                               'ipb_expiry' => self::encodeExpiry( $this->mExpiry, $dbw ),
+                               'ipb_range_start' => $this->mRangeStart,
+                               'ipb_range_end' => $this->mRangeEnd,
+                               'ipb_deleted'   => $this->mHideName,
+                               'ipb_block_email' => $this->mBlockEmail,
+                               'ipb_allow_usertalk' => $this->mAllowUsertalk
+                       ),
+                       array( 'ipb_id' => $this->mId ),
+                       'Block::update'
+               );
+
+               return $dbw->affectedRows();
+       }
+
+       /**
+        * Make sure all the proper members are set to sane values
+        * before adding/updating a block
+        */
+       protected function validateBlockParams() {
+               # Unset ipb_anon_only for user blocks, makes no sense
+               if ( $this->mUser ) {
+                       $this->mAnonOnly = 0;
+               }
+
+               # Unset ipb_enable_autoblock for IP blocks, makes no sense
+               if ( !$this->mUser ) {
+                       $this->mEnableAutoblock = 0;
+               }
+
+               # bug 18860: non-anon-only IP blocks should be allowed to block email
+               if ( !$this->mUser && $this->mAnonOnly ) {
+                       $this->mBlockEmail = 0;
+               }
+
+               if ( !$this->mByName ) {
+                       if ( $this->mBy ) {
+                               $this->mByName = User::whoIs( $this->mBy );
+                       } else {
+                               global $wgUser;
+                               $this->mByName = $wgUser->getName();
+                       }
+               }
+       }
+
+       /**
+        * Retroactively autoblocks the last IP used by the user (if it is a user)
+        * blocked by this Block.
+        *
+        * @return Boolean: whether or not a retroactive autoblock was made.
+        */
+       public function doRetroactiveAutoblock() {
                $dbr = wfGetDB( DB_SLAVE );
-               #If autoblock is enabled, autoblock the LAST IP used
+               # If autoblock is enabled, autoblock the LAST IP used
                # - stolen shamelessly from CheckUser_body.php
 
-               if ($this->mEnableAutoblock && $this->mUser) {
-                       wfDebug("Doing retroactive autoblocks for " . $this->mAddress . "\n");
-                       
+               if ( $this->mEnableAutoblock && $this->mUser ) {
+                       wfDebug( "Doing retroactive autoblocks for " . $this->mAddress . "\n" );
+
                        $options = array( 'ORDER BY' => 'rc_timestamp DESC' );
                        $conds = array( 'rc_user_text' => $this->mAddress );
-                       
-                       if ($this->mAngryAutoblock) {
+
+                       if ( $this->mAngryAutoblock ) {
                                // Block any IP used in the last 7 days. Up to five IPs.
-                               $conds[] = 'rc_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( time() - (7*86400) ) );
+                               $conds[] = 'rc_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( time() - ( 7 * 86400 ) ) );
                                $options['LIMIT'] = 5;
                        } else {
                                // Just the last IP used.
@@ -483,108 +525,114 @@ class Block
                        }
 
                        $res = $dbr->select( 'recentchanges', array( 'rc_ip' ), $conds,
-                               __METHOD__ ,  $options);
+                               __METHOD__ ,  $options );
 
                        if ( !$dbr->numRows( $res ) ) {
-                               #No results, don't autoblock anything
-                               wfDebug("No IP found to retroactively autoblock\n");
+                               # No results, don't autoblock anything
+                               wfDebug( "No IP found to retroactively autoblock\n" );
                        } else {
-                               while ( $row = $dbr->fetchObject( $res ) ) {
-                                       if ( $row->rc_ip )
+                               foreach ( $res as $row ) {
+                                       if ( $row->rc_ip ) {
                                                $this->doAutoblock( $row->rc_ip );
+                                       }
                                }
                        }
                }
        }
-       
+
        /**
         * Checks whether a given IP is on the autoblock whitelist.
-        * @return bool
-        * @param string $autoblockip The IP to check
+        *
+        * @param $ip String: The IP to check
+        * @return Boolean
         */
-       function isWhitelistedFromAutoblocks( $ip ) {
+       public static function isWhitelistedFromAutoblocks( $ip ) {
                global $wgMemc;
-               
+
                // Try to get the autoblock_whitelist from the cache, as it's faster
                // than getting the msg raw and explode()'ing it.
-               $key = wfMemc( 'ipb', 'autoblock', 'whitelist' );
+               $key = wfMemcKey( 'ipb', 'autoblock', 'whitelist' );
                $lines = $wgMemc->get( $key );
                if ( !$lines ) {
                        $lines = explode( "\n", wfMsgForContentNoTrans( 'autoblock_whitelist' ) );
                        $wgMemc->set( $key, $lines, 3600 * 24 );
                }
 
-               wfDebug("Checking the autoblock whitelist..\n");
+               wfDebug( "Checking the autoblock whitelist..\n" );
 
-               foreach( $lines as $line ) {
+               foreach ( $lines as $line ) {
                        # List items only
                        if ( substr( $line, 0, 1 ) !== '*' ) {
                                continue;
                        }
 
-                       $wlEntry = substr($line, 1);
-                       $wlEntry = trim($wlEntry);
+                       $wlEntry = substr( $line, 1 );
+                       $wlEntry = trim( $wlEntry );
 
-                       wfDebug("Checking $ip against $wlEntry...");
+                       wfDebug( "Checking $ip against $wlEntry..." );
 
                        # Is the IP in this range?
-                       if (IP::isInRange( $ip, $wlEntry )) {
-                               wfDebug(" IP $ip matches $wlEntry, not autoblocking\n");
+                       if ( IP::isInRange( $ip, $wlEntry ) ) {
+                               wfDebug( " IP $ip matches $wlEntry, not autoblocking\n" );
                                return true;
                        } else {
                                wfDebug( " No match\n" );
                        }
                }
-               
+
                return false;
        }
 
        /**
-       * Autoblocks the given IP, referring to this Block.
-       * @param string $autoblockip The IP to autoblock.
-       * @param bool $justInserted The main block was just inserted
-       * @return bool Whether or not an autoblock was inserted.
-       */
-       function doAutoblock( $autoblockip, $justInserted = false ) {
+        * Autoblocks the given IP, referring to this Block.
+        *
+        * @param $autoblockIP String: the IP to autoblock.
+        * @param $justInserted Boolean: the main block was just inserted
+        * @return Boolean: whether or not an autoblock was inserted.
+        */
+       public function doAutoblock( $autoblockIP, $justInserted = false ) {
                # If autoblocks are disabled, go away.
                if ( !$this->mEnableAutoblock ) {
                        return;
                }
 
                # Check for presence on the autoblock whitelist
-               if (Block::isWhitelistedFromAutoblocks($autoblockip)) {
+               if ( Block::isWhitelistedFromAutoblocks( $autoblockIP ) ) {
                        return;
                }
-               
-               ## Allow hooks to cancel the autoblock.
-               if (!wfRunHooks( 'AbortAutoblock', array( $autoblockip, &$this ) )) {
-                       wfDebug( "Autoblock aborted by hook." );
+
+               # # Allow hooks to cancel the autoblock.
+               if ( !wfRunHooks( 'AbortAutoblock', array( $autoblockIP, &$this ) ) ) {
+                       wfDebug( "Autoblock aborted by hook.\n" );
                        return false;
                }
 
                # It's okay to autoblock. Go ahead and create/insert the block.
 
-               $ipblock = Block::newFromDB( $autoblockip );
+               $ipblock = Block::newFromDB( $autoblockIP );
                if ( $ipblock ) {
                        # If the user is already blocked. Then check if the autoblock would
                        # exceed the user block. If it would exceed, then do nothing, else
                        # prolong block time
-                       if ($this->mExpiry &&
-                       ($this->mExpiry < Block::getAutoblockExpiry($ipblock->mTimestamp))) {
+                       if ( $this->mExpiry &&
+                               ( $this->mExpiry < Block::getAutoblockExpiry( $ipblock->mTimestamp ) )
+                       ) {
                                return;
                        }
+
                        # Just update the timestamp
                        if ( !$justInserted ) {
                                $ipblock->updateTimestamp();
                        }
+
                        return;
                } else {
                        $ipblock = new Block;
                }
 
                # Make a new block object with the desired properties
-               wfDebug( "Autoblocking {$this->mAddress}@" . $autoblockip . "\n" );
-               $ipblock->mAddress = $autoblockip;
+               wfDebug( "Autoblocking {$this->mAddress}@" . $autoblockIP . "\n" );
+               $ipblock->mAddress = $autoblockIP;
                $ipblock->mUser = 0;
                $ipblock->mBy = $this->mBy;
                $ipblock->mByName = $this->mByName;
@@ -594,26 +642,27 @@ class Block
                $ipblock->mCreateAccount = $this->mCreateAccount;
                # Continue suppressing the name if needed
                $ipblock->mHideName = $this->mHideName;
+               $ipblock->mAllowUsertalk = $this->mAllowUsertalk;
 
                # If the user is already blocked with an expiry date, we don't
                # want to pile on top of that!
-               if($this->mExpiry) {
-                       $ipblock->mExpiry = min ( $this->mExpiry, Block::getAutoblockExpiry( $this->mTimestamp ));
+               if ( $this->mExpiry ) {
+                       $ipblock->mExpiry = min( $this->mExpiry, Block::getAutoblockExpiry( $this->mTimestamp ) );
                } else {
                        $ipblock->mExpiry = Block::getAutoblockExpiry( $this->mTimestamp );
                }
+
                # Insert it
                return $ipblock->insert();
        }
 
        /**
         * Check if a block has expired. Delete it if it is.
-        * @return bool
+        * @return Boolean
         */
-       function deleteIfExpired()
-       {
-               $fname = 'Block::deleteIfExpired';
-               wfProfileIn( $fname );
+       public function deleteIfExpired() {
+               wfProfileIn( __METHOD__ );
+
                if ( $this->isExpired() ) {
                        wfDebug( "Block::deleteIfExpired() -- deleting\n" );
                        $this->delete();
@@ -622,17 +671,18 @@ class Block
                        wfDebug( "Block::deleteIfExpired() -- not expired\n" );
                        $retVal = false;
                }
-               wfProfileOut( $fname );
+
+               wfProfileOut( __METHOD__ );
                return $retVal;
        }
 
        /**
         * Has the block expired?
-        * @return bool
+        * @return Boolean
         */
-       function isExpired()
-       {
+       public function isExpired() {
                wfDebug( "Block::isExpired() checking current " . wfTimestampNow() . " vs $this->mExpiry\n" );
+
                if ( !$this->mExpiry ) {
                        return false;
                } else {
@@ -642,18 +692,16 @@ class Block
 
        /**
         * Is the block address valid (i.e. not a null string?)
-        * @return bool
+        * @return Boolean
         */
-       function isValid()
-       {
+       public function isValid() {
                return $this->mAddress != '';
        }
 
        /**
-        * Update the timestamp on autoblocks. 
+        * Update the timestamp on autoblocks.
         */
-       function updateTimestamp()
-       {
+       public function updateTimestamp() {
                if ( $this->mAuto ) {
                        $this->mTimestamp = wfTimestamp();
                        $this->mExpiry = Block::getAutoblockExpiry( $this->mTimestamp );
@@ -661,8 +709,8 @@ class Block
                        $dbw = wfGetDB( DB_MASTER );
                        $dbw->update( 'ipblocks',
                                array( /* SET */
-                                       'ipb_timestamp' => $dbw->timestamp($this->mTimestamp),
-                                       'ipb_expiry' => $dbw->timestamp($this->mExpiry),
+                                       'ipb_timestamp' => $dbw->timestamp( $this->mTimestamp ),
+                                       'ipb_expiry' => $dbw->timestamp( $this->mExpiry ),
                                ), array( /* WHERE */
                                        'ipb_address' => $this->mAddress
                                ), 'Block::updateTimestamp'
@@ -670,20 +718,10 @@ class Block
                }
        }
 
-       /*
-       function getIntegerAddr()
-       {
-               return $this->mIntegerAddr;
-       }
-
-       function getNetworkBits()
-       {
-               return $this->mNetworkBits;
-       }*/
-
        /**
         * Get the user id of the blocking sysop
-        * @return int
+        *
+        * @return Integer
         */
        public function getBy() {
                return $this->mBy;
@@ -691,22 +729,32 @@ class Block
 
        /**
         * Get the username of the blocking sysop
-        * @return string
+        *
+        * @return String
         */
-       function getByName()
-       {
+       public function getByName() {
                return $this->mByName;
        }
 
-       function forUpdate( $x = NULL ) {
+       /**
+        * Get/set the SELECT ... FOR UPDATE flag
+        */
+       public function forUpdate( $x = null ) {
                return wfSetVar( $this->mForUpdate, $x );
        }
 
-       function fromMaster( $x = NULL ) {
+       /**
+        * Get/set a flag determining whether the master is used for reads
+        */
+       public function fromMaster( $x = null ) {
                return wfSetVar( $this->mFromMaster, $x );
        }
 
-       function getRedactedName() {
+       /**
+        * Get the block name, but with autoblocked IPs hidden as per standard privacy policy
+        * @return String
+        */
+       public function getRedactedName() {
                if ( $this->mAuto ) {
                        return '#' . $this->mId;
                } else {
@@ -716,11 +764,12 @@ class Block
 
        /**
         * Encode expiry for DB
-        * @return string
-        * @param $expiry string Timestamp for expiry, or 
+        *
+        * @param $expiry String: timestamp for expiry, or
         * @param $db Database object
+        * @return String
         */
-       static function encodeExpiry( $expiry, $db ) {
+       public static function encodeExpiry( $expiry, $db ) {
                if ( $expiry == '' || $expiry == Block::infinity() ) {
                        return Block::infinity();
                } else {
@@ -730,11 +779,12 @@ class Block
 
        /**
         * Decode expiry which has come from the DB
-        * @return string
-        * @param $expiry string Database expiry format
+        *
+        * @param $expiry String: Database expiry format
         * @param $timestampType Requested timestamp format
+        * @return String
         */
-       static function decodeExpiry( $expiry, $timestampType = TS_MW ) {
+       public static function decodeExpiry( $expiry, $timestampType = TS_MW ) {
                if ( $expiry == '' || $expiry == Block::infinity() ) {
                        return Block::infinity();
                } else {
@@ -744,28 +794,29 @@ class Block
 
        /**
         * Get a timestamp of the expiry for autoblocks
-        * @return string
+        *
+        * @return String
         */
-       static function getAutoblockExpiry( $timestamp )
-       {
+       public static function getAutoblockExpiry( $timestamp ) {
                global $wgAutoblockExpiry;
+
                return wfTimestamp( TS_MW, wfTimestamp( TS_UNIX, $timestamp ) + $wgAutoblockExpiry );
        }
 
        /**
         * Gets rid of uneeded numbers in quad-dotted/octet IP strings
         * For example, 127.111.113.151/24 -> 127.111.113.0/24
-        * @param $range string IP address to normalize
+        * @param $range String: IP address to normalize
         * @return string
         */
-       static function normaliseRange( $range ) {
+       public static function normaliseRange( $range ) {
                $parts = explode( '/', $range );
                if ( count( $parts ) == 2 ) {
                        // IPv6
-                       if ( IP::isIPv6($range) && $parts[1] >= 64 && $parts[1] <= 128 ) {
+                       if ( IP::isIPv6( $range ) && $parts[1] >= 64 && $parts[1] <= 128 ) {
                                $bits = $parts[1];
-                               $ipint = IP::toUnsigned6( $parts[0] );
-                               # Native 32 bit functions WONT work here!!!
+                               $ipint = IP::toUnsigned( $parts[0] );
+                               # Native 32 bit functions WON'T work here!!!
                                # Convert to a padded binary number
                                $network = wfBaseConvert( $ipint, 10, 2, 128 );
                                # Truncate the last (128-$bits) bits and replace them with zeros
@@ -776,7 +827,7 @@ class Block
                                $newip = IP::toOctet( $network );
                                $range = "$newip/{$parts[1]}";
                        } // IPv4
-                       else if ( IP::isIPv4($range) && $parts[1] >= 16 && $parts[1] <= 32 ) {
+                       elseif ( IP::isIPv4( $range ) && $parts[1] >= 16 && $parts[1] <= 32 ) {
                                $shift = 32 - $parts[1];
                                $ipint = IP::toUnsigned( $parts[0] );
                                $ipint = $ipint >> $shift << $shift;
@@ -784,74 +835,75 @@ class Block
                                $range = "$newip/{$parts[1]}";
                        }
                }
+
                return $range;
        }
 
        /**
         * Purge expired blocks from the ipblocks table
         */
-       static function purgeExpired() {
+       public static function purgeExpired() {
                $dbw = wfGetDB( DB_MASTER );
                $dbw->delete( 'ipblocks', array( 'ipb_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ), __METHOD__ );
        }
 
        /**
-        * This is a special keyword for timestamps in PostgreSQL, and
-        * works with CHAR(14) as well because "i" sorts after all numbers.
-        * @return string
+        * Get a value to insert into expiry field of the database when infinite expiry
+        * is desired
+        *
+        * @return String
         */
-       static function infinity() {
-               return 'infinity';
+       public static function infinity() {
+               return wfGetDB( DB_SLAVE )->getInfinity();
        }
-       
+
        /**
         * Convert a DB-encoded expiry into a real string that humans can read.
-        * @param 
-        * @return string
-        * @todo @fixme This is nasty. Forces a msg on the expiry, which isn't what
-        * we want. Probably want to abstract out the number formatting so it can
-        * be used elsewhere (some bug I forgot and can't find at the moment)
+        *
+        * @param $encoded_expiry String: Database encoded expiry time
+        * @return Html-escaped String
         */
-       static function formatExpiry( $encoded_expiry ) {
-       
+       public static function formatExpiry( $encoded_expiry ) {
                static $msg = null;
-               
-               if( is_null( $msg ) ) {
+
+               if ( is_null( $msg ) ) {
                        $msg = array();
                        $keys = array( 'infiniteblock', 'expiringblock' );
-                       foreach( $keys as $key ) {
+
+                       foreach ( $keys as $key ) {
                                $msg[$key] = wfMsgHtml( $key );
                        }
                }
-               
+
                $expiry = Block::decodeExpiry( $encoded_expiry );
-               if ($expiry == 'infinity') {
+               if ( $expiry == 'infinity' ) {
                        $expirystr = $msg['infiniteblock'];
                } else {
                        global $wgLang;
-                       $expiretimestr = $wgLang->timeanddate( $expiry, true );
-                       $expirystr = wfMsgReplaceArgs( $msg['expiringblock'], array($expiretimestr) );
+                       $expiredatestr = htmlspecialchars( $wgLang->date( $expiry, true ) );
+                       $expiretimestr = htmlspecialchars( $wgLang->time( $expiry, true ) );
+                       $expirystr = wfMsgReplaceArgs( $msg['expiringblock'], array( $expiredatestr, $expiretimestr ) );
                }
 
                return $expirystr;
        }
-       
+
        /**
         * Convert a typed-in expiry time into something we can put into the database.
-        * @param $expiry_input string Whatever was typed into the form
-        * @return string More database friendly
+        * @param $expiry_input String: whatever was typed into the form
+        * @return String: more database friendly
         */
-       static function parseExpiryInput( $expiry_input ) {
+       public static function parseExpiryInput( $expiry_input ) {
                if ( $expiry_input == 'infinite' || $expiry_input == 'indefinite' ) {
                        $expiry = 'infinity';
                } else {
                        $expiry = strtotime( $expiry_input );
-                       if ($expiry < 0 || $expiry === false) {
+
+                       if ( $expiry < 0 || $expiry === false ) {
                                return false;
                        }
                }
-               
+
                return $expiry;
        }
-
 }