--- alx-src/branches/alx-web-070/show.php	2016/02/08 09:58:38	8524
+++ alx-src/branches/alx-web-070/show.php	2017/11/23 10:21:44	11133
@@ -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();
 
@@ -14,6 +14,7 @@
 $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);
@@ -36,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');
 }
@@ -62,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';
@@ -119,8 +119,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));
 }
 
 
@@ -402,6 +402,7 @@
 		echo '<br>';
 		echo '<u>OS:</u> '.$alxos.'<br>';
 		echo '<u>Utils:</u> '.$alxutils.'<br>';
+		echo '<u>Arch:</u> '.$alxarch.'<br>';
 	}
 
 	echo '</b></div>';
@@ -419,6 +420,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>';
 ?>