Merge branch 'perl-system' into next

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

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 38b89ef1e632afdba4a72c0d276358a94d82048d..2374757350d674cf1b5babd421532ad53607bc44 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2010  IPFire Team                                        #
+# Copyright (C) 2005-2021  IPFire Team                                        #
 #                                                                             #
 # 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        #
@@ -141,7 +141,7 @@ END
        my $paramstr=$ENV{QUERY_STRING};
        my @param=split(/!/, $paramstr);
        if ($param[1] ne ''){
-               system("/usr/local/bin/addonctrl @param[0] @param[1] > /dev/null 2>&1");
+               &General::system("/usr/local/bin/addonctrl", "$param[0]", "$param[1]");
        }
 
        print <<END
@@ -163,6 +163,8 @@ END
        # Generate list of installed addon pak's
        opendir (DIR, "/opt/pakfire/db/installed") || die "Cannot opendir /opt/pakfire/db/installed/: $!";
        my @pak = sort readdir DIR;
+       closedir(DIR);
+
        foreach (@pak){
                chomp($_);
                next unless (m/^meta-/);
@@ -187,6 +189,7 @@ END
                                        print "<tr>";
                                        $col="bgcolor='$color{'color20'}'";
                                }
+
                                print "<td align='left' $col width='31%'>$_</td> ";
                                my $status = isautorun($_,$col);
                                print "$status ";
@@ -217,27 +220,54 @@ END
        &Header::closepage();
 }
 
-sub isautorun{
-       my $cmd = $_[0];
-       my $col = $_[1];
+sub isautorun (@) {
+       my ($cmd, $col) = @_;
+
+       # Init directory.
+       my $initdir = "/etc/rc.d/rc3.d/";
+
        my $status = "<td align='center' $col></td>";
-       my $init = `find /etc/rc.d/rc3.d/S??${cmd} 2>/dev/null`;
-       chomp ($init);
-       if ($init ne ''){
+
+       # Check if autorun for the given cmd is enabled.
+       if ( &find_init("$cmd", "$initdir") ) {
+               # Adjust status.
                $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 ''){
+       } else {
+               # Adjust status.
                $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 the status.
        return $status;
 }
 
-sub isrunning{
-       my $cmd = $_[0];
-       my $col = $_[1];
+sub find_init (@) {
+       my ($cmd, $dir) = @_;
+
+       # Open given init directory.
+       opendir (INITDIR, "$dir") || die "Cannot opendir $dir: $!";
+
+       # Read-in init files from directory.
+       my @inits = readdir(INITDIR);
+
+       # Close directory handle.
+       closedir(INITDIR);
+
+       # Loop through the directory.
+       foreach my $init (@inits) {
+               # Check if the current processed file belongs to the given command.
+               if ($init =~ /S\d+\d+$cmd\z/) {
+                       # Found, return "1" - True.
+                       return "1";
+               }
+        }
+
+       # Nothing found, return nothing.
+       return;
+}
+
+sub isrunning (@) {
+       my ($cmd, $col) = @_;
        my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
        my $pid = '';
        my $testcmd = '';
@@ -288,16 +318,17 @@ sub isrunning{
        return $status;
 }
 
-sub isrunningaddon{
-       my $cmd = $_[0];
-       my $col = $_[1];
+sub isrunningaddon (@) {
+       my ($cmd, $col) = @_;
+
        my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
        my $pid = '';
        my $testcmd = '';
        my $exename;
        my @memory;
 
-       my $testcmd = `/usr/local/bin/addonctrl $_ status 2>/dev/null`;
+       my @testcmd = &General::system_output("/usr/local/bin/addonctrl", "$cmd", "status");
+       my $testcmd = @testcmd[0];
 
        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>";