From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH 3/3] vpnmain.cgi: Join certificate output before &Header::cleanhtml();
Date: Tue, 13 Jul 2021 15:30:53 +0000
Message-ID: <20210713153053.11281-3-michael.tremer@ipfire.org>
In-Reply-To: <20210713153053.11281-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1234379472740330350=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/vpnmain.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 80e93ffd3..d54b56577 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -705,8 +705,8 @@ END
 		&Header::openbigbox('100%', 'left', '', '');
 		&Header::openbox('100%', 'left', "$Lang::tr{'ca certificate'}:");
 		my @output =3D &General::system_output("/usr/bin/openssl", "x509", "-text"=
, "-in", "${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem");
-		@output =3D &Header::cleanhtml(@output,"y");
-		print "<pre>@output</pre>\n";
+		my $output =3D &Header::cleanhtml(join("", @output) ,"y");
+		print "<pre>$output</pre>\n";
 		&Header::closebox();
 		print "<div align=3D'center'><a href=3D'/cgi-bin/vpnmain.cgi'>$Lang::tr{'b=
ack'}</a></div>";
 		&Header::closebigbox();
@@ -832,8 +832,8 @@ END
 		&Header::openbox('100%', 'left', "$Lang::tr{'host certificate'}:");
 		@output =3D &General::system_output("/usr/bin/openssl", "x509", "-text", "=
-in", "${General::swroot}/certs/hostcert.pem");
 	}
-	@output =3D &Header::cleanhtml(@output,"y");
-	print "<pre>@output</pre>\n";
+	my $output =3D &Header::cleanhtml(join("", @output) ,"y");
+	print "<pre>$output</pre>\n";
 	&Header::closebox();
 	print "<div align=3D'center'><a href=3D'/cgi-bin/vpnmain.cgi'>$Lang::tr{'ba=
ck'}</a></div>";
 	&Header::closebigbox();
@@ -1521,8 +1521,8 @@ END
 		&Header::openbigbox('100%', 'left', '', '');
 		&Header::openbox('100%', 'left', "$Lang::tr{'cert'}:");
 		my @output =3D &General::system_output("/usr/bin/openssl", "x509", "-text"=
, "-in", "${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"=
);
-		@output =3D &Header::cleanhtml(@output,"y");
-		print "<pre>@output</pre>\n";
+		my $output =3D &Header::cleanhtml(join("", @output) ,"y");
+		print "<pre>$output</pre>\n";
 		&Header::closebox();
 		print "<div align=3D'center'><a href=3D'/cgi-bin/vpnmain.cgi'>$Lang::tr{'b=
ack'}</a></div>";
 		&Header::closebigbox();
--=20
2.31.0


--===============1234379472740330350==--