--- alx-src/branches/alx-web-060/index.php	2012/02/01 10:54:50	3347
+++ alx-src/branches/alx-web-070/index.php	2016/02/08 09:59:56	8525
@@ -4,9 +4,12 @@
 include('include/common-functions.php');
 
 session_start();
-session_register('alx_sort_krit'); session_register('alx_sort_onfirst'); session_register('alx_sort_loc');
+//session_register('alx_sort_krit'); session_register('alx_sort_onfirst'); session_register('alx_sort_loc');
+$_SESSION['alx_sort_krit'] = $alx_sort_krit;
+$_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)
@@ -27,11 +30,11 @@
 function check_online($dat, $bla)
 {
 	global $comps;
-	global $pingcmd;
+	global $mcore_port;
+	global $ping_timeout;
 	if(!isset($comps[$dat['serial']])) return false;
 
-	//passthru("/bin/ping -I eth0 -c 1 -W 1 -q ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);
-	passthru($pingcmd." ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);
+	$retval = ping_host($dat['ip'],$mcore_port,$ping_timeout);
 	if($retval==0)
 	{
 		$comps[$dat['serial']]['online'] = true;
@@ -67,9 +70,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 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
@@ -113,19 +116,22 @@
 
 
 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)
 {
 	if(!$_SESSION['alx_sort_loc'][$c['location']]) Continue;
-	if($c['serial']<0 && !$_SESSION['alx_sort_loc']['DEAD']) Continue;
+	if($c['enabled']==0 && !$_SESSION['alx_sort_loc']['DEAD']) Continue;
 
 	if($c['online']) $pic='online';
 	else $pic='offline';
 
-	if($c['serial']<0)
+	if($c['enabled']==0)
 	{
 		echo '<tr style="text-decoration:line-through; color:#aaaaaa">';
 		$pic = 'deact';
@@ -133,12 +139,13 @@
 	else echo '<tr>';
 
 	echo '<td><input type=button value="EDIT" onclick="location.href=\'show.php?id='.$c['serial'].'\'"></td>';
-	echo '<td>'.substr($c['location'],0,1).'</td>';
+	echo '<td>'.substr($c['location'],0,3).'</td>';
 	echo '<td><img src="pics/'.$pic.'.gif" alt="'.strtoupper($pic).'"></td>';
 	echo '<td width=40><b>#'.$c['serial'].'</b></td>';
 	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>';
@@ -150,22 +157,26 @@
 		$alxver = $alxinfo[os];
 		$alxutils = $alxinfo[utils];
 
-		if( $alxver == '')
-		{
-			if($c['online'])
-			{
-				//$alxinfo = @sshdo('os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng | cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"', $c['ip']);
-				//$alxinfo = explode(':',$alxinfo[1]);
-				//$alxver = $alxinfo[0];
-				//$alxutils = $alxinfo[1];
-			}
-		}
-		if($alxver == '') $alxver='unkown';
-		if($alxutils == '') $alxutils='unkown';
-
-	       	echo '<td>'.$alxver.'</td>';
-	       	echo '<td>'.$alxutils.'</td>';
-	}
+//		if( $alxver == '')
+//		{
+//			if($c['online'])
+//			{
+//				//$alxinfo = @sshdo('os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng | cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"', $c['ip']);
+//				//$alxinfo = explode(':',$alxinfo[1]);
+//				//$alxver = $alxinfo[0];
+//				//$alxutils = $alxinfo[1];
+//			}
+//		}
+		if($alxver == '') $alxver='unknown';
+		if($alxutils == '') $alxutils='unknown';
+
+		echo '<td>'.$alxver.'</td>';
+		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'])
@@ -178,7 +189,7 @@
 	else echo '<input type=button style="width:100%" value="WOL" onclick="if(confirm(\'WAKE CLIENT #'.$c['serial'].' ?\')) window.open(\'wake_on_lan.php?mac='.$c['mac'].'\', \'WakeWin\', \'width=200,height=100\')">';
 	echo '</td>';
 
- 	echo '</tr>';
+	echo '</tr>';
 }
 echo '</tbody></table><br>';
 

edit	serial			hostname	ip	last connected
edit	serial			hostname	ip	mac	last connected	version		boot	up/down
	'.substr($c['location'],0,1).'	'.substr($c['location'],0,3).'		#'.$c['serial'].'	'.$c['hostname'].'	'.$c['ip'].'	'.$c['mac'].'	'.date('Y-m-d, H:i:s',$c['mtime']).'	'.$c['mtime'].'		'.$alxutils.'	'.$alxutils.'	Netboot (PXE)	Local Disk	'; if($c['online']) @@ -178,7 +189,7 @@ else echo ''; echo '