--- alx-src/branches/alx-web-060/show.php	2011/11/04 11:32:24	3299
+++ alx-src/branches/alx-web-060/show.php	2013/05/28 13:56:36	4898
@@ -39,7 +39,7 @@
 {
 	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');
+		$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'nouveau', 'mach64', 'mga', 'unichrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
 	}
 	else
 	{
@@ -176,8 +176,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
@@ -355,7 +358,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>';
 	}
 
@@ -523,15 +526,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')
@@ -545,7 +548,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
 		}