bug-790: do translation, fix cert download
authorFelix Dörre <felix@dogcraft.de>
Tue, 23 Sep 2014 21:39:11 +0000 (23:39 +0200)
committerFelix Dörre <felix@dogcraft.de>
Tue, 23 Sep 2014 21:45:23 +0000 (23:45 +0200)
includes/keygen.php
pages/account/17.php
pages/account/19.php

index 2713a81..0a6578d 100644 (file)
@@ -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>
index cd2ad0a..0d5c2c7 100644 (file)
 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>
index 6a2749c..6b488f3 100644 (file)
                        showfooter();
                        exit;
                }
+       } else if($row['keytype'] == "VI"){
+               showheader(_("My CAcert.org Account!"));
+               echo $cert;
+               showfooter();
        } else {
                showheader(_("My CAcert.org Account!"));
 ?>