diff options
author | Matthew Grooms <mgrooms@pfsense.org> | 2008-09-09 06:19:45 +0000 |
---|---|---|
committer | Matthew Grooms <mgrooms@pfsense.org> | 2008-09-09 06:19:45 +0000 |
commit | 96c7a492be8dbc04a0d494a91522c3167c148abf (patch) | |
tree | 83623fa690cd37438511dd9e81611b004a0c259c | |
parent | ab3c85535d2b84d117f0605e22c0f2ab6e799f29 (diff) | |
download | pfsense-96c7a492be8dbc04a0d494a91522c3167c148abf.zip pfsense-96c7a492be8dbc04a0d494a91522c3167c148abf.tar.gz |
Cleanup the tab format of the system ca/certificate pages. The edges were
square instead of rounded like most pfSense pages. While here, fix a bug
that made the submit button disappear when it shouldn't.
-rw-r--r-- | usr/local/www/system_camanager.php | 458 | ||||
-rw-r--r-- | usr/local/www/system_certmanager.php | 782 |
2 files changed, 623 insertions, 617 deletions
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index 68b05ef..b2d697e 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -209,7 +209,7 @@ function method_change() { ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td class="tabnavtbl"> + <td> <?php $tab_array = array(); $tab_array[] = array(gettext("CAs"), true, "system_camanager.php"); @@ -219,248 +219,250 @@ function method_change() { </td> </tr> <tr> - <td class="tabcont"> - - <?php if ($act == "new" || $act == "save" || $input_errors): ?> - - <form action="system_camanager.php" method="post" name="iform" id="iform"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <td id="mainarea"> + <div class="tabcont"> + + <?php if ($act == "new" || $act == "save" || $input_errors): ?> + + <form action="system_camanager.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> + <td width="78%" class="vtable"> + <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> + </td> + </tr> + <?php if (!isset($id)): ?> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Method");?></td> + <td width="78%" class="vtable"> + <select name='method' id='method' class="formselect" onchange='method_change()'> + <?php + foreach($ca_methods as $method => $desc): + $selected = ""; + if ($pconfig['method'] == $method) + $selected = "selected"; + ?> + <option value="<?=$method;?>"<?=$selected;?>><?=$desc;?></option> + <?php endforeach; ?> + </select> + </td> + </tr> + <?php endif; ?> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="existing"> + <tr> + <td colspan="2" class="list" height="12"></td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">Existing Certificate Authority</td> + </tr> + + <tr> + <td width="22%" valign="top" class="vncellreq">Certificate data</td> + <td width="78%" class="vtable"> + <textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=$pconfig['cert'];?></textarea> + <br> + Paste a certificate in X.509 PEM format here.</td> + </td> + </tr> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="internal"> + <tr> + <td colspan="2" class="list" height="12"></td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">Internal Certificate Authority</td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td> + <td width="78%" class="vtable"> + <select name='keylen' id='keylen' class="formselect"> + <?php + foreach( $ca_keylens as $len): + $selected = ""; + if ($pconfig['keylen'] == $len) + $selected = "selected"; + ?> + <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> + <?php endforeach; ?> + </select> + bits + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td> + <td width="78%" class="vtable"> + <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/> + days + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td> + <td width="78%" class="vtable"> + <table border="0" cellspacing="0" cellpadding="2"> + <tr> + <td align="right">Country Code : </td> + <td align="left"> + <input name="dn_country" type="text" class="formfld unknown" size="2" value="<?=htmlspecialchars($pconfig['dn_country']);?>"/> + + <em>ex:</em> + + US + <em>( two letters )</em> + </td> + </tr> + <tr> + <td align="right">State or Province : </td> + <td align="left"> + <input name="dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_state']);?>"/> + + <em>ex:</em> + + Texas + </td> + </tr> + <tr> + <td align="right">City : </td> + <td align="left"> + <input name="dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_city']);?>"/> + + <em>ex:</em> + + Austin + </td> + </tr> + <tr> + <td align="right">Organization : </td> + <td align="left"> + <input name="dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_organization']);?>"/> + + <em>ex:</em> + + My Company Inc. + </td> + </tr> + <tr> + <td align="right">Email Address : </td> + <td align="left"> + <input name="dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_email']);?>"/> + + <em>ex:</em> + + admin@mycompany.com + </td> + </tr> + <tr> + <td align="right">Common Name : </td> + <td align="left"> + <input name="dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_commonname']);?>"/> + + <em>ex:</em> + + internal-ca + </td> + </tr> + </table> + </td> + </tr> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> + <?php if (isset($id) && $a_ca[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>" /> + <?php endif;?> + </td> + </tr> + </table> + </form> + + <?php else: ?> + + <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> - <td width="78%" class="vtable"> - <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> - </td> - </tr> - <?php if (!isset($id)): ?> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Method");?></td> - <td width="78%" class="vtable"> - <select name='method' id='method' class="formselect" onchange='method_change()'> - <?php - foreach($ca_methods as $method => $desc): - $selected = ""; - if ($pconfig['method'] == $method) - $selected = "selected"; - ?> - <option value="<?=$method;?>"<?=$selected;?>><?=$desc;?></option> - <?php endforeach; ?> - </select> - </td> - </tr> - <?php endif; ?> - </table> - - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="existing"> - <tr> - <td colspan="2" class="list" height="12"></td> - </tr> - <tr> - <td colspan="2" valign="top" class="listtopic">Existing Certificate Authority</td> - </tr> - - <tr> - <td width="22%" valign="top" class="vncellreq">Certificate data</td> - <td width="78%" class="vtable"> - <textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=$pconfig['cert'];?></textarea> - <br> - Paste a certificate in X.509 PEM format here.</td> - </td> - </tr> - </table> - - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="internal"> - <tr> - <td colspan="2" class="list" height="12"></td> - </tr> - <tr> - <td colspan="2" valign="top" class="listtopic">Internal Certificate Authority</td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td> - <td width="78%" class="vtable"> - <select name='keylen' id='keylen' class="formselect"> - <?php - foreach( $ca_keylens as $len): - $selected = ""; - if ($pconfig['keylen'] == $len) - $selected = "selected"; - ?> - <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> - <?php endforeach; ?> - </select> - bits - </td> + <td width="20%" class="listhdrr">Name</td> + <td width="10%" class="listhdrr">Internal</td> + <td width="10%" class="listhdrr">Certificates</td> + <td width="40%" class="listhdrr">Distinguished Name</td> + <td width="10%" class="list"></td> </tr> + <?php + $i = 0; + foreach($a_ca as $ca): + $name = htmlspecialchars($ca['name']); + $subj = cert_get_subject($ca['crt']); + $subj = htmlspecialchars($subj); + $certcount = 0; + + // TODO : Need gray certificate icon + + if($ca['prv']) { + $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; + $internal = "YES"; + + foreach ($a_cert as $cert) + if ($cert['caref'] == $ca['refid']) + $certcount++; + } else { + $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; + $internal = "NO"; + } + ?> <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td> - <td width="78%" class="vtable"> - <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/> - days - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td> - <td width="78%" class="vtable"> - <table border="0" cellspacing="0" cellpadding="2"> - <tr> - <td align="right">Country Code : </td> - <td align="left"> - <input name="dn_country" type="text" class="formfld unknown" size="2" value="<?=htmlspecialchars($pconfig['dn_country']);?>"/> - - <em>ex:</em> - - US - <em>( two letters )</em> - </td> - </tr> - <tr> - <td align="right">State or Province : </td> - <td align="left"> - <input name="dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_state']);?>"/> - - <em>ex:</em> - - Texas - </td> - </tr> - <tr> - <td align="right">City : </td> - <td align="left"> - <input name="dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_city']);?>"/> - - <em>ex:</em> - - Austin - </td> - </tr> + <td class="listlr"> + <table border="0" cellpadding="0" cellspacing="0"> <tr> - <td align="right">Organization : </td> - <td align="left"> - <input name="dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_organization']);?>"/> - - <em>ex:</em> - - My Company Inc. + <td align="left" valign="center"> + <img src="<?=$caimg;?>" alt="CA" title="CA" border="0" height="16" width="16" /> </td> - </tr> - <tr> - <td align="right">Email Address : </td> - <td align="left"> - <input name="dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_email']);?>"/> - - <em>ex:</em> - - admin@mycompany.com - </td> - </tr> - <tr> - <td align="right">Common Name : </td> - <td align="left"> - <input name="dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_commonname']);?>"/> - - <em>ex:</em> - - internal-ca + <td align="left" valign="middle"> + <?=$name;?> </td> </tr> </table> </td> + <td class="listr"><?=$internal;?> </td> + <td class="listr"><?=$certcount;?> </td> + <td class="listr"><?=$subj;?> </td> + <td valign="middle" nowrap class="list"> + <a href="system_camanager.php?act=exp&id=<?=$i;?>")"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="export ca" alt="export ca" width="17" height="17" border="0" /> + </a> + <a href="system_camanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Authority and all associated Certificates?");?>')"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete ca" alt="delete ca" width="17" height="17" border="0" /> + </a> + </td> + </tr> + <?php + $i++; + endforeach; + ?> + <tr> + <td class="list" colspan="4"></td> + <td class="list"> + <a href="system_camanager.php?act=new"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add or import ca" alt="add ca" width="17" height="17" border="0" /> + </a> + </td> </tr> - </table> - - <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> - <?php if (isset($id) && $a_ca[$id]): ?> - <input name="id" type="hidden" value="<?=$id;?>" /> - <?php endif;?> + <td colspan="4"> + <p> + <?=gettext("Additional trusted certificate authorities can be added here.");?> + </p> </td> </tr> </table> - </form> - - <?php else: ?> - - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="20%" class="listhdrr">Name</td> - <td width="10%" class="listhdrr">Internal</td> - <td width="10%" class="listhdrr">Certificates</td> - <td width="40%" class="listhdrr">Distinguished Name</td> - <td width="10%" class="list"></td> - </tr> - <?php - $i = 0; - foreach($a_ca as $ca): - $name = htmlspecialchars($ca['name']); - $subj = cert_get_subject($ca['crt']); - $subj = htmlspecialchars($subj); - $certcount = 0; - - // TODO : Need gray certificate icon - - if($ca['prv']) { - $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; - $internal = "YES"; - - foreach ($a_cert as $cert) - if ($cert['caref'] == $ca['refid']) - $certcount++; - } else { - $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; - $internal = "NO"; - } - ?> - <tr> - <td class="listlr"> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> - <td align="left" valign="center"> - <img src="<?=$caimg;?>" alt="CA" title="CA" border="0" height="16" width="16" /> - </td> - <td align="left" valign="middle"> - <?=$name;?> - </td> - </tr> - </table> - </td> - <td class="listr"><?=$internal;?> </td> - <td class="listr"><?=$certcount;?> </td> - <td class="listr"><?=$subj;?> </td> - <td valign="middle" nowrap class="list"> - <a href="system_camanager.php?act=exp&id=<?=$i;?>")"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="export ca" alt="export ca" width="17" height="17" border="0" /> - </a> - <a href="system_camanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Authority and all associated Certificates?");?>')"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete ca" alt="delete ca" width="17" height="17" border="0" /> - </a> - </td> - </tr> - <?php - $i++; - endforeach; - ?> - <tr> - <td class="list" colspan="4"></td> - <td class="list"> - <a href="system_camanager.php?act=new"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add or import ca" alt="add ca" width="17" height="17" border="0" /> - </a> - </td> - </tr> - <tr> - <td colspan="4"> - <p> - <?=gettext("Additional trusted certificate authorities can be added here.");?> - </p> - </td> - </tr> - </table> - - <?php endif; ?> + <?php endif; ?> + + </div> </td> </tr> </table> diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 4903c50..37ab331 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -282,6 +282,7 @@ function method_change() { document.getElementById("existing").style.display=""; document.getElementById("internal").style.display="none"; document.getElementById("external").style.display="none"; + document.getElementById("submit").style.display=""; break; case 1: document.getElementById("existing").style.display="none"; @@ -293,6 +294,7 @@ function method_change() { document.getElementById("existing").style.display="none"; document.getElementById("internal").style.display="none"; document.getElementById("external").style.display=""; + document.getElementById("submit").style.display=""; break; } } @@ -341,418 +343,420 @@ function internalca_change() { </td> </tr> <tr> - <td class="tabcont"> + <td id="mainarea"> + <div class="tabcont"> + + <?php if ($act == "new" || (($_POST['save'] == "Save") && $input_errors)): ?> + + <form action="system_certmanager.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> + <td width="78%" class="vtable"> + <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> + </td> + </tr> + <?php if (!isset($id)): ?> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Method");?></td> + <td width="78%" class="vtable"> + <select name='method' id='method' class="formselect" onchange='method_change()'> + <?php + foreach($cert_methods as $method => $desc): + $selected = ""; + if ($pconfig['method'] == $method) + $selected = "selected"; + ?> + <option value="<?=$method;?>"<?=$selected;?>><?=$desc;?></option> + <?php endforeach; ?> + </select> + </td> + </tr> + <?php endif; ?> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="existing"> + <tr> + <td colspan="2" class="list" height="12"></td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">Existing Certificate</td> + </tr> + + <tr> + <td width="22%" valign="top" class="vncellreq">Certificate data</td> + <td width="78%" class="vtable"> + <textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=$pconfig['cert'];?></textarea> + <br> + Paste a certificate in X.509 PEM format here.</td> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq">Private key data</td> + <td width="78%" class="vtable"> + <textarea name="key" id="key" cols="65" rows="7" class="formfld_cert"><?=$pconfig['key'];?></textarea> + <br> + Paste a private key in X.509 PEM format here.</td> + </td> + </tr> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="internal"> + <tr> + <td colspan="2" class="list" height="12"></td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">Internal Certificate</td> + </tr> + + <?php if (!$internal_ca_count): ?> + + <tr> + <td colspan="2" align="center" class="vtable"> + No internal Certificate Authorities have been defined. You must + <a href="system_camanager.php?act=new&method=internal">create</a> + an internal CA before creating an internal certificate. + </td> + </tr> + + <?php else: ?> + + <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()'> + <?php + foreach( $a_ca as $ca): + if (!$ca['prv']) + continue; + $selected = ""; + if ($pconfig['caref'] == $ca['refid']) + $selected = "selected"; + ?> + <option value="<?=$ca['refid'];?>"<?=$selected;?>><?=$ca['name'];?></option> + <?php endforeach; ?> + </select> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td> + <td width="78%" class="vtable"> + <select name='keylen' class="formselect"> + <?php + foreach( $cert_keylens as $len): + $selected = ""; + if ($pconfig['keylen'] == $len) + $selected = "selected"; + ?> + <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> + <?php endforeach; ?> + </select> + bits + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td> + <td width="78%" class="vtable"> + <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/> + days + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td> + <td width="78%" class="vtable"> + <table border="0" cellspacing="0" cellpadding="2"> + <tr> + <td align="right">Country Code : </td> + <td align="left"> + <input name="dn_country" type="text" class="formfld unknown" size="2" value="<?=htmlspecialchars($pconfig['dn_country']);?>" readonly/> + </td> + </tr> + <tr> + <td align="right">State or Province : </td> + <td align="left"> + <input name="dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_state']);?>" readonly/> + </td> + </tr> + <tr> + <td align="right">City : </td> + <td align="left"> + <input name="dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_city']);?>" readonly/> + </td> + </tr> + <tr> + <td align="right">Organization : </td> + <td align="left"> + <input name="dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_organization']);?>" readonly/> + </td> + </tr> + <tr> + <td align="right">Email Address : </td> + <td align="left"> + <input name="dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_email']);?>"/> + + <em>ex:</em> + + webadmin@mycompany.com + </td> + </tr> + <tr> + <td align="right">Common Name : </td> + <td align="left"> + <input name="dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_commonname']);?>"/> + + <em>ex:</em> + + www.pfsense.org + </td> + </tr> + </table> + </td> + </tr> - <?php if ($act == "new" || (($_POST['save'] == "Save") && $input_errors)): ?> - - <form action="system_certmanager.php" method="post" name="iform" id="iform"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> - <td width="78%" class="vtable"> - <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> - </td> - </tr> - <?php if (!isset($id)): ?> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Method");?></td> - <td width="78%" class="vtable"> - <select name='method' id='method' class="formselect" onchange='method_change()'> - <?php - foreach($cert_methods as $method => $desc): - $selected = ""; - if ($pconfig['method'] == $method) - $selected = "selected"; - ?> - <option value="<?=$method;?>"<?=$selected;?>><?=$desc;?></option> - <?php endforeach; ?> - </select> - </td> - </tr> <?php endif; ?> - </table> - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="existing"> - <tr> - <td colspan="2" class="list" height="12"></td> - </tr> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="external"> + <tr> + <td colspan="2" class="list" height="12"></td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">External Signing Request</td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td> + <td width="78%" class="vtable"> + <select name='csr_keylen' class="formselect"> + <?php + foreach( $cert_keylens as $len): + $selected = ""; + if ($pconfig['keylen'] == $len) + $selected = "selected"; + ?> + <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> + <?php endforeach; ?> + </select> + bits + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td> + <td width="78%" class="vtable"> + <table border="0" cellspacing="0" cellpadding="2"> + <tr> + <td align="right">Country Code : </td> + <td align="left"> + <input name="csr_dn_country" type="text" class="formfld unknown" size="2" value="<?=htmlspecialchars($pconfig['csr_dn_country']);?>" /> + + <em>ex:</em> + + US + + <em>( two letters )</em> + </td> + </tr> + <tr> + <td align="right">State or Province : </td> + <td align="left"> + <input name="csr_dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['csr_dn_state']);?>" /> + + <em>ex:</em> + + Texas + </td> + </tr> + <tr> + <td align="right">City : </td> + <td align="left"> + <input name="csr_dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['csr_dn_city']);?>" /> + + <em>ex:</em> + + Austin + </td> + </tr> + <tr> + <td align="right">Organization : </td> + <td align="left"> + <input name="csr_dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['csr_dn_organization']);?>" /> + + <em>ex:</em> + + My Company Inc. + </td> + </tr> + <tr> + <td align="right">Email Address : </td> + <td align="left"> + <input name="csr_dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['csr_dn_email']);?>"/> + + <em>ex:</em> + + webadmin@mycompany.com + </td> + </tr> + <tr> + <td align="right">Common Name : </td> + <td align="left"> + <input name="csr_dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['csr_dn_commonname']);?>"/> + + <em>ex:</em> + + www.pfsense.org + </td> + </tr> + </table> + </td> + </tr> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> + <?php if (isset($id) && $a_cert[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>" /> + <?php endif;?> + </td> + </tr> + </table> + </form> + + <?php elseif ($act == "csr" || (($_POST['save'] == "Update") && $input_errors)):?> + + <form action="system_certmanager.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> + <td width="78%" class="vtable"> + <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> + </td> + </tr> + <tr> + <td colspan="2" class="list" height="12"></td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">Complete Signing Request</td> + </tr> + + <tr> + <td width="22%" valign="top" class="vncellreq">Signing Request data</td> + <td width="78%" class="vtable"> + <textarea name="csr" id="csr" cols="65" rows="7" class="formfld_cert" readonly><?=$pconfig['csr'];?></textarea> + <br> + Copy the certificate signing data from here and forward it to your certificate authority for singing.</td> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq">Final Certificate data</td> + <td width="78%" class="vtable"> + <textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=$pconfig['cert'];?></textarea> + <br> + Paste the certificate received from your cerificate authority here.</td> + </td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input id="submit" name="save" type="submit" class="formbtn" value="Update" /> + <?php if (isset($id) && $a_cert[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>" /> + <input name="act" type="hidden" value="csr" /> + <?php endif;?> + </td> + </tr> + </table> + </form> + + <?php else:?> + + <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td colspan="2" valign="top" class="listtopic">Existing Certificate</td> - </tr> - - <tr> - <td width="22%" valign="top" class="vncellreq">Certificate data</td> - <td width="78%" class="vtable"> - <textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=$pconfig['cert'];?></textarea> - <br> - Paste a certificate in X.509 PEM format here.</td> - </td> + <td width="20%" class="listhdrr">Name</td> + <td width="20%" class="listhdrr">CA</td> + <td width="40%" class="listhdrr">Distinguished Name</td> + <td width="10%" class="list"></td> </tr> + <?php + $i = 0; + foreach($a_cert as $cert): + $name = htmlspecialchars($cert['name']); + + if ($cert['crt']) { + $subj = htmlspecialchars(cert_get_subject($cert['crt'])); + $caname = "<em>external</em>"; + } + + if ($cert['csr']) { + $subj = htmlspecialchars(csr_get_subject($cert['csr'])); + $caname = "<em>external - signature pending</em>"; + } + + $ca = lookup_ca($cert['caref']); + if ($ca) + $caname = $ca['name']; + + if($cert['prv']) + $certimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; + else + $certimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; + ?> <tr> - <td width="22%" valign="top" class="vncellreq">Private key data</td> - <td width="78%" class="vtable"> - <textarea name="key" id="key" cols="65" rows="7" class="formfld_cert"><?=$pconfig['key'];?></textarea> - <br> - Paste a private key in X.509 PEM format here.</td> - </td> - </tr> - </table> - - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="internal"> - <tr> - <td colspan="2" class="list" height="12"></td> - </tr> - <tr> - <td colspan="2" valign="top" class="listtopic">Internal Certificate</td> - </tr> - - <?php if (!$internal_ca_count): ?> - - <tr> - <td colspan="2" align="center" class="vtable"> - No internal Certificate Authorities have been defined. You must - <a href="system_camanager.php?act=new&method=internal">create</a> - an internal CA before creating an internal certificate. - </td> - </tr> - - <?php else: ?> - - <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()'> - <?php - foreach( $a_ca as $ca): - if (!$ca['prv']) - continue; - $selected = ""; - if ($pconfig['caref'] == $ca['refid']) - $selected = "selected"; - ?> - <option value="<?=$ca['refid'];?>"<?=$selected;?>><?=$ca['name'];?></option> - <?php endforeach; ?> - </select> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td> - <td width="78%" class="vtable"> - <select name='keylen' class="formselect"> - <?php - foreach( $cert_keylens as $len): - $selected = ""; - if ($pconfig['keylen'] == $len) - $selected = "selected"; - ?> - <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> - <?php endforeach; ?> - </select> - bits - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td> - <td width="78%" class="vtable"> - <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/> - days - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td> - <td width="78%" class="vtable"> - <table border="0" cellspacing="0" cellpadding="2"> - <tr> - <td align="right">Country Code : </td> - <td align="left"> - <input name="dn_country" type="text" class="formfld unknown" size="2" value="<?=htmlspecialchars($pconfig['dn_country']);?>" readonly/> - </td> - </tr> + <td class="listlr"> + <table border="0" cellpadding="0" cellspacing="0"> <tr> - <td align="right">State or Province : </td> - <td align="left"> - <input name="dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_state']);?>" readonly/> + <td align="left" valign="center"> + <img src="<?=$certimg;?>" alt="CA" title="CA" border="0" height="16" width="16" /> </td> - </tr> - <tr> - <td align="right">City : </td> - <td align="left"> - <input name="dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_city']);?>" readonly/> - </td> - </tr> - <tr> - <td align="right">Organization : </td> - <td align="left"> - <input name="dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_organization']);?>" readonly/> - </td> - </tr> - <tr> - <td align="right">Email Address : </td> - <td align="left"> - <input name="dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_email']);?>"/> - - <em>ex:</em> - - webadmin@mycompany.com - </td> - </tr> - <tr> - <td align="right">Common Name : </td> - <td align="left"> - <input name="dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_commonname']);?>"/> - - <em>ex:</em> - - www.pfsense.org + <td align="left" valign="middle"> + <?=$name;?> </td> </tr> </table> </td> - </tr> - - <?php endif; ?> - - </table> - - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="external"> - <tr> - <td colspan="2" class="list" height="12"></td> - </tr> - <tr> - <td colspan="2" valign="top" class="listtopic">External Signing Request</td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td> - <td width="78%" class="vtable"> - <select name='csr_keylen' class="formselect"> - <?php - foreach( $cert_keylens as $len): - $selected = ""; - if ($pconfig['keylen'] == $len) - $selected = "selected"; - ?> - <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> - <?php endforeach; ?> - </select> - bits + <td class="listr"><?=$caname;?> </td> + <td class="listr"><?=$subj;?> </td> + <td valign="middle" nowrap class="list"> + <a href="system_certmanager.php?act=exp&id=<?=$i;?>")"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="export cert" alt="export ca" width="17" height="17" border="0" /> + </a> + <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="delete cert" alt="delete cert" width="17" height="17" border="0" /> + </a> + <?php if ($cert['csr']): ?> + + <a href="system_certmanager.php?act=csr&id=<?=$i;?>"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="update csr" alt="update csr" width="17" height="17" border="0" /> + </a> + <?php endif; ?> </td> </tr> + <?php + $i++; + endforeach; + ?> <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td> - <td width="78%" class="vtable"> - <table border="0" cellspacing="0" cellpadding="2"> - <tr> - <td align="right">Country Code : </td> - <td align="left"> - <input name="csr_dn_country" type="text" class="formfld unknown" size="2" value="<?=htmlspecialchars($pconfig['csr_dn_country']);?>" /> - - <em>ex:</em> - - US - - <em>( two letters )</em> - </td> - </tr> - <tr> - <td align="right">State or Province : </td> - <td align="left"> - <input name="csr_dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['csr_dn_state']);?>" /> - - <em>ex:</em> - - Texas - </td> - </tr> - <tr> - <td align="right">City : </td> - <td align="left"> - <input name="csr_dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['csr_dn_city']);?>" /> - - <em>ex:</em> - - Austin - </td> - </tr> - <tr> - <td align="right">Organization : </td> - <td align="left"> - <input name="csr_dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['csr_dn_organization']);?>" /> - - <em>ex:</em> - - My Company Inc. - </td> - </tr> - <tr> - <td align="right">Email Address : </td> - <td align="left"> - <input name="csr_dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['csr_dn_email']);?>"/> - - <em>ex:</em> - - webadmin@mycompany.com - </td> - </tr> - <tr> - <td align="right">Common Name : </td> - <td align="left"> - <input name="csr_dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['csr_dn_commonname']);?>"/> - - <em>ex:</em> - - www.pfsense.org - </td> - </tr> - </table> + <td class="list" colspan="3"></td> + <td class="list"> + <a href="system_certmanager.php?act=new"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add or import ca" alt="add ca" width="17" height="17" border="0" /> + </a> </td> </tr> - </table> - - <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> - <?php if (isset($id) && $a_cert[$id]): ?> - <input name="id" type="hidden" value="<?=$id;?>" /> - <?php endif;?> + <td colspan="3"> + <p> + <?=gettext("Additional certificates can be added here.");?> + </p> </td> </tr> </table> - </form> - - <?php elseif ($act == "csr" || (($_POST['save'] == "Update") && $input_errors)):?> - - <form action="system_certmanager.php" method="post" name="iform" id="iform"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> - <td width="78%" class="vtable"> - <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> - </td> - </tr> - <tr> - <td colspan="2" class="list" height="12"></td> - </tr> - <tr> - <td colspan="2" valign="top" class="listtopic">Complete Signing Request</td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq">Signing Request data</td> - <td width="78%" class="vtable"> - <textarea name="csr" id="csr" cols="65" rows="7" class="formfld_cert" readonly><?=$pconfig['csr'];?></textarea> - <br> - Copy the certificate signing data from here and forward it to your certificate authority for singing.</td> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq">Final Certificate data</td> - <td width="78%" class="vtable"> - <textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=$pconfig['cert'];?></textarea> - <br> - Paste the certificate received from your cerificate authority here.</td> - </td> - </tr> - <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input id="submit" name="save" type="submit" class="formbtn" value="Update" /> - <?php if (isset($id) && $a_cert[$id]): ?> - <input name="id" type="hidden" value="<?=$id;?>" /> - <input name="act" type="hidden" value="csr" /> - <?php endif;?> - </td> - </tr> - </table> - </form> - - <?php else:?> - - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="20%" class="listhdrr">Name</td> - <td width="20%" class="listhdrr">CA</td> - <td width="40%" class="listhdrr">Distinguished Name</td> - <td width="10%" class="list"></td> - </tr> - <?php - $i = 0; - foreach($a_cert as $cert): - $name = htmlspecialchars($cert['name']); - - if ($cert['crt']) { - $subj = htmlspecialchars(cert_get_subject($cert['crt'])); - $caname = "<em>external</em>"; - } - - if ($cert['csr']) { - $subj = htmlspecialchars(csr_get_subject($cert['csr'])); - $caname = "<em>external - signature pending</em>"; - } - - $ca = lookup_ca($cert['caref']); - if ($ca) - $caname = $ca['name']; - - if($cert['prv']) - $certimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; - else - $certimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; - ?> - <tr> - <td class="listlr"> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> - <td align="left" valign="center"> - <img src="<?=$certimg;?>" alt="CA" title="CA" border="0" height="16" width="16" /> - </td> - <td align="left" valign="middle"> - <?=$name;?> - </td> - </tr> - </table> - </td> - <td class="listr"><?=$caname;?> </td> - <td class="listr"><?=$subj;?> </td> - <td valign="middle" nowrap class="list"> - <a href="system_certmanager.php?act=exp&id=<?=$i;?>")"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="export cert" alt="export ca" width="17" height="17" border="0" /> - </a> - <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="delete cert" alt="delete cert" width="17" height="17" border="0" /> - </a> - <?php if ($cert['csr']): ?> - - <a href="system_certmanager.php?act=csr&id=<?=$i;?>"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="update csr" alt="update csr" width="17" height="17" border="0" /> - </a> - <?php endif; ?> - </td> - </tr> - <?php - $i++; - endforeach; - ?> - <tr> - <td class="list" colspan="3"></td> - <td class="list"> - <a href="system_certmanager.php?act=new"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add or import ca" alt="add ca" width="17" height="17" border="0" /> - </a> - </td> - </tr> - <tr> - <td colspan="3"> - <p> - <?=gettext("Additional certificates can be added here.");?> - </p> - </td> - </tr> - </table> - - <?php endif; ?> + <?php endif; ?> + </div> </td> </tr> </table> |