Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

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

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 2b7ee75a1a08bd9685cd51c022280318cd8308d5..64fdbba05a4ee6afcaceae2caa1dbee12f485782 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -49,7 +49,7 @@ my %servicenames =(
        $Lang::tr{'dhcp server'} => 'dhcpd',
        $Lang::tr{'web server'} => 'httpd',
        $Lang::tr{'cron server'} => 'fcron',
-       $Lang::tr{'dns proxy server'} => 'dnsmasq',
+       $Lang::tr{'dns proxy server'} => 'unbound',
        $Lang::tr{'logging server'} => 'syslogd',
        $Lang::tr{'kernel logging server'} => 'klogd',
        $Lang::tr{'ntp server'} => 'ntpd',
@@ -117,7 +117,7 @@ if ( $querry[0] =~ "processescpu"){
        print <<END
 <div align='center'>
 <table width='80%' cellspacing='1' class='tbl'>
-<tr bgcolor='$color{'color20'}'>
+<tr>
        <th align='left'><b>$Lang::tr{'services'}</b></th>
        <th align='center' ><b>$Lang::tr{'status'}</b></th>
        <th align='center'><b>PID</b></th>
@@ -161,7 +161,7 @@ END
        print <<END
 <div align='center'>
 <table width='80%' cellspacing='1' class='tbl'>
-<tr bgcolor='$color{'color20'}'>
+<tr>
        <th align='center'><b>Addon</b></th>
        <th align='center'><b>Boot</b></th>
        <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th>
@@ -188,6 +188,9 @@ END
                        # mdadm should not stopped with webif because this could crash the system
                        #
                        chomp($_);
+                       if ( $_ eq 'squid' ) {
+                               next;
+                       }
                        if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
                                $lines++;
                                if ($lines % 2){
@@ -197,11 +200,11 @@ END
                                        print "<tr>";
                                        $col="bgcolor='$color{'color20'}'";
                                }
-                               print "<td align='left' $col>$_</td> ";
+                               print "<td align='left' $col width='31%'>$_</td> ";
                                my $status = isautorun($_,$col);
                                print "$status ";
-                               print "<td align='center' $col><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>";
-                               print "<td align='center' $col><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> ";
+                               print "<td align='center' $col width='8%'><a href='services.cgi?$_!start'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
+                               print "<td align='center' $col width='8%'><a href='services.cgi?$_!stop'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> ";
                                my $status = &isrunningaddon($_,$col);
                                $status =~ s/\\e\[[0-1]\;[0-9]+m//g;
 
@@ -234,12 +237,12 @@ sub isautorun{
        my $init = `find /etc/rc.d/rc3.d/S??${cmd} 2>/dev/null`;
        chomp ($init);
        if ($init ne ''){
-               $status = "<td align='center' $col><A HREF=services.cgi?$_!disable><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></A></td>";
+               $status = "<td align='center' $col><a href='services.cgi?$_!disable'><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></a></td>";
        }
        $init = `find /etc/rc.d/rc3.d/off/S??${cmd} 2>/dev/null`;
        chomp ($init);
        if ($init ne ''){
-               $status = "<td align='center' $col><A HREF=services.cgi?$_!enable><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></A></td>";
+               $status = "<td align='center' $col><a href='services.cgi?$_!enable'><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></a></td>";
        }
 
        return $status;