--- alx-src/branches/alx-web-060/show.php	2011/06/15 14:24:07	2419
+++ alx-src/branches/alx-web-060/show.php	2011/07/12 15:01:18	2703
@@ -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');
 }
@@ -44,9 +48,26 @@
 $drop['depth'] = array('24', '16', '8');
 $drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
 $drop['keyboard'] = array('PC105');
-$drop['cfg_network_module'] = array('3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211', 'b44', 'bnx2', 'dl2k', 'e1000', 'forcedeth', 'r8169', 'sk98lin', 'tg3', 'via-velocity');
+if($alxos >= '0.6.0')
+{
+	$drop['cfg_network_module'] = array('3c509', '3c59x', '8139cp', '8139too', '8390', 'amd8111e', 'atl1c', 'atl1e', 'atl1', 'atl2', 'b44', 'bnx2', 'cnic', 'e100', 'e1000', 'e1000e', 'forcedeth', 'igb', 'ipg', 'jme', 'natsemi', 'ne2k-pci', 'ns83820', 'pcnet32', 'qla3xxx', 'r8169', 'sis190', 'sis900', 'skge', 'sky2', 'tg3', 'typhoon', 'via-rhine', 'via-velocity', 'adm8211', 'airo', 'at76c50x-usb', 'ar9170usb', 'ath5k', 'ath9k', 'atmel', 'b43', 'b43legacy', 'hostap_pci', 'hostap_plx', 'ipw2100', 'ipw2200', 'iwl3945', 'usb8xxx', 'libertas_tf', 'libertas_tf_usb', 'mwl8k', 'orinoco', 'orinoco_nortel', 'orinoco_plx', 'orinoco_tmd', 'orinoco_usb', 'p54pci', 'p54usb', 'prism54', 'rndis_wlan', 'rt2400pci', 'rt2500pci', 'rt2500usb', 'rt2800pci', 'rt2800usb', 'rt61pci', 'rt73usb', 'rtl8180', 'rtl8187', 'wl1251', 'wl1271', 'zd1201', 'zd1211rw');
+}
+else
+{
+	$drop['cfg_network_module'] = array('3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211', 'b44', 'bnx2', 'dl2k', 'e1000', 'forcedeth', 'r8169', 'sk98lin', 'tg3', 'via-velocity');
+}
 $drop['networking'] = array('dhcp', 'static');
-$drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
+// 0.6.0 does not support lpd, ipp and socket printing atm
+if($alxos>='0.6.0')
+{
+	$drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2');
+	for ($i=0; $i<999; $i++) { $drop['cfg_printers_'.$i.'_ip'] = 'ignore'; }
+	$drop['share'] = 'ignore';
+}
+else
+{
+	$drop['cfg_printers_port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
+}
 $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
 $drop['id'] = 'hidden';
 $drop['flg_modified'] = '1';
@@ -63,7 +84,15 @@
 }
 $drop['hostname'] = 'bold';
 $drop['session'] = 'bold';
-$drop['cfg_autostart_session'] = 'filename';
+if($alxos>='0.6.0')
+{
+	$drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, '', 'filename');
+	array_unshift($drop['cfg_autostart_session'], "");
+}
+else
+{
+	$drop['cfg_autostart_session'] = 'filename';
+}
 $drop['mtime'] = 'showtime';
 $drop['mac'] = 'show';
 $drop['client_serials_serial'] = 'show';
@@ -89,7 +118,7 @@
 
 // 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', 'off');
+$drop['wireless_auth_mode'] = array('', 'wep', 'wpa', 'wpa2', 'off');
 $drop['wireless_key_length'] = array('', '64', '128', '256');
 $drop['wireless_channel'] = array('', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14');
 $drop['wireless_frequency'] = array('', '2.412G', '2.417G', '2.422G', '2.427G', '2.432G', '2.437G', '2.442G',
@@ -97,6 +126,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']))
 {
@@ -104,7 +150,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));
 }
 
@@ -141,8 +187,10 @@
 			}
 		}
 	}
-}
 
+	// reload site
+	header("location: show.php?id=".$id);
+}
 
 // EINLESEN DER DATEN AUS SQL-TABELLEN
 foreach($tabs as $k=>$t)
