/[alx-svn]/alx-src/trunk/alx-web/show.php

Diff of /alx-src/trunk/alx-web/show.php

Parent Directory | Revision Log | View Patch Patch

-revision 433 by niro,
Wed Jun  4 23:28:35 2008 UTC
+revision 470 by niro,
Thu Jun  5 22:04:21 2008 UTC
 Line 1
  <?
  	// 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');
+ 	$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,		0,		0,		0,		0,		1,		1,		1,		1,		1,		0);
+ 	$multi= array(    0,		 0,		  1,		   0,		0,		0,		0,		   1,		   1,		   1,		   1,			1,		   0);
  	$data = array();
  	if($kill==1)
 Line 22
  	// 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['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['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['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';
-Line 36
+Line 39
  	$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';
-Line 56
+Line 60
  			'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');
-Line 99
+Line 102
  		foreach($tabs as $k=>$t)
  		{
- 			if(!$multi[$k])	mysql_query('UPDATE '.$t.' SET '.updatestr(postarr($t)).' WHERE serial='.$id);
+ 			if(!$multi[$k])
+ 			{
+ 				if(updatestr(postarr($t))='') $myupdatestr='NULL' else $myupdatestr=updatestr(postarr($t));
+ 				echo "debug1: '".$myupdatestr."'<br>";
+ 				//mysql_query('UPDATE '.$t.' SET '.updatestr(postarr($t)).' WHERE serial='.$id);
+ 				mysql_query('UPDATE '.$t.' SET '.$myupdatestr.' WHERE serial='.$id);
+ 			}
  			else
  			{
  				$i=0;
-Line 108
+Line 117
  					if($_POST[$t.'_'.$i.'_delete'])
  						mysql_query('DELETE FROM '.$t.' WHERE serial='.$id.' AND id='.$_POST[$t.'_'.$i.'_id']);
  					else
- 						mysql_query('UPDATE '.$t.' SET '.updatestr(postarr($t.'_'.$i)).' WHERE serial='.$id.' AND id='.$_POST[$t.'_'.$i.'_id']);
+ 						if(updatestr(postarr($t.'_'.$i)))='') $myupdatestr='NULL' else $myupdatestr=updatestr(postarr($t.'_'.$i)));
+ 						echo "debug2: '".$myupdatestr."'<br>";
+ 						//mysql_query('UPDATE '.$t.' SET '.updatestr(postarr($t.'_'.$i)).' WHERE serial='.$id.' AND id='.$_POST[$t.'_'.$i.'_id']);
+ 						mysql_query('UPDATE '.$t.' SET '.$myupdatestr.' WHERE serial='.$id.' AND id='.$_POST[$t.'_'.$i.'_id']);
  					$i++;
  				}
  	 		}
-Line 171
+Line 183
  		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))
-Line 200
+Line 212
  		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)
  	{
-Line 345
+Line 357
  				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';

 Legend:



Removed from v.433
 


changed lines


 
Added in v.470
 Legend:



Removed from v.433
 


changed lines


 
Added in v.470
-Removed from v.433
+Added in v.470