stv0g/sddns
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added sorting option

Browse source
This commit is contained in:
Steffen Vogel 2013-03-08 03:23:01 +01:00
parent 0cf4eb440f
commit 7e2f040a38
3 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/get.php
View file

@ -168,7 +168,7 @@ else {
}
}
$data = DBUri::get($db, $filter);
$data = DBUri::get($db, $filter, array('last_accessed' => 'DESC'));
$dateField = 'created';
break;
@ -193,7 +193,7 @@ else {
$filter['rdata'] = $_REQUEST['rdata'];
}
$data = DBRecord::get($db, $filter);
$data = DBRecord::get($db, $filter, array('last_accessed' => 'DESC'));
$dateField = 'created';
}

8
include/dbrecord.php
View file

@ -68,7 +68,7 @@ class DBRecord extends Record implements DBObject {
$this->db->execute($sql);
}
public static function get(Database $db, $filter = false) {
public static function get(Database $db, $filter = false, $order = array()) {
$config = Registry::get('config');
$sql = 'SELECT r.id
@ -98,7 +98,11 @@ class DBRecord extends Record implements DBObject {
if (!empty($filter['ttl']))
$sql .= ' && ttl = ' . (int) $filter['ttl'];
$sql .= ' ORDER BY r.id ASC';
$sql .= ' ORDER BY';
foreach ($order as $column => $dir) {
$sql .= ' ' . $column . ' ' . $dir . ',';
}
$sql .= ' r.id ASC';
$result = $db->query($sql);

34
include/dburi.php
View file

@ -5,7 +5,7 @@ class DBUri extends Uri implements DBObject {
public $lifetime;
public $lastAccessed;
public $accessed;
private $db;
public function __construct($id, Database $db) {
@ -29,14 +29,14 @@ class DBUri extends Uri implements DBObject {
parent::__construct($uri['uri'], $this->host);
}
public function __destruct() {
//$this->update();
}
public function update() {
$config = Registry::get('config');
$sql = 'UPDATE ' . $config['db']['tbl']['uris'] . '
SET
host_id = ' . (int) $this->host->id . ',
@ -46,18 +46,18 @@ class DBUri extends Uri implements DBObject {
last_accessed = \'' . date('Y-m-d H:i:s', $this->lastAccessed) . '\',
lifetime = ' . (int) $this->lifetime . '
WHERE id = ' . (int) $this->id;
$this->db->execute($sql);
}
public function toXml(DOMDocument $doc) {
$xmlUri = parent::toXml($doc);
$xmlUri->setAttribute('id', $this->id);
$xmlUri->appendChild($doc->createElement('lifetime', $this->lifetime));
$xmlUri->appendChild($doc->createElement('lastaccessed', $this->lastAccessed));
return $xmlUri;
}
@ -66,11 +66,11 @@ class DBUri extends Uri implements DBObject {
$sql = 'DELETE FROM ' . $config['db']['tbl']['uris'] . '
WHERE id = ' . (int) $this->id;
$this->db->execute($sql);
}
public static function get(Database $db, $filter = false) {
public static function get(Database $db, $filter = false, $order = array()) {
$config = Registry::get('config');
$sql = 'SELECT u.id
@ -78,7 +78,7 @@ class DBUri extends Uri implements DBObject {
LEFT JOIN ' . $config['db']['tbl']['hosts'] . ' AS h
ON h.id = u.host_id
WHERE true';
if (!empty($filter['id']))
$sql .= ' && id = ' . (int) $filter['id'];
if (!empty($filter['host']) && $filter['host'] instanceof Host)
@ -94,9 +94,15 @@ class DBUri extends Uri implements DBObject {
if (!empty($filter['uri']))
$sql .= ' && uri = \'' . $filter['uri'] . '\'';
$sql .= ' ORDER BY u.id ASC';
$sql .= ' ORDER BY';
foreach ($order as $column => $dir) {
$sql .= ' ' . $column . ' ' . $dir . ',';
}
$sql .= ' u.id ASC';
$result = $db->query($sql);
$uris = array();
foreach ($result as $uri) {
$uris[] = new self($uri['id'], $db);