Fix addon service pid/memory display if the addon name has numbers.

diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files
index 0037af183326a74f3cbb5f65b2cf4c007eea7bed..1df41d9a76e8bc6f6fe2954b027d5a82264da1ad 100644 (file)
--- a/config/rootfiles/core/47/filelists/files
+++ b/config/rootfiles/core/47/filelists/files
@@ -1 +1,2 @@
 etc/system-release
 etc/system-release

+srv/web/ipfire/cgi-bin/services.cgi

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 424ca868f15161e1694d55217032080ddbc99ace..b6efe095849431c112ab8d36bd488833aaa829d5 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -279,6 +279,7 @@ sub isrunningaddon{
 
        if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
                $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
 
        if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
                $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";

+               $testcmd =~ s/.* //gi;

                $testcmd =~ s/[a-z_]//gi;
                $testcmd =~ s/\[[0-1]\;[0-9]+//gi;
                $testcmd =~ s/[\(\)\.]//gi;
                $testcmd =~ s/[a-z_]//gi;
                $testcmd =~ s/\[[0-1]\;[0-9]+//gi;
                $testcmd =~ s/[\(\)\.]//gi;