| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -5,13 +5,6 @@ |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | | - * Some globals |
| 10 | | - */ |
| 11 | | -define ( 'EB_KEEP_EXPIRED', 1 ); |
| 12 | | -define ( 'EB_FOR_UPDATE', 2 ); |
| 13 | | -define ( 'EB_RANGE_ONLY', 4 ); |
| 14 | | - |
| 15 | | -/** |
| 16 | 9 | * The block class |
| 17 | 10 | * All the functions in this class assume the object is either explicitly |
| 18 | 11 | * loaded or filled. It is not load-on-demand. There are no accessors. |
| — | — | @@ -27,6 +20,10 @@ |
| 28 | 21 | /* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry, |
| 29 | 22 | $mRangeStart, $mRangeEnd; |
| 30 | 23 | /* private */ var $mNetworkBits, $mIntegerAddr, $mForUpdate, $mFromMaster, $mByName; |
| | 24 | + |
| | 25 | + const EB_KEEP_EXPIRED = 1; |
| | 26 | + const EB_FOR_UPDATE = 2; |
| | 27 | + const EB_RANGE_ONLY = 4; |
| 31 | 28 | |
| 32 | 29 | function Block( $address = '', $user = '', $by = 0, $reason = '', |
| 33 | 30 | $timestamp = '' , $auto = 0, $expiry = '' ) |
| — | — | @@ -258,7 +255,7 @@ |
| 259 | 256 | global $wgAntiLockFlags; |
| 260 | 257 | |
| 261 | 258 | $block = new Block(); |
| 262 | | - if ( $flags & EB_FOR_UPDATE ) { |
| | 259 | + if ( $flags & Block::EB_FOR_UPDATE ) { |
| 263 | 260 | $db =& wfGetDB( DB_MASTER ); |
| 264 | 261 | if ( $wgAntiLockFlags & ALF_NO_BLOCK_LOCK ) { |
| 265 | 262 | $options = ''; |
| — | — | @@ -270,7 +267,7 @@ |
| 271 | 268 | $db =& wfGetDB( DB_SLAVE ); |
| 272 | 269 | $options = ''; |
| 273 | 270 | } |
| 274 | | - if ( $flags & EB_RANGE_ONLY ) { |
| | 271 | + if ( $flags & Block::EB_RANGE_ONLY ) { |
| 275 | 272 | $cond = " AND ipb_range_start <> ''"; |
| 276 | 273 | } else { |
| 277 | 274 | $cond = ''; |
| — | — | @@ -287,11 +284,11 @@ |
| 288 | 285 | |
| 289 | 286 | while ( $row = $db->fetchObject( $res ) ) { |
| 290 | 287 | $block->initFromRow( $row ); |
| 291 | | - if ( ( $flags & EB_RANGE_ONLY ) && $block->mRangeStart == '' ) { |
| | 288 | + if ( ( $flags & Block::EB_RANGE_ONLY ) && $block->mRangeStart == '' ) { |
| 292 | 289 | continue; |
| 293 | 290 | } |
| 294 | 291 | |
| 295 | | - if ( !( $flags & EB_KEEP_EXPIRED ) ) { |
| | 292 | + if ( !( $flags & Block::EB_KEEP_EXPIRED ) ) { |
| 296 | 293 | if ( $block->mExpiry && $now > $block->mExpiry ) { |
| 297 | 294 | $block->delete(); |
| 298 | 295 | } else { |