--- alx-src/trunk/alx-web/show.php	2008/06/04 23:28:35	433
+++ alx-src/trunk/alx-web/show.php	2008/06/05 12:01:24	442
@@ -1,8 +1,8 @@
 <?
 	// INCLUDE UND TABELLEN-DEFINITIONEN
 	include('include/basesql.php');
-	$tabs = array('cfg_graphic', 'cfg_network', 'cfg_input', 'client_auth', 'cfg_autostart', 'client_serials', 'cfg_comments', 'cfg_printers', 'cfg_sessions', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver');
-	$multi= array(    0,		 0,		0,		0,		0,		0,		1,		1,		1,		1,		1,		0);
+	$tabs = array('cfg_graphic', 'cfg_network', 'cfg_network_interfaces', 'cfg_input', 'client_auth', 'cfg_autostart', 'client_serials', 'cfg_comments', 'cfg_printers', 'cfg_sessions', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver');
+	$multi= array(    0,		 0,			1,		0,		0,		0,		0,		1,		1,		1,		1,			1,		0);
 	$data = array();
 
 	if($kill==1)
@@ -22,12 +22,14 @@
 
 	// FELD-DEFINITIONEN  (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID)
 	$drop = array();
-	$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i810', 'i710', 'nv', 'mga', 'r128', 'radeon', 's3', 's3virge', 'sis', 'trident', 'tseng', 'via');
- 	$drop['resolution'] = array('640x480', '800x600', '1024x768', '1280x1024','1360x768', '1366x768', '1600x1200');
+	$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i810', 'i710', 'nv', 'mga', 'r128', 'radeon', 's3', 's3virge', 'sis', 'trident', 'tseng', 'via', 'vmware');
+	$drop['resolution'] = array('640x480', '800x600', '1024x768', '1280x1024','1360x768', '1366x768', '1600x1200');
 	$drop['depth'] = array('24', '16', '8');
 	$drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
-	$drop['cfg_network_module'] = array('3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211');
+	$drop['keyboard'] = array('kbd');
+	$drop['cfg_network_module'] = array('auto','3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211');
 	$drop['networking'] = array('dhcp', 'static');
+	$drop['iface'] = 'show';
 	$drop['port'] = array('lpt1', 'com1', 'com2', 'lpd', 'socket', 'ipp');
 	$drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
 	$drop['id'] = 'hidden';
@@ -56,8 +58,7 @@
 			'sierpinski', 'slip', 'solitare', 'space', 'sphere', 'spiral', 'spline', 'star', 'starfish', 'strange',
 			'swarm', 'swirl', 't3d', 'tetris', 'thornbird', 'tik_tak', 'toneclock', 'triangle', 'tube', 'turtle',
 			'vines', 'voters', 'wator', 'wire', 'world', 'worm', 'xcl', 'xjack');
-	$drop['iface'] = array('eth0', 'wlan0');
-	
+
 	
 	// ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
 	$drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto');
@@ -345,7 +346,7 @@
 				fwrite($hostfile,$conn['ip']." ".$row[0],strlen($row[0])+strlen($conn['ip'])+1);
 				fclose($hostfile);
 
-				$osver = exec($sshcmd.' -l root '.$conn['ip'].' \'os_ver=$(<'$mageversion.');cfg_ver=$(/sbin/magequery -n '.$alxconfig.'|cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"\'');
+				$osver = exec($sshcmd.' -l root '.$conn['ip'].' \'os_ver=$(<'.$mageversion.');cfg_ver=$(/sbin/magequery -n '.$alxconfig.'|cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"\'');
 				$osver = explode(':',$osver);
 			}
 			if($osver[0] == '') $osver[0]='unkown';