X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=4ac237d0fe7c007376ac4c2cc8badfd311f837e1;hb=8ce6222a1002a669cb511ba75b9e4e57810a4432;hp=ef9da2389b41de4277f2d633ab9e4e19ba15fd80;hpb=74c193f266e9660c822bfc5e86d050d35539bab6;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index ef9da2389b..4ac237d0fe 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -70,7 +70,7 @@ $pppsettings{'PROFILENAME'} = 'None';
 my %color = ();
 my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 
 my $connstate = &Header::connectionstatus();
 
@@ -200,25 +200,6 @@ END
 END
 	}
 
-	my $dns_servers;
-	if ( -e "${General::swroot}/red/dns" ) {
-		open (TMP, "<${General::swroot}/red/dns");
-		$dns_servers = <TMP>;
-		chomp($dns_servers);
-		close TMP;
-	}
-	print <<END;
-		<tr>
-			<td>
-				<b><a href="netexternal.cgi">$Lang::tr{'dns servers'}</a>:</b>
-			</td>
-			<td style='text-align:center;'>
-				$dns_servers
-			</td>
-			<td></td>
-		</tr>
-END
-
 	if (&General::RedIsWireless()) {
 		my $iface = $netsettings{"RED_DEV"} || "red0";
 
@@ -367,13 +348,12 @@ END
 	}
 #check if IPSEC is running
 if ( $vpnsettings{'ENABLED'} eq 'on' || $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {
-	my $ipsecip = $vpnsettings{'VPN_IP'};
 print<<END;
 		<tr>
 			<td style='width:25%; text-align:center; background-color:$Header::colourvpn;'>
 				<a href='/cgi-bin/vpnmain.cgi' style='color:white'><b>$Lang::tr{'ipsec'}</b></a>
 			</td>
-			<td style='width:30%; text-align:center;'>$ipsecip</td>
+			<td style='width:30%; text-align:center;'></td>
 			<td style='width:45%; text-align:center; color:$Header::colourgreen;'>Online</td>
 		</tr>
 END
@@ -465,6 +445,10 @@ END
 
 				my $activecolor = $Header::colourred;
 				my $activestatus = $Lang::tr{'capsclosed'};
+				if ($vpnconfig{$key}[33] eq "add") {
+					$activecolor = ${Header::colourorange};
+					$activestatus = $Lang::tr{'vpn wait'};
+				}
 				if ($vpnconfig{$key}[0] eq 'off') {
 					$activecolor = $Header::colourblue;
 					$activestatus = $Lang::tr{'capsclosed'};
@@ -473,15 +457,13 @@ END
 						if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){
 							$activecolor = $Header::colourgreen;
 							$activestatus = $Lang::tr{'capsopen'};
+							last;
 						} elsif ($line =~ /$vpnconfig{$key}[1]\[.*CONNECTING/) {
 							$activecolor = $Header::colourorange;
 							$activestatus = $Lang::tr{'vpn connecting'};
 						} elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) {
 							$activecolor = $Header::colourorange;
 							$activestatus = $Lang::tr{'vpn on-demand'};
-						} elsif ($vpnconfig{$key}[33] eq "add") {
-							$activecolor = ${Header::colourorange};
-							$activestatus = $Lang::tr{'vpn wait'};
 						}
 					}
 				}
@@ -564,6 +546,12 @@ if ( ! -e "/var/ipfire/main/send_profile") {
 	$warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";
 }
 
+# Legacy architecture
+my ($sysname, $nodename, $release, $version, $machine) = &POSIX::uname();
+if ($machine =~ m/^i.86$/) {
+	$warnmessage .= "<li>$Lang::tr{'legacy architecture warning'}</li>";
+}
+
 # Memory usage warning
 my @free = `/usr/bin/free`;
 $free[1] =~ m/(\d+)/;
@@ -612,13 +600,6 @@ foreach my $file (@files) {
 	}
 }
 
-# Reiser4 warning
-my @files = `mount | grep " reiser4 (" 2>/dev/null`;
-foreach my $disk (@files) {
-	chomp ($disk);
-	$warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>";
-}
-
 if ($warnmessage) {
 	&Header::openbox('100%','center', );
 	print "<table class='tbl' style='width:80%;'>";