diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 27d0998ca..6295a0945 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -40,9 +40,14 @@ open (ACTIVE, 'iptstate -1rbt |') or die 'Unable to open ip_conntrack'; my @active = ; close (ACTIVE); -my @vpn = ('none'); -#open (ACTIVE, "/proc/net/ipsec_eroute") and @vpn = ; -#close (ACTIVE); +my @vpn = ` route -n | grep ipsec | awk '{ print \$1" "\$3}'`; + foreach my $route (@vpn) { + chomp($route); + my @temp = split(/[\t ]+/, $route); + push(@network, $temp[0]); + push(@masklen, $temp[1]); + push(@colour, ${Header::colourvpn} ); + } my $aliasfile = "${General::swroot}/ethernet/aliases"; open(ALIASES, $aliasfile) or die 'Unable to open aliases file.'; diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi index 7af6f11c1..ffab93c2a 100644 --- a/html/cgi-bin/gui.cgi +++ b/html/cgi-bin/gui.cgi @@ -26,6 +26,7 @@ my $errormessage=''; $cgiparams{'FX'} = 'off'; +$cgiparams{'SPEED'} = 'off'; $cgiparams{'WINDOWWITHHOSTNAME'} = 'off'; $cgiparams{'REFRESHINDEX'} = 'off'; $cgiparams{'ACTION'} = ''; @@ -77,6 +78,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'}; $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'}; $mainsettings{'FX'} = $cgiparams{'FX'}; + $mainsettings{'SPEED'} = $cgiparams{'SPEED'}; $mainsettings{'THEME'} = $cgiparams{'theme'}; $mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'}; &General::writehash("${General::swroot}/main/settings", \%mainsettings); @@ -112,6 +114,11 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") } else { $cgiparams{'REFRESHINDEX'} = 'off'; } + if($mainsettings{'SPEED'}) { + $cgiparams{'SPEED'} = $mainsettings{'SPEED'}; + } else { + $cgiparams{'SPEED'} = 'off'; + } } # Default settings @@ -121,6 +128,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}") $cgiparams{'PPPUPDOWNBEEP'} = 'on'; $cgiparams{'REFRESHINDEX'} = 'off'; $cgiparams{'FX'} = 'on'; + $cgiparams{'SPEED'} = 'on'; $cgiparams{'THEME'} = 'ipfire'; } @@ -140,6 +148,10 @@ $checked{'FX'}{'off'} = ''; $checked{'FX'}{'on'} = ''; $checked{'FX'}{$cgiparams{'FX'}} = "checked='checked'"; +$checked{'SPEED'}{'off'} = ''; +$checked{'SPEED'}{'on'} = ''; +$checked{'SPEED'}{$cgiparams{'SPEED'}} = "checked='checked'"; + &Header::openpage($Lang::tr{'gui settings'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -169,6 +181,10 @@ print < $Lang::tr{'refresh index page while connected'} + + + $Lang::tr{'show ajax speedmeter in footer'} +   $Lang::tr{'languagepurpose'} diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index bb3312979..473d1fe8e 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -180,7 +180,7 @@ if ($cgigraphs[1] =~ /hddtemp/){ } &Header::closebox(); print "
"; - print ""; + print ""; print "$Lang::tr{'back'}
\n"; } else @@ -192,7 +192,7 @@ else { my $ftime = localtime((stat("$graphdir/mbmon-temp-day.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print ""; print ""; } @@ -211,7 +211,7 @@ else { my $ftime = localtime((stat("$graphdir/mbmon-fan-day.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print ""; print ""; } @@ -230,7 +230,7 @@ else { my $ftime = localtime((stat("$graphdir/mbmon-volt-day.png"))[9]); print "
$Lang::tr{'the statistics were last updated at'}: $ftime

\n"; - print ""; + print ""; print ""; print ""; } diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 750514ed7..aaf9c20a7 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -223,7 +223,7 @@ if (-e "/etc/snort/snort.conf") { close(FILE); if ($restartsnortrequired) { - system('/usr/local/bin/snortctrl','restart'); + system('/usr/local/bin/snortctrl restart >/dev/null'); } } @@ -271,7 +271,7 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'}) unlink "${General::swroot}/snort/enable_orange"; } - system('/usr/local/bin/snortctrl','restart'); + system('/usr/local/bin/snortctrl restart >/dev/null'); } else { # INSTALLMD5 is not in the form, so not retrieved by getcgihash diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index e427fb290..0b0d8cb08 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -31,8 +31,6 @@ my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); - - ### ### Initialize variables ### diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 639a700e3..8abfd00db 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -21,6 +21,11 @@ my @squidversion = `/usr/sbin/squid -v`; my $http_port='81'; my $https_port='444'; +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 %proxysettings=(); my %netsettings=(); my %filtersettings=(); diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 0dfac7898..27524729d 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -762,8 +762,8 @@ END print "$message"; } if ( $qossettings{'EDIT'} eq 'yes' ) { - print ""; - print ""; + print ""; + print ""; } print <Geben sie die Daten ein
und klicken Sie danach auf Speichern. @@ -782,8 +782,8 @@ END $qossettings{'IMQ_DEV_SEL'} = 'selected'; } print <$qossettings{'RED_DEV'} - + +   Klasse: END @@ -845,7 +845,7 @@ END     -   +   END ; @@ -920,7 +920,7 @@ END -   +   END ; @@ -961,11 +961,11 @@ END print <  Quell-IP-Adresse: - +   Ziel-IP-Adresse: - - + + END ; @@ -998,17 +998,17 @@ END print <  Quell-Port: - +   Ziel-Port: - +   Quell-IP-Adresse: - +   Ziel-IP-Adresse: - - + + END ; @@ -1035,7 +1035,7 @@ END Maximaler Durchsatz (4) Maximale Zuverlaessigkeit (2) Minimale Kosten (1) - + END ; @@ -1065,7 +1065,7 @@ sub showclasses { @classline = split( /\;/, $classentry ); if ( $classline[0] eq $qossettings{'DEV'} ) { - &Header::openbox('100%', 'center', "Klasse: $classline[1]"); + &Header::openbox('100%', 'center', "Klasse: $classline[1]"); print < $Lang::tr{'interface'} @@ -1270,9 +1270,6 @@ END } END ; - } - - foreach $subclassentry (sort @subclasses) { @subclassline = split( /\;/, $subclassentry ); @@ -1312,9 +1309,10 @@ END END ; - &Header::closebox(); + &Header::closebox(); } - } + } + } } sub expert @@ -1324,14 +1322,14 @@ sub expert
MTU: - + Diese Einstellung aendert die MTU nicht global sondern nur fuer das QoS.
Queue Laenge: - +  
SFQ Perturb: - - + +
END diff --git a/html/html/images/openvpn.png b/html/html/images/openvpn.png new file mode 100644 index 000000000..e4c789b6c Binary files /dev/null and b/html/html/images/openvpn.png differ diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 1e4903a53..789d0c1af 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -156,6 +156,10 @@ END } } +END +; +if ($settings{'SPEED'} ne 'off') { +print < var http_request = false; @@ -211,6 +215,12 @@ END +END +; +} +else { +print "";} +print < diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index 476991a4d..6a2067bce 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -156,6 +156,10 @@ END } } +END +; +if ($settings{'SPEED'} ne 'off') { +print < var http_request = false; @@ -211,6 +215,12 @@ END +END +; +} +else { +print "";} +print < +END +; +if ($settings{'SPEED'} ne 'off') { +print < +
+ $Lang::tr{'bandwidth usage'}: $Lang::tr{'incoming'}: + $Lang::tr{'outgoing'}: +
+END +; +} +print < + diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 91f31e23c..3f8a9cec5 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1307,6 +1307,7 @@ 'shared memory' => 'Gemeins. Speicher', 'sharename' => 'Freigabename', 'shares' => 'Freigaben', +'show ajax speedmeter in footer' => 'Ajax Speed Anzeige', 'show ca certificate' => 'CA Zertifikat anzeigen', 'show certificate' => 'Zertifikat anzeigen', 'show crl' => 'Certificate Revocation List anzeigen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 6dbe21c05..705bac13e 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1313,6 +1313,7 @@ 'shared memory' => 'Shared Memory', 'sharename' => 'Sharename', 'shares' => 'Shares', +'show ajax speedmeter in footer' => 'Show Ajax Speedmeter', 'show areas' => 'show areas', 'show ca certificate' => 'Show CA Certificate', 'show certificate' => 'Show Certificate', diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index a3c351cf1..493054853 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -4,6 +4,9 @@ . /etc/sysconfig/rc . $rc_functions +chown -R squid:squid /var/log/squid +chown -R squid:squid /var/log/squidGuard + transparent() { DEVICE=$1