phpki-ng/contribs10/phpki-ng-0.84-fix-for-php74-code-tidy.patch

diff -ruN phpki-ng.old/phpki-ng-0.84/about.php phpki-ng/phpki-ng-0.84/about.php
--- phpki-ng.old/phpki-ng-0.84/about.php        2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/about.php    2021-03-07 19:33:03.019322943 +0100
@@ -1,31 +1,32 @@
 <?php
-
-
 include('./config.php');
 include('./include/my_functions.php');
 include('./include/common.php');
 
 printHeader('about');
-
 ?>
+
 <p>
 PHPki is an <a href=http://www.opensource.org target=_blank>Open Source</a>
 Web application for managing a <a href=<?php echo BASE_URL?>help/glossary.html#PKI target=help/glossary>
 Public Key Infrastructure</a> within a small organizations. PHPki acts as a
 mechanism for the centralized creation and management of digital certificates.
 PHPki is capable of managing certificates for multiple organizations or user
-accounts.
+accounts.</p>
 
 <p>
 PHPki requires the Apache Web Server, the <href=http://www.php.net target=_blank>PHP</a> Scripting Language, and <href=http://www.openssl.org target=_blank>
 OpenSSL</a>, all of which are included with any major
 <a href=http://www.linux.org target=_blank> Linux Operating System</a>
 <a href=http://www.redhat.com target=_blank>distribution</a>.
+</p>
 
 <p>
 This software may be freely redistributed under the terms of the 
 <a href=http://www.gnu.org target=_blank>GNU</a> Public
 License provided this page and all copyright notices remain completely intact.
+</p>
+
 <p>
 <center><h4>Copyright: 2003, William E. Roadcap</h4>
 <form>
@@ -36,7 +37,7 @@
 </textarea>
 </form>
 </center>
-<p>
+</p>
 
 <?php
 printFooter();
diff -ruN phpki-ng.old/phpki-ng-0.84/admin/index.php phpki-ng/phpki-ng-0.84/admin/index.php
--- phpki-ng.old/phpki-ng-0.84/admin/index.php  2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/admin/index.php      2021-03-07 19:33:03.019322943 +0100
@@ -10,118 +10,117 @@
 $passwd  = gpvar('passwd');
 $passwdv = gpvar('passwdv');
 
