diff options
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/system_camanager.php | 8 | ||||
| -rw-r--r-- | usr/local/www/system_certmanager.php | 27 |
2 files changed, 18 insertions, 17 deletions
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index 814c4c5..790cab9 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -645,18 +645,18 @@ function method_change() { <td class="listr"><?=$certcount;?> </td> <td class="listr"><?=$subj;?> </td> <td valign="middle" nowrap class="list"> - <a href="system_camanager.php?act=edit&id=<?=$i;?>")"> + <a href="system_camanager.php?act=edit&id=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit CA");?>" alt="<?=gettext("edit CA");?>" width="17" height="17" border="0" /> </a> - <a href="system_camanager.php?act=exp&id=<?=$i;?>")"> + <a href="system_camanager.php?act=exp&id=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export CA cert");?>" alt="<?=gettext("export CA cert");?>" width="17" height="17" border="0" /> </a> <?php if ($ca['prv']): ?> - <a href="system_camanager.php?act=expkey&id=<?=$i;?>")"> + <a href="system_camanager.php?act=expkey&id=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export CA private key");?>" alt="<?=gettext("export CA private key");?>" width="17" height="17" border="0" /> </a> <?php endif; ?> - <a href="system_camanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Authority and its CRLs, and unreference any associated certificates?");?>')"> + <a href="system_camanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Authority and its CRLs, and unreference any associated certificates?");?>')"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete ca");?>" alt="<?=gettext("delete ca"); ?>" width="17" height="17" border="0" /> </a> </td> diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index d8ca0b6..0b4f02a 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -583,7 +583,7 @@ function internalca_change() { foreach($cert_methods as $method => $desc): $selected = ""; if ($pconfig['method'] == $method) - $selected = "selected"; + $selected = " selected"; ?> <option value="<?=$method;?>"<?=$selected;?>><?=$desc;?></option> <?php endforeach; ?> @@ -616,7 +616,7 @@ function internalca_change() { <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.");?></td> + <?=gettext("Paste a certificate in X.509 PEM format here.");?> </td> </tr> <tr> @@ -624,7 +624,7 @@ function internalca_change() { <td width="78%" class="vtable"> <textarea name="key" id="key" cols="65" rows="7" class="formfld_cert"><?=htmlspecialchars($pconfig['key']);?></textarea> <br> - <?=gettext("Paste a private key in X.509 PEM format here.");?></td> + <?=gettext("Paste a private key in X.509 PEM format here.");?> </td> </tr> </table> @@ -659,7 +659,7 @@ function internalca_change() { continue; $selected = ""; if ($pconfig['caref'] == $ca['refid']) - $selected = "selected"; + $selected = " selected"; ?> <option value="<?=$ca['refid'];?>"<?=$selected;?>><?=$ca['descr'];?></option> <?php endforeach; ?> @@ -674,7 +674,7 @@ function internalca_change() { foreach( $cert_keylens as $len): $selected = ""; if ($pconfig['keylen'] == $len) - $selected = "selected"; + $selected = " selected"; ?> <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> <?php endforeach; ?> @@ -690,7 +690,7 @@ function internalca_change() { foreach( $openssl_digest_algs as $digest_alg): $selected = ""; if ($pconfig['digest_alg'] == $digest_alg) - $selected = "selected"; + $selected = " selected"; ?> <option value="<?=$digest_alg;?>"<?=$selected;?>><?=strtoupper($digest_alg);?></option> <?php endforeach; ?> @@ -706,7 +706,7 @@ function internalca_change() { foreach( $cert_types as $ct => $ctdesc ): $selected = ""; if ($pconfig['type'] == $ct) - $selected = "selected"; + $selected = " selected"; ?> <option value="<?=$ct;?>"<?=$selected;?>><?=$ctdesc;?></option> <?php endforeach; ?> @@ -847,7 +847,7 @@ function internalca_change() { foreach( $cert_keylens as $len): $selected = ""; if ($pconfig['keylen'] == $len) - $selected = "selected"; + $selected = " selected"; ?> <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> <?php endforeach; ?> @@ -866,8 +866,9 @@ function internalca_change() { <?php foreach( $dn_cc as $cc){ $selected = ""; - if ($pconfig['csr_dn_country'] == $cc) $selected = "selected"; - print "<option value=\"$cc\" $selected>$cc</option>"; + if ($pconfig['csr_dn_country'] == $cc) + $selected = " selected"; + print "<option value=\"$cc\"$selected>$cc</option>"; } ?> </select> @@ -948,19 +949,19 @@ function internalca_change() { $caname = ""; $inuse = ""; $revoked = ""; - if (in_array($cert['refid'], $config['system']['user'][$userid]['cert'])) + if (isset($userid) && in_array($cert['refid'], $config['system']['user'][$userid]['cert'])) continue; $ca = lookup_ca($cert['caref']); if ($ca) $caname = " (CA: {$ca['descr']})"; if ($pconfig['certref'] == $cert['refid']) - $selected = "selected"; + $selected = " selected"; if (cert_in_use($cert['refid'])) $inuse = " *In Use"; if (is_cert_revoked($cert)) $revoked = " *Revoked"; ?> - <option value="<?=$cert['refid'];?>" <?=$selected;?>><?=$cert['descr'] . $caname . $inuse . $revoked;?></option> + <option value="<?=$cert['refid'];?>"<?=$selected;?>><?=$cert['descr'] . $caname . $inuse . $revoked;?></option> <?php endforeach; ?> </select> </td> |
