--- alx-src/branches/alx-web-060/show.php	2011/07/07 19:30:13	2634
+++ alx-src/branches/alx-web-060/show.php	2011/07/12 15:10:27	2705
@@ -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,		0,		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', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'client_version', 'cfg_plugins');
+$multi= array(    0,		 0,		0,		0,		0,		0,		1,		1,		1,		1,		1,		0,	0,	1);
 $data = array();
 
 
@@ -32,7 +32,11 @@
 
 // FELD-DEFINITIONEN  (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID)
 $drop = array();
-if($alxos >= '0.5.3')
+if($alxos >= '0.6.0')
+{
+	$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
+}
+else if($alxos >= '0.5.3')
 {
 	$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng');
 }
@@ -82,8 +86,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,12 +126,38 @@
 $drop['wireless_key'] = 'password';
 $drop['wireless_key_ascii'] = 'password';
 
+// plugin support
+if($alxos>='0.6.0')
+{
+	for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'pluginconfig'; }
+	for ($i=0; $i<999; $i++)
+	{
+		$drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins', '', 'plugin');
+		array_unshift($drop['cfg_plugins_'.$i.'_plugin_array'], "");
+	}
+}
+else
+{
+	for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_id'] = 'ignore'; }
+	for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_serial'] = 'ignore'; }
+	for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'ignore'; }
+}
+
 // get current citrix sessions
-exec($wwwroot.'/pnabrowse-wrapper -A '.str_replace(";", " ", $citrix_browseradrs), $returned_citrix_sessions,$retval);
-if ($retval == 0)
+if($alxos>='0.6.0')
 {
-	$citrix_public_applications = str_replace("'", "", $returned_citrix_sessions);
-	for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; }
+	// 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
@@ -139,6 +169,7 @@
 	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=='MENUITEM')	sqladd('cfg_other_menuitems', array('serial'=>$id));
+	else if($what=='PLUGIN')	sqladd('cfg_plugins', array('serial'=>$id));
 }
 
 
@@ -272,6 +303,19 @@
 		else if($d=='hidden') 			echo '<tr><td colspan=2><input type=hidden name="'.$name.'_'.$k.'" value="'.$v.'"></td></tr>';
 		else if($d=='1')			echo '<tr><td colspan=2><input type=hidden name="'.$name.'_'.$k.'" value="1"></td></tr>';
 		else if($d=='monitorid')		echo '<tr><td class="key">'.$k2.'</td><td>= <input type=button style="width:24px" onclick="window.open(\'monitor.php?id='.$id.'\', \'MonitorWin\', \'width=350,height=200\')" value="..."></td>';
+		else if($d=='pluginconfig')
+		{
+			$dplugin = $drop[$name.'_'.$k.'_array']; if($dplugin==null) $dplugin = $drop[$k];
+			if(is_array($dplugin))
+			{
+				echo '<tr><td class="key">'.$k2.'</td><td>= <select style="width:144px" name="'.$name.'_'.$k.'">';
+				foreach($dplugin as $di) if($v==$di) echo '<option selected>'.$di; else echo '<option>'.$di;
+				echo '</select></td></tr>';
+			}
+			// $v contains the pluginname, get the configure flag
+			$pflag = sqlfirst('SELECT configflag FROM avail_plugins WHERE plugin="'.$v.'"');
+			if ($pflag[configflag]==1) echo '<tr><td class="key">configure</td><td>= <input type=button style="width:24px" onclick="window.open(\'plugin.php?id='.$id.'&plugin='.$v.'\', \'PluginWin\', \'width=500,height=400\')" value="..."></td>';
+		}
 		else if($d=='bold')			echo '<tr><td class="key">'.$k2.'</td><td>= <input style="width:144px;font-weight:bold" name="'.$name.'_'.$k.'" value="'.$v.'"></td></tr>';
 		else if($d=='filename')			echo '<tr><td class="key">filename</td><td>= <input style="width:144px;font-weight:bold" name="'.$name.'_'.$k.'" value="'.$v.'"></td></tr>';
 		else if($d=='show')			echo '<tr><td class="key">'.$k2.'</td><td>= <b>'.$v.'</b></td></tr>';
@@ -312,6 +356,7 @@
 		var $url = url.split("?");
 		$.ajax({type:""+typ+"",url:$url[0],data:$url[1],cache:false,success:function(data){ alert(data); }});
 	}
+	function plugin(name,id) { window.open('plugin.php?plugin='+name+'&id='+id, '', 'width=350,height=180'); }
 
 /* ignore this atm, not always working, sometime open does not work
 	function openclose(nummer, act)
@@ -414,8 +459,12 @@
 	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 MODULE" style="width:150px"><br>';
-	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD MENUITEM" style="width:150px"><br><br>';
-
+	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD MENUITEM" style="width:150px"><br>';
+	if($alxos >= '0.6.0')
+	{
+		echo '<input class="but" type=submit name="do_add" value="INSTALL PLUGIN" style="width:150px"><br>';
+	}
+	echo '<br>';
 
 	if($id>0) $KILLCAP='DEACTIVATE'; else $KILLCAP='ACTIVATE';
 	echo '<input class="but" type=button value="'.$KILLCAP.'" style="width:150px" onclick="if(confirm(\''.$KILLCAP.' CLIENT #'.abs($id).' ?\')) { window.open(\'show.php?id='.$id.'&kill=1\', \'DeactWin\', \'width=200,height=100\'); location.href=\'index.php\'; }"><br>';