--- alx-src/trunk/alx-web/show.php	2008/06/04 23:32:57	435
+++ alx-src/trunk/alx-web/show.php	2008/06/06 08:37:02	471
@@ -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_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,15 @@
 
 	// 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['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['default_iface'] = sqlarr('SELECT iface FROM cfg_interfaces where serial='.$id, '', 'iface');
+	$drop['iface'] = 'show';
 	$drop['port'] = array('lpt1', 'com1', 'com2', 'lpd', 'socket', 'ipp');
 	$drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
 	$drop['id'] = 'hidden';
@@ -36,6 +39,7 @@
 	$drop['monitorid'] = 'monitorid';
 	$drop['hostname'] = 'bold';
 	$drop['session'] = 'bold';
+	$drop['displaymode'] = array('fullscreen', 'seamless', '1280x1024', '1024x768', '800x600');
 	$drop['cfg_autostart_session'] = 'filename';
 	$drop['mtime'] = 'showtime';
 	$drop['mac'] = 'show';
@@ -56,8 +60,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');
@@ -99,7 +102,10 @@
 
 		foreach($tabs as $k=>$t)
 		{
-			if(!$multi[$k])	mysql_query('UPDATE '.$t.' SET '.updatestr(postarr($t)).' WHERE serial='.$id);
+			if(!$multi[$k])
+			{
+				mysql_query('UPDATE '.$t.' SET '.updatestr(postarr($t)).' WHERE serial='.$id);
+			}
 			else
 			{
 				$i=0;
@@ -171,10 +177,10 @@
 
 		foreach($arr as $k=>$v)
 		{
-			if( (substr($k,0,9)=='wireless_') xor $wireless )	Continue;
+			//if( (substr($k,0,9)=='wireless_') xor $wireless )	Continue;
 			
 			$d = $drop[$name.'_'.$k]; if($d==null) $d = $drop[$k];
-			$k = str_replace('wireless_', '', $k);
+			//$k = str_replace('wireless_', '', $k);
 			$k2 = $k;
 
 			if(is_array($d))
@@ -200,7 +206,7 @@
 		echo '</table>';
 		closeabs();
 		
-		if($name=='cfg_network' && !$wireless)	parsearr($name.'_wireless', $arr, $del, true);
+		//if($name=='cfg_network' && !$wireless)	parsearr($name.'_wireless', $arr, $del, true);
 	}
 	function parsearrs($name, $arr)
 	{