--- alx-src/branches/alx-web-070/show.php	2015/09/11 12:12:31	7114
+++ alx-src/branches/alx-web-070/show.php	2015/09/15 08:33:39	7140
@@ -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_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 
@@ -45,12 +45,13 @@
 }
 $drop['resolution'] = sqlarr('SELECT value FROM values_graphic_resolution where enabled=1', '', 'value');
 $drop['depth'] = sqlarr('SELECT value FROM values_graphic_depth where enabled=1', '', 'value');
-$drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
-$drop['keyboard'] = array('PC105');
+//$drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
+//$drop['keyboard'] = array('PC105');
+$drop['keymap'] = sqlarr('SELECT value FROM values_input_keymap where enabled=1', '', 'value');
 $drop['cfg_network_module'] = sqlarr('SELECT value FROM values_network_module where enabled=1', '', 'value');
 $drop['networking'] = array('dhcp', 'static');
 $drop['port'] = sqlarr('SELECT value FROM values_printers_port where enabled=1', '', 'value');
-for ($i=0; $i<999; $i++) { $drop['cfg_printers_'.$i.'_ip'] = 'ignore'; }
+//for ($i=0; $i<999; $i++) { $drop['cfg_printers_'.$i.'_ip'] = 'ignore'; }
 $drop['share'] = 'ignore';
 $drop['location'] = sqlarr('SELECT location FROM client_locations where enabled=1', '', 'location');
 $drop['id'] = 'hidden';
@@ -60,23 +61,26 @@
 $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';
 $drop['client_serials_serial'] = 'show';
-$drop['password'] = 'password';
-$drop['shell'] = 'password';
+//$drop['password'] = 'password';
+//$drop['shell'] = 'password';
+$drop['client_auth_user'] = 'password';
+$drop['root'] = 'password';
 $drop['vnc'] = 'password';
 $drop['samba'] = 'password';
 $drop['station'] = 'password';
 $drop['txt'] = 'txt';
 $drop['screensaver'] = sqlarr('SELECT value FROM values_screensaver_screensaver where enabled=1', '', 'value');
-$drop['iface'] = array('eth0', 'wlan0');
+//$drop['iface'] = array('eth0', 'wlan0');
 $drop['client_version_os'] = 'show';
 $drop['client_version_utils'] = 'show';
+$drop['hwdetected'] = 'ignore';
 
-// ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
+// ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
 $drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto');
 $drop['wireless_auth_mode'] = array('', 'wep', 'wpa', 'wpa2', 'off');
 $drop['wireless_key_length'] = array('', '64', '128', '256');
@@ -86,36 +90,31 @@
 $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);
-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; }
-}
+// get current citrix apps
+$citrix_apps = sqlarr('SELECT session FROM values_citrix_session where enabled=1', '', 'session');
+// add an empty value add the first position of the array as session-default
+array_unshift($citrix_apps, "");
+// hackish, fix me
+for ($i=0; $i<999; $i++) { $drop['cfg_sessions_citrix_'.$i.'_session'] = $citrix_apps; }
+
+// get current storefront apps
+$storefront_apps = sqlarr('SELECT session FROM values_storefront_session where enabled=1', '', 'session');
+// add an empty value add the first position of the array as session-default
+array_unshift($storefront_apps, "");
+// hackish, fix me
+for ($i=0; $i<999; $i++) { $drop['cfg_sessions_storefront_'.$i.'_session'] = $storefront_apps; }
 
-// GGF. NEUEN DATENSATZ EINFÜGEN
+// GGF. NEUEN DATENSATZ EINFÃœGEN
 if(isset($_POST['do_add']))
 {
 	list($bla,$what) = explode(' ',$_POST['do_add']);
 	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=='SESSION-STOREFRONT')	sqladd('cfg_sessions_storefront', array('domain'=>$storefront_domain_name, 'store'=>$storefront_store, 'serial'=>$id));
 	else if($what=='MENUITEM')	sqladd('cfg_other_menuitems', array('serial'=>$id));
-	else if($what=='PLUGIN')	sqladd('cfg_plugins', array('serial'=>$id));
+	else if($what=='AUTOSTART')	sqladd('cfg_autostart', array('serial'=>$id));
 }
 
 
@@ -170,14 +169,14 @@
 {
 	global $absnames;
 	$absnames[] = $heading;
-	
+
 	// <AufZuLink> <Bild/> <Heading/> </AufZuLink><BR/> <Absatz>
-	
+
 	if( $_SESSION['openclose'][$heading] )
 	{
 		echo '<a href="JavaScript:openclose(\''.$heading.'\',1);"><img border="0" src="pics/minus.gif" title="CLOSE" id="sch_bild_'.$heading.'"> <b>['.$heading.']</b></a>';
 		if($helpfile!='')	echo ' <a href="JavaScript:showhelp(\''.$helpfile.'\')" title="HELP">[?]</a>';
-		echo '<br><div id="sch_absatz_'.$heading.'" style="top:0px; visibility:visible">';			
+		echo '<br><div id="sch_absatz_'.$heading.'" style="top:0px; visibility:visible">';
 	}
 	else
 	{
@@ -190,12 +189,10 @@
 function closeabs()
 {
 	// </Absatz> <BR/>
-	
 	echo '</div><br>';
 }
 
-
-// ANZEIGEN	
+// ANZEIGEN
 
 function parsearr($name, $arr, $del=false, $wireless=false)
 {
@@ -210,7 +207,7 @@
 	foreach($arr as $k=>$v)
 	{
 		if( (substr($k,0,9)=='wireless_') xor $wireless )	Continue;
-		
+
 		$d = $drop[$name.'_'.$k]; if($d==null) $d = $drop[$k];
 		$k = str_replace('wireless_', '', $k);
 		$k2 = $k;
@@ -227,19 +224,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>';
@@ -281,11 +265,10 @@
 		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)
-	{			
+	{
 		var bild = document.images['sch_bild_'+nummer];
 		var absatz = document.all['sch_absatz_'+nummer].style;
 		var senden = false;
@@ -297,11 +280,11 @@
 	}
 */
 	function openclose(nummer, act)
-	{			
+	{
 		var bild = document.images['sch_bild_'+nummer];
 		var absatz = document.all['sch_absatz_'+nummer].style;
 		var senden = false;
-		
+
 		if(bild.title == 'OPEN')
 		{
 			if(act<=1)
@@ -326,7 +309,6 @@
 				act = 2;
 			}
 		}
-		
 		if(senden)	sendopenclose(nummer,act);
 	}
 
@@ -373,22 +355,29 @@
 	$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>';
 
 	echo '<input class="but" type=submit value="SAVE" style="width:150px"><br><br>';
 
-	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 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 '<input class="but" type=submit name="do_add" value="ADD COMMENT" style="width:150px"><br>';
+	echo '<input class="but" type=submit name="do_add" value="ADD PRINTER" style="width:150px"><br>';
+	echo '<input class="but" type=submit name="do_add" value="ADD SESSION-CITRIX" style="width:150px"><br>';
+	echo '<input class="but" type=submit name="do_add" value="ADD SESSION-STOREFRONT" style="width:150px"><br>';
+	echo '<input class="but" type=submit name="do_add" value="ADD MODULE" style="width:150px"><br>';
+	echo '<input class="but" type=submit name="do_add" value="ADD MENUITEM" style="width:150px"><br>';
+	echo '<input class="but" type=submit name="do_add" value="ADD AUTOSTART" style="width:150px"><br>';
 	echo '<br>';
 
 	if($id>0) $KILLCAP='DEACTIVATE'; else $KILLCAP='ACTIVATE';