--- alx-src/branches/alx-web-060/show.php	2011/11/02 14:41:24	3284
+++ alx-src/branches/alx-web-060/show.php	2013/05/29 06:44:21	4908
@@ -37,7 +37,14 @@
 $drop = array();
 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');
+	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');
@@ -145,7 +152,10 @@
 	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');
+		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'], "");
 	}
 }
@@ -169,8 +179,11 @@
 		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>";
+	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
@@ -302,7 +315,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>';
 
@@ -335,7 +361,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>';
 	}
 
@@ -503,15 +529,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')
@@ -525,7 +551,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
 		}
@@ -548,10 +574,7 @@
 			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\');">';
-			if($alxutils >= '0.6.3')
-			{
-				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="HRDW" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=system\',\'POST\');">';
 			echo '<br><br>';
 		}