--- alx-src/branches/alx-web-060/show.php	2011/06/30 11:30:32	2496
+++ alx-src/branches/alx-web-060/show.php	2011/07/06 10:15:09	2598
@@ -275,6 +275,12 @@
 <script language="JavaScript" src="openclose_ajax.js"></script>
 <script language="JavaScript">
 
+	// opens an url and shows retval in a javascript-alert on current site
+	function urlopen(url,typ) {
+		var $url = url.split("?");
+		$.ajax({type:""+typ+"",url:$url[0],data:$url[1],cache:false,success:function(data){ alert(data); }});
+	}
+
 	function openclose(nummer, act)
 	{			
 		var bild = document.images['sch_bild_'+nummer];
@@ -382,7 +388,7 @@
 	echo '<input class="but" type=button '.$disdanach.' value=">" style="width:30px" onclick="location.href=\'show.php?id='.($id+1).'\'">';
 	echo '<br><input class="but" type=button value="INDEX" style="width:150px; font-weight:bold" onclick="location.href=\'index.php\'"><br><br>';
 
-	echo '<br><br>';
+	echo '<br>';
 	echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff"><b>';
 	if($id<0)	echo '<b>DEACTIVATED!</b><br><br>';
 	echo '<u>Serial:</u>&nbsp;&nbsp;#'.$id.'<br>';
@@ -391,7 +397,11 @@
 	if($state=='On')
 	{
 		echo '<u>IP:</u> '.$conn['ip'].'<br><br>';
-		$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}"', $conn['ip']);
+		if($alxos >= '0.6.0') {
+			$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}"', $conn['ip']);
+		} else {
+			$osver = sshdo('os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng-alx | cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"', $conn['ip']);
+		}
 		$osver = explode(':',$osver[1]);
 		if($osver[0] == '') $osver[0]='unkown';
 		if($osver[1] == '') $osver[1]='unkown';
@@ -422,6 +432,17 @@
 		echo '<input class="but" type=button value="REBOOT" style="width:150px" onclick="if(confirm(\'REBOOT CLIENT #'.$id.' ?\')) window.open(\'reboot.php?client='.$id.'&ip='.$conn['ip'].'&op=reboot\', \'ShutdownWin\', \'width=200,height=100\')"><br>';
 		echo '<input class="but" type=button value="SHUTDOWN" style="width:150px" onclick="if(confirm(\'SHUTDOWN CLIENT #'.$id.' ?\')) window.open(\'reboot.php?client='.$id.'&ip='.$conn['ip'].'&op=halt\', \'ShutdownWin\', \'width=200,height=100\')"><br>';
 		echo '<br>';
+
+		if($alxos >= '0.6.0')
+		{
+			echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
+			echo 'Hardware Detection:</b></div>';
+			echo '<input class="but" type=button value="LAN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=lan\',\'POST\');">';
+			echo '<input class="but" type=button value="WLAN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=wlan\',\'POST\');">';
+			echo '<input class="but" type=button value="VGA" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=vga\',\'POST\');">';
+			echo '<br><br>';
+		}
+
 		echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
 		echo 'Remote Shadow:</b></div>';
 		echo '<input class="but" type=button value="VNC" style="width:150px" onclick="window.open(\'vncviewer.php?ip='.$conn['ip'].'\', \'VncViewer\', \'width=200,height=100\')"><br>';