--- alx-src/branches/alx-web-060/show.php	2011/06/07 18:29:36	2199
+++ alx-src/branches/alx-web-060/show.php	2011/06/27 11:47:42	2444
@@ -1,6 +1,8 @@
 <?
+<?
 // INCLUDE UND TABELLEN-DEFINITIONEN
 include('include/basesql.php');
+include('include/common-functions.php');
 
 // INCLUDE CURRENT-PROBLEMS
 include('include/current-problems.php');
@@ -88,7 +90,7 @@
 
 // ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
 $drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto');
-$drop['wireless_auth_mode'] = array('', 'wep', 'wpa', 'off');
+$drop['wireless_auth_mode'] = array('', 'wep', 'wpa', 'wpa2', 'off');
 $drop['wireless_key_length'] = array('', '64', '128', '256');
 $drop['wireless_channel'] = array('', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14');
 $drop['wireless_frequency'] = array('', '2.412G', '2.417G', '2.422G', '2.427G', '2.432G', '2.437G', '2.442G',
@@ -386,7 +388,7 @@
 	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']);
+		$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']);
 		$osver = explode(':',$osver[1]);
 		if($osver[0] == '') $osver[0]='unkown';
 		if($osver[1] == '') $osver[1]='unkown';