--- alx-src/branches/alx-web-070/show.php	2016/02/08 09:19:00	8512
+++ 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';
@@ -82,12 +80,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';
 
@@ -119,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));
 }
 
 
@@ -221,7 +219,7 @@
 		$k2 = $k;
 
 		# tell something about vesa
-		if ($v == 'vesa') echo '<br><font color="#FF0000">Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!</font><br>';
+//		if ($v == 'vesa') echo '<br><font color="#FF0000">Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!</font><br>';
 
 		if(is_array($d))
 		{
@@ -352,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';
@@ -421,6 +417,10 @@
 	else
 		echo '<input class="but" type=button value="WAKE ON LAN" style="width:150px" onclick="if(confirm(\'WAKE CLIENT #'.$id.' ?\')) window.open(\'wake_on_lan.php?mac='.$data['client_serials']['mac'].'\', \'WakeWin\', \'width=200,height=100\')"><br>';
 
+	// print version info
+	$version = file_get_contents('./VERSION', FILE_USE_INCLUDE_PATH);
+	echo '<br><br><font size="1">v'.$version.'</font>';
+
 echo '</td></tr></table>';
 echo '</form>';
 ?>