--- alx-src/branches/alx-web-050/index.php 2010/12/09 22:27:33 1630
+++ alx-src/branches/alx-web-050/index.php 2011/03/16 11:04:35 1725
@@ -61,7 +61,8 @@
function checkif($b)
{ if($b) return ' checked'; else return ''; }
- $comps = sqlarr("SELECT s.serial, s.location, s.mac, n.hostname, t.mtime FROM cfg_network n,client_serials s,state_connected t WHERE n.serial=s.serial OR t.serial=s.serial", "serial");
+ $comps = sqlarr("select client_serials.serial, client_serials.location, client_serials.mac, cfg_network.hostname, state_connected.mtime from client_serials left join cfg_network on client_serials.serial=cfg_network.serial left join state_connected on client_serials.serial=state_connected.serial", "serial");
+
sqlforeach('SELECT serial, ip, hostname, mac FROM state_connected', 'check_online', null);
usort($comps, 'sortcomp');
echo '';
echo '| edit | serial | hostname | ip | last connected | ';
if($showversion=='on') echo 'version | ';
- echo 'up/down |
|---|
';
+ echo 'up/down | ';
foreach($comps as $c)
{
@@ -157,9 +158,10 @@
echo '';
if($c['online'])
{
- echo '';
- echo '';
- echo '';
+ echo '';
+ echo '';
+ echo '';
+ echo '';
}
else echo '';
echo ' | ';