diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 8904246a8..30d66c335 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -72,7 +72,7 @@ my $dialButtonDisabled = "disabled='disabled'"; &Header::openbigbox('', 'center'); &Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y")); -if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { +if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { if (open(IPADDR,"${General::swroot}/ddns/ipcache")) { $ipaddr = ; close IPADDR; @@ -124,7 +124,7 @@ END } } $dialButtonDisabled = "disabled='disabled'" if (-e '/var/run/ppp-ipfire.pid' || -e "${General::swroot}/red/active"); - if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) { + if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) { print < diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 9819f85ed..69cb9fe25 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -162,10 +162,10 @@ if ($sambasettings{'ACTION'} eq 'globalreset')
$Lang::tr{'resetglobals'}
- $Lang::tr{'yes'} + $Lang::tr{'yes'}
- $Lang::tr{'no'} + $Lang::tr{'no'}
@@ -180,10 +180,10 @@ if ($sambasettings{'ACTION'} eq 'sharesreset')
$Lang::tr{'resetshares'}
- $Lang::tr{'yes'} + $Lang::tr{'yes'}
- $Lang::tr{'no'} + $Lang::tr{'no'}
@@ -393,9 +393,9 @@ print < - - + + +
-

@@ -508,13 +508,13 @@ print < - +
-
+
-
+ END ; @@ -607,7 +607,7 @@ END
- +
END ; @@ -619,7 +619,7 @@ END
- +
END ; @@ -635,7 +635,7 @@ END
- +
END ; @@ -647,7 +647,7 @@ END
- +
END ; @@ -658,7 +658,7 @@ END
- +
END ; @@ -670,7 +670,7 @@ END + END ; @@ -679,14 +679,14 @@ END print <
- + END ; } print <
- +
-
END @@ -723,7 +723,7 @@ END $Lang::tr{'username'} $Lang::tr{'password'} - + END @@ -748,7 +748,7 @@ END $Lang::tr{'unix group'} $Lang::tr{'unix shell'} - + END @@ -769,7 +769,7 @@ END $Lang::tr{'unix group'} $Lang::tr{'unix shell'} - + END @@ -805,12 +805,12 @@ foreach my $shareentry (sort @Shares)
- +
- +
END ; @@ -822,15 +822,15 @@ print <
- +
- +
- +
@@ -867,7 +867,7 @@ if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio
+
-
END ; @@ -887,7 +887,7 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op
- +
END @@ -946,12 +946,12 @@ foreach my $printerentry (sort @Printers)
- +
- +
END ; @@ -962,15 +962,15 @@ print <
- +
- +
- +
@@ -991,7 +991,7 @@ if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'pri
+
-
END @@ -1012,7 +1012,7 @@ if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq '
- +
END @@ -1083,7 +1083,7 @@ foreach my $log (@Logs) {chomp $log;print"";} print <$Lang::tr{'show last x lines'} - +
$Log
diff --git a/html/cgi-bin/traffics.cgi b/html/cgi-bin/traffics.cgi index 00c7ebe6c..92e731407 100644 --- a/html/cgi-bin/traffics.cgi +++ b/html/cgi-bin/traffics.cgi @@ -18,6 +18,11 @@ require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; require '/var/ipfire/net-traffic/net-traffic-lib.pl'; +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + my %cgiparams; my %netsettings; @@ -177,13 +182,13 @@ my $netWidth = '34%'; my $inOutWidth = '17%'; # 4 networks -if ($netsettings{'CONFIG_TYPE'} =~ /^(5|7)$/) { +if ($netsettings{'CONFIG_TYPE'} =~ /^(4)$/) { $dateWidth = '12%'; $netWidth = '22%'; $inOutWidth = '11%'; } # 3 networks -if ($netsettings{'CONFIG_TYPE'} =~ /^(1|3|4|6)$/) { +if ($netsettings{'CONFIG_TYPE'} =~ /^(2|3)$/) { $dateWidth = '16%'; $netWidth = '28%'; $inOutWidth = '14%'; @@ -196,14 +201,18 @@ print <$Lang::tr{'trafficgreen'} END -if ($netsettings{'CONFIG_TYPE'} =~ /^(4|5|6|7)$/) { +if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/) { print "$Lang::tr{'trafficblue'}"; } -if ($netsettings{'CONFIG_TYPE'} =~ /^(1|3|5|7)$/) { +if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) { print "$Lang::tr{'trafficorange'}"; } +if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) { + print "$Lang::tr{'trafficred'}"; + } + print <$Lang::tr{'trafficred'} @@ -215,22 +224,23 @@ print <$Lang::tr{'trafficout'} END -if ($netsettings{'CONFIG_TYPE'} =~ /^(4|5|6|7)$/) +if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/) { print "$Lang::tr{'trafficin'}"; print "$Lang::tr{'trafficout'}"; } -if ($netsettings{'CONFIG_TYPE'} =~ /^(1|3|5|7)$/) +if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) { print "$Lang::tr{'trafficin'}"; print "$Lang::tr{'trafficout'}"; } -print <$Lang::tr{'trafficin'} - $Lang::tr{'trafficout'} - -END +if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) +{ + print "$Lang::tr{'trafficin'}"; + print "$Lang::tr{'trafficout'}"; +} + print""; my $total_blue_in=0; my $total_blue_out=0; @@ -270,44 +280,48 @@ foreach (@allDays) { $total_green_in += $allDaysBytes{$_}{${Traffic::green_in}}; $total_green_out += $allDaysBytes{$_}{${Traffic::green_out}}; - if ($netsettings{'CONFIG_TYPE'} =~ /^(4|5|6|7)$/) + if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/) { $total_blue_in += $allDaysBytes{$_}{${Traffic::blue_in}}; $total_blue_out += $allDaysBytes{$_}{${Traffic::blue_out}}; } - if ($netsettings{'CONFIG_TYPE'} =~ /^(1|3|5|7)$/) + if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) { $total_orange_in += $allDaysBytes{$_}{${Traffic::orange_in}}; $total_orange_out += $allDaysBytes{$_}{${Traffic::orange_out}}; } - + + if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) + { $total_red_in += $allDaysBytes{$_}{${Traffic::red_in}}; $total_red_out += $allDaysBytes{$_}{${Traffic::red_out}}; + } if ($lines % 2) { - print ""; } + print ""; } else { - print ""; } + print ""; } printf "%s\n", $allDaysBytes{$_}{'Day'}; printf "%.3f\n", ($allDaysBytes{$_}{${Traffic::green_in}}/1048576); printf "%.3f\n", ($allDaysBytes{$_}{${Traffic::green_out}}/1048576); - if ($netsettings{'CONFIG_TYPE'} =~ /^(4|5|6|7)$/) - { + if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/) + { printf "%.3f\n", ($allDaysBytes{$_}{${Traffic::blue_in}}/1048576); printf "%.3f\n", ($allDaysBytes{$_}{${Traffic::blue_out}}/1048576); } - if ($netsettings{'CONFIG_TYPE'} =~ /^(1|3|5|7)$/) + if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) { printf "%.3f\n", ($allDaysBytes{$_}{${Traffic::orange_in}}/1048576); printf "%.3f\n", ($allDaysBytes{$_}{${Traffic::orange_out}}/1048576); } - + if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) + { printf "%.3f\n", ($allDaysBytes{$_}{${Traffic::red_in}}/1048576); printf "%.3f\n", ($allDaysBytes{$_}{${Traffic::red_out}}/1048576); - + } $lines++; } @@ -320,8 +334,8 @@ $total_orange_out=sprintf("%.2f", ($total_orange_out/1048576)); $total_red_in=sprintf("%.2f", ($total_red_in/1048576)); $total_red_out=sprintf("%.2f", ($total_red_out/1048576)); -if ($lines % 2) {print ""; } -else {print ""; } +if ($lines % 2) {print ""; } +else {print ""; } print <$Lang::tr{'trafficsum'} @@ -329,21 +343,23 @@ print <$total_green_out MB END -if ($netsettings{'CONFIG_TYPE'} =~ /^(4|5|6|7)$/) +if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/) { print "$total_blue_in MB"; print "$total_blue_out MB"; } -if ($netsettings{'CONFIG_TYPE'} =~ /^(1|3|5|7)$/) +if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) { print "$total_orange_in MB"; print "$total_orange_out MB"; } - +if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) +{ + print "$total_red_in MB"; + print "$total_red_out MB"; +} print <$total_red_in MB - $total_red_out MB END diff --git a/html/cgi-bin/tripwire.cgi b/html/cgi-bin/tripwire.cgi index 965ec60cc..3fa8fc7e7 100644 --- a/html/cgi-bin/tripwire.cgi +++ b/html/cgi-bin/tripwire.cgi @@ -114,10 +114,10 @@ if ($tripwiresettings{'ACTION'} eq 'addcron')
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{'save settings'}
$Lang::tr{'restore settings'}
$Lang::tr{$Lang::tr{'save settings'}
$Lang::tr{$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{$Lang::tr{'generatekeys'}
$Lang::tr{$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{$Lang::tr{'generatepolicy'}
$Lang::tr{$Lang::tr{'resetpolicy'}
$Lang::tr{$Lang::tr{'generatereport'}
$Lang::tr{$Lang::tr{'updatedatabase'}
END ; @@ -459,7 +459,7 @@ END foreach my $log (@Logs) {chomp $log;print"";} print < + END @@ -519,8 +519,8 @@ END #END #; #} - -&Header::closebox(); +# +#&Header::closebox(); &Header::closebigbox(); &Header::closepage(); diff --git a/src/initscripts/init.d/net/red/pppoe b/src/initscripts/init.d/net/red/pppoe index 912adddd2..199164a71 100644 --- a/src/initscripts/init.d/net/red/pppoe +++ b/src/initscripts/init.d/net/red/pppoe @@ -23,7 +23,7 @@ case "${2}" in if [ "${METHOD}" != "PPPOE_PLUGIN" ]; then PPPCOMMAND="/usr/sbin/pppd pty" - PPPOECOMMAND="/usr/sbin/pppoe -p /var/run/pppoe.pid -I ${1} -T 80 -U -m ${${MTU}-80}" + PPPOECOMMAND="/usr/sbin/pppoe -p /var/run/pppoe.pid -I ${1} -T 80 -U -m ${MTU}" if [ -n ${SERVICENAME} ]; then PPPOECOMMAND+=" -S ${SERVICENAME}" fi