summaryrefslogtreecommitdiff
path: root/pages/gpg/0.php
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-07-22 07:22:37 +0200
committerBenny Baumann <BenBE@geshi.org>2013-07-22 07:22:37 +0200
commit23ee6915a319bf79b92c494ced798a8c67817ad3 (patch)
tree840c4623882af549d6543307731e50d031dbf2a1 /pages/gpg/0.php
parent2e6489775c62b7a0ef4e4bcbb0effc6c12c305a3 (diff)
parent32bec6416a6f6e40b912a707830b6c7385a9a056 (diff)
downloadcacert-devel-23ee6915a319bf79b92c494ced798a8c67817ad3.tar.gz
cacert-devel-23ee6915a319bf79b92c494ced798a8c67817ad3.tar.xz
cacert-devel-23ee6915a319bf79b92c494ced798a8c67817ad3.zip
Merge branch 'bug-893' into bug-1136
Conflicts: includes/temp_functions.php pages/account/43.php
Diffstat (limited to 'pages/gpg/0.php')
-rw-r--r--pages/gpg/0.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/pages/gpg/0.php b/pages/gpg/0.php
index ce3b72a..7c7a37b 100644
--- a/pages/gpg/0.php
+++ b/pages/gpg/0.php
@@ -19,7 +19,9 @@
?>
<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">
-<textarea name="CSR" cols="80" rows="15"><?=array_key_exists('CSR',$_POST)?strip_tags($_POST['CSR']):""?></textarea><br>
-<input type="submit" name="process" value="<?=_("Submit")?>">
-<input type="hidden" name="oldid" value="<?=$id?>">
+<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 />
+<input type="submit" name="process" value="<?=_("Submit")?>" />
+<input type="hidden" name="oldid" value="<?=$id?>" />
</form>