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 [thread overview]
Message-ID: <D14C46A6-DF72-4D83-82E8-D1FCB0AE0B43@ipfire.org> (raw)
In-Reply-To: <20210730175701.2930-1-stefan.schantl@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
> On 30 Jul 2021, at 19:57, Stefan Schantl <stefan.schantl(a)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(a)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
>
prev parent reply other threads:[~2021-08-04 14:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 17:57 Stefan Schantl
2021-07-30 18:58 ` Bernhard Bitsch
2021-08-04 14:28 ` Michael Tremer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D14C46A6-DF72-4D83-82E8-D1FCB0AE0B43@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox