--- alx-src/branches/alx-web-070/show.php	2015/09/14 09:22:59	7129
+++ alx-src/branches/alx-web-070/show.php	2015/09/14 15:02:03	7130
@@ -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', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'client_version');
-$multi= array(	0,		 0,		0,		0,		1,		0,		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_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'client_version');
+$multi= array(	0,		 0,		0,		0,		1,		0,		1,		1,		1,		1,		1,		1,		0,	0);
 $data = array();
 
 // get alx version info for 
@@ -61,7 +61,7 @@
 $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 where serial='.$id, '', 'filename');
+$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';
@@ -92,15 +92,18 @@
 
 // get current citrix sessions
 // split all citrix server into an array to get the first server from list
-$citrix_query_browser = split(";", $citrix_browseradrs);
-exec($wwwroot.'/pnabrowse-wrapper -A '.$citrix_query_browser[0], $returned_citrix_sessions, $retval);
-if ($retval == 0)
-{
-	$citrix_public_applications = str_replace("'", "", $returned_citrix_sessions);
-	// add an empty value add the first position of the array as session-default
-	array_unshift($citrix_public_applications, "");
-	for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; }
-}
+//$citrix_query_browser = split(";", $citrix_browseradrs);
+//exec($wwwroot.'/pnabrowse-wrapper -A '.$citrix_query_browser[0], $returned_citrix_sessions, $retval);
+//if ($retval == 0)
+//{
+//	$citrix_public_applications = str_replace("'", "", $returned_citrix_sessions);
+//	// add an empty value add the first position of the array as session-default
+//	array_unshift($citrix_public_applications, "");
+//	for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; }
+//}
+
+$drop['cfg_sessions_citrix_session'] = sqlarr('SELECT session FROM values_citrix_session where enabled=1', '', 'session');
+
 
 // GGF. NEUEN DATENSATZ EINFÜGEN
 if(isset($_POST['do_add']))
@@ -109,7 +112,7 @@
 	if($what=='COMMENT')		sqladd('cfg_comments', array('serial'=>$id));
 	else if($what=='PRINTER')	sqladd('cfg_printers', array('serial'=>$id));
 	else if($what=='MODULE')	sqladd('cfg_modules', array('serial'=>$id));
-	else if($what=='SESSION')	sqladd('cfg_sessions', array('domain'=>$citrix_domain_name, 'browseradrs'=>$citrix_browseradrs, 'serial'=>$id));
+	else if($what=='SESSION-CITRIX')	sqladd('cfg_sessions_citrix', array('domain'=>$citrix_domain_name, 'browseradrs'=>$citrix_browseradrs, 'serial'=>$id));
 	else if($what=='MENUITEM')	sqladd('cfg_other_menuitems', array('serial'=>$id));
 	else if($what=='AUTOSTART')	sqladd('cfg_autostart', array('serial'=>$id));
 }
@@ -373,7 +376,7 @@
 
 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD COMMENT" style="width:150px"><br>';
 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD PRINTER" style="width:150px"><br>';
-	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD SESSION" style="width:150px"><br>';
+	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD SESSION-CITRIX" style="width:150px"><br>';
 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD MODULE" style="width:150px"><br>';
 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD MENUITEM" style="width:150px"><br>';
 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD AUTOSTART" style="width:150px"><br>';