--- alx-src/branches/alx-web-060/show.php	2012/02/01 10:51:54	3345
+++ alx-src/branches/alx-web-070/show.php	2015/09/11 11:06:04	7113
@@ -7,10 +7,9 @@
 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);
+$multi= array(	0,		 0,		0,		0,		0,		0,		1,		1,		1,		1,		1,		0,	0,	1);
 $data = array();
 
-
 // get alx version info for 
 $alxinfo = sqlfirst('SELECT * FROM client_version WHERE serial='.$id);
 $alxos = $alxinfo[os];
@@ -35,84 +34,34 @@
 
 // FELD-DEFINITIONEN  (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID)
 $drop = array();
-if($alxos >= '0.6.0')
-{
-	if($alxos >= '0.6.2')
-	{
-		$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', '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', 'nouveau', 'mach64', 'mga', 'unichrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
+if($gfxinfo[module] == 'intel')
 {
-	$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';
+	$drop['cfg_graphic_hdmi'] = array('disable', 'enable');
 }
 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')
-{
-	$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['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');
 $drop['networking'] = array('dhcp', 'static');
-// 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['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
-}
+$drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2');
+for ($i=0; $i<999; $i++) { $drop['cfg_printers_'.$i.'_ip'] = 'ignore'; }
+$drop['share'] = 'ignore';
 $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
 $drop['id'] = 'hidden';
 $drop['flg_modified'] = '1';
 $drop['serial'] = 'ignore';
-if($alxos>='0.5.3')
-{
-	$drop['monitorid'] = 'ignore';
-	$drop['refresh_rate'] = array('','60','75','85','100');
-}
-else
-{
-	$drop['monitorid'] = 'monitorid';
-	$drop['refresh_rate'] = 'ignore';
-}
+$drop['monitorid'] = 'ignore';
+$drop['refresh_rate'] = array('','60','75','85','100');
 $drop['hostname'] = 'bold';
 $drop['session'] = 'bold';
-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['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, '', 'filename');
+array_unshift($drop['cfg_autostart_session'], "");
 $drop['mtime'] = 'showtime';
 $drop['mac'] = 'show';
 $drop['client_serials_serial'] = 'show';
@@ -147,37 +96,23 @@
 $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++)
-	{
-		$drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins', '', 'plugin');
-		array_unshift($drop['cfg_plugins_'.$i.'_plugin_array'], "");
-	}
-}
-else
+for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'pluginconfig'; }
+for ($i=0; $i<999; $i++)
 {
-	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'; }
+	$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
-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>";
+// 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; }
 }
 
 // GGF. NEUEN DATENSATZ EINFÜGEN
@@ -289,44 +224,9 @@
 		$k = str_replace('wireless_', '', $k);
 		$k2 = $k;
 
-		//replace some drivers on 0.5.3 or higher
-		if($alxos >= '0.5.3')
-		{
-			if($v == 'i810')
-			{
-				echo '<br><font color="#FF0000">Replaced "i810" with "intel" - Please press SAVE!</font><br>';
-				$v='intel';
-			}
-			if($v == 'r128')
-			{
-				echo '<br><font color="#FF0000">Replaced "r128" with "vesa" - Please press SAVE!</font><br>';
-				$v='vesa';
-			}
-
-			if($v == 'via')
-			{
-				echo '<br><font color="#FF0000">Replaced "via" with "openchrome" - Please press SAVE!</font><br>';
-				$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>';
 
-
 		if(is_array($d))
 		{
 			echo '<tr><td class="key">'.$k2.'</td><td>= <select style="width:144px" name="'.$name.'_'.$k.'">';
@@ -355,7 +255,7 @@
 		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>';
 	}
 
@@ -365,6 +265,7 @@
 
 	if($name=='cfg_network' && !$wireless)	parsearr($name.'_wireless', $arr, $del, true);
 }
+
 function parsearrs($name, $arr)
 {
 	foreach($arr as $k=>$a)
@@ -521,34 +422,8 @@
 	if($state=='On')
 	{
 		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']);
-		}
-		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';
-
-		# update os string in database
-		if($alxos == '' && $osver[0] >= '0.5.3')
-		{
-			mysql_query('insert into client_version(serial,os,utils) values("'.$id.'","'.$osver[0].'","'.$osver[1].'")
-							on duplicate key update os="'.$osver[0].'", utils="'.$osver[1].'"');
-			# reload the site
-			echo '<script type="text/javascript">setTimeout(\'window.location.reload()\',0);</script>';
-		}
-
-		echo '<u>OS:</u> '.$osver[0].'<br>';
-		echo '<u>Utils:</u> '.$osver[1].'<br>';
-
-		if($osver[0] <> 'unkown')
-		{
-			//write them to database
-		}
+		echo '<u>OS:</u> '.$alxos.'<br>';
+		echo '<u>Utils:</u> '.$alxutils.'<br>';
 	}
 
 	echo '</b></div>';
@@ -558,20 +433,16 @@
 		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>';
-			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 '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\')">';