From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/7] pakfire.cgi: Fix indentation
Date: Sun, 08 May 2022 13:11:53 +0000 [thread overview]
Message-ID: <71fbc912-b59f-ab84-c084-01879a2d4bb0@ipfire.org> (raw)
In-Reply-To: <20220508120952.52-2-hofmann@leo-andres.de>
[-- Attachment #1: Type: text/plain, Size: 6060 bytes --]
Oh yes, we do have a rather lot of these. Thank you for cleaning them up.
Acked-by: Peter Müller <peter.muelle(a)ipfire.org>
> Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
> ---
> html/cgi-bin/pakfire.cgi | 111 ++++++++++++++++++++-------------------
> 1 file changed, 56 insertions(+), 55 deletions(-)
>
> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
> index b908ec6a0..535168547 100644
> --- a/html/cgi-bin/pakfire.cgi
> +++ b/html/cgi-bin/pakfire.cgi
> @@ -214,79 +214,80 @@ END
>
> # Process Pakfire commands
> if (($cgiparams{'ACTION'} eq 'install') && (! &_is_pakfire_busy())) {
> + &Header::openbox("100%", "center", $Lang::tr{'request'});
> +
> my @pkgs = split(/\|/, $cgiparams{'INSPAKS'});
> - &Header::openbox("100%", "center", $Lang::tr{'request'});
> - my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
> - print <<END;
> - <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'} @pkgs $Lang::tr{'pakfire possible dependency'}
> + my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
> + print <<END;
> + <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'} @pkgs $Lang::tr{'pakfire possible dependency'}
> <pre>
> END
> - foreach (@output) {
> - $_ =~ s/\^[\[[0-1]\;[0-9]+m//g;
> - print "$_\n";
> - }
> - print <<END;
> + foreach (@output) {
> + $_ =~ s/\^[\[[0-1]\;[0-9]+m//g;
> + print "$_\n";
> + }
> + print <<END;
> </pre></td></tr>
> <tr><td colspan='2'>$Lang::tr{'pakfire accept all'}</td></tr>
> <tr><td colspan='2'> </td></tr>
> <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
> - <input type='hidden' name='INSPAKS' value='$cgiparams{'INSPAKS'}' />
> - <input type='hidden' name='FORCE' value='on' />
> - <input type='hidden' name='ACTION' value='install' />
> - <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/go-next.png' />
> - </form>
> - </td>
> - <td align='left'>
> - <form method='post' action='$ENV{'SCRIPT_NAME'}'>
> - <input type='hidden' name='ACTION' value='' />
> - <input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
> - </form>
> - </td>
> - </tr>
> - </table>
> + <input type='hidden' name='INSPAKS' value='$cgiparams{'INSPAKS'}' />
> + <input type='hidden' name='FORCE' value='on' />
> + <input type='hidden' name='ACTION' value='install' />
> + <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/go-next.png' />
> + </form>
> + </td>
> + <td align='left'>
> + <form method='post' action='$ENV{'SCRIPT_NAME'}'>
> + <input type='hidden' name='ACTION' value='' />
> + <input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
> + </form>
> + </td>
> + </tr>
> + </table>
> END
> - &Header::closebox();
> - &Header::closebigbox();
> - &Header::closepage();
> - exit;
> + &Header::closebox();
> + &Header::closebigbox();
> + &Header::closepage();
> + exit;
>
> } elsif (($cgiparams{'ACTION'} eq 'remove') && (! &_is_pakfire_busy())) {
> + &Header::openbox("100%", "center", $Lang::tr{'request'});
> +
> my @pkgs = split(/\|/, $cgiparams{'DELPAKS'});
> - &Header::openbox("100%", "center", $Lang::tr{'request'});
> - my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
> - print <<END;
> - <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'} @pkgs $Lang::tr{'pakfire possible dependency'}
> + my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
> + print <<END;
> + <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'} @pkgs $Lang::tr{'pakfire possible dependency'}
> <pre>
> END
> - foreach (@output) {
> - $_ =~ s/\^[\[[0-1]\;[0-9]+m//g;
> - print "$_\n";
> - }
> - print <<END;
> + foreach (@output) {
> + $_ =~ s/\^[\[[0-1]\;[0-9]+m//g;
> + print "$_\n";
> + }
> + print <<END;
> </pre></td></tr>
> <tr><td colspan='2'>$Lang::tr{'pakfire uninstall all'}</td></tr>
> <tr><td colspan='2'> </td></tr>
> <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
> - <input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' />
> - <input type='hidden' name='FORCE' value='on' />
> - <input type='hidden' name='ACTION' value='remove' />
> - <input type='image' alt='$Lang::tr{'uninstall'}' title='$Lang::tr{'uninstall'}' src='/images/go-next.png' />
> - </form>
> - </td>
> - <td align='left'>
> - <form method='post' action='$ENV{'SCRIPT_NAME'}'>
> - <input type='hidden' name='ACTION' value='' />
> - <input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
> - </form>
> - </td>
> - </tr>
> - </table>
> + <input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' />
> + <input type='hidden' name='FORCE' value='on' />
> + <input type='hidden' name='ACTION' value='remove' />
> + <input type='image' alt='$Lang::tr{'uninstall'}' title='$Lang::tr{'uninstall'}' src='/images/go-next.png' />
> + </form>
> + </td>
> + <td align='left'>
> + <form method='post' action='$ENV{'SCRIPT_NAME'}'>
> + <input type='hidden' name='ACTION' value='' />
> + <input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
> + </form>
> + </td>
> + </tr>
> + </table>
> END
> - &Header::closebox();
> - &Header::closebigbox();
> - &Header::closepage();
> - exit;
> -
> + &Header::closebox();
> + &Header::closebigbox();
> + &Header::closepage();
> + exit;
> }
>
> my %selected=();
next prev parent reply other threads:[~2022-05-08 13:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-08 12:09 [PATCH 1/7] pakfire.cgi: Separate command processing and HTML generation Leo-Andres Hofmann
2022-05-08 12:09 ` [PATCH 2/7] pakfire.cgi: Fix indentation Leo-Andres Hofmann
2022-05-08 13:11 ` Peter Müller [this message]
2022-05-08 12:09 ` [PATCH 3/7] pakfire.cgi: Show error and log messages earlier Leo-Andres Hofmann
2022-05-08 13:12 ` Peter Müller
2022-05-08 12:09 ` [PATCH 4/7] pakfire.cgi: Notify user if Pakfire is already performing a task Leo-Andres Hofmann
2022-05-08 13:12 ` Peter Müller
2022-05-08 12:09 ` [PATCH 5/7] pakfire.cgi: Implement Post/Redirect/Get pattern Leo-Andres Hofmann
2022-05-08 13:12 ` Peter Müller
2022-05-12 9:30 ` Michael Tremer
2022-05-20 9:47 ` hofmann
2022-05-08 12:09 ` [PATCH 6/7] pakfire.cgi: Discard tac stderr output Leo-Andres Hofmann
2022-05-08 13:12 ` Peter Müller
2022-05-08 12:09 ` [PATCH 7/7] pakfire.cgi: Cosmetic fixes Leo-Andres Hofmann
2022-05-08 13:12 ` Peter Müller
2022-05-08 13:11 ` [PATCH 1/7] pakfire.cgi: Separate command processing and HTML generation Peter Müller
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=71fbc912-b59f-ab84-c084-01879a2d4bb0@ipfire.org \
--to=peter.mueller@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