--- alx-src/branches/alx-web-060/show.php 2011/07/07 19:30:13 2634 +++ alx-src/branches/alx-web-060/show.php 2011/11/04 11:32:24 3299 @@ -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,13 +35,34 @@ // FELD-DEFINITIONEN (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID) $drop = array(); -if($alxos >= '0.5.3') +if($alxos >= '0.6.0') +{ + if($alxos >= '0.6.2') + { + $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'unichrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware'); + } + else + { + $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'); @@ -62,7 +86,7 @@ } else { - $drop['cfg_printers_port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp'); + $drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp'); } $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location'); $drop['id'] = 'hidden'; @@ -82,8 +106,8 @@ $drop['session'] = 'bold'; if($alxos>='0.6.0') { - $drop['cfg_autostart_session'] = array(''); - $drop['cfg_autostart_session'] += sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, 'array', 'filename'); + $drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, '', 'filename'); + array_unshift($drop['cfg_autostart_session'], ""); } else { @@ -122,12 +146,38 @@ $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 -exec($wwwroot.'/pnabrowse-wrapper -A '.str_replace(";", " ", $citrix_browseradrs), $returned_citrix_sessions,$retval); -if ($retval == 0) +if($alxos>='0.6.0') { - $citrix_public_applications = str_replace("'", "", $returned_citrix_sessions); - for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; } + // 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 @@ -139,6 +189,7 @@ else if($what=='MODULE') sqladd('cfg_modules', array('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)); } @@ -258,7 +309,20 @@ $v='openchrome'; } } - + if($alxos >= '0.6.2') + { + if($v == 'via') + { + echo '
Replaced "via" with "unichrome" - Please press SAVE!
'; + $v='unichrome'; + } + if($v == 'openchrome') + { + echo '
Replaced "openchrome" with "unichrome" - Please press SAVE!
'; + $v='unichrome'; + } + } + # tell something about vesa if ($v == 'vesa') echo '
Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!
'; @@ -272,6 +336,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.''; @@ -312,6 +389,7 @@ var $url = url.split("?"); $.ajax({type:""+typ+"",url:$url[0],data:$url[1],cache:false,success:function(data){ alert(data); }}); } + function plugin(name,id) { window.open('plugin.php?plugin='+name+'&id='+id, '', 'width=350,height=180'); } /* ignore this atm, not always working, sometime open does not work function openclose(nummer, act) @@ -414,8 +492,12 @@ echo '
'; echo '
'; echo '
'; - echo '

'; - + echo '
'; + if($alxos >= '0.6.0') + { + echo '
'; + } + echo '
'; if($id>0) $KILLCAP='DEACTIVATE'; else $KILLCAP='ACTIVATE'; echo '
'; @@ -484,14 +566,17 @@ echo ''; echo ''; echo ''; + echo '
'; + echo ''; + echo ''; echo '

'; } echo '
'; echo 'Remote Shadow:
'; - echo '
'; - echo '
'; - echo '
'; + echo ''; + echo ''; + echo '

'; echo '
'; echo 'Client Update:
'; echo '
';