--- alx-src/branches/alx-web-060/index.php	2011/06/15 13:14:25	2415
+++ alx-src/branches/alx-web-070/index.php	2015/12/14 08:24:42	7996
@@ -1,10 +1,15 @@
 <?
 
 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');
+//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)
@@ -25,11 +30,14 @@
 function check_online($dat, $bla)
 {
 	global $comps;
-	global $pingcmd;
+	global $ssh_port;
+	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);
+	// first try mcore, then get ssh
+	$retval = ping_host($dat['ip'],$mcore_port,$ping_timeout);
+	if($retval==1) $retval = ping_host($dat['ip'],$ssh_port,$ping_timeout);
 	if($retval==0)
 	{
 		$comps[$dat['serial']]['online'] = true;
@@ -66,8 +74,8 @@
 }
 
 $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);
+
+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">';
@@ -111,7 +119,9 @@
 
 
 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=150>up/down</th></tr></thead><tbody>';
 
@@ -131,27 +141,39 @@
 	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>';
 
-	if($c['online'])
+	if($showversion=='on')
 	{
-		if($showversion=='on')
-		{
-			$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>';
-	        }
+		// get alx version info for
+		$alxinfo = sqlfirst('SELECT * FROM client_version WHERE serial='.$c['serial']);
+		$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='unknown';
+		if($alxutils == '') $alxutils='unknown';
+
+		echo '<td>'.$alxver.'</td>';
+		echo '<td>'.$alxutils.'</td>';
 	}
 
 	echo '<td>';
@@ -165,7 +187,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		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'].'		'.$osver[1].'	'.$alxutils.'	'; @@ -165,7 +187,7 @@ else echo ''; echo '