From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <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
Message-ID: <71fbc912-b59f-ab84-c084-01879a2d4bb0@ipfire.org>
In-Reply-To: <20220508120952.52-2-hofmann@leo-andres.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0096961147147508406=="
List-Id: <development.lists.ipfire.org>

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

Oh yes, we do have a rather lot of these. Thank you for cleaning them up.

Acked-by: Peter M=C3=BCller <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(-)
>=20
> 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
> =20
>  # Process Pakfire commands
>  if (($cgiparams{'ACTION'} eq 'install') && (! &_is_pakfire_busy())) {
> +	&Header::openbox("100%", "center", $Lang::tr{'request'});
> +
>  	my @pkgs =3D split(/\|/, $cgiparams{'INSPAKS'});
> -		&Header::openbox("100%", "center", $Lang::tr{'request'});
> -		my @output =3D &General::system_output("/usr/local/bin/pakfire", "resolv=
edeps", "--no-colors", @pkgs);
> -		print <<END;
> -		<table><tr><td colspan=3D'2'>$Lang::tr{'pakfire install package'} @pkgs =
$Lang::tr{'pakfire possible dependency'}
> +	my @output =3D &General::system_output("/usr/local/bin/pakfire", "resolve=
deps", "--no-colors", @pkgs);
> +	print <<END;
> +	<table><tr><td colspan=3D'2'>$Lang::tr{'pakfire install package'} @pkgs $=
Lang::tr{'pakfire possible dependency'}
>  		<pre>
>  END
> -		foreach (@output) {
> -		  $_ =3D~ s/\=1B\[[0-1]\;[0-9]+m//g;
> -			print "$_\n";
> -		}
> -		print <<END;
> +	foreach (@output) {
> +		$_ =3D~ s/\=1B\[[0-1]\;[0-9]+m//g;
> +		print "$_\n";
> +	}
> +	print <<END;
>  		</pre></td></tr>
>  		<tr><td colspan=3D'2'>$Lang::tr{'pakfire accept all'}</td></tr>
>  		<tr><td colspan=3D'2'>&nbsp;</td></tr>
>  		<tr><td align=3D'right'><form method=3D'post' action=3D'$ENV{'SCRIPT_NAM=
E'}'>
> -							<input type=3D'hidden' name=3D'INSPAKS' value=3D'$cgiparams{'INSPAK=
S'}' />
> -							<input type=3D'hidden' name=3D'FORCE' value=3D'on' />
> -							<input type=3D'hidden' name=3D'ACTION' value=3D'install' />
> -							<input type=3D'image' alt=3D'$Lang::tr{'install'}' title=3D'$Lang::=
tr{'install'}' src=3D'/images/go-next.png' />
> -						</form>
> -				</td>
> -				<td align=3D'left'>
> -						<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
> -							<input type=3D'hidden' name=3D'ACTION' value=3D'' />
> -							<input type=3D'image' alt=3D'$Lang::tr{'abort'}' title=3D'$Lang::tr=
{'abort'}' src=3D'/images/dialog-error.png' />
> -						</form>
> -				</td>
> -			</tr>
> -		</table>
> +					<input type=3D'hidden' name=3D'INSPAKS' value=3D'$cgiparams{'INSPAKS'=
}' />
> +					<input type=3D'hidden' name=3D'FORCE' value=3D'on' />
> +					<input type=3D'hidden' name=3D'ACTION' value=3D'install' />
> +					<input type=3D'image' alt=3D'$Lang::tr{'install'}' title=3D'$Lang::tr=
{'install'}' src=3D'/images/go-next.png' />
> +				</form>
> +			</td>
> +			<td align=3D'left'>
> +				<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
> +					<input type=3D'hidden' name=3D'ACTION' value=3D'' />
> +					<input type=3D'image' alt=3D'$Lang::tr{'abort'}' title=3D'$Lang::tr{'=
abort'}' src=3D'/images/dialog-error.png' />
> +				</form>
> +			</td>
> +		</tr>
> +	</table>
>  END
> -		&Header::closebox();
> -		&Header::closebigbox();
> -		&Header::closepage();
> -		exit;
> +	&Header::closebox();
> +	&Header::closebigbox();
> +	&Header::closepage();
> +	exit;
> =20
>  } elsif (($cgiparams{'ACTION'} eq 'remove') && (! &_is_pakfire_busy())) {
> +	&Header::openbox("100%", "center", $Lang::tr{'request'});
> +
>  	my @pkgs =3D split(/\|/, $cgiparams{'DELPAKS'});
> -		&Header::openbox("100%", "center", $Lang::tr{'request'});
> -		my @output =3D &General::system_output("/usr/local/bin/pakfire", "resolv=
edeps", "--no-colors", @pkgs);
> -		print <<END;
> -		<table><tr><td colspan=3D'2'>$Lang::tr{'pakfire uninstall package'} @pkg=
s $Lang::tr{'pakfire possible dependency'}
> +	my @output =3D &General::system_output("/usr/local/bin/pakfire", "resolve=
deps", "--no-colors", @pkgs);
> +	print <<END;
> +	<table><tr><td colspan=3D'2'>$Lang::tr{'pakfire uninstall package'} @pkgs=
 $Lang::tr{'pakfire possible dependency'}
>  		<pre>
>  END
> -		foreach (@output) {
> -		  $_ =3D~ s/\=1B\[[0-1]\;[0-9]+m//g;
> -			print "$_\n";
> -		}
> -		print <<END;
> +	foreach (@output) {
> +		$_ =3D~ s/\=1B\[[0-1]\;[0-9]+m//g;
> +		print "$_\n";
> +	}
> +	print <<END;
>  		</pre></td></tr>
>  		<tr><td colspan=3D'2'>$Lang::tr{'pakfire uninstall all'}</td></tr>
>  		<tr><td colspan=3D'2'>&nbsp;</td></tr>
>  		<tr><td align=3D'right'><form method=3D'post' action=3D'$ENV{'SCRIPT_NAM=
E'}'>
> -							<input type=3D'hidden' name=3D'DELPAKS' value=3D'$cgiparams{'DELPAK=
S'}' />
> -							<input type=3D'hidden' name=3D'FORCE' value=3D'on' />
> -							<input type=3D'hidden' name=3D'ACTION' value=3D'remove' />
> -							<input type=3D'image' alt=3D'$Lang::tr{'uninstall'}' title=3D'$Lang=
::tr{'uninstall'}' src=3D'/images/go-next.png' />
> -						</form>
> -				</td>
> -				<td align=3D'left'>
> -						<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
> -							<input type=3D'hidden' name=3D'ACTION' value=3D'' />
> -							<input type=3D'image' alt=3D'$Lang::tr{'abort'}' title=3D'$Lang::tr=
{'abort'}' src=3D'/images/dialog-error.png' />
> -						</form>
> -				</td>
> -			</tr>
> -		</table>
> +					<input type=3D'hidden' name=3D'DELPAKS' value=3D'$cgiparams{'DELPAKS'=
}' />
> +					<input type=3D'hidden' name=3D'FORCE' value=3D'on' />
> +					<input type=3D'hidden' name=3D'ACTION' value=3D'remove' />
> +					<input type=3D'image' alt=3D'$Lang::tr{'uninstall'}' title=3D'$Lang::=
tr{'uninstall'}' src=3D'/images/go-next.png' />
> +				</form>
> +			</td>
> +			<td align=3D'left'>
> +				<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
> +					<input type=3D'hidden' name=3D'ACTION' value=3D'' />
> +					<input type=3D'image' alt=3D'$Lang::tr{'abort'}' title=3D'$Lang::tr{'=
abort'}' src=3D'/images/dialog-error.png' />
> +				</form>
> +			</td>
> +		</tr>
> +	</table>
>  END
> -		&Header::closebox();
> -		&Header::closebigbox();
> -		&Header::closepage();
> -		exit;
> -
> +	&Header::closebox();
> +	&Header::closebigbox();
> +	&Header::closepage();
> +	exit;
>  }
> =20
>  my %selected=3D();

--===============0096961147147508406==--