summaryrefslogtreecommitdiff
path: root/pages/gpg/0.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-08-25 00:46:28 +0200
committerMichael Tänzer <neo@nhng.de>2013-08-25 00:46:28 +0200
commitb3f92f6473bc302bddb5efe7f3b6e200625cfacb (patch)
tree1a4310594093c7d65b60509eadef34109f114c36 /pages/gpg/0.php
parentc6fd753005d2651382fc8aa21933376225035a31 (diff)
parenta82f507306a9eba8a9f5dff82d2091dbd29edf71 (diff)
downloadcacert-devel-b3f92f6473bc302bddb5efe7f3b6e200625cfacb.tar.gz
cacert-devel-b3f92f6473bc302bddb5efe7f3b6e200625cfacb.tar.xz
cacert-devel-b3f92f6473bc302bddb5efe7f3b6e200625cfacb.zip
Merge branch 'release' into bug-1123bug-1123
Conflicts: includes/account.php pages/account/10.php pages/account/3.php pages/gpg/0.php www/gpg.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/gpg/0.php')
-rw-r--r--pages/gpg/0.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/pages/gpg/0.php b/pages/gpg/0.php
index 60b1784..f490511 100644
--- a/pages/gpg/0.php
+++ b/pages/gpg/0.php
@@ -19,6 +19,8 @@
?>
<p><?=_("Paste your own public OpenPGP key below. It should not contain a picture. CAcert will sign your key after submission.")?></p>
<form method="post" action="gpg.php">
+<p><?=_("Optional comment, only used in the certifictate overview")?><br />
+ <input type="text" name="description" maxlength="80" size=80 /></p>
<textarea name="CSR" cols="80" rows="15"><?=array_key_exists('CSR',$_POST)?strip_tags($_POST['CSR']):""?></textarea><br />
<p><input type="checkbox" name="CCA" /> <strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
<?=_("Please Note: You need to accept the CCA to proceed.")?></p>