diff options
| author | Benny Baumann <BenBE@geshi.org> | 2013-07-21 22:33:04 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2013-07-21 22:33:04 +0200 |
| commit | eb288d6caa7426f24f28cb647fd5e9f451c26d23 (patch) | |
| tree | 80af1dbd5866f545481ffcf95f8ca51222517c5d /pages/gpg/0.php | |
| parent | 4173e38402f9cd765828dd5bd59771f1e31db96e (diff) | |
| parent | c8a190e3abfbd4f4422e04baf4c869bf8ce87fac (diff) | |
| download | cacert-devel-eb288d6caa7426f24f28cb647fd5e9f451c26d23.tar.gz cacert-devel-eb288d6caa7426f24f28cb647fd5e9f451c26d23.tar.xz cacert-devel-eb288d6caa7426f24f28cb647fd5e9f451c26d23.zip | |
Merge branch 'bug-1177' into bug-893
Conflicts:
includes/account.php
Diffstat (limited to 'pages/gpg/0.php')
| -rw-r--r-- | pages/gpg/0.php | 8 |
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> |