]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
vpnmain.cgi: Join certificate output before &Header::cleanhtml();
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 13 Jul 2021 15:30:53 +0000 (15:30 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 13 Jul 2021 15:33:49 +0000 (15:33 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
html/cgi-bin/vpnmain.cgi

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