vpn-stats: Show daily graph as *all* other graphs do, too

[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 100644 (file)
new mode 100755 (executable)
index 181ae33..fed6d4d
--- a/html/cgi-bin/netovpnrw.cgi
+++ b/html/cgi-bin/netovpnrw.cgi
@@ -47,20 +47,24 @@ if ( $querry[0] ne "" && $querry[0] ne "UNDEF"){
        &Graphs::updatevpngraph($querry[0],$querry[1]);
 }else{
        &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'host to net vpn'}, 1, '');
+       &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* -name *.rrd|sort`;
+       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){
-               $_ =~ /(.*)\/openvpn-(.*)\/if_octets.rrd/;
-               push(@vpns,$2);
+               if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive.rrd/){
+                       push(@vpns,$2);
+               }
        }
-       foreach (@vpns) {
-               &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
-               &Graphs::makegraphbox("netovpnrw.cgi",$_,"week");
-               &Header::closebox();
+       if(@vpns){
+               foreach (@vpns) {
+                       &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
+                       &Graphs::makegraphbox("netovpnrw.cgi",$_, "day");
+                       &Header::closebox();
+               }
+       }else{
+               print "<center>".$Lang::tr{'no data'}."</center>";
        }
-
        my $output = '';
 
        &Header::closebigbox();