Merge remote-tracking branch 'ms/dns-forwarding' into next

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

diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
index 171bdbd4b6ecbd4be75e12b026bd0b34440644ab..487ba996c2e4ef38169c27788d324b3902253d4b 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) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2005-2010  IPFire Team                                        #
 #                                                                             #
 # 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        #
@@ -39,7 +39,11 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'});
 $querry[0] = '' unless defined $querry[0];
 $querry[1] = 'hour' unless defined $querry[1];
 
-if ( $querry[0] =~ "cpu"){
+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]);
@@ -53,9 +57,15 @@ if ( $querry[0] =~ "cpu"){
        &Header::openbigbox('100%', 'left');
 
        &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
-       &Graphs::makegraphbox("system.cgi","cpu","day","315");
+       &Graphs::makegraphbox("system.cgi","cpu","day");
        &Header::closebox();
 
+       if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
+               &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
+               &Graphs::makegraphbox("system.cgi","cpufreq","day");
+               &Header::closebox();
+       }
+
        &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
        &Graphs::makegraphbox("system.cgi","load","day");
        &Header::closebox();