diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index c16e2f806..cdcdaf3de 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -147,9 +147,6 @@ $querry[1] = 'hour' unless defined $querry[1];
END
;
- my $lines=0; # Used to count the outputlines to make different bgcolor
- my $col;
-
my @paks;
my @addon_services;
@@ -163,26 +160,17 @@ END
if ("$metadata{'Services'}") {
foreach $service (split(/ /, "$metadata{'Services'}")) {
- $lines++;
- if ($lines % 2) {
- print "
";
- $col="bgcolor='$color{'color22'}'";
- } else {
- print "
";
- $col="bgcolor='$color{'color20'}'";
- }
-
# Add addon name to displayname of service if servicename differs from addon
my $displayname = ($pak ne $service) ? "$service ($pak)" : $service;
if ( -e "/srv/web/ipfire/cgi-bin/$pak.cgi" ) {
$displayname = ($pak ne $service) ? "$service ($pak)" : "$service";
}
- print "| $displayname | ";
+ print "$displayname | ";
- my $status = isautorun($pak,$service,$col);
+ my $status = isautorun($pak,$service);
print "$status ";
- my $status = isrunningaddon($pak,$service,$col);
+ my $status = isrunningaddon($pak,$service);
$status =~ s/\\[[0-1]\;[0-9]+m//g;
chomp($status);
@@ -200,18 +188,18 @@ END
&Header::closepage();
sub isautorun (@) {
- my ($pak, $service, $col) = @_;
+ my ($pak, $service) = @_;
my @testcmd = &General::system_output("/usr/local/bin/addonctrl", "$pak", "boot-status", "$service");
my $testcmd = @testcmd[0];
- my $status = " | ";
+ my $status = " | ";
# Check if autorun for the given service is enabled.
if ( $testcmd =~ /enabled\ on\ boot/ ) {
# Adjust status.
- $status = " | ";
+ $status = " | ";
} elsif ( $testcmd =~ /disabled\ on\ boot/ ) {
# Adjust status.
- $status = " | ";
+ $status = " | ";
}
# Return the status.
@@ -219,9 +207,9 @@ sub isautorun (@) {
}
sub isrunningaddon (@) {
- my ($pak, $service, $col) = @_;
+ my ($pak, $service) = @_;
- my $status = "$Lang::tr{'stopped'} | | ";
+ my $status = "$Lang::tr{'stopped'} | | ";
my $pid = '';
my $testcmd = '';
my $exename;
@@ -231,8 +219,8 @@ sub isrunningaddon (@) {
my $testcmd = @testcmd[0];
if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
- $status = " | ";
- $status .= " | ";
+ $status = " | ";
+ $status .= " | ";
$status .= "$Lang::tr{'running'} | ";
$testcmd =~ s/.* //gi;
$testcmd =~ s/[a-z_]//gi;
@@ -242,7 +230,7 @@ sub isrunningaddon (@) {
$testcmd =~ s///gi;
my @pid = split(/\s/,$testcmd);
- $status .="$pid[0] | ";
+ $status .="$pid[0] | ";
my $memory = 0;
@@ -254,10 +242,10 @@ sub isrunningaddon (@) {
}
$memory+=$memory[0];
}
- $status .="$memory KB | ";
+ $status .="$memory KB | ";
}else{
- $status = " | ";
- $status .= "$Lang::tr{'stopped'} | | ";
+ $status = " | ";
+ $status .= "$Lang::tr{'stopped'} | | ";
}
return $status;
}