--- alx-src/branches/alx-web-070/show.php 2015/11/03 11:05:28 7743 +++ alx-src/branches/alx-web-070/show.php 2016/02/02 13:16:11 8475 @@ -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_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_autostart', 'client_serials', 'cfg_comments', 'cfg_printers', 'cfg_sessions_citrix', 'cfg_sessions_storefront', 'cfg_sessions_rdesktop', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'cfg_scm_egk', 'client_version'); +$multi= array( 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0); $data = array(); // get alx version info for @@ -20,13 +20,14 @@ 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; @@ -79,6 +80,7 @@ $drop['client_version_os'] = 'show'; $drop['client_version_utils'] = 'show'; $drop['hwdetected'] = 'ignore'; +$drop['cfg_scm_egk_facility'] = 'ignore'; // ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_ $drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto'); @@ -117,6 +119,7 @@ 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=='SESSION-RDP') sqladd('cfg_sessions_rdesktop', array('domain'=>$rdesktop_domain_name, 'server'=>$rdesktop_server, 'serial'=>$id)); else if($what=='MENUITEM') sqladd('cfg_other_menuitems', array('serial'=>$id)); else if($what=='AUTOSTART') sqladd('cfg_autostart', array('serial'=>$id)); } @@ -381,13 +384,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 '

'; @@ -407,7 +412,10 @@ echo 'Status: '.$state.'line
'; if($state=='On') { - echo 'IP: '.$conn['ip'].'

'; + echo 'IP: '.$conn['ip'].'
'; + if($conn['netboot'] == 1) echo 'Boot: Netboot (PXE)
'; + else echo 'Boot: Local Disk
'; + echo '
'; echo 'OS: '.$alxos.'
'; echo 'Utils: '.$alxutils.'
'; } @@ -420,30 +428,30 @@ echo '
'; echo '
'; echo '
'; - echo 'Hardware Detection:
'; - echo ''; - echo ''; - echo ''; - echo '
'; - echo ''; - echo ''; - 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 '
'; +// echo '

'; +// echo '
'; +// echo 'Client Update:
'; +// echo '
'; +// echo '
'; +// echo '
'; } else echo '
'; - echo '
[ChangeLog] [FAQs]
'; +// echo '
[ChangeLog] [FAQs]
'; echo ''; echo '';