--- alx-src/branches/alx-web-060/show.php	2011/07/06 14:17:11	2607
+++ alx-src/branches/alx-web-070/show.php	2015/09/07 10:50:48	7070
@@ -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();
 
 
@@ -16,6 +16,9 @@
 $alxos = $alxinfo[os];
 $alxutils = $alxinfo[utils];
 
+// get gfxdriver
+$gfxinfo = sqlfirst('SELECT * FROM cfg_graphic WHERE serial='.$id);
+
 if($kill==1)
 {
 	foreach($tabs as $t)	mysql_query('UPDATE '.$t.' SET serial=-serial WHERE serial='.$id);
@@ -32,19 +35,44 @@
 
 // FELD-DEFINITIONEN  (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID)
 $drop = array();
-if($alxos >= '0.5.3')
+if($alxos >= '0.6.0')
+{
+	if($alxos >= '0.6.2')
+	{
+		$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'nouveau', 'mach64', 'mga', 'unichrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
+	}
+	else
+	{
+		$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
+	}
+	if($gfxinfo[module] == 'intel')
+	{
+		$drop['cfg_graphic_hdmi'] = array('disable', 'enable');
+	}
+	else
+	{
+		$drop['cfg_graphic_hdmi'] = 'ignore';
+	}
+}
+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');
+	$drop['cfg_graphic_hdmi'] = 'ignore';
 }
 else
 {
 	$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i810', 'i710', 'nv', 'mga', 'r128', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'via');
+	$drop['cfg_graphic_hdmi'] = 'ignore';
 }
 $drop['resolution'] = array('640x480', '800x600', '1024x768', '1280x960', '1280x1024', '1360x768', '1366x768', '1400x1050', '1440x900', '1600x1200', '1680x1050', '1280x720', '1920x1080');
 $drop['depth'] = array('24', '16', '8');
 $drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
 $drop['keyboard'] = array('PC105');
-if($alxos >= '0.6.0')
+if($alxos >= '0.6.8.100')
+{
+	$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', 'atmel_pci', 'b43', 'b43legacy', 'hostap_pci', 'hostap_plx', 'ipw2100', 'ipw2200', 'iwl3945', 'iwl4965', 'iwldvm', 'iwlwifi', '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', 'usb8xxx', 'wl1251', 'wl1271', 'zd1201', 'zd1211rw');
+}
+else 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');
 }
@@ -62,7 +90,7 @@
 }
 else
 {
-	$drop['cfg_printers_port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
+	$drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
 }
 $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
 $drop['id'] = 'hidden';
@@ -82,8 +110,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,6 +150,46 @@
 $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++)
+	{
+		if($alxos>'0.6.5')
+			$drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins', '', 'plugin');
+		else
+			$drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins where plugin<>"citrix_spe"', '', '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
+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']))
 {
@@ -129,8 +197,9 @@
 	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));
+	else if($what=='PLUGIN')	sqladd('cfg_plugins', array('serial'=>$id));
 }
 
 
@@ -250,7 +319,20 @@
 				$v='openchrome';
 			}
 		}
-
+		if($alxos >= '0.6.2')
+		{
+			if($v == 'via')
+			{
+				echo '<br><font color="#FF0000">Replaced "via" with "unichrome" - Please press SAVE!</font><br>';
+				$v='unichrome';
+			}
+			if($v == 'openchrome')
+			{
+				echo '<br><font color="#FF0000">Replaced "openchrome" with "unichrome" - Please press SAVE!</font><br>';
+				$v='unichrome';
+			}
+		}
+	
 		# tell something about vesa
 		if ($v == 'vesa') echo '<br><font color="#FF0000">Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!</font><br>';
 
@@ -264,13 +346,26 @@
 		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>';
 		else if($d=='showtime')			echo '<tr><td class="key">'.$k2.'</td><td>= <b>'.date('d.m.y - H:i:s', $v).'</b></td></tr>';
 		else if($d=='password' && $v=='')	echo '<tr><td class="key">'.$k2.'</td><td>= <input type=password style="width:144px" name="'.$name.'_'.$k.'" value=""></td></tr>';
 		else if($d=='password')			echo '<tr><td class="key">'.$k2.'</td><td>= <input type=password style="width:144px" name="'.$name.'_'.$k.'" value="KEEPPASS"></td></tr>';
-		else if($d=='txt') 			echo '<tr><td colspan=2><textarea style="width:240px; background-color:#d5e5ff" rows=4 name="'.$name.'_'.$k.'">'.$v.'</textarea></td></tr>';
+		else if($d=='txt') 			echo '<tr><td colspan=2><textarea style="width:240px; background-color:#d5e5ff" rows=6 name="'.$name.'_'.$k.'">'.$v.'</textarea></td></tr>';
 		else if($d!='ignore')			echo '<tr><td class="key">'.$k2.'</td><td>= <input style="width:144px" name="'.$name.'_'.$k.'" value="'.$v.'"></td></tr>';
 	}
 
@@ -304,6 +399,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)
@@ -406,8 +502,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>';
@@ -433,15 +533,15 @@
 		echo '<u>IP:</u> '.$conn['ip'].'<br><br>';
 		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']);
+			$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 = @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';
+		if($osver[0] == '') $osver[0]='unknown';
+		if($osver[1] == '') $osver[1]='unknown';
 
 		# update os string in database
 		if($alxos == '' && $osver[0] >= '0.5.3')
@@ -455,7 +555,7 @@
 		echo '<u>OS:</u> '.$osver[0].'<br>';
 		echo '<u>Utils:</u> '.$osver[1].'<br>';
 
-		if($osver[0] <> 'unkown')
+		if($osver[0] <> 'unknown')
 		{
 			//write them to database
 		}
@@ -476,14 +576,17 @@
 			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 '<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>';
-		echo '<input class="but" type=button value="SSH" style="width:150px" onclick="window.open(\'mindterm.php?ip='.$conn['ip'].'\', \'MindTerm\', \'width=200,height=100\')"><br>';
-		echo '<br>';
+		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>';