--- alx-src/branches/alx-web-070/show.php 2016/02/08 09:20:44 8514
+++ alx-src/branches/alx-web-070/show.php 2017/04/06 13:58:42 9474
@@ -6,7 +6,7 @@
// 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_sessions_rdesktop', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'client_version');
+$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();
@@ -36,7 +36,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');
}
@@ -62,8 +62,6 @@
$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['client_serials_serial'] = 'show';
@@ -84,7 +82,8 @@
// ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
$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_key_length'] = sqlarr('SELECT value FROM values_network_wireless_key_lenght 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';
@@ -118,8 +117,8 @@
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));
+ else if($what=='MENUITEM') sqladd('cfg_fluxbox_menuitem', array('serial'=>$id));
+ else if($what=='AUTOSTART') sqladd('cfg_fluxbox_autostart', array('serial'=>$id));
}
@@ -351,9 +350,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';
@@ -420,6 +417,10 @@
else
echo '
';
+ // print version info
+ $version = file_get_contents('./VERSION', FILE_USE_INCLUDE_PATH);
+ echo '
v'.$version.'';
+
echo '';
echo '';
?>