From de06286a660c6342d57ecee95c03077f28a9d540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Tue, 23 Sep 2014 23:39:11 +0200
Subject: bug-790: do translation, fix cert download

---
 includes/keygen.php  | 2 +-
 pages/account/17.php | 6 +++---
 pages/account/19.php | 4 ++++
 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!"));
 ?>
-- 
cgit v1.2.1