Revize 1075
Přidáno uživatelem Michal Kliment před asi 13 roky(ů)
| freenetis/branches/device_templates/application/models/subnet.php | ||
|---|---|---|
|
{
|
||
|
$order_by = 'inet_aton(network_address)';
|
||
|
}
|
||
|
else if ($order_by == 'id' || !$this->has_column($order_by))
|
||
|
else
|
||
|
{
|
||
|
$order_by = 's.id';
|
||
|
$order_by = $this->db->escape_column($order_by);
|
||
|
}
|
||
|
// order by direction check
|
||
|
if (strtolower($order_by_direction) != 'desc')
|
||
| ... | ... | |
|
LEFT JOIN subnets_owners so ON s.id = so.subnet_id
|
||
|
LEFT JOIN members m ON so.member_id = m.id
|
||
|
$where
|
||
|
ORDER BY " . $this->db->escape_column($order_by) . " $order_by_direction
|
||
|
ORDER BY $order_by $order_by_direction
|
||
|
LIMIT ".intval($limit_from) . "," . intval($limit_results) . "
|
||
|
");
|
||
|
}
|
||
| freenetis/branches/device_templates/application/controllers/subnets.php | ||
|---|---|---|
|
|
||
|
$subnet_model = new Subnet_Model();
|
||
|
$total_subnets = $subnet_model->count_all_subnets();
|
||
|
$subnets = $subnet_model->get_all_subnets(0, $total_subnets, 'inet_aton(network_address)');
|
||
|
$subnets = $subnet_model->get_all_subnets(0, $total_subnets, 'cidr');
|
||
|
|
||
|
$arr_subnets = array();
|
||
|
$arr_subnet_lengths = array();
|
||
Také k dispozici: Unified diff
Merge zmen z testingu do vetve se sablonami zarizeni.