webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 08:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

services.cgi: Use new system methods

Browse Source 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2021-05-17 23:08:01 +02:00
committed by Michael Tremer
parent 3f5cb3b7cc
commit 31c46c0758
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
html/cgi-bin/services.cgi
View File

@@ -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 #
@@ -221,13 +221,13 @@ sub isautorun{
my $cmd = $_[0];
my $col = $_[1];
my $status = "<td align='center' $col></td>";
my $init = `find /etc/rc.d/rc3.d/S??${cmd} 2>/dev/null`;
chomp ($init);
my @init = &General::system_output("find", "/etc/rc.d/rc3.d/S??${cmd}");
my $init = chomp(@init[0]);
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>";
}
$init = `find /etc/rc.d/rc3.d/off/S??${cmd} 2>/dev/null`;
chomp ($init);
@init = &General::system_output("find", "/etc/rc.d/rc3.d/off/S??${cmd}");
my $init = chomp (@init[0]);
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>";
}
@@ -297,7 +297,8 @@ sub isrunningaddon{
my $exename;
my @memory;
my $testcmd = `/usr/local/bin/addonctrl $_ status 2>/dev/null`;
my @testcmd = &General::system_output("/usr/local/bin/addonctrl", "$_", "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>";