summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Dörre <felix@dogcraft.de>2014-09-23 23:39:11 +0200
committerFelix Dörre <felix@dogcraft.de>2014-09-23 23:45:23 +0200
commitde06286a660c6342d57ecee95c03077f28a9d540 (patch)
treed2f01008d6573a6fa6785d138fbe52539a773575
parent408c03848b0e60e449c0d5b9bf75bb9ddd88c269 (diff)
downloadcacert-devel-de06286a660c6342d57ecee95c03077f28a9d540.tar.gz
cacert-devel-de06286a660c6342d57ecee95c03077f28a9d540.tar.xz
cacert-devel-de06286a660c6342d57ecee95c03077f28a9d540.zip
bug-790: do translation, fix cert download
-rw-r--r--includes/keygen.php2
-rw-r--r--pages/account/17.php6
-rw-r--r--pages/account/19.php4
3 files changed, 8 insertions, 4 deletions
diff --git a/includes/keygen.php b/includes/keygen.php
index 2713a81..0a6578d 100644
--- a/includes/keygen.php
+++ b/includes/keygen.php
@@ -121,7 +121,7 @@ if (array_key_exists('HTTP_USER_AGENT',$_SERVER) && strstr($_SERVER['HTTP_USER_A
<input type="hidden" name="keytype" value="NS">
<?=_("Keysize:")?> <keygen name="SPKAC" challenge="<? $_SESSION['spkac_hash']=make_hash(); echo $_SESSION['spkac_hash']; ?>">
- <input type="submit" name="submit" value="<?=_("Create Certificate Request")?>">
+ <input type="submit" name="submit" value="<?=_("Generate SPKAC")?>">
<input type="hidden" name="oldid" value="<?=intval($id)?>">
</form>
</p>
diff --git a/pages/account/17.php b/pages/account/17.php
index cd2ad0a..0d5c2c7 100644
--- a/pages/account/17.php
+++ b/pages/account/17.php
@@ -19,10 +19,10 @@
require_once($_SESSION['_config']['filepath'].'/includes/keygen.php');
?>
-
+ -- <?=_("or")?> --
<form method="post" action="account.php">
<input type="hidden" name="keytype" value="VI">
- <textarea rows="10" cols="10" name="CSR"></textarea>
- <input type="submit" name="submit" value="Erstellen einer Zertifikat-Anfrage (CSR)">
+ <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 6a2749c..6b488f3 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 $cert;
+ showfooter();
} else {
showheader(_("My CAcert.org Account!"));
?>