--- alx-src/trunk/alx-web/show.php 2008/06/05 11:00:34 438
+++ alx-src/trunk/alx-web/show.php 2008/06/05 22:04:21 470
@@ -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)
@@ -29,6 +29,8 @@
$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';
@@ -37,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';
@@ -57,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');
@@ -100,7 +102,13 @@
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."'
";
+ //mysql_query('UPDATE '.$t.' SET '.updatestr(postarr($t)).' WHERE serial='.$id);
+ mysql_query('UPDATE '.$t.' SET '.$myupdatestr.' WHERE serial='.$id);
+ }
else
{
$i=0;
@@ -109,7 +117,10 @@
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."'
";
+ //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++;
}
}
@@ -172,10 +183,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))
@@ -201,7 +212,7 @@
echo '';
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)
{