--- alx-src/branches/alx-web-060/index.php	2011/06/15 13:14:25	2415
+++ alx-src/branches/alx-web-060/index.php	2012/02/08 13:03:11	3348
@@ -1,6 +1,8 @@
 <?
 
 include('include/basesql.php');
+include('include/common-functions.php');
+
 session_start();
 session_register('alx_sort_krit'); session_register('alx_sort_onfirst'); session_register('alx_sort_loc');
 
@@ -66,7 +68,7 @@
 }
 
 $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 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -112,6 +114,8 @@
 
 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>';
+//always enable showversion atm
+$showversion = "on";
 if($showversion=='on') echo '<th colspan=2>version</th>';
 echo '<th width=150>up/down</th></tr></thead><tbody>';
 
@@ -141,17 +145,28 @@
 	//if($c['mtime']) { echo '<td><nobr>'.$c['mtime'].'</nobr></td>'; }
 	else echo '<td></td>';
 
-	if($c['online'])
+	if($showversion=='on')
 	{
-		if($showversion=='on')
+		// get alx version info for
+		$alxinfo = sqlfirst('SELECT * FROM client_version WHERE serial='.$c['serial']);
+		$alxver = $alxinfo[os];
+		$alxutils = $alxinfo[utils];
+
+		if( $alxver == '')
 		{
-			$osver = 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']);
-			$osver = explode(':',$osver[1]);
-			if($osver[0] == '') $osver[0]='unkown';
-			if($osver[1] == '') $osver[1]='unkown';
-	        	echo '<td>'.$osver[0].'</td>';
-	        	echo '<td>'.$osver[1].'</td>';
-	        }
+			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>';
 	}
 
 	echo '<td>';
