Am Pakfire weitergearbeitet.

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

diff --git a/html/cgi-bin/fwhits.cgi b/html/cgi-bin/fwhits.cgi
old mode 100755 (executable)
new mode 100644 (file)
index 58da565..7f3b62d
--- a/html/cgi-bin/fwhits.cgi
+++ b/html/cgi-bin/fwhits.cgi
@@ -12,11 +12,17 @@ use strict;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "${General::swroot}/graphs.pl";
 
 my %cgiparams=();
 my @cgigraphs=();
 my @graphs=();
 
+&Graphs::updatefwhitsgraph ("day");
+&Graphs::updatefwhitsgraph ("week");
+&Graphs::updatefwhitsgraph ("month");
+&Graphs::updatefwhitsgraph ("year");
+
 $ENV{'QUERY_STRING'} =~ s/&//g;
 @cgigraphs = split(/graph=/,$ENV{'QUERY_STRING'});
 $cgigraphs[1] = '' unless defined $cgigraphs[1];
@@ -24,84 +30,59 @@ $cgigraphs[1] = '' unless defined $cgigraphs[1];
 &Header::showhttpheaders();
 
 my $graphdir = "/home/httpd/html/graphs";
-
 my @LOCALCHECK=();
 my $errormessage="";
 
-&Header::openpage($Lang::tr{'firewall graphs'}, 1, ' <META HTTP-EQUIV="Refresh" CONTENT="300"> <META HTTP-EQUIV="Cache-Control" content="no-cache"> <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> ');
-
+&Header::openpage($Lang::tr{'firewall graphs'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
-print <<END;
-<table width="100%" align="center">
-       <tr>
-               <td align="left">
-                       <a href=/cgi-bin/fwhits.cgi?graph=line>$Lang::tr{'show lines'}</a>
-                       &nbsp;
-                       <a href=/cgi-bin/fwhits.cgi?graph=area>$Lang::tr{'show areas'}</a>
-               </td>
-       </tr>
-</table>
-END
-if ($cgigraphs[1] eq "line") {
-               &Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-day-line.png"))[9]);
-               print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-               print "<img src='/graphs/firewallhits-day-line.png' border='0' />";
-               print "<br />\n";
-               &Header::closebox();
 
-               &Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-week-line.png"))[9]);
-               print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-               print "<img src='/graphs/firewallhits-week-line.png' border='0' />";
-               print "<br />\n";
-               &Header::closebox();
-
-               &Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-month-line.png"))[9]);
-               print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-               print "<img src='/graphs/firewallhits-month-line.png' border='0' />";
-               print "<br />\n";
-               &Header::closebox();
-
-               &Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-year-line.png"))[9]);
-               print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-               print "<img src='/graphs/firewallhits-year-line.png' border='0' />";
-               print "<br />\n";
-               &Header::closebox();
-}
-else
-{
                &Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-day-area.png"))[9]);
+if (-e "$Header::graphdir/firewallhits-day-area.png") {
+               my $ftime = localtime((stat("$Header::graphdir/firewallhits-day-area.png"))[9]);
                print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-               print "<img src='/graphs/firewallhits-day-area.png' border='0' />";
+               print "<img alt='' src='/graphs/firewallhits-day-area.png' border='0' />";
                print "<br />\n";
+} else {
+       print $Lang::tr{'no information available'};
+}
+print "<br />\n";
                &Header::closebox();
-
+               
                &Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-week-area.png"))[9]);
+if (-e "$Header::graphdir/firewallhits-week-area.png") {
+               my $ftime = localtime((stat("$Header::graphdir/firewallhits-week-area.png"))[9]);
                print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-               print "<img src='/graphs/firewallhits-week-area.png' border='0' />";
+               print "<img alt='' src='/graphs/firewallhits-week-area.png' border='0' />";
                print "<br />\n";
+} else {
+       print $Lang::tr{'no information available'};
+}
+print "<br />\n";
                &Header::closebox();
 
                &Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-month-area.png"))[9]);
+if (-e "$Header::graphdir/firewallhits-month-area.png") {
+               my $ftime = localtime((stat("$Header::graphdir/firewallhits-month-area.png"))[9]);
                print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-               print "<img src='/graphs/firewallhits-month-area.png' border='0' />";
+               print "<img alt='' src='/graphs/firewallhits-month-area.png' border='0' />";
                print "<br />\n";
+} else {
+       print $Lang::tr{'no information available'};
+}
+print "<br />\n";
                &Header::closebox();
 
                &Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-year-area.png"))[9]);
+if (-e "$Header::graphdir/firewallhits-year-area.png") {
+               my $ftime = localtime((stat("$Header::graphdir/firewallhits-year-area.png"))[9]);
                print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-               print "<img src='/graphs/firewallhits-year-area.png' border='0' />";
+               print "<img alt='' src='/graphs/firewallhits-year-area.png' border='0' />";
                print "<br />\n";
-               &Header::closebox();
+} else {
+       print $Lang::tr{'no information available'};
 }
-
+print "<br />\n";
+               &Header::closebox();
 
 &Header::closebigbox();
 &Header::closepage();