From mboxrd@z Thu Jan  1 00:00:00 1970
From: Robin Roevens <robin.roevens@disroot.org>
To: development@lists.ipfire.org
Subject:
 [PATCH v2 4/5] services.cgi: add restart action and restrict action usage
Date: Thu, 06 Oct 2022 19:59:57 +0200
Message-ID: <20221006175958.11036-5-robin.roevens@disroot.org>
In-Reply-To: <20221006175958.11036-1-robin.roevens@disroot.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1521702526915356144=="
List-Id: <development.lists.ipfire.org>

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

* 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.

Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
---
 html/cgi-bin/services.cgi | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index e35b04cae..4b379251e 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -143,7 +143,7 @@ END
 	my @param=3Dsplit(/!/, $paramstr);
 	# Make sure action parameter is actually one of the allowed service actions
 	given ($param[1]) {
-		when ( ['start', 'stop', 'enable', 'disable'] ) {
+		when ( ['start', 'stop', 'restart', 'enable', 'disable'] ) {
 			# Make sure pak-name and service name don't contain any illegal character
 			if ( $param[0] !~ /[^a-zA-Z_0-9\-]/ &&
 			     $param[2] !~ /[^a-zA-Z_0-9\-]/ ) {
@@ -196,8 +196,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?$p=
ak!start!$service'><img alt=3D'$Lang::tr{'start'}' title=3D'$Lang::tr{'start'=
}' 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?$p=
ak!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
@@ -307,7 +305,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}'><font=
 color=3D'white'><b>$Lang::tr{'running'}</b></font></td>";
+		$status =3D "<td align=3D'center' $col width=3D'8%'><a href=3D'services.cg=
i?$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> ";
+		$status .=3D "<td align=3D'center' $col width=3D'8%'><a href=3D'services.c=
gi?$pak!restart!$service'><img alt=3D'$Lang::tr{'restart'}' title=3D'$Lang::t=
r{'restart'}' src=3D'/images/reload.gif' border=3D'0' /></a></td> ";
+		$status .=3D "<td align=3D'center' bgcolor=3D'${Header::colourgreen}'><fon=
t 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;
@@ -330,7 +330,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 c=
olor=3D'white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan=3D'2' $col>=
</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}'><font =
color=3D'white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan=3D'2' $col=
></td>";
 	}
 	return $status;
 }
--=20
2.37.3


--=20
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.


--===============1521702526915356144==--