--- alx-src/branches/alx-web-060/show.php 2011/06/15 14:24:07 2419 +++ alx-src/branches/alx-web-060/show.php 2011/11/02 14:27:28 3283 @@ -6,8 +6,8 @@ // INCLUDE CURRENT-PROBLEMS include('include/current-problems.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', 'client_version'); -$multi= array( 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0); +$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', 'client_version', 'cfg_plugins'); +$multi= array( 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1); $data = array(); @@ -16,6 +16,9 @@ $alxos = $alxinfo[os]; $alxutils = $alxinfo[utils]; +// get gfxdriver +$gfxinfo = sqlfirst('SELECT * FROM cfg_graphic WHERE serial='.$id); + if($kill==1) { foreach($tabs as $t) mysql_query('UPDATE '.$t.' SET serial=-serial WHERE serial='.$id); @@ -32,21 +35,52 @@ // FELD-DEFINITIONEN (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID) $drop = array(); -if($alxos >= '0.5.3') +if($alxos >= '0.6.0') +{ + $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware'); + if($gfxinfo[module] == 'intel') + { + $drop['cfg_graphic_hdmi'] = array('disable', 'enable'); + } + else + { + $drop['cfg_graphic_hdmi'] = 'ignore'; + } +} +else if($alxos >= '0.5.3') { $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng'); + $drop['cfg_graphic_hdmi'] = 'ignore'; } else { $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i810', 'i710', 'nv', 'mga', 'r128', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'via'); + $drop['cfg_graphic_hdmi'] = 'ignore'; } $drop['resolution'] = array('640x480', '800x600', '1024x768', '1280x960', '1280x1024', '1360x768', '1366x768', '1400x1050', '1440x900', '1600x1200', '1680x1050', '1280x720', '1920x1080'); $drop['depth'] = array('24', '16', '8'); $drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2'); $drop['keyboard'] = array('PC105'); -$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'); +if($alxos >= '0.6.0') +{ + $drop['cfg_network_module'] = array('3c509', '3c59x', '8139cp', '8139too', '8390', 'amd8111e', 'atl1c', 'atl1e', 'atl1', 'atl2', 'b44', 'bnx2', 'cnic', 'e100', 'e1000', 'e1000e', 'forcedeth', 'igb', 'ipg', 'jme', 'natsemi', 'ne2k-pci', 'ns83820', 'pcnet32', 'qla3xxx', 'r8169', 'sis190', 'sis900', 'skge', 'sky2', 'tg3', 'typhoon', 'via-rhine', 'via-velocity', 'adm8211', 'airo', 'at76c50x-usb', 'ar9170usb', 'ath5k', 'ath9k', 'atmel', 'b43', 'b43legacy', 'hostap_pci', 'hostap_plx', 'ipw2100', 'ipw2200', 'iwl3945', 'usb8xxx', 'libertas_tf', 'libertas_tf_usb', 'mwl8k', 'orinoco', 'orinoco_nortel', 'orinoco_plx', 'orinoco_tmd', 'orinoco_usb', 'p54pci', 'p54usb', 'prism54', 'rndis_wlan', 'rt2400pci', 'rt2500pci', 'rt2500usb', 'rt2800pci', 'rt2800usb', 'rt61pci', 'rt73usb', 'rtl8180', 'rtl8187', 'wl1251', 'wl1271', 'zd1201', 'zd1211rw'); +} +else +{ + $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['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'; @@ -63,7 +97,15 @@ } $drop['hostname'] = 'bold'; $drop['session'] = 'bold'; -$drop['cfg_autostart_session'] = 'filename'; +if($alxos>='0.6.0') +{ + $drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, '', 'filename'); + array_unshift($drop['cfg_autostart_session'], ""); +} +else +{ + $drop['cfg_autostart_session'] = 'filename'; +} $drop['mtime'] = 'showtime'; $drop['mac'] = 'show'; $drop['client_serials_serial'] = 'show'; @@ -89,7 +131,7 @@ // ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_ $drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto'); -$drop['wireless_auth_mode'] = array('', 'wep', 'wpa', 'off'); +$drop['wireless_auth_mode'] = array('', 'wep', 'wpa', 'wpa2', 'off'); $drop['wireless_key_length'] = array('', '64', '128', '256'); $drop['wireless_channel'] = array('', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14'); $drop['wireless_frequency'] = array('', '2.412G', '2.417G', '2.422G', '2.427G', '2.432G', '2.437G', '2.442G', @@ -97,6 +139,40 @@ $drop['wireless_key'] = 'password'; $drop['wireless_key_ascii'] = 'password'; +// plugin support +if($alxos>='0.6.0') +{ + for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'pluginconfig'; } + for ($i=0; $i<999; $i++) + { + $drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins', '', 'plugin'); + array_unshift($drop['cfg_plugins_'.$i.'_plugin_array'], ""); + } +} +else +{ + for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_id'] = 'ignore'; } + for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_serial'] = 'ignore'; } + for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'ignore'; } +} + +// get current citrix sessions +if($alxos>='0.6.0') +{ + // split all citrix server into an array to get the first server from list + $citrix_query_browser = split(";", $citrix_browseradrs); + exec($wwwroot.'/pnabrowse-wrapper -A '.$citrix_query_browser[0], $returned_citrix_sessions, $retval); + if ($retval == 0) + { + $citrix_public_applications = str_replace("'", "", $returned_citrix_sessions); + // add an empty value add the first position of the array as session-default + array_unshift($citrix_public_applications, ""); + for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; } + } + else if($retval = 126) echo "pnabrowser-wrapper has no execute permission! please run chmod +x on ".$wwwroot."/pnabrowser-wrapper."; + else echo "pnabrowse-wrapper does not run successfully! retval->'".$retval."'
"; +} + // GGF. NEUEN DATENSATZ EINFÜGEN if(isset($_POST['do_add'])) { @@ -104,8 +180,9 @@ 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'=>$citrix_domain_name, 'browseradrs'=>$citrix_browseradrs, 'serial'=>$id)); else if($what=='MENUITEM') sqladd('cfg_other_menuitems', array('serial'=>$id)); + else if($what=='PLUGIN') sqladd('cfg_plugins', array('serial'=>$id)); } @@ -141,8 +218,10 @@ } } } -} + // reload site + header("location: show.php?id=".$id); +} // EINLESEN DER DATEN AUS SQL-TABELLEN foreach($tabs as $k=>$t) @@ -237,6 +316,19 @@ else if($d=='hidden') echo ''; else if($d=='1') echo ''; else if($d=='monitorid') echo ''.$k2.'= '; + else if($d=='pluginconfig') + { + $dplugin = $drop[$name.'_'.$k.'_array']; if($dplugin==null) $dplugin = $drop[$k]; + if(is_array($dplugin)) + { + echo ''.$k2.'= '; + } + // $v contains the pluginname, get the configure flag + $pflag = sqlfirst('SELECT configflag FROM avail_plugins WHERE plugin="'.$v.'"'); + if ($pflag[configflag]==1) echo 'configure= '; + } else if($d=='bold') echo ''.$k2.'= '; else if($d=='filename') echo 'filename= '; else if($d=='show') echo ''.$k2.'= '.$v.''; @@ -268,15 +360,36 @@ .keytab, input, textarea, select, option { font-size:8pt; font-family:Tahoma } .but { font-size:10pt; font-family:Tahoma; height:23px } +