-switch($stage) {
-case 'list_users':
-       printHeader('admin');
+switch ($stage) {
+    case 'list_users':
+        printHeader('admin');
         print '<p><h3>Contents of '.htvar($config['passwd_file']).' file:</h3><pre>';
         readfile($config['passwd_file'])
 
-       ?>
-       </pre>
-       <form action="<?php echo $PHP_SELF?>" method="post">
-       <input type=submit name=submit value="Back to Menu">
-       </form>
-       <?php
-       printFooter(false);
-       break;
-
-case 'add_user_form';
-       printHeader('admin');
-       ?>
-       <body onLoad="self.focus();document.form.login.focus()">
-       <form action="<?php echo $PHP_SELF?>" method="post" name="form">
-       <table>
-       <th colspan=2><h3>Add User or Change Password</h3></th>
-       <tr><td>User ID</td><td><input type=text name=login value="<?php echo htvar($login)?>" maxlength=15 size=15></td></tr>
-       <tr><td>Password </td><td><input type=password name=passwd value=''  size=20></td></tr>
-       <tr><td>Verify Password </td><td><input type=password name=passwdv value='' size=20></td></tr>
-       </table>
-       <input type=hidden name=stage value=add_user>
-       <input type=submit name=submit value='Submit'>
-       </form>
-       <?php
-       break;
-
-case 'add_user':
-       printHeader('admin');
-       if (! $passwd || ! $passwdv || $passwd != $passwdv || strlen($passwd) < 8) {
-               print "<center><h2><font color=red>Missing or invalid password or password and password verification do not match.</font></h2></center>"
-
-               ?>
-               <p><center>
-               <form action="<?php echo $PHP_SELF?>" method="post">
-               <input type=hidden name=stage value=add_user_form>
-               <input type=hidden name=login value="<?php echo htvar($login)?>">
-               <input type=submit name=submit value=Back>
-               </form></center>
-               <?php
-       }
-       else {
-               $pwdfile = escapeshellarg($config['passwd_file']);
-               $login = escapeshellarg($login);
-               $passwd = escapeshellarg($passwd);
-
-               print 'Results of htpasswd command:<br>';
-               system("htpasswd -bm $pwdfile $login $passwd 2>&1")
-               ?>
-               <p>
-               <form action="<?php echo $PHP_SELF?>" method="post">
-               <input type=submit name=submit value="Back to Menu">
-               </form>
-               <?php
-       }
-       printFooter();
-       break;
-
-case 'del_user_form';
-       printHeader('admin');
-       ?>
-       <body onLoad="self.focus();document.form.login.focus();">
-       <form action="<?php echo $PHP_SELF?>" method="post" name="form">
-       <table>
-       <th colspan=2><h3>Remove User</h3></th>
-       <tr><td>User ID</td><td><input type=text name=login value="<?php echo htvar($login)?>" maxlength=15 size=15></td></tr>
-       </table>
-       <input type=hidden name=stage value=del_user>
-       <input type=submit name=submit value='Submit'>
-       </form>
-       <?php
-       printFooter();
-       break;
-case 'del_user':
-       printHeader('admin');
-
-       $pwdfile = escapeshellarg($config['passwd_file']);
-       $login = escapeshellarg($login);
-
-       print 'Results of htpasswd command:<br>';
-       system("htpasswd -D $pwdfile $login 2>&1")
-       ?>
-       <p>
-       <form action="<?php echo $PHP_SELF?>" method="post">
-       <input type=submit name=submit value="Back to Menu">
-       </form>
-       <?php
-       printFooter();
-       break;
-
-default:
-       printHeader('admin');
-       ?>
-       <br>
-       <br>
-       <center>
-       <table class=menu><th class=menu>SYSADMIN MENU</th>
-       <tr><td class=menu style="padding-left: 1em;"><table>
-       <tr><td class=menu-pad><a href=<?php echo $PHP_SELF?>?stage=add_user_form>Add User or Change Password</a></td></tr>
-       <tr><td class=menu-pad><a href=<?php echo $PHP_SELF?>?stage=del_user_form>Remove User</a></td></tr>
-       <tr><td class=menu-pad><a href=<?php echo $PHP_SELF?>?stage=list_users>List Password File Contents</a></td></tr>
-       </table></td></tr>
-       </table>
-       </center>
-       <br><br>
-       <?php
-       printFooter();
+        ?>
+        </pre>
+        <form action="<?php echo $PHP_SELF?>" method="post">
+    <input type=submit name=submit value="Back to Menu">
+    </form>
+    <?php
+    printFooter(false);
+        break;
+
+    case 'add_user_form';
+        printHeader('admin');
+        ?>
+        <body onLoad="self.focus();document.form.login.focus()">
+        <form action="<?php echo $PHP_SELF?>" method="post" name="form">
+    <table>
+    <th colspan=2><h3>Add User or Change Password</h3></th>
+    <tr><td>User ID</td><td><input type=text name=login value="<?php echo htvar($login)?>" maxlength=15 size=15></td></tr>
+    <tr><td>Password </td><td><input type=password name=passwd value=''  size=20></td></tr>
+    <tr><td>Verify Password </td><td><input type=password name=passwdv value='' size=20></td></tr>
+    </table>
+    <input type=hidden name=stage value=add_user>
+    <input type=submit name=submit value='Submit'>
+    </form>
+    <?php
+    break;
+
+    case 'add_user':
+        printHeader('admin');
+        if (! $passwd || ! $passwdv || $passwd != $passwdv || strlen($passwd) < 8) {
+            print "<center><h2><font color=red>Missing or invalid password or password and password verification do not match.</font></h2></center>"
+
+            ?>
+            <p><center>
+            <form action="<?php echo $PHP_SELF?>" method="post">
+        <input type=hidden name=stage value=add_user_form>
+        <input type=hidden name=login value="<?php echo htvar($login)?>">
+        <input type=submit name=submit value=Back>
+        </form></center>
+        <?php
+        } else {
+            $pwdfile = escapeshellarg($config['passwd_file']);
+            $login = escapeshellarg($login);
+            $passwd = escapeshellarg($passwd);
+
+            print 'Results of htpasswd command:<br>';
+            system("htpasswd -bm $pwdfile $login $passwd 2>&1")
+            ?>
+            <p>
+            <form action="<?php echo $PHP_SELF?>" method="post">
+        <input type=submit name=submit value="Back to Menu">
+        </form>
+        <?php
+        }
+        printFooter();
+        break;
+
+    case 'del_user_form';
+        printHeader('admin');
+        ?>
+        <body onLoad="self.focus();document.form.login.focus();">
+        <form action="<?php echo $PHP_SELF?>" method="post" name="form">
+    <table>
+    <th colspan=2><h3>Remove User</h3></th>
+    <tr><td>User ID</td><td><input type=text name=login value="<?php echo htvar($login)?>" maxlength=15 size=15></td></tr>
+    </table>
+    <input type=hidden name=stage value=del_user>
+    <input type=submit name=submit value='Submit'>
+    </form>
+    <?php
+    printFooter();
+    break;
+    case 'del_user':
+        printHeader('admin');
+
+        $pwdfile = escapeshellarg($config['passwd_file']);
+        $login = escapeshellarg($login);
+
+        print 'Results of htpasswd command:<br>';
+        system("htpasswd -D $pwdfile $login 2>&1")
+        ?>
+        <p>
+        <form action="<?php echo $PHP_SELF?>" method="post">
+    <input type=submit name=submit value="Back to Menu">
+    </form>
+    <?php
+    printFooter();
+        break;
+
+    default:
+        printHeader('admin');
+        ?>
+        <br>
+        <br>
+        <center>
+        <table class=menu><th class=menu>SYSADMIN MENU</th>
+        <tr><td class=menu style="padding-left: 1em;"><table>
+        <tr><td class=menu-pad><a href=<?php echo $PHP_SELF?>?stage=add_user_form>Add User or Change Password</a></td></tr>
+    <tr><td class=menu-pad><a href=<?php echo $PHP_SELF?>?stage=del_user_form>Remove User</a></td></tr>
+    <tr><td class=menu-pad><a href=<?php echo $PHP_SELF?>?stage=list_users>List Password File Contents</a></td></tr>
+    </table></td></tr>
+    </table>
+    </center>
+    <br><br>
+    <?php
+    printFooter();
 }
 
 ?>
diff -ruN phpki-ng.old/phpki-ng-0.84/ca/help.php phpki-ng/phpki-ng-0.84/ca/help.php
--- phpki-ng.old/phpki-ng-0.84/ca/help.php      2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/ca/help.php  2021-03-07 19:33:03.029323092 +0100
@@ -364,7 +364,7 @@
 <p>
 <h2><a name="GETTING-HELP">GETTING ADDITIONAL HELP</a></h2>
 <blockquote>
-<?php echo $config[getting_help]?>
+<?php echo $config['getting_help']?>
 </blockquote>
 <br>
 
diff -ruN phpki-ng.old/phpki-ng-0.84/ca/index.php phpki-ng/phpki-ng-0.84/ca/index.php
--- phpki-ng.old/phpki-ng-0.84/ca/index.php     2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/ca/index.php 2021-03-07 19:33:03.070323708 +0100
@@ -1,3 +1,2 @@
 <?php
 header("Location: ./../index.php");
-?>
diff -ruN phpki-ng.old/phpki-ng-0.84/ca/main.php phpki-ng/phpki-ng-0.84/ca/main.php
--- phpki-ng.old/phpki-ng-0.84/ca/main.php      2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/ca/main.php  2021-03-07 19:33:03.070323709 +0100
@@ -8,161 +8,159 @@
 
 $stage = gpvar('stage');
 
-switch($stage) {
-
-case 'dl_takey':
-       upload("$config[private_dir]/takey.pem", "$config[ca_prefix]takey.pem", 'application/octet-stream');
-       break;
-
-case 'dl_dhparam':
-       upload("$config[private_dir]/dhparam2048.pem", "$config[ca_prefix]dhparam2048.pem", 'application/octet-stream');
-       break;
-
-case 'dl_root':
-       upload("$config[cacert_pem]", "$config[ca_prefix]cacert.crt", 'application/x-x509-ca-cert');
-       break;
-
-case 'dl_crl':
-       upload("$config[cacrl_der]", "$config[ca_prefix]cacrl.crl", 'application/pkix-crl');
-       break;
-
-case 'dl_crl_pem':
-       upload("$config[cacrl_pem]", "$config[ca_prefix]cacrl.crl", 'application/octet-stream');
-       break;
-
-case 'gen_crl':
-       list($ret,$errtxt) = CA_generate_crl();
-
-       printHeader(false);
-
-       if ($ret) {
-               ?>
-               <center><h2>Certificate Revocation List Updated</h2></center>
-               <br>
-               <form action="<?php echo $PHP_SELF?>" method="post">
-               <input type="submit" name="submit" value="Back to Menu">
-               </form>
-               <?php
-               print '<pre>'.CA_crl_text().'</pre>';
-       }
-       else {
-               ?>
-               <font color="#ff0000">
-               <h2>There was an error updating the Certificate Revocation List.</h2></font><br>
-               <blockquote>
-               <h3>Debug Info:</h3>
-               <pre><?php echo $errtxt?></pre>
-               </blockquote>
-               <form action="<?php echo $PHP_SELF?>" method="post">
-               <br>
-               <input type="submit" name="submit" value="Back to Menu">
-               <br>
-               </form>
-               <?php
-}
-       break;
-
-case 'display_takey':
-       printHeader(false);
-
-       ?>
-       <center><h2>OpenVPN pre-shared Key</h2></center>
-       <br>
-       <form action="<?php echo $PHP_SELF?>" method="post">
-       <input type="submit" name="submit" value="Back to Menu">
-       </form>
-       <?php
-       print '<pre>'.ta_key_text().'</pre>';
-       break;
-
-case 'display_dhparam':
-       printHeader(false);
-
-       ?>
-       <center><h2>OpenVPN Diffie-Helman parameters</h2></center>
-       <br>
-       <form action="<?php echo $PHP_SELF?>" method="post">
-       <input type=submit name=submit value="Back to Menu">
-       </form>
-       <?php
-       print '<pre>'.dhparam_text().'</pre>';
-       break;
-
-case 'display_root_pem':
-       printHeader(false);
-
-       ?>
-       <center><h2>Root certificate file (PEM Encoded)</h2></center>
-       <br>
-       <form action="<?php echo $PHP_SELF?>" method="post">
-       <input type="submit" name="submit" value="Back to Menu">
-       </form>
-       <?php
-       print '<pre>'.root_pem_text().'</pre>';
-       break;
-
-
-default:
-       printHeader('ca');
-       ?>
-       <br>
-       <br>
-       <center>
-       <table class="menu" width="600px"><th class="menu" colspan="2"><big>CERTIFICATE MANAGEMENT MENU</big></th>
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;" width="33%">
-       <a href="request_cert.php">Create a New Certificate</a></td>
-       <td>Use the <strong><cite>Certificate Request Form</cite></strong> to create and download new digital certificates.  
-       You may create certificates in succession without re-entering the entire form 
-       by clicking the "<strong>Go Back</strong>" button after each certificate is created.</td></tr>
-
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
-       <a href="manage_certs.php">Manage Certificates</a></td>
-       <td>Conveniently view, download, revoke, and renew your existing certificates using the
-       <strong><cite>Certificate Management Control Panel</cite></strong>.</td></tr>
-
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
-       <a href="<?php echo $PHP_SELF?>?stage=gen_crl">Update & View the Certificate Revocation List</a></td>
-       <td>Some applications automagically reference the Certificate Revocation List to determine
-       certificate validity.  It is not necessary to perform this update function, as the CRL is 
-       updated when certificates are revoked.  However, doing so is harmless.
-       <a href="../help.php" target="_help">Read the online help</a> to learn more about this.</td></tr>
-
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
-       <a href="<?php echo $PHP_SELF?>?stage=dl_root">Download the Root Certificate</a><br><br>
-       <a href="<?php echo $PHP_SELF?>?stage=display_root_pem">Display the Root Certificate (PEM Encoded)</a></td>
-       <td>The "Root" certificate must be installed before using any of the 
-       certificates issued here. <a href="../help.php" target="_help">Read the online help</a> 
-       to learn more about this.</td></tr>
-
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
-       <a href="<?php echo $PHP_SELF?>?stage=dl_crl">Download the Certificate Revocation List</a><br><br>
-       <a href="<?php echo $PHP_SELF?>?stage=dl_crl_pem">Download in PEM format.</a></td>
-       <td>This is the official list of revoked certificates.  Using this list with your e-mail or
-       browser application is optional.  Some applications will automagically reference this list.</td></tr>
- <?php
- if (file_exists($config[private_dir] . '/takey.pem')) {
-       ?>
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
-       <a href="<?php echo $PHP_SELF?>?stage=dl_takey">Download the static pre-shared key</a><br><br>
-       <a href="<?php echo $PHP_SELF?>?stage=display_takey">Display the static pre-shared key</a></td>
-       <td>This key can be used with OpenVPN as a standalone auth mechanism, or as an additional TLS authentication.</td></tr>
- <?php }
- ?>
- <?php if (file_exists ($config[private_dir] . '/dhparam2048.pem')) {
-       ?>
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
-       <a href="<?php echo $PHP_SELF?>?stage=dl_dhparam">Download the Diffie-Hellman parameters</a><br><br>
-       <a href="<?php echo $PHP_SELF?>?stage=display_dhparam">Display the Diffie-Hellman parameters</a></td>
-       <td>This file is used by OpenVPN for the hand-shake. The Diffie-Hellman key agreement 
-       protocol enables two communication partners to exchange a secret key safely.</td></tr>
- <?php }
- ?>
-
-       </table>
-       </center>
-       <br><br>
-       <?php
-       printFooter();
+switch ($stage) {
+    case 'dl_takey':
+        upload($config['private_dir'] . '/takey.pem', $config['ca_prefix'] . 'takey.pem', 'application/octet-stream');
+        break;
+
+    case 'dl_dhparam':
+        upload($config['private_dir'] . '/dhparam2048.pem', $config['ca_prefix'] . 'dhparam2048.pem', 'application/octet-stream');
+        break;
+
+    case 'dl_root':
+        upload($config['cacert_pem'], $config['ca_prefix'] . 'cacert.crt', 'application/x-x509-ca-cert');
+        break;
+
+    case 'dl_crl':
+        upload($config['cacrl_der'], $config['ca_prefix'] . 'cacrl.crl', 'application/pkix-crl');
+        break;
+
+    case 'dl_crl_pem':
+        upload($config['cacrl_pem'], $config['ca_prefix'] . 'cacrl.crl', 'application/octet-stream');
+        break;
+
+    case 'gen_crl':
+        list($ret,$errtxt) = CA_generate_crl();
+
+        printHeader(false);
+
+        if ($ret) {
+            ?>
+            <center><h2>Certificate Revocation List Updated</h2></center>
+            <br>
+            <form action="<?php echo $PHP_SELF?>" method="post">
+        <input type="submit" name="submit" value="Back to Menu">
+        </form>
+        <?php
+        print '<pre>'.CA_crl_text().'</pre>';
+        } else {
+            ?>
+            <font color="#ff0000">
+            <h2>There was an error updating the Certificate Revocation List.</h2></font><br>
+            <blockquote>
+            <h3>Debug Info:</h3>
+            <pre><?php echo $errtxt?></pre>
+        </blockquote>
+        <form action="<?php echo $PHP_SELF?>" method="post">
+        <br>
+        <input type="submit" name="submit" value="Back to Menu">
+        <br>
+        </form>
+        <?php
+        }
+        break;
+
+    case 'display_takey':
+        printHeader(false);
+
+        ?>
+        <center><h2>OpenVPN pre-shared Key</h2></center>
+        <br>
+        <form action="<?php echo $PHP_SELF?>" method="post">
+    <input type="submit" name="submit" value="Back to Menu">
+    </form>
+    <?php
+    print '<pre>'.ta_key_text().'</pre>';
+        break;
+
+    case 'display_dhparam':
+        printHeader(false);
+
+        ?>
+        <center><h2>OpenVPN Diffie-Helman parameters</h2></center>
+        <br>
+        <form action="<?php echo $PHP_SELF?>" method="post">
+    <input type=submit name=submit value="Back to Menu">
+    </form>
+    <?php
+    print '<pre>'.dhparam_text().'</pre>';
+        break;
+
+    case 'display_root_pem':
+        printHeader(false);
+
+        ?>
+        <center><h2>Root certificate file (PEM Encoded)</h2></center>
+        <br>
+        <form action="<?php echo $PHP_SELF?>" method="post">
+    <input type="submit" name="submit" value="Back to Menu">
+    </form>
+    <?php
+    print '<pre>'.root_pem_text().'</pre>';
+        break;
+
+
+    default:
+        printHeader('ca');
+        ?>
+        <br>
+        <br>
+        <center>
+        <table class="menu" width="600px"><th class="menu" colspan="2"><big>CERTIFICATE MANAGEMENT MENU</big></th>
+        <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;" width="33%">
+        <a href="request_cert.php">Create a New Certificate</a></td>
+        <td>Use the <strong><cite>Certificate Request Form</cite></strong> to create and download new digital certificates.  
+        You may create certificates in succession without re-entering the entire form 
+        by clicking the "<strong>Go Back</strong>" button after each certificate is created.</td></tr>
+
+        <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
+        <a href="manage_certs.php">Manage Certificates</a></td>
+        <td>Conveniently view, download, revoke, and renew your existing certificates using the
+        <strong><cite>Certificate Management Control Panel</cite></strong>.</td></tr>
+
+        <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
+        <a href="<?php echo $PHP_SELF?>?stage=gen_crl">Update & View the Certificate Revocation List</a></td>
+    <td>Some applications automagically reference the Certificate Revocation List to determine
+    certificate validity.  It is not necessary to perform this update function, as the CRL is 
+    updated when certificates are revoked.  However, doing so is harmless.
+    <a href="../help.php" target="_help">Read the online help</a> to learn more about this.</td></tr>
+
+    <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
+    <a href="<?php echo $PHP_SELF?>?stage=dl_root">Download the Root Certificate</a><br><br>
+    <a href="<?php echo $PHP_SELF?>?stage=display_root_pem">Display the Root Certificate (PEM Encoded)</a></td>
+    <td>The "Root" certificate must be installed before using any of the 
+    certificates issued here. <a href="../help.php" target="_help">Read the online help</a> 
+    to learn more about this.</td></tr>
+
+    <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
+    <a href="<?php echo $PHP_SELF?>?stage=dl_crl">Download the Certificate Revocation List</a><br><br>
+    <a href="<?php echo $PHP_SELF?>?stage=dl_crl_pem">Download in PEM format.</a></td>
+    <td>This is the official list of revoked certificates.  Using this list with your e-mail or
+    browser application is optional.  Some applications will automagically reference this list.</td></tr>
+        <?php
+        if (file_exists($config['private_dir'] . '/takey.pem')) {
+            ?>
+           <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
+           <a href="<?php echo $PHP_SELF?>?stage=dl_takey">Download the static pre-shared key</a><br><br>
+       <a href="<?php echo $PHP_SELF?>?stage=display_takey">Display the static pre-shared key</a></td>
+       <td>This key can be used with OpenVPN as a standalone auth mechanism, or as an additional TLS authentication.</td></tr>
+        <?php }
+        ?>
+        <?php if (file_exists($config['private_dir'] . '/dhparam2048.pem')) {
+    ?>
+    <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
+    <a href="<?php echo $PHP_SELF?>?stage=dl_dhparam">Download the Diffie-Hellman parameters</a><br><br>
+    <a href="<?php echo $PHP_SELF?>?stage=display_dhparam">Display the Diffie-Hellman parameters</a></td>
+    <td>This file is used by OpenVPN for the hand-shake. The Diffie-Hellman key agreement 
+    protocol enables two communication partners to exchange a secret key safely.</td></tr>
+        <?php }
+    ?>
+
+    </table>
+    </center>
+    <br><br>
+    <?php
+    printFooter();
 }
 
 ?>
diff -ruN phpki-ng.old/phpki-ng-0.84/ca/manage_certs.php phpki-ng/phpki-ng-0.84/ca/manage_certs.php
--- phpki-ng.old/phpki-ng-0.84/ca/manage_certs.php      2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/ca/manage_certs.php  2021-03-07 19:33:03.071323720 +0100
@@ -6,14 +6,14 @@
 include('../include/common.php');
 include('../include/openssl_functions.php');
 
-$stage     = gpvar('stage');
-$serial    = gpvar('serial');
-$sortfield = gpvar('sortfield');
-$ascdec    = gpvar('ascdec');
-$passwd    = gpvar('passwd');
-$expiry    = gpvar('expiry');
-$submit    = gpvar('submit');
-$dl_type   = gpvar('dl_type');
+$stage        = gpvar('stage');
+$serial       = gpvar('serial');
+$sortfield    = gpvar('sortfield');
+$ascdec       = gpvar('ascdec');
+$passwd       = gpvar('passwd');
+$expiry       = gpvar('expiry');
+$submit       = gpvar('submit');
+$dl_type      = gpvar('dl_type');
 
 $search       = gpvar('search');
 $show_valid   = gpvar('show_valid');
@@ -22,404 +22,403 @@
 
 
 # Prevent handling certs that don't belong to user
-if ($serial && CAdb_issuer($serial) != $PHPki_user && ! in_array($PHPki_user, $PHPki_admins)) { 
-       $stage = 'goaway';
+if ($serial && CAdb_issuer($serial) != $PHPki_user && ! in_array($PHPki_user, $PHPki_admins)) {
+    $stage = 'goaway';
 }
 
-if ( !($show_valid.$show_revoked.$show_expired) ) {
-       $show_valid   = 'V';
-       $show_revoked = 'R';
-       $show_expired = 'E';
+if (!($show_valid.$show_revoked.$show_expired)) {
+    $show_valid   = 'V';
+    $show_revoked = 'R';
+    $show_expired = 'E';
 }
 
-$qstr_filter = 'search='.htvar($search) . '&' . "show_valid=$show_valid&" . "show_revoked=$show_revoked&" . "show_expired=$show_expired&";
+$qstr_filter =  'search='.htvar($search) . '&' . "show_valid=$show_valid&" . "show_revoked=$show_revoked&" . "show_expired=$show_expired&";
 
 $qstr_sort   = "sortfield=$sortfield&ascdec=$ascdec";
 
 switch ($stage) {
-case 'goaway':
-       printHeader(false);
-       ?>
-
-       <p><center><h1><font color="red">YOU ARE A VERY BAD BOY!</font></h2></center>
-
-       <?php
-       break;
-
-case 'display':
-       printHeader(false);
-       ?>
-       
-    <center><h2>Certificate Details</h2></center>
-       <center><font color="#0000AA"><h3>(#<?php echo $serial?>)<br><?php echo htvar(CA_cert_cname($serial).' <'.CA_cert_email($serial).'>')?> </h3></font></center>
-       
-       <?php
-
-       if ($revoke_date = CAdb_is_revoked($serial)) {
-               print '<center><font color=red><h2>REVOKED '.$revoke_date.'</h2></font></center>';
-       }
-
-               print '<pre>'.CA_cert_text($serial).'</pre>';
-       break;
-
-case 'dl-confirm':
-       printHeader('ca');
-
-       $rec = CAdb_get_entry($serial);
-
-       ?>
-       <h3>You are about to download the <font color=red>PRIVATE</font> certificate key for <?php echo $rec['common_name'].' &lt;'.$rec['email'].'&gt; '?></h3>
-       <h3><font color="red">DO NOT DISTRIBUTE THIS FILE TO THE PUBLIC!</font></h3>
-       <form action="<?php echo $PHP_SELF.'?stage=download&serial='.$serial.'&'.$qstr_sort.'&'.$qstr_filter?>" method="post">
-       <strong>File type: </strong>
-       <select name="dl_type">
-       <option value="PKCS#12">PKCS#12 Bundle</option>
-       <option value="PEMCERT">PEM Certificate</option>
-       <option value="PEMKEY">PEM Key</option>
-       <option value="PEMBUNDLE">PEM Bundle</option>
-       <option value="PEMCABUNDLE">PEM Bundle w/Root</option>
-       </select>
-       <input type="submit" name="submit" value="Download">
-       &nbsp; or &nbsp;
-       <input type="submit" name="submit" value="Go Back">
-       </form>
+    case 'goaway':
+        printHeader(false);
+        ?>
+
+        <p><center><h1><font color="red">YOU ARE A VERY BAD BOY!</font></h2></center>
+
+        <?php
+        break;
+
+    case 'display':
+        printHeader(false);
+        ?>
+
+        <center><h2>Certificate Details</h2></center>
+        <center><font color="#0000AA"><h3>(#<?php echo $serial?>)<br><?php echo htvar(CA_cert_cname($serial).' <'.CA_cert_email($serial).'>')?> </h3></font></center>
 
     <?php
 
-       break;
+    if ($revoke_date = CAdb_is_revoked($serial)) {
+        print '<center><font color=red><h2>REVOKED '.$revoke_date.'</h2></font></center>';
+    }
 
-case 'download':
-       if (strstr($submit, "Back"))  $dl_type = '';
+        print '<pre>'.CA_cert_text($serial).'</pre>';
+        break;
 
-       $rec = CAdb_get_entry($serial);
+    case 'dl-confirm':
+        printHeader('ca');
+
+        $rec = CAdb_get_entry($serial);
+
+        ?>
+    <h3>You are about to download the <font color=red>PRIVATE</font> certificate key for <?php echo $rec['common_name'].' &lt;'.$rec['email'].'&gt; '?></h3>
+    <h3><font color="red">DO NOT DISTRIBUTE THIS FILE TO THE PUBLIC!</font></h3>
+    <form action="<?php echo $PHP_SELF.'?stage=download&serial='.$serial.'&'.$qstr_sort.'&'.$qstr_filter?>" method="post">
+    <strong>File type: </strong>
+    <select name="dl_type">
+    <option value="PKCS#12">PKCS#12 Bundle</option>
+    <option value="PEMCERT">PEM Certificate</option>
+    <option value="PEMKEY">PEM Key</option>
+    <option value="PEMBUNDLE">PEM Bundle</option>
+    <option value="PEMCABUNDLE">PEM Bundle w/Root</option>
+    </select>
+    <input type="submit" name="submit" value="Download">
+    &nbsp; or &nbsp;
+    <input type="submit" name="submit" value="Go Back">
+    </form>
+
+    <?php
 
-       switch ($dl_type) {
-       case 'PKCS#12':
-               upload("$config[pfx_dir]/$serial.pfx", "$rec[common_name].p12", 'application/x-pkcs12');
-               break;
-       case 'PEMCERT':
-               upload("$config[new_certs_dir]/$serial.pem", "$rec[common_name]-cert.pem",'application/pkix-cert');
-               break;
-       case 'PEMKEY':
-               upload("$config[private_dir]/$serial-key.pem", "$rec[common_name]-key.pem",'application/octet-stream');
-               break;
-       case 'PEMBUNDLE':
-               upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem"), "$rec[common_name]-Bundle.pem",'application/octet-stream');
-               break;
-       case 'PEMCABUNDLE':
-               upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem",$config['cacert_pem']), "$rec[common_name]-CABundle.pem",'application/octet-stream');
-               break;
-       default:
-               header("Location: ${PHP_SELF}?$qstr_sort&$qstr_filter");
-       }
-       break;
-
-case 'revoke-form':
-       $rec = CAdb_get_entry($serial);
-
-       printHeader('ca');
-
-       ?>
-       <h4>You are about to <font color=red>REVOKE</font> the following certificate:
-       <hr>
-               <table width="500px"><tr>
-               <td width="25%" style="white-space: nowrap">
-               <p align="right">
+        break;
+
+    case 'download':
+        if (strstr($submit, "Back")) {
+            $dl_type = '';
+        }
+
+        $rec = CAdb_get_entry($serial);
+
+        switch ($dl_type) {
+            case 'PKCS#12':
+                upload($config['pfx_dir'] . "/$serial.pfx", "$rec[common_name].p12", 'application/x-pkcs12');
+                break;
+            case 'PEMCERT':
+                upload($config['new_certs_dir'] . "/$serial.pem", "$rec[common_name]-cert.pem", 'application/pkix-cert');
+                break;
+            case 'PEMKEY':
+                upload($config['private_dir'] . "/$serial-key.pem", "$rec[common_name]-key.pem", 'application/octet-stream');
+                break;
+            case 'PEMBUNDLE':
+                upload(array($config['private_dir'] . "/$serial-key.pem",$config['new_certs_dir'] . "/$serial.pem"), $rec['common_name'] . "-Bundle.pem", 'application/octet-stream');
+                break;
+            case 'PEMCABUNDLE':
+                upload(array($config['private_dir'] . "/$serial-key.pem",$config['new_certs_dir'] . "/$serial.pem", $config['cacert_pem']), $rec['common_name'] . "-CABundle.pem", 'application/octet-stream');
+                break;
+            default:
+                header("Location: ${PHP_SELF}?$qstr_sort&$qstr_filter");
+        }
+        break;
+
+    case 'revoke-form':
+        $rec = CAdb_get_entry($serial);
+
+        printHeader('ca');
+
+        ?>
+        <h4>You are about to <font color=red>REVOKE</font> the following certificate:
+        <hr>
+        <table width="500px"><tr>
+        <td width="25%" style="white-space: nowrap">
+        <p align="right">
         Serial Number<br>
-               User's Name<br>
-               Email Address<br>
-               Organization<br>
-               Department/Unit<br>
-               Locality<br>
-               State/Province<br>
-               Country<br>
-               </p>
-               </td>
-       <?php
-
-       print '
-               <td>
-           '.htvar($rec[serial]).'<br>
-               '.htvar($rec[common_name]).'<br>
-               '.htvar($rec[email]).'<br>
-               '.htvar($rec[organization]).'<br>
-               '.htvar($rec[unit]).'<br>
-               '.htvar($rec[locality]).'<br>
-               '.htvar($rec[province]).'<br>
-               '.htvar($rec[country]).'<br>
-               </td>
-               </tr></table>
-           <h4>Are you sure?</h4>
-               <form action="'.$PHP_SELF.'?'.$qstr_sort.'&'.$qstr_filter.'" method=post>
-           <input type=hidden name=stage value=revoke >
-           <input type=hidden name=serial value='.$serial.' >
-                   <input type=submit name=submit value=Yes >&nbsp
-                   <input type=submit name=submit value=Cancel>
-               </form>';
-       
-       break;
-
-case 'revoke':
-       $ret = true;
-       if ($submit == 'Yes') 
-               list($ret, $errtxt) = CA_revoke_cert($serial);
-
-       if (! $ret) {
-               printHeader('ca');
-
-               print "<form action=\"$PHP_SELF?stage=revoke-form&serial=$serial&$qstr_sort&$qstr_filter\" method=post>";
-               ?>
-               <font color=#ff0000>
-               <h2>There was an error revoking your certificate.</h2></font><br>
-               <blockquote>
-               <h3>Debug Info:</h3>
-               <pre><?php echo $errtxt?></pre>
-               </blockquote>
-               <p>
-               <input type=submit name=submit value=Back>
-               <p>
-               </form>
-               <?php
-       }
-       else
-               header("Location: ${PHP_SELF}?$qstr_sort&$qstr_filter");
-       break;
-
-case 'renew-form':
-       # 
-       # Get last known values submitted by this user.  We only really
-       # need the expiry value, but the old cert values will override
-       # the rest.
-       #
-       if (! $submit and file_exists("config/user-${PHPki_user}.php")) {
-               include("config/user-${PHPki_user}.php");
-    }
-       # 
-       # Get values from the old certificate.
-       #
-       $rec = CAdb_get_entry($serial);
-       $country      = $rec['country'];
-       $province     = $rec['province'];
-       $locality     = $rec['locality'];
-       $organization = $rec['organization'];
-       $unit         = $rec['unit'];
-       $common_name  = $rec['common_name'];
-       $email        = $rec['email'];
-
-       printHeader('ca');
-       ?>
-       <body onLoad="self.focus();document.form.passwd.focus();">
-
-       <form action="<?php echo $PHP_SELF.'?'.$qstr_sort.'&'.$qstr_filter?>" method=post name=form>
-       <table width=99%>
-       <th colspan="2"><h3>Certificate Renewal Form</h3></th>
-
-       <tr>
-       <td colspan="2" style="text-align:center">This will Revoke the old Certificate and Create a new one<br>You can add a password if required</td>
-       </tr>
-       
-       <tr>
-       <td width="25%">Common Name </td>
-       <td><input type="text"" name="common_name" value="<?php echo  htvar($common_name)?>" size="50" maxlength="60" disabled></td>
-       </tr>
-
-       <tr>
-       <td>E-mail Address </td>
-       <td><input type="text" name="email" value="<?php echo htvar($email)?>" size="50" maxlength="60" disabled></td>
-       </tr>
-
-       <tr>
-       <td>Organization </td>
-       <td><input type="text" name="organization" value="<?php echo htvar($organization)?>" size="60" maxlength="60" disabled></td>
-       </tr>
-
-       <tr>
-       <td>Department/Unit </td><td><input type="text" name="unit" value="<?php echo  htvar($unit) ?>" size="40" maxlength="60" disabled></td>
-       </tr>
-
-       <tr>
-       <td>Locality</td><td><input type="text" name="locality" value="<?php echo  htvar($locality) ?>" size="30" maxlength="30" disabled></td>
-       </tr>
-
-       <tr>
-       <td>State/Province</td><td><input type="text" name="province" value="<?php echo  htvar($province) ?>" size="30" maxlength="30" disabled></td>
-       </tr>
-
-       <tr>
-       <td>Country</td>
-       <td><input type="text" name="country" value="<?php echo  htvar($country) ?>" size="2" maxlength="2" disabled></td>
-       </tr>
-
-       <tr>
-       <td>Certificate Password </td>
-       <td><input type="password" name="passwd" value="<?php echo  htvar($passwd) ?>" size="30"></td>
-       </tr>
-
-       <tr>
-       <td>Certificate Life </td>
-       <td><select name=expiry>
-       <?php
-
-       print "<option value=0.083 " . ($expiry == 1 ? "selected='selected'" : "") . " >1 Month</option>\n" ;
-       print "<option value=0.25 " . ($expiry == 1 ? "selected='selected'" : "") . " >3 Months</option>\n" ;
-       print "<option value=0.5 " . ($expiry == 1 ? "selected='selected'" : "") . " >6 Months</option>\n" ;
-       print "<option value=1 " . ($expiry == 1 ? "selected='selected'" : "") . " >1 Year</option>\n" ;
-       for ( $i = 2 ; $i <= 5 ; $i++ ) {
-               print "<option value=$i " . ($expiry == $i ? "selected='selected'" : "") . " >$i Years</option>\n" ;
-       }
-
-       ?>
-
-       </select></td>
-       </tr>
-       <tr>
-       <td>&nbsp</td>
-       <td>
-           <input type="submit" name="submit" value="Submit Request">&nbsp
-           <input type="submit" name="submit" value="Back">
-           <input type="hidden" name="stage" value="renew">
-           <input type="hidden" name="serial" value="<?php echo $serial ?>" >
-       </td>
-       </tr>
-       </table>
-       </form>
-       
-       <?php
-
-       printFooter();
-       break;
-
-case 'renew':
-       $ret = true;
-       if ($submit == "Submit Request") {
-               list($ret, $errtxt) = CA_renew_cert($serial, $expiry, $passwd);
-    }
-        
-       if (! $ret) {
-               printHeader('ca');
-
-               print "<form action=\"$PHP_SELF?stage=renew-form&serial=$serial&$qstr_sort&$qstr_filter\" method=post>";
-               ?>
-               <font color=#ff0000>
-               <h2>There was an error creating your certificate.</h2>
-               </font><br>
-               <blockquote>
-               <h3>Debug Info:</h3>
-               <pre><?php echo $errtxt?></pre>
-               </blockquote>
-               <p>
-               <input type="submit" name="submit" value="Back">
-               <p>
-               </form>
-               <?php
-       }
-       else {
-               header("Location: $PHP_SELF?$qstr_sort&$qstr_filter");
-       }
-
-       break;
-
-default:
-
-       printHeader('ca');
-
-       ?>
-       <body onLoad="self.focus();document.filter.search.focus();">
-       <table style="margin:0 auto">
-       <tr><th colspan=9><big>CERTIFICATE MANAGEMENT CONTROL PANEL</big></th></tr>
-       <tr><td colspan=9><center>
-       <form action="<?php echo "$PHP_SELF?$qstr_sort"?>" method="get" name="filter">
+        User's Name<br>
+        Email Address<br>
+        Organization<br>
+        Department/Unit<br>
+        Locality<br>
+        State/Province<br>
+        Country<br>
+        </p>
+        </td>
+        <?php
+
+        print '
+         <td>
+            '.htvar($rec['serial']).'<br>
+            '.htvar($rec['common_name']).'<br>
+            '.htvar($rec['email']).'<br>
+            '.htvar($rec['organization']).'<br>
+            '.htvar($rec['unit']).'<br>
+            '.htvar($rec['locality']).'<br>
+            '.htvar($rec['province']).'<br>
+            '.htvar($rec['country']).'<br>
+         </td>
+       </tr></table>
+      <h4>Are you sure?</h4>
+         <form action="'.$PHP_SELF.'?'.$qstr_sort.'&'.$qstr_filter.'" method=post>
+      <input type=hidden name=stage value=revoke >
+      <input type=hidden name=serial value='.$serial.' >
+             <input type=submit name=submit value=Yes >&nbsp
+             <input type=submit name=submit value=Cancel>
+         </form>';
+
+        break;
+
+    case 'revoke':
+        $ret = true;
+        if ($submit == 'Yes') {
+            list($ret, $errtxt) = CA_revoke_cert($serial);
+        }
+
+        if (! $ret) {
+            printHeader('ca');
+
+            print "<form action=\"$PHP_SELF?stage=revoke-form&serial=$serial&$qstr_sort&$qstr_filter\" method=post>";
+            ?>
+            <font color=#ff0000>
+            <h2>There was an error revoking your certificate.</h2></font><br>
+            <blockquote>
+            <h3>Debug Info:</h3>
+            <pre><?php echo $errtxt?></pre>
+            </blockquote>
+            <p>
+            <input type=submit name=submit value=Back>
+            <p>
+            </form>
+        <?php
+        } else {
+            header("Location: ${PHP_SELF}?$qstr_sort&$qstr_filter");
+        }
+        break;
+
+    case 'renew-form':
+        #
+        # Get last known values submitted by this user.  We only really
+        # need the expiry value, but the old cert values will override
+        # the rest.
+        #
+        if (! $submit and file_exists("config/user-${PHPki_user}.php")) {
+            include("config/user-${PHPki_user}.php");
+        }
+        #
+        # Get values from the old certificate.
+        #
+        $rec = CAdb_get_entry($serial);
+        $country      = $rec['country'];
+        $province     = $rec['province'];
+        $locality     = $rec['locality'];
+        $organization = $rec['organization'];
+        $unit         = $rec['unit'];
+        $common_name  = $rec['common_name'];
+        $email        = $rec['email'];
+
+        printHeader('ca');
+        ?>
+        <body onLoad="self.focus();document.form.passwd.focus();">
+
+        <form action="<?php echo $PHP_SELF.'?'.$qstr_sort.'&'.$qstr_filter?>" method=post name=form>
+        <table width=99%>
+        <th colspan="2"><h3>Certificate Renewal Form</h3></th>
+
+        <tr>
+        <td colspan="2" style="text-align:center">This will Revoke the old Certificate and Create a new one<br>You can add a password if required</td>
+        </tr>
+
+        <tr>
+        <td width="25%">Common Name </td>
+        <td><input type="text"" name="common_name" value="<?php echo  htvar($common_name)?>" size="50" maxlength="60" disabled></td>
+        </tr>
+
+        <tr>
+        <td>E-mail Address </td>
+        <td><input type="text" name="email" value="<?php echo htvar($email)?>" size="50" maxlength="60" disabled></td>
+        </tr>
+
+        <tr>
+        <td>Organization </td>
+        <td><input type="text" name="organization" value="<?php echo htvar($organization)?>" size="60" maxlength="60" disabled></td>
+        </tr>
+
+        <tr>
+        <td>Department/Unit </td><td><input type="text" name="unit" value="<?php echo  htvar($unit) ?>" size="40" maxlength="60" disabled></td>
+        </tr>
+
+        <tr>
+        <td>Locality</td><td><input type="text" name="locality" value="<?php echo  htvar($locality) ?>" size="30" maxlength="30" disabled></td>
+        </tr>
+
+        <tr>
+        <td>State/Province</td><td><input type="text" name="province" value="<?php echo  htvar($province) ?>" size="30" maxlength="30" disabled></td>
+        </tr>
+
+        <tr>
+        <td>Country</td>
+        <td><input type="text" name="country" value="<?php echo  htvar($country) ?>" size="2" maxlength="2" disabled></td>
+        </tr>
+
+        <tr>
+        <td>Certificate Password </td>
+        <td><input type="password" name="passwd" value="<?php echo  htvar($passwd) ?>" size="30"></td>
+        </tr>
+
+        <tr>
+        <td>Certificate Life </td>
+        <td><select name=expiry>
+
+        <?php
+        print "<option value=0.083 " . ($expiry == 1 ? "selected='selected'" : "") . " >1 Month</option>\n" ;
+        print "<option value=0.25 " . ($expiry == 1 ? "selected='selected'" : "") . " >3 Months</option>\n" ;
+        print "<option value=0.5 " . ($expiry == 1 ? "selected='selected'" : "") . " >6 Months</option>\n" ;
+        print "<option value=1 " . ($expiry == 1 ? "selected='selected'" : "") . " >1 Year</option>\n" ;
+        for ($i = 2; $i <= 5; $i++) {
+            print "<option value=$i " . ($expiry == $i ? "selected='selected'" : "") . " >$i Years</option>\n" ;
+        }
+        ?>
+
+        </select></td>
+        </tr>
+        <tr>
+        <td>&nbsp</td>
+        <td>
+            <input type="submit" name="submit" value="Submit Request">&nbsp
+            <input type="submit" name="submit" value="Back">
+            <input type="hidden" name="stage" value="renew">
+            <input type="hidden" name="serial" value="<?php echo $serial ?>" >
+        </td>
+        </tr>
+        </table>
+        </form>
+
+    <?php
+
+    printFooter();
+        break;
+
+    case 'renew':
+        $ret = true;
+        if ($submit == "Submit Request") {
+            list($ret, $errtxt) = CA_renew_cert($serial, $expiry, $passwd);
+        }
+
+        if (! $ret) {
+            printHeader('ca');
+
+            print "<form action=\"$PHP_SELF?stage=renew-form&serial=$serial&$qstr_sort&$qstr_filter\" method=post>";
+            ?>
+            <font color=#ff0000>
+            <h2>There was an error creating your certificate.</h2>
+            </font><br>
+            <blockquote>
+            <h3>Debug Info:</h3>
+            <pre><?php echo $errtxt?></pre>
+            </blockquote>
+            <p>
+            <input type="submit" name="submit" value="Back">
+            <p>
+            </form>
+            <?php
+        } else {
+            header("Location: $PHP_SELF?$qstr_sort&$qstr_filter");
+        }
+
+        break;
+
+    default:
+        printHeader('ca');
+        ?>
+
+        <body onLoad="self.focus();document.filter.search.focus();">
+        <table style="margin:0 auto">
+        <tr><th colspan=9><big>CERTIFICATE MANAGEMENT CONTROL PANEL</big></th></tr>
+        <tr><td colspan=9><center>
+        <form action="<?php echo "$PHP_SELF?$qstr_sort"?>" method="get" name="filter">
         Search: <input type="text" name=search" value="<?php echo htvar($search)?>" style="font-size: 11px;" maxlength="60" size="30">
         &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-               <input type="checkbox" name="show_valid" value="V" <?php echo ($show_valid?'checked':'')?>>Valid
+        <input type="checkbox" name="show_valid" value="V" <?php echo ($show_valid?'checked':'')?>>Valid
         &nbsp&nbsp
-               <input type="checkbox" name="show_revoked" value="R" <?php echo ($show_revoked?'checked':'')?>>Revoked
+        <input type="checkbox" name="show_revoked" value="R" <?php echo ($show_revoked?'checked':'')?>>Revoked
         &nbsp&nbsp
-               <input type="checkbox" name="show_expired" value="E" <?php echo ($show_expired?'checked':'')?>>Expired
+        <input type="checkbox" name="show_expired" value="E" <?php echo ($show_expired?'checked':'')?>>Expired
         &nbsp&nbsp&nbsp&nbsp&nbsp
-               <input type="submit" name="submit" value="Apply Filter" style="font-size: 11px;">
+        <input type="submit" name="submit" value="Apply Filter" style="font-size: 11px;">
         </form>
-       </center></td>
-       </tr>
-       <?php
-
-       if (! $sortfield) {
-               $sortfield = 'email' ;
-               $ascdec = 'A';
-       }
-
-       if ($ascdec == 'A') {
-               $arrow_gif = '../images/uparrow-blue.gif';
-               $ht_ascdec = 'D';
-       }
-       else {
-               $arrow_gif = '../images/downarrow-blue.gif';
-               $ht_ascdec = 'A';
-       }
-
-       print '<tr>';
-       
-       $headings = array(
-           'status'=>"Status", 'issued'=>"Issued", 'expires'=>"Expires",
-               'common_name'=>"User's Name", 'email'=>"E-mail", 
-               'organization'=>"Organization", 'unit'=>"Department", 
-               'locality'=>"Locality"
-       );
-
-       foreach($headings as $field=>$head) {
-               print '<th><a href="'.$PHP_SELF.'?sortfield='.$field.'&ascdec=A&'.$qstr_filter.'" title="Click to sort on this column."><u>'.$head.'</u></a>';
-
-               if ($sortfield == $field) {
-                       print   '&nbsp<a href="'.$PHP_SELF.'?sortfield='.$field.'&ascdec='.$ht_ascdec.'&'.$qstr_filter.'" >'.
-                               '<img src='.$arrow_gif.' height=12 alt=\'Change sort order.\' title=\'Click to reverse sort order.\'></a>';
-               }
-
-               print '</th>';
-       }
-       print '<th><font color=green>Actions</font></th>';
-       print '</tr>';
-
-       $x = "^[$show_valid$show_revoked$show_expired]";
-
-       if (in_array($PHPki_user, $PHPki_admins)) {
-               $x = "$x.*$search";
-       }
-       else {
-               $x = "$x.*$search.*$PHPki_user|$x.*$PHPki_user.*$search";
-       }
-
-       $db = csort(CAdb_to_array($x), $sortfield, ($ascdec=='A'?SORT_ASC:SORT_DESC));
-
-       $stcolor = array('Valid'=>'green','Revoked'=>'red','Expired'=>'orange');
-
-       foreach($db as $rec) {
-               print   '<tr style="font-size: 11px;">
-                        <td><font color='.$stcolor[$rec['status']].'><b>' .$rec[status].'</b></font></td>
-                        <td style="white-space: nowrap">'.$rec['issued'].'</td>
-                        <td style="white-space: nowrap">'.$rec['expires'].'</td>
-                        <td>'.$rec['common_name'].'</td>
-                        <td style="white-space: nowrap"><a href="mailto:' . htvar($rec['common_name']) . ' <' . htvar($rec['email']) . '>" >' . htvar($rec['email']) . '</a></td>
-                        <td>'.htvar($rec['organization']).'</td>
-                        <td>'.htvar($rec['unit']).'</td>
-                        <td>'.htvar($rec['locality']).'</td>
-                        <td><a href="'.$PHP_SELF.'?stage=display&serial='.$rec['serial'].'" target=_certdisp>'.
-                        '<img src=../images/display.png alt="Display" title="Display complete certificate details."></a>';
-
-               if ($rec['status'] == 'Valid') {
-                       print '
-                       <a href="'.$PHP_SELF.'?stage=dl-confirm&serial='.$rec['serial'].'&'.$qstr_sort.'&'.$qstr_filter.'">'.
-                       '<img src=../images/download.png alt="Download" title="Download the PRIVATE certificate. DO NOT DISTRIBUTE THIS TO THE PUBLIC!"></a>
-                       <a href="'.$PHP_SELF.'?stage=revoke-form&serial='.$rec['serial'].'&'.$qstr_sort.'&'.$qstr_filter.'">'.
-                       '<img src=../images/revoke.png alt="Revoke" title="Revoke the certificate when the e-mail address is no longer valid or the certificate password or private key has been compromised."></a>';
-               }
-               print '
-                       <a href="'.$PHP_SELF.'?stage=renew-form&serial='.$rec['serial'].'&'.$qstr_sort.'&'.$qstr_filter.'">'.
-                       '<img src=../images/renew.png alt="Renew" title="Renew the certificate by revoking it, if necessary, and creating a replacement with a new expiration date."></a>
-                       </td></tr>';
-       }
+    </center></td>
+    </tr>
+
+    <?php
+
+    if (! $sortfield) {
+        $sortfield = 'email' ;
+        $ascdec = 'A';
+    }
+
+    if ($ascdec == 'A') {
+        $arrow_gif = '../images/uparrow-blue.gif';
+        $ht_ascdec = 'D';
+    } else {
+        $arrow_gif = '../images/downarrow-blue.gif';
+        $ht_ascdec = 'A';
+    }
+
+    print '<tr>';
+
+    $headings = array(
+        'status'=>"Status", 'issued'=>"Issued", 'expires'=>"Expires",
+        'common_name'=>"User's Name", 'email'=>"E-mail",
+        'organization'=>"Organization", 'unit'=>"Department",
+        'locality'=>"Locality"
+        );
+
+    foreach ($headings as $field => $head) {
+        print '<th><a href="'.$PHP_SELF.'?sortfield='.$field.'&ascdec=A&'.$qstr_filter.'" title="Click to sort on this column."><u>'.$head.'</u></a>';
+
+        if ($sortfield == $field) {
+            print   '&nbsp<a href="'.$PHP_SELF.'?sortfield='.$field.'&ascdec='.$ht_ascdec.'&'.$qstr_filter.'" >'.
+            '<img src='.$arrow_gif.' height=12 alt=\'Change sort order.\' title=\'Click to reverse sort order.\'></a>';
+        }
+
+        print '</th>';
+    }
+        print '<th><font color=green>Actions</font></th>';
+        print '</tr>';
+
+        $x = "^[$show_valid$show_revoked$show_expired]";
+
+    if (in_array($PHPki_user, $PHPki_admins)) {
+        $x = "$x.*$search";
+    } else {
+        $x = "$x.*$search.*$PHPki_user|$x.*$PHPki_user.*$search";
+    }
+
+        $db = csort(CAdb_to_array($x), $sortfield, ($ascdec=='A'?SORT_ASC:SORT_DESC));
+
+        $stcolor = array('Valid'=>'green','Revoked'=>'red','Expired'=>'orange');
+
+    foreach ($db as $rec) {
+        print '<tr style="font-size: 11px;">
+       <td><font color='. $stcolor[$rec['status']] . '><b>' . $rec['status'] . '</b></font></td>
+       <td style="white-space: nowrap">'.$rec['issued'].'</td>
+       <td style="white-space: nowrap">'.$rec['expires'].'</td>
+       <td>' . $rec['common_name'] . '</td>
+       <td style="white-space: nowrap"><a href="mailto:' . htvar($rec['common_name']) . ' <' . htvar($rec['email']) . '>" >' . htvar($rec['email']) . '</a></td>
+       <td>' . htvar($rec['organization']) . '</td>
+       <td>' . htvar($rec['unit']) . '</td>
+       <td>' . htvar($rec['locality']) . '</td>
+       <td><a href="' . $PHP_SELF . '?stage=display&serial=' . $rec['serial'] . '" target=_certdisp>'.
+         '<img src=../images/display.png alt="Display" title="Display complete certificate details."></a>';
+
+        if ($rec['status'] == 'Valid') {
+            print '
+      <a href="' . $PHP_SELF . '?stage=dl-confirm&serial=' . $rec['serial'] . '&' . $qstr_sort . '&' . $qstr_filter . '">' .
+            '<img src=../images/download.png alt="Download" title="Download the PRIVATE certificate. DO NOT DISTRIBUTE THIS TO THE PUBLIC!"></a>
+      <a href="' . $PHP_SELF . '?stage=revoke-form&serial=' . $rec['serial'] . '&' . $qstr_sort . '&' . $qstr_filter . '">' .
+            '<img src=../images/revoke.png alt="Revoke" title="Revoke the certificate when the e-mail address is no longer valid or the certificate password or private key has been compromised."></a>';
+        }
+        print '
+      <a href="' . $PHP_SELF . '?stage=renew-form&serial=' . $rec['serial'] . '&' . $qstr_sort . '&' . $qstr_filter . '">' .
+        '<img src=../images/renew.png alt="Renew" title="Renew the certificate by revoking it, if necessary, and creating a replacement with a new expiration date."></a>
+      </td></tr>';
+    }
 
-       print '</table>';
+        print '</table>';
 
-       printFooter();
+        printFooter();
 }
 ?>
diff -ruN phpki-ng.old/phpki-ng-0.84/ca/policy.html phpki-ng/phpki-ng-0.84/ca/policy.html
--- phpki-ng.old/phpki-ng-0.84/ca/policy.html   2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/ca/policy.html       2021-03-07 19:33:03.072323731 +0100
@@ -1,78 +1,34 @@
-<html>
-
-<head>
-<title>Certificate Authority Agreement</title>
-</head>
-
-<body>
-
-<h2 align=center>Certificate Authority Agreement</h2>
-<h3 align=center>Policy and Practices</h3>
-
-<br><br>
-<p>This is a statement of practices by this Digital Certificate Authority.  
-Your use of this Certificate Authority constitutes your and/or your agency's 
-understanding and full acceptance of these practices and all associated risks.
-<strong>Please have an authorized person at your agency sign this document and fax it to 000-000-0000</strong>
-
-<p>This document may not be all encompassing, and we reserve the right to modify it at any time. 
-
-<ul>
-<li> The sole role of this Certificate Authority is
-to provide and maintain a password protected software application for the easy
-and instant creation and management of standard x.509 personal digital
-certificates for e-mail encryption. We assume no responsibility for
-verifying the identity of any persons other than that of the limited number of
-authorized users of the software.
-We accept no liability for damages resulting from the use, misuse,
-or compromise of the software application or its host server.
-
-<p><li>As an authorized user of the software, you are in effect <strong>THE</strong> Certificate Authority for your
-agency. As such, you are solely
-responsible for authenticating the identity of the persons for whom you obtain
-certificates. We accept no
-responsibility or liability for non-repudiation in any digital certificate
-created by this software. You agree that
-password protection to the application by authorized certificate managers,
-and personal identity management by
-those managers is sufficient to create a chain of trust for non-repudiation
-in all digital certificates created using the software.
-
-<p><li>No more than two(2)
-users at your agency should have access to your agency's Certificate Authority
-password. We should be notified
-immediately, via e-mail, when the employment of any
-authorized user at your agency is terminated so that a new password can be
-issued.
-
-<p><li>This Certificate
-Authority software application is accessed via the Internet using standard SSL
-or Secure Server encryption mechanisms.
-Although steps have been taken to protect the security and availability
-of the host server and application, its exposure to the Internet as well as any
-presently unknown security flaws could lead to potential compromise of the
-software and your certificates.
-
-<p><li>No promise is made as
-to the availability of the software in the event of hardware, software, or
-telecommunications failure or maintenance. 
-No advanced notice will be given when the software must be temporarily
-taken off line for service.
-
-<p><li>In order to provide
-software which can easily create &quot;instant&quot; certificates it is
-necessary to store all private keys on the host server.  As such, all private keys are potentially exposed
-to the Internet and suffer some risk of unauthorized access. However, since all private keys <strong>ARE
-ENCRYPTED</strong> using a password provided by you, they are unlikely to be usable by
-any intruder.
-
-<p><li>A publicly accessible
-web page is provided for interested Internet users to download the Certificate
-Authority root certificate, certificate revocation list, and search for the
-e-mail addresses and public certificates of users. So as to avoid e-mail address scraping by spammers, no static
-content with users' e-mail addresses is available.
-
-</ul>
-</body>
-
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+
+<html>
+<head>
+  <title>Certificate Authority Agreement</title>
+</head>
+
+<body>
+  <h2 align="center">Certificate Authority Agreement</h2>
+
+  <h3 align="center">Policy and Practices</h3><br>
+  <br>
+
+  <p>This is a statement of practices by this Digital Certificate Authority. Your use of this Certificate Authority constitutes your and/or your agency's understanding and full acceptance of these practices and all associated risks. <strong>Please have an authorized person at your agency sign this document and fax it to 000-000-0000</strong></p>
+
+  <p>This document may not be all encompassing, and we reserve the right to modify it at any time.</p>
+
+  <ul>
+    <li>The sole role of this Certificate Authority is to provide and maintain a password protected software application for the easy and instant creation and management of standard x.509 personal digital certificates for e-mail encryption. We assume no responsibility for verifying the identity of any persons other than that of the limited number of authorized users of the software. We accept no liability for damages resulting from the use, misuse, or compromise of the software application or its host server.</li>
+
+    <li>As an authorized user of the software, you are in effect <strong>THE</strong> Certificate Authority for your agency. As such, you are solely responsible for authenticating the identity of the persons for whom you obtain certificates. We accept no responsibility or liability for non-repudiation in any digital certificate created by this software. You agree that password protection to the application by authorized certificate managers, and personal identity management by those managers is sufficient to create a chain of trust for non-repudiation in all digital certificates created using the software.</li>
+
+    <li>No more than two(2) users at your agency should have access to your agency's Certificate Authority password. We should be notified immediately, via e-mail, when the employment of any authorized user at your agency is terminated so that a new password can be issued.</li>
+
+    <li>This Certificate Authority software application is accessed via the Internet using standard SSL or Secure Server encryption mechanisms. Although steps have been taken to protect the security and availability of the host server and application, its exposure to the Internet as well as any presently unknown security flaws could lead to potential compromise of the software and your certificates.</li>
+
+    <li>No promise is made as to the availability of the software in the event of hardware, software, or telecommunications failure or maintenance.&nbsp; No advanced notice will be given when the software must be temporarily taken off line for service.</li>
+
+    <li>In order to provide software which can easily create "instant" certificates it is necessary to store all private keys on the host server. As such, all private keys are potentially exposed to the Internet and suffer some risk of unauthorized access. However, since all private keys <strong>ARE ENCRYPTED</strong> using a password provided by you, they are unlikely to be usable by any intruder.</li>
+
+    <li>A publicly accessible web page is provided for interested Internet users to download the Certificate Authority root certificate, certificate revocation list, and search for the e-mail addresses and public certificates of users. So as to avoid e-mail address scraping by spammers, no static content with users' e-mail addresses is available.</li>
+  </ul>
+</body>
+</html>
diff -ruN phpki-ng.old/phpki-ng-0.84/ca/request_cert.php phpki-ng/phpki-ng-0.84/ca/request_cert.php
--- phpki-ng.old/phpki-ng-0.84/ca/request_cert.php      2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/ca/request_cert.php  2021-03-07 19:33:03.072323731 +0100
@@ -7,7 +7,7 @@
 include('../include/openssl_functions.php') ;
 
 # User's preferences file
-$user_cnf = "$config[home_dir]/config/user-".strtr($PHPki_user,'/\\','|#').'.php';
+$user_cnf = $config['home_dir'] . "/config/user-".strtr($PHPki_user, '/\\', '|#').'.php';
 
 # Retrieve GET/POST values
 $form_stage   = gpvar('form_stage');
@@ -48,355 +48,398 @@
 
 
 switch ($form_stage) {
+    case 'validate':
+        $er = '';
 
-case 'validate':
-       $er = '';
-
-       if (! $country)      $er .= 'Missing Country<br>';
-       if (! $province)     $er .= 'Missing State/Province<br>';
-       if (! $locality)     $er .= 'Missing Locality (City/County)<br>';
-       if (! $organization) $er .= 'Missing Organization (Company/Agency)<br>';
-       if (! $unit)         $er .= 'Missing Unit/Department<br>';
-       if (! $common_name)  $er .= 'Missing E-mail User\'s Full Name<br>';
-       if (! $email)        $er .= 'Missing E-mail Address<br>';
-
-       if (($cert_type == 'email' || $cert_type == 'email_signing') && ! $passwd)       $er .= 'Missing Certificate Password<br>';
-       if (($cert_type == 'email' || $cert_type == 'email_signing') && ! $passwdv)      $er .= 'Missing Certificate Password Verification "Again"<br>';
-
-       if ( $passwd && strlen($passwd) < 8 )
-               $er .= 'Certificate password is too short.<br>';
-
-       if ( $passwd and $passwd != $passwdv )
-               $er .= 'Password and password verification do not match.<br>';
-
-       //if ( ! is_alnum($passwd) or ! is_alnum($passwdv) )
-       //      $er .= 'Password contains invalid characters.<br>';
-
-       if ( $email && ! is_email($email) )
-               $er .= 'E-mail address ('. htvar($email) . ') may be invalid.<br>';
-
-       $ip_ar=explode("\n", $ip_addr);
-       foreach ($ip_ar as $value){
-               if ( $value && ! is_ip($value) )
-                       $er .= 'IP address ('. htvar($value) . ') may be invalid.<br>';
-       }
-
-       $dns_n=explode("\n", $dns_names);
-       foreach ($dns_n as $value){
-               if ( $value && ! is_fqdn(trim($value)) )
-                       $er .= 'DNS Name ('. htvar($value) . ') may be invalid.<br>';
-       }
-
-       if ( $er )
-               $er = '<h2>ERROR(S) IN FORM:</h2><h4><blockquote>' . $er . '</blockquote></h4>';
-
-       if ($email && ($serial = CAdb_in($email,$common_name))) {
-               $er = '';
-               $certtext = CA_cert_text($serial);
-               $er .= '<h2>A valid certificate already exists for ' . htvar("$common_name  <$email>") . '</h2>';
-               $er .= '</font><blockquote><pre> ' . htvar($certtext) . ' </pre></blockquote>';
-
-       }
-
-       if ($er)  {
-               printHeader();
-               ?>
-
-               <form action='<?php echo $PHP_SELF?>' method=post>
-               <input type=submit name=submit value='Go Back'>
-               <font color=#ff0000><?php echo $er?></font>
-               <br><input type=submit name=submit value='Go Back'>
-
-               <?php
-               print $hidden_fields;
-               print "</form>";
-
-               printFooter();
-               break;
-       }
-
-case 'confirm':
-       printHeader();
-
-       ?>
-       <h4>You are about to create a certificate using the following information:</h4>
-       <table width=500><tr>
-       <td width=25% style='white-space: nowrap'>
-       <p align=right>
-       User's Name<br>
-       E-mail Address<br>
-       Organization<br>
-       Department/Unit<br>
-       Locality<br>
-       State/Province<br>
-       Country<br>
-           Certificate Life<br>
-           Key Size<br>
-           Certificate Use<br>
-       <?php
-       if  ($cert_type == 'server' ) {
-       print 'DNS Alt Names<br>';
-       print 'IP Addresses<br>';
-       }
-       ?>
-               </p>
-               </td>
-
-       <td>
-       <?php
-       print htvar($common_name) . '<br>';
-       print htvar($email) . '<br>';
-       print htvar($organization) . '<br>';
-       print htvar($unit) . '<br>';
-       print htvar($locality) . '<br>';
-       print htvar($province) . '<br>';
-       print htvar($country) . '<br>';
-       print htvar($expiry). ' Year'.($expiry == 1 ? '' : 's').'<br>';
-       print htvar($keysize). ' bits<br>';
-
-       switch  ($cert_type) {
-           case 'email':
-                   print 'E-mail, SSL Client' . '<br>';
-                   break;
-           case 'email_signing':
-                   print 'E-mail, SSL Client, Code Signing' . '<br>';
-                   break;
-           case 'server':
-                   print 'SSL Server' . '<br>';
-                   print htvar($dns_names). '<br>';
-                   print htvar($ip_addr). '<br>';
-                   break;
-           case 'vpn_client':
-                   print 'VPN Client Only' . '<br>';
-                   break;
-           case 'vpn_server':
-                   print 'VPN Server Only' . '<br>';
-                   break;
-           case 'vpn_client_server':
-                   print 'VPN Client, VPN Server' . '<br>';
-                   break;
-           case 'time_stamping':
-                   print 'Time Stamping' . '<br>';
-
-       }
-       ?>
-       </td>
-
-       </tr></table>
-
-       <h4>Are you sure?</h4>
-       <p><form action='<?php echo $PHP_SELF?>' method=post>
-       <?php echo  $hidden_fields ?>
-       <input type=hidden name=form_stage value=final>
-       <input type=submit name=submit value='Yes.  Create and Download' >&nbsp;
-       <input type=submit name=submit value='Yes.  Just Create' >&nbsp;
-       <input type=submit name=submit value='Go Back'>
-       </form>
-
-       <?php
-       printFooter();
-
-       # Save user's defaults
-       $fp = fopen($user_cnf,'w');
-       $x = '<?php
-       $country = \''.addslashes($country).'\';
-       $locality = \''.addslashes($locality).'\';
-       $province = \''.addslashes($province).'\';
-       $organization = \''.addslashes($organization).'\';
-       $unit = \''.addslashes($unit).'\';
-       $expiry = \''.addslashes($expiry).'\';
-       $keysize = \''.addslashes($keysize).'\';
-       ?>';
-       fwrite($fp,$x);
-       fclose($fp);
-
-       break;
-
-case 'final':
-       if ($submit == "Yes  Create and Download" || $submit == "Yes.  Just Create") {
-               if (! $serial = CAdb_in($email,$common_name)) {
-                       list($ret,$errtxt) = CA_create_cert($cert_type, $country, $province, $locality, $organization, $unit, $common_name, $email, $expiry, $passwd, $keysize, $dns_names, $ip_addr);
-
-                       if (! $ret) {
-                               printHeader();
-                               ?>
-                               <form action="<?php echo $PHP_SELF?>" method="post">
-                                       <font color=#ff0000>
-                                       <h2>There was an error creating your certificate.</h2></font><br>
-                                       <blockquote>
-                                       <h3>Debug Info:</h3>
-                                       <pre><?php echo $errtxt?></pre>
-                                       </blockquote>
-                                       <p>
-                                       <?php echo $hidden_fields?>
-                                       <input type=submit name=submit value=Back>
-                                       <p>
-                               </form>
-                               <?php
-                               printFooter();
-                               break;
-                       }
-                       else {
-                               $serial = $errtxt;
-                       }
-               }
-       }
-       
-    if ($submit == "Yes  Create and Download") {
-               switch($cert_type) {
-               case 'server':
-#               upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem",$config['cacert_pem']), "$common_name ($email).pem",'application/pkix-cert');
-                               upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem",$config['cacert_pem']), "$rec[common_name]-Bundle.pem",'application/pkix-cert');
-                               break;
-               case 'email':
-               case 'email_signing':
-               case 'time_stamping':
-               case 'vpn_client_server':
-               case 'vpn_client':
-               case 'vpn_server':
-#               upload("$config[pfx_dir]/$serial.pfx", "$common_name ($email).p12", 'application/x-pkcs12');
-                               upload("$config[pfx_dir]/$serial.pfx", "$rec[common_name].p12", 'application/x-pkcs12');
-                               break;
-               }
-           
-               # Clear common_name fields
-           $common_name = '';
-               break;
-       }
-       
-# Clear common_name fields
-$common_name = '';
-
-// We could add 'return to index or create another certificate'
-
-default:
-       #
-       # Default fields to reasonable values if necessary.
-       #
-       if (! $submit and file_exists($user_cnf)) include($user_cnf);
-
-       if (! $country)       $country = $config['country'];
-       if (! $province)      $province = $config['province'];
-       if (! $locality)      $locality = "";
-       if (! $organization)  $organization = "";
-       if (! $unit)          $unit = "";
-       if (! $email)         $email = "";
-       if (! $expiry)        $expiry = 1;
-       if (! $keysize)       $keysize = 2048;
-       if (! $cert_type)     $cert_type = 'email';
-       if (! $dns_names)     $dns_names = "";
-       if (! $ip_addr)       $ip_addr = "";
-
-       printHeader();
-       ?>
-       
-       <body onLoad="self.focus();document.request.common_name.focus();document.request.cert_type.onchange();">
-       <form action="<?php echo $PHP_SELF?>" method=post name=request>
-       <table width=99%>
-       <th colspan=2><h3>Certificate Request Form</h3></th>
-
-       <tr>
-       <td width=30%>Common Name<font color=red size=3>*</font><br>(i.e. User real name or computer hostname - used as SubjectAltName)</td>
-       <td><input type=text name=common_name value="<?php echo  htvar($common_name)?>" size=50 maxlength=60></td>
-       </tr>
-
-       <tr>
-       <td>E-mail Address <font color=red size=3>*</font></td>
-       <td><input type=text name=email value="<?php echo htvar($email)?>" size=50 maxlength=60></td>
-       </tr>
-
-       <tr>
-       <td>Organization (Company/Agency)<font color=red size=3>*</font></td>
-       <td><input type=text name=organization value="<?php echo htvar($organization)?>" size=60 maxlength=60></td>
-       </tr>
-
-       <tr>
-       <td>Department/Unit<font color=red size=3>*</font> </td><td><input type=text name=unit value="<?php echo  htvar($unit) ?>" size=40 maxlength=60></td>
-       </tr>
-
-       <tr>
-       <td>Locality (City/County)<font color=red size=3>*</font></td><td><input type=text name=locality value="<?php echo  htvar($locality) ?>" size=30 maxlength=30></td>
-       </tr>
-
-       <tr>
-       <td>State/Province<font color=red size=3>*</font></td><td><input type=text name=province value="<?php echo  htvar($province) ?>" size=30 maxlength=30></td>
-       </tr>
-
-       <tr>
-       <td>Country<font color=red size=3>*</font></td>
-       <td><input type=text name=country value="<?php echo  htvar($country) ?>" size=2 maxlength=2></td>
-       </tr>
-
-       <tr>
-       <td>Certificate Password<font color=red size=3>*</font><br>(Mandatory for Email,SSL Client,Code signing)</td>
-       <td><input type=password name=passwd value="<?php echo  htvar($passwd) ?>" size=30>&nbsp;&nbsp; Again <input type=password name=passwdv  value="<?php echo  htvar($passwdv) ?>" size=30></td>
-       </tr>
-
-       <tr>
-       <td>Certificate Life<font color=red size=3>*</font> </td>
-       <td><select name=expiry>
-
-       <?php
-       print "<option value=0.083 " . ($expiry == 1 ? "selected='selected'" : "") . " >1 Month</option>\n" ;
-       print "<option value=0.25 " . ($expiry == 1 ? "selected='selected'" : "") . " >3 Months</option>\n" ;
-       print "<option value=0.5 " . ($expiry == 1 ? "selected='selected'" : "") . " >6 Months</option>\n" ;
-       print "<option value=1 " . ($expiry == 1 ? "selected='selected'" : "") . " >1 Year</option>\n" ;
-       for ( $i = 2 ; $i <= 5 ; $i++ ) {
-               print "<option value=$i " . ($expiry == $i ? "selected='selected'" : "") . " >$i Years</option>\n" ;
-       }
-
-       ?>
-
-       </select></td>
-       </tr>
-
-       <tr>
-       <td>Key Size<font color=red size=3>*</font> </td>
-       <td><select name=keysize>
-       <?php
-       for ( $i = 512 ; $i <= 4096 ; $i+= 512 ) {
-               print "<option value=$i " . ($keysize == $i ? "selected='selected'" : "") . ">$i bits</option>\n" ;
-       }
-       ?>
-
-       </select></td>
-       </tr>
-
-       <tr>
-       <td>Certificate Use:<font color=red size=3>*</font> </td>
-       <td><select name=cert_type onchange="if (this.value=='server')
-        {setVisibility('testrow1',true);setVisibility('testrow2',true);} else {setVisibility('testrow1',false);setVisibility('testrow2',false);}">
-       <?php
-       print '<option value="email" '.($cert_type=='email'?'selected':'').'>E-mail, SSL Client</option>';
-       print '<option value="email_signing" '.($cert_type=='email_signing'?'selected':'').'>E-mail, SSL Client, Code Signing</option>';
-       print '<option value="server" '.($cert_type=='server'?'selected':'').'>SSL Server</option>';
-       print '<option value="vpn_client" '.($cert_type=='vpn_client'?'selected':'').'>VPN Client Only</option>';
-       print '<option value="vpn_server" '.($cert_type=='vpn_server'?'selected':'').'>VPN Server Only</option>';
-       print '<option value="vpn_client_server" '.($cert_type=='vpn_client_server'?'selected':'').'>VPN Client, VPN Server</option>';
-       print '<option value="time_stamping" '.($cert_type=='time_stamping'?'selected':'').'>Time Stamping</option>';
-       ?>
-       </select></td>
-       </tr>
-
-       <tr id="testrow2" name="testrow2" style="visibility:hidden;display:none;">
-       <td>Alternative DNS Names<br>(only one per Line)</td><td><textarea name=dns_names cols=30 rows=5><?php echo htvar($dns_names) ?></textarea></td>
-       </tr>
-
-       <tr id="testrow1" name="testrow1" style="visibility:hidden;display:none;">
-       <td>IP's<br>(only one per Line)</td><td><textarea name=ip_addr cols=30 rows=5><?php echo htvar($ip_addr) ?></textarea></td>
-       </tr>
-    <tr>
-               <td>&nbsp</td>
-               <td>&nbsp</td>
-       </tr>
-       <tr>
-       <td><font color=red size=3>* Fields are required</td><td><input type=submit name=submit value='Submit Request'><input type=hidden name=form_stage value='validate'></td>
-       </tr>
-       </table>
-       </form>
-       <?php
-
-       printFooter();
+        if (! $country) {
+            $er .= 'Missing Country<br>';
+        }
+        if (! $province) {
+            $er .= 'Missing State/Province<br>';
+        }
+        if (! $locality) {
+            $er .= 'Missing Locality (City/County)<br>';
+        }
+        if (! $organization) {
+            $er .= 'Missing Organization (Company/Agency)<br>';
+        }
+        if (! $unit) {
+            $er .= 'Missing Unit/Department<br>';
+        }
+        if (! $common_name) {
+            $er .= 'Missing E-mail User\'s Full Name<br>';
+        }
+        if (! $email) {
+            $er .= 'Missing E-mail Address<br>';
+        }
+
+        if (($cert_type == 'email' || $cert_type == 'email_signing') && ! $passwd) {
+            $er .= 'Missing Certificate Password<br>';
+        }
+        if (($cert_type == 'email' || $cert_type == 'email_signing') && ! $passwdv) {
+            $er .= 'Missing Certificate Password Verification "Again"<br>';
+        }
+
+        if ($passwd && strlen($passwd) < 8) {
+            $er .= 'Certificate password is too short.<br>';
+        }
+
+        if ($passwd and $passwd != $passwdv) {
+            $er .= 'Password and password verification do not match.<br>';
+        }
+
+        //if ( ! is_alnum($passwd) or ! is_alnum($passwdv) )
+        //  $er .= 'Password contains invalid characters.<br>';
+
+        if ($email && ! is_email($email)) {
+            $er .= 'E-mail address ('. htvar($email) . ') may be invalid.<br>';
+        }
+
+        $ip_ar=explode("\n", $ip_addr);
+        foreach ($ip_ar as $value) {
+            if ($value && ! is_ip($value)) {
+                $er .= 'IP address ('. htvar($value) . ') may be invalid.<br>';
+            }
+        }
+
+        $dns_n=explode("\n", $dns_names);
+        foreach ($dns_n as $value) {
+            if ($value && ! is_fqdn(trim($value))) {
+                $er .= 'DNS Name ('. htvar($value) . ') may be invalid.<br>';
+            }
+        }
+
+        if ($er) {
+            $er = '<h2>ERROR(S) IN FORM:</h2><h4><blockquote>' . $er . '</blockquote></h4>';
+        }
+
+        if ($email && ($serial = CAdb_in($email, $common_name))) {
+            $er = '';
+            $certtext = CA_cert_text($serial);
+            $er .= '<h2>A valid certificate already exists for ' . htvar("$common_name  <$email>") . '</h2>';
+            $er .= '</font><blockquote><pre> ' . htvar($certtext) . ' </pre></blockquote>';
+        }
+
+        if ($er) {
+            printHeader();
+            ?>
+
+        <form action='<?php echo $PHP_SELF?>' method=post>
+        <input type=submit name=submit value='Go Back'>
+        <font color=#ff0000><?php echo $er?></font>
+        <br><input type=submit name=submit value='Go Back'>
+
+        <?php
+        print $hidden_fields;
+        print "</form>";
+
+        printFooter();
+        break;
+        }
+
+    case 'confirm':
+        printHeader();
+
+        ?>
+        <h4>You are about to create a certificate using the following information:</h4>
+        <table width=500><tr>
+        <td width=25% style='white-space: nowrap'>
+        <p align=right>
+        User's Name<br>
+        E-mail Address<br>
+        Organization<br>
+        Department/Unit<br>
+        Locality<br>
+        State/Province<br>
+        Country<br>
+        Certificate Life<br>
+        Key Size<br>
+        Certificate Use<br>
+        <?php
+        if ($cert_type == 'server') {
+            print 'DNS Alt Names<br>';
+            print 'IP Addresses<br>';
+        }
+        ?>
+        </p>
+        </td>
+
+        <td>
+        <?php
+        print htvar($common_name) . '<br>';
+        print htvar($email) . '<br>';
+        print htvar($organization) . '<br>';
+        print htvar($unit) . '<br>';
+        print htvar($locality) . '<br>';
+        print htvar($province) . '<br>';
+        print htvar($country) . '<br>';
+        print htvar($expiry). ' Year'.($expiry == 1 ? '' : 's').'<br>';
+        print htvar($keysize). ' bits<br>';
+
+        switch ($cert_type) {
+            case 'email':
+                print 'E-mail, SSL Client' . '<br>';
+                break;
+            case 'email_signing':
+                print 'E-mail, SSL Client, Code Signing' . '<br>';
+                break;
+            case 'server':
+                print 'SSL Server' . '<br>';
+                print htvar($dns_names). '<br>';
+                print htvar($ip_addr). '<br>';
+                break;
+            case 'vpn_client':
+                print 'VPN Client Only' . '<br>';
+                break;
+            case 'vpn_server':
+                print 'VPN Server Only' . '<br>';
+                break;
+            case 'vpn_client_server':
+                print 'VPN Client, VPN Server' . '<br>';
+                break;
+            case 'time_stamping':
+                print 'Time Stamping' . '<br>';
+        }
+        ?>
+        </td>
+
+        </tr></table>
+
+        <h4>Are you sure?</h4>
+        <p><form action='<?php echo $PHP_SELF?>' method=post>
+    <?php echo  $hidden_fields ?>
+    <input type=hidden name=form_stage value=final>
+    <input type=submit name=submit value='Yes.  Create and Download' >&nbsp;
+    <input type=submit name=submit value='Yes.  Just Create' >&nbsp;
+    <input type=submit name=submit value='Go Back'>
+    </form>
+
+    <?php
+    printFooter();
+
+    # Save user's defaults
+    $fp = fopen($user_cnf, 'w');
+    $x = '<?php
+    $country      = \''.addslashes($country).'\';
+    $locality     = \''.addslashes($locality).'\';
+    $province     = \''.addslashes($province).'\';
+    $organization = \''.addslashes($organization).'\';
+    $unit         = \''.addslashes($unit).'\';
+    $expiry       = \''.addslashes($expiry).'\';
+    $keysize      = \''.addslashes($keysize).'\';
+    ?>';
+    fwrite($fp, $x);
+    fclose($fp);
+
+        break;
+
+    case 'final':
+        if ($submit == "Yes  Create and Download" || $submit == "Yes.  Just Create") {
+            if (! $serial = CAdb_in($email, $common_name)) {
+                list($ret,$errtxt) = CA_create_cert($cert_type, $country, $province, $locality, $organization, $unit, $common_name, $email, $expiry, $passwd, $keysize, $dns_names, $ip_addr);
+
+                if (! $ret) {
+                        printHeader();
+                    ?>
+                    <form action="<?php echo $PHP_SELF?>" method="post">
+                    <font color=#ff0000>
+                    <h2>There was an error creating your certificate.</h2></font><br>
+                    <blockquote>
+                    <h3>Debug Info:</h3>
+                    <pre><?php echo $errtxt?></pre>
+                    </blockquote>
+                    <p>
+                    <?php echo $hidden_fields?>
+                    <input type=submit name=submit value=Back>
+                    <p>
+                </form>
+                <?php
+                printFooter();
+                break;
+                } else {
+                    $serial = $errtxt;
+                }
+            }
+        }
+    
+        if ($submit == "Yes  Create and Download") {
+            switch ($cert_type) {
+                case 'server':
+        #               upload(array("$config[private_dir]/$serial-key.pem","$config[new_certs_dir]/$serial.pem",$config['cacert_pem']), "$common_name ($email).pem",'application/pkix-cert');
+                    upload(array($config['private_dir'] . "/$serial-key.pem",$config['new_certs_dir'] . "/$serial.pem",$config['cacert_pem']), $rec['common_name'] . "-Bundle.pem", 'application/pkix-cert');
+                    break;
+                case 'email':
+                case 'email_signing':
+                case 'time_stamping':
+                case 'vpn_client_server':
+                case 'vpn_client':
+                case 'vpn_server':
+        #               upload("$config[pfx_dir]/$serial.pfx", "$common_name ($email).p12", 'application/x-pkcs12');
+                    upload($config['pfx_dir'] . "/$serial.pfx", $rec['common_name'] . ".p12", 'application/x-pkcs12');
+                    break;
+            }
+        
+            # Clear common_name fields
+            $common_name = '';
+            break;
+        }
+    
+    # Clear common_name fields
+        $common_name = '';
+
+    // We could add 'return to index or create another certificate'
+
+    default:
+        #
+        # Default fields to reasonable values if necessary.
+        #
+        if (! $submit and file_exists($user_cnf)) {
+            include($user_cnf);
+        }
+
+        if (! $country) {
+            $country = $config['country'];
+        }
+        if (! $province) {
+            $province = $config['province'];
+        }
+        if (! $locality) {
+            $locality = "";
+        }
+        if (! $organization) {
+            $organization = "";
+        }
+        if (! $unit) {
+            $unit = "";
+        }
+        if (! $email) {
+            $email = "";
+        }
+        if (! $expiry) {
+            $expiry = 1;
+        }
+        if (! $keysize) {
+            $keysize = 2048;
+        }
+        if (! $cert_type) {
+            $cert_type = 'email';
+        }
+        if (! $dns_names) {
+            $dns_names = "";
+        }
+        if (! $ip_addr) {
+            $ip_addr = "";
+        }
+
+        printHeader();
+        ?>
+    
+        <body onLoad="self.focus();document.request.common_name.focus();document.request.cert_type.onchange();">
+        <form action="<?php echo $PHP_SELF?>" method=post name=request>
+        <table width=99%>
+        <th colspan=2><h3>Certificate Request Form</h3></th>
+    
+        <tr>
+        <td width=30%>Common Name<font color=red size=3> *</font><br>(i.e. User real name or computer hostname - used as SubjectAltName)</td>
+        <td><input type=text name=common_name value="<?php echo  htvar($common_name)?>" size=50 maxlength=60></td>
+        </tr>
+    
+        <tr>
+        <td>E-mail Address<font color=red size=3> *</font></td>
+        <td><input type=text name=email value="<?php echo htvar($email)?>" size=50 maxlength=60></td>
+        </tr>
+    
+        <tr>
+        <td>Organization (Company/Agency)<font color=red size=3> *</font></td>
+        <td><input type=text name=organization value="<?php echo htvar($organization)?>" size=60 maxlength=60></td>
+        </tr>
+    
+        <tr>
+        <td>Department/Unit<font color=red size=3> *</font> </td><td><input type=text name=unit value="<?php echo  htvar($unit) ?>" size=40 maxlength=60></td>
+        </tr>
+    
+        <tr>
+        <td>Locality (City/County)<font color=red size=3> *</font></td><td><input type=text name=locality value="<?php echo  htvar($locality) ?>" size=30 maxlength=30></td>
+        </tr>
+    
+        <tr>
+        <td>State/Province<font color=red size=3> *</font></td><td><input type=text name=province value="<?php echo  htvar($province) ?>" size=30 maxlength=30></td>
+        </tr>
+    
+        <tr>
+        <td>Country<font color=red size=3> *</font></td>
+        <td><input type=text name=country value="<?php echo  htvar($country) ?>" size=2 maxlength=2></td>
+        </tr>
+    
+        <tr>
+        <td>Certificate Password<font color=red size=3> *</font><br>(Min 8 chars - Mandatory for Email,SSL Client,Code signing)</td>
+        <td><input type=password name=passwd value="<?php echo  htvar($passwd) ?>" size=30>&nbsp;&nbsp; Again <input type=password name=passwdv  value="<?php echo  htvar($passwdv) ?>" size=30></td>
+        </tr>
+    
+        <tr>
+        <td>Certificate Life<font color=red size=3>*</font> </td>
+        <td><select name=expiry>
+
+        <?php
+        print "<option value=0.083 " . ($expiry == 1 ? "selected='selected'" : "") . " >1 Month</option>\n" ;
+        print "<option value=0.25 " . ($expiry == 1 ? "selected='selected'" : "") . " >3 Months</option>\n" ;
+        print "<option value=0.5 " . ($expiry == 1 ? "selected='selected'" : "") . " >6 Months</option>\n" ;
+        print "<option value=1 " . ($expiry == 1 ? "selected='selected'" : "") . " >1 Year</option>\n" ;
+        for ($i = 2; $i <= 5; $i++) {
+            print "<option value=$i " . ($expiry == $i ? "selected='selected'" : "") . " >$i Years</option>\n" ;
+        }
+    
+        ?>
+    
+        </select></td>
+        </tr>
+    
+        <tr>
+        <td>Key Size<font color=red size=3>*</font> </td>
+        <td><select name=keysize>
+        <?php
+        for ($i = 512; $i <= 4096; $i+= 512) {
+            print "<option value=$i " . ($keysize == $i ? "selected='selected'" : "") . ">$i bits</option>\n" ;
+        }
+        ?>
+    
+        </select></td>
+        </tr>
+    
+        <tr>
+        <td>Certificate Use:<font color=red size=3>*</font> </td>
+        <td><select name=cert_type onchange="if (this.value=='server')
+            {setVisibility('testrow1',true);setVisibility('testrow2',true);} else {setVisibility('testrow1',false);setVisibility('testrow2',false);}">
+        <?php
+        print '<option value="email" '.($cert_type=='email'?'selected':'').'>E-mail, SSL Client</option>';
+        print '<option value="email_signing" '.($cert_type=='email_signing'?'selected':'').'>E-mail, SSL Client, Code Signing</option>';
+        print '<option value="server" '.($cert_type=='server'?'selected':'').'>SSL Server</option>';
+        print '<option value="vpn_client" '.($cert_type=='vpn_client'?'selected':'').'>VPN Client Only</option>';
+        print '<option value="vpn_server" '.($cert_type=='vpn_server'?'selected':'').'>VPN Server Only</option>';
+        print '<option value="vpn_client_server" '.($cert_type=='vpn_client_server'?'selected':'').'>VPN Client, VPN Server</option>';
+        print '<option value="time_stamping" '.($cert_type=='time_stamping'?'selected':'').'>Time Stamping</option>';
+        ?>
+        </select></td>
+        </tr>
+    
+        <tr id="testrow2" name="testrow2" style="visibility:hidden;display:none;">
+        <td>Alternative DNS Names<br>(only one per Line)</td><td><textarea name=dns_names cols=30 rows=5><?php echo htvar($dns_names) ?></textarea></td>
+        </tr>
+    
+        <tr id="testrow1" name="testrow1" style="visibility:hidden;display:none;">
+        <td>IP's<br>(only one per Line)</td><td><textarea name=ip_addr cols=30 rows=5><?php echo htvar($ip_addr) ?></textarea></td>
+        </tr>
+        <tr>
+            <td>&nbsp</td>
+            <td>&nbsp</td>
+        </tr>
+        <tr>
+        <td><font color=red size=3>* Fields are required</td><td><input type=submit name=submit value='Submit Request'><input type=hidden name=form_stage value='validate'></td>
+        </tr>
+        </table>
+        </form>
+    <?php
+    printFooter();
 }
 
 ?>
diff -ruN phpki-ng.old/phpki-ng-0.84/config.php phpki-ng/phpki-ng-0.84/config.php
--- phpki-ng.old/phpki-ng-0.84/config.php       2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/config.php   2021-03-07 19:33:03.073323741 +0100
@@ -1,3 +1,2 @@
 <?php
-define("PHPKI_VERSION", "0.83");
-?>
+define("PHPKI_VERSION", "0.84");
diff -ruN phpki-ng.old/phpki-ng-0.84/css/style.css phpki-ng/phpki-ng-0.84/css/style.css
--- phpki-ng.old/phpki-ng-0.84/css/style.css    2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/css/style.css        2021-03-07 19:33:03.073323741 +0100
@@ -1,171 +1,171 @@
-h1 {
-    font-size: 32px;
-}
-
-h2 {
-    font-size: 24px;
-}
-
-h3 {
-    font-size: 18px;
-}
-
-body {
-    margin: 10px;
-    padding: 0;
-    background: #fafaff;
-    font-family: Arial, Veranda, Helvetica, sans-serif;
-    font-size: 14px;
-}
-
-img {
-    border: 0;
-}
-
-a {
-    color: #00F;
-    background-color: transparent;
-}
-
-a:link, a:active, a:visited {
-    color: #00F;
-    background-color: transparent;
-}
-
-a.headermenu:link, a.headermenu:active, a.headermenu:visited {
-    text-decoration: underline;
-    color: #00F;
-    background-color: transparent;
-    padding-left: 8px;
-}
-
-form {
-    padding: 0;
-    margin: 0;
-}
-
-fieldset {
-    border: 2px solid black;
-    margin-left: 10px;
-    padding: 10px;
-    width: 700px;
-    font-size: 10px;
-}
-
-legend {
-    background-color: rgb(200, 220, 240);
-    border: 2px solid black;
-    padding: 0.25em;
-    padding-top: 0.1em;
-    font-size: 12px;
-}
-
-table {
-    font-size: 12px;
-    margin-right: .1in;
-}
-
-th {
-    font-weight: bold;
-    background-color: #AFC3E4;
-    padding: 3px;
-    color: #323C4D;
-    text-align: center;
-    vertical-align: middle;
-    border: 1px solid #606060;
-    white-space: nowrap;
-}
-
-td {
-    background-color: #DEE3EC;
-    padding: 3px;
-    text-align: left;
-    vertical-align: middle;
-    border: 1px solid #a0a0a0;
-}
-
-.menu {
-    height: 22px;
-    font-size: 13px;
-    text-align: center;
-    vertical-align: bottom;
-    border: 1px solid #808080;
-    border-left: 2px solid #808080;
-    border-bottom: 2px solid #808080;
-    color: #000000;
-}
-
-.menu-pad {
-    height: 22px;
-    font-size: 13px;
-    text-align: center;
-    padding-left: 1em;
-    padding-right: 1em;
-    vertical-align: bottom;
-    border: 1px solid #808080;
-    border-left: 2px solid #808080;
-    border-bottom: 2px solid #808080;
-    color: #000000;
-}
-
-.menu a {
-    vertical-align: bottom;
-    text-decoration: none;
-    font-size: 13px;
-}
-
-.headermenu-ie {
-    text-align: center;
-    margin-right: 0.1in;
-    margin-top: 0.20in;
-}
-
-.headermenu-konq {
-    text-align: center;
-    margin-right: 0.1in;
-    margin-top: 0.25in;
-}
-
-.logo-ie {
-    font-family: 'impact', sans-serif;
-    font-size: 60pt;
-    font-weight: bold;
-    color: #99caff;
-    margin-top: -0.20in;
-    margin-bottom: 0;
-    margin-right: 0.2in;
-    text-align: left;
-}
-
-.title-ie {
-    font-family: 'impact', sans-serif;
-    font-size: 22pt;
-    font-weight: bold;
-    font-style: italic;
-    margin-right: 0.4in;
-    margin-top: -0.52in;
-    margin-bottom: 0;
-    text-align: left;
-}
-
-.logo-konq {
-    font-family: 'impact', sans-serif;
-    font-size: 62pt;
-    font-weight: bold;
-    color: #99caff;
-    margin-top: -0.20in;
-    margin-bottom: 0;
-    margin-right: 0.2in;
-    text-align: left;
-}
-
-.title-konq {
-    font-family: 'impact', 'sans-serif';
-    font-size: 24pt;
-    font-weight: bold;
-    font-style: italic;
-    margin-right: 0.4in;
-    margin-top: -0.55in;
-    margin-bottom: 0;
-    text-align: left;
-}
+h1 {
+  font-size: 32px;
+}
+
+h2 {
+  font-size: 24px;
+}
+
+h3 {
+  font-size: 18px;
+}
+
+body {
+  margin: 10px;
+  padding: 0;
+  background: #fafaff;
+  font-family: Arial, Veranda, Helvetica, sans-serif;
+  font-size: 14px;
+}
+
+img {
+  border: 0;
+}
+
+a {
+  color: #00F;
+  background-color: transparent;
+}
+
+a:link, a:active, a:visited {
+  color: #00F;
+  background-color: transparent;
+}
+
+a.headermenu:link, a.headermenu:active, a.headermenu:visited {
+  text-decoration: underline;
+  color: #00F;
+  background-color: transparent;
+  padding-left: 8px;
+}
+
+form {
+  padding: 0;
+  margin: 0;
+}
+
+fieldset {
+  border: 2px solid black;
+  margin-left: 10px;
+  padding: 10px;
+  width: 700px;
+  font-size: 10px;
+}
+
+legend {
+  background-color: rgb(200, 220, 240);
+  border: 2px solid black;
+  padding: 0.25em;
+  padding-top: 0.1em;
+  font-size: 12px;
+}
+
+table {
+  font-size: 12px;
+  margin-right: .1in;
+}
+
+th {
+  font-weight: bold;
+  background-color: #AFC3E4;
+  padding: 3px;
+  color: #323C4D;
+  text-align: center;
+  vertical-align: middle;
+  border: 1px solid #606060;
+  white-space: nowrap;
+}
+
+td {
+  background-color: #DEE3EC;
+  padding: 3px;
+  text-align: left;
+  vertical-align: middle;
+  border: 1px solid #a0a0a0;
+}
+
+.menu {
+  height: 22px;
+  font-size: 13px;
+  text-align: center;
+  vertical-align: bottom;
+  border: 1px solid #808080;
+  border-left: 2px solid #808080;
+  border-bottom: 2px solid #808080;
+  color: #000000;
+}
+
+.menu-pad {
+  height: 22px;
+  font-size: 13px;
+  text-align: center;
+  padding-left: 1em;
+  padding-right: 1em;
+  vertical-align: bottom;
+  border: 1px solid #808080;
+  border-left: 2px solid #808080;
+  border-bottom: 2px solid #808080;
+  color: #000000;
+}
+
+.menu a {
+  vertical-align: bottom;
+  text-decoration: none;
+  font-size: 13px;
+}
+
+.headermenu-ie {
+  text-align: center;
+  margin-right: 0.1in;
+  margin-top: 0.20in;
+}
+
+.headermenu-konq {
+  text-align: center;
+  margin-right: 0.1in;
+  margin-top: 0.25in;
+}
+
+.logo-ie {
+  font-family: 'impact', sans-serif;
+  font-size: 60pt;
+  font-weight: bold;
+  color: #99caff;
+  margin-top: -0.20in;
+  margin-bottom: 0;
+  margin-right: 0.2in;
+  text-align: left;
+}
+
+.title-ie {
+  font-family: 'impact', sans-serif;
+  font-size: 22pt;
+  font-weight: bold;
+  font-style: italic;
+  margin-right: 0.4in;
+  margin-top: -0.52in;
+  margin-bottom: 0;
+  text-align: left;
+}
+
+.logo-konq {
+  font-family: 'impact', sans-serif;
+  font-size: 62pt;
+  font-weight: bold;
+  color: #99caff;
+  margin-top: -0.20in;
+  margin-bottom: 0;
+  margin-right: 0.2in;
+  text-align: left;
+}
+
+.title-konq {
+  font-family: 'impact', 'sans-serif';
+  font-size: 24pt;
+  font-weight: bold;
+  font-style: italic;
+  margin-right: 0.4in;
+  margin-top: -0.55in;
+  margin-bottom: 0;
+  text-align: left;
+}
diff -ruN phpki-ng.old/phpki-ng-0.84/gen_crl.php phpki-ng/phpki-ng-0.84/gen_crl.php
--- phpki-ng.old/phpki-ng-0.84/gen_crl.php      2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/gen_crl.php  2021-03-07 19:33:03.074323756 +0100
@@ -10,5 +10,3 @@
 include('../html/include/openssl_functions.php') ;
 
 CA_generate_crl();
-
-?>
diff -ruN phpki-ng.old/phpki-ng-0.84/help/cacert_install_ie.html phpki-ng/phpki-ng-0.84/help/cacert_install_ie.html
--- phpki-ng.old/phpki-ng-0.84/help/cacert_install_ie.html      2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/help/cacert_install_ie.html  2021-03-07 19:33:03.074323756 +0100
@@ -1,29 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
 <html>
 <head>
-<title>Root Certificate Installation for Outlook & Outlook Express</title> 
-<link rel='stylesheet' type='text/css' href='../css/style.css'>
+  <title>Root Certificate Installation for Outlook &amp; Outlook Express</title>
+  <link rel='stylesheet' type='text/css' href='../css/style.css'>
 </head>
+
 <body>
-<center><h1>Root Certificate Installation for Outlook & Outlook Express</h1>
-<h2>A Step-by-Step Guide</h2></center><br>
-<h4>
-<p><img src=../images/right-click-install-cacert.jpg>
-<p>Open the folder which holds the certificates you have downloaded.<br>
-Right-click on the certificate you wish to install, and select
-<cite>Install Certificate</cite> from the context menu.
-<p><br><img src=../images/cert-wizard1-welcome.jpg >
-<p>Click the <cite>Next</cite> button in the <cite>Certificate Wizard</cite> 
-welcome window.
-<p><br><img src=../images/cert-wizard4-select-store.jpg>
-<p>Click the <cite>Next</cite> button in the <cite>Select a Certificate Store</cite> window.
-<p><br><img src=../images/cert-wizard5-root-final.jpg>
-<p>Click the <cite>Finish</cite> button in the <cite>Complete the Certificate..</cite> window.
-<p><br><img src=../images/confirm-install-cacert.jpg>
-<p>You may be asked to confirm the root certificate installation.  Click the <cite>Yes</cite> button if a window like this appears.
-<p><br><img src=../images/import-successful.jpg>
-<p>Windows confirms the root certificate was successfully imported.<br>
-You may now <a href=usercert_install_ie.html>install your personal e-mail certificate</a>.
+  <center>
+    <h1>Root Certificate Installation for Outlook &amp; Outlook Express</h1>
+
+    <h2>A Step-by-Step Guide</h2>
+  </center><br>
+
+  <p><img src="../images/right-click-install-cacert.jpg"></p>
+
+  <p>Open the folder which holds the certificates you have downloaded.<br>
+  Right-click on the certificate you wish to install, and select <cite>Install Certificate</cite> from the context menu.</p>
+
+  <p><br>
+  <img src="../images/cert-wizard1-welcome.jpg"></p>
+
+  <p>Click the <cite>Next</cite> button in the <cite>Certificate Wizard</cite> welcome window.</p>
+
+  <p><br>
+  <img src="../images/cert-wizard4-select-store.jpg"></p>
+
+  <p>Click the <cite>Next</cite> button in the <cite>Select a Certificate Store</cite> window.</p>
+
+  <p><br>
+  <img src="../images/cert-wizard5-root-final.jpg"></p>
+
+  <p>Click the <cite>Finish</cite> button in the <cite>Complete the Certificate..</cite> window.</p>
+
+  <p><br>
+  <img src="../images/confirm-install-cacert.jpg"></p>
+
+  <p>You may be asked to confirm the root certificate installation. Click the <cite>Yes</cite> button if a window like this appears.</p>
+
+  <p><br>
+  <img src="../images/import-successful.jpg"></p>
 
-</h4>
+  <p>Windows confirms the root certificate was successfully imported.<br>
+  You may now <a href="usercert_install_ie.html">install your personal e-mail certificate</a>.</p>
 </body>
 </html>
diff -ruN phpki-ng.old/phpki-ng-0.84/help/glossary.html phpki-ng/phpki-ng-0.84/help/glossary.html
--- phpki-ng.old/phpki-ng-0.84/help/glossary.html       2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/help/glossary.html   2021-03-07 19:33:03.075323772 +0100
@@ -1,144 +1,169 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
 <html>
 <head>
-<title>PHPki Glossary</title>
-<link rel='stylesheet' type='text/css' href='../css/style.css'>
+  <title>PHPki Glossary</title>
+  <link rel='stylesheet' type='text/css' href='../css/style.css'>
 </head>
-<body>
 
-<a name=TOP></a>
-<a name=PKI></a><p>
-<table>
-<th><h2>PUBLIC KEY INFRASTRUCTURE</h2></th>
-<tr><td>
-PKI stands for <cite>Public Key Infrastructure</cite>. PKI is IT infrastructure that enables users of a basically unsecure public network (such as the Internet) to securely and privately exchange data through the use of a public and a private <a href=#KEYS>cryptographic key pair</a> that is obtained and shared through a trusted authority. 
-
-PKI is not only software or hardware. It is an infrastructure.  So, PKI is a combination of products, services, facilities, policies, procedures, agreements, and people.  All of these elements work together to provide for secure interactions on the Internet and other open networks. PKI is not a single monolithic entity, but a distributed system.   The component elements may include multiple organization-specific public key infrastructures that are interoperable and interconnected.
-</td></tr>
-</table>
-
-<a name=CERTIFICATE></a><p>
-<table>
-<th><h2>DIGITAL CERTIFICATE</h2></th>
-<tr><td>
-<p>
-An attachment to an electronic message used for security purposes. The most common use of a digital certificate is to verify that a user sending a message is who he or she claims to be, and to provide the receiver with the means to encode a reply. 
-
-<p>An individual wishing to send an encrypted message applies for a digital certificate from a <a href=#CA>Certificate Authority (CA)</a>. The CA issues an encrypted digital certificate containing the applicant's <a href=#KEYS>public key</a> and a variety of other identification information. The CA makes its own public key readily available through print publicity or perhaps on the Internet. 
-
-<p>The recipient of an encrypted message uses the CA's public key to decode the digital certificate attached to the message, verifies it as issued by the CA and then obtains the sender's public key and identification information held within the certificate. With this information, the recipient can send an encrypted reply. 
-
-<p>The most widely used standard for digital certificates is X.509. 
-</td></tr>
-</table>
-
-<a name=CA></a><p>
-<table>
-<th><h2>CERTIFICATE AUTHORITY</h2></th>
-<tr><td>
-A trusted third-party organization or company that issues digital certificates used to create digital signatures and <a href=#KEYS>public-private key pairs</a>. The role of the CA in this process is to guarantee that the individual granted the unique certificate is, in fact, who he or she claims to be. Usually, this means that the CA has an arrangement with a financial institution, such as a credit card company, which provides it with information to confirm an individual's claimed identity. CAs are a critical component in data security and electronic commerce because they guarantee that the two parties exchanging information are really who they claim to be. 
-</td></tr>
-</table>
-
-<a name=KEYS></a><p>
-<table>
-<th><h2>PUBLIC KEY ENCRYPTION</h2></th>
-<tr><td>
-A cryptographic system that uses two keys -- a public key known to everyone and a private or secret key known only to the recipient of the message. When John wants to send a secure message to Jane, he uses Jane's public key to encrypt the message. Jane then uses her private key to decrypt it. 
-
-<p>An important element to the public key system is that the public and private keys are related in such a way that only the public key can be used to encrypt messages and only the corresponding private key can be used to decrypt them. Moreover, it is virtually impossible to deduce the private key if you know the public key. 
-</td></tr>
-</table>
-
-<a name=SMIME></a><p>
-<table>
-<th><h2>S/MIME</h2></th>
-<tr><td>
-S/MIME (Secure Multi-Purpose Internet Mail Extensions) is a secure method of sending e-mail that uses the <a href=#RSA>RSA</a> encryption system. S/MIME is included in the latest versions of the Web browsers from Microsoft and Netscape and has also been endorsed by other vendors that make messaging products. RSA has proposed S/MIME as a standard to the Internet Engineering Task Force (IETF). 
-</td></tr>
-</table>
-
-<a name=RSA></a><p>
-<table>
-<th><h2>RSA</h2></th>
-<tr><td>
-RSA is an Internet encryption and authentication system that uses an algorithm developed in 1977 by Ron Rivest, Adi Shamir, and Leonard Adleman. The RSA algorithm is the most commonly used encryption and authentication algorithm and is included as part of the Web browsers from Microsoft and Netscape. It's also part of Lotus Notes, Intuit's Quicken, and many other products. The encryption system was owned by RSA Security, but a recent patent expiration placed it into the public domain. The technologies are part of existing or proposed Web, Internet, and computing standards. 
-</td></tr>
-</table>
-
-<a name=ROOT-CERT></a><p>
-<table>
-<th><h2>ROOT CERTIFICATE</h2></th>
-<tr><td>
-A root certificate is like a MASTER
-<a href=#CERTIFICATE>digital certificate</a>.
-You must install a <a href=#CA>certificate authority's</a> root certificate
-before you can trust other certificates issued by that same certificate
-authority.  Root certificates are used to "sign" other certificates.  
-A signature by a root certificate is somewhat analogous to "notarizing" a
-document in the physical world.  When you install a root certificate on your
-computer, you are saying you "trust" that certification authority and all
-certificates it signs.
-</td></tr>
-</table>
-
-<a name=SIGNATURE></a><p>
-<table>
-<th><h2>DIGITAL SIGNATURE</h2></th>
-<tr><td>
-A digital code that can be attached to an electronically transmitted message 
-that uniquely identifies the sender. Like a written signature, the purpose of
-a digital signature is to guarantee that the individual sending the message
-really is who he or she claims to be.  Digital certificates inherently provide
-digital signature capability to most S/MIME enable e-mail clients. Digitally
-signing an e-mail usually provides the recipient the with the sender's public
-key, so the recipient may then send encrypted e-mail back to the sender.
-</td></tr>
-</table>
-
-<a name=X509></a><p>
-<table>
-<th><h2>X.509</h2></th>
-<tr><td>
-The most widely used standard for defining digital certificates. X.509 is 
-actually an ITU Recommendation, which means that has not yet been officially 
-defined or approved. As a result, companies have implemented the standard in 
-different ways. For example, both Netscape and Microsoft use X.509 certificates
-to implement SSL in their web servers and browsers. But an X.509 certificate 
-generated by Netscape may not be readable by Microsoft products, and vice 
-versa.
-</td></tr>
-</table>
-
-<a name=PEM></a><p>
-<table>
-<th><h2>PEM</h2></th>
-<tr><td>
-PEM is a widely used standard for storing digital certificates.  
-A PEM encoded file can contain all of private keys, public keys, and 
-<a href=#X509>(x.509)</a> certificates. It is the default format for OpenSSL.
-It stores data in Base64 encoded format, surrounded by ascii headers, so it is 
-suitable for text mode transfers between systems. PEM files usually end with
-a <cite>.PEM</cite> extension.
-</td></tr>
-</table>
-
-<a name=DER></a><p>
-<table>
-<th><h2>DER</h2></th>
-<tr><td>
-DER is a widely used standard for storing digital certificates. A DER encoded
-file can contain all of private keys, public keys, and <a href=#X509>(x.509)</a>
-certificates.  DER is a binary encoded headerless format.  DER files usually
-end with a <cite>.CRT</cite> or <cite>.CER</cite> extension.
-</td></tr>
-</table>
-
-<a name=PKCS12></a><p>
-<table>
-<th><h2>PKCS #12</h2></th>
-<tr><td>
-PKCS #12 (a.k.a. Personal Information Exchange Standard) is a standard for storing private keys and certificates securely (well sort of). It is used in (among other things) Netscape and Microsoft Internet Explorer with their import and export options. PKCS12 files usually end with a <cite>.PFX</cite> extension.
-</td></tr>
-</table>
+<body>
+  <a name="TOP" id="TOP"></a> <a name="PKI" id="PKI"></a>
 
-<br><br></body></html>
+  <table>
+    <tr>
+      <th>
+        <h2>PUBLIC KEY INFRASTRUCTURE</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>PKI stands for <cite>Public Key Infrastructure</cite>. PKI is IT infrastructure that enables users of a basically unsecure public network (such as the Internet) to securely and privately exchange data through the use of a public and a private <a href="#KEYS">cryptographic key pair</a> that is obtained and shared through a trusted authority. PKI is not only software or hardware. It is an infrastructure. So, PKI is a combination of products, services, facilities, policies, procedures, agreements, and people. All of these elements work together to provide for secure interactions on the Internet and other open networks. PKI is not a single monolithic entity, but a distributed system. The component elements may include multiple organization-specific public key infrastructures that are interoperable and interconnected.</td>
+    </tr>
+  </table><a name="CERTIFICATE" id="CERTIFICATE"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>DIGITAL CERTIFICATE</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>
+        <p>An attachment to an electronic message used for security purposes. The most common use of a digital certificate is to verify that a user sending a message is who he or she claims to be, and to provide the receiver with the means to encode a reply.</p>
+
+        <p>An individual wishing to send an encrypted message applies for a digital certificate from a <a href="#CA">Certificate Authority (CA)</a>. The CA issues an encrypted digital certificate containing the applicant's <a href="#KEYS">public key</a> and a variety of other identification information. The CA makes its own public key readily available through print publicity or perhaps on the Internet.</p>
+
+        <p>The recipient of an encrypted message uses the CA's public key to decode the digital certificate attached to the message, verifies it as issued by the CA and then obtains the sender's public key and identification information held within the certificate. With this information, the recipient can send an encrypted reply.</p>
+
+        <p>The most widely used standard for digital certificates is X.509.</p>
+      </td>
+    </tr>
+  </table><a name="CA" id="CA"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>CERTIFICATE AUTHORITY</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>A trusted third-party organization or company that issues digital certificates used to create digital signatures and <a href="#KEYS">public-private key pairs</a>. The role of the CA in this process is to guarantee that the individual granted the unique certificate is, in fact, who he or she claims to be. Usually, this means that the CA has an arrangement with a financial institution, such as a credit card company, which provides it with information to confirm an individual's claimed identity. CAs are a critical component in data security and electronic commerce because they guarantee that the two parties exchanging information are really who they claim to be.</td>
+    </tr>
+  </table><a name="KEYS" id="KEYS"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>PUBLIC KEY ENCRYPTION</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>
+        <p>A cryptographic system that uses two keys -- a public key known to everyone and a private or secret key known only to the recipient of the message. When John wants to send a secure message to Jane, he uses Jane's public key to encrypt the message. Jane then uses her private key to decrypt it.</p>
+
+        <p>An important element to the public key system is that the public and private keys are related in such a way that only the public key can be used to encrypt messages and only the corresponding private key can be used to decrypt them. Moreover, it is virtually impossible to deduce the private key if you know the public key.</p>
+      </td>
+    </tr>
+  </table><a name="SMIME" id="SMIME"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>S/MIME</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>S/MIME (Secure Multi-Purpose Internet Mail Extensions) is a secure method of sending e-mail that uses the <a href="#RSA">RSA</a> encryption system. S/MIME is included in the latest versions of the Web browsers from Microsoft and Netscape and has also been endorsed by other vendors that make messaging products. RSA has proposed S/MIME as a standard to the Internet Engineering Task Force (IETF).</td>
+    </tr>
+  </table><a name="RSA" id="RSA"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>RSA</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>RSA is an Internet encryption and authentication system that uses an algorithm developed in 1977 by Ron Rivest, Adi Shamir, and Leonard Adleman. The RSA algorithm is the most commonly used encryption and authentication algorithm and is included as part of the Web browsers from Microsoft and Netscape. It's also part of Lotus Notes, Intuit's Quicken, and many other products. The encryption system was owned by RSA Security, but a recent patent expiration placed it into the public domain. The technologies are part of existing or proposed Web, Internet, and computing standards.</td>
+    </tr>
+  </table><a name="ROOT-CERT" id="ROOT-CERT"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>ROOT CERTIFICATE</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>A root certificate is like a MASTER <a href="#CERTIFICATE">digital certificate</a>. You must install a <a href="#CA">certificate authority's</a> root certificate before you can trust other certificates issued by that same certificate authority. Root certificates are used to "sign" other certificates. A signature by a root certificate is somewhat analogous to "notarizing" a document in the physical world. When you install a root certificate on your computer, you are saying you "trust" that certification authority and all certificates it signs.</td>
+    </tr>
+  </table><a name="SIGNATURE" id="SIGNATURE"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>DIGITAL SIGNATURE</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>A digital code that can be attached to an electronically transmitted message that uniquely identifies the sender. Like a written signature, the purpose of a digital signature is to guarantee that the individual sending the message really is who he or she claims to be. Digital certificates inherently provide digital signature capability to most S/MIME enable e-mail clients. Digitally signing an e-mail usually provides the recipient the with the sender's public key, so the recipient may then send encrypted e-mail back to the sender.</td>
+    </tr>
+  </table><a name="X509" id="X509"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>X.509</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>The most widely used standard for defining digital certificates. X.509 is actually an ITU Recommendation, which means that has not yet been officially defined or approved. As a result, companies have implemented the standard in different ways. For example, both Netscape and Microsoft use X.509 certificates to implement SSL in their web servers and browsers. But an X.509 certificate generated by Netscape may not be readable by Microsoft products, and vice versa.</td>
+    </tr>
+  </table><a name="PEM" id="PEM"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>PEM</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>PEM is a widely used standard for storing digital certificates. A PEM encoded file can contain all of private keys, public keys, and <a href="#X509">(x.509)</a> certificates. It is the default format for OpenSSL. It stores data in Base64 encoded format, surrounded by ascii headers, so it is suitable for text mode transfers between systems. PEM files usually end with a <cite>.PEM</cite> extension.</td>
+    </tr>
+  </table><a name="DER" id="DER"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>DER</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>DER is a widely used standard for storing digital certificates. A DER encoded file can contain all of private keys, public keys, and <a href="#X509">(x.509)</a> certificates. DER is a binary encoded headerless format. DER files usually end with a <cite>.CRT</cite> or <cite>.CER</cite> extension.</td>
+    </tr>
+  </table><a name="PKCS12" id="PKCS12"></a>
+
+  <table>
+    <tr>
+      <th>
+        <h2>PKCS #12</h2>
+      </th>
+    </tr>
+
+    <tr>
+      <td>PKCS #12 (a.k.a. Personal Information Exchange Standard) is a standard for storing private keys and certificates securely (well sort of). It is used in (among other things) Netscape and Microsoft Internet Explorer with their import and export options. PKCS12 files usually end with a <cite>.PFX</cite> extension.</td>
+    </tr>
+  </table><br>
+  <br>
+</body>
+</html>
diff -ruN phpki-ng.old/phpki-ng-0.84/help/PKI_basics.html phpki-ng/phpki-ng-0.84/help/PKI_basics.html
--- phpki-ng.old/phpki-ng-0.84/help/PKI_basics.html     2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/help/PKI_basics.html 2021-03-07 19:33:03.075323772 +0100
@@ -1,64 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
 <html>
 <head>
-<link rel='stylesheet' type='text/css' href='../css/style.css'>
-<title>PKI and E-mail Encryption - A Brief Explanation</title>
+  <link rel='stylesheet' type='text/css' href='../css/style.css'>
+
+  <title>PKI and E-mail Encryption - A Brief Explanation</title>
 </head>
+
 <body>
-<center><h1>PKI and E-mail Encryption - A Brief Explanation</h2></center>
+  <center>
+    <h1>PKI and E-mail Encryption - A Brief Explanation</h1>
+  </center>
+
+  <p>PKI stands for <cite>Public Key Infrastructure</cite>. PKI is Information Technology infrastructure that enables users of a basically unsecure public network (such as the Internet) to securely and privately exchange data through the use of a <a href="glossary.html#KEYS" target="glossary">public and a private cryptographic key pair</a> that is obtained and shared through a <a href="glossary.html#CA" target="glossary">trusted Authority</a>.</p>
+
+  <p>Public and private keys are like two halves of a single key. PKI encryption algorithms are designed such that a public key is used to encrypt or "lock" a message, and only the complementary private key can "unlock" that message. Think of a bank vault or safe that can only be unlocked by two individuals using two different but complementary keys. Neither of those keys can be used by itself to unlock the vault.</p>
+
+  <p>In practice, individuals wishing to exchange encrypted e-mail will agree to mutually trust one or more <a href="glossary.html#CA" target="glossary">Certificate Authorities(CA)</a> by downloading and installing each trusted Authority's <a href="glossary.html#ROOT-CERT" target="glossary">root certificate</a> on their computers. They will each obtain their own personal <a href="glossary.html#CERTIFICATE" target="glossary">digital certificate</a> from a trusted Certificate Authority, and install them on their respective computers. Because they mutually trust the Certificate Authorities, they trust each other's digital certificates. More specifically, they trust the <a href="glossary.html#KEYS" target="glossary">public keys</a> contained within their personal digital certificates which have been <a href="glossary.html#SIGNATURE" target="glossary">digitally signed</a> by a trusted Certificate Authority. They will then exchange their trusted public keys by sending each other digitally
+  signed e-mail messages. Once each party has the other's public key, they may exchange trusted and encrypted messsages.</p>
+
+  <p>Public key exchange and encryption is like exchanging notarized documents. One trusts a notarized document because a trusted third party, the Notary Public, has signed it. The Certificate Authority is the Notary Public, and the public keys are the documents.</p>
 
-PKI stands for <cite>Public Key Infrastructure</cite>. PKI is Information 
-Technology infrastructure that enables users of a basically unsecure public 
-network (such as the Internet) to securely and privately exchange data through 
-the use of a <a href=glossary.html#KEYS target=glossary>public and a private 
-cryptographic key pair</a> that is obtained and shared through a 
-<a href=glossary.html#CA target=glossary>trusted Authority</a>.
-
-<p>
-Public and private keys are like two halves of a single key.  PKI encryption
-algorithms are designed such that a public key is used to encrypt or
-"lock" a message, and only the complementary private key can "unlock" that
-message.
-Think of a bank vault or safe that can only be unlocked by two individuals 
-using two different but complementary keys. Neither of those keys can be used
-by itself to unlock the vault.
-
-<p>
-In practice, individuals wishing to exchange encrypted e-mail
-will agree to mutually trust one or more <a href=glossary.html#CA target=glossary>
-Certificate Authorities(CA)</a> by downloading and installing each trusted Authority's 
-<a href=glossary.html#ROOT-CERT target=glossary>root certificate</a> on their computers.
-They will each obtain their own personal 
-<a href=glossary.html#CERTIFICATE target=glossary>digital certificate</a>
-from a trusted Certificate Authority, and install them on their
-respective computers.
-Because they mutually trust the Certificate Authorities, they trust each other's
-digital certificates.  More specifically, they trust the 
-<a href=glossary.html#KEYS target=glossary>public keys</a> contained within
-their personal digital certificates which have been 
-<a href=glossary.html#SIGNATURE target=glossary>digitally signed</a> by a
-trusted Certificate Authority.
-They will then exchange their trusted public keys by sending each other 
-digitally signed e-mail messages.  Once each party has the other's public key,
-they may exchange trusted and encrypted messsages.  
-
-<p>
-Public key exchange and encryption is like exchanging notarized documents.
-One trusts a notarized document because a trusted third party, the Notary 
-Public, has signed it.  The Certificate Authority is the Notary Public, and
-the public keys are the documents.
-
-<p>
-Remember, having a personal digital certificate alone does <strong>not</strong> 
-give one the ability to send encrypted e-mail to others, but only allows the 
-<strong>receipt</strong> of encrypted e-mail.  PKI is a cooperative encryption
-standard.  Both parties who are exchanging encrypted messages must have
-personal digital certificates, they must trust the Certificate Authority 
-which issued the other persons certificate, and they must exchange
-public keys with each other, as described above.
-
-<p>
-The process of installing certificates and exchanging public keys is dependent
-upon the e-mail application one uses, and is beyond the scope of this document.
+  <p>Remember, having a personal digital certificate alone does <strong>not</strong> give one the ability to send encrypted e-mail to others, but only allows the <strong>receipt</strong> of encrypted e-mail. PKI is a cooperative encryption standard. Both parties who are exchanging encrypted messages must have personal digital certificates, they must trust the Certificate Authority which issued the other persons certificate, and they must exchange public keys with each other, as described above.</p>
 
+  <p>The process of installing certificates and exchanging public keys is dependent upon the e-mail application one uses, and is beyond the scope of this document.</p>
 </body>
 </html>
diff -ruN phpki-ng.old/phpki-ng-0.84/help/usercert_install_ie.html phpki-ng/phpki-ng-0.84/help/usercert_install_ie.html
--- phpki-ng.old/phpki-ng-0.84/help/usercert_install_ie.html    2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/help/usercert_install_ie.html        2021-03-07 19:33:03.076323787 +0100
@@ -1,40 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
 <html>
 <head>
-<title>Personal E-mail Certificate Installation for Outlook & Outlook Express</title> 
-<link rel='stylesheet' type='text/css' href='../css/style.css'>
+  <title>Personal E-mail Certificate Installation for Outlook &amp; Outlook Express</title>
+  <link rel='stylesheet' type='text/css' href='../css/style.css'>
 </head>
+
 <body>
-<center><h1>Personal E-mail Certificate Installation for Outlook & Outlook Express</h1>
-<h2>A Step-by-Step Guide</h2></center><br>
-<h4>
-<p><img src=../images/right-click-install-usercert.jpg>
-<p>Open the folder which holds the certificates you have downloaded.<br>
-Right-click on the certificate you wish to install, and select
-<cite>Install PFX</cite> from the context menu.
-<p><br><img src=../images/cert-wizard1-welcome.jpg >
-<p>Click the <cite>Next</cite> button in the <cite>Certificate Wizard</cite> 
-welcome window.
-<p><br><img src=../images/cert-wizard2-select-file.jpg>
-<p>Click the <cite>Next</cite> button in the <cite>Select File to Import</cite> window.
-<p><br><img src=../images/cert-wizard3-password.jpg>
-<p>The personal e-mail certificate files created by PHPki contain an encrypted
-copy of your private key. When your certficate was created, a password was
-given to PHPki to encrypt the private key.  The same password is used to
-decrypt your private key and install the certificate.  Do not forget or lose 
-this password as it cannot be recovered under any circumstance.
-Select the <cite>Enable strong private key protection</cite> option if you
-would like Windows to add an additional layer of password protection to use 
-your certificate.  This is not necessary, and will not be covered further here.
-There is no need to select the <cite>Mark the private key as exportable</cite> 
-option.  Enter your certificate password and click the <cite>Next</cite> button
-in the <cite>Password Protection for Private Keys</cite> window. 
-<p><br><img src=../images/cert-wizard4-select-store.jpg>
-<p>Click the <cite>Next</cite> button in the <cite>Select a Certificate Store</cite> window.
-<p><br><img src=../images/cert-wizard5-user-final.jpg>
-<p>Click the <cite>Finish</cite> button in the <cite>Complete the Certificate..</cite> window.
-<p><br><img src=../images/import-successful.jpg>
-<p>Windows confirms the root certificate was successfully imported.<br>
+  <center>
+    <h1>Personal E-mail Certificate Installation for Outlook &amp; Outlook Express</h1>
+
+    <h2>A Step-by-Step Guide</h2>
+  </center><br>
+
+  <p><img src="../images/right-click-install-usercert.jpg"></p>
+
+  <p>Open the folder which holds the certificates you have downloaded.<br>
+  Right-click on the certificate you wish to install, and select <cite>Install PFX</cite> from the context menu.</p>
+
+  <p><br>
+  <img src="../images/cert-wizard1-welcome.jpg"></p>
+
+  <p>Click the <cite>Next</cite> button in the <cite>Certificate Wizard</cite> welcome window.</p>
+
+  <p><br>
+  <img src="../images/cert-wizard2-select-file.jpg"></p>
+
+  <p>Click the <cite>Next</cite> button in the <cite>Select File to Import</cite> window.</p>
+
+  <p><br>
+  <img src="../images/cert-wizard3-password.jpg"></p>
+
+  <p>The personal e-mail certificate files created by PHPki contain an encrypted copy of your private key. When your certficate was created, a password was given to PHPki to encrypt the private key. The same password is used to decrypt your private key and install the certificate. Do not forget or lose this password as it cannot be recovered under any circumstance. Select the <cite>Enable strong private key protection</cite> option if you would like Windows to add an additional layer of password protection to use your certificate. This is not necessary, and will not be covered further here. There is no need to select the <cite>Mark the private key as exportable</cite> option. Enter your certificate password and click the <cite>Next</cite> button in the <cite>Password Protection for Private Keys</cite> window.</p>
+
+  <p><br>
+  <img src="../images/cert-wizard4-select-store.jpg"></p>
+
+  <p>Click the <cite>Next</cite> button in the <cite>Select a Certificate Store</cite> window.</p>
+
+  <p><br>
+  <img src="../images/cert-wizard5-user-final.jpg"></p>
+
+  <p>Click the <cite>Finish</cite> button in the <cite>Complete the Certificate..</cite> window.</p>
+
+  <p><br>
+  <img src="../images/import-successful.jpg"></p>
 
-</h4>
+  <p>Windows confirms the root certificate was successfully imported.<br></p>
 </body>
 </html>
diff -ruN phpki-ng.old/phpki-ng-0.84/help.php phpki-ng/phpki-ng-0.84/help.php
--- phpki-ng.old/phpki-ng-0.84/help.php 2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/help.php     2021-03-07 19:33:03.076323787 +0100
@@ -5,11 +5,12 @@
 
 printHeader(about);
 ?>
-<center><h1>PHPki HELP FILES</h1>
-<a href=<?php echo BASE_URL?>help/PKI_basics.html><h3>PKI and E-mail Encryption - A Brief Explanation</h3></a>
-<a href=<?php echo BASE_URL?>help/cacert_install_ie.html><h3>Installing Our Root Certificate For Use With Outlook and Outlook Express</h3></a>
-<p><a href=<?php echo BASE_URL?>help/usercert_install_ie.html><h3>Installing Your Personal E-mail Certificate For Use With Outlook and Outlook Express</h3></a>
-<p><a href=<?php echo BASE_URL?>help/glossary.html><h3>Glossary</h3></a>
+<center>
+  <h1>PHPki HELP FILES</h1>
+  <p><a href="<?php echo BASE_URL?>"help/PKI_basics.html><h3>PKI and E-mail Encryption - A Brief Explanation</h3></a></p>
+  <p><a href="<?php echo BASE_URL?>"help/cacert_install_ie.html><h3>Installing Our Root Certificate For Use With Outlook and Outlook Express</h3></a></p>
+  <p><a href="<?php echo BASE_URL?>"help/usercert_install_ie.html><h3>Installing Your Personal E-mail Certificate For Use With Outlook and Outlook Express</h3></a></p>
+  <p><a href="<?php echo BASE_URL?>"help/glossary.html><h3>Glossary</h3></a></p>
 </center>
 <?php
 printFooter();
diff -ruN phpki-ng.old/phpki-ng-0.84/include/common.php phpki-ng/phpki-ng-0.84/include/common.php
--- phpki-ng.old/phpki-ng-0.84/include/common.php       2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/include/common.php   2021-03-07 19:33:03.077323802 +0100
@@ -2,46 +2,48 @@
 
 umask(0007);
 
-if (isset($_SERVER['PHP_AUTH_USER']))
-       $PHPki_user = md5($_SERVER['PHP_AUTH_USER']);
-else
-       $PHPki_user = md5('default');
+if (isset($_SERVER['PHP_AUTH_USER'])) {
+    $PHPki_user = md5($_SERVER['PHP_AUTH_USER']);
+} else {
+    $PHPki_user = md5('default');
+}
 
 $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, "utf-8");
 
 
-function printHeader($withmenu="default") {
-       global $config;
-       $title = ($config['header_title']?$config['header_title']:'PHPki Certificate Authority');
-
-       switch ($withmenu) {
-       case 'public':
-       case 'about':
-       case 'setup':
-               $style_css = './css/style.css';
-               break;
-       case 'ca':
-       case 'admin':
-       default:
-               $style_css = '../css/style.css';
-               break;
-       }
+function printHeader($withmenu = "default")
+{
+    global $config;
+    $title = ($config['header_title']?$config['header_title']:'PHPki Certificate Authority');
+
+    switch ($withmenu) {
+        case 'public':
+        case 'about':
+        case 'setup':
+            $style_css = './css/style.css';
+            break;
+        case 'ca':
+        case 'admin':
+        default:
+            $style_css = '../css/style.css';
+            break;
+    }
 
-       header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-       header("Expires: -1");
+    header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+    header("Expires: -1");
         header("Cache-Control: no-store, no-cache, must-revalidate");
         header("Cache-Control: post-check=0, pre-check=0", false);
         header("Pragma: no-cache");
 
-       ?>
-       <!DOCTYPE html>
-       <head>
-       <meta charset="utf-8">
-       <title>PHPki: <?php echo $title?> </title>
-       <link rel="stylesheet" type="text/css" href="<?php echo $style_css?>">
-       <script type="text/javascript" language="javascript">
+    ?>
+    <!DOCTYPE html>
+    <head>
+    <meta charset="utf-8">
+    <title>PHPki: <?php echo $title?> </title>
+    <link rel="stylesheet" type="text/css" href="<?php echo $style_css?>">
+    <script type="text/javascript" language="javascript">
 
-       function setVisibility(rowName, show) {
+    function setVisibility(rowName, show) {
         // Tabellenzelle ermitteln
  
         var actualVisibility=document.getElementById(rowName).style.visibility;
@@ -53,96 +55,94 @@
                 document.getElementById(rowName).style.visibility = "visible";
                 document.getElementById(rowName).style.display = "";
         }
-       }
+    }
 
-       </script>
-       </head>
-       <body>
-       <?php
-
-       if (isKonq()) { 
-               $logoclass  = 'logo-konq';
-               $titleclass = 'title-konq';
-               $menuclass  = 'headermenu-konq';
-       }
-       else {
-               $logoclass  = 'logo-ie';
-               $titleclass = 'title-ie';
-               $menuclass  = 'headermenu-ie';
-       }
-
-       ?>
-       <div class="<?php echo $logoclass?>">PHPki</div>
-       <div class="<?php echo $titleclass?>"><?php echo $title?></div>
-       <?php
-
-       switch ($withmenu) {
-       case false:
-       case 'about':
-               break;
-       case 'setup':
-               ?>
-               <div class="<?php echo $menuclass?>">
-               <a class="<?php echo $menuclass?>" href="readme.php">ReadMe</a>
-               <a class="<?php echo $menuclass?>" href="setup.php">Setup</a>
-               <a class="<?php echo $menuclass?>" href="about.php" target="_about">About</a>
-               </div>
-               <?php
-               break;
-       case 'public':
-               print "<div class=$menuclass>";
-
-               if (DEMO)  {
-                       print "<a class=$menuclass href=\"index.php\">Public</a>";
-                       print "<a class=$menuclass href=\"ca/\">Manage</a>";
-               }
-               else {
-                       print "<a class=$menuclass href=\"index.php\">Menu</a>";
-               }
-
-               if (file_exists('policy.html')) {
-                       print '<a class='.$menuclass.' style="color: red;" href="policy.html" target="help">Policy</a>';
-               }
-               ?>
-               <a class="<?php echo $menuclass?>" href="help.php" target="_help">Help</a>
-               <a class="<?php echo $menuclass?>" href="about.php" target="_about">About</a>
-               </div>
-               <?php
-               break;
-       case 'ca':
-       default:
-               print "<div class=$menuclass>";
-
-               if (DEMO)  {
-                       print "<a class=$menuclass href=\"../index.php\">Public</a>";
-                       print "<a class=$menuclass href=\"../ca/index.php\">Manage</a>";
-               }
-               else {
-                       print "<a class=$menuclass href=\"index.php\">Menu</a>";
-               }
-
-               if (file_exists('../policy.html')) {
-                       print '<a class='.$menuclass.' style="color: red;" href="../policy.html" target="help">Policy</a>';
-               }
-               ?>
-               <a class="<?php echo $menuclass?>" href="../help.php" target="_help">Help</a>
-               <a class="<?php echo $menuclass?>" href="../about.php" target="_about">About</a>
-               </div>
-               <?php
-       }
+    </script>
+    </head>
+    <body>
+    <?php
+
+    if (isKonq()) {
+        $logoclass  = 'logo-konq';
+        $titleclass = 'title-konq';
+        $menuclass  = 'headermenu-konq';
+    } else {
+        $logoclass  = 'logo-ie';
+        $titleclass = 'title-ie';
+        $menuclass  = 'headermenu-ie';
+    }
+
+    ?>
+    <div class="<?php echo $logoclass?>">PHPki</div>
+    <div class="<?php echo $titleclass?>"><?php echo $title?></div>
+    <?php
+
+    switch ($withmenu) {
+        case false:
+        case 'about':
+            break;
+        case 'setup':
+            ?>
+            <div class="<?php echo $menuclass?>">
+        <a class="<?php echo $menuclass?>" href="readme.php">ReadMe</a>
+        <a class="<?php echo $menuclass?>" href="setup.php">Setup</a>
+        <a class="<?php echo $menuclass?>" href="about.php" target="_about">About</a>
+        </div>
+        <?php
+            break;
+        case 'public':
+            print "<div class=$menuclass>";
+
+            if (DEMO) {
+                print "<a class=$menuclass href=\"index.php\">Public</a>";
+                print "<a class=$menuclass href=\"ca/\">Manage</a>";
+            } else {
+                print "<a class=$menuclass href=\"index.php\">Menu</a>";
+            }
+
+            if (file_exists('policy.html')) {
+                print '<a class='.$menuclass.' style="color: red;" href="policy.html" target="help">Policy</a>';
+            }
+            ?>
+            <a class="<?php echo $menuclass?>" href="help.php" target="_help">Help</a>
+        <a class="<?php echo $menuclass?>" href="about.php" target="_about">About</a>
+        </div>
+        <?php
+            break;
+        case 'ca':
+        default:
+            print "<div class=$menuclass>";
+
+            if (DEMO) {
+                print "<a class=$menuclass href=\"../index.php\">Public</a>";
+                print "<a class=$menuclass href=\"../ca/index.php\">Manage</a>";
+            } else {
+                print "<a class=$menuclass href=\"index.php\">Menu</a>";
+            }
+
+            if (file_exists('../policy.html')) {
+                print '<a class='.$menuclass.' style="color: red;" href="../policy.html" target="help">Policy</a>';
+            }
+            ?>
+            <a class="<?php echo $menuclass?>" href="../help.php" target="_help">Help</a>
+        <a class="<?php echo $menuclass?>" href="../about.php" target="_about">About</a>
+        </div>
+        <?php
+    }
 
-       ?><hr style="width:99%; align:left; color:#99caff;" /><?php
+    ?><hr style="width:99%; align:left; color:#99caff;" /><?php
 }
 
 
-function printFooter() {
-       ?>
-       <br />
-       <hr style="width:99%; color:#99caff;" />
-       <p style="margin-top: -5px; font-size: 8pt; text-align:center;">PHPki v<?php echo PHPKI_VERSION?> - Copyright 2003 - William E. Roadcap</p>
-       </body>
-       </html>
-       <?php
+function printFooter()
+{
+    ?>
+    <br />
+    <hr style="width:99%; color:#99caff;" />
+    <p style="margin-top: -5px; font-size: 8pt; text-align:center;">PHPki v<?php echo PHPKI_VERSION?> - Copyright 2003 - William E. Roadcap</p>
+    </body>
+    </html>
+    <?php
 }
 
 ?>
diff -ruN phpki-ng.old/phpki-ng-0.84/include/my_functions.php phpki-ng/phpki-ng-0.84/include/my_functions.php
--- phpki-ng.old/phpki-ng-0.84/include/my_functions.php 2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/include/my_functions.php     2021-03-07 19:33:03.077323802 +0100
@@ -5,49 +5,57 @@
 #
 # Returns TRUE if browser is Internet Explorer.
 #
-function isIE() {
-       global $_SERVER;
-       return strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE');
-}
-
-function isKonq() {
-       global $_SERVER;
-       return strstr($_SERVER['HTTP_USER_AGENT'], 'Konqueror');
-}
-
-function isMoz() {
-       global $_SERVER;
-       return strstr($_SERVER['HTTP_USER_AGENT'], 'Gecko');
+function isIE()
+{
+    global $_SERVER;
+    return strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE');
+}
+
+function isKonq()
+{
+    global $_SERVER;
+    return strstr($_SERVER['HTTP_USER_AGENT'], 'Konqueror');
+}
+
+function isMoz()
+{
+    global $_SERVER;
+    return strstr($_SERVER['HTTP_USER_AGENT'], 'Gecko');
 }
 
 
 #
 # Force upload of specified file to browser.
 #
-function upload($source, $destination, $content_type="application/octet-stream") {
-       header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); 
-       header("Expires: -1");
-#      header("Cache-Control: no-store, no-cache, must-revalidate");
-#      header("Cache-Control: post-check=0, pre-check=0", false);
-#      header("Pragma: no-cache");
+function upload($source, $destination, $content_type = "application/octet-stream")
+{
+    header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+    header("Expires: -1");
+#   header("Cache-Control: no-store, no-cache, must-revalidate");
+#   header("Cache-Control: post-check=0, pre-check=0", false);
+#   header("Pragma: no-cache");
     header("Content-Type: $content_type");
 
-       if (is_array($source)) {
-               $fsize = 0;
-               foreach($source as $f) $fsize += filesize($f);
-       }
-       else {
-               $fsize = filesize($source);
-       }
+    if (is_array($source)) {
+        $fsize = 0;
+        foreach ($source as $f) {
+            $fsize += filesize($f);
+        }
+    } else {
+        $fsize = filesize($source);
+    }
 
-       header("Content-length: " . $fsize);
+    header("Content-length: " . $fsize);
 #        header("Content-Disposition: attachment; filename=\"" . $destination ."\"");
         header("Content-Disposition: filename=\"" . $destination ."\"");
 
-       if (is_array($source))
-               foreach($source as $f) $ret = readfile($f);
-       else 
-               $ret=readfile($source);
+    if (is_array($source)) {
+        foreach ($source as $f) {
+            $ret = readfile($f);
+        }
+    } else {
+        $ret=readfile($source);
+    }
 
 #        $fd=fopen($source,'r');
 #        fpassthru($fd);
@@ -60,35 +68,51 @@
 # by field name.  POST fields have precedence over GET fields.
 # Quoting/Slashes are stripped if magic quotes gpc is on.
 #
-function gpvar($v) {
-       global $_GET, $_POST;
+function gpvar($v)
+{
+    global $_GET, $_POST;
     $x = "";
-       if (isset($_GET[$v]))  $x = $_GET[$v];
-       if (isset($_POST[$v])) $x = $_POST[$v];
-       if (get_magic_quotes_gpc()) $x = stripslashes($x);
-       return $x;
+    if (isset($_GET[$v])) {
+        $x = $_GET[$v];
+    }
+    if (isset($_POST[$v])) {
+        $x = $_POST[$v];
+    }
+    if (get_magic_quotes_gpc()) {
+        $x = stripslashes($x);
+    }
+    return $x;
 }
 
 
 #
 # Sort a two multidimensional array by one of it's columns
 #
-function csort($array, $column, $ascdec=SORT_ASC){    
+function csort($array, $column, $ascdec = SORT_ASC)
+{
 
-    if (sizeof($array) == 0) return $array;
+    if (sizeof($array) == 0) {
+        return $array;
+    }
 
     // Sort by digital date rather than text date
-    if ($column == 'issued') $column = "issuedSort";
-    if ($column == 'expires') $column = 'expiresSort';
+    if ($column == 'issued') {
+        $column = "issuedSort";
+    }
+    if ($column == 'expires') {
+        $column = 'expiresSort';
+    }
     
     if ($column == 'status') {
-               foreach($array as $x) {
-                       $sortarr[]=$x[$column];
-                       $sortdate[] = $x['expiresSort'];
-               }
+        foreach ($array as $x) {
+            $sortarr[]=$x[$column];
+            $sortdate[] = $x['expiresSort'];
+        }
         array_multisort($sortarr, $ascdec, $sortdate, SORT_ASC, $array);
     } else {
-        foreach($array as $x) $sortarr[]=$x[$column];
+        foreach ($array as $x) {
+            $sortarr[]=$x[$column];
+        }
         array_multisort($sortarr, $ascdec, $array);
     }
     return $array;
@@ -99,11 +123,13 @@
 # Returns a value suitable for display in the browser.
 # Strips slashes if second argument is true.
 #
-function htvar($v, $strip=false) {
-       if ($strip) 
-               return  htmlentities(stripslashes($v), 0, "UTF-8");
-       else
-               return  htmlentities($v, 0, "UTF-8");
+function htvar($v, $strip = false)
+{
+    if ($strip) {
+        return  htmlentities(stripslashes($v), 0, "UTF-8");
+    } else {
+        return  htmlentities($v, 0, "UTF-8");
+    }
 }
 
 
@@ -113,11 +139,13 @@
 # provided strings with single-quotes and quotes any
 # other dangerous characters.
 #
-function escshellarg($v, $strip=false) {
-       if ($strip)
-               return escapeshellarg(stripslashes($v));
-       else
-               return escapeshellarg($v);
+function escshellarg($v, $strip = false)
+{
+    if ($strip) {
+        return escapeshellarg(stripslashes($v));
+    } else {
+        return escapeshellarg($v);
+    }
 }
 
 
@@ -125,93 +153,103 @@
 # Similar to escshellarg(), but doesn't surround provided
 # string with single-quotes.
 #
-function escshellcmd($v, $strip=false) {
-       if ($strip)
-               return escapeshellcmd(stripslashes($v));
-       else
-               return escapeshellarg($v);
+function escshellcmd($v, $strip = false)
+{
+    if ($strip) {
+        return escapeshellcmd(stripslashes($v));
+    } else {
+        return escapeshellarg($v);
+    }
 }
-       
+    
 #
 # Recursively strips slashes from a string or array.
 #
-function stripslashes_array(&$a) {
-       if (is_array($a)) {
-               foreach($a as $k => $v) {
-                       my_stripslashes($a[$k]);
-               }
-       }
-       else {
-               $a = stripslashes($a);
-       }
+function stripslashes_array(&$a)
+{
+    if (is_array($a)) {
+        foreach ($a as $k => $v) {
+            my_stripslashes($a[$k]);
+        }
+    } else {
+        $a = stripslashes($a);
+    }
 }
 
 
 #
 # Don't use this.
 #
-function undo_magic_quotes(&$a) {
-       if(get_magic_quotes_gpc()) {
-               global $HTTP_POST_VARS, $HTTP_GET_VARS;
-
-               foreach($HTTP_POST_VARS as $k => $v) {
-                       stripslashes_array($HTTP_POST_VARS[$k]);
-                       global $$k;
-                       stripslashes_array($$k);
-               }
-               foreach($HTTP_GET_VARS as $k => $v) {
-                       stripslashes_array($HTTP_GET_VARS[$k]);
-                       global $$k;
-                       stripslashes_array($$k);
-               }
-       }
+function undo_magic_quotes(&$a)
+{
+    if (get_magic_quotes_gpc()) {
+        global $HTTP_POST_VARS, $HTTP_GET_VARS;
+
+        foreach ($HTTP_POST_VARS as $k => $v) {
+            stripslashes_array($HTTP_POST_VARS[$k]);
+            global $$k;
+            stripslashes_array($$k);
+        }
+        foreach ($HTTP_GET_VARS as $k => $v) {
+            stripslashes_array($HTTP_GET_VARS[$k]);
+            global $$k;
+            stripslashes_array($$k);
+        }
+    }
 }
 
 #
 # Returns TRUE if argument contains only alphabetic characters.
 #
-function is_alpha($v) {
-       #return (eregi('[^A-Z]',$v) ? false : true) ;
-       #return (preg_match('/[^A-Z]'.'/i',$v,PCRE_CASELESS) ? false : true) ; # Replaced eregi() with preg_match()
-       return (preg_match('/[^A-Z]/i',$v) ? false : true) ;
+function is_alpha($v)
+{
+    #return (eregi('[^A-Z]',$v) ? false : true) ;
+    #return (preg_match('/[^A-Z]'.'/i',$v,PCRE_CASELESS) ? false : true) ; # Replaced eregi() with preg_match()
+    return (preg_match('/[^A-Z]/i', $v) ? false : true) ;
 }
 
 #
 # Returns TRUE if argument contains only numeric characters.
 #
-function is_num($v) {
-       #return (eregi('[^0-9]',$v) ? false : true) ;
-       return (preg_match('/[^0-9]/',$v) ? false : true) ; # Replaced eregi() with preg_match()
+function is_num($v)
+{
+    #return (eregi('[^0-9]',$v) ? false : true) ;
+    return (preg_match('/[^0-9]/', $v) ? false : true) ; # Replaced eregi() with preg_match()
 }
 
 #
 # Returns TRUE if argument contains only alphanumeric characters.
 #
-function is_alnum($v) {
-       #return (eregi('[^A-Z0-9]',$v) ? false : true) ;
-       return (preg_match('/[^A-Z0-9]/i',$v) ? false : true) ; # Replaced eregi() with preg_match()
+function is_alnum($v)
+{
+    #return (eregi('[^A-Z0-9]',$v) ? false : true) ;
+    return (preg_match('/[^A-Z0-9]/i', $v) ? false : true) ; # Replaced eregi() with preg_match()
 }
 
 #
 # Returns TRUE if argument is in proper e-mail address format.
 #
-function is_email($v) {
-       #return (eregi('^[^@ ]+\@[^@ ]+\.[A-Z]{2,4}$',$v) ? true : false);
-       return (preg_match('/^[^@ ]+\@[^@ ]+\.[A-Z]{2,4}$'.'/i',$v) ? true : false); # Replaced eregi() with preg_match()
+function is_email($v)
+{
+    #return (eregi('^[^@ ]+\@[^@ ]+\.[A-Z]{2,4}$',$v) ? true : false);
+    return (preg_match('/^[^@ ]+\@[^@ ]+\.[A-Z]{2,4}$'.'/i', $v) ? true : false); # Replaced eregi() with preg_match()
 }
 
 #
 # Returns True if the given string is a IP address
 #
-function is_ip( $ip = null ) {
-    if( !$ip or strlen(trim($ip)) == 0){
+function is_ip($ip = null)
+{
+    if (!$ip or strlen(trim($ip)) == 0) {
         return false;
     }
     $ip=trim($ip);
-    if(preg_match("/^[0-9]{1,3}(.[0-9]{1,3}){3}$/",$ip)) {
-        foreach(explode(".", $ip) as $block)
-            if($block<0 || $block>255 )
+    if (preg_match("/^[0-9]{1,3}(.[0-9]{1,3}){3}$/", $ip)) {
+        foreach (explode(".", $ip) as $block) {
+            if ($block<0 || $block>255) {
                 return false;
+            }
+        }
         return true;
     }
     return false;
@@ -220,9 +258,10 @@
 #
 # Returns True if the given string is a valid FQDN
 #
-function is_fqdn($FQDN) {
+function is_fqdn($FQDN)
+{
     // remove leading wildcard characters if exist
-    $FQDN = preg_replace('/^\*\./','', $FQDN, 1);
+    $FQDN = preg_replace('/^\*\./', '', $FQDN, 1);
     return (!empty($FQDN) && preg_match('/^(?=.{1,254}$)((?=[a-z0-9-]{1,63}\.)(xn--+)?[a-z0-9]+(-[a-z0-9]+)*\.)+(xn--+)?[a-z0-9]{2,63}$/i', $FQDN) > 0);
 }
 
@@ -231,26 +270,31 @@
 # as a match is found.
 #
 
-function eregi_array($regexp, $arr) {
+function eregi_array($regexp, $arr)
+{
 
-       foreach ($arr as $elem) {
-               #if (eregi($regexp,$elem))
-               if (! preg_match('/^\/.*\/$/', $regexp)) # if it doesn't begin and end with '/'
-                       $regexp = '/'.$regexp.'/'; # pad the $regexp with '/' to prepare for preg_match()
-               if (preg_match($regexp.'i',$elem)) # Replaced eregi() with preg_match()
-                       return true;
-       }
-       return false;
+    foreach ($arr as $elem) {
+        #if (eregi($regexp,$elem))
+        if (! preg_match('/^\/.*\/$/', $regexp)) { # if it doesn't begin and end with '/'
+            $regexp = '/'.$regexp.'/'; # pad the $regexp with '/' to prepare for preg_match()
+        }
+        if (preg_match($regexp.'i', $elem)) { # Replaced eregi() with preg_match()
+            return true;
+        }
+    }
+    return false;
 }
 #
 # Reads entire file into a string
 # Same as file_get_contents in php >= 4.3.0
 #
-function my_file_get_contents($f) {
-       return implode('', file($f));
+function my_file_get_contents($f)
+{
+    return implode('', file($f));
 }
 
-function getOSInformation() {
+function getOSInformation()
+{
     if (false == function_exists("shell_exec")) {
         return null;
     }
@@ -261,4 +305,3 @@
         return null;
     }
 }
-?>
diff -ruN phpki-ng.old/phpki-ng-0.84/include/openssl_functions.php phpki-ng/phpki-ng-0.84/include/openssl_functions.php
--- phpki-ng.old/phpki-ng-0.84/include/openssl_functions.php    2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/include/openssl_functions.php        2021-03-07 19:33:03.078323817 +0100
@@ -5,64 +5,88 @@
 // File name is placed in ./tmp with a random name. It lingers unless
 // removed manually.
 //
-function CA_create_cnf($country='',$province='',$locality='',$organization='',$unit='',$common_name='',$email='',$keysize=2048,$dns_names='',$ip_addr='',$serial='') {
-       global $config, $PHPki_user;
+function CA_create_cnf($country = '', $province = '', $locality = '', $organization = '', $unit = '', $common_name = '', $email = '', $keysize = 2048, $dns_names = '', $ip_addr = '', $serial = '')
+{
+    global $config, $PHPki_user;
+
+    $issuer = $PHPki_user;
+    $count_dns = 0;
+    $count_ip = 0;
+    $alt_names = "";
+
+    if (! $dns_names == '') {
+        $dns_n=explode("\n", $dns_names);
+        $count_dns  = $count_dns + 1;
+        $alt_names .= "DNS.$count_dns = $common_name\n";
+        foreach ($dns_n as $value) {
+            if (! $value == '') {
+                $count_dns  = $count_dns + 1;
+                $alt_names .= "DNS.$count_dns = ".trim($value)."\n";
+            }
+        }
+    }
+
+    if (! $ip_addr == '') {
+        $ip_ar=explode("\n", $ip_addr);
+        foreach ($ip_ar as $value) {
+            if (! $value == '') {
+                $count_dns  = $count_dns + 1;
+                $count_ip   = $count_ip + 1;
+                # reetp IP should not be added to a DNS entry
+                #$alt_names .= "DNS.$count_dns = ".trim($value)."\n";
+                $alt_names .= "IP.$count_ip = ".trim($value)."\n";
+            }
+        }
+    }
+
+    if (($count_dns > 0) || ($count_ip > 0)) {
+        $server_altnames = "@alt_names";
+    } else {
+        $server_altnames = "DNS:$common_name,email:copy";
+    }
+
+    $configHOME             = $config['home_dir'];
+    $configRANDFILE         = $config['random'];
+    $configCa_dir           = $config['ca_dir'];
+    $configCert_dir         = $config['cert_dir'];
+    $configCrl_dir          = $config['crl_dir'];
+    $configDatabase         = $config['index'];
+    $configNew_certs_dir    = $config['new_certs_dir'];
+    $configPrivate_dir      = $config['private_dir'];
+    $configSerial           = $config['serial'];
+    $configCacert_pem       = $config['cacert_pem'];
+    $configCacrl_pem        = $config['cacrl_pem'];
+    $configCakey            = $config['cakey'];
+    $configDefault_md       = $config['default_md'];
+    $configBase_url         = $config['base_url'];
+    $configCrl_dist         = $config['crl_distrib'];
+    $configComment_root     = $config['comment_root'];
+    $configPolicy_url       = $config['policy_url'];
+    $configRevoke_url       = $config['revoke_url'];
+    $configComment_email    = $config['comment_email'];
+    $configComment_sign     = $config['comment_sign'];
+    $configComment_srv      = $config['comment_srv'];
+
 
-       $issuer = $PHPki_user;
-       $count_dns = 0;
-       $count_ip = 0;
-       $alt_names = "";
-       
-       if (! $dns_names == '') {
-       
-               $dns_n=explode("\n", $dns_names);
-               $count_dns  = $count_dns + 1;
-               $alt_names .= "DNS.$count_dns = $common_name\n";
-               foreach ($dns_n as $value) {
-                       if (! $value == '') {
-                               $count_dns  = $count_dns + 1;
-                               $alt_names .= "DNS.$count_dns = ".trim($value)."\n";
-                       }
-               }
-       }
-       
-       if (! $ip_addr == '') {
-               $ip_ar=explode("\n", $ip_addr);
-               foreach ($ip_ar as $value) {
-                       if (! $value == '') {
-                               $count_dns  = $count_dns + 1;
-                               $count_ip   = $count_ip + 1;
-                               # reetp IP should not be added to a DNS entry
-                               #$alt_names .= "DNS.$count_dns = ".trim($value)."\n";
-                               $alt_names .= "IP.$count_ip = ".trim($value)."\n";
-                       }
-               }
-       }
-
-       if (($count_dns > 0) || ($count_ip > 0)) {
-               $server_altnames = "@alt_names";
-       } else {
-               $server_altnames = "DNS:$common_name,email:copy";
-       }
-       
-       $cnf_contents = "
-HOME             = $config[home_dir] 
-RANDFILE         = $config[random]
-dir                 = $config[ca_dir]
-certs            = $config[cert_dir]
-crl_dir                 = $config[crl_dir]
-database         = $config[index]
-new_certs_dir    = $config[new_certs_dir]
-private_dir      = $config[private_dir]
-serial           = $config[serial]
-certificate      = $config[cacert_pem]
-crl              = $config[cacrl_pem]
-private_key      = $config[cakey]
+
+    $cnf_contents = "
+HOME             = $configHOME
+RANDFILE         = $configRANDFILE
+dir                 = $configCa_dir
+certs            = $configCert_dir
+crl_dir                 = $configCrl_dir
+database         = $configDatabase
+new_certs_dir    = $configNew_certs_dir
+private_dir      = $configPrivate_dir
+serial           = $configSerial
+certificate      = $configCacert_pem
+crl              = $configCacrl_pem
+private_key      = $configCakey
 crl_extentions  = crl_ext
 default_days     = 365
 default_crl_days = 30
 preserve         = no
-default_md       = $config[default_md]
+default_md       = $configDefault_md
 
 [ req ]
 default_bits        = $keysize
@@ -108,7 +132,7 @@
 x509_extensions        = vpn_client_server_ext
 default_days           = 365
 policy                 = policy_supplied
- 
+
 [ time_stamping_cert ]
 x509_extensions        = time_stamping_ext
 default_days           = 365
@@ -137,10 +161,10 @@
 nsCertType             = sslCA, emailCA, objCA
 subjectKeyIdentifier   = hash
 subjectAltName         = email:copy
-crlDistributionPoints  = URI:$config[base_url]$config[crl_distrib]
-nsComment              = $config[comment_root]
+crlDistributionPoints  = URI:$configBase_url$configCrl_dist
+nsComment              = $configComment_root
 #nsCaRevocationUrl     =
-nsCaPolicyUrl          = $config[base_url]$config[policy_url]
+nsCaPolicyUrl          = $configBase_url$configPolicy_url
 
 [ email_ext ]
 basicConstraints       = critical, CA:false
@@ -151,11 +175,11 @@
 authorityKeyIdentifier = keyid:always, issuer:always
 subjectAltName         = email:copy
 issuerAltName          = issuer:copy
-crlDistributionPoints  = URI:$config[base_url]$config[crl_distrib]
-nsComment              = $config[comment_email]
-nsBaseUrl              = $config[base_url]
-nsRevocationUrl        = $config[base_url]$config[revoke_url]$serial
-nsCaPolicyUrl          = $config[base_url]$config[policy_url]
+crlDistributionPoints  = URI:$configBase_url$configCrl_dist
+nsComment              = $configComment_email
+nsBaseUrl              = $configBase_url
+nsRevocationUrl        = $configBase_url$configRevoke_url$serial
+nsCaPolicyUrl          = $configBase_url$configPolicy_url
 
 [ email_signing_ext ]
 basicConstraints       = critical, CA:false
@@ -166,11 +190,11 @@
 authorityKeyIdentifier = keyid:always, issuer:always
 subjectAltName         = email:copy
 issuerAltName          = issuer:copy
-crlDistributionPoints  = URI:$config[base_url]$config[crl_distrib]
-nsComment              = $config[comment_sign]
-nsBaseUrl              = $config[base_url]
-nsRevocationUrl        = $config[base_url]$config[revoke_url]$serial
-nsCaPolicyUrl          = $config[base_url]$config[policy_url]
+crlDistributionPoints  = URI:$configBase_url$configCrl_dist
+nsComment              = $configComment_sign
+nsBaseUrl              = $configBase_url
+nsRevocationUrl        = $configBase_url$configRevoke_url$serial
+nsCaPolicyUrl          = $configBase_url$configPolicy_url
 
 [ server_ext ]
 basicConstraints        = critical, CA:false
@@ -181,11 +205,11 @@
 authorityKeyIdentifier  = keyid:always, issuer:always
 subjectAltName          = $server_altnames
 issuerAltName           = issuer:copy
-crlDistributionPoints   = URI:$config[base_url]$config[crl_distrib]
-nsComment               = $config[comment_srv]
-nsBaseUrl               = $config[base_url]
-nsRevocationUrl         = $config[base_url]$config[revoke_url]$serial
-nsCaPolicyUrl           = $config[base_url]$config[policy_url]
+crlDistributionPoints   = URI:$configBase_url$configCrl_dist
+nsComment               = $configComment_srv
+nsBaseUrl               = $configBase_url
+nsRevocationUrl         = $configBase_url$configRevoke_url$serial
+nsCaPolicyUrl           = $configBase_url$configPolicy_url
 
 [ time_stamping_ext ]
 basicConstraints       = CA:false
@@ -195,10 +219,10 @@
 authorityKeyIdentifier = keyid:always, issuer:always
 subjectAltName         = DNS:$common_name,email:copy
 issuerAltName          = issuer:copy
-crlDistributionPoints   = URI:$config[base_url]$config[crl_distrib]
+crlDistributionPoints   = URI:$configBase_url$configCrl_dist
 nsComment              = $config[comment_stamp]
-nsBaseUrl              = $config[base_url]
-nsRevocationUrl        = $config[base_url]$config[revoke_url]$serial
+nsBaseUrl              = $configBase_url
+nsRevocationUrl        = $configBase_url$configRevoke_url$serial
 
 [ vpn_client_ext ]
 basicConstraints        = critical, CA:false
@@ -232,13 +256,13 @@
 ";
 
 
-       # Write out the config file.
-       $cnf_file  = tempnam('../../tmp','cnf-');  // Why is this not in the phpki dir ? why ../../ ?
-       $handle = fopen($cnf_file,"w");
-       fwrite($handle, $cnf_contents);
-       fclose($handle);
-       
-       return($cnf_file);
+    # Write out the config file.
+    $cnf_file  = tempnam('../../tmp', 'cnf-');  // Why is this not in the phpki dir ? why ../../ ?
+    $handle = fopen($cnf_file, "w");
+    fwrite($handle, $cnf_contents);
+    fclose($handle);
+
+    return($cnf_file);
 }
 
 //
@@ -247,242 +271,264 @@
 // Fields: serial, country, province, locality, organization,
 //         issuer, unit, common_name, email
 //
-function CAdb_to_array($search = '.*') {
-       global $config;
-
-       # Prepend a default status to search string if missing.
-       #if (! ereg('^\^\[.*\]', $search)) $search = '^[VRE].*'.$search;
-       if (! preg_match("/^\^\[.*\]/", $search)) $search = '^[VRE].*'.$search;
-       # Include valid certs?
-       #if (ereg('^\^\[.*V.*\]',$search)) $inclval = true;
-       if (preg_match('/^\^\[.*V.*\]/',$search)) $inclval = true;
-       # Include revoked certs?
-       #if (ereg('^\^\[.*R.*\]',$search)) $inclrev = true;
-       if (preg_match('/^\^\[.*R.*\]/',$search)) $inclrev = true;
-       # Include expired certs?
-       #if (ereg('^\^\[.*E.*\]',$search)) $inclexp = true;
-       if (preg_match('/^\^\[.*E.*\]/',$search)) $inclexp = true;
-
-       # There isn't really a status of 'E' in the openssl index.
-       # Change (E)xpired to (V)alid within the search string.
-       #$search = ereg_replace('^(\^\[.*)E(.*\])','\\1V\\2',$search);
-       $search = preg_replace('/^(\^\[.*)E(.*\])/','${1}V${2}',$search);
-
-       $db = array();
-       exec('egrep -i '.escshellarg($search).' '.$config['index'], $x);
-       foreach($x as $y) {
-               $i = CAdb_explode_entry($y);
-               if (($i['status'] == "Valid" && $inclval) || ($i['status'] == "Revoked" && $inclrev) || ($i['status'] == "Expired" && $inclexp))
-                       $db[$i['serial']] = $i;
-       }
+function CAdb_to_array($search = '.*')
+{
+    global $config;
+
+    # Prepend a default status to search string if missing.
+    #if (! ereg('^\^\[.*\]', $search)) $search = '^[VRE].*'.$search;
+    if (! preg_match("/^\^\[.*\]/", $search)) {
+        $search = '^[VRE].*'.$search;
+    }
+    # Include valid certs?
+    #if (ereg('^\^\[.*V.*\]',$search)) $inclval = true;
+    if (preg_match('/^\^\[.*V.*\]/', $search)) {
+        $inclval = true;
+    }
+    # Include revoked certs?
+    #if (ereg('^\^\[.*R.*\]',$search)) $inclrev = true;
+    if (preg_match('/^\^\[.*R.*\]/', $search)) {
+        $inclrev = true;
+    }
+    # Include expired certs?
+    #if (ereg('^\^\[.*E.*\]',$search)) $inclexp = true;
+    if (preg_match('/^\^\[.*E.*\]/', $search)) {
+        $inclexp = true;
+    }
+
+    # There isn't really a status of 'E' in the openssl index.
+    # Change (E)xpired to (V)alid within the search string.
+    #$search = ereg_replace('^(\^\[.*)E(.*\])','\\1V\\2',$search);
+    $search = preg_replace('/^(\^\[.*)E(.*\])/', '${1}V${2}', $search);
+
+    $db = array();
+    exec('egrep -i '.escshellarg($search).' '.$config['index'], $x);
+    foreach ($x as $y) {
+        $i = CAdb_explode_entry($y);
+        if (($i['status'] == "Valid" && $inclval) || ($i['status'] == "Revoked" && $inclrev) || ($i['status'] == "Expired" && $inclexp)) {
+            $db[$i['serial']] = $i;
+        }
+    }
 
-       return($db);
+    return($db);
 }
 
 
 //
 // Returns an array containing the index record for
 // certificate $serial.
-// 
-function CAdb_get_entry($serial) {
-       global $config;
-       $regexp = "^[VR]\t.*\t.*\t$serial\t.*\t.*$";
-        $x = exec('egrep '.escshellarg($regexp).' '.$config['index']);
-       if ($x)
-               return CAdb_explode_entry($x);
-       else {
-               return false;
-       }
+//
+function CAdb_get_entry($serial)
+{
+    global $config;
+    $regexp = "^[VR]\t.*\t.*\t$serial\t.*\t.*$";
+    $x = exec('egrep '.escshellarg($regexp).' '.$config['index']);
+    if ($x) {
+        return CAdb_explode_entry($x);
+    } else {
+        return false;
+    }
 }
 
 
 //
-// Returns the serial number of a VALID certificate matching 
+// Returns the serial number of a VALID certificate matching
 // $email and/or $name. Returns FALSE if no match is found.
 //
-function CAdb_in($email="", $name="") {
-       global $config;
-       $email = escshellcmd($email);
-       $name = escshellcmd($name);
-       $regexp = "^[V].*CN=$name/(Email|emailAddress)=$email";
-        $x =exec('egrep '.escshellarg($regexp).' '.$config['index']);
+function CAdb_in($email = "", $name = "")
+{
+    global $config;
+    $email = escshellcmd($email);
+    $name = escshellcmd($name);
+    $regexp = "^[V].*CN=$name/(Email|emailAddress)=$email";
+    $x = exec('egrep '.escshellarg($regexp).' '.$config['index']);
 
     if ($x) {
-               list($j,$j,$j,$serial,$j,$j) = explode("\t", $x);
-               return "$serial";
-       }
-       else
-               return false;
+        list($j,$j,$j,$serial,$j,$j) = explode("\t", $x);
+        return "$serial";
+    } else {
+        return false;
+    }
 }
 
 
 //
 // Alias for CAdb_in()
 //
-function CAdb_serial($email, $name='') {
-       return CAdb_in($email, $name='');
+function CAdb_serial($email, $name = '')
+{
+    return CAdb_in($email, $name = '');
 }
 
 //
 // Alias for CAdb_in()
 //
-function CAdb_exists($email, $name='') {
-       return CAdb_in($email, $name='');
+function CAdb_exists($email, $name = '')
+{
+    return CAdb_in($email, $name = '');
 }
 
 
 //
 // Returns the certificate 'issuer'
 //
-function CAdb_issuer($serial) {
-       global $config;
-       $rec = CAdb_get_entry($serial);
-       return $rec['issuer'];
+function CAdb_issuer($serial)
+{
+    global $config;
+    $rec = CAdb_get_entry($serial);
+    return $rec['issuer'];
 }
 
 //
 // Returns an array containing the respective fields given a
 // a raw line ($dbentry) from the certificate index.
-// Fields: serial, country, province locality, organization, 
+// Fields: serial, country, province locality, organization,
 //         issuer, unit, common_name, email
 //
-function CAdb_explode_entry($dbentry) {
-       $a = explode("\t", $dbentry);
-       $b  = preg_split('/\/([A-Z]|[a-z])+=/', $a[5]);
-
-       switch ($a[0]) {
-       case "V":
-               $db['status'] = "Valid";
-               break;
-       case "R":
-               $db['status'] = "Revoked";
-               break;
-       }
-
-       // CA_cert_start/enddate
-       // A date will be returned in this format
-       // Feb 27 16:00:09 2020 GMT
-       // Add a 'digital' sort key for digital date sorting later
-       sscanf(CA_cert_startdate($a[3]),"%s%s%s%s", $mm,$dd,$tt,$yy);
-       $db['issued'] = strftime("%Y-%b-%d", strtotime("$yy-$mm-$dd"));
-       $db['issuedSort'] = strftime("%Y-%m-%d", strtotime("$yy-$mm-$dd"));
-
-       sscanf(CA_cert_enddate($a[3]), "%s%s%s%s",$mm,$dd,$tt,$yy);
-       $db['expires'] = strftime("%Y-%b-%d", strtotime("$yy-$mm-$dd"));
-       $db['expiresSort'] = strftime("%Y-%m-%d", strtotime("$yy-$mm-$dd"));
-       
-       if (time() > strtotime("$yy-$mm-$dd")) {
-               $db['status'] = "Expired";
-       }
-
-
-       // Compatibility with migrated certs from openvpn-bridge
-       if(count($b) == 7){
-                $db['serial']       = $a[3];
-                $db['country']      = $b[1];
-                $db['province']     = $b[2];
-                $db['locality']     = '';
-                $db['organization'] = $b[3];
-                $db['issuer']       = '';
-                $db['unit']         = $b[4];
-                $db['common_name']  = $b[5];
-                $db['email']        = $b[6];
-        }
-       // Compatibility with renewed certs from openvpn-bridge
-        elseif(count($b) == 8){
-                $db['serial']       = $a[3];
-                $db['country']      = $b[1];
-                $db['province']     = $b[2];
-                $db['locality']     = $b[3];
-                $db['organization'] = $b[4];
-                $db['issuer']       = '';
-                $db['unit']         = $b[5];
-                $db['common_name']  = $b[6];
-                $db['email']        = $b[7];
-        }
-       // Else, it's a certificate created with phpki
-        else{
-               $db['serial']       = $a[3];
-               $db['country']      = $b[1];
-               $db['province']     = $b[2];
-               $db['locality']     = $b[3];
-               $db['organization'] = $b[4];
-               $db['issuer']       = $b[5];
-               $db['unit']         = $b[6];
-               $db['common_name']  = $b[7];
-               $db['email']        = $b[8];
-       }
+function CAdb_explode_entry($dbentry)
+{
+    $a = explode("\t", $dbentry);
+    $b  = preg_split('/\/([A-Z]|[a-z])+=/', $a[5]);
+
+    switch ($a[0]) {
+        case "V":
+            $db['status'] = "Valid";
+            break;
+        case "R":
+            $db['status'] = "Revoked";
+            break;
+    }
+
+    // CA_cert_start/enddate
+    // A date will be returned in this format
+    // Feb 27 16:00:09 2020 GMT
+    // Add a 'digital' sort key for digital date sorting later
+    sscanf(CA_cert_startdate($a[3]), "%s%s%s%s", $mm, $dd, $tt, $yy);
+    $db['issued'] = strftime("%Y-%b-%d", strtotime("$yy-$mm-$dd"));
+    $db['issuedSort'] = strftime("%Y-%m-%d", strtotime("$yy-$mm-$dd"));
+
+    sscanf(CA_cert_enddate($a[3]), "%s%s%s%s", $mm, $dd, $tt, $yy);
+    $db['expires'] = strftime("%Y-%b-%d", strtotime("$yy-$mm-$dd"));
+    $db['expiresSort'] = strftime("%Y-%m-%d", strtotime("$yy-$mm-$dd"));
+
+    if (time() > strtotime("$yy-$mm-$dd")) {
+        $db['status'] = "Expired";
+    }
+
+
+    // Compatibility with migrated certs from openvpn-bridge
+    if (count($b) == 7) {
+        $db['serial']       = $a[3];
+        $db['country']      = $b[1];
+        $db['province']     = $b[2];
+        $db['locality']     = '';
+        $db['organization'] = $b[3];
+        $db['issuer']       = '';
+        $db['unit']         = $b[4];
+        $db['common_name']  = $b[5];
+        $db['email']        = $b[6];
+    } // Compatibility with renewed certs from openvpn-bridge
+    elseif (count($b) == 8) {
+        $db['serial']       = $a[3];
+        $db['country']      = $b[1];
+        $db['province']     = $b[2];
+        $db['locality']     = $b[3];
+        $db['organization'] = $b[4];
+        $db['issuer']       = '';
+        $db['unit']         = $b[5];
+        $db['common_name']  = $b[6];
+        $db['email']        = $b[7];
+    } // Else, it's a certificate created with phpki
+    else {
+        $db['serial']       = $a[3];
+        $db['country']      = $b[1];
+        $db['province']     = $b[2];
+        $db['locality']     = $b[3];
+        $db['organization'] = $b[4];
+        $db['issuer']       = $b[5];
+        $db['unit']         = $b[6];
+        $db['common_name']  = $b[7];
+        $db['email']        = $b[8];
+    }
 
-       return $db;
+    return $db;
 }
 
 //
 // Returns the date & time a specified certificate is revoked,
 // Returns FALSE if the certificate is not revoked.
 //
-function CAdb_is_revoked($serial) {
-       global $config;
-       $regexp = "^R\t.*\t.*\t$serial\t.*\t.*$";
-        $x = exec('egrep '.escshellarg($regexp).' '.$config['index']);
-
-        if  ($x) {
-               list($j,$j,$revoke_date,$j,$j,$j) = explode("\t", $x);
-               // Revoke date = 'R' + start date and is in this format
-               // 200227162209Z
-               sscanf($revoke_date, "%2s%2s%2s",$yy,$mm,$dd);
-               return strftime("%b %d, %Y", strtotime("$yy-$mm-$dd"));
-       }
-       else
-               return false;
+function CAdb_is_revoked($serial)
+{
+    global $config;
+    $regexp = "^R\t.*\t.*\t$serial\t.*\t.*$";
+    $x = exec('egrep '.escshellarg($regexp).' '.$config['index']);
+
+    if ($x) {
+        list($j,$j,$revoke_date,$j,$j,$j) = explode("\t", $x);
+        // Revoke date = 'R' + start date and is in this format
+        // 200227162209Z
+        sscanf($revoke_date, "%2s%2s%2s", $yy, $mm, $dd);
+        return strftime("%b %d, %Y", strtotime("$yy-$mm-$dd"));
+    } else {
+        return false;
+    }
 }
 
 //
 // Returns TRUE if a certificate is valid, otherwise FALSE.
 //
-function CAdb_is_valid($serial) {
-       global $config;
-       $regexp = "^V\t.*\t.*\t$serial\t.*\t.*$";
-
-        if  (exec('egrep '.escshellarg($regexp).' '.$config['index']))
-               return true;
-       else
-               return false;
+function CAdb_is_valid($serial)
+{
+    global $config;
+    $regexp = "^V\t.*\t.*\t$serial\t.*\t.*$";
+
+    if (exec('egrep '.escshellarg($regexp).' '.$config['index'])) {
+        return true;
+    } else {
+        return false;
+    }
 }
 
 //
 // Returns the long-form certificate description as output by
 // openssl x509 -in certificatefile -text -purpose
 //
-function CA_cert_text($serial) {
-       global $config;
-       $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
-       return(shell_exec(X509.' -in '.escshellarg($certfile).' -text -purpose 2>&1'));
+function CA_cert_text($serial)
+{
+    global $config;
+    $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
+    return(shell_exec(X509.' -in '.escshellarg($certfile).' -text -purpose 2>&1'));
 }
 
 //
 // Returns the long-form text of the Certificate Revocation List
-// openssl crl -in crlfile -text 
+// openssl crl -in crlfile -text
 //
-function CA_crl_text() {
-       global $config;
-       $crlfile = $config['cacrl_pem'];
-       return(shell_exec(CRL.' -in '.escshellarg($crlfile).' -text 2>&1'));
+function CA_crl_text()
+{
+    global $config;
+    $crlfile = $config['cacrl_pem'];
+    return(shell_exec(CRL.' -in '.escshellarg($crlfile).' -text 2>&1'));
 }
 
 // Returns the static takey.pem file
-function ta_key_text() {
+function ta_key_text()
+{
         global $config;
         return(shell_exec('cat '.escshellarg($config['private_dir']).'/takey.pem 2>&1'));
 }
 
 // Returns the dhparam file
-function dhparam_text() {
+function dhparam_text()
+{
         global $config;
         return(shell_exec('cat '.escshellarg($config['private_dir']).'/dhparam2048.pem 2>&1'));
 }
 
 // Returns the root CA certificate file (PEM Encoded)
-function root_pem_text() {
+function root_pem_text()
+{
         global $config;
         return(shell_exec('cat '.escshellarg($config['cacert_pem']).' 2>&1'));
 }
@@ -490,416 +536,447 @@
 //
 // Returns the subject of a certificate.
 //
-function CA_cert_subject($serial) {
-       global $config;
-       $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
-       $x = exec(X509.' -in '.escshellarg($certfile).' -noout -subject 2>&1');
-       return(str_replace('subject=', '', $x));
+function CA_cert_subject($serial)
+{
+    global $config;
+    $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
+    $x = exec(X509.' -in '.escshellarg($certfile).' -noout -subject 2>&1');
+    return(str_replace('subject=', '', $x));
 }
 
 //
 // Returns the common name of a certificate.
 //
-function CA_cert_cname($serial) {
-       global $config;
-       #return(ereg_replace('^.*/CN=(.*)/.*','\\1',CA_cert_subject($serial)));
-       return(preg_replace('/^.*\/CN=(.*)\/.*/','${1}',CA_cert_subject($serial)));
-
+function CA_cert_cname($serial)
+{
+    global $config;
+    #return(ereg_replace('^.*/CN=(.*)/.*','\\1',CA_cert_subject($serial)));
+    return(preg_replace('/^.*\/CN=(.*)\/.*/', '${1}', CA_cert_subject($serial)));
 }
 
 //
 // Returns the email address of a certificate.
 //
-function CA_cert_email($serial) {
-       global $config;
-       $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
-       $x = exec(X509.' -in '.escshellarg($certfile).' -noout -email 2>&1');
-       return($x);
+function CA_cert_email($serial)
+{
+    global $config;
+    $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
+    $x = exec(X509.' -in '.escshellarg($certfile).' -noout -email 2>&1');
+    return($x);
 }
 
 //
 // Returns the effective date of a certificate.
 //
-function CA_cert_startdate($serial) {
-       global $config;
-       $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
-       $x = exec(X509.' -in '.escshellarg($certfile).' -noout -startdate 2>&1');
-       return(str_replace('notBefore=','',$x));
+function CA_cert_startdate($serial)
+{
+    global $config;
+    $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
+    $x = exec(X509.' -in '.escshellarg($certfile).' -noout -startdate 2>&1');
+    return(str_replace('notBefore=', '', $x));
 }
 
 //
 // Returns the expiration date of a certificate.
 //
-function CA_cert_enddate($serial) {
-       global $config;
-       $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
-       $x = exec(X509.' -in '.escshellarg($certfile).' -noout -enddate  2>&1');
-       return(str_replace('notAfter=','',$x));
+function CA_cert_enddate($serial)
+{
+    global $config;
+    $certfile = $config['new_certs_dir'] . '/' . $serial . '.pem';
+    $x = exec(X509.' -in '.escshellarg($certfile).' -noout -enddate  2>&1');
+    return(str_replace('notAfter=', '', $x));
 }
 
 //
 // Revokes a specified certificate.
 //
-function CA_revoke_cert($serial) {
-       global $config;
-
-       $fd = fopen($config['index'],'a');
-       flock($fd, LOCK_EX);
+function CA_revoke_cert($serial)
+{
+    global $config;
+
+    $fd = fopen($config['index'], 'a');
+    flock($fd, LOCK_EX);
+
+    $certfile     = $config['new_certs_dir'] . "/$serial.pem";
+    $cmd_output[] = 'Revoking the certificate.';
+    $configCa_pwd = $config['ca_pwd'];
+    $configOpenssl_cnf = $config['openssl_cnf'];
+    exec(CA." -config $configOpenssl_cnf -revoke ".escshellarg($certfile)." -passin pass:$ConfigCa_pwd 2>&1", $cmd_output, $ret);
+
+    if ($ret == 0) {
+        unset($cmd_output);
+        list($ret, $cmd_output[]) = CA_generate_crl();
+    }
 
-       $certfile     = "$config[new_certs_dir]/$serial.pem";
-       
-       $cmd_output[] = 'Revoking the certificate.';
-       exec(CA." -config '$config[openssl_cnf]' -revoke ".escshellarg($certfile)." -passin pass:'$config[ca_pwd]' 2>&1", $cmd_output, $ret);
-
-       if ($ret == 0) {
-               unset($cmd_output);
-               list($ret, $cmd_output[]) = CA_generate_crl();
-       }
-       
-       fclose($fd);
+    fclose($fd);
 
-       return array(($ret == true || $ret == 0 ? true : false), implode('<br>',$cmd_output));
+    return array(($ret == true || $ret == 0 ? true : false), implode('<br>', $cmd_output));
 }
 
 //
 // Creates a new certificate request, and certificate in various formats
-// according to specified parameters.   PKCS12 bundle files contain the 
+// according to specified parameters.   PKCS12 bundle files contain the
 // private key, certificate, and CA certificate.
 //
 // Returns an array containing the output of failed openssl commands.
 //
-function CA_create_cert($cert_type='email',$country,$province,$locality,$organization,$unit,$common_name,$email,$expiry,$passwd,$keysize=2048,$dns_names,$ip_addr) {
-       global $config;
+function CA_create_cert($cert_type = 'email', $country, $province, $locality, $organization, $unit, $common_name, $email, $expiry, $passwd, $keysize = 2048, $dns_names, $ip_addr)
+{
+    global $config;
+
+    # Wait here if another user has the database locked.
+    $fd = fopen($config['index'], "a");
+    flock($fd, LOCK_EX);
+
+    # Get the next available serial number
+    $serial = trim(implode('', file($config['serial'])));
+
+    $userkey   = $config['private_dir'] . "/$serial-key.pem";
+    $userreq   = $config['req_dir'] ."/$serial-req.pem";
+    $usercert  = $config['new_certs_dir'].'/'.$serial.'.pem';
+    $userder   = $config['cert_dir'] . "/$serial.der";
+    $userpfx   = $config['pfx_dir'] . "/$serial.pfx";
+
+    $expiry_days = round($expiry * 365.25, 0);
+
+    $cnf_file = CA_create_cnf($country, $province, $locality, $organization, $unit, $common_name, $email, $keysize, $dns_names, $ip_addr, $serial);
+
+    # Escape certain dangerous characters in user input
+    $email         = escshellcmd($email);
+    $_passwd       = escshellarg($passwd);
+    $friendly_name = escshellarg($common_name);
+    $extensions    = escshellarg($cert_type.'_ext');
+
+    # Create the certificate request
+    unset($cmd_output);
+    $cmd_output[] = 'Creating certificate request.';
+
+    if (($_passwd) && ($_passwd != "''")) {
+        exec(REQ." -new -newkey rsa:$keysize -keyout '$userkey' -out '$userreq' -config '$cnf_file' -days '$expiry_days' -passout pass:$_passwd  2>&1", $cmd_output, $ret);
+    } else {
+        exec(REQ." -new -newkey rsa:$keysize -keyout '$userkey' -out '$userreq' -config '$cnf_file' -days '$expiry_days' -nodes  2>&1", $cmd_output, $ret);
+    }
+
+    # Sign the certificate request and create the certificate
+    if ($ret == 0) {
+        unset($cmd_output);
+        $cmd_output[] = "Signing $cert_type certificate request.";
+        $configCa_pwd = $config['ca_pwd'];
+        exec(CA." -config '$cnf_file' -in '$userreq' -out /dev/null -notext -days '$expiry_days' -passin pass:'$configCa_pwd' -batch -extensions $extensions 2>&1", $cmd_output, $ret);
+    };
+
+    # Create DER format certificate
+    if ($ret == 0) {
+        unset($cmd_output);
+        $cmd_output[] = "Creating DER format certificate.";
+        exec(X509." -in '$usercert' -out '$userder' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
+    };
+
+    # Create a PKCS12 certificate file for download to Windows
+    if ($ret == 0) {
+        unset($cmd_output);
+        $cmd_output[] = "Creating PKCS12 format certificate.";
+        $configCacert_pem = $config['cacert_pem'];
+        $configOrganization = $config['organization'];
+        $configRandom = $config['random'];
+
+        if (($_passwd) && ($_passwd != "''")) {
+            $cmd_output[] = "infile: $usercert   keyfile: $userkey   outfile: $userpfx  pass: $_passwd";
+            exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$configCacert_pem' -caname '$configOrganization' -out '$userpfx' -name $friendly_name -rand '$configRandom' -passin pass:$_passwd -passout pass:$_passwd  2>&1", $cmd_output, $ret);
+        } else {
+            $cmd_output[] = "infile: $usercert   keyfile: $userkey   outfile: $userpfx";
+            // reetp - this needs looking at
+            exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$configCacert_pem' -caname '$configOrganization' -out '$userpfx' -name $friendly_name -nodes -passout pass: 2>&1", $cmd_output, $ret);
+            //exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name  -nodes 2>&1", $cmd_output, $ret);
+        }
+    };
 
-       # Wait here if another user has the database locked.
-       $fd = fopen($config['index'],"a");
-       flock($fd, LOCK_EX);
-
-       # Get the next available serial number
-       $serial = trim(implode('',file($config['serial'])));
-
-       $userkey   = $config['private_dir'].'/'.$serial.'-key.pem';
-       $userreq   = $config['req_dir'].'/'.$serial.'-req.pem';
-       $usercert  = $config['new_certs_dir'].'/'.$serial.'.pem';
-       $userder   = $config['cert_dir'].'/'.$serial.'.der';
-       $userpfx   = $config['pfx_dir'].'/'.$serial.'.pfx';
-
-       $expiry_days = round($expiry * 365.25, 0);
-
-       $cnf_file = CA_create_cnf($country,$province,$locality,$organization,$unit,$common_name,$email,$keysize,$dns_names,$ip_addr,$serial);
-
-       # Escape certain dangerous characters in user input
-       $email         = escshellcmd($email);
-       $_passwd       = escshellarg($passwd);
-       $friendly_name = escshellarg($common_name);
-       $extensions    = escshellarg($cert_type.'_ext');
-       
-       # Create the certificate request
-       unset($cmd_output);
-       $cmd_output[] = 'Creating certificate request.';
-
-       if (($_passwd) && ($_passwd != "''")) {
-               exec(REQ." -new -newkey rsa:$keysize -keyout '$userkey' -out '$userreq' -config '$cnf_file' -days '$expiry_days' -passout pass:$_passwd  2>&1", $cmd_output, $ret);
-       }
-       else {
-               exec(REQ." -new -newkey rsa:$keysize -keyout '$userkey' -out '$userreq' -config '$cnf_file' -days '$expiry_days' -nodes  2>&1", $cmd_output, $ret);
-       }
-       
-       # Sign the certificate request and create the certificate
-       if ($ret == 0) {
-               unset($cmd_output);
-               $cmd_output[] = "Signing $cert_type certificate request.";
-               exec(CA." -config '$cnf_file' -in '$userreq' -out /dev/null -notext -days '$expiry_days' -passin pass:'$config[ca_pwd]' -batch -extensions $extensions 2>&1", $cmd_output, $ret);
-       };
-
-       # Create DER format certificate
-       if ($ret == 0) {
-               unset($cmd_output);
-               $cmd_output[] = "Creating DER format certificate.";
-               exec(X509." -in '$usercert' -out '$userder' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
-       };
-
-       # Create a PKCS12 certificate file for download to Windows
-       if ($ret == 0) {
-               unset($cmd_output);
-               $cmd_output[] = "Creating PKCS12 format certificate.";
-               if (($_passwd) && ($_passwd != "''")) {
-                       $cmd_output[] = "infile: $usercert   keyfile: $userkey   outfile: $userpfx  pass: $_passwd";
-                       exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name -rand '$config[random]' -passin pass:$_passwd -passout pass:$_passwd  2>&1", $cmd_output, $ret);
-               }
-               else {
-                       $cmd_output[] = "infile: $usercert   keyfile: $userkey   outfile: $userpfx";
-                       // reetp - this needs looking at
-                       exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name -nodes -passout pass: 2>&1", $cmd_output, $ret);
-                       //exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name  -nodes 2>&1", $cmd_output, $ret);
-               }
-       };
-
-       #Unlock the CA database
-       fclose($fd);
-
-       #Remove temporary openssl config file.
-       if (file_exists($cnf_file)) unlink($cnf_file);
-
-       if ($ret == 0) {
-               # Successful!
-               # Return status=true and serial number of issued certificate.
-               return array(true, $serial);
-       
-       }
-       else {
-               # Not successful. :-(
-               # Clean up our loose ends.
-               # Return status=false and openssl output/errors for debug.
-               CA_remove_cert($serial);
-               $cmd_output[] = 'Click on the "Help" link above for information on how to report this problem.';
-               return array(false, implode("<br>",$cmd_output));
-       }
+    #Unlock the CA database
+    fclose($fd);
+
+    #Remove temporary openssl config file.
+    if (file_exists($cnf_file)) {
+        unlink($cnf_file);
+    }
+
+    if ($ret == 0) {
+        # Successful!
+        # Return status=true and serial number of issued certificate.
+        return array(true, $serial);
+    } else {
+        # Not successful. :-(
+        # Clean up our loose ends.
+        # Return status=false and openssl output/errors for debug.
+        CA_remove_cert($serial);
+        $cmd_output[] = 'Click on the "Help" link above for information on how to report this problem.';
+        return array(false, implode("<br>", $cmd_output));
+    }
 }
 
 //
 // Renews a specified certificate, revoking any existing valid versions.
-// Uses old certificate request to Creates a new request, and certificate 
+// Uses old certificate request to Creates a new request, and certificate
 // in various formats.
 //
 // Returns an array containing the output of failed openssl commands.
 //
-// FIXME: Yes, I know... This functions contains much duplicative code 
+// FIXME: Yes, I know... This functions contains much duplicative code
 //        from CA_create_cert().  Bleh!
-//        
-function CA_renew_cert($old_serial,$expiry,$passwd) {
-       global $config;
-
-       # Do not renew a revoked certificate if a valid one exists for this
-       # URL.  Find and renew the valid certificate instead.
-       if (CAdb_is_revoked($old_serial)) {
-               $ret = CAdb_in(CA_cert_email($old_serial),CA_cert_cname($old_serial));
-               if ($ret && $old_serial != $ret) $old_serial = $ret;
-       }
-
-       # Valid certificates must be revoked prior to renewal.
-       if (CAdb_is_valid($old_serial)) {
-               $ret = CA_revoke_cert($old_serial);
-               if (! $ret[0]) return $ret;
-       }
-
-       $cert_type  = CA_cert_type($old_serial);
-       $extensions = $cert_type.'_ext'; 
-
-       # Get common_name from old certificate for use as the
-       # "friendly name" of PKCS12 certificate.
-       $rec = CAdb_get_entry($old_serial);
-       $country      = $rec['country'];
-       $province     = $rec['province'];
-       $locality     = $rec['locality'];
-       $organization = $rec['organiztion'];
-       $unit         = $rec['unit'];
-       $common_name  = $rec['common_name'];
-       $email        = $rec['email'];
-
-       # Wait here if another user has the database locked.
-       $fd = fopen($config['index'],"a");
-       flock($fd, LOCK_EX);
-
-       # Get the next available serial number
-       $serial = trim(implode('',file($config['serial'])));
-
-       $old_userkey = $config['private_dir'].'/'.$old_serial.'-key.pem';
-       $old_userreq = $config['req_dir'].'/'.$old_serial.'-req.pem';
-       $userkey     = $config['private_dir'].'/'.$serial.'-key.pem';
-       $userreq     = $config['req_dir'].'/'.$serial.'-req.pem';
-       $usercert    = $config['new_certs_dir'].'/'.$serial.'.pem';
-       $userder     = $config['cert_dir'].'/'.$serial.'.der';
-       $userpfx     = $config['pfx_dir'].'/'.$serial.'.pfx';
-
-       $expiry_days = round($expiry * 365.25, 0);
-
-       $cmd_output = array();
-       $ret = 0;
-
-       # Create a new certificate request by copying the old request.
-       if (! file_exists($old_userreq) || ! copy($old_userreq,$userreq)) {
-               $cmd_output[] = 'Could not create new certificate request file.';
-               $ret = 1;
-       }
-
-       # Copy private key to new file.
-       if ($ret == 0 && (! file_exists($old_userkey) || ! copy($old_userkey,$userkey))) {
-               $cmd_output[] = "Could not update private key file.";
-               $ret = 1;
-       }
-       
-       $cnf_file = CA_create_cnf($country,$province,$locality,$organization,$unit,$common_name,$email);
-
-       # "friendly name" of PKCS12 certificate.
-       $friendly_name = escshellarg($rec['common_name']);
-
-       # Escape dangerous characters in user input.
-       $_passwd    = escshellarg($passwd);
-
-       # Sign the certificate request and create the certificate.
-       if ($ret == 0) {
-               unset($cmd_output);
-               $cmd_output[] = "Signing the $cert_type certificate request.";
-               exec(CA." -config '$cnf_file' -in '$userreq' -out /dev/null -notext -days '$expiry_days' -passin pass:'$config[ca_pwd]' -batch -extensions $extensions 2>&1", $cmd_output, $ret);
-       };
-
-       # Create DER format certificate
-       if ($ret == 0) {
-               unset($cmd_output);
-               $cmd_output[] = "Creating DER format certificate.";
-               exec(X509." -in '$usercert' -out '$userder' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
-       };
-
-       # Create a PKCS12 certificate file for download to Windows
-       if ($ret == 0) {
-               unset($cmd_output);
-               $cmd_output[] = "Creating PKCS12 format certificate.";
-               if (($_passwd) && ($_passwd != "''")) {
-                       $cmd_output[] = "infile: $usercert   keyfile: $userkey   outfile: $userpfx  pass: $_passwd";
-                       exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name -rand '$config[random]' -passin pass:$_passwd -passout pass:$_passwd  2>&1", $cmd_output, $ret);
-               }
-               else {
-                       $cmd_output[] = "infile: $usercert   keyfile: $userkey   outfile: $userpfx";
+//
+function CA_renew_cert($old_serial, $expiry, $passwd)
+{
+    global $config;
+
+    # Do not renew a revoked certificate if a valid one exists for this
+    # URL.  Find and renew the valid certificate instead.
+    if (CAdb_is_revoked($old_serial)) {
+        $ret = CAdb_in(CA_cert_email($old_serial), CA_cert_cname($old_serial));
+        if ($ret && $old_serial != $ret) {
+            $old_serial = $ret;
+        }
+    }
+
+    # Valid certificates must be revoked prior to renewal.
+    if (CAdb_is_valid($old_serial)) {
+        $ret = CA_revoke_cert($old_serial);
+        if (! $ret[0]) {
+            return $ret;
+        }
+    }
+
+    $cert_type  = CA_cert_type($old_serial);
+    $extensions = $cert_type.'_ext';
+
+    # Get common_name from old certificate for use as the
+    # "friendly name" of PKCS12 certificate.
+    $rec = CAdb_get_entry($old_serial);
+    $country      = $rec['country'];
+    $province     = $rec['province'];
+    $locality     = $rec['locality'];
+    $organization = $rec['organization'];
+    $unit         = $rec['unit'];
+    $common_name  = $rec['common_name'];
+    $email        = $rec['email'];
+
+    # Wait here if another user has the database locked.
+    $fd = fopen($config['index'], "a");
+    flock($fd, LOCK_EX);
+
+    # Get the next available serial number
+    $serial = trim(implode('', file($config['serial'])));
+
+    $old_userkey = $config['private_dir'] . "$old_serial-key.pem";
+    $old_userreq = $config['req_dir'] . "/$old_serial-req.pem";
+    $userkey     = $config['private_dir'] . "/$serial-key.pem";
+    $userreq     = $config['req_dir'] . "/$serial-req.pem";
+    $usercert    = $config['new_certs_dir'] . "/$serial.pem";
+    $userder     = $config['cert_dir'] . "/$serial.der";
+    $userpfx     = $config['pfx_dir'] . "/$serial.pfx";
+
+
+    $expiry_days = round($expiry * 365.25, 0);
+
+    $cmd_output = array();
+    $ret = 0;
+
+    # Create a new certificate request by copying the old request.
+    if (! file_exists($old_userreq) || ! copy($old_userreq, $userreq)) {
+        $cmd_output[] = 'Could not create new certificate request file.';
+        $ret = 1;
+    }
+
+    # Copy private key to new file.
+    if ($ret == 0 && (! file_exists($old_userkey) || ! copy($old_userkey, $userkey))) {
+        $cmd_output[] = "Could not update private key file.";
+        $ret = 1;
+    }
+
+    $cnf_file = CA_create_cnf($country, $province, $locality, $organization, $unit, $common_name, $email);
+
+    # "friendly name" of PKCS12 certificate.
+    $friendly_name = escshellarg($rec['common_name']);
+
+    # Escape dangerous characters in user input.
+    $_passwd    = escshellarg($passwd);
+
+    $configCa_pwd = $config['ca_pwd'];
+    $configCacert_pem = $config['cacert_pem'];
+    $configOrganization = $config['organization'];
+    $configRandom = $config['random'];
+
+    # Sign the certificate request and create the certificate.
+    if ($ret == 0) {
+        unset($cmd_output);
+        $cmd_output[] = "Signing the $cert_type certificate request.";
+        exec(CA." -config '$cnf_file' -in '$userreq' -out /dev/null -notext -days '$expiry_days' -passin pass:'$configCa_pwd' -batch -extensions $extensions 2>&1", $cmd_output, $ret);
+    };
+
+    # Create DER format certificate
+    if ($ret == 0) {
+        unset($cmd_output);
+        $cmd_output[] = "Creating DER format certificate.";
+        exec(X509." -in '$usercert' -out '$userder' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
+    };
+
+    # Create a PKCS12 certificate file for download to Windows
+    if ($ret == 0) {
+        unset($cmd_output);
+        $cmd_output[] = "Creating PKCS12 format certificate.";
+        if (($_passwd) && ($_passwd != "''")) {
+            $cmd_output[] = "infile: $usercert   keyfile: $userkey   outfile: $userpfx  pass: $_passwd";
+            exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$configCacert_pem' -caname '$configOrganization' -out '$userpfx' -name $friendly_name -rand '$configRandom' -passin pass:$_passwd -passout pass:$_passwd  2>&1", $cmd_output, $ret);
+        } else {
+            $cmd_output[] = "infile: $usercert   keyfile: $userkey   outfile: $userpfx";
             // reetp - this needs looking at
-                       exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name  -nodes -passout pass: 2>&1", $cmd_output, $ret);
-                       //exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name  -nodes 2>&1", $cmd_output, $ret);
+            exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$configCacert_pem' -caname '$configOrganization' -out '$userpfx' -name $friendly_name  -nodes -passout pass: 2>&1", $cmd_output, $ret);
+            //exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name  -nodes 2>&1", $cmd_output, $ret);
+        }
+    };
 
-               }
-       };
-       
-       #Unlock the CA database
-       fclose($fd);
-
-       # https://github.com/radicand/phpki/issues/14
-       if (preg_match('E-mail Protection', $certtext) && preg_match('Code Signing', $certtest)) {
-       $cert_type = 'email_signing';
-       }
-       if (preg_match('E-mail Protection', $certtext)) {
-       $cert_type = 'email';
-       }
-       
-       #Remove temporary openssl config file.
-       if (file_exists($cnf_file)) unlink($cnf_file);
-
-       if ($ret == 0) {
-               return array(true, $serial);
-       }
-       else {
-               # Not successful, so clean up before exiting.
-               CA_remove_cert($serial);
-
-               if (eregi_array('.*private key.*',$cmd_output))
-                       $cmd_output[] = '<strong>This was likely caused by entering the wrong certificate password.</strong>';
-               else
-                       $cmd_output[] = '<strong>Click on the "Help" link above for information on how to report this problem.</strong>';
+    #Unlock the CA database
+    fclose($fd);
+
+    # https://github.com/radicand/phpki/issues/14
+    if (preg_match('E-mail Protection', $certtext) && preg_match('Code Signing', $certtest)) {
+        $cert_type = 'email_signing';
+    }
+    if (preg_match('E-mail Protection', $certtext)) {
+        $cert_type = 'email';
+    }
+
+    #Remove temporary openssl config file.
+    if (file_exists($cnf_file)) {
+        unlink($cnf_file);
+    }
+
+    if ($ret == 0) {
+        return array(true, $serial);
+    } else {
+        # Not successful, so clean up before exiting.
+        CA_remove_cert($serial);
+
+        if (eregi_array('.*private key.*', $cmd_output)) {
+            $cmd_output[] = '<strong>This was likely caused by entering the wrong certificate password.</strong>';
+        } else {
+            $cmd_output[] = '<strong>Click on the "Help" link above for information on how to report this problem.</strong>';
+        }
 
-               return array(false, implode('<br>',$cmd_output));
-       }
+        return array(false, implode('<br>', $cmd_output));
+    }
 }
 
 //
-// Creates a new Certificate Revocation List and copies it the the approriate 
+// Creates a new Certificate Revocation List and copies it the the approriate
 // locations. Returns error messages from failed commands.
 //
-function CA_generate_crl() {
-       global $config;
+function CA_generate_crl()
+{
+    global $config;
+
+    $configOpenssl_cnf = $config['openssl_cnf'];
+    $configCacrl_pem = $config['cacrl_pem'];
+    $configCa_pwd = $config['ca_pwd'];
+    $configCacrl_der = $config['cacrl_der'];
+    $ret = 0;
+
+    $cmd_output[] = "Generating Certificate Revocation List.";
+    exec(CA. " -gencrl -config '$configOpenssl_cnf' -out '$configCacrl_pem' -passin pass:'$configCa_pwd' 2>&1", $cmd_output, $ret);
+
+    if ($ret == 0) {
+        unset($cmd_output);
+        $cmd_output[] = "Creating DER format Certificate Revocation List.";
+        exec(CRL." -in '$configCacrl_der' -out '$configCacrl_der' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
+    }
 
-       $ret = 0;
-
-       $cmd_output[] = "Generating Certificate Revocation List.";
-       exec(CA. " -gencrl -config '$config[openssl_cnf]' -out '$config[cacrl_pem]' -passin pass:'$config[ca_pwd]' 2>&1", $cmd_output, $ret);
-
-       if ($ret == 0) {
-               unset($cmd_output);
-               $cmd_output[] = "Creating DER format Certificate Revocation List.";
-               exec(CRL." -in '$config[cacrl_pem]' -out '$config[cacrl_der]' -inform PEM -outform DER 2>&1", $cmd_output, $ret);
-       }
-
-       return array(($ret == 0 ? true : false), implode('<br>',$cmd_output));
+    return array(($ret == 0 ? true : false), implode('<br>', $cmd_output));
 }
 
 //
 // Removes a specified certificate from the certificate index,
 // and all traces of it from the file system.
 //
-function CA_remove_cert($serial) {
-       global $config;
-
-       $userreq  = $config['req_dir'].'/'.$serial.'-req.pem';
-       $userkey  = $config['private_dir'].'/'.$serial.'-key.pem';
-       $usercert = $config['new_certs_dir'].'/'.$serial.'.pem';
-       $userder  = $config['cert_dir'].'/'.$serial.'.der';
-       $userpfx  = $config['pfx_dir'].'/'.$serial.'.pfx';
-       
-
-       # Wait here if another user has the database locked.
-       $fd = fopen($config['index'],'a');
-       flock($fd, LOCK_EX);
+function CA_remove_cert($serial)
+{
+    global $config;
+
+    $userreq  = $config['req_dir'] . "/$serial-req.pem";
+    $userkey  = $config['private_dir'] . "/$serial-key.pem";
+    $usercert = $config['new_certs_dir'] . "/$serial.pem";
+    $userder  = $config['cert_dir'] . "/$serial.der";
+    $userpfx  = $config['pfx_dir'] ."/$serial.pfx";
+
+    $configIndex = $config['index'];
+
+    # Wait here if another user has the database locked.
+    $fd = fopen($configIndex, 'a');
+    flock($fd, LOCK_EX);
+
+    if (file_exists($userreq)) {
+        unlink($userreq);
+    }
+    if (file_exists($userkey)) {
+        unlink($userkey);
+    }
+    if (file_exists($usercert)) {
+        unlink($usercert);
+    }
+    if (file_exists($userder)) {
+        unlink($userder);
+    }
+    if (file_exists($userpfx)) {
+        unlink($userpfx);
+    }
+
+    $tmpfile = $configIndex .'.tmp';
+    copy($configIndex, $tmpfile);
+
+    $regexp = "^[VR]\t.*\t.*\t".$serial."\t.*\t.*$";
+    exec('egrep -v '.escshellarg($regexp)." $tmpfile > $configIndex 2>/dev/null");
 
-       if( file_exists($userreq))  unlink($userreq);
-       if( file_exists($userkey))  unlink($userkey);
-       if( file_exists($usercert)) unlink($usercert);
-       if( file_exists($userder))  unlink($userder);
-       if( file_exists($userpfx))  unlink($userpfx);
-
-       $tmpfile = $config['index'].'.tmp';
-       copy($config['index'], $tmpfile);
-
-       $regexp = "^[VR]\t.*\t.*\t".$serial."\t.*\t.*$";
-       exec('egrep -v '.escshellarg($regexp)." $tmpfile > $config[index] 2>/dev/null");
-
-       unlink($tmpfile);
-       fclose($fd);
-       
+    unlink($tmpfile);
+    fclose($fd);
 }
 
 //
-// Returns the likely intended use for a specified certificate 
+// Returns the likely intended use for a specified certificate
 // (email, server, vpn).
 //
-function CA_cert_type($serial) {
+function CA_cert_type($serial)
+{
 
-       $certtext = CA_cert_text($serial);
+    $certtext = CA_cert_text($serial);
 
-       #if (ereg('OpenSSL.* (E.?mail|Personal) .*Certificate', $certtext) && ereg('Code Signing', $certtest)) {
-       if (preg_match('~OpenSSL.* (E.?mail|Personal) .*Certificate~', $certtext) && preg_match('~Code Signing~', $certtest)) {
-               $cert_type = 'email_codesigning';
-       }
-       #if (ereg('OpenSSL.* (E.?mail|Personal) .*Certificate', $certtext)) {
-       if (preg_match('~OpenSSL.* (E.?mail|Personal) .*Certificate~', $certtext)) {
-               $cert_type = 'email';
-       }
-       #elseif (ereg('OpenSSL.* Server .*Certificate', $certtext)) {
-       elseif (preg_match('~OpenSSL.* Server .*Certificate~', $certtext)) {
-               $cert_type = 'server';
-       }
-       #elseif (ereg('timeStamping|Time Stamping', $certtext)) {
-       elseif (preg_match('~timeStamping|Time Stamping~', $certtext)) {
-               $cert_type = 'time_stamping';
-       }
-       #elseif (ereg('TLS Web Client Authentication', $certtext) && ereg('TLS Web Server Authentication', $certtext)) {
-       elseif (preg_match('~TLS Web Client Authentication~', $certtext) && preg_match('~TLS Web Server Authentication~', $certtext)) {
-               $cert_type = 'vpn_client_server';
-       }
-       #elseif (ereg('TLS Web Client Authentication', $certtext)) {
-       elseif (preg_match('~TLS Web Client Authentication~', $certtext)) {
-               $cert_type = 'vpn_client';
-       }
-       #elseif (ereg('TLS Web Server Authentication', $certtext)) {
-       elseif (preg_match('~TLS Web Server Authentication~', $certtext)) {
-               $cert_type = 'vpn_server';
-       }
-       else {
-               $cert_type = 'vpn_client_server';
-       }
-
-       return $cert_type;
-}
-
-function CA_get_root_pem() {
-       global $config;
-       return(file_get_contents($config['cacert_pem']));
+    #if (ereg('OpenSSL.* (E.?mail|Personal) .*Certificate', $certtext) && ereg('Code Signing', $certtest)) {
+    if (preg_match('~OpenSSL.* (E.?mail|Personal) .*Certificate~', $certtext) && preg_match('~Code Signing~', $certtest)) {
+        $cert_type = 'email_codesigning';
+    }
+    #if (ereg('OpenSSL.* (E.?mail|Personal) .*Certificate', $certtext)) {
+    if (preg_match('~OpenSSL.* (E.?mail|Personal) .*Certificate~', $certtext)) {
+        $cert_type = 'email';
+    } #elseif (ereg('OpenSSL.* Server .*Certificate', $certtext)) {
+    elseif (preg_match('~OpenSSL.* Server .*Certificate~', $certtext)) {
+        $cert_type = 'server';
+    } #elseif (ereg('timeStamping|Time Stamping', $certtext)) {
+    elseif (preg_match('~timeStamping|Time Stamping~', $certtext)) {
+        $cert_type = 'time_stamping';
+    } #elseif (ereg('TLS Web Client Authentication', $certtext) && ereg('TLS Web Server Authentication', $certtext)) {
+    elseif (preg_match('~TLS Web Client Authentication~', $certtext) && preg_match('~TLS Web Server Authentication~', $certtext)) {
+        $cert_type = 'vpn_client_server';
+    } #elseif (ereg('TLS Web Client Authentication', $certtext)) {
+    elseif (preg_match('~TLS Web Client Authentication~', $certtext)) {
+        $cert_type = 'vpn_client';
+    } #elseif (ereg('TLS Web Server Authentication', $certtext)) {
+    elseif (preg_match('~TLS Web Server Authentication~', $certtext)) {
+        $cert_type = 'vpn_server';
+    } else {
+        $cert_type = 'vpn_client_server';
+    }
+
+    return $cert_type;
+}
+
+function CA_get_root_pem()
+{
+    global $config;
+    return(file_get_contents($config['cacert_pem']));
 }
-
-?>
diff -ruN phpki-ng.old/phpki-ng-0.84/main.php phpki-ng/phpki-ng-0.84/main.php
--- phpki-ng.old/phpki-ng-0.84/main.php 2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/main.php     2021-03-07 19:33:03.079323832 +0100
@@ -8,72 +8,66 @@
 
 $stage = gpvar('stage');
 
-switch($stage) {
+switch ($stage) {
+    case 'dl_root':
+        upload($config['cacert_pem'], $config['ca_prefix'] . "cacert.crt", 'application/x-x509-ca-cert');
+        break;
+
+    case 'display_root':
+        printHeader('public');
+
+        ?>
+        <center><h2>Root Certificate (PEM Encoded)</h2></center>
+        <p><pre><?php echo  CA_get_root_pem() ?></pre></p>
+        <p>
+        <form action="<?php echo $PHP_SELF?>" method="post">
+            <input type=submit name=submit value="Back to Menu">
+        </form>
+    <?php
+        break;
+
+    case 'dl_crl':
+        upload($config['cacrl_der'], $config['ca_prefix'] . "cacrl.crl", 'application/pkix-crl');
+        break;
+
+    case 'dl_crl_pem':
+           upload($config['cacrl_pem'], $config['ca_prefix'] . "cacrl.crl", 'application/octet-stream');
+        break;
+
+    default:
+        printHeader('public');
+
+        ?>
+        <br>
+        <br>
+        <center>
+        <table class=menu width=500><th class=menu colspan=2><big>PUBLIC CONTENT MENU<big></th>
+            <tr>
+                <td style="text-align: center; vertical-align: middle; font-weight: bold;" width=35%> <a href=search.php>Search for a Certificate</a></td>
+                <td>Find a digital certificate to download and install in your e-mail or browser application.</td>
+            </tr>
+        
+            <tr>
+                <td style="text-align: center; vertical-align: middle; font-weight: bold;"> <a href=<?php echo $PHP_SELF?>?stage=dl_root>Download Our Root Certificate</a> </td>
+                <td>You must install our "Root" certificate before you can use any of the certificates issued here. <a href=help.php target=_help>Read the online help</a> to learn more about this.</td>
+            </tr>
+            
+            <tr>
+                <td style="text-align: center; vertical-align: middle; font-weight: bold;"> <a href=<?php echo $PHP_SELF?>?stage=display_root>Display Our Root Certificate (PEM Encoded)</a></td>
+                <td>This option provides the "Root" certificate PEM encoded text for advanced users to manually install via copy and paste. <a href=help.php target=_help>Read the online help</a> to learn more about this.</td>
+        
+            <tr>
+                <td style="text-align: center; vertical-align: middle; font-weight: bold;"> <a href=<?php echo $PHP_SELF?>?stage=dl_crl>Download Our Certificate Revocation List</a></td>
+                <td>The official list of certificates revoked by this site.  Installation and use of this list is optional. Some e-mail programs will reference this list automagically. (<a href="<?php echo $PHP_SELF?>?stage=dl_crl_pem">Some will need it in PEM format.</a>)</td>
+            </tr>
+        </table>
+        </center>
+        <br>
+        <br>
 
-case 'dl_root':
-       upload("$config[cacert_pem]", "$config[ca_prefix]cacert.crt", 'application/x-x509-ca-cert');
-       break;
-
-case 'display_root':
-       printHeader('public');
-
-       ?>
-       <center><h2>Root Certificate (PEM Encoded)</h2></center>
-       <p>
-       <pre><?php echo  CA_get_root_pem() ?></pre>
-       <p>
-       <form action="<?php echo $PHP_SELF?>" method="post">
-               <input type=submit name=submit value="Back to Menu">
-       </form>
-       <?php
-       break;
-
-case 'dl_crl':
-       upload("$config[cacrl_der]", "$config[ca_prefix]cacrl.crl", 'application/pkix-crl');
-       break;
-
-case 'dl_crl_pem':
-       upload("$config[cacrl_pem]", "$config[ca_prefix]cacrl.crl", 'application/octet-stream');
-       break;
-
-default:
-       printHeader('public');
-
-       ?>
-       <br>
-       <br>
-       <center>
-       <table class=menu width=500><th class=menu colspan=2><big>PUBLIC CONTENT MENU<big></th>
-       
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;" width=35%>
-       <a href=search.php>Search for a Certificate</a></td>
-       <td>Find a digital certificate to download and install in your e-mail or browser application.</td></tr>
-       
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
-       <a href=<?php echo $PHP_SELF?>?stage=dl_root>Download Our Root Certificate</a></td>
-       <td>You must install our "Root" certificate before you can use any of the 
-       certificates issued here. <a href=help.php target=_help>Read the online help</a> 
-       to learn more about this.</td></tr>
-       
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
-       <a href=<?php echo $PHP_SELF?>?stage=display_root>Display Our Root Certificate (PEM Encoded)</a></td>
-       <td>This option provides the "Root" certificate PEM encoded text for advanced users 
-       to manually install via copy and paste. <a href=help.php target=_help>Read the online help</a> 
-       to learn more about this.</td>
-
-       <tr><td style="text-align: center; vertical-align: middle; font-weight: bold;">
-       
-       <a href=<?php echo $PHP_SELF?>?stage=dl_crl>Download Our Certificate Revocation List</a></td>
-       <td>The official list of certificates revoked by this site.  Installation and use of 
-       this list is optional. Some e-mail programs will reference this list automagically.
-       (<a href="<?php echo $PHP_SELF?>?stage=dl_crl_pem">Some will need it in PEM format.</a>)</td></tr>
-       
-       </table>
-       </center>
-       <br><br>
-       <?php
+    <?php
 
-       printFooter();
+    printFooter();
 }
 
 ?>
diff -ruN phpki-ng.old/phpki-ng-0.84/ns_revoke_query.php phpki-ng/phpki-ng-0.84/ns_revoke_query.php
--- phpki-ng.old/phpki-ng-0.84/ns_revoke_query.php      2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/ns_revoke_query.php  2021-03-07 19:33:03.080323846 +0100
@@ -7,10 +7,10 @@
 #
 # PROTOCOL:
 # The client should issue an HTTP GET request using a URL that is
-# the concatenation of the revocation url and certificate serial 
+# the concatenation of the revocation url and certificate serial
 # number. (i.e. http://www.host.dom/phpki/ns_revoke_query.php?10A5F2)
 #
-# The server should return a document of type 
+# The server should return a document of type
 # application/x-netscape-revocation containing a single character
 # '1' if the certificate is revoked, '0' if it is valid.
 #
@@ -23,9 +23,10 @@
 # old Reg Ex doesnt work, new should do the work
 #$regexp = "^R\t.*\t.*\t$serial\t.*\t.*$";
 $regexp = "^R.*$serial.*$";
+$configIndex = $config['index'];
 
-if (exec("egrep '$regexp' $config[index]"))
-       print '1';
-else
-       print '0';
-?>
+if (exec("egrep '$regexp' '$configIndex'")) {
+    print '1';
+} else {
+    print '0';
+}
diff -ruN phpki-ng.old/phpki-ng-0.84/policy.html phpki-ng/phpki-ng-0.84/policy.html
--- phpki-ng.old/phpki-ng-0.84/policy.html      2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/policy.html  2021-03-07 19:33:03.080323846 +0100
@@ -1,14 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+
 <html>
 <head>
-<title>Certificate Authority Issuer's Statement</title>
+  <title>Certificate Authority Issuer's Statement</title>
 </head>
+
 <body>
-<h1 align=center>Certificate Authority Issuer's Statement</h2>
-<p>
-This is a private Limited Liability certificate authority for use by member
-non-profit agencies.
-<p>
-Certificate non-repudiation is achieved via identity verification by password
-authorized certificate managers from each member agency.
+  <h1 align="center">Certificate Authority Issuer's Statement</h1>
+
+  <p>This is a private Limited Liability certificate authority for use by member non-profit agencies.</p>
+
+  <p>Certificate non-repudiation is achieved via identity verification by password authorized certificate managers from each member agency.</p>
 </body>
 </html>
diff -ruN phpki-ng.old/phpki-ng-0.84/readme.php phpki-ng/phpki-ng-0.84/readme.php
--- phpki-ng.old/phpki-ng-0.84/readme.php       2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/readme.php   2021-03-07 19:33:03.081323860 +0100
@@ -10,4 +10,3 @@
 readfile('./README.md');
 print '</pre>';
 printFooter();
-?>
diff -ruN phpki-ng.old/phpki-ng-0.84/search.php phpki-ng/phpki-ng-0.84/search.php
--- phpki-ng.old/phpki-ng-0.84/search.php       2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/search.php   2021-03-07 19:33:03.081323860 +0100
@@ -15,132 +15,137 @@
 $show_expired = gpvar('show_expired');
 
 # Force stage back to search form if search string is empty.
-if ($stage == "search" && ! $search) $stage = "";
+if ($stage == "search" && ! $search) {
+    $stage = "";
+}
 
 # Force filter to (V)alid certs if no search status is selected.
-if ( !($show_valid.$show_revoked.$show_expired) ) $show_valid = 'V';
+if (!($show_valid.$show_revoked.$show_expired)) {
+    $show_valid = 'V';
+}
 
 switch ($stage) {
-case 'display':
-       printHeader('about');
+    case 'display':
+        printHeader('about');
+
+        print '
+  <center><h2>Certificate Details</h2></center>
+  <center><font color=#0000AA><h3>(#'.htvar($serial).')<br>'.htvar(CA_cert_cname($serial).' <'.CA_cert_email($serial).'>').'</h3></font></center>';
 
-       print '
-       <center><h2>Certificate Details</h2></center>
-       <center><font color=#0000AA><h3>(#'.htvar($serial).')<br>'.htvar(CA_cert_cname($serial).' <'.CA_cert_email($serial).'>').'</h3></font></center>';
-
-       if ($revoke_date = CAdb_is_revoked($serial))
-       print '<center><font color=red><h2>REVOKED '.htvar($revoke_date).'</h2></font></center>';
-
-       print '<pre>'.htvar(CA_cert_text($serial)).'</pre>';
-       break;
-
-case 'download':
-       $rec = CAdb_get_entry($serial);
-       upload("$config[cert_dir]/$serial.der", "$rec[common_name].cer", 'application/pkix-cert');
+        if ($revoke_date = CAdb_is_revoked($serial)) {
+            print '<center><font color=red><h2>REVOKED '.htvar($revoke_date).'</h2></font></center>';
+        }
+
+        print '<pre>'.htvar(CA_cert_text($serial)).'</pre>';
         break;
 
-case 'download_pem':
-    $rec = CAdb_get_entry($serial);
-    upload("$config[new_certs_dir]/$serial.pem", "$rec[common_name].pem", 'application/pkix-cert');
-       break;
-
-case 'search':
-       printHeader('public');
-
-       $db = CAdb_to_array("^[${show_valid}${show_revoked}${show_expired}].*$search");
-
-       print '<body onLoad="self.focus();document.form.submit.focus()">';
-       if (sizeof($db) == 0) {
-               ?>
-               <center>
-               <h2>Nothing Found</h2>
-               <form action="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?>" method="post" name="form">
-               <input type=hidden name=search value="<?php echo htvar($search)?>">
-               <input type=hidden name=show_valid value="<?php echo htvar($show_valid)?>">
-               <input type=hidden name=show_revoked value="<?php echo htvar($show_revoked)?>">
-               <input type=hidden name=show_expired value="<?php echo htvar($show_expired)?>">
-               <input type=submit name=submit value="Go Back">
-               </form>
-               </center>
-               <?php
-               printFooter();
-               break;
-       }
+    case 'download':
+        $rec = CAdb_get_entry($serial);
+        upload($config['cert_dir'] . "/$serial.der", $rec['common_name'] . ".cer", 'application/pkix-cert');
+        break;
 
-       print '<table>';
-       print '<th colspan=9><big>CERTIFICATE SEARCH RESULTS</big></th>';
+    case 'download_pem':
+        $rec = CAdb_get_entry($serial);
+        upload($config['new_certs_dir'] . "/$serial.pem", $rec['common_name'] . ".pem", 'application/pkix-cert');
+        break;
+
+    case 'search':
+        printHeader('public');
+
+        $db = CAdb_to_array("^[${show_valid}${show_revoked}${show_expired}].*$search");
+
+        print '<body onLoad="self.focus();document.form.submit.focus()">';
+        if (sizeof($db) == 0) {
+            ?>
+            <center>
+            <h2>Nothing Found</h2>
+            <form action="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?>" method="post" name="form">
+        <input type=hidden name=search value="<?php echo htvar($search)?>">
+        <input type=hidden name=show_valid value="<?php echo htvar($show_valid)?>">
+        <input type=hidden name=show_revoked value="<?php echo htvar($show_revoked)?>">
+        <input type=hidden name=show_expired value="<?php echo htvar($show_expired)?>">
+        <input type=submit name=submit value="Go Back">
+        </form>
+        </center>
+        <?php
+        printFooter();
+        break;
+        }
+
+        print '<table>';
+        print '<th colspan=9><big>CERTIFICATE SEARCH RESULTS</big></th>';
 
         $headings = array(
                 status=>"Status", issued=>"Issued", expires=>"Expires",
                 common_name=>"User's Name", email=>"E-mail",
                 organization=>"Organization", unit=>"Department",
                 locality=>"Locality", province=>"State"
-        );
+            );
+
+            print '<tr>';
+        foreach ($headings as $field => $head) {
+            print '<th>'.htvar($head). '</th>';
+        }
+            print '</tr>';
+
+        foreach ($db as $rec) {
+            $stcolor = array(Valid=>'green',Revoked=>'red',Expired=>'orange');
 
-        print '<tr>';
-        foreach($headings as $field=>$head) {
-                print '<th>'.htvar($head). '</th>';
+            ?>
+            <tr style="font-size: 11px;">
+            <td style="color: <?php echo $stcolor[$rec['status']]?>; font-weight: bold"><?php echo htvar($rec['status'])?></td>
+        <td style="white-space: nowrap"><?php echo htvar($rec['issued'])?></td>
+        <td style="white-space: nowrap"><?php echo htvar($rec['expires'])?></td>
+        <td><?php echo htvar($rec['common_name'])?></td>
+        <td style="white-space: nowrap"><a href="mailto: <?php echo htvar($rec['common_name']).'<'.htvar($rec['email']).'>' ?> "> <?php echo htvar($rec['email'])?></a></td>
+        <td><?php echo htvar($rec['organization'])?></td>
+        <td><?php echo htvar($rec['unit'])?></td>
+        <td><?php echo htvar($rec['locality'])?></td>
+        <td><?php echo htvar($rec['province'])?></td>
+        <td><a href="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?>?stage=display&serial=<?php echo htvar($rec['serial'])?>" target=_certdisp><img src=images/display.png alt="Display" title="Display the certificate in excruciating detail"></a>
+        <?php
+        if ($rec['status'] != 'Revoked') {
+            ?>
+            <a href="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?>?stage=download&serial=<?php echo htvar($rec['serial'])?>"><img src=images/download.png alt="Download" title="Download the certificate so that you may send encrypted e-mail"></a>
+            <a href="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?>?stage=download_pem&serial=<?=htvar($rec['serial'])?>"><img src=images/download.png alt="Download (in PEM format)" title="Download in PEM format"></a>
+            <?php
         }
-        print '</tr>';
+        print '</td></tr>';
+        }
+
+        ?>
+        </table>
+
+        <form action="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?>" method="post" name="form">
+    <input type=submit name=submit value="Another Search">
+    <input type=hidden name=search value="<?php echo htvar($search)?>">
+    <input type=hidden name=show_valid value="<?php echo htvar($show_valid)?>">
+    <input type=hidden name=show_revoked value="<?php echo htvar($show_revoked)?>">
+    <input type=hidden name=show_expired value="<?php echo htvar($show_expired)?>">
+    </form>
+    <?php
+
+    printFooter();
+        break;
 
-       foreach($db as $rec) {
-               $stcolor = array(Valid=>'green',Revoked=>'red',Expired=>'orange');
+    default:
+        printHeader('public');
 
-               ?>
-               <tr style="font-size: 11px;">
-               <td style="color: <?php echo $stcolor[$rec['status']]?>; font-weight: bold"><?php echo htvar($rec['status'])?></td>
-               <td style="white-space: nowrap"><?php echo htvar($rec['issued'])?></td>
-               <td style="white-space: nowrap"><?php echo htvar($rec['expires'])?></td>
-               <td><?php echo htvar($rec['common_name'])?></td>
-               <td style="white-space: nowrap"><a href="mailto: <?php echo htvar($rec['common_name']).'<'.htvar($rec['email']).'>' ?> "> <?php echo htvar($rec['email'])?></a></td>
-               <td><?php echo htvar($rec['organization'])?></td>
-               <td><?php echo htvar($rec['unit'])?></td>
-               <td><?php echo htvar($rec['locality'])?></td>
-               <td><?php echo htvar($rec['province'])?></td>
-               <td><a href="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?> ?stage=display&serial=<?php echo htvar($rec['serial'])?>" target=_certdisp><img src=images/display.png alt="Display" title="Display the certificate in excruciating detail"></a>
-               <?php
-               if ($rec['status'] != 'Revoked') {
-                       ?>
-                       <a href="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?>?stage=download&serial=<?php echo htvar($rec['serial'])?>"><img src=images/download.png alt="Download" title="Download the certificate so that you may send encrypted e-mail"></a>
-                       <a href="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?>?stage=download_pem&serial=<?=htvar($rec['serial'])?>"><img src=images/download.png alt="Download (in PEM format)" title="Download in PEM format"></a>
-                       <?php
-               }
-               print '</td></tr>';
-       }
-
-       ?>
-       </table>
-
-       <form action="<?php echo htmlentities($_SERVER['SCRIPT_NAME'])?>" method="post" name="form">
-       <input type=submit name=submit value="Another Search">
-       <input type=hidden name=search value="<?php echo htvar($search)?>">
-       <input type=hidden name=show_valid value="<?php echo htvar($show_valid)?>">
-       <input type=hidden name=show_revoked value="<?php echo htvar($show_revoked)?>">
-       <input type=hidden name=show_expired value="<?php echo htvar($show_expired)?>">
-       </form>
-       <?php
-
-       printFooter();
-       break;
-
-default:
-       printHeader('public');
-
-       ?>
-       <body onLoad="self.focus();document.search.search.focus();">
-       <center><h2>Certificate Search</h2>
-       <form action="<?php echo $PHP_SELF?>" method="post" name="search">
-       <input type=text name=search value="<?php echo htvar($search)?>" maxlength=60 size=40>
-       <input type=submit name=submit value="Find It!"><br>
-       <input type=checkbox name=show_valid value="V" <?php echo ($show_valid?'checked':'')?>>Valid
-       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=checkbox name=show_revoked value="R" <?php echo ($show_revoked?'checked':'')?>>Revoked
-       &nbsp;&nbsp;&nbsp;&nbsp;<input type=checkbox name=show_expired value="E" <?php echo ($show_expired?'checked':'')?>>Expired
-       <input type=hidden name=stage value=search>
-       </form></center>
-
-       <br><br>
-       <?php
-       printFooter();
+        ?>
+        <body onLoad="self.focus();document.search.search.focus();">
+        <center><h2>Certificate Search</h2>
+        <form action="<?php echo $PHP_SELF?>" method="post" name="search">
+    <input type=text name=search value="<?php echo htvar($search)?>" maxlength=60 size=40>
+    <input type=submit name=submit value="Find It!"><br>
+    <input type=checkbox name=show_valid value="V" <?php echo ($show_valid?'checked':'')?>>Valid
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=checkbox name=show_revoked value="R" <?php echo ($show_revoked?'checked':'')?>>Revoked
+    &nbsp;&nbsp;&nbsp;&nbsp;<input type=checkbox name=show_expired value="E" <?php echo ($show_expired?'checked':'')?>>Expired
+    <input type=hidden name=stage value=search>
+    </form></center>
+
+    <br><br>
+    <?php
+    printFooter();
 }
 
 ?>
diff -ruN phpki-ng.old/phpki-ng-0.84/setup.php-presetup phpki-ng/phpki-ng-0.84/setup.php-presetup
--- phpki-ng.old/phpki-ng-0.84/setup.php-presetup       2020-04-02 14:22:47.000000000 +0200
+++ phpki-ng/phpki-ng-0.84/setup.php-presetup   2021-03-07 19:33:03.084323905 +0100
@@ -3,27 +3,27 @@
 include('./include/my_functions.php');
 include('./include/common.php');
 
-function flush_exec($command, $line_length=200) {
-        $handle = popen("$command 2>&1",'r');
+function flush_exec($command, $line_length = 200)
+{
+        $handle = popen("$command 2>&1", 'r');
 
         $line = '';
-        while (! feof($handle)) {
-                $chr = fread($handle, 1);
-                $line .= $chr;
-                if ($chr == "\n") {
-                        print str_replace("\n", "<br>\n", $line);
-                        $line = '';
-                        flush();
-                }
-                elseif (strlen($line) > $line_length) {
-                        print $line."<br>\n";
-                        $line = '';
-                        flush();
-                }
+    while (! feof($handle)) {
+            $chr = fread($handle, 1);
+            $line .= $chr;
+        if ($chr == "\n") {
+                print str_replace("\n", "<br>\n", $line);
+                $line = '';
+                flush();
+        } elseif (strlen($line) > $line_length) {
+                print $line."<br>\n";
+                $line = '';
+                flush();
         }
+    }
         print $line."<br>\n";
-       flush();
-       return;
+    flush();
+    return;
 }
 
 $version = PHPKI_VERSION;
@@ -69,7 +69,9 @@
 $header_title = gpvar('header_title');
 $store_dir    = gpvar('store_dir');
 
-if ($base_url && substr($base_url,-1) != '/') $base_url .= '/';
+if ($base_url && substr($base_url, -1) != '/') {
+    $base_url .= '/';
+}
 
 $hidden_fields = '
     <input type=hidden name=country value="' . htvar($country) . '">
@@ -101,62 +103,99 @@
 ';
 
 switch ($stage) {
-case 'validate':
-       $er = '';
+    case 'validate':
+        $er = '';
+
+        if (! $country) {
+            $er .= 'Missing Country<br>';
+        }
+        if (! $province) {
+            $er .= 'Missing State/Province<br>';
+        }
+        if (! $locality) {
+            $er .= 'Missing Locality<br>';
+        }
+        if (! $organization) {
+            $er .= 'Missing Organization<br>';
+        }
+        if (! $unit) {
+            $er .= 'Missing Unit/Department<br>';
+        }
+        if (! $contact) {
+            $er .= 'Missing Contact E-mail Address<br>';
+        }
+        if (! $common_name) {
+            $er .= 'Missing Common Name<br>';
+        }
+        if (! $passwd) {
+            $er .= 'Missing Certificate Password<br>';
+        }
+        if (! $passwdv) {
+            $er .= 'Missing Certificate Password Verification "Again"<br>';
+        }
+        if (! $header_title) {
+            $er .= 'Missing Header Title<br>';
+        }
+        if (! $passwd_file) {
+            $er .= 'Missing User Password File Location';
+        }
+        if (! $store_dir) {
+            $er .= 'Missing Storage Directory<br>';
+        }
 
-       if (! $country)      $er .= 'Missing Country<br>';
-       if (! $province)     $er .= 'Missing State/Province<br>';
-       if (! $locality)     $er .= 'Missing Locality<br>';
-       if (! $organization) $er .= 'Missing Organization<br>';
-       if (! $unit)         $er .= 'Missing Unit/Department<br>';
-       if (! $contact)      $er .= 'Missing Contact E-mail Address<br>';
-       if (! $common_name)  $er .= 'Missing Common Name<br>';
-       if (! $passwd)       $er .= 'Missing Certificate Password<br>';
-       if (! $passwdv)      $er .= 'Missing Certificate Password Verification "Again"<br>';
-       if (! $header_title) $er .= 'Missing Header Title<br>';
-       if (! $passwd_file)  $er .= 'Missing User Password File Location';
-       if (! $store_dir)    $er .= 'Missing Storage Directory<br>';
-
-       $countrycode = strtoupper($country);
-
-       if (! preg_match("/\b[A-Z][A-Z]\b/", $countrycode, $match) ) {
-           $er .= 'Country Code must be ISO 3166 two letters <br>'; 
-       }
-       
-       if ( $passwd && strlen($passwd) < 8 )
-               $er .= 'Certificate password is too short.<br>';
+        $countrycode = strtoupper($country);
+
+        if (! preg_match("/\b[A-Z][A-Z]\b/", $countrycode, $match)) {
+            $er .= 'Country Code must be ISO 3166 two letters <br>';
+        }
 
-       if ( $passwd and $passwd != $passwdv )
-               $er .= 'Password and password verification do not match.<br>';
+        if ($passwd && strlen($passwd) < 8) {
+            $er .= 'Certificate password is too short.<br>';
+        }
+
+        if ($passwd and $passwd != $passwdv) {
+            $er .= 'Password and password verification do not match.<br>';
+        }
 
-        if ( $contact && ! is_email($contact) )
+        if ($contact && ! is_email($contact)) {
                 $er .= 'E-mail address ('. htvar($contact) . ') may be invalid.<br>';
+        }
 
-       if (strpos($store_dir,$_SERVER['DOCUMENT_ROOT']) === 0)
-               $er .= 'Store directory must exist somewhere outside of DOCUMENT_ROOT ('.$_SERVER['DOCUMENT_ROOT'].').<br>';
+        if (strpos($store_dir, $_SERVER['DOCUMENT_ROOT']) === 0) {
+            $er .= 'Store directory must exist somewhere outside of DOCUMENT_ROOT ('.$_SERVER['DOCUMENT_ROOT'].').<br>';
+        }
 
-       if (strpos($store_dir,dirname($_SERVER['SCRIPT_FILENAME'])) === 0)
-               $er .= 'Store directory cannot exist within the PHPki installation directory ('.dirname($_SERVER['SCRIPT_FILENAME']).').<br>';
+        if (strpos($store_dir, dirname($_SERVER['SCRIPT_FILENAME'])) === 0) {
+            $er .= 'Store directory cannot exist within the PHPki installation directory ('.dirname($_SERVER['SCRIPT_FILENAME']).').<br>';
+        }
 
-       if (! $er) {
-               if (! file_exists($store_dir) ) {
-                       if ( ! mkdir("$store_dir",$store_perms)) $er .= "Could not create the store directory \"$store_dir\"<br>";
-               }
-
-               if (file_exists($store_dir)) {
-                       if (! chmod($store_dir, $store_perms)) $er .= "Could not change permissions on the store directory \"$store_dir\"<br>";
-                       if (! is_readable($store_dir))  $er .= "The store directory \"$store_dir\" is not readable by the web server user \"$uname\"<br>";
-                       if (! is_writeable($store_dir)) $er .= "The store directory \"$store_dir\: is not writeable by the web server user \"$uname\"<br>";
-               }
-               else {
-                       $er .= "Store directory \"$store_dir\" does not exist.  You will have to manually create it as desribed in the setup form.<br>";
-               }
-       }
+        if (! $er) {
+            if (! file_exists($store_dir)) {
+                if (! mkdir("$store_dir", $store_perms)) {
+                    $er .= "Could not create the store directory \"$store_dir\"<br>";
+                }
+            }
 
-        if ( $er )
+            if (file_exists($store_dir)) {
+                if (! chmod($store_dir, $store_perms)) {
+                    $er .= "Could not change permissions on the store directory \"$store_dir\"<br>";
+                }
+                if (! is_readable($store_dir)) {
+                    $er .= "The store directory \"$store_dir\" is not readable by the web server user \"$uname\"<br>";
+                }
+                if (! is_writeable($store_dir)) {
+                    $er .= "The store directory \"$store_dir\: is not writeable by the web server user \"$uname\"<br>";
+                }
+            } else {
+                $er .= "Store directory \"$store_dir\" does not exist.  You will have to manually create it as desribed in the setup form.<br>";
+            }
+        }
+
+        if ($er) {
                 $er = '<h2>ERROR(S) IN FORM:</h2><h4><blockquote>' . $er . '</blockquote></h4>';
+        }
 
-        if ($er)  {
+        if ($er) {
                 printHeader('setup');
                 ?>
 
@@ -171,95 +210,112 @@
 
                 printFooter();
                 break;
-       }
+        }
 
-case 'write':
-       
-       printHeader('about');
-
-       #
-       #Create the file store directory structure.
-       #
-
-       print '<strong>Creating PHPki file store...</strong><br>';
-       flush();
-
-       if (! file_exists("$store_dir/config")) mkdir("$store_dir/config",$store_perms);
-       if (! file_exists("$store_dir/tmp")) mkdir("$store_dir/tmp",$store_perms);
-       if (! file_exists("$store_dir/CA")) mkdir("$store_dir/CA",$store_perms);
-       if (! file_exists("$store_dir/CA/certs")) mkdir("$store_dir/CA/certs",$store_perms);
-       if (! file_exists("$store_dir/CA/private")) mkdir("$store_dir/CA/private",$store_perms);
-       if (! file_exists("$store_dir/CA/newcerts")) mkdir("$store_dir/CA/newcerts",$store_perms);
-       if (! file_exists("$store_dir/CA/requests")) mkdir("$store_dir/CA/requests",$store_perms);
-       if (! file_exists("$store_dir/CA/crl")) mkdir("$store_dir/CA/crl",$store_perms);
-       if (! file_exists("$store_dir/CA/pfx")) mkdir("$store_dir/CA/pfx",$store_perms);
-
-
-       #
-       # Create the PHPki CA configuration.
-       #
-       print '<strong>Writing configuration files...</strong><br>';
-       flush();
+    case 'write':
+        printHeader('about');
+
+        #
+        #Create the file store directory structure.
+        #
+
+        print '<strong>Creating PHPki file store...</strong><br>';
+        flush();
 
-       $config_main_txt = <<<EOS
+        if (! file_exists("$store_dir/config")) {
+            mkdir("$store_dir/config", $store_perms);
+        }
+        if (! file_exists("$store_dir/tmp")) {
+            mkdir("$store_dir/tmp", $store_perms);
+        }
+        if (! file_exists("$store_dir/CA")) {
+            mkdir("$store_dir/CA", $store_perms);
+        }
+        if (! file_exists("$store_dir/CA/certs")) {
+            mkdir("$store_dir/CA/certs", $store_perms);
+        }
+        if (! file_exists("$store_dir/CA/private")) {
+            mkdir("$store_dir/CA/private", $store_perms);
+        }
+        if (! file_exists("$store_dir/CA/newcerts")) {
+            mkdir("$store_dir/CA/newcerts", $store_perms);
+        }
+        if (! file_exists("$store_dir/CA/requests")) {
+            mkdir("$store_dir/CA/requests", $store_perms);
+        }
+        if (! file_exists("$store_dir/CA/crl")) {
+            mkdir("$store_dir/CA/crl", $store_perms);
+        }
+        if (! file_exists("$store_dir/CA/pfx")) {
+            mkdir("$store_dir/CA/pfx", $store_perms);
+        }
+
+
+        #
+        # Create the PHPki CA configuration.
+        #
+        print '<strong>Writing configuration files...</strong><br>';
+        flush();
+
+        $config_main_txt = <<<EOS
 <?php
 # PHPki CONFIGURATION FILE
 # Automatically generated by PHPki.  Edit at your own peril.
 #
-\$config['organization'] = '$organization';
-\$config['unit']         = '$unit';
-\$config['contact']      = '$contact';
-\$config['locality']     = '$locality';
-\$config['province']     = '$province';
-\$config['country']      = '$country';
-\$config['common_name']  = '$common_name';
+\$config['organization']  = '$organization';
+\$config['unit']          = '$unit';
+\$config['contact']       = '$contact';
+\$config['locality']      = '$locality';
+\$config['province']      = '$province';
+\$config['country']       = '$country';
+\$config['common_name']   = '$common_name';
 
 # Store Directory
-\$config['store_dir'] = '$store_dir';
+\$config['store_dir']     = '$store_dir';
 
 # Location HTTP Password File
-\$config['passwd_file'] = '$passwd_file';
+\$config['passwd_file']   = '$passwd_file';
 
 # Password for CA root certificate.
-\$config['ca_pwd'] = '$passwd';
+\$config['ca_pwd']        = '$passwd';
 
 # Number of years the root certificate is good.
-\$config['expiry'] = '$expiry';
+\$config['expiry']        = '$expiry';
 
 # CA certificate key size
-\$config['keysize'] = '$keysize';
+\$config['keysize']       = '$keysize';
 
 # This is superimposed over the PHPki logo on each page.
-\$config['header_title'] = '$header_title';
+\$config['header_title']  = '$header_title';
 
 # String to prefix cer and crl uploads
-\$config['ca_prefix'] = '$ca_prefix';
+\$config['ca_prefix']     = '$ca_prefix';
 
 # Location of your OpenSSL binary.
-\$config['openssl_bin'] = '$openssl_bin';
+\$config['openssl_bin']   = '$openssl_bin';
 
 # Base URL
-\$config['base_url']  = '$base_url';
+\$config['base_url']      = '$base_url';
 
 # CRL Distribution points path
-\$config['crl_distrib']  = '$crl_distrib';
+\$config['crl_distrib']   = '$crl_distrib';
 
 # Certificate Revocation URL
-\$config['revoke_url']  = '$revoke_url';
+\$config['revoke_url']    = '$revoke_url';
 
 # Certificate Authority Policy URL
-\$config['policy_url']  = '$policy_url'; 
+\$config['policy_url']    = '$policy_url';
 
 # Certificate Comment Fields
 \$config['comment_root']  = '$comment_root';
-\$config['comment_email']  = '$comment_email';
+\$config['comment_email'] = '$comment_email';
 \$config['comment_sign']  = '$comment_sign';
-\$config['comment_srv']  = '$comment_srv';
-\$config['comment_stamp']  = '$comment_stamp';
+\$config['comment_srv']   = '$comment_srv';
+\$config['comment_stamp'] = '$comment_stamp';
 
 # Who users should contact if they have technical difficulty with
 # your certificate authority site.
-\$config['getting_help'] = '$getting_help';
+\$config['getting_help']  = '$getting_help';
 
 #
 # You shouldn't change anything below this line.  If you do, don't
@@ -275,17 +331,17 @@
 \$config['pfx_dir']       = \$config['ca_dir']   . '/pfx';
 \$config['index']         = \$config['ca_dir']   . '/index.txt';
 \$config['serial']        = \$config['ca_dir']   . '/serial';
-\$config['random']        = \$config['ca_dir'] . '/.rnd';
+\$config['random']        = \$config['ca_dir']   . '/.rnd';
+\$config['cacrl_pem']     = \$config['crl_dir']  . '/cacrl.pem';
+\$config['cacrl_der']     = \$config['crl_dir']  . '/cacrl.crl';
 \$config['cacert_pem']    = \$config['cert_dir'] . '/cacert.pem';
-\$config['cacrl_pem']     = \$config['crl_dir'] . '/cacrl.pem';
-\$config['cacrl_der']     = \$config['crl_dir'] . '/cacrl.crl';
 \$config['cakey']         = \$config['private_dir'] . '/cakey.pem';
 
 # Default OpenSSL Config File.
 \$config['openssl_cnf']   = \$config['home_dir'] . '/config/openssl.cnf';
 
 # Define default md
-\$config['default_md']         = 'sha512';
+\$config['default_md']    = 'sha512';
 
 \$PHPki_admins = Array(md5('admin'));
 
@@ -300,18 +356,18 @@
 ?>
 EOS;
 
-       #
-       # Write out the CA configuration file.
-       #
-       $fd = fopen("$store_dir/config/config.php",'w');
-       fwrite($fd, $config_main_txt);
-       fclose($fd);
+        #
+        # Write out the CA configuration file.
+        #
+        $fd = fopen("$store_dir/config/config.php", 'w');
+        fwrite($fd, $config_main_txt);
+        fclose($fd);
 
 
-       #
-       # Create the bootstrap configuration
-       #
-       $config_boot_txt = <<<EOS
+        #
+        # Create the bootstrap configuration
+        #
+        $config_boot_txt = <<<EOS
 <?php
 define('PHPKI_VERSION','$version');
 define('STORE_DIR','$store_dir');
@@ -320,224 +376,248 @@
 ?>
 EOS;
 
-       #
-       # Write out the bootstrap config
-       #
-       $fd = fopen('./config.php','w');
-       fwrite($fd, $config_boot_txt);
-       fclose($fd);
-
-
-       # Re-read the CA config file so the openssl_functions 
-       # can be used to create a CA root certificate.
-       include("$store_dir/config/config.php");
-
-       #
-       # Now create a temporary openssl.cnf for creating a self-signed
-       # CA root certificate, and create a generic openssl.cnf file 
-       # in the CA home
-       #
-       $config_txt1 = <<< EOS
-HOME                   = $config[home_dir]
-RANDFILE               = $config[random]
-dir                            = $config[ca_dir]
-certs                  = $config[cert_dir]
-crl_dir                        = $config[crl_dir]
-database               = $config[index]
-new_certs_dir  = $config[new_certs_dir]
-private_dir            = $config[private_dir]
-serial                 = $config[serial]
-certificate            = $config[cacert_pem]
-crl                            = $config[cacrl_pem]
-private_key            = $config[cakey]
-crl_extensions = crl_ext
-default_days   = 365
-default_crl_days= 30
-preserve               = no
-default_md             = $config[default_md]
+        #
+        # Write out the bootstrap config
+        #
+        $fd = fopen('./config.php', 'w');
+        fwrite($fd, $config_boot_txt);
+        fclose($fd);
+
+
+        # Re-read the CA config file so the openssl_functions
+        # can be used to create a CA root certificate.
+        include("$store_dir/config/config.php");
+
+        #
+        # Now create a temporary openssl.cnf for creating a self-signed
+        # CA root certificate, and create a generic openssl.cnf file
+        # in the CA home
+        #
+
+        $configHOME             = $config['home_dir'];
+        $configRANDFILE         = $config['random'];
+        $configCa_dir           = $config['ca_dir'];
+        $configCert_dir         = $config['cert_dir'];
+        $configCrl_dir          = $config['crl_dir'];
+        $configDatabase         = $config['index'];
+        $configNew_certs_dir    = $config['new_certs_dir'];
+        $configPrivate_dir      = $config['private_dir'];
+        $configSerial           = $config['serial'];
+        $configCacert_pem       = $config['cacert_pem'];
+        $configCacrl_pem        = $config['cacrl_pem'];
+        $configCakey            = $config['cakey'];
+        $configDefault_md       = $config['default_md'];
+        $configBase_url         = $config['base_url'];
+        $configCrl_dist         = $config['crl_distrib'];
+        $configComment_root     = $config['comment_root'];
+        $configPolicy_url       = $config['policy_url'];
+        $configRevoke_url       = $config['revoke_url'];
+        $configComment_email    = $config['comment_email'];
+        $configComment_sign     = $config['comment_sign'];
+        $configComment_srv      = $config['comment_srv'];
+
+
+        $config_txt1 = "
+
+HOME                     = $configHOME
+RANDFILE                 = $configRANDFILE
+dir                      = $configCa_dir
+certs                    = $configCert_dir
+crl_dir                  = $configCrl_dir
+database                 = $configDatabase
+new_certs_dir            = $configNew_certs_dir
+private_dir              = $configPrivate_dir
+serial                   = $configSerial
+certificate              = $configCacert_pem
+crl                      = $configCacrl_pem
+private_key              = $configCakey
+crl_extentions           = crl_ext
+default_days             = 365
+default_crl_days         = 30
+preserve                 = no
+default_md               = $configDefault_md
 
 [ ca ]
-default_ca             = email_cert
+default_ca               = email_cert
 
 [ root_cert ]
-x509_extensions        = root_ext
-default_days           = 3650
-policy                 = policy_supplied
+x509_extensions          = root_ext
+default_days             = 3650
+policy                   = policy_supplied
 
 [ email_cert ]
-x509_extensions        = email_ext
-default_days           = 365
-policy                 = policy_supplied
+x509_extensions          = email_ext
+default_days             = 365
+policy                   = policy_supplied
 
 [ email_signing_cert ]
-x509_extensions        = email_signing_ext
-default_days           = 365
-policy                 = policy_supplied
+x509_extensions          = email_signing_ext
+default_days             = 365
+policy                   = policy_supplied
 
 [ server_cert ]
-x509_extensions        = server_ext
-default_days           = 365
-policy                 = policy_supplied
+x509_extensions          = server_ext
+default_days             = 365
+policy                   = policy_supplied
 
 [ vpn_cert ]
-x509_extensions        = vpn_client_server_ext
-default_days           = 365
-policy                 = policy_supplied
+x509_extensions          = vpn_client_server_ext
+default_days             = 365
+policy                   = policy_supplied
 
 [ time_stamping_cert ]
-x509_extensions        = time_stamping_ext
-default_days           = 365
-policy                 = policy_supplied
+x509_extensions          = time_stamping_ext
+default_days             = 365
+policy                   = policy_supplied
 
 [ policy_supplied ]
-countryName            = supplied
-stateOrProvinceName    = supplied
-localityName           = supplied
-organizationName       = supplied
-organizationalUnitName = supplied
-commonName             = supplied
-emailAddress           = supplied
+countryName              = supplied
+stateOrProvinceName      = supplied
+localityName             = supplied
+organizationName         = supplied
+organizationalUnitName   = supplied
+commonName               = supplied
+emailAddress             = supplied
 
 [ root_ext ]
-basicConstraints       = CA:true
-keyUsage               = cRLSign, keyCertSign
-nsCertType             = sslCA, emailCA, objCA
-subjectKeyIdentifier   = hash
-subjectAltName         = email:copy
-crlDistributionPoints  = URI:$config[base_url]$config[crl_distrib]
-nsComment              = $config[comment_root]
-#nsCaRevocationUrl     =
-nsCaPolicyUrl          = $config[base_url]$config[policy_url]
+basicConstraints         = CA:true
+keyUsage                 = cRLSign, keyCertSign
+nsCertType               = sslCA, emailCA, objCA
+subjectKeyIdentifier     = hash
+subjectAltName           = email:copy
+crlDistributionPoints    = URI:$configBase_url$configCrl_dist
+nsComment                = $configComment_root
+#nsCaRevocationUrl       =
+nsCaPolicyUrl            = $configBase_url$configPolicy_url
 
 [ email_ext ]
-basicConstraints       = critical, CA:false
-keyUsage               = critical, nonRepudiation, digitalSignature, keyEncipherment
-extendedKeyUsage       = critical, emailProtection, clientAuth
-nsCertType             = critical, client, email
-subjectKeyIdentifier   = hash
-authorityKeyIdentifier = keyid:always, issuer:always
-subjectAltName         = email:copy
-issuerAltName          = issuer:copy
-crlDistributionPoints  = URI:$config[base_url]$config[crl_distrib]
-nsComment              = $config[comment_email]
-nsBaseUrl              = $config[base_url]
-nsRevocationUrl        = $config[revoke_url]
-#nsRenewalUrl          =
-nsCaPolicyUrl          = $config[base_url]$config[policy_url]
-#nsSslServerName       =
+basicConstraints         = critical, CA:false
+keyUsage                 = critical, nonRepudiation, digitalSignature, keyEncipherment
+extendedKeyUsage         = critical, emailProtection, clientAuth
+nsCertType               = critical, client, email
+subjectKeyIdentifier     = hash
+authorityKeyIdentifier   = keyid:always, issuer:always
+subjectAltName           = email:copy
+issuerAltName            = issuer:copy
+crlDistributionPoints    = URI:$configBase_url$configCrl_dist
+nsComment                = $configComment_email
+nsBaseUrl                = $configBase_url
+nsRevocationUrl          = $configRevoke_url
+#nsRenewalUrl            =
+nsCaPolicyUrl            = $configBase_url$configPolicy_url
+#nsSslServerName         =
 
 [ email_signing_ext ]
-basicConstraints       = critical, CA:false
-keyUsage               = critical, nonRepudiation, digitalSignature, keyEncipherment
-extendedKeyUsage       = critical, emailProtection, clientAuth, codeSigning
-nsCertType             = critical, client, email
-subjectKeyIdentifier   = hash
-authorityKeyIdentifier = keyid:always, issuer:always
-subjectAltName         = email:copy
-issuerAltName          = issuer:copy
-crlDistributionPoints  = URI:$config[base_url]$config[crl_distrib]
-nsComment              = $config[comment_sign]
-nsBaseUrl              = $config[base_url]
-nsRevocationUrl               = $config[revoke_url]
-#nsRenewalUrl          =
-nsCaPolicyUrl          = $config[base_url]$config[policy_url]
-#nsSslServerName       =
+basicConstraints         = critical, CA:false
+keyUsage                 = critical, nonRepudiation, digitalSignature, keyEncipherment
+extendedKeyUsage         = critical, emailProtection, clientAuth, codeSigning
+nsCertType               = critical, client, email
+subjectKeyIdentifier     = hash
+authorityKeyIdentifier   = keyid:always, issuer:always
+subjectAltName           = email:copy
+issuerAltName            = issuer:copy
+crlDistributionPoints    = URI:$configBase_url$configCrl_dist
+nsComment                = $configComment_sign
+nsBaseUrl                = $configBase_url
+nsRevocationUrl          = $configRevoke_url
+#nsRenewalUrl            =
+nsCaPolicyUrl            = $configBase_url$configPolicy_url
+#nsSslServerName         =
 
 [ server_ext ]
-basicConstraints        = CA:false
-keyUsage                = critical, digitalSignature, keyEncipherment
-nsCertType              = critical, server
-extendedKeyUsage        = critical, serverAuth, 1.3.6.1.5.5.7.3.1
-subjectKeyIdentifier    = hash
-authorityKeyIdentifier  = keyid:always, issuer:always
-subjectAltName          = DNS:$common_name,email:copy
-issuerAltName           = issuer:copy
-crlDistributionPoints   = URI:$config[base_url]$config[crl_distrib]
-nsComment               = $config[comment_srv]
-nsBaseUrl               = $config[base_url]
-nsRevocationUrl         = $config[revoke_url]
-nsCaPolicyUrl           = $config[base_url]$config[policy_url]
+basicConstraints         = critical, CA:false
+keyUsage                 = critical, digitalSignature, keyEncipherment
+nsCertType               = server
+extendedKeyUsage         = critical, serverAuth
+subjectKeyIdentifier     = hash
+authorityKeyIdentifier   = keyid:always, issuer:always
+subjectAltName           = $server_altnames
+issuerAltName            = issuer:copy
+crlDistributionPoints    = URI:$configBase_url$configCrl_dist
+nsComment                = $configComment_srv
+nsBaseUrl                = $configBase_url
+nsRevocationUrl          = $configRevoke_url
+nsCaPolicyUrl            = $configBase_url$configPolicy_url
 
 [ time_stamping_ext ]
-basicConstraints       = CA:false
-keyUsage               = critical, nonRepudiation, digitalSignature
-extendedKeyUsage       = timeStamping
-subjectKeyIdentifier   = hash
-authorityKeyIdentifier = keyid:always, issuer:always
-subjectAltName         = DNS:$common_name,email:copy
-issuerAltName          = issuer:copy
-crlDistributionPoints  = URI:$config[base_url]$config[crl_distrib]
-nsComment              = $config[comment_stamp]
-nsBaseUrl              = $config[base_url]
-nsRevocationUrl        = $config[revoke_url]
-nsCaPolicyUrl          = $config[base_url]$config[policy_url]
+basicConstraints         = CA:false
+keyUsage                 = critical, nonRepudiation, digitalSignature
+extendedKeyUsage         = timeStamping
+subjectKeyIdentifier     = hash
+authorityKeyIdentifier   = keyid:always, issuer:always
+subjectAltName           = DNS:$common_name,email:copy
+issuerAltName            = issuer:copy
+crlDistributionPoints    = URI:$configBase_url$configCrl_dist
+nsComment                = $config[comment_stamp]
+nsBaseUrl                = $configBase_url
+nsRevocationUrl          = $configRevoke_url
+nsCaPolicyUrl            = $configBase_url$configPolicy_url
 
 [ vpn_client_ext ]
-basicConstraints        = critical, CA:false
-keyUsage                = critical, digitalSignature
-extendedKeyUsage        = critical, clientAuth
-nsCertType              = critical, client
-subjectKeyIdentifier    = hash
-authorityKeyIdentifier  = keyid:always, issuer:always
-subjectAltName          = DNS:$common_name,email:copy
+basicConstraints         = critical, CA:false
+keyUsage                 = critical, digitalSignature
+extendedKeyUsage         = critical, clientAuth
+nsCertType               = critical, client
+subjectKeyIdentifier     = hash
+authorityKeyIdentifier   = keyid:always, issuer:always
+subjectAltName           = DNS:$common_name,email:copy
 
 [ vpn_server_ext ]
-basicConstraints        = critical, CA:false
-keyUsage                = critical, digitalSignature, keyEncipherment
-extendedKeyUsage        = critical, serverAuth
-nsCertType              = critical, server
-subjectKeyIdentifier    = hash
-authorityKeyIdentifier  = keyid:always, issuer:always
-subjectAltName          = DNS:$common_name,email:copy
+basicConstraints         = critical, CA:false
+keyUsage                 = critical, digitalSignature, keyEncipherment
+extendedKeyUsage         = critical, serverAuth
+nsCertType               = critical, server
+subjectKeyIdentifier     = hash
+authorityKeyIdentifier   = keyid:always, issuer:always
+subjectAltName           = DNS:$common_name,email:copy
 
 [ vpn_client_server_ext ]
-basicConstraints        = critical, CA:false
-keyUsage                = critical, digitalSignature, keyEncipherment
-extendedKeyUsage        = critical, serverAuth, clientAuth
-nsCertType              = critical, server, client
-subjectKeyIdentifier    = hash
-authorityKeyIdentifier  = keyid:always, issuer:always
-subjectAltName          = DNS:$common_name,email:copy
+basicConstraints         = critical, CA:false
+keyUsage                 = critical, digitalSignature, keyEncipherment
+extendedKeyUsage         = critical, serverAuth, clientAuth
+nsCertType               = critical, server, client
+subjectKeyIdentifier     = hash
+authorityKeyIdentifier   = keyid:always, issuer:always
+subjectAltName           = DNS:$common_name,email:copy
 
 [ crl_ext ]
 issuerAltName=issuer:copy
 authorityKeyIdentifier=keyid:always,issuer:always
 
+";
 
-EOS;
-
-       $config_txt2 = <<< EOS
+        $config_txt2 = <<< EOS
 [ req ]
-default_bits           = 2048
-default_keyfile                = privkey.pem
-distinguished_name     = req_name
-string_mask                    = nombstr
-req_extensions         = req_ext
+default_bits             = 2048
+default_keyfile          = privkey.pem
+distinguished_name       = req_name
+string_mask              = nombstr
+req_extensions           = req_ext
 
 [ req_name]
-countryName                            = Country Name (2 letter code)
-countryName_default            = US
-countryName_min                        = 2
-countryName_max                        = 2
+countryName              = Country Name (2 letter code)
+countryName_default      = US
+countryName_min          = 2
+countryName_max          = 2
 
-stateOrProvinceName            = State or Province Name (full name)
-stateOrProvinceName_default    = 
+stateOrProvinceName      = State or Province Name (full name)
+stateOrProvinceName_default =
 
-localityName                   = Locality Name (eg, city)
-localityName_default           = 
+localityName             = Locality Name (eg, city)
+localityName_default     =
 
-0.organizationName             = Organization Name (eg, company)
-0.organizationName_default     =
+0.organizationName       = Organization Name (eg, company)
+0.organizationName_default  =
 
-1.organizationName             = Second Organization Name (eg, company)
-1.organizationName_default     = 
+1.organizationName       = Second Organization Name (eg, company)
+1.organizationName_default  =
 
-organizationalUnitName         = Organizational Unit Name (eg, section)
-organizationalUnitName_default = 
+organizationalUnitName   = Organizational Unit Name (eg, section)
+organizationalUnitName_default  =
 
-commonName                     = Common Name (eg, YOUR name)
+commonName               = Common Name (eg, YOUR name)
 
-emailAddress                   = Email Address or Web URL
+emailAddress             = Email Address or Web URL
 
 [ req_ext ]
 basicConstraints = critical, CA:false
@@ -545,23 +625,31 @@
 
 EOS;
 
-       $config_txt3 = <<< EOS
+        $configCountry       = $config['country'];
+        $configProvince      = $config['province'];
+        $configLocality      = $config['locality'];
+        $configOrganization  = $config['organization'];
+        $configUnit          = $config['unit'];
+        $configCommon_name   = $config['common_name'];
+        $configEmailaddress  = $config['contact'];
+
+        $config_txt3 = <<< EOS
 [ req ]
-default_bits           = 2048
-default_keyfile                = privkey.pem
-distinguished_name     = req_name
-string_mask                    = nombstr
-req_extensions         = req_ext
-prompt                         = no
+default_bits             = 2048
+default_keyfile          = privkey.pem
+distinguished_name       = req_name
+string_mask              = nombstr
+req_extensions           = req_ext
+prompt                   = no
 
 [ req_name ]
-C              = $config[country]
-ST             = $config[province]
-L              = $config[locality]
-O              = $config[organization]
-OU             = $config[unit]
-CN             = $config[common_name]
-emailAddress   = $config[contact]
+C                        = $configCountry
+ST                       = $configProvince
+L                        = $configLocality
+O                        = $configOrganization
+OU                       = $configUnit
+CN                       = $configCommon_name
+emailAddress             = $configEmailaddress
 
 [ req_ext ]
 basicConstraints = critical, CA:true
@@ -569,163 +657,217 @@
 
 EOS;
 
-       #
-       # Write the permanent OpenSSL config
-       #
-       $fd = fopen($config['openssl_cnf'],'w');
-       fwrite($fd, $config_txt1 . $config_txt2);
-       fclose($fd);
-
-       #
-       # Write the temporary OpenSSL config
-       #
-       $tmp_cnf = "$config[home_dir]/tmp/openssl.cnf";
-       $fd = fopen($tmp_cnf,'w');
-       fwrite($fd, $config_txt1 . $config_txt3);
-       fclose($fd);
-
-       #
-       # Intialize index.txt and serial files
-       #
-       $fd = fopen($config['index'],'w');
-       fwrite($fd, "");
-       fclose($fd);
-       #
-       $fd = fopen($config['serial'],'w');
-       fwrite($fd, "100001");
-       fclose($fd);
-
-       #
-       # Convert expiry years to approximate days.
-       #
-       $days = $config['expiry'] * 365.25;
-
-
-       #
-       # Create a new self-signed CA certificate in PEM format.
-       #
-       print '<strong>Creating root certificate...</strong><br>';
-       flush();
-       // .rnd created here
-       exec(REQ . " -x509 -config $tmp_cnf -extensions root_ext -newkey rsa:$keysize -keyout $config[cakey] -out $config[cacert_pem] -passout pass:'$config[ca_pwd]' -days $days 2>&1");
-
-       # **** DISABLED *****
-       # It appears that both IE and Netscape accept PEM formatted root certificates
-       #
-       # Create a copy of the CA certificate in DER format.
-       #
-       #exec(X509 . " -in ca/$config[cacert_pem] -inform PEM -out ca/$config[cacert_der] -outform DER 2>&1");
-
-       #
-       # Generate the initial CRL.
-       #
-       print '<strong>Generating certificate revocation list...</strong><br>';
-       flush();
-       exec(CA . " -gencrl -config $config[openssl_cnf] -out $config[cacrl_pem] -passin pass:'$config[ca_pwd]'");
-
-       # Make a copy of the CRL in DER format.
-       #
-       exec(CRL . " -in $config[cacrl_pem] -out $config[cacrl_der] -inform PEM -outform DER");
-
-       #
-       # Clean up.
-       #
-       if (! unlink("$store_dir/tmp/openssl.cnf")) print "Can't unlink $store_dir/tmp/openssl.cnf";
-
-       #
-       # Create dhparam files for OpenVPN and others.
-       #
-       #print '<p><strong>Creating 1024 bit Diffie-Hellman parameters used by OpenVPN.<br>';
-       #print "Saving to $config[private_dir]/dhparam1024.pem.</strong><br>";
-       #$cmd = "openssl dhparam -rand '$config[random]' -out '$config[private_dir]/dhparam1024.pem' 1024";
-       #print $cmd.'<br>';
-       #flush();
-       #flush_exec($cmd,100);
-
-    #print "Please ignore warnings about \"unable to write 'random state\' <br><br>";
-
-       // This method works but still errors in logs
-    // exec(DH . "-rand '$config[random]' -out '$config[private_dir]/dhparam1024.pem' 1024");
-       // exec(DH . " -out '$config[private_dir]/dhparam1024.pem' 1024");
-       
-       print '<p><strong>Creating 2048 bit Diffie-Hellman parameters used by OpenVPN.<br>';
-       print "Saving to $store_dir/dhparam2048.pem.</strong><br>";
-       $cmd = "openssl dhparam -rand '$config[random]' -out '$config[private_dir]/dhparam2048.pem' 2048";
-       print $cmd.'<br>';
-       flush();
-       flush_exec($cmd,200);
-       
-       print "Please ignore warnings about \"unable to write 'random state' <br><br>";
-       
-       #
-    # Create a TLS auth key for OpenVPN if openvpn is installed
-    #
-    $command = 'which openvpn';
-       $command = escapeshellcmd($command);
-       
-    if (system ($command) == '/usr/sbin/openvpn') {
-       
-       print '<p><strong>Creating a TLS authentication key used by OpenVPN.<br>';
-    print "Saving to $store_dir/takey.pem.</strong><br>";
-       $cmd = "openvpn --genkey --secret '$config[private_dir]/takey.pem'";
-       print $cmd.'<br>';
+        #
+        # Write the permanent OpenSSL config
+        #
+        $fd = fopen($config['openssl_cnf'], 'w');
+        fwrite($fd, $config_txt1 . $config_txt2);
+        fclose($fd);
+
+        #
+        # Write the temporary OpenSSL config
+        #
+        $configHome_dir = $config['home_dir'];
+        $tmp_cnf = "$configHome_dir/tmp/openssl.cnf";
+        $fd = fopen($tmp_cnf, 'w');
+        fwrite($fd, $config_txt1 . $config_txt3);
+        fclose($fd);
+
+        #
+        # Initialize index.txt and serial files
+        #
+        $fd = fopen($config['index'], 'w');
+        fwrite($fd, "");
+        fclose($fd);
+        #
+        $fd = fopen($config['serial'], 'w');
+        fwrite($fd, "100001");
+        fclose($fd);
+
+        #
+        # Convert expiry years to approximate days.
+        #
+        $days = $config['expiry'] * 365.25;
+
+        #
+        # Create a new self-signed CA certificate in PEM format.
+        #
+        print '<strong>Creating root certificate...</strong><br>';
+        flush();
+
+        $configOpenssl_cnf = $config['openssl_cnf'];
+        $configPrivate_dir = $config['private_dir'];
+        $configCacert_pem  = $config['cacert_pem'];
+        $configCa_pwd      = $config['ca_pwd'];
+        $configCakey       = $config['cakey'];
+        $configRandom      = $config['random'];
+        $configCacrl_der   = $config['cacrl_der'];
+        $configCacrl_pem   = $config['cacrl_pem'];
+
+        // .rnd created here
+        exec(REQ . " -x509 -config $tmp_cnf -extensions root_ext -newkey rsa:$keysize -keyout $configCakey -out $configCacert_pem -passout pass:'$configCa_pwd' -days $days 2>&1");
+
+        # **** DISABLED *****
+        # It appears that both IE and Netscape accept PEM formatted root certificates
+        #
+        # Create a copy of the CA certificate in DER format.
+        #
+        #exec(X509 . " -in ca/$config[cacert_pem] -inform PEM -out ca/$config[cacert_der] -outform DER 2>&1");
+
+        #
+        # Generate the initial CRL.
+        #
+        print '<strong>Generating certificate revocation list...</strong><br>';
+        flush();
+        exec(CA . " -gencrl -config $configOpenssl_cnf -out $configCacrl_pem -passin pass:'$configCa_pwd'");
+
+        # Make a copy of the CRL in DER format.
+        #
+        exec(CRL . " -in $configCacrl_pem -out $configCarcrl_der -inform PEM -outform DER");
+
+        #
+        # Clean up.
+        #
+        if (! unlink("$store_dir/tmp/openssl.cnf")) {
+            print "Can't unlink $store_dir/tmp/openssl.cnf";
+        }
+
+        #
+        # Create dhparam files for OpenVPN and others.
+        #
+        #print '<p><strong>Creating 1024 bit Diffie-Hellman parameters used by OpenVPN.<br>';
+        #print "Saving to $config[private_dir]/dhparam1024.pem.</strong><br>";
+        #$cmd = "openssl dhparam -rand '$config[random]' -out '$config[private_dir]/dhparam1024.pem' 1024";
+        #print $cmd.'<br>';
+        #flush();
+        #flush_exec($cmd,100);
+
+        #print "Please ignore warnings about \"unable to write 'random state\' <br><br>";
+
+        // This method works but still errors in logs
+        // exec(DH . "-rand '$config[random]' -out '$config[private_dir]/dhparam1024.pem' 1024");
+        // exec(DH . " -out '$config[private_dir]/dhparam1024.pem' 1024");
+
+        print '<p><strong>Creating 2048 bit Diffie-Hellman parameters used by OpenVPN.<br>';
+        print "Saving to $store_dir/dhparam2048.pem.</strong><br>";
+        $cmd = "openssl dhparam -rand '$configRandom' -out '$configPrivate_dir/dhparam2048.pem' 2048";
+        print $cmd.'<br>';
         flush();
-        flush_exec($cmd);
-       } else {
-               echo "openvpn is required to generate a takey.pem<br>";
-               echo "You can create one later like this:<br>";
-               echo "openvpn --genkey --secret". $config[private_dir] . "/takey.pem<br>";
-       }
-
-
-       
-       #
-       # Step aside and let the users in (create index.php files).  
-       #
-       if (! unlink('index.php')) print "Can't unlink index.php";
-       if (! unlink('setup.php')) print "Can't unlink setup.php";;
-       if (! unlink('ca/index.php')) print "Can't unlink ca/index.php";
-       if (! symlink('main.php','index.php')) print "Can't symlink main.php";
-       if (! symlink('main.php','ca/index.php')) print "Can't symlink ca/main.php";
-
-       ?>
-       <center>
-       <h2>Setup is complete. Your CA root certificate as been created.</h2>
-       <?php
-       if (! getOSInformation()) {
-       print '<h3><font color=red>SECURITY WARNING!&nbsp;&nbsp; Be sure to run the <cite>secure.sh</cite> shell script as the <strong>root</strong> user.</font></h3>';
-       }
-       ?>
-       <p><br><br>
-       <form action=index.php>
-       <input type=submit name=submit value="Proceed To The PHPki Main Menu">
-       </form>
-       </center>
-       <?php
-       printFooter();
-       break;
-
-default:
-       if (! $country) $country = $config['country'];
-       if (! $province) $province = $config['province'];
-       if (! $locality) $locality = $config['locality'];
-       if (! $organization) $organization = $config['organization'];
-       if (! $contact) $contact = $config['contact'];
-       if (! $expiry) $expiry = $config['expiry'];
-       if (! $expiry) $expiry = 10;
-       if (! $keysize) $keysize = $config['keysize'];
-       if (! $keysize) $keysize = 2048;
-       if (! $passwd) $passwd = $config['ca_pwd'];
-       if (! $passwdv) $passwdv = $passwd;
+        flush_exec($cmd, 200);
+
+        print "Please ignore warnings about \"unable to write 'random state' <br><br>";
+
+        #
+        # Create a TLS auth key for OpenVPN if openvpn is installed
+        #
+        $command = 'which openvpn';
+        $command = escapeshellcmd($command);
+
+        if (system($command) == '/usr/sbin/openvpn') {
+            print '<p><strong>Creating a TLS authentication key used by OpenVPN.<br>';
+            print "Saving to $store_dir/takey.pem.</strong><br>";
+            $cmd = "openvpn --genkey --secret '$configPrivate_dir/takey.pem'";
+            print $cmd.'<br>';
+            flush();
+            flush_exec($cmd);
+        } else {
+            echo "openvpn is required to generate a takey.pem<br>";
+            echo "You can create one later like this:<br>";
+            echo "openvpn --genkey --secret". $configPrivate_dir . "/takey.pem<br>";
+        }
+
+
 
-       if (! $unit) $unit = $config['unit'];
-       if (! $unit) $unit = "Certificate Authority";
+        #
+        # Step aside and let the users in (create index.php files).
+        #
+        if (! unlink('index.php')) {
+            print "Can't unlink index.php";
+        }
+        if (! unlink('setup.php')) {
+            print "Can't unlink setup.php";
+        };
+        if (! unlink('ca/index.php')) {
+            print "Can't unlink ca/index.php";
+        }
+        if (! symlink('main.php', 'index.php')) {
+            print "Can't symlink main.php";
+        }
+        if (! symlink('main.php', 'ca/index.php')) {
+            print "Can't symlink ca/main.php";
+        }
+
+        ?>
+        <center>
+        <h2>Setup is complete. Your CA root certificate as been created.</h2>
+        <?php
+        if (! getOSInformation()) {
+            print '<h3><font color=red>SECURITY WARNING!&nbsp;&nbsp; Be sure to run the <cite>secure.sh</cite> shell script as the <strong>root</strong> user.</font></h3>';
+        }
+        ?>
+        <p><br><br>
+        <form action=index.php>
+        <input type=submit name=submit value="Proceed To The PHPki Main Menu">
+        </form>
+        </center>
+        <?php
+        printFooter();
+        break;
+
+    default:
+        if (! $country) {
+            $country = $config['country'];
+        }
+        if (! $province) {
+            $province = $config['province'];
+        }
+        if (! $locality) {
+            $locality = $config['locality'];
+        }
+        if (! $organization) {
+            $organization = $config['organization'];
+        }
+        if (! $contact) {
+            $contact = $config['contact'];
+        }
+        if (! $expiry) {
+            $expiry = $config['expiry'];
+        }
+        if (! $expiry) {
+            $expiry = 10;
+        }
+        if (! $keysize) {
+            $keysize = $config['keysize'];
+        }
+        if (! $keysize) {
+            $keysize = 2048;
+        }
+        if (! $passwd) {
+            $passwd = $config['ca_pwd'];
+        }
+        if (! $passwdv) {
+            $passwdv = $passwd;
+        }
 
-       if (! $common_name) $common_name = $config['common_name'];
-       if (! $common_name) $common_name = "PHPki Certificate Authority";
+        if (! $unit) {
+            $unit = $config['unit'];
+        }
+        if (! $unit) {
+            $unit = "Certificate Authority";
+        }
 
-       if (! $getting_help) $getting_help = $config['getting_help'];
-       if (! $getting_help) $getting_help = '
+        if (! $common_name) {
+            $common_name = $config['common_name'];
+        }
+        if (! $common_name) {
+            $common_name = "PHPki Certificate Authority";
+        }
+
+        if (! $getting_help) {
+            $getting_help = $config['getting_help'];
+        }
+        if (! $getting_help) {
+            $getting_help = '
 <b>Contact:</b><br>
 First-Name Last-Name<br>
 Company/Organization Name<br>
@@ -735,322 +877,360 @@
 <br>
 Phone: (000) 000-0000<br>
 E-mail: <a href=mailto:someone@somewhere.com>someone@somewhere.com</a>&nbsp;&nbsp;&nbsp;<i><b>E-mail is preferred.</b></i><br>';
+        }
+
+        if (! $store_dir) {
+            $store_dir = dirname($_SERVER['DOCUMENT_ROOT']).'/phpki-store';
+        }
+
+        if (! $base_url) {
+            $base_url = $config['base_url'];
+        }
+        if (! $base_url) {
+            $base_url = 'http://www.somewhere.com/phpki/';
+        }
 
-       if (! $store_dir) $store_dir = dirname($_SERVER['DOCUMENT_ROOT']).'/phpki-store';
+        if (! $crl_distrib) {
+            $crl_distrib = 'index.php?stage=dl_crl';
+        }
+        if (! $revoke_url) {
+            $revoke_url = 'ns_revoke_query.php?';
+        }
+        if (! $policy_url) {
+            $policy_url = 'policy.html';
+        }
 
-       if (! $base_url) $base_url = $config['base_url'];
-       if (! $base_url) $base_url = 'http://www.somewhere.com/phpki/';
+        if (! $comment_root) {
+            $comment_root = 'PHPki/OpenSSL Generated Root Certificate Authority';
+        }
+        if (! $comment_email) {
+            $comment_email = 'PHPki/OpenSSL Generated Personal Certificate';
+        }
+        if (! $comment_sign) {
+            $comment_sign = 'PHPki/OpenSSL Generated Personal Certificate';
+        }
+        if (! $comment_srv) {
+            $comment_srv = 'PHPki/OpenSSL Generated Secure Server Certificate';
+        }
+        if (! $comment_stamp) {
+            $comment_stamp = 'PHPki/OpenSSL Generated Time Stamping Certificate';
+        }
+
+        if (! $ca_prefix) {
+            $ca_prefix = $config['ca_prefix'];
+        }
+
+        if (! $openssl_bin) {
+            $openssl_bin = $config['openssl_bin'];
+        }
+        if (! $openssl_bin) {
+            $openssl_bin = '/usr/bin/openssl';
+        }
+
+        if (! $passwd_file) {
+            $passwd_file = $config['passwd_file'];
+        }
+        if (! $passwd_file) {
+            $passwd_file = dirname($_SERVER['DOCUMENT_ROOT']).'/phpkipasswd';
+        }
+
+        if (! $header_title) {
+            $header_title = $config['header_title'];
+        }
+        if (! $header_title) {
+            $header_title = 'Certificate Authority';
+        }
 
-       if (! $crl_distrib) $crl_distrib = 'index.php?stage=dl_crl';
-       if (! $revoke_url) $revoke_url = 'ns_revoke_query.php?';
-       if (! $policy_url) $policy_url = 'policy.html';
-
-       if (! $comment_root) $comment_root = 'PHPki/OpenSSL Generated Root Certificate Authority';
-       if (! $comment_email) $comment_email = 'PHPki/OpenSSL Generated Personal Certificate';
-       if (! $comment_sign) $comment_sign = 'PHPki/OpenSSL Generated Personal Certificate';
-       if (! $comment_srv) $comment_srv = 'PHPki/OpenSSL Generated Secure Server Certificate';
-       if (! $comment_stamp) $comment_stamp = 'PHPki/OpenSSL Generated Time Stamping Certificate';
-
-       if (! $ca_prefix) $ca_prefix = $config['ca_prefix'];
-
-       if (! $openssl_bin) $openssl_bin = $config['openssl_bin'];
-       if (! $openssl_bin) $openssl_bin = '/usr/bin/openssl';
-
-       if (! $passwd_file) $passwd_file = $config['passwd_file'];
-       if (! $passwd_file)  $passwd_file = dirname($_SERVER['DOCUMENT_ROOT']).'/phpkipasswd';
-       
-       if (! $header_title) $header_title = $config['header_title'];
-       if (! $header_title) $header_title = 'Certificate Authority';
-
-       printHeader('setup');
-       ?>
-       <form action="<?php echo $PHP_SELF?>" method="post">
-       <center><h2>Certificate Authority Initial Setup</h2></center>
-       <table width=99%>
-       <tr>
-       <th colspan=2><h3>Root Certificate Data</h3></th>
-       </tr>
-
-       <tr>
-       <td width=35%><strong>Organization</strong> <font color=red>*</font></td>
-       <td><input type=text name=organization value="<?php echo htvar($organization)?>" maxlength=60 size=50></td>
-       </tr>
-
-       <tr>
-       <td><strong>Department/Unit</strong> <font color=red>*</font></td>
-       <td><input type=text name=unit value="<?php echo htvar($unit)?>" maxlength=60 size=30></td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Common Name</strong> <font color=red>*</font>
-       This is embeded in certificates, and is most often displayed in
-       e-mail clients as the <cite>Issued By:</cite> text.  This is usually
-       the full name of your certificate authority (i.e. ACME Certificate Authority).
-       </td>
-       <td><input type=text name=common_name value="<?php echo htvar($common_name)?>" maxlength=60 size=60></td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Technical Contact E-mail Address</strong> <font color=red>*</font><br>
-       Enter an e-mail address where users should send correspondence
-       regarding your certificate authority and the certificates you issue.
-       </td>
-       
-       <td><input type=text name=contact value="<?php echo htvar($contact)?>" maxlength=60 size=30></td>
-       </tr>
-
-       <tr>
-       <td><strong>Locality</strong> <font color=red>*</font></td>
-       <td><input type=text name=locality value="<?php echo htvar($locality)?>" maxlength=60 size=30></td>
-       </tr>
-
-       <tr>
-       <td><strong>State/Province</strong> <font color=red>*</font></td>
-       <td><input type=text name=province value="<?php echo htvar($province)?>" maxlength=60 size=20></td>
-       </tr>
-
-       <tr>
-       <td><strong>Country Code ISO 3166 - 2 Characters</strong> <font color=red>*</font></td>
-       <td><input type=text name=country value="<?php echo htvar($country)?>" maxlength=2 size=2></td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Password</strong> <font color=red>*</font><br>
-       This password will be used to protect your root certificate private
-       key.<br/>Can't contain single quote ! <strong><font color=red>Do not lose or forget this password.</font></strong>
-       </td>
-       <td><input type=password name=passwd value="<?php echo htvar($passwd)?>" size=30>&nbsp;&nbsp; Again <input type=password name=passwdv value="<?php echo htvar($passwdv)?>" size=30></td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Certificate Life</strong> <font color=red>*</font><br>
-       Enter the number of years you wish your root certificate to be valid.
-       </td>
-       <td><select name=expiry>
-
-       <?php
-        for ( $i = 5 ; $i <= 15 ; $i+=5 ) {
-            print "<option value=$i " . ($expiry == $i ? "selected='selected'" : "") . " >$i Years</option>\n" ;
-        }
-       ?>
-
-       </select></td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Key Size</strong> <font color=red>*</font><br>
-       Enter the size of your certificate key. Recommend 2048+
-       </td>
-       <td><select name=keysize>
-
-       <?php
-        for ( $i = 1024 ; $i <= 4096 ; $i+=512 ) {
-            print "<option value=$i " . ($keysize == $i ? "selected='selected'" : "") . ">$i bits</option>\n" ;
-        }
-       ?>
-
-       </select></td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Certificate Authority Base URL</strong><br>
-       Enter the public Web address where your Certificate Authority will
-       reside.  The address should end with a trailing slash (/) character.
-       This address will be embeded in all certficates issued
-       by your CA, for informational purposes.
-       </td>
-       <td>
-       <input type=text name=base_url value="<?php echo htvar($base_url)?>" size=50>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Certificate Authority CRL Distribution Points</strong><br>
-        Provide the public URL where Certificate Revocation List (CRL) of
-        your CA will reside. This path is relative to Base URL above.
-        You may leave it by default if your clients have direct access to PHPki.
-       </td>
-       <td>
-       <input type=text name=crl_distrib value="<?php echo htvar($crl_distrib)?>" size=50>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Certificate Authority Revocation Check URL</strong><br>
-        Provide the public URL where clients of your CA can check if the requested
-        certificate has been revoked. This path is relative to Base URL above.
-        You may leave it by default if your clients have direct access to PHPki.
-       </td>
-       <td>
-       <input type=text name=revoke_url value="<?php echo htvar($revoke_url)?>" size=50>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Certificate Authority Policy URL</strong><br>
-        Provide the public URL where your CA policy will reside.
-        This path is relative to Base URL above.
-        You may leave it by default or adjust to your environment.
-       </td>
-       <td>
-       <input type=text name=policy_url value="<?php echo htvar($policy_url)?>" size=50>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Root Certificate Comment</strong><br>
-        Root certificate Comment attribute. You may change it to something
-        or use the default value set by PHPki.
-       </td>
-       <td>
-       <input type=text name=comment_root value="<?php echo htvar($comment_root)?>" size=50>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Email Certificate Comment</strong><br>
-        Email certificate Comment attribute. You may change it to something
-        or use the default value set by PHPki.
-       </td>
-       <td>
-       <input type=text name=comment_email value="<?php echo htvar($comment_email)?>" size=50>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Email/Signing Certificate Comment</strong><br>
-        Email and signing certificate Comment attribute. You may change it
-        to something or use the default value set by PHPki.
-       </td>
-       <td>
-       <input type=text name=comment_sign value="<?php echo htvar($comment_sign)?>" size=50>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>SSL Server Certificate Comment</strong><br>
-        SSL server certificate Comment attribute. You may change it to something
-        or use the default value set by PHPki.
-       </td>
-       <td>
-       <input type=text name=comment_srv value="<?php echo htvar($comment_srv)?>" size=50>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Time Stamping Certificate Comment</strong><br>
-        Time stamping certificate Comment attribute. You may change it
-        to something or use the default value set by PHPki.
-       </td>
-       <td>
-       <input type=text name=comment_stamp value="<?php echo htvar($comment_stamp)?>" size=50>
-       </td>
-       </tr>
-
-       </table>
-
-       <p>
-       <table width=99%>
-       <tr>
-       <th colspan=2><h3>Configuration Options</h3></th>
-       </tr>
-
-       <tr>
-       <td width=35%>
-       <strong>Storage Directory <font color=red>*</font></strong><br>
-       Enter the location where PHPki will store its files.  This should be a directory where
-       the web server has full read/write access (chown <?php echo $uname?> ; chmod 700), and is preferably 
-       outside of DOCUMENT_ROOT (<?php echo $_SERVER['DOCUMENT_ROOT']?>).  You may have to manually create the directory before completing this form.
-       </td>
-       <td>
-       <input type=text name=store_dir value="<?php echo htvar($store_dir)?>" size=35>
-       </td>
-       </tr>
-
-       <tr>
-       <td width=35%>
-       <strong>Location of OpenSSL Executable <font color=red>*</font></strong><br>
-       Enter the location of your OpenSSL binary.  The default is usually ok.
-       </td>
-       <td>
-       <input type=text name=openssl_bin value="<?php echo htvar($openssl_bin)?>" size=35>
-       </td>
-       </tr>
-
-       <tr>
-       <td width=35%>
-       <strong>Location of HTTP password file <font color=red>*</font></strong><br>
-       Enter the location of your PHPki user password file.  The default is usually ok.
-       </td>
-       <td>
-       <input type=text name=passwd_file value="<?php echo htvar($passwd_file)?>" size=35>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>File Upload Prefix</strong><br>
-       This is an optional prefix which will be added to root certificate
-       and certificate revocation list file uploads.  Normally the root 
-       certificate is uploaded as caroot.crt.  With a prefix like
-       <cite style="white-space: nowrap">"acme_"</cite>, the root certificate would be uploaded as
-       <cite>"acme_caroot.crt"</cite>.
-       </td>
-       <td>
-       <input type=text name=ca_prefix value="<?php echo htvar($ca_prefix)?>" maxlength=10 size=10>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Page Header Title</strong><br>
-       This title will be displayed superimposed over the PHPki logo at the
-       top of every page.
-       </td>
-       <td>
-       <input type=text name=header_title value="<?php echo htvar($header_title)?>" maxlength=40 size=40>
-       </td>
-       </tr>
-
-       <tr>
-       <td>
-       <strong>Help Document Contact Info</strong><br>
-       This text will be inserted into the online help document
-       under the "Getting Additional Help" section.  Include full
-       contact info for the convenience of your users.  Use HTML
-       tags to improve presentation.
-       </td>
-       <td>
-       <textarea name=getting_help cols=50 rows=15><?php echo htvar($getting_help)?></textarea>
-       </td>
-       </tr>
-       </table>
-       <font color=red>* Required field</font>
-
-       <p>
-       <center><input type=submit name=submit value=Submit></center></td>
-       <input type=hidden name=stage value='validate'>
-       </form>
-
-       <?php
-       printFooter();
-       break;
+        printHeader('setup');
+        ?>
+        <form action="<?php echo $PHP_SELF?>" method="post">
+    <center><h2>Certificate Authority Initial Setup</h2></center>
+    <table width=99%>
+    <tr>
+    <th colspan=2><h3>Root Certificate Data</h3></th>
+    </tr>
+
+    <tr>
+    <td width=35%><strong>Organization</strong> <font color=red>*</font></td>
+    <td><input type=text name=organization value="<?php echo htvar($organization)?>" maxlength=60 size=50></td>
+    </tr>
+
+    <tr>
+    <td><strong>Department/Unit</strong> <font color=red>*</font></td>
+    <td><input type=text name=unit value="<?php echo htvar($unit)?>" maxlength=60 size=30></td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Common Name</strong> <font color=red>*</font>
+    This is embeded in certificates, and is most often displayed in
+    e-mail clients as the <cite>Issued By:</cite> text.  This is usually
+    the full name of your certificate authority (i.e. ACME Certificate Authority).
+    </td>
+    <td><input type=text name=common_name value="<?php echo htvar($common_name)?>" maxlength=60 size=60></td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Technical Contact E-mail Address</strong> <font color=red>*</font><br>
+    Enter an e-mail address where users should send correspondence
+    regarding your certificate authority and the certificates you issue.
+    </td>
+
+    <td><input type=text name=contact value="<?php echo htvar($contact)?>" maxlength=60 size=30></td>
+    </tr>
+
+    <tr>
+    <td><strong>Locality</strong> <font color=red>*</font></td>
+    <td><input type=text name=locality value="<?php echo htvar($locality)?>" maxlength=60 size=30></td>
+    </tr>
+
+    <tr>
+    <td><strong>State/Province</strong> <font color=red>*</font></td>
+    <td><input type=text name=province value="<?php echo htvar($province)?>" maxlength=60 size=20></td>
+    </tr>
+
+    <tr>
+    <td><strong>Country Code ISO 3166 - 2 Characters</strong> <font color=red>*</font></td>
+    <td><input type=text name=country value="<?php echo htvar($country)?>" maxlength=2 size=2></td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Password</strong> <font color=red>*</font><br>
+    This password will be used to protect your root certificate private
+    key.<br/>Can't contain single quote ! <strong><font color=red>Do not lose or forget this password.</font></strong>
+    </td>
+    <td><input type=password name=passwd value="<?php echo htvar($passwd)?>" size=30>&nbsp;&nbsp; Again <input type=password name=passwdv value="<?php echo htvar($passwdv)?>" size=30></td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Certificate Life</strong> <font color=red>*</font><br>
+    Enter the number of years you wish your root certificate to be valid.
+    </td>
+    <td><select name=expiry>
+
+    <?php
+    for ($i = 5; $i <= 15; $i+=5) {
+        print "<option value=$i " . ($expiry == $i ? "selected='selected'" : "") . " >$i Years</option>\n" ;
+    }
+    ?>
+
+    </select></td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Key Size</strong> <font color=red>*</font><br>
+    Enter the size of your certificate key. Recommend 2048+
+    </td>
+    <td><select name=keysize>
+
+    <?php
+    for ($i = 1024; $i <= 4096; $i+=512) {
+        print "<option value=$i " . ($keysize == $i ? "selected='selected'" : "") . ">$i bits</option>\n" ;
+    }
+    ?>
+
+    </select></td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Certificate Authority Base URL</strong><br>
+    Enter the public Web address where your Certificate Authority will
+    reside.  The address should end with a trailing slash (/) character.
+    This address will be embeded in all certficates issued
+    by your CA, for informational purposes.
+    </td>
+    <td>
+    <input type=text name=base_url value="<?php echo htvar($base_url)?>" size=50>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Certificate Authority CRL Distribution Points</strong><br>
+     Provide the public URL where Certificate Revocation List (CRL) of
+     your CA will reside. This path is relative to Base URL above.
+     You may leave it by default if your clients have direct access to PHPki.
+    </td>
+    <td>
+    <input type=text name=crl_distrib value="<?php echo htvar($crl_distrib)?>" size=50>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Certificate Authority Revocation Check URL</strong><br>
+     Provide the public URL where clients of your CA can check if the requested
+     certificate has been revoked. This path is relative to Base URL above.
+     You may leave it by default if your clients have direct access to PHPki.
+    </td>
+    <td>
+    <input type=text name=revoke_url value="<?php echo htvar($revoke_url)?>" size=50>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Certificate Authority Policy URL</strong><br>
+     Provide the public URL where your CA policy will reside.
+     This path is relative to Base URL above.
+     You may leave it by default or adjust to your environment.
+    </td>
+    <td>
+    <input type=text name=policy_url value="<?php echo htvar($policy_url)?>" size=50>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Root Certificate Comment</strong><br>
+     Root certificate Comment attribute. You may change it to something
+     or use the default value set by PHPki.
+    </td>
+    <td>
+    <input type=text name=comment_root value="<?php echo htvar($comment_root)?>" size=50>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Email Certificate Comment</strong><br>
+     Email certificate Comment attribute. You may change it to something
+     or use the default value set by PHPki.
+    </td>
+    <td>
+    <input type=text name=comment_email value="<?php echo htvar($comment_email)?>" size=50>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Email/Signing Certificate Comment</strong><br>
+     Email and signing certificate Comment attribute. You may change it
+     to something or use the default value set by PHPki.
+    </td>
+    <td>
+    <input type=text name=comment_sign value="<?php echo htvar($comment_sign)?>" size=50>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>SSL Server Certificate Comment</strong><br>
+     SSL server certificate Comment attribute. You may change it to something
+     or use the default value set by PHPki.
+    </td>
+    <td>
+    <input type=text name=comment_srv value="<?php echo htvar($comment_srv)?>" size=50>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Time Stamping Certificate Comment</strong><br>
+     Time stamping certificate Comment attribute. You may change it
+     to something or use the default value set by PHPki.
+    </td>
+    <td>
+    <input type=text name=comment_stamp value="<?php echo htvar($comment_stamp)?>" size=50>
+    </td>
+    </tr>
+
+    </table>
+
+    <p>
+    <table width=99%>
+    <tr>
+    <th colspan=2><h3>Configuration Options</h3></th>
+    </tr>
+
+    <tr>
+    <td width=35%>
+    <strong>Storage Directory <font color=red>*</font></strong><br>
+    Enter the location where PHPki will store its files.  This should be a directory where
+    the web server has full read/write access (chown <?php echo $uname?> ; chmod 700), and is preferably
+    outside of DOCUMENT_ROOT (<?php echo $_SERVER['DOCUMENT_ROOT']?>).  You may have to manually create the directory before completing this form.
+    </td>
+    <td>
+    <input type=text name=store_dir value="<?php echo htvar($store_dir)?>" size=35>
+    </td>
+    </tr>
+
+    <tr>
+    <td width=35%>
+    <strong>Location of OpenSSL Executable <font color=red>*</font></strong><br>
+    Enter the location of your OpenSSL binary.  The default is usually ok.
+    </td>
+    <td>
+    <input type=text name=openssl_bin value="<?php echo htvar($openssl_bin)?>" size=35>
+    </td>
+    </tr>
+
+    <tr>
+    <td width=35%>
+    <strong>Location of HTTP password file <font color=red>*</font></strong><br>
+    Enter the location of your PHPki user password file.  The default is usually ok.
+    </td>
+    <td>
+    <input type=text name=passwd_file value="<?php echo htvar($passwd_file)?>" size=35>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>File Upload Prefix</strong><br>
+    This is an optional prefix which will be added to root certificate
+    and certificate revocation list file uploads.  Normally the root
+    certificate is uploaded as caroot.crt.  With a prefix like
+    <cite style="white-space: nowrap">"acme_"</cite>, the root certificate would be uploaded as
+    <cite>"acme_caroot.crt"</cite>.
+    </td>
+    <td>
+    <input type=text name=ca_prefix value="<?php echo htvar($ca_prefix)?>" maxlength=10 size=10>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Page Header Title</strong><br>
+    This title will be displayed superimposed over the PHPki logo at the
+    top of every page.
+    </td>
+    <td>
+    <input type=text name=header_title value="<?php echo htvar($header_title)?>" maxlength=40 size=40>
+    </td>
+    </tr>
+
+    <tr>
+    <td>
+    <strong>Help Document Contact Info</strong><br>
+    This text will be inserted into the online help document
+    under the "Getting Additional Help" section.  Include full
+    contact info for the convenience of your users.  Use HTML
+    tags to improve presentation.
+    </td>
+    <td>
+    <textarea name=getting_help cols=50 rows=15><?php echo htvar($getting_help)?></textarea>
+    </td>
+    </tr>
+    </table>
+    <font color=red>* Required field</font>
+
+    <p>
+    <center><input type=submit name=submit value=Submit></center></td>
+    <input type=hidden name=stage value='validate'>
+    </form>
+
+    <?php
+    printFooter();
+        break;
 }
 
-function create_ca_cnf($email, $expiry) {
+function create_ca_cnf($email, $expiry)
+{
 }
 ?>