From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH 2/3] services.cgi: add restart action and restrict action usage
Date: Mon, 03 Oct 2022 20:42:58 +0200
Message-ID: <b76c8d20-03a0-1619-5262-f4a628047f8c@ipfire.org>
In-Reply-To: <20221003153905.14824-3-robin.roevens@disroot.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7159370985999055085=="
List-Id: <development.lists.ipfire.org>

--===============7159370985999055085==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 03.10.2022 um 17:39 schrieb Robin Roevens:
> * Add restart action to services.
> * Only display available actions for a service:
>    Start when service is stopped or Stop and Restart when a service
>    is running.
>=20
> Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
> ---
>   html/cgi-bin/services.cgi | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
>=20
> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
> index d480088a8..498d7fd8e 100644
> --- a/html/cgi-bin/services.cgi
> +++ b/html/cgi-bin/services.cgi
> @@ -189,8 +189,6 @@ END
>  =20
>   				my $status =3D isautorun($pak,$service,$col);
>   				print "$status ";
> -				print "<td align=3D'center' $col width=3D'8%'><a href=3D'services.cgi?=
$pak!start!$service'><img alt=3D'$Lang::tr{'start'}' title=3D'$Lang::tr{'star=
t'}' src=3D'/images/go-up.png' border=3D'0' /></a></td>";
> -				print "<td align=3D'center' $col width=3D'8%'><a href=3D'services.cgi?=
$pak!stop!$service'><img alt=3D'$Lang::tr{'stop'}' title=3D'$Lang::tr{'stop'}=
' src=3D'/images/go-down.png' border=3D'0' /></a></td> ";
>   				my $status =3D isrunningaddon($pak,$service,$col);
>   				$status =3D~ s/\=1B\[[0-1]\;[0-9]+m//g;
>  =20
> @@ -300,7 +298,9 @@ sub isrunningaddon (@) {
>   	my $testcmd =3D @testcmd[0];
>  =20
>   	if ( $testcmd =3D~ /is\ running/ && $testcmd !~ /is\ not\ running/){
> -		$status =3D "<td align=3D'center' bgcolor=3D'${Header::colourgreen}'><fo=
nt color=3D'white'><b>$Lang::tr{'running'}</b></font></td>";
> +		$status =3D "<td align=3D'center' $col width=3D'8%'><a href=3D'services.=
cgi?$pak!stop!$service'><img alt=3D'$Lang::tr{'stop'}' title=3D'$Lang::tr{'st=
op'}' src=3D'/images/go-down.png' border=3D'0' /></a></td> ";
> +		$status .=3D "<td align=3D'center' $col width=3D'8%'><a href=3D'services=
.cgi?$pak!restart!$service'><img alt=3D'$Lang::tr{'restart'}' title=3D'$Lang:=
:tr{'restart'}' src=3D'/images/reload.gif' border=3D'0' /></a></td> ";
> +		$status .=3D "<td align=3D'center' bgcolor=3D'${Header::colourgreen}'><f=
ont color=3D'white'><b>$Lang::tr{'running'}</b></font></td>";
>   		$testcmd =3D~ s/.* //gi;
>   		$testcmd =3D~ s/[a-z_]//gi;
>   		$testcmd =3D~ s/\[[0-1]\;[0-9]+//gi;
> @@ -323,7 +323,8 @@ sub isrunningaddon (@) {
>   		}
>   		$status .=3D"<td align=3D'center' $col>$memory KB</td>";
>   	}else{
> -		$status =3D "<td align=3D'center' bgcolor=3D'${Header::colourred}'><font=
 color=3D'white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan=3D'2' $co=
l></td>";
> +		$status =3D "<td align=3D'center' $col width=3D'16%' colspan=3D2><a href=
=3D'services.cgi?$pak!start!$service'><img alt=3D'$Lang::tr{'start'}' title=
=3D'$Lang::tr{'start'}' src=3D'/images/go-up.png' border=3D'0' /></a></td>";
> +		$status .=3D "<td align=3D'center' bgcolor=3D'${Header::colourred}'><fon=
t color=3D'white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan=3D'2' $c=
ol></td>";
>   	}
>   	return $status;
>   }

--===============7159370985999055085==--