From afbda81596e83cc832cc0faeb44ea3e2359a80f8 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Mon, 4 Jun 2007 19:37:49 +0000 Subject: [PATCH] PPOE Skript sollte den kill, CGI Fixes git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@607 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/cfgroot/graphs.pl | 2 +- doc/language_issues.de | 1 - doc/language_issues.en | 1 - html/cgi-bin/index.cgi | 2 +- html/cgi-bin/outgoingfw.cgi | 2 +- html/cgi-bin/traffic.cgi | 6 ++- html/cgi-bin/tripwire.cgi | 68 ++++++++++++++-------------- src/initscripts/init.d/net/red/pppoe | 2 +- 8 files changed, 43 insertions(+), 41 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index abc1368510..f49b119858 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 25a2b16b8f..af9adb6e58 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 cff2b821c7..61e52904e7 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 3eab9845b3..caa6bc7927 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 e8cef70030..c48f28574c 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 55470246b1..ac0d2a079a 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -131,6 +131,10 @@ print < + +
+ +
@@ -177,7 +181,7 @@ if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) { print "$Lang::tr{'trafficorange'}"; } -if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) { +if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) { print "$Lang::tr{'trafficred'}"; } print < HHMM

- $Lang::tr{'ok'} + $Lang::tr{'ok'}
- $Lang::tr{'cancel'} + $Lang::tr{'cancel'}
@@ -133,10 +133,10 @@ if ($tripwiresettings{'ACTION'} eq 'globalreset') $Lang::tr{'resetglobals'} $Lang::tr{'defaultwarning'}
- $Lang::tr{'ok'} + $Lang::tr{'ok'}
- $Lang::tr{'cancel'} + $Lang::tr{'cancel'}
@@ -154,10 +154,10 @@ if ($tripwiresettings{'ACTION'} eq 'generatepolicypw')
$Lang::tr{'sitekey'} $Lang::tr{'localkey'}

- $Lang::tr{'ok'} + $Lang::tr{'ok'}
- $Lang::tr{'cancel'} + $Lang::tr{'cancel'}
@@ -175,10 +175,10 @@ if ($tripwiresettings{'ACTION'} eq 'policyresetpw')
$Lang::tr{'sitekey'} $Lang::tr{'localkey'}

- $Lang::tr{'ok'} + $Lang::tr{'ok'}
- $Lang::tr{'cancel'} + $Lang::tr{'cancel'}
@@ -195,10 +195,10 @@ if ($tripwiresettings{'ACTION'} eq 'updatedatabasepw') $Lang::tr{'tripwirewarningdatabase'}
$Lang::tr{'localkey'}

- $Lang::tr{'ok'} + $Lang::tr{'ok'}
- $Lang::tr{'cancel'} + $Lang::tr{'cancel'}
@@ -213,10 +213,10 @@ if ($tripwiresettings{'ACTION'} eq 'keyreset') $Lang::tr{'keyreset'} $Lang::tr{'tripwirewarningkeys'}
- $Lang::tr{'ok'} + $Lang::tr{'ok'}
- $Lang::tr{'cancel'} + $Lang::tr{'cancel'}
@@ -232,10 +232,10 @@ if ($tripwiresettings{'ACTION'} eq 'generatekeys') $Lang::tr{'generatekeys'} $Lang::tr{'tripwirewarningkeys'}
- $Lang::tr{'ok'} + $Lang::tr{'ok'}
- $Lang::tr{'cancel'} + $Lang::tr{'cancel'}
@@ -329,13 +329,13 @@ print <
-
+
-
+
-
+ END @@ -346,8 +346,8 @@ print < - - + +
$Lang::tr{'caption'}
$Lang::tr{$Lang::tr{'save settings'}
$Lang::tr{$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{$Lang::tr{'generatekeys'}
$Lang::tr{$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{$Lang::tr{'generatepolicy'}
$Lang::tr{$Lang::tr{'resetpolicy'}
$Lang::tr{$Lang::tr{'generatereport'}
$Lang::tr{$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 ecb9434b49..8c3493c265 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} -- 2.39.2