diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index abc136851..f49b11985 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -243,7 +243,7 @@ sub updateifgraph {
"DEF:incoming=$rrdlog/$interface.rrd:incoming:AVERAGE",
"DEF:outgoing=$rrdlog/$interface.rrd:outgoing:AVERAGE",
"AREA:incoming".$color{"color11"}.":$tr{'incoming traffic in bytes per second'}",
- "LINE1:outgoing".$color{"color12"}.":$tr{'outgoing traffic in bytes per second'}\\j",
+ "AREA:outgoing".$color{"color12"}.":$tr{'outgoing traffic in bytes per second'}\\j",
"COMMENT: \\j",
"COMMENT:$tr{'maximal'}",
"COMMENT:$tr{'average'}",
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 25a2b16b8..af9adb6e5 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -224,7 +224,6 @@ WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
-WARNING: translation string unused: net-traffic configuration
WARNING: translation string unused: network configuration
WARNING: translation string unused: network status information
WARNING: translation string unused: new optionsfw later
diff --git a/doc/language_issues.en b/doc/language_issues.en
index cff2b821c..61e52904e 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -235,7 +235,6 @@ WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
-WARNING: translation string unused: net-traffic configuration
WARNING: translation string unused: network configuration
WARNING: translation string unused: network status information
WARNING: translation string unused: new optionsfw later
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 3eab9845b..caa6bc792 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -23,7 +23,7 @@ my %modemsettings=();
my %netsettings=();
my %ddnssettings=();
my $warnmessage = '';
-my $refresh = "";
+my $refresh = "";
my $ipaddr='';
&Header::showhttpheaders();
diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index e8cef7003..c48f28574 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -446,7 +446,7 @@ END
;
&Header::closebox();
-if ($outfwsettings{'POLICY'} eq 'MODE1')
+if ($outfwsettings{'POLICY'} eq 'MODE1' || $outfwsettings{'POLICY'} eq 'MODE2')
{
&Header::openbox('100%', 'center', 'Quick Add');
diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi
index 55470246b..ac0d2a079 100644
--- a/html/cgi-bin/traffic.cgi
+++ b/html/cgi-bin/traffic.cgi
@@ -131,6 +131,10 @@ print <
+
+
|
|
END
@@ -346,8 +346,8 @@ print <
| $Lang::tr{'caption'} |
- | $Lang::tr{'save settings'} |
- | $Lang::tr{'restore settings'} |
+ | $Lang::tr{'save settings'} |
+ | $Lang::tr{'restore settings'} |
END
;
@@ -373,13 +373,13 @@ print <
|
+
|
+
|
+
END
@@ -390,8 +390,8 @@ print <
| $Lang::tr{'caption'} |
- | $Lang::tr{'generatekeys'} |
- | $Lang::tr{'keyreset'} |
+ | $Lang::tr{'generatekeys'} |
+ | $Lang::tr{'keyreset'} |
END
;
@@ -410,19 +410,19 @@ print <
|
+
|
+
|
+
|
+
|
+
END
;
@@ -432,10 +432,10 @@ print <
| $Lang::tr{'caption'} |
- | $Lang::tr{'generatepolicy'} |
- | $Lang::tr{'resetpolicy'} |
- | $Lang::tr{'generatereport'} |
- | $Lang::tr{'updatedatabase'} |
+ | $Lang::tr{'generatepolicy'} |
+ | $Lang::tr{'resetpolicy'} |
+ | $Lang::tr{'generatereport'} |
+ | $Lang::tr{'updatedatabase'} |
END
;
@@ -459,7 +459,7 @@ END
foreach my $log (@Logs) {chomp $log;print"";}
print < |
+ |
END
diff --git a/src/initscripts/init.d/net/red/pppoe b/src/initscripts/init.d/net/red/pppoe
index ecb9434b4..8c3493c26 100644
--- a/src/initscripts/init.d/net/red/pppoe
+++ b/src/initscripts/init.d/net/red/pppoe
@@ -113,7 +113,7 @@ case "${2}" in
boot_mesg "Bringing down the PPPoE interface on ${1}..."
modprobe -r pppoe >/dev/null 2>&1
- kill $(cat /var/run/pppd-ipfire.pid)
+ kill $(head -1 /var/run/ppp-ipfire.pid)
sleep 2
ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${1}