mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
Merge pull request #545 from ExolonDX/branch_12
Tidy up "system_camanager.php" XHTML
This commit is contained in:
commit
8a9857e4a1
@ -305,7 +305,7 @@ include("head.inc");
|
||||
<body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>">
|
||||
<?php include("fbegin.inc"); ?>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
//<![CDATA[
|
||||
|
||||
function method_change() {
|
||||
|
||||
@ -330,7 +330,7 @@ function method_change() {
|
||||
}
|
||||
}
|
||||
|
||||
//-->
|
||||
//]]>
|
||||
</script>
|
||||
<?php
|
||||
if ($input_errors)
|
||||
@ -347,7 +347,7 @@ function method_change() {
|
||||
array_push($dn_cc, $matches[1]);
|
||||
}
|
||||
?>
|
||||
<table width="100%" border="0" cellpadding="0" cellspacing="0">
|
||||
<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="CA manager">
|
||||
<tr>
|
||||
<td>
|
||||
<?php
|
||||
@ -367,11 +367,11 @@ function method_change() {
|
||||
|
||||
<form action="system_camanager.php" method="post" name="iform" id="iform">
|
||||
<?php if ($act == "edit"): ?>
|
||||
<input type="hidden" name="edit" value="edit" id="edit">
|
||||
<input type="hidden" name="id" value="<?php echo $id; ?>" id="id">
|
||||
<input type="hidden" name="refid" value="<?php echo $pconfig['refid']; ?>" id="refid">
|
||||
<input type="hidden" name="edit" value="edit" id="edit" />
|
||||
<input type="hidden" name="id" value="<?php echo $id; ?>" id="id" />
|
||||
<input type="hidden" name="refid" value="<?php echo $pconfig['refid']; ?>" id="refid" />
|
||||
<?php endif; ?>
|
||||
<table width="100%" border="0" cellpadding="6" cellspacing="0">
|
||||
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
|
||||
<tr>
|
||||
<td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td>
|
||||
<td width="78%" class="vtable">
|
||||
@ -387,7 +387,7 @@ function method_change() {
|
||||
foreach($ca_methods as $method => $desc):
|
||||
$selected = "";
|
||||
if ($pconfig['method'] == $method)
|
||||
$selected = " selected";
|
||||
$selected = " selected=\"selected\"";
|
||||
?>
|
||||
<option value="<?=$method;?>"<?=$selected;?>><?=$desc;?></option>
|
||||
<?php endforeach; ?>
|
||||
@ -397,7 +397,7 @@ function method_change() {
|
||||
<?php endif; ?>
|
||||
</table>
|
||||
|
||||
<table width="100%" border="0" cellpadding="6" cellspacing="0" id="existing">
|
||||
<table width="100%" border="0" cellpadding="6" cellspacing="0" id="existing" summary="existing">
|
||||
<tr>
|
||||
<td colspan="2" class="list" height="12"></td>
|
||||
</tr>
|
||||
@ -409,7 +409,7 @@ function method_change() {
|
||||
<td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate data");?></td>
|
||||
<td width="78%" class="vtable">
|
||||
<textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=htmlspecialchars($pconfig['cert']);?></textarea>
|
||||
<br>
|
||||
<br/>
|
||||
<?=gettext("Paste a certificate in X.509 PEM format here.");?>
|
||||
</td>
|
||||
</tr>
|
||||
@ -417,7 +417,7 @@ function method_change() {
|
||||
<td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate Private Key");?><br/><?=gettext("(optional)");?></td>
|
||||
<td width="78%" class="vtable">
|
||||
<textarea name="key" id="key" cols="65" rows="7" class="formfld_cert"><?=htmlspecialchars($pconfig['key']);?></textarea>
|
||||
<br>
|
||||
<br/>
|
||||
<?=gettext("Paste the private key for the above certificate here. This is optional in most cases, but required if you need to generate a Certificate Revocation List (CRL).");?>
|
||||
</td>
|
||||
</tr>
|
||||
@ -433,7 +433,7 @@ function method_change() {
|
||||
<?php endif; ?>
|
||||
</table>
|
||||
|
||||
<table width="100%" border="0" cellpadding="6" cellspacing="0" id="internal">
|
||||
<table width="100%" border="0" cellpadding="6" cellspacing="0" id="internal" summary="internal">
|
||||
<tr>
|
||||
<td colspan="2" class="list" height="12"></td>
|
||||
</tr>
|
||||
@ -450,7 +450,7 @@ function method_change() {
|
||||
continue;
|
||||
$selected = "";
|
||||
if ($pconfig['caref'] == $ca['refid'])
|
||||
$selected = " selected";
|
||||
$selected = " selected=\"selected\"";
|
||||
?>
|
||||
<option value="<?=$ca['refid'];?>"<?=$selected;?>><?=$ca['descr'];?></option>
|
||||
<?php endforeach; ?>
|
||||
@ -465,7 +465,7 @@ function method_change() {
|
||||
foreach( $ca_keylens as $len):
|
||||
$selected = "";
|
||||
if ($pconfig['keylen'] == $len)
|
||||
$selected = " selected";
|
||||
$selected = " selected=\"selected\"";
|
||||
?>
|
||||
<option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option>
|
||||
<?php endforeach; ?>
|
||||
@ -481,7 +481,7 @@ function method_change() {
|
||||
foreach( $openssl_digest_algs as $digest_alg):
|
||||
$selected = "";
|
||||
if ($pconfig['digest_alg'] == $digest_alg)
|
||||
$selected = " selected";
|
||||
$selected = " selected=\"selected\"";
|
||||
?>
|
||||
<option value="<?=$digest_alg;?>"<?=$selected;?>><?=strtoupper($digest_alg);?></option>
|
||||
<?php endforeach; ?>
|
||||
@ -499,7 +499,7 @@ function method_change() {
|
||||
<tr>
|
||||
<td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td>
|
||||
<td width="78%" class="vtable">
|
||||
<table border="0" cellspacing="0" cellpadding="2">
|
||||
<table border="0" cellspacing="0" cellpadding="2" summary="name">
|
||||
<tr>
|
||||
<td align="right"><?=gettext("Country Code");?> : </td>
|
||||
<td align="left">
|
||||
@ -508,7 +508,7 @@ function method_change() {
|
||||
foreach( $dn_cc as $cc){
|
||||
$selected = "";
|
||||
if ($pconfig['dn_country'] == $cc)
|
||||
$selected = " selected";
|
||||
$selected = " selected=\"selected\"";
|
||||
print "<option value=\"$cc\"$selected>$cc</option>";
|
||||
}
|
||||
?>
|
||||
@ -570,7 +570,7 @@ function method_change() {
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table width="100%" border="0" cellpadding="6" cellspacing="0">
|
||||
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="save">
|
||||
<tr>
|
||||
<td width="22%" valign="top"> </td>
|
||||
<td width="78%">
|
||||
@ -585,7 +585,7 @@ function method_change() {
|
||||
|
||||
<?php else: ?>
|
||||
|
||||
<table width="100%" border="0" cellpadding="0" cellspacing="0">
|
||||
<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="">
|
||||
<tr>
|
||||
<td width="20%" class="listhdrr"><?=gettext("Name");?></td>
|
||||
<td width="10%" class="listhdrr"><?=gettext("Internal");?></td>
|
||||
@ -632,9 +632,9 @@ function method_change() {
|
||||
?>
|
||||
<tr>
|
||||
<td class="listlr">
|
||||
<table border="0" cellpadding="0" cellspacing="0">
|
||||
<table border="0" cellpadding="0" cellspacing="0" summary="icon">
|
||||
<tr>
|
||||
<td align="left" valign="center">
|
||||
<td align="left" valign="middle">
|
||||
<img src="<?=$caimg;?>" alt="CA" title="CA" border="0" height="16" width="16" />
|
||||
</td>
|
||||
<td align="left" valign="middle">
|
||||
@ -647,7 +647,7 @@ function method_change() {
|
||||
<td class="listr"><?=$issuer_name;?> </td>
|
||||
<td class="listr"><?=$certcount;?> </td>
|
||||
<td class="listr"><?=$subj;?><br />
|
||||
<table width="100%" style="font-size: 9px">
|
||||
<table width="100%" style="font-size: 9px" summary="valid">
|
||||
<tr>
|
||||
<td width="10%"> </td>
|
||||
<td width="20%"><?=gettext("Valid From")?>:</td>
|
||||
@ -706,11 +706,11 @@ function method_change() {
|
||||
</table>
|
||||
<?php include("fend.inc");?>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
//<![CDATA[
|
||||
|
||||
method_change();
|
||||
|
||||
//-->
|
||||
//]]>
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user