diff options
| author | Benny Baumann <BenBE@geshi.org> | 2013-08-13 21:25:28 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2013-08-13 21:25:28 +0200 |
| commit | 90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25 (patch) | |
| tree | c869a8f3af7ded6a5e943a813f18c7a517561c9d /pages/gpg | |
| parent | e4d5df60c1c443d0e4a516cc9aa5d5d7cdb0b55a (diff) | |
| parent | 75693292de2d907bf2a4b0f12abd7cd68781f95a (diff) | |
| download | cacert-devel-90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25.tar.gz cacert-devel-90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25.tar.xz cacert-devel-90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25.zip | |
Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137
Conflicts:
includes/account.php
pages/account/10.php
pages/account/3.php
pages/gpg/0.php
www/gpg.php
Diffstat (limited to 'pages/gpg')
| -rw-r--r-- | pages/gpg/0.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pages/gpg/0.php b/pages/gpg/0.php index 7c7a37b..f490511 100644 --- a/pages/gpg/0.php +++ b/pages/gpg/0.php @@ -22,6 +22,8 @@ <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> <input type="submit" name="process" value="<?=_("Submit")?>" /> <input type="hidden" name="oldid" value="<?=$id?>" /> </form> |