@@ -268,15 +316,35 @@
 	.keytab, input, textarea, select, option { font-size:8pt; font-family:Tahoma }
 	.but { font-size:10pt; font-family:Tahoma; height:23px }
 </style>
+<script type="text/javascript" src="js/jquery-1.2.6.min.js"></script>
 <script language="JavaScript" src="openclose_ajax.js"></script>
 <script language="JavaScript">
 
+	// opens an url and shows retval in a javascript-alert on current site
+	function urlopen(url,typ) {
+		var $url = url.split("?");
+		$.ajax({type:""+typ+"",url:$url[0],data:$url[1],cache:false,success:function(data){ alert(data); }});
+	}
+
+/* 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;
 
+		$("#sch_absatz_"+nummer).toggle(0, function(){
+			if($(this).css("display")=="none"){$("#sch_bild_"+nummer).attr({title:'OPEN',src:'pics/plus.gif'});}else{$("#sch_bild_"+nummer).attr({title:'CLOSE',src:'pics/minus.gif'});}
+		});
+		if(act<=1){ $("#sch_bild_"+nummer).attr({title:'CLOSE',src:'pics/minus.gif'}); }else{ $("#sch_bild_"+nummer).attr({title:'OPEN',src:'pics/plus.gif'}); };
+	}
+*/
+	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)
@@ -301,9 +369,9 @@
 				act = 2;
 			}
 		}
-
+		
 		if(senden)	sendopenclose(nummer,act);
-	}	
+	}
 
 	function showhelp(name)
 	{ window.open(name, 'HelpWin', 'width=620,height=500,scrollbars=yes'); }
@@ -313,8 +381,7 @@
 
 <body><?
 
-//echo '<body style="background-image:URL(logo.jpg);background-repeat:no-repeat; background-position:0px 0px; margin-top:25px">';
-echo '<form action="show.php" method=post onreset="return confirm(\'UNDO CHANGES?\')">';
+echo '<form action="show.php" method="post" onreset="return confirm(\'UNDO CHANGES?\')">';
 echo '<input type=hidden name="do_upl" value="1">';
 echo '<input type=hidden name="id" value="'.$id.'">';
 
@@ -349,11 +416,9 @@
 	$state = 'Off';
 	if(count($conn)>0)
 	{
-// 			passthru($pingcmd." ".$conn['ip']." &> /dev/null && exit 0 || exit 1",$retval);
 		if($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>';
@@ -378,7 +443,7 @@
 	echo '<input class="but" type=button '.$disdanach.' value=">" style="width:30px" onclick="location.href=\'show.php?id='.($id+1).'\'">';
 	echo '<br><input class="but" type=button value="INDEX" style="width:150px; font-weight:bold" onclick="location.href=\'index.php\'"><br><br>';
 
-	echo '<br><br>';
+	echo '<br>';
 	echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff"><b>';
 	if($id<0)	echo '<b>DEACTIVATED!</b><br><br>';
 	echo '<u>Serial:</u>&nbsp;&nbsp;#'.$id.'<br>';
@@ -387,7 +452,14 @@
 	if($state=='On')
 	{
 		echo '<u>IP:</u> '.$conn['ip'].'<br><br>';
-		$osver = sshdo('os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng | cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"', $conn['ip']);
+		if($alxos >= '0.6.0')
+		{
+			$osver = sshdo('os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng | cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"', $conn['ip']);
+		}
+		else
+		{
+			$osver = sshdo('os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng-alx | cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"', $conn['ip']);
+		}
 		$osver = explode(':',$osver[1]);
 		if($osver[0] == '') $osver[0]='unkown';
 		if($osver[1] == '') $osver[1]='unkown';
@@ -411,13 +483,23 @@
 	}
 
 	echo '</b></div>';
-	//echo '<br><br>';
 
 	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>';
+
+		if($alxos >= '0.6.0')
+		{
+			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><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:150px" onclick="window.open(\'vncviewer.php?ip='.$conn['ip'].'\', \'VncViewer\', \'width=200,height=100\')"><br>';