From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] qos.cgi: Fix truncated status output
Date: Wed, 04 Aug 2021 16:28:00 +0200
Message-ID: <D14C46A6-DF72-4D83-82E8-D1FCB0AE0B43@ipfire.org>
In-Reply-To: <20210730175701.2930-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6831192218116914524=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 30 Jul 2021, at 19:57, Stefan Schantl <stefan.schantl(a)ipfire.org> wrot=
e:
>=20
> 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.
>=20
> Fixes #12666.
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> html/cgi-bin/qos.cgi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> 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 =3D "";
> 		my @output =3D &General::system_output("/usr/local/bin/qosctrl", "status"=
);
> -		$output =3D &Header::cleanhtml(@output[0],"y");
> +		$output =3D &Header::cleanhtml(join("", @output), "y");
> 		print "<pre>$output</pre>\n";
> 	} else { print "$Lang::tr{'QoS not enabled'}"; }
> 	&Header::closebox();
> --=20
> 2.30.2
>=20


--===============6831192218116914524==--