Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 439 by niro, Thu Jun 5 11:12:21 2008 UTC revision 467 by niro, Thu Jun 5 21:29:56 2008 UTC
# Line 1  Line 1 
1  <?  <?
2   // INCLUDE UND TABELLEN-DEFINITIONEN   // INCLUDE UND TABELLEN-DEFINITIONEN
3   include('include/basesql.php');   include('include/basesql.php');
4   $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');
5   $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);
6   $data = array();   $data = array();
7    
8   if($kill==1)   if($kill==1)
# Line 29  Line 29 
29   $drop['keyboard'] = array('kbd');   $drop['keyboard'] = array('kbd');
30   $drop['cfg_network_module'] = array('auto','3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211');   $drop['cfg_network_module'] = array('auto','3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211');
31   $drop['networking'] = array('dhcp', 'static');   $drop['networking'] = array('dhcp', 'static');
32     $drop['default_iface'] = sqlarr('SELECT iface FROM cfg_interfaces where serial='.$id, '', 'iface');
33     $drop['iface'] = 'show';
34   $drop['port'] = array('lpt1', 'com1', 'com2', 'lpd', 'socket', 'ipp');   $drop['port'] = array('lpt1', 'com1', 'com2', 'lpd', 'socket', 'ipp');
35   $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');   $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
36   $drop['id'] = 'hidden';   $drop['id'] = 'hidden';
# Line 37  Line 39 
39   $drop['monitorid'] = 'monitorid';   $drop['monitorid'] = 'monitorid';
40   $drop['hostname'] = 'bold';   $drop['hostname'] = 'bold';
41   $drop['session'] = 'bold';   $drop['session'] = 'bold';
42     $drop['displaymode'] = array('fullscreen', 'seamless', '1280x1024', '1024x768', '800x600');
43   $drop['cfg_autostart_session'] = 'filename';   $drop['cfg_autostart_session'] = 'filename';
44   $drop['mtime'] = 'showtime';   $drop['mtime'] = 'showtime';
45   $drop['mac'] = 'show';   $drop['mac'] = 'show';
# Line 57  Line 60 
60   'sierpinski', 'slip', 'solitare', 'space', 'sphere', 'spiral', 'spline', 'star', 'starfish', 'strange',   'sierpinski', 'slip', 'solitare', 'space', 'sphere', 'spiral', 'spline', 'star', 'starfish', 'strange',
61   'swarm', 'swirl', 't3d', 'tetris', 'thornbird', 'tik_tak', 'toneclock', 'triangle', 'tube', 'turtle',   'swarm', 'swirl', 't3d', 'tetris', 'thornbird', 'tik_tak', 'toneclock', 'triangle', 'tube', 'turtle',
62   'vines', 'voters', 'wator', 'wire', 'world', 'worm', 'xcl', 'xjack');   'vines', 'voters', 'wator', 'wire', 'world', 'worm', 'xcl', 'xjack');
63   //$drop['iface'] = array('eth0', 'wlan0');  
   
64    
65   // ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_   // ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
66   $drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto');   $drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto');
# Line 172  Line 174 
174    
175   foreach($arr as $k=>$v)   foreach($arr as $k=>$v)
176   {   {
177   if( (substr($k,0,9)=='wireless_') xor $wireless ) Continue;   //if( (substr($k,0,9)=='wireless_') xor $wireless ) Continue;
178    
179   $d = $drop[$name.'_'.$k]; if($d==null) $d = $drop[$k];   $d = $drop[$name.'_'.$k]; if($d==null) $d = $drop[$k];
180   $k = str_replace('wireless_', '', $k);   //$k = str_replace('wireless_', '', $k);
181   $k2 = $k;   $k2 = $k;
182    
183   if(is_array($d))   if(is_array($d))
# Line 201  Line 203 
203   echo '</table>';   echo '</table>';
204   closeabs();   closeabs();
205    
206   if($name=='cfg_network' && !$wireless) parsearr($name.'_wireless', $arr, $del, true);   //if($name=='cfg_network' && !$wireless) parsearr($name.'_wireless', $arr, $del, true);
207   }   }
208   function parsearrs($name, $arr)   function parsearrs($name, $arr)
209   {   {

Legend:
Removed from v.439  
changed lines
  Added in v.467