* [PATCH 1/3] services.cgi: minor cosmetics
2022-10-03 15:39 [PATCH 0/3] services.cgi: few cosmetic changes/enhancements Robin Roevens
@ 2022-10-03 15:39 ` Robin Roevens
2022-10-03 18:40 ` Bernhard Bitsch
2022-10-03 15:39 ` [PATCH 2/3] services.cgi: add restart action and restrict action usage Robin Roevens
2022-10-03 15:39 ` [PATCH 3/3] services.cgi: add link to addon config if ui exists for it Robin Roevens
2 siblings, 1 reply; 7+ messages in thread
From: Robin Roevens @ 2022-10-03 15:39 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]
* Singular 'Service' instead of plural 'Services' as column header of
services table
* Sort list of services
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
---
html/cgi-bin/services.cgi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index e91da884b..d480088a8 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -105,7 +105,7 @@ if ( $querry[0] =~ "processescpu"){
<div align='center'>
<table width='80%' cellspacing='1' class='tbl'>
<tr>
- <th align='left'><b>$Lang::tr{'services'}</b></th>
+ <th align='left'><b>$Lang::tr{'service'}</b></th>
<th align='center' ><b>$Lang::tr{'status'}</b></th>
<th align='center'><b>PID</b></th>
<th align='center'><b>$Lang::tr{'memory'}</b></th>
@@ -167,7 +167,7 @@ END
# Generate list of installed addon pak services
my %paklist = &Pakfire::dblist("installed");
- foreach my $pak (keys %paklist) {
+ foreach my $pak (sort keys %paklist) {
my %metadata = &Pakfire::getmetadata($pak, "installed");
my $service;
--
2.37.3
--
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] services.cgi: minor cosmetics
2022-10-03 15:39 ` [PATCH 1/3] services.cgi: minor cosmetics Robin Roevens
@ 2022-10-03 18:40 ` Bernhard Bitsch
0 siblings, 0 replies; 7+ messages in thread
From: Bernhard Bitsch @ 2022-10-03 18:40 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Am 03.10.2022 um 17:39 schrieb Robin Roevens:
> * Singular 'Service' instead of plural 'Services' as column header of
> services table
> * Sort list of services
>
> Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
> ---
> html/cgi-bin/services.cgi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
> index e91da884b..d480088a8 100644
> --- a/html/cgi-bin/services.cgi
> +++ b/html/cgi-bin/services.cgi
> @@ -105,7 +105,7 @@ if ( $querry[0] =~ "processescpu"){
> <div align='center'>
> <table width='80%' cellspacing='1' class='tbl'>
> <tr>
> - <th align='left'><b>$Lang::tr{'services'}</b></th>
> + <th align='left'><b>$Lang::tr{'service'}</b></th>
> <th align='center' ><b>$Lang::tr{'status'}</b></th>
> <th align='center'><b>PID</b></th>
> <th align='center'><b>$Lang::tr{'memory'}</b></th>
> @@ -167,7 +167,7 @@ END
> # Generate list of installed addon pak services
> my %paklist = &Pakfire::dblist("installed");
>
> - foreach my $pak (keys %paklist) {
> + foreach my $pak (sort keys %paklist) {
> my %metadata = &Pakfire::getmetadata($pak, "installed");
>
> my $service;
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] services.cgi: add restart action and restrict action usage
2022-10-03 15:39 [PATCH 0/3] services.cgi: few cosmetic changes/enhancements Robin Roevens
2022-10-03 15:39 ` [PATCH 1/3] services.cgi: minor cosmetics Robin Roevens
@ 2022-10-03 15:39 ` Robin Roevens
2022-10-03 18:42 ` Bernhard Bitsch
2022-10-03 15:39 ` [PATCH 3/3] services.cgi: add link to addon config if ui exists for it Robin Roevens
2 siblings, 1 reply; 7+ messages in thread
From: Robin Roevens @ 2022-10-03 15:39 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2802 bytes --]
* 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 | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
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
my $status = isautorun($pak,$service,$col);
print "$status ";
- print "<td align='center' $col width='8%'><a href='services.cgi?$pak!start!$service'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
- print "<td align='center' $col width='8%'><a href='services.cgi?$pak!stop!$service'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> ";
my $status = isrunningaddon($pak,$service,$col);
$status =~ s/\^[\[[0-1]\;[0-9]+m//g;
@@ -300,7 +298,9 @@ sub isrunningaddon (@) {
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>";
+ $status = "<td align='center' $col width='8%'><a href='services.cgi?$pak!stop!$service'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> ";
+ $status .= "<td align='center' $col width='8%'><a href='services.cgi?$pak!restart!$service'><img alt='$Lang::tr{'restart'}' title='$Lang::tr{'restart'}' src='/images/reload.gif' border='0' /></a></td> ";
+ $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;
@@ -323,7 +323,8 @@ sub isrunningaddon (@) {
}
$status .="<td align='center' $col>$memory KB</td>";
}else{
- $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
+ $status = "<td align='center' $col width='16%' colspan=2><a href='services.cgi?$pak!start!$service'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
+ $status .= "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
}
return $status;
}
--
2.37.3
--
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/3] services.cgi: add restart action and restrict action usage
2022-10-03 15:39 ` [PATCH 2/3] services.cgi: add restart action and restrict action usage Robin Roevens
@ 2022-10-03 18:42 ` Bernhard Bitsch
0 siblings, 0 replies; 7+ messages in thread
From: Bernhard Bitsch @ 2022-10-03 18:42 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2880 bytes --]
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.
>
> Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
> ---
> html/cgi-bin/services.cgi | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> 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
>
> my $status = isautorun($pak,$service,$col);
> print "$status ";
> - print "<td align='center' $col width='8%'><a href='services.cgi?$pak!start!$service'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
> - print "<td align='center' $col width='8%'><a href='services.cgi?$pak!stop!$service'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> ";
> my $status = isrunningaddon($pak,$service,$col);
> $status =~ s/\^[\[[0-1]\;[0-9]+m//g;
>
> @@ -300,7 +298,9 @@ sub isrunningaddon (@) {
> 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>";
> + $status = "<td align='center' $col width='8%'><a href='services.cgi?$pak!stop!$service'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> ";
> + $status .= "<td align='center' $col width='8%'><a href='services.cgi?$pak!restart!$service'><img alt='$Lang::tr{'restart'}' title='$Lang::tr{'restart'}' src='/images/reload.gif' border='0' /></a></td> ";
> + $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;
> @@ -323,7 +323,8 @@ sub isrunningaddon (@) {
> }
> $status .="<td align='center' $col>$memory KB</td>";
> }else{
> - $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
> + $status = "<td align='center' $col width='16%' colspan=2><a href='services.cgi?$pak!start!$service'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
> + $status .= "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
> }
> return $status;
> }
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] services.cgi: add link to addon config if ui exists for it
2022-10-03 15:39 [PATCH 0/3] services.cgi: few cosmetic changes/enhancements Robin Roevens
2022-10-03 15:39 ` [PATCH 1/3] services.cgi: minor cosmetics Robin Roevens
2022-10-03 15:39 ` [PATCH 2/3] services.cgi: add restart action and restrict action usage Robin Roevens
@ 2022-10-03 15:39 ` Robin Roevens
2022-10-03 18:44 ` Bernhard Bitsch
2 siblings, 1 reply; 7+ messages in thread
From: Robin Roevens @ 2022-10-03 15:39 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]
* If a cgi file exists with the same name as an addon, the
displayed service will be a link to that cgi file.
Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
---
html/cgi-bin/services.cgi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 498d7fd8e..d988b29a5 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -185,6 +185,10 @@ END
# Add addon name to displayname of service if servicename differs from addon
my $displayname = ($pak ne $service) ? "$service ($pak)" : $service;
+ if ( -e "/srv/web/ipfire/cgi-bin/$pak.cgi" ) {
+ $displayname = ($pak ne $service) ? "$service (<a href=\'$pak.cgi\'>$pak</a>)" : "<a href=\'$pak.cgi\'>$service</a>";
+ }
+
print "<td align='left' $col width='31%'>$displayname</td> ";
my $status = isautorun($pak,$service,$col);
--
2.37.3
--
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 3/3] services.cgi: add link to addon config if ui exists for it
2022-10-03 15:39 ` [PATCH 3/3] services.cgi: add link to addon config if ui exists for it Robin Roevens
@ 2022-10-03 18:44 ` Bernhard Bitsch
0 siblings, 0 replies; 7+ messages in thread
From: Bernhard Bitsch @ 2022-10-03 18:44 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Am 03.10.2022 um 17:39 schrieb Robin Roevens:
> * If a cgi file exists with the same name as an addon, the
> displayed service will be a link to that cgi file.
>
> Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
> ---
> html/cgi-bin/services.cgi | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
> index 498d7fd8e..d988b29a5 100644
> --- a/html/cgi-bin/services.cgi
> +++ b/html/cgi-bin/services.cgi
> @@ -185,6 +185,10 @@ END
>
> # Add addon name to displayname of service if servicename differs from addon
> my $displayname = ($pak ne $service) ? "$service ($pak)" : $service;
> + if ( -e "/srv/web/ipfire/cgi-bin/$pak.cgi" ) {
> + $displayname = ($pak ne $service) ? "$service (<a href=\'$pak.cgi\'>$pak</a>)" : "<a href=\'$pak.cgi\'>$service</a>";
> + }
> +
> print "<td align='left' $col width='31%'>$displayname</td> ";
>
> my $status = isautorun($pak,$service,$col);
^ permalink raw reply [flat|nested] 7+ messages in thread