diff mbox series

qos.cgi: Fix truncated status output

Message ID 20210730175701.2930-1-stefan.schantl@ipfire.org
State Accepted
Commit 1c959b88c7ab8b79df61f3e51c633c0455cfb421
Headers
Series qos.cgi: Fix truncated status output |

Commit Message

Stefan Schantl July 30, 2021, 5:57 p.m. UTC 
  In the past only the fist line of the status output has been passed
to the cleanhtml() function and displayed. Now the whole output will be
converted to a string, cleaned and displyed on the WUI again.

Fixes #12666.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 html/cgi-bin/qos.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Bernhard Bitsch July 30, 2021, 6:58 p.m. UTC | #1 
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>

Am 30.07.2021 um 19:57 schrieb Stefan Schantl:
> In the past only the fist line of the status output has been passed
> to the cleanhtml() function and displayed. Now the whole output will be
> converted to a string, cleaned and displyed on the WUI again.
> 
> Fixes #12666.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> ---
>   html/cgi-bin/qos.cgi | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
> index fa566b523..d768f95f5 100644
> --- a/html/cgi-bin/qos.cgi
> +++ b/html/cgi-bin/qos.cgi
> @@ -543,7 +543,7 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} )
>   	if ($qossettings{'ENABLED'} eq 'on'){
>   		my $output = "";
>   		my @output = &General::system_output("/usr/local/bin/qosctrl", "status");
> -		$output = &Header::cleanhtml(@output[0],"y");
> +		$output = &Header::cleanhtml(join("", @output), "y");
>   		print "<pre>$output</pre>\n";
>   	} else { print "$Lang::tr{'QoS not enabled'}"; }
>   	&Header::closebox();
>
Michael Tremer Aug. 4, 2021, 2:28 p.m. UTC | #2 
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 30 Jul 2021, at 19:57, Stefan Schantl <stefan.schantl@ipfire.org> wrote:
> 
> In the past only the fist line of the status output has been passed
> to the cleanhtml() function and displayed. Now the whole output will be
> converted to a string, cleaned and displyed on the WUI again.
> 
> Fixes #12666.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> ---
> html/cgi-bin/qos.cgi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
> index fa566b523..d768f95f5 100644
> --- a/html/cgi-bin/qos.cgi
> +++ b/html/cgi-bin/qos.cgi
> @@ -543,7 +543,7 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} )
> 	if ($qossettings{'ENABLED'} eq 'on'){
> 		my $output = "";
> 		my @output = &General::system_output("/usr/local/bin/qosctrl", "status");
> -		$output = &Header::cleanhtml(@output[0],"y");
> +		$output = &Header::cleanhtml(join("", @output), "y");
> 		print "<pre>$output</pre>\n";
> 	} else { print "$Lang::tr{'QoS not enabled'}"; }
> 	&Header::closebox();
> -- 
> 2.30.2
>
diff mbox series

Patch

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index fa566b523..d768f95f5 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -543,7 +543,7 @@  elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} )
 	if ($qossettings{'ENABLED'} eq 'on'){
 		my $output = "";
 		my @output = &General::system_output("/usr/local/bin/qosctrl", "status");
-		$output = &Header::cleanhtml(@output[0],"y");
+		$output = &Header::cleanhtml(join("", @output), "y");
 		print "<pre>$output</pre>\n";
 	} else { print "$Lang::tr{'QoS not enabled'}"; }
 	&Header::closebox();