<?php
-# Blocks and bans object
-#
-#TODO: This could be used everywhere, but it isn't.
-#
-# All the functions in this class assume the object is either explicitly
-# loaded or filled. It is not load-on-demand. There are no accessors.
-#
-# To use delete(), you only need to fill $mAddress
-
-# Globals used: $wgBlockCache, $wgAutoblockExpiry
+/**
+ * Blocks and bans object
+ * @package MediaWiki
+ * $Id$
+ */
+/**
+ * Some globals
+ */
define ( 'EB_KEEP_EXPIRED', 1 );
define ( 'EB_FOR_UPDATE', 2 );
+/**
+ * The block class
+ * All the functions in this class assume the object is either explicitly
+ * loaded or filled. It is not load-on-demand. There are no accessors.
+ *
+ * To use delete(), you only need to fill $mAddress
+ * Globals used: $wgBlockCache, $wgAutoblockExpiry
+ *
+ * @todo This could be used everywhere, but it isn't.
+ * @package MediaWiki
+ */
class Block
{
/* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry;
$this->mUser = $user;
$this->mBy = $by;
$this->mReason = $reason;
- $this->mTimestamp = $timestamp;
+ $this->mTimestamp = wfTimestamp(TS_MW,$timestamp);
$this->mAuto = $auto;
- $this->mExpiry = $expiry;
+ $this->mExpiry = wfTimestamp(TS_MW,$expiry);
$this->mForUpdate = false;
$this->initialiseRange();
}
# Get a ban from the DB, with either the given address or the given username
- function load( $address = "", $user = 0, $killExpired = true )
+ function load( $address = '', $user = 0, $killExpired = true )
{
$fname = 'Block::load';
}
$ipblocks = $db->tableName( 'ipblocks' );
- if ( 0 == $user && $address=="" ) {
+ if ( 0 == $user && $address=='' ) {
$sql = "SELECT * from $ipblocks $options";
} elseif ($address=="") {
$sql = "SELECT * FROM $ipblocks WHERE ipb_user={$user} $options";
{
$this->mAddress = $row->ipb_address;
$this->mReason = $row->ipb_reason;
- $this->mTimestamp = $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;
$this->mId = $row->ipb_id;
- $this->mExpiry = $row->ipb_expiry;
+ $this->mExpiry = wfTimestamp(TS_MW,$row->ipb_expiry);
$this->initialiseRange();
}
$fname = 'Block::delete';
$dbw =& wfGetDB( DB_MASTER );
- if ( $this->mAddress == "" ) {
+ if ( $this->mAddress == '' ) {
$condition = array( 'ipb_id' => $this->mId );
} else {
$condition = array( 'ipb_address' => $this->mAddress );
function insert()
{
$dbw =& wfGetDB( DB_MASTER );
- $dbw->insertArray( 'ipblocks',
+ $dbw->insert( 'ipblocks',
array(
'ipb_address' => $this->mAddress,
'ipb_user' => $this->mUser,
'ipb_by' => $this->mBy,
'ipb_reason' => $this->mReason,
- 'ipb_timestamp' => $this->mTimestamp,
+ 'ipb_timestamp' => $dbw->timestamp($this->mTimestamp),
'ipb_auto' => $this->mAuto,
- 'ipb_expiry' => $this->mExpiry,
+ 'ipb_expiry' => $dbw->timestamp($this->mExpiry),
), 'Block::insert'
);
if ( !$this->mExpiry ) {
return false;
} else {
- return wfTimestampNow() > $this->mExpiry;
+ return wfTimestamp() > $this->mExpiry;
}
}
function updateTimestamp()
{
if ( $this->mAuto ) {
- $this->mTimestamp = wfTimestampNow();
+ $this->mTimestamp = wfTimestamp();
$this->mExpiry = Block::getAutoblockExpiry( $this->mTimestamp );
$dbw =& wfGetDB( DB_MASTER );
- $dbw->updateArray( 'ipblocks',
+ $dbw->update( 'ipblocks',
array( /* SET */
- 'ipb_timestamp' => $this->mTimestamp,
- 'ipb_expiry' => $this->mExpiry,
+ 'ipb_timestamp' => $dbw->timestamp($this->mTimestamp),
+ 'ipb_expiry' => $dbw->timestamp($this->mExpiry),
), array( /* WHERE */
'ipb_address' => $this->mAddress
), 'Block::updateTimestamp'
/* static */ function getAutoblockExpiry( $timestamp )
{
global $wgAutoblockExpiry;
- return wfUnix2Timestamp( wfTimestamp2Unix( $timestamp ) + $wgAutoblockExpiry );
+ return wfTimestamp( TS_MW, wfTimestamp( TS_UNIX, $timestamp ) + $wgAutoblockExpiry );
}
/* static */ function normaliseRange( $range )