Mibew/mibew
1
0
Fork 0
mirror of https://github.com/Mibew/mibew.git synced 2025-02-07 16:24:43 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reduce duplication in Ban class

Browse Source
This commit is contained in:
Dmitriy Simushev 2014-10-27 10:57:03 +00:00
parent 7f6a9c6513
commit 6cc94bcb33
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mibew/libs/classes/Mibew/Ban.php
View File

@ -87,13 +87,9 @@ class Ban
return false; return false;
} }
// Store ban properties // Create and populate ban object
$ban = new self(); $ban = new self();
$ban->id = $ban_info['banid']; $ban->populateFromDbFields($ban_info);
$ban->created = $ban_info['dtmcreated'];
$ban->till = $ban_info['dtmtill'];
$ban->address = $ban_info['address'];
$ban->comment = $ban_info['comment'];
return $ban; return $ban;
} }
@ -123,13 +119,9 @@ class Ban
return false; return false;
} }
// Store ban properties // Create and populate ban object
$ban = new self(); $ban = new self();
$ban->id = $ban_info['banid']; $ban->populateFromDbFields($ban_info);
$ban->created = $ban_info['dtmcreated'];
$ban->till = $ban_info['dtmtill'];
$ban->address = $ban_info['address'];
$ban->comment = $ban_info['comment'];
return $ban; return $ban;
} }
@ -145,7 +137,7 @@ class Ban
public static function all() public static function all()
{ {
$rows = Database::getInstance()->query( $rows = Database::getInstance()->query(
"SELECT banid, dtmtill AS till, address, comment FROM {ban}", "SELECT * FROM {ban}",
null, null,
array('return_rows' => Database::RETURN_ALL_ROWS) array('return_rows' => Database::RETURN_ALL_ROWS)
); );
@ -157,10 +149,7 @@ class Ban
$bans = array(); $bans = array();
foreach ($rows as $item) { foreach ($rows as $item) {
$ban = new self(); $ban = new self();
$ban->id = $item['banid']; $ban->populateFromDbFields($item);
$ban->till = $item['till'];
$ban->address = $item['address'];
$ban->comment = $item['comment'];
$bans[] = $ban; $bans[] = $ban;
} }
@ -256,4 +245,19 @@ class Ban
{ {
return ($this->till < time()); return ($this->till < time());
} }
/**
* Sets ban's fields according to the fields from Database.
*
* @param array $db_fields Associative array of database fields which keys
* are fields names and the values are fields values.
*/
protected function populateFromDbFields($db_fields)
{
$this->id = $db_fields['banid'];
$this->created = $db_fields['dtmcreated'];
$this->till = $db_fields['dtmtill'];
$this->address = $db_fields['address'];
$this->comment = $db_fields['comment'];
}
} }