diff options
author | Michael Tänzer <neo@nhng.de> | 2014-12-05 01:26:02 +0100 |
---|---|---|
committer | Michael Tänzer <neo@nhng.de> | 2014-12-05 01:26:02 +0100 |
commit | 5596d4a37845019c6053c184a94689101a7d48a8 (patch) | |
tree | bbc315fd77ac97821e6f51703476639810185789 /pages | |
parent | 9e373f974a28e3573a419a069bfeb8ce2503f69d (diff) | |
parent | 7c3691bce3bfbd46e8e18bd23f0aa566f685c5fe (diff) | |
download | cacert-devel-5596d4a37845019c6053c184a94689101a7d48a8.tar.gz cacert-devel-5596d4a37845019c6053c184a94689101a7d48a8.tar.xz cacert-devel-5596d4a37845019c6053c184a94689101a7d48a8.zip |
Merge remote-tracking branch 'origin/bug-790' into release
Diffstat (limited to 'pages')
-rw-r--r-- | pages/account/16.php | 1 | ||||
-rw-r--r-- | pages/account/17.php | 9 | ||||
-rw-r--r-- | pages/account/19.php | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/pages/account/16.php b/pages/account/16.php index 8783bc5..829897f 100644 --- a/pages/account/16.php +++ b/pages/account/16.php @@ -104,6 +104,7 @@ if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_conf </table> <input type="hidden" name="oldid" value="<?=$id?>"> </form> +<?=_("Please fill out the form, when all data is entered and you click \"Next\" you can add either a CSR (certificate signing request) or create a new key with your browser. Even in the case that a CSR is given the data from this form will be used for the certificate. Only the public key information of the CSR will be copied.")?> <script language="javascript"> function showExpert(a) diff --git a/pages/account/17.php b/pages/account/17.php index 8ac8b65..0d5c2c7 100644 --- a/pages/account/17.php +++ b/pages/account/17.php @@ -17,3 +17,12 @@ */ require_once($_SESSION['_config']['filepath'].'/includes/keygen.php'); + +?> + -- <?=_("or")?> -- + <form method="post" action="account.php"> + <input type="hidden" name="keytype" value="VI"> + <textarea rows="20" cols="40" name="CSR"></textarea> + <input type="submit" name="submit" value="<?=_("Submit CSR")?>"> + <input type="hidden" name="oldid" value="17"> + </form> diff --git a/pages/account/19.php b/pages/account/19.php index 959111f..d7259f3 100644 --- a/pages/account/19.php +++ b/pages/account/19.php @@ -52,6 +52,10 @@ showfooter(); exit; } + } else if($row['keytype'] == "VI"){ + showheader(_("My CAcert.org Account!")); + echo "<pre>".$cert."</pre>"; + showfooter(); } else { showheader(_("My CAcert.org Account!")); ?> |