services.cgi: Remove links from addon services

Message ID 20241111093721.4311-1-adolf.belka@ipfire.org
State Staged
Commit 6274e1d0b6035474719ffb2e9d1e043b0fa6e6f2
Headers
Series services.cgi: Remove links from addon services |

Commit Message

Adolf Belka Nov. 11, 2024, 9:37 a.m. UTC
  - As discussed in Video Conf Call on Oct 7th 2024
- This patch removes the links from the addon services, in line with the change made
   to the core services.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 html/cgi-bin/services.cgi | 3 ---
 1 file changed, 3 deletions(-)
  

Comments

Bernhard Bitsch Nov. 12, 2024, 3:56 p.m. UTC | #1
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch@ipfire.org>

Am 11.11.2024 um 10:37 schrieb Adolf Belka:
> - As discussed in Video Conf Call on Oct 7th 2024
> - This patch removes the links from the addon services, in line with the change made
>     to the core services.
> 
> Tested-by: Adolf Belka <adolf.belka@ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>   html/cgi-bin/services.cgi | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
> index a3ae13c78..43babf522 100644
> --- a/html/cgi-bin/services.cgi
> +++ b/html/cgi-bin/services.cgi
> @@ -161,9 +161,6 @@ END
>   			foreach $service (split(/ /, "$metadata{'Services'}")) {
>   				# 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' width='31%'>$displayname</td> ";
>
  
Michael Tremer Nov. 18, 2024, 8:07 p.m. UTC | #2
Acked-by: Michael Tremer <michael.tremer@ipfire.org>

> On 11 Nov 2024, at 09:37, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> - As discussed in Video Conf Call on Oct 7th 2024
> - This patch removes the links from the addon services, in line with the change made
>   to the core services.
> 
> Tested-by: Adolf Belka <adolf.belka@ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
> html/cgi-bin/services.cgi | 3 ---
> 1 file changed, 3 deletions(-)
> 
> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
> index a3ae13c78..43babf522 100644
> --- a/html/cgi-bin/services.cgi
> +++ b/html/cgi-bin/services.cgi
> @@ -161,9 +161,6 @@ END
> foreach $service (split(/ /, "$metadata{'Services'}")) {
> # 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' width='31%'>$displayname</td> ";
> 
> -- 
> 2.47.0
>
  

Patch

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index a3ae13c78..43babf522 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -161,9 +161,6 @@  END
 			foreach $service (split(/ /, "$metadata{'Services'}")) {
 				# 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' width='31%'>$displayname</td> ";