--- alx-src/branches/alx-web-070/show.php 2015/12/16 15:17:38 8004 +++ alx-src/branches/alx-web-070/show.php 2017/11/23 10:21:44 11133 @@ -6,27 +6,29 @@ // 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_citrix', 'cfg_sessions_storefront', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'client_version'); -$multi= array( 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0); +$tabs = array('cfg_graphic', 'cfg_network', 'cfg_input', 'client_auth', 'cfg_fluxbox_autostart', 'client_serials', 'cfg_comments', 'cfg_printers', 'cfg_sessions_citrix', 'cfg_sessions_storefront', 'cfg_sessions_rdesktop', 'cfg_modules', 'cfg_fluxbox_menuitem', 'cfg_screensaver', 'client_version'); +$multi= array( 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0); $data = array(); // get alx version info for $alxinfo = sqlfirst('SELECT * FROM client_version WHERE serial='.$id); $alxos = $alxinfo[os]; $alxutils = $alxinfo[utils]; +$alxarch = $alxinfo[arch]; // 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); + if($method=='DEACTIVATE') mysql_query('UPDATE client_serials SET enabled="0" WHERE serial='.$id); + else mysql_query('UPDATE client_serials SET enabled="1" WHERE serial='.$id); echo ''; echo '
'; - if($id<0) echo 'ACTIVATED #'.abs($id); - else echo 'DEACTIVATED #'.$id; + if($method=='DEACTIVATE') echo 'DEACTIVATED #'.$id; + else echo 'ACTIVATED #'.$id; echo '
'; return true; @@ -35,7 +37,7 @@ // FELD-DEFINITIONEN (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID) $drop = array(); $drop['cfg_graphic_module'] = sqlarr('SELECT value FROM values_graphic_module where enabled=1', '', 'value'); -if($gfxinfo[module] == 'intel') +if($gfxinfo['module'] == 'intel') { $drop['cfg_graphic_hdmi'] = array('disable', 'enable'); } @@ -61,10 +63,9 @@ $drop['refresh_rate'] = sqlarr('SELECT value FROM values_graphic_refresh_rate where enabled=1', '', 'value'); $drop['hostname'] = 'bold'; $drop['session'] = 'bold'; -$drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions_citrix where serial='.$id, '', 'filename'); -array_unshift($drop['cfg_autostart_session'], ""); $drop['mtime'] = 'showtime'; $drop['mac'] = 'show'; +$drop['arch'] = 'show'; $drop['client_serials_serial'] = 'show'; $drop['password'] = 'password'; //$drop['shell'] = 'password'; @@ -81,12 +82,12 @@ $drop['hwdetected'] = 'ignore'; // 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', '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', - '2.447G', '2.452G', '2.457G', '2.462G', '2.467G', '2.472G', '2.484G'); +$drop['wireless_mode'] = sqlarr('SELECT value FROM values_network_wireless_mode where enabled=1', '', 'value'); +$drop['wireless_auth_mode'] = sqlarr('SELECT value FROM values_network_wireless_auth_mode where enabled=1', '', 'value'); +$drop['wireless_bitrate'] = sqlarr('SELECT value FROM values_network_wireless_bitrate where enabled=1', '', 'value'); +$drop['wireless_key_length'] = sqlarr('SELECT value FROM values_network_wireless_key_length where enabled=1', '', 'value'); +$drop['wireless_channel'] = sqlarr('SELECT value FROM values_network_wireless_channel where enabled=1', '', 'value'); +$drop['wireless_frequency'] = sqlarr('SELECT value FROM values_network_wireless_frequency where enabled=1', '', 'value'); $drop['wireless_key'] = 'password'; $drop['wireless_key_ascii'] = 'password'; @@ -117,8 +118,9 @@ else if($what=='MODULE') sqladd('cfg_modules', array('serial'=>$id)); else if($what=='SESSION-CITRIX') sqladd('cfg_sessions_citrix', array('domain'=>$citrix_domain_name, 'serverlist'=>$citrix_serverlist, 'serial'=>$id)); else if($what=='SESSION-STOREFRONT') sqladd('cfg_sessions_storefront', array('domain'=>$storefront_domain_name, 'store'=>$storefront_store, 'serial'=>$id)); - else if($what=='MENUITEM') sqladd('cfg_other_menuitems', array('serial'=>$id)); - else if($what=='AUTOSTART') sqladd('cfg_autostart', array('serial'=>$id)); + else if($what=='SESSION-RDP') sqladd('cfg_sessions_rdesktop', array('domain'=>$rdesktop_domain_name, 'server'=>$rdesktop_server, 'serial'=>$id)); + else if($what=='MENUITEM') sqladd('cfg_fluxbox_menuitem', array('serial'=>$id)); + else if($what=='AUTOSTART') sqladd('cfg_fluxbox_autostart', array('serial'=>$id)); } @@ -219,7 +221,7 @@ $k2 = $k; # tell something about vesa - if ($v == 'vesa') echo '
Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!
'; +// if ($v == 'vesa') echo '
Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!
'; if(is_array($d)) { @@ -272,19 +274,6 @@ $.ajax({type:""+typ+"",url:$url[0],data:$url[1],cache:false,success:function(data){ alert(data); }}); } -/* ignore this atm, not always working, sometime open does not work - function openclose(nummer, act) - { - var bild = document.images['sch_bild_'+nummer]; - var absatz = document.all['sch_absatz_'+nummer].style; - var senden = false; - - $("#sch_absatz_"+nummer).toggle(0, function(){ - if($(this).css("display")=="none"){$("#sch_bild_"+nummer).attr({title:'OPEN',src:'pics/plus.gif'});}else{$("#sch_bild_"+nummer).attr({title:'CLOSE',src:'pics/minus.gif'});} - }); - if(act<=1){ $("#sch_bild_"+nummer).attr({title:'CLOSE',src:'pics/minus.gif'}); }else{ $("#sch_bild_"+nummer).attr({title:'OPEN',src:'pics/plus.gif'}); }; - } -*/ function openclose(nummer, act) { var bild = document.images['sch_bild_'+nummer]; @@ -363,9 +352,7 @@ { if($retval==0) { - // first try mcore, then get ssh $ping_retval = ping_host($conn['ip'],$mcore_port,$ping_timeout); - if($ping_retval==1) $ping_retval = ping_host($dat['ip'],$ssh_port,$ping_timeout); if($ping_retval==0) { $state = 'On'; @@ -381,13 +368,15 @@ echo '
'; echo '
'; echo '
'; + echo '
'; echo '
'; echo '
'; echo '
'; echo '
'; - if($id>0) $KILLCAP='DEACTIVATE'; else $KILLCAP='ACTIVATE'; - echo '
'; + $clientstatus = sqlfirst('SELECT * FROM client_serials WHERE serial='.$id); + if($clientstatus['enabled']>0) $KILLCAP='DEACTIVATE'; else $KILLCAP='ACTIVATE'; + echo '
'; echo '
'; echo '

'; @@ -413,6 +402,7 @@ echo '
'; echo 'OS: '.$alxos.'
'; echo 'Utils: '.$alxutils.'
'; + echo 'Arch: '.$alxarch.'
'; } echo ''; @@ -423,30 +413,16 @@ echo '
'; echo '
'; echo '
'; -// echo 'Hardware Detection:
'; -// echo ''; -// echo ''; -// echo ''; -// echo '
'; -// echo ''; -// echo ''; -// echo ''; -// echo '

'; -// echo '
'; echo 'Remote Shadow:
'; echo ''; echo ''; -// echo '

'; -// echo '
'; -// echo 'Client Update:
'; -// echo '
'; -// echo '
'; -// echo '
'; } else echo '
'; -// echo '
[ChangeLog] [FAQs]
'; + // print version info + $version = file_get_contents('./VERSION', FILE_USE_INCLUDE_PATH); + echo '

v'.$version.''; echo ''; echo '';