Hardcode theme to ipfire

[ipfire-2.x.git] / html / cgi-bin / index.cgi

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 8e7207d0c97d25b655a1576b75f94dff8d6e84df..4ac237d0fe7c007376ac4c2cc8badfd311f837e1 100644 (file)
--- 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();
 
@@ -457,6 +457,7 @@ 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'};
@@ -547,7 +548,7 @@ if ( ! -e "/var/ipfire/main/send_profile") {
 
 # Legacy architecture
 my ($sysname, $nodename, $release, $version, $machine) = &POSIX::uname();
-if ($machine =~ m/^i?86$/) {
+if ($machine =~ m/^i.86$/) {
        $warnmessage .= "<li>$Lang::tr{'legacy architecture warning'}</li>";
 }