--- alx-src/branches/alx-web-070/index.php 2015/09/11 15:24:49 7122 +++ alx-src/branches/alx-web-070/index.php 2015/12/16 16:06:40 8007 @@ -9,7 +9,7 @@ $_SESSION['alx_sort_onfirst'] = $alx_sort_onfirst; $_SESSION['alx_sort_loc'] = $alx_sort_loc; -$locations = sqlarr('SELECT location FROM client_locations', '', 'location'); +$locations = sqlarr('SELECT location FROM client_locations where enabled="1"', '', 'location'); $locations[] = ''; if($_SESSION['alx_sort_krit']==null) @@ -73,9 +73,9 @@ else return ''; } -$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"); +$comps = sqlarr("select client_serials.serial, client_serials.enabled, client_serials.location, client_serials.mac, cfg_network.hostname, state_connected.mtime, state_connected.netboot 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); +sqlforeach('SELECT state_connected.serial, state_connected.ip, cfg_network.hostname, state_connected.mac FROM state_connected left join cfg_network on cfg_network.serial=state_connected.serial', 'check_online', null); usort($comps, 'sortcomp'); echo ''; @@ -119,21 +119,22 @@ echo '
edit | serial | hostname | ip | last connected | '; +echo '||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
edit | serial | hostname | ip | mac | last connected | '; //always enable showversion atm $showversion = "on"; if($showversion=='on') echo 'version | '; +echo 'boot | '; echo 'up/down | ||||||||||
'; @@ -171,10 +173,14 @@ if($alxver == '') $alxver='unknown'; if($alxutils == '') $alxutils='unknown'; - echo ' | '.$alxver.' | '; - echo ''.$alxutils.' | '; + echo ''.$alxver.' | '; + echo ''.$alxutils.' | '; } + //netboot state + if($c['netboot'] == 1) echo 'Netboot (PXE) | '; + else echo 'Local Disk | '; + echo ''; if($c['online']) { @@ -186,7 +192,7 @@ else echo ''; echo ' | '; - echo '