--- alx-src/branches/alx-web-070/show.php	2015/09/11 15:21:11	7121
+++ alx-src/branches/alx-web-070/show.php	2015/12/16 15:17:38	8004
@@ -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_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,12 +61,12 @@
 $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['password'] = 'password';
 //$drop['shell'] = 'password';
 $drop['client_auth_user'] = 'password';
 $drop['root'] = 'password';
@@ -80,7 +80,7 @@
 $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');
@@ -90,27 +90,35 @@
 $drop['wireless_key'] = 'password';
 $drop['wireless_key_ascii'] = 'password';
 
-// 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; }
+
+$drop['enabled'] = 'ignore';
+$drop['filename'] = 'ignore';
+$drop['autostart'] = array('0','1');
 
-// 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, 'serverlist'=>$citrix_serverlist, '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=='AUTOSTART')	sqladd('cfg_autostart', array('serial'=>$id));
 }
 
 
@@ -124,8 +132,10 @@
 
 		$arr = array();
 		foreach($_POST as $k=>$v)
+		{
 			if((substr($k,0,$prelen)==$prefix) && ($v!='KEEPPASS'))
 				$arr[substr($k,$prelen)] = stripslashes($v);
+		}
 
 		return $arr;
 	}
@@ -165,14 +175,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
 	{
@@ -185,12 +195,10 @@
 function closeabs()
 {
 	// </Absatz> <BR/>
-	
 	echo '</div><br>';
 }
 
-
-// ANZEIGEN	
+// ANZEIGEN
 
 function parsearr($name, $arr, $del=false, $wireless=false)
 {
@@ -205,7 +213,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;
@@ -266,7 +274,7 @@
 
 /* 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;
@@ -278,11 +286,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)
@@ -307,7 +315,6 @@
 				act = 2;
 			}
 		}
-		
 		if(senden)	sendopenclose(nummer,act);
 	}
 
@@ -354,18 +361,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>';
+	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';
@@ -389,7 +407,10 @@
 	echo '<u>Status:</u> <img src="pics/'.strtolower($state).'line.gif" align=top> '.$state.'line<br>';
 	if($state=='On')
 	{
-		echo '<u>IP:</u> '.$conn['ip'].'<br><br>';
+		echo '<u>IP:</u> '.$conn['ip'].'<br>';
+		if($conn['netboot'] == 1) echo '<u>Boot:</u> Netboot (PXE)<br>';
+		else echo '<u>Boot:</u> Local Disk<br>';
+		echo '<br>';
 		echo '<u>OS:</u> '.$alxos.'<br>';
 		echo '<u>Utils:</u> '.$alxutils.'<br>';
 	}
@@ -399,33 +420,33 @@
 	if($state=='On')
 	{
 		echo '<input class="but" type=button value="REBOOT" style="width:150px" onclick="if(confirm(\'REBOOT CLIENT #'.$id.' ?\')) window.open(\'reboot.php?client='.$id.'&ip='.$conn['ip'].'&op=reboot\', \'ShutdownWin\', \'width=200,height=100\')"><br>';
-		echo '<input class="but" type=button value="SHUTDOWN" style="width:150px" onclick="if(confirm(\'SHUTDOWN CLIENT #'.$id.' ?\')) window.open(\'reboot.php?client='.$id.'&ip='.$conn['ip'].'&op=halt\', \'ShutdownWin\', \'width=200,height=100\')"><br>';
-		echo '<br>';
-		echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
-		echo 'Hardware Detection:</b></div>';
-		echo '<input class="but" type=button value="LAN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=lan\',\'POST\');">';
-		echo '<input class="but" type=button value="WLAN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=wlan\',\'POST\');">';
-		echo '<input class="but" type=button value="VGA" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=vga\',\'POST\');">';
+		echo '<input class="but" type=button value="SHUTDOWN" style="width:150px" onclick="if(confirm(\'SHUTDOWN CLIENT #'.$id.' ?\')) window.open(\'reboot.php?client='.$id.'&ip='.$conn['ip'].'&op=shutdown\', \'ShutdownWin\', \'width=200,height=100\')"><br>';
 		echo '<br>';
-		echo '<input class="but" type=button value="PRN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=printer\',\'POST\');">';
-		echo '<input class="but" type=button value="HRDW" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=system\',\'POST\');">';
-		echo '<input class="but" type=button value="FS" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=rootfs\',\'POST\');">';
-		echo '<br><br>';
 		echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
+//		echo 'Hardware Detection:</b></div>';
+//		echo '<input class="but" type=button value="LAN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=lan\',\'POST\');">';
+//		echo '<input class="but" type=button value="WLAN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=wlan\',\'POST\');">';
+//		echo '<input class="but" type=button value="VGA" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=vga\',\'POST\');">';
+//		echo '<br>';
+//		echo '<input class="but" type=button value="PRN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=printer\',\'POST\');">';
+//		echo '<input class="but" type=button value="HRDW" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=system\',\'POST\');">';
+//		echo '<input class="but" type=button value="FS" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=rootfs\',\'POST\');">';
+//		echo '<br><br>';
+//		echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
 		echo 'Remote Shadow:</b></div>';
 		echo '<input class="but" type=button value="VNC" style="width:75px" onclick="window.open(\'vncviewer.php?ip='.$conn['ip'].'\', \'VncViewer\', \'width=200,height=100\')">';
 		echo '<input class="but" type=button value="SSH" style="width:75px" onclick="window.open(\'mindterm.php?ip='.$conn['ip'].'\', \'MindTerm\', \'width=200,height=100\')">';
-		echo '<br><br>';
-		echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
-		echo 'Client Update:</b></div>';
-		echo '<input class="but" type=button value="UPDATE MAGE DB" style="width:150px" onclick="if(confirm(\'UPDATE DB ON CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=update\', \'ShutdownWin\', \'width=800,height=600\')"><br>';
-		echo '<input class="but" type=button value="CALC DEPS" style="width:150px" onclick="if(confirm(\'CALC DEPS FOR CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=calc\', \'ShutdownWin\', \'width=800,height=600\')"><br>';
-		echo '<input class="but" type=button value="UPGRADE CLIENT" style="width:150px" onclick="if(confirm(\'UPGRADE ALL PACKAGES ON CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=upgrade\', \'ShutdownWin\', \'width=800,height=600\');setTimeout(\'window.location.reload()\',0);"><br>'; 
+//		echo '<br><br>';
+//		echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
+//		echo 'Client Update:</b></div>';
+//		echo '<input class="but" type=button value="UPDATE MAGE DB" style="width:150px" onclick="if(confirm(\'UPDATE DB ON CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=update\', \'ShutdownWin\', \'width=800,height=600\')"><br>';
+//		echo '<input class="but" type=button value="CALC DEPS" style="width:150px" onclick="if(confirm(\'CALC DEPS FOR CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=calc\', \'ShutdownWin\', \'width=800,height=600\')"><br>';
+//		echo '<input class="but" type=button value="UPGRADE CLIENT" style="width:150px" onclick="if(confirm(\'UPGRADE ALL PACKAGES ON CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=upgrade\', \'ShutdownWin\', \'width=800,height=600\');setTimeout(\'window.location.reload()\',0);"><br>'; 
 	}
 	else
 		echo '<input class="but" type=button value="WAKE ON LAN" style="width:150px" onclick="if(confirm(\'WAKE CLIENT #'.$id.' ?\')) window.open(\'wake_on_lan.php?mac='.$data['client_serials']['mac'].'\', \'WakeWin\', \'width=200,height=100\')"><br>';
 
-	echo '<br><center><a href="share/ChangeLog.html" target="_blank">[ChangeLog]</a> <a href="share/FAQ.html" target="_blank">[FAQs]</a></center>';
+//	echo '<br><center><a href="share/ChangeLog.html" target="_blank">[ChangeLog]</a> <a href="share/FAQ.html" target="_blank">[FAQs]</a></center>';
 
 echo '</td></tr></table>';
 echo '</form>';