Merge remote-tracking branch 'origin/next' into kernel-update

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

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 002352354a15a05ad780ba64ced3f66547328964..01bb3d6850c13f25f5de12f6f8c94b348ed69353 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -356,7 +356,7 @@ END
 END
                my $id = 0;
                my $gif;
-               foreach my $key (keys %confighash) {
+               foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
                        if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
 
                        if ($id % 2) {
@@ -421,7 +421,7 @@ if ($confighash{$dkey}[3] eq 'net') {
           $display = "<font color=$Header::colourred>$tustate[1]</font>"; }
  
        print <<END;
-       <tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br>
+       <tr><td align='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br>
   <td width='30%' align='center'> $confighash{$dkey}[10]<td width='45%' align='center'> $display 
 
 END
@@ -489,6 +489,14 @@ 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>\n\n";
+}
+
+
 if ($warnmessage) {
        print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
 }