diff options
| author | Colin Fleming <cj_fleming@sky.com> | 2013-04-09 12:17:17 +0100 |
|---|---|---|
| committer | Colin Fleming <cj_fleming@sky.com> | 2013-04-09 12:17:17 +0100 |
| commit | b8e1877f48070e623ee751ee01c71149ca8f9d20 (patch) | |
| tree | b1394402942e89309dbd1ddf8b4c6e32ac3c02a2 /usr/local/www/system_certmanager.php | |
| parent | 4fd2fed2ad6672c3be771146048bee61317f3197 (diff) | |
| download | pfsense-b8e1877f48070e623ee751ee01c71149ca8f9d20.zip pfsense-b8e1877f48070e623ee751ee01c71149ca8f9d20.tar.gz | |
Update "system_certmanager.php" XHTML
Add CDATA section to SCRIPT tags
Update HTML boolean operators
Close BR tags
Deprecate ampersand in ANCHOR tags
Diffstat (limited to 'usr/local/www/system_certmanager.php')
| -rw-r--r-- | usr/local/www/system_certmanager.php | 86 |
1 files changed, 45 insertions, 41 deletions
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index ca0a54c..3fbfc4a 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -452,10 +452,10 @@ if ($_POST) { include("head.inc"); ?> -<body link="#000000" vlink="#000000" alink="#000000" onLoad="<?= $jsevents["body"]["onload"] ?>"> +<body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>"> <?php include("fbegin.inc"); ?> <script type="text/javascript"> -<!-- +//<![CDATA[ function method_change() { @@ -529,19 +529,20 @@ function internalca_change() { } <?php endif; ?> -//--> -</script> -<script type="text/javascript" src="/javascript/row_helper_dynamic.js"> +//]]> </script> +<script type="text/javascript" src="/javascript/row_helper_dynamic.js"></script> <input type='hidden' name='altname_value_type' value='select' /> <input type='hidden' name='altname_type_type' value='textbox' /> <script type="text/javascript"> +//<![CDATA[ rowname[0] = "altname_type"; rowtype[0] = "textbox"; rowsize[0] = "10"; rowname[1] = "altname_value"; rowtype[1] = "textbox"; rowsize[1] = "30"; +//]]> </script> <?php if ($input_errors) @@ -558,7 +559,7 @@ function internalca_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="cert manager"> <tr> <td class="tabnavtbl"> <?php @@ -577,7 +578,7 @@ function internalca_change() { <?php if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)): ?> <form action="system_certmanager.php" method="post" name="iform" id="iform"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> <?php if (!isset($id)): ?> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Method");?></td> @@ -587,7 +588,7 @@ function internalca_change() { foreach($cert_methods as $method => $desc): $selected = ""; if ($pconfig['method'] == $method) - $selected = " selected"; + $selected = " selected=\"selected\""; ?> <option value="<?=$method;?>"<?=$selected;?>><?=$desc;?></option> <?php endforeach; ?> @@ -607,7 +608,7 @@ function internalca_change() { </tr> </table> - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="import"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="import" summary="import"> <tr> <td colspan="2" class="list" height="12"></td> </tr> @@ -619,21 +620,21 @@ function internalca_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> - <?=gettext("Paste a certificate in X.509 PEM format here.");?> + <br/> + <?=gettext("Paste a certificate in X.509 PEM format here.");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Private key data");?></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 a private key in X.509 PEM format here.");?> </td> </tr> </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> @@ -646,7 +647,7 @@ function internalca_change() { <tr> <td colspan="2" align="center" class="vtable"> <?=gettext("No internal Certificate Authorities have been defined. You must");?> - <a href="system_camanager.php?act=new&method=internal"><?=gettext("create");?></a> + <a href="system_camanager.php?act=new&method=internal"><?=gettext("create");?></a> <?=gettext("an internal CA before creating an internal certificate.");?> </td> </tr> @@ -656,14 +657,14 @@ function internalca_change() { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate authority");?></td> <td width="78%" class="vtable"> - <select name='caref' id='caref' class="formselect" onChange='internalca_change()'> + <select name='caref' id='caref' class="formselect" onchange='internalca_change()'> <?php foreach( $a_ca as $ca): if (!$ca['prv']) continue; $selected = ""; if ($pconfig['caref'] == $ca['refid']) - $selected = " selected"; + $selected = " selected=\"selected\""; ?> <option value="<?=$ca['refid'];?>"<?=$selected;?>><?=$ca['descr'];?></option> <?php endforeach; ?> @@ -678,7 +679,7 @@ function internalca_change() { foreach( $cert_keylens as $len): $selected = ""; if ($pconfig['keylen'] == $len) - $selected = " selected"; + $selected = " selected=\"selected\""; ?> <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> <?php endforeach; ?> @@ -694,7 +695,7 @@ function internalca_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; ?> @@ -710,7 +711,7 @@ function internalca_change() { foreach( $cert_types as $ct => $ctdesc ): $selected = ""; if ($pconfig['type'] == $ct) - $selected = " selected"; + $selected = " selected=\"selected\""; ?> <option value="<?=$ct;?>"<?=$selected;?>><?=$ctdesc;?></option> <?php endforeach; ?> @@ -729,7 +730,7 @@ function internalca_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"> @@ -812,16 +813,19 @@ function internalca_change() { endforeach; endif; ?> + <tr><td> </td></tr> </tbody> </table> <a onclick="javascript:addRowTo('altNametable', 'formfldalias'); return false;" href="#"> <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" /> </a> <script type="text/javascript"> + //<![CDATA[ field_counter_js = 3; rows = 1; totalrows = <?php echo $counter; ?>; loaded = <?php echo $counter; ?>; + //]]> </script> <br/>NOTE: Type must be one of DNS (FQDN or Hostname), IP (IP address), URI, or email. </td> @@ -834,7 +838,7 @@ function internalca_change() { </table> - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="external"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="external" summary="external"> <tr> <td colspan="2" class="list" height="12"></td> </tr> @@ -851,7 +855,7 @@ function internalca_change() { foreach( $cert_keylens as $len): $selected = ""; if ($pconfig['csr_keylen'] == $len) - $selected = " selected"; + $selected = " selected=\"selected\""; ?> <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> <?php endforeach; ?> @@ -867,7 +871,7 @@ function internalca_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; ?> @@ -878,7 +882,7 @@ function internalca_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"> @@ -887,7 +891,7 @@ function internalca_change() { foreach( $dn_cc as $cc){ $selected = ""; if ($pconfig['csr_dn_country'] == $cc) - $selected = " selected"; + $selected = " selected=\"selected\""; print "<option value=\"$cc\"$selected>$cc</option>"; } ?> @@ -949,7 +953,7 @@ function internalca_change() { </tr> </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> @@ -975,7 +979,7 @@ function internalca_change() { if ($ca) $caname = " (CA: {$ca['descr']})"; if ($pconfig['certref'] == $cert['refid']) - $selected = " selected"; + $selected = " selected=\"selected\""; if (cert_in_use($cert['refid'])) $inuse = " *In Use"; if (is_cert_revoked($cert)) @@ -988,7 +992,7 @@ function internalca_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%"> @@ -1004,7 +1008,7 @@ function internalca_change() { <?php elseif ($act == "csr" || (($_POST['save'] == gettext("Update")) && $input_errors)):?> <form action="system_certmanager.php" method="post" name="iform" id="iform"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="name"> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> <td width="78%" class="vtable"> @@ -1021,8 +1025,8 @@ function internalca_change() { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Signing request data");?></td> <td width="78%" class="vtable"> - <textarea name="csr" id="csr" cols="65" rows="7" class="formfld_cert" readonly><?=htmlspecialchars($pconfig['csr']);?></textarea> - <br> + <textarea name="csr" id="csr" cols="65" rows="7" class="formfld_cert" readonly="readonly"><?=htmlspecialchars($pconfig['csr']);?></textarea> + <br/> <?=gettext("Copy the certificate signing data from here and forward it to your certificate authority for signing.");?></td> </td> </tr> @@ -1030,7 +1034,7 @@ function internalca_change() { <td width="22%" valign="top" class="vncellreq"><?=gettext("Final 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 the certificate received from your certificate authority here.");?></td> </td> </tr> @@ -1057,7 +1061,7 @@ function internalca_change() { <?php else:?> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="details"> <tr> <td width="15%" class="listhdrr"><?=gettext("Name");?></td> <td width="15%" class="listhdrr"><?=gettext("Issuer");?></td> @@ -1098,9 +1102,9 @@ function internalca_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="<?=$certimg;?>" alt="CA" title="CA" border="0" height="16" width="16" /> </td> <td align="left" valign="middle"> @@ -1121,7 +1125,7 @@ function internalca_change() { </td> <td class="listr"><?=$caname;?> </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> @@ -1157,7 +1161,7 @@ function internalca_change() { Captive Portal<br/> <?php endif; ?> </td> - <td valign="middle" nowrap class="list"> + <td valign="middle" class="list nowrap"> <a href="system_certmanager.php?act=exp&id=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export cert");?>" alt="<?=gettext("export ca");?>" width="17" height="17" border="0" /> </a> @@ -1168,7 +1172,7 @@ function internalca_change() { <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export cert+key in .p12");?>" alt="<?=gettext("export cert+key in .p12");?>" width="17" height="17" border="0" /> </a> <?php if (!cert_in_use($cert['refid'])): ?> - <a href="system_certmanager.php?act=del&id=<?=$i;?>" onClick="return confirm('<?=gettext("Do you really want to delete this Certificate?");?>')"> + <a href="system_certmanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate?");?>')"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete cert");?>" alt="<?=gettext("delete cert");?>" width="17" height="17" border="0" /> </a> <?php endif; ?> @@ -1206,13 +1210,13 @@ function internalca_change() { </table> <?php include("fend.inc");?> <script type="text/javascript"> -<!-- +//<![CDATA[ method_change(); internalca_change(); -//--> +//]]> </script> </body> -</html> +</html>
\ No newline at end of file |
