";
- print "
";
- print "
";
- print "
";
- print "
";
- print "| $Lang::tr{'device'} | $Lang::tr{'mounted on'} | @@ -72,11 +84,9 @@ while($device | $mount | @@ -86,24 +96,22 @@ END
END
;
- &percentbar($percent);
- print <| $percent |
END
;
- }
-}
-close DF;
-print " \n | Inodes\n"; + } + } + close DF; + print " \n | Inodes\n"; -open(DF,'/bin/df -i -x rootfs|'); -while($Lang::tr{'device'} |
$Lang::tr{'mounted on'} |
@@ -114,11 +122,9 @@ while($device |
$mount |
@@ -128,33 +134,35 @@ END
END
;
- &percentbar($percent);
- print < | $percent |
END
;
- }
+ }
+ }
+ close DF;
+ my @iostat1 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$1}');
+ my @iostat2 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$5}');
+ my @iostat3 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$6}');
+ print " \n | transfersDevice | MB read | MB writen | $iostat1[$i] | $iostat2[$i] | $iostat3[$i] | |
";
- print "";
- print "
";
- print "";
-} else {
- print $Lang::tr{'no information available'};
-}
-print "
";
- print "";
-} else {
- print $Lang::tr{'no information available'};
-}
-print "| $Lang::tr{'size'} | @@ -90,52 +84,51 @@ while($Lang::tr{'ram'} | $size KB | 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 <$Lang::tr{'swap'} | $size KB | END ; - } elsif ($ram and $_ =~ m/^-\/\+ buffers\/cache:\s+(\d+)\s+(\d+)$/ ) { - ($used,$free) = ($1,$2); - ($percent = ($used/$ram)*100) =~ s/^(\d+)(\.\d+)?$/$1%/; - print "||
| $Lang::tr{'excluding buffers and cache'} | " - } - print <$Lang::tr{'excluding buffers and cache'} | "; + } + print <$free KB |
END
;
- &percentbar($percent);
- print <| $percent |
| ||
| $Lang::tr{'shared'} | $shared KB | |||||
| $Lang::tr{'buffers'} | $buffers KB | |||||
| " - } elsif ($percent eq "0%") { - print " | " - } else { - print " | "
- }
- print <| ";
+ }else{
+ print " | ";
+ }
+ print < | | ||
| $Lang::tr{'hostname'} | $dhcpinfo{'HOSTNAME'}.$dhcpinfo{'DOMAIN'} |
| $Lang::tr{'domain'} | $dhcpinfo{'DOMAIN'} | $Lang::tr{'gateway'} | $dhcpinfo{'GATEWAY'} | +
| $Lang::tr{'primary dns'} | $DNS1 |
| $Lang::tr{'secondary dns'} | $DNS2 |
| $Lang::tr{'dhcp server'} | $dhcpinfo{'DHCPSIADDR'} |
| $Lang::tr{'def lease time'} | $leasetime |
| $Lang::tr{'default renewal time'} | $rnwltime |
| $Lang::tr{'max renewal time'} | $maxtime |
";
- print "";
- } else {
- print $Lang::tr{'no information available'};
- }
- print "";
- print "";
- } else {
- print $Lang::tr{'no information available'};
- }
- print "
";
- print "";
- } else {
- print $Lang::tr{'no information available'};
- }
- print "| $Lang::tr{'hostname'} | $dhcpinfo{'HOSTNAME'}.$dhcpinfo{'DOMAIN'} |
| $Lang::tr{'domain'} | $dhcpinfo{'DOMAIN'} | $Lang::tr{'gateway'} | $dhcpinfo{'GATEWAY'} | -
| $Lang::tr{'primary dns'} | $DNS1 |
| $Lang::tr{'secondary dns'} | $DNS2 |
| $Lang::tr{'dhcp server'} | $dhcpinfo{'DHCPSIADDR'} |
| $Lang::tr{'def lease time'} | $leasetime |
| $Lang::tr{'default renewal time'} | $rnwltime |
| $Lang::tr{'max renewal time'} | $maxtime |
$output\n"; - &Header::closebox(); - - &Header::openbox('100%', 'left', $Lang::tr{'arp table entries'}); - $output = `/sbin/ip neigh show`; - $output = &Header::cleanhtml($output,"y"); - print "
$output\n"; - &Header::closebox(); - -} - -&Header::closebigbox(); -&Header::closepage(); diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 1b781404c..c24b4601c 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.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 # @@ -22,33 +22,30 @@ use strict; # enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; +use warnings; +use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; require "${General::swroot}/graphs.pl"; +my %color = (); +my %mainsettings = (); +my %netsettings=(); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); +&General::readhash("${General::swroot}/ethernet/settings", \%netsettings); + #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colourred} ); undef (@dummy); -my %color = (); -my %mainsettings = (); -&General::readhash("${General::swroot}/main/settings", \%mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); - -my %netsettings=(); -&General::readhash("${General::swroot}/ethernet/settings", \%netsettings); - -&Graphs::updateprocessesgraph ("day"); my %cgiparams=(); # Maps a nice printable name to the changing part of the pid file, which # is also the name of the program -my %servicenames = -( +my %servicenames =( $Lang::tr{'dhcp server'} => 'dhcpd', $Lang::tr{'web server'} => 'httpd', $Lang::tr{'cron server'} => 'fcron', @@ -65,65 +62,73 @@ my %servicenames = my $lines=0; # Used to count the outputlines to make different bgcolor my $iface = ''; -if (open(FILE, "${General::swroot}/red/iface")) -{ +if (open(FILE, "${General::swroot}/red/iface")){ $iface =
| $Lang::tr{'services'} | $Lang::tr{'status'} | PID | $Lang::tr{'memory'} |
| $key | \n"; + }else{ + print "|||
| $key | \n"; + } -my $key = ''; -foreach $key (sort keys %servicenames) -{ - $lines++; - if ($lines % 2) - { print "|||
| $key | \n";} - else - { print "|||
| $key | \n";} + my $shortname = $servicenames{$key}; + my $status = &isrunning($shortname); - my $shortname = $servicenames{$key}; - my $status = &isrunning($shortname); + print "$status\n"; + print "
| $_ | "; + my $status = isautorun($_); + print "$status "; + print " | ";
+ print " | ";
+ my $status = &isrunningaddon($_);
+ $status =~ s/\\[[0-1]\;[0-9]+m//g;
+
+ chomp($status);
+ print "$status";
+ print "|||
| $_ | "; - my $status = isautorun($_); - print "$status "; - print " | ";
- print " | ";
- my $status = &isrunningaddon($_);
- $status =~ s/\\[[0-1]\;[0-9]+m//g;
-
- chomp($status);
- print "$status";
- print "
";
- print "";
-} else {
- print $Lang::tr{'no information available'};
-}
-print "
";
- print "";
-} else {
- print $Lang::tr{'no information available'};
-}
-print "
";
- print "";
-} else {
- print $Lang::tr{'no information available'};
+ &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
+ &Graphs::makegraphbox("system.cgi","load","day");
+ &Header::closebox();
+
+ &Header::closebigbox();
+ &Header::closepage();
}
-print "
";
- print "";
- print "
";
- print "";
-} else {
- print $Lang::tr{'no information available'};
-}
-print "| $Lang::tr{'trafficdate'} | -$Lang::tr{'trafficin'} | -$Lang::tr{'trafficout'} | -END - -if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/) -{ - print "$Lang::tr{'trafficin'} | "; - print "$Lang::tr{'trafficout'} | "; -} - -if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) -{ - print "$Lang::tr{'trafficin'} | "; - print "$Lang::tr{'trafficout'} | "; -} -if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) -{ -print "$Lang::tr{'trafficin'} | "; -print "$Lang::tr{'trafficout'} | "; -} -print "
| %s | \n", $allDaysBytes{$_}{'Day'}; - printf "%.3f | \n", ($allDaysBytes{$_}{${Traffic::green_in}}/1048576); - printf "%.3f | \n", ($allDaysBytes{$_}{${Traffic::green_out}}/1048576); - - if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/) - { - printf "%.3f | \n", ($allDaysBytes{$_}{${Traffic::blue_in}}/1048576); - printf "%.3f | \n", ($allDaysBytes{$_}{${Traffic::blue_out}}/1048576); - } - if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) - { - printf "%.3f | \n", ($allDaysBytes{$_}{${Traffic::orange_in}}/1048576); - printf "%.3f | \n", ($allDaysBytes{$_}{${Traffic::orange_out}}/1048576); - } - if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) - { - printf "%.3f | \n", ($allDaysBytes{$_}{${Traffic::red_in}}/1048576); - printf "%.3f |
| $total_green_in MB | -$total_green_out MB | -END - -if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/) -{ - print "$total_blue_in MB | "; - print "$total_blue_out MB | "; -} - -if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) -{ - print "$total_orange_in MB | "; - print "$total_orange_out MB | "; -} - -if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) -{ -print "$total_red_in MB | "; -print "$total_red_out MB | "; -} -print "