Start updater (test).

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

diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
index 5d852176b92baac5073f96cf9b2eeaff9f400a2b..1ec07d057cfd2447fc55b68baf64883bd0be848e 100644 (file)
--- a/html/cgi-bin/system.cgi
+++ b/html/cgi-bin/system.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -35,53 +35,41 @@ 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 @querry = split(/\?/,$ENV{'QUERY_STRING'});
+$querry[0] = '' unless defined $querry[0];
+$querry[1] = 'hour' unless defined $querry[1];
 
-# Generate Graphs from rrd Data
-&Graphs::updatecpugraph ("day");
-&Graphs::updatecpufreqgraph ("day");
-&Graphs::updateloadgraph ("day");
+if ( $querry[0] =~ "cpufreq"){
+       print "Content-type: image/png\n\n";
+       binmode(STDOUT);
+       &Graphs::updatecpufreqgraph($querry[1]);
+}elsif ( $querry[0] =~ "cpu"){
+       print "Content-type: image/png\n\n";
+       binmode(STDOUT);
+       &Graphs::updatecpugraph($querry[1]);
+}elsif ( $querry[0] =~ "load"){
+       print "Content-type: image/png\n\n";
+       binmode(STDOUT);
+       &Graphs::updateloadgraph($querry[1]);
+}else{
+       &Header::showhttpheaders();
+       &Header::openpage($Lang::tr{'status information'}, 1, '');
+       &Header::openbigbox('100%', 'left');
 
-&Header::showhttpheaders();
-&Header::getcgihash(\%cgiparams);
-&Header::openpage($Lang::tr{'status information'}, 1, '');
-&Header::openbigbox('100%', 'left');
+       if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
+               &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
+               &Graphs::makegraphbox("system.cgi","cpufreq","day","325");
+               &Header::closebox();
+       }
 
-&Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
-if (-e "$Header::graphdir/cpu-day.png") {
-       my $ftime = localtime((stat("$Header::graphdir/cpu-day.png"))[9]);
-       print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-       print "<a href='/cgi-bin/graphs.cgi?graph=cpu'>";
-       print "<img alt='' src='/graphs/cpu-day.png' border='0' />";
-       print "</a>";
-} else {
-       print $Lang::tr{'no information available'};
-}
-print "<br />\n";
-&Header::closebox();
+       &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
+       &Graphs::makegraphbox("system.cgi","cpu","day","325");
+       &Header::closebox();
 
-if (-e "$Header::graphdir/cpufreq-day.png") {
-    &Header::openbox('100%', 'center', "CPU Frequency $Lang::tr{'graph'}");
-       my $ftime = localtime((stat("$Header::graphdir/cpufreq-day.png"))[9]);
-       print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-       print "<a href='/cgi-bin/graphs.cgi?graph=cpufreq'>";
-       print "<img alt='' src='/graphs/cpufreq-day.png' border='0' />";
-       print "</a>";
-       print "<br />\n";
-    &Header::closebox();
-}
+       &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
+       &Graphs::makegraphbox("system.cgi","load","day");
+       &Header::closebox();
 
-&Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
-if (-e "$Header::graphdir/load-day.png") {
-       my $ftime = localtime((stat("$Header::graphdir/load-day.png"))[9]);
-       print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-       print "<a href='/cgi-bin/graphs.cgi?graph=load'>";
-       print "<img alt='' src='/graphs/load-day.png' border='0' />";
-       print "</a>";
-} else {
-       print $Lang::tr{'no information available'};
+       &Header::closebigbox();
+       &Header::closepage();
 }
-print "<br />\n";
-&Header::closebox();
-&Header::closebigbox();
-&Header::closepage();