Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/core/77/update.sh
index e19237fee16eed09f4dd1fab4a099df3505d7715..e9cf7700451c60663a3706753bfa601f0d76344e 100644 (file)
--- a/config/rootfiles/core/77/update.sh
+++ b/config/rootfiles/core/77/update.sh
@@ -401,12 +401,15 @@ fi
 
 chown cron:cron /var/spool/cron
 # Update crontab
-cat <<EOF >> /var/spool/cron/root.orig
+grep -q timezone-transition /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
 
 # Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time
 00 3 * 3 0          /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
 00 2 * 10-11 0      /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
 EOF
+
+# Remove dialctrl script.
+sed -i /var/spool/cron/root.orig -e "/Dialup/,/dialctrl.pl/d"
 fcrontab -z &>/dev/null
 
 

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index cf94c8f8bccccefe6692c56b5af0aa8530f9e237..e6ae5272a2c2f5f7bc382196c3c91bcaf631510e 100644 (file)
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1602,7 +1602,7 @@ END
                if (! -z "${General::swroot}/ethernet/aliases"){
                        foreach my $alias (sort keys %aliases)
                        {
-                               print "<option value='$alias' $selected{'ipfire_src'}{$alias}>$alias</option>";
+                               print "<option value='$alias' $selected{'ipfire_src'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
                        }
                }
                print<<END;
@@ -1706,7 +1706,7 @@ END
                if (! -z "${General::swroot}/ethernet/aliases"){
                        foreach my $alias (sort keys %aliases)
                        {
-                               print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
+                               print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
                        }
                }
                print<<END;

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index c5e1c28452ca814f5a99286f6e781cbe4b4a0142..eeb83ac127bc216b3e7c10e7568c1c82cab7bdb4 100644 (file)
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1632,7 +1632,7 @@ sub getcolor
                }
 
                #Now check if IP is part of ORANGE,BLUE or GREEN
-               if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+               if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
                        $tdcolor="<font style='color: $Header::colourorange;'>$c</font>";
                        return $tdcolor;
                }
@@ -1640,7 +1640,7 @@ sub getcolor
                        $tdcolor="<font style='color: $Header::colourgreen;'>$c</font>";
                        return $tdcolor;
                }
-               if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
+               if ( &Header::blue_used() && &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
                        $tdcolor="<font style='color: $Header::colourblue;'>$c</font>";
                        return $tdcolor;
                }