--- alx-src/branches/alx-web-060/show.php 2011/07/06 10:37:11 2601 +++ alx-src/branches/alx-web-060/show.php 2011/07/06 14:40:22 2608 @@ -53,7 +53,17 @@ $drop['cfg_network_module'] = array('3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211', 'b44', 'bnx2', 'dl2k', 'e1000', 'forcedeth', 'r8169', 'sk98lin', 'tg3', 'via-velocity'); } $drop['networking'] = array('dhcp', 'static'); -$drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp'); +// 0.6.0 does not support lpd, ipp and socket printing atm +if($alxos>='0.6.0') +{ + $drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2'); + for ($i=0; $i<999; $i++) { $drop['cfg_printers_'.$i.'_ip'] = 'ignore'; } + $drop['share'] = 'ignore'; +} +else +{ + $drop['cfg_printers_port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp'); +} $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location'); $drop['id'] = 'hidden'; $drop['flg_modified'] = '1'; @@ -119,7 +129,7 @@ if($what=='COMMENT') sqladd('cfg_comments', array('serial'=>$id)); else if($what=='PRINTER') sqladd('cfg_printers', array('serial'=>$id)); else if($what=='MODULE') sqladd('cfg_modules', array('serial'=>$id)); - else if($what=='SESSION') sqladd('cfg_sessions', array('domain'=>'DOM_AKA_NT', 'browseradrs'=>'128.20.50.50;128.20.50.66;128.20.50.71;128.20.50.46;128.20.100.31;128.20.100.32', 'serial'=>$id)); + else if($what=='SESSION') sqladd('cfg_sessions', array('domain'=>'DOM_AKA_NT', 'browseradrs'=>$citrix_browseradrs, 'serial'=>$id)); else if($what=='MENUITEM') sqladd('cfg_other_menuitems', array('serial'=>$id)); } @@ -285,6 +295,7 @@ .keytab, input, textarea, select, option { font-size:8pt; font-family:Tahoma } .but { font-size:10pt; font-family:Tahoma; height:23px } +