X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fmemory.cgi;fp=html%2Fcgi-bin%2Fmemory.cgi;h=35ce7a0f1137882caa80af8c82904c8705f6622e;hb=4e481c3a517c27fae6b8e7056fb8a5fdd05c9188;hp=ed73fb3f80e9671840825e5b667c1f20fd2720be;hpb=989182d244671879b69d43d99161ae24a9a97f42;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/html/cgi-bin/memory.cgi b/html/cgi-bin/memory.cgi
index ed73fb3f8..35ce7a0f1 100644
--- a/html/cgi-bin/memory.cgi
+++ b/html/cgi-bin/memory.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        #
@@ -30,57 +30,51 @@ require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 require "${General::swroot}/graphs.pl";
 
-my %cgiparams=();
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
-&Graphs::updatememgraph ("day");
+my @querry = split(/\?/,$ENV{'QUERY_STRING'});
+$querry[0] = '' unless defined $querry[0];
+$querry[1] = 'hour' unless defined $querry[1];
 
-&Header::showhttpheaders();
-&Header::getcgihash(\%cgiparams);
-&Header::openpage($Lang::tr{'memory information'}, 1, '');
-&Header::openbigbox('100%', 'left');
+if ( $querry[0] =~ "memory"){
+	print "Content-type: image/png\n\n";
+	binmode(STDOUT);
+	&Graphs::updatememorygraph($querry[1]);
+}elsif ( $querry[0] =~ "swap"){
+	print "Content-type: image/png\n\n";
+	binmode(STDOUT);
+	&Graphs::updateswapgraph($querry[1]);
+}else{
+	&Header::showhttpheaders();
+	&Header::openpage($Lang::tr{'memory information'}, 1, '');
+	&Header::openbigbox('100%', 'left');
 
-&Header::openbox('100%', 'center', "Memory $Lang::tr{'graph'}");
-if (-e "$Header::graphdir/memory-day.png") {
-	my $ftime = localtime((stat("$Header::graphdir/memory-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=memory'>";
-	print "<img alt='' src='/graphs/memory-day.png' border='0' />";
-	print "</a>";
-} else {
-	print $Lang::tr{'no information available'};
-}
-print "<br />\n";
-&Header::closebox();
+	&Header::openbox('100%', 'center', "Memory $Lang::tr{'graph'}");
+	&Graphs::makegraphbox("memory.cgi","memory","day");
+	&Header::closebox();
 
-&Header::openbox('100%', 'center', "Swap $Lang::tr{'graph'}");
-if (-e "$Header::graphdir/swap-day.png") {
-	my $ftime = localtime((stat("$Header::graphdir/swap-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=swap'>";
-	print "<img alt='' src='/graphs/swap-day.png' border='0' />";
-	print "</a>";
-} else {
-	print $Lang::tr{'no information available'};
-}
-print "<br />\n";
-&Header::closebox();
+	&Header::openbox('100%', 'center', "Swap $Lang::tr{'graph'}");
+	&Graphs::makegraphbox("memory.cgi","swap","day");
+	&Header::closebox();
+	
+	&Header::openbox('100%', 'center', $Lang::tr{'memory'});
+	print "<table width='95%' cellspacing='5'>";
+	my $ram=0;
+	my $size=0;
+	my $used=0;
+	my $free=0;
+	my $percent=0;
+	my $shared=0;
+	my $buffers=0;
+	my $cached=0;
 
-&Header::openbox('100%', 'center', $Lang::tr{'memory'});
-print "<table width='95%' cellspacing='5'>";
-my $ram=0;
-my $size=0;
-my $used=0;
-my $free=0;
-my $percent=0;
-my $shared=0;
-my $buffers=0;
-my $cached=0;
-open(FREE,'/usr/bin/free |');
-while(<FREE>)
-{
-        if ($_ =~ m/^\s+total\s+used\s+free\s+shared\s+buffers\s+cached$/ )
-        {
-    print <<END
+	open(FREE,'/usr/bin/free |');
+	while(<FREE>){
+		if ($_ =~ m/^\s+total\s+used\s+free\s+shared\s+buffers\s+cached$/ ){
+			print <<END
 <tr>
 <td align='center'>&nbsp;</td>
 <td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
@@ -90,52 +84,51 @@ while(<FREE>)
 </tr>
 END
 ;
-  } else {
-    if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/) {
-      ($ram,$size,$used,$free,$shared,$buffers,$cached) = ($1,$1,$2,$3,$4,$5,$6);
-      ($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
-      print <<END
+		}else{
+			if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/){
+				($ram,$size,$used,$free,$shared,$buffers,$cached) = ($1,$1,$2,$3,$4,$5,$6);
+				($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
+				print <<END
 <tr>
 <td class='boldbase'><b>$Lang::tr{'ram'}</b></td>
 <td align='center'>$size  KB</td>
 END
 ;
-    } elsif ($_ =~ m/^Swap:\s+(\d+)\s+(\d+)\s+(\d+)$/) {
-      ($size,$used,$free) = ($1,$2,$3);
-      if ($size != 0)
-      {
-        ($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
-      } else {
-        ($percent = '');
-      }
-      print <<END
+			}elsif($_ =~ m/^Swap:\s+(\d+)\s+(\d+)\s+(\d+)$/){
+				($size,$used,$free) = ($1,$2,$3);
+				if ($size != 0){
+					($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
+				}else{
+					($percent = '');
+				}
+				print <<END
 <tr>
 <td class='boldbase'><b>$Lang::tr{'swap'}</b></td>
 <td align='center'>$size  KB</td>
 END
 ;
-    } elsif ($ram and $_ =~ m/^-\/\+ buffers\/cache:\s+(\d+)\s+(\d+)$/ ) {
-      ($used,$free) = ($1,$2);
-      ($percent = ($used/$ram)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
-      print "<tr><td colspan='2' class='boldbase'><b>$Lang::tr{'excluding buffers and cache'}</b></td>"
-    }
-    print <<END
+			}elsif($ram and $_ =~ m/^-\/\+ buffers\/cache:\s+(\d+)\s+(\d+)$/ ){
+				($used,$free) = ($1,$2);
+				($percent = ($used/$ram)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
+				print "<tr><td colspan='2' class='boldbase'><b>$Lang::tr{'excluding buffers and cache'}</b></td>";
+			}
+			print <<END
 <td align='center'>$used KB</td>
 <td align='center'>$free KB</td>
 <td>
 END
 ;
-    &percentbar($percent);
-    print <<END
+			&percentbar($percent);
+			print <<END
 </td>
 <td align='left'>$percent</td>
 </tr>
 END
 ;
-  }
-}
-close FREE;
-print <<END
+		}
+	}
+	close FREE;
+	print <<END
 <tr><td class='boldbase' colspan='2'><br /></td></tr>
 <tr><td class='boldbase'><b>$Lang::tr{'shared'}</b></td><td align='center'>$shared KB</td></tr>
 <tr><td class='boldbase'><b>$Lang::tr{'buffers'}</b></td><td align='center'>$buffers KB</td></tr>
@@ -143,35 +136,33 @@ print <<END
 </table>
 END
 ;
-&Header::closebox();
+	&Header::closebox();
 
-&Header::closebigbox();
-
-&Header::closepage();
+	&Header::closebigbox();
+	&Header::closepage();
+}
 
-sub percentbar
-{
-  my $percent = $_[0];
-  my $fg = '#a0a0a0';
-  my $bg = '#e2e2e2';
+sub percentbar{
+	my $percent = $_[0];
+	my $fg = '#a0a0a0';
+	my $bg = '#e2e2e2';
 
-  if ($percent =~ m/^(\d+)%$/ )
-  {
-    print <<END
+	if ($percent =~ m/^(\d+)%$/ ){
+		print <<END
 <table width='100' border='1' cellspacing='0' cellpadding='0' style='border-width:1px;border-style:solid;border-color:$fg;width:100px;height:10px;'>
 <tr>
 END
 ;
-    if ($percent eq "100%") {
-      print "<td width='100%' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'>"
-    } elsif ($percent eq "0%") {
-      print "<td width='100%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>"
-    } else {
-      print "<td width='$percent' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'></td><td width='" . (100-$1) . "%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>"
-    }
-    print <<END
+		if ($percent eq "100%"){
+			print "<td width='100%' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'>";
+		}elsif($percent eq "0%"){
+			print "<td width='100%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>";
+		}else{
+			print "<td width='$percent' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'></td><td width='" . (100-$1) . "%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>";
+		}
+		print <<END
 <img src='/images/null.gif' width='1' height='1' alt='' /></td></tr></table>
 END
 ;
-  }
+	}
 }