suricata: Change midstream policy to "pass-flow"

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / netovpnrw.cgi

diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi
old mode 100755 (executable)
new mode 100644 (file)
index e0b1148..5014f9a
--- a/html/cgi-bin/netovpnrw.cgi
+++ b/html/cgi-bin/netovpnrw.cgi
@@ -20,7 +20,7 @@
 ###############################################################################
 
 use strict;
-
+use URI::Escape;
 # enable only the following on debugging purpose
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
@@ -33,40 +33,30 @@ require "${General::swroot}/graphs.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);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 
 my @vpns=();
 
-my @querry = split(/\?/,$ENV{'QUERY_STRING'});
-$querry[0] = '' unless defined $querry[0];
-$querry[1] = 'week' unless defined $querry[1];
-
-if ( $querry[0] ne "" && $querry[0] ne "UNDEF"){
-       print "Content-type: image/png\n\n";
-       binmode(STDOUT);
-       &Graphs::updatevpngraph($querry[0],$querry[1]);
-}else{
-       &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn statistic rw'}, 1, '');
-       &Header::openbigbox('100%', 'left');
+&Header::showhttpheaders();
+&Header::openpage($Lang::tr{'vpn statistic rw'}, 1, '');
+&Header::openbigbox('100%', 'left');
 
-       my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*/ -not  -path *openvpn-UNDEF*  -not -path *openvpn-*n2n* -name *.rrd 2>/dev/null|sort`;
-       foreach (@vpngraphs){
-               if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive.rrd/){
-                       push(@vpns,$2);
-               }
+my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*/ -not  -path *openvpn-UNDEF*  -not -path *openvpn-*n2n* -name *.rrd 2>/dev/null|sort`;
+foreach (@vpngraphs){
+       if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive.rrd/){
+               push(@vpns,$2);
        }
-       if(@vpns){
-               foreach (@vpns) {
-                       &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
-                       &Graphs::makegraphbox("netovpnrw.cgi",$_,"week");
-                       &Header::closebox();
-               }
-       }else{
-               print "<center>".$Lang::tr{'no data'}."</center>";
+}
+if(@vpns){
+       foreach (@vpns) {
+               &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
+               &Graphs::makegraphbox("netovpnrw.cgi",$_, "day");
+               &Header::closebox();
        }
-       my $output = '';
-
-       &Header::closebigbox();
-       &Header::closepage();
+}else{
+       print "<center>".$Lang::tr{'no data'}."</center>";
 }
+my $output = '';
+
+&Header::closebigbox();
+&Header::closepage();