X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fsystem.cgi;h=487ba996c2e4ef38169c27788d324b3902253d4b;hb=56947acb12176f397cbd5078c5544cdc4f19b27b;hp=6c85e3823807c43d4131618cb2a4e1623d618643;hpb=74e82b68e80899e5712697383ee05443e91b19f3;p=ipfire-2.x.git diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index 6c85e38238..487ba996c2 100644 --- 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","325"); + &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();