--- alx-src/branches/alx-web-070/index.php	2015/09/11 15:25:31	7123
+++ alx-src/branches/alx-web-070/index.php	2015/12/16 15:26:57	8006
@@ -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.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 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
@@ -119,10 +119,11 @@
 
 
 echo '<table border="1" id="mytab">';
-echo '<thead><tr style="font-weight:bold;background-color:#d5e5ff"><th>edit</th><th colspan=3>serial</th><th width=170>hostname</th><th width=100>ip</th><th width=100>last connected</th>';
+echo '<thead><tr style="font-weight:bold;background-color:#d5e5ff"><th>edit</th><th colspan=3>serial</th><th width=170>hostname</th><th width=100>ip</th><th width=100>mac</th><th width=100>last connected</th>';
 //always enable showversion atm
 $showversion = "on";
 if($showversion=='on') echo '<th colspan=2>version</th>';
+echo '<th width=100>boot</th>';
 echo '<th width=150>up/down</th></tr></thead><tbody>';
 
 foreach($comps as $c)
@@ -147,6 +148,7 @@
 	echo '<td><nobr>'.$c['hostname'].'</nobr></td>';
 
  	echo '<td><nobr>'.$c['ip'].'</nobr></td>';
+ 	echo '<td><nobr>'.$c['mac'].'</nobr></td>';
 	if($c['mtime']) { echo '<td><nobr>'.date('Y-m-d, H:i:s',$c['mtime']).'</nobr></td>'; }
 	//if($c['mtime']) { echo '<td><nobr>'.$c['mtime'].'</nobr></td>'; }
 	else echo '<td></td>';
@@ -175,6 +177,10 @@
 		echo '<td>'.$alxutils.'</td>';
 	}
 
+	//netboot state
+	if($c['netboot'] == 1) echo '<td>Netboot (PXE)</td>';
+	else echo '<td>Local Disk</td>';
+
 	echo '<td>';
 	if($c['online'])
 	{

edit	serial			hostname	ip	last connected
edit	serial			hostname	ip	mac	last connected	version		boot	up/down
'.$c['hostname'].'	'.$c['ip'].'	'.$c['mac'].'	'.date('Y-m-d, H:i:s',$c['mtime']).'	'.$c['mtime'].'		'.$alxutils.'	Netboot (PXE)	Local Disk	'; if($c['online']) {