--- alx-src/branches/alx-web-060/show.php	2011/07/06 14:15:18	2606
+++ alx-src/branches/alx-web-060/show.php	2011/07/11 08:39:05	2640
@@ -56,9 +56,9 @@
 // 0.6.0 does not support lpd, ipp and socket printing atm
 if($alxos>='0.6.0')
 {
-	$drop['cfg_printers_port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2');
+	$drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2');
 	for ($i=0; $i<999; $i++) { $drop['cfg_printers_'.$i.'_ip'] = 'ignore'; }
-	$drop['cfg_printers_share'] = 'ignore';
+	$drop['share'] = 'ignore';
 }
 else
 {
@@ -82,8 +82,8 @@
 $drop['session'] = 'bold';
 if($alxos>='0.6.0')
 {
-	$drop['cfg_autostart_session'] = array('');
-	$drop['cfg_autostart_session'] += sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, 'array', 'filename');
+	$drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, '', 'filename');
+	array_unshift($drop['cfg_autostart_session'], "");
 }
 else
 {
@@ -122,6 +122,23 @@
 $drop['wireless_key'] = 'password';
 $drop['wireless_key_ascii'] = 'password';
 
+// get current citrix sessions
+if($alxos>='0.6.0')
+{
+	// 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; }
+	}
+	else if($retval = 126) echo "pnabrowser-wrapper has no execute permission! please run chmod +x on ".$wwwroot."/pnabrowser-wrapper.";
+	else echo "pnabrowse-wrapper does not run successfully! retval->'".$retval."'<br>";
+}
+
 // GGF. NEUEN DATENSATZ EINFÜGEN
 if(isset($_POST['do_add']))
 {
@@ -129,7 +146,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'=>'DOM_AKA_NT', 'browseradrs'=>'128.20.50.50;128.20.50.66;128.20.50.71;128.20.50.46;128.20.100.31;128.20.100.32', 'serial'=>$id));
+	else if($what=='SESSION')	sqladd('cfg_sessions', array('domain'=>$citrix_domain_name, 'browseradrs'=>$citrix_browseradrs, 'serial'=>$id));
 	else if($what=='MENUITEM')	sqladd('cfg_other_menuitems', array('serial'=>$id));
 }