--- alx-src/branches/alx-web-070/show.php	2015/09/11 15:16:23	7120
+++ alx-src/branches/alx-web-070/show.php	2015/09/11 15:35:13	7124
@@ -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', 'cfg_plugins');
-$multi= array(	0,		 0,		0,		0,		0,		0,		1,		1,		1,		1,		1,		0,	0,	1);
+$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);
 $data = array();
 
 // get alx version info for 
@@ -90,14 +90,6 @@
 $drop['wireless_key'] = 'password';
 $drop['wireless_key_ascii'] = 'password';
 
-// plugin support
-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'], "");
-}
-
 // get current citrix sessions
 // split all citrix server into an array to get the first server from list
 $citrix_query_browser = split(";", $citrix_browseradrs);
@@ -119,7 +111,6 @@
 	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));
 }
 
 
@@ -231,19 +222,6 @@
 		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>';
@@ -285,7 +263,6 @@
 		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)
@@ -377,7 +354,16 @@
 	$state = 'Off';
 	if(count($conn)>0)
 	{
-		if($retval==0)	$state = 'On';
+		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';
+			}
+		}
 	}
 
 	echo '<img src="pics/logo2.jpg"><br><br>';
@@ -389,10 +375,6 @@
 	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>';
-	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';