deprecated/phpki-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy html and formatting

Browse Source
This commit is contained in:
John Crisp
2020-02-27 18:02:17 +01:00
parent 081de22d9c
commit 4484ac7926
1 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
ca/request_cert.php
View File

@@ -90,7 +90,7 @@ case 'validate':
if ( $er ) if ( $er )
$er = '<h2>ERROR(S) IN FORM:</h2><h4><blockquote>' . $er . '</blockquote></h4>'; $er = '<h2>ERROR(S) IN FORM:</h2><h4><blockquote>' . $er . '</blockquote></h4>';
if ($email && ($serial = CAdb_in($email,$common_name))) { if ($email && ($serial = CAdb_in($email,$common_name))) {
$er = ''; $er = '';
$certtext = CA_cert_text($serial); $certtext = CA_cert_text($serial);
$er .= '<h2>A valid certificate already exists for ' . htvar("$common_name <$email>") . '</h2>'; $er .= '<h2>A valid certificate already exists for ' . htvar("$common_name <$email>") . '</h2>';
@@ -98,7 +98,7 @@ case 'validate':
} }
if ($er) { if ($er) {
printHeader(); printHeader();
?> ?>
@@ -106,7 +106,7 @@ case 'validate':
<input type=submit name=submit value='Go Back'> <input type=submit name=submit value='Go Back'>
<font color=#ff0000><?php echo $er?></font> <font color=#ff0000><?php echo $er?></font>
<br><input type=submit name=submit value='Go Back'> <br><input type=submit name=submit value='Go Back'>
<?php <?php
print $hidden_fields; print $hidden_fields;
print "</form>"; print "</form>";
@@ -139,37 +139,45 @@ case 'confirm':
print 'IP Addresses<br>'; print 'IP Addresses<br>';
} }
?> ?>
</td> </p>
</td>
<td> <td>
<?php <?php
print htvar($common_name) . '<br>'; print htvar($common_name) . '<br>';
print htvar($email) . '<br>'; print htvar($email) . '<br>';
print htvar($organization) . '<br>'; print htvar($organization) . '<br>';
print htvar($unit) . '<br>'; print htvar($unit) . '<br>';
print htvar($locality) . '<br>'; print htvar($locality) . '<br>';
print htvar($province) . '<br>'; print htvar($province) . '<br>';
print htvar($country) . '<br>'; print htvar($country) . '<br>';
print htvar($expiry). ' Year'.($expiry == 1 ? '' : 's').'<br>'; print htvar($expiry). ' Year'.($expiry == 1 ? '' : 's').'<br>';
print htvar($keysize). ' bits<br>'; print htvar($keysize). ' bits<br>';
switch ($cert_type) { switch ($cert_type) {
case 'email': print 'E-mail, SSL Client' . '<br>'; case 'email':
break; print 'E-mail, SSL Client' . '<br>';
case 'email_signing': print 'E-mail, SSL Client, Code Signing' . '<br>'; break;
break; case 'email_signing':
case 'server': print 'E-mail, SSL Client, Code Signing' . '<br>';
print 'SSL Server' . '<br>'; break;
print htvar($dns_names). '<br>'; case 'server':
print htvar($ip_addr). '<br>'; print 'SSL Server' . '<br>';
break; print htvar($dns_names). '<br>';
case 'vpn_client': print 'VPN Client Only' . '<br>'; print htvar($ip_addr). '<br>';
break; break;
case 'vpn_server': print 'VPN Server Only' . '<br>'; case 'vpn_client':
break; print 'VPN Client Only' . '<br>';
case 'vpn_client_server': print 'VPN Client, VPN Server' . '<br>'; break;
break; case 'vpn_server':
case 'time_stamping': print 'Time Stamping' . '<br>'; 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> </td>
@@ -187,7 +195,7 @@ case 'confirm':
<?php <?php
printFooter(); printFooter();
# Save user's defaults # Save user's defaults
$fp = fopen($user_cnf,'w'); $fp = fopen($user_cnf,'w');
$x = '<?php $x = '<?php
$country = \''.addslashes($country).'\'; $country = \''.addslashes($country).'\';
@@ -206,7 +214,7 @@ case 'confirm':
case 'final': case 'final':
if ($submit == "Yes! Create and Download") { if ($submit == "Yes! Create and Download") {
if (! $serial = CAdb_in($email,$common_name)) { 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); 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) { if (! $ret) {
printHeader(); printHeader();
@@ -238,7 +246,8 @@ case 'final':
switch($cert_type) { switch($cert_type) {
case 'server': 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']), "$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; break;
case 'email': case 'email':
case 'email_signing': case 'email_signing':
@@ -246,14 +255,15 @@ case 'final':
case 'vpn_client_server': case 'vpn_client_server':
case 'vpn_client': case 'vpn_client':
case 'vpn_server': case 'vpn_server':
upload("$config[pfx_dir]/$serial.pfx", "$common_name ($email).p12", 'application/x-pkcs12'); # 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; break;
} }
break; break;
} }
default: default:
# #
# Default fields to reasonable values if necessary. # Default fields to reasonable values if necessary.
# #
if (! $submit and file_exists($user_cnf)) include($user_cnf); if (! $submit and file_exists($user_cnf)) include($user_cnf);
@@ -346,7 +356,7 @@ default:
<tr> <tr>
<td>Certificate Use:<font color=red size=3>*</font> </td> <td>Certificate Use:<font color=red size=3>*</font> </td>
<td><select name=cert_type onchange="if (this.value=='server') <td><select name=cert_type onchange="if (this.value=='server')
{setVisibility('testrow1',true);setVisibility('testrow2',true);} else {setVisibility('testrow1',false);setVisibility('testrow2',false);}"> {setVisibility('testrow1',true);setVisibility('testrow2',true);} else {setVisibility('testrow1',false);setVisibility('testrow2',false);}">
<?php <?php
print '<option value="email" '.($cert_type=='email'?'selected':'').'>E-mail, SSL Client</option>'; print '<option value="email" '.($cert_type=='email'?'selected':'').'>E-mail, SSL Client</option>';