diff options
Diffstat (limited to 'pages/account')
| -rw-r--r-- | pages/account/13.php | 12 | ||||
| -rw-r--r-- | pages/account/15.php | 2 | ||||
| -rw-r--r-- | pages/account/16.php | 1 | ||||
| -rw-r--r-- | pages/account/17.php | 9 | ||||
| -rw-r--r-- | pages/account/19.php | 6 | ||||
| -rw-r--r-- | pages/account/23.php | 2 | ||||
| -rw-r--r-- | pages/account/6.php | 6 |
7 files changed, 21 insertions, 17 deletions
diff --git a/pages/account/13.php b/pages/account/13.php index 080e277..ea28c0e 100644 --- a/pages/account/13.php +++ b/pages/account/13.php @@ -127,20 +127,10 @@ <td colspan="2" class="title"><a href="account.php?id=59&oldid=13&userid=<?=intval($_SESSION['profile']['id'])?>"><?=_('Show account history')?></a></td> </tr> <tr> - <td colspan="2" class="title"><a href="account.php?id=13&showdetails=<?=intval(!$showdetails)?>"><?=_("View secret question & answers and OTP phrases")?></a></td> + <td colspan="2" class="title"><a href="account.php?id=13&showdetails=<?=intval(!$showdetails)?>"><?=_("View secret question & answers")?></a></td> </tr> <? if($showdetails){ ?> <tr> - <td class="DataTD"><?=_("OTP Hash")?><br> - (<?=_("Not displayed")?>)</td> - <td class="DataTD"><input type="text" name="otphash"></td> - </tr> - <tr> - <td class="DataTD"><?=_("OTP PIN")?><br> - (<?=_("Not displayed")?>)</td> - <td class="DataTD"><input type="text" name="otppin"></td> - </tr> - <tr> <td class="DataTD" colspan="2"><?=_("Lost Pass Phrase Questions")?></td> </tr> <tr> diff --git a/pages/account/15.php b/pages/account/15.php index 6cd3115..405cb44 100644 --- a/pages/account/15.php +++ b/pages/account/15.php @@ -30,7 +30,7 @@ } $row = mysql_fetch_assoc($res); $crtname=escapeshellarg($row['crt_name']); - $cert = `/usr/bin/openssl x509 -in $crtname`; + $cert = shell_exec("/usr/bin/openssl x509 -in $crtname"); ?> <h3><?=_("Below is your Server Certificate")?></h3> <pre> 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 6a2749c..d7259f3 100644 --- a/pages/account/19.php +++ b/pages/account/19.php @@ -31,7 +31,7 @@ } $row = mysql_fetch_assoc($res); $crtname=escapeshellarg($row['crt_name']); - $cert = `/usr/bin/openssl x509 -in $crtname`; + $cert = shell_exec("/usr/bin/openssl x509 -in $crtname"); if($row['keytype'] == "NS") { @@ -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!")); ?> diff --git a/pages/account/23.php b/pages/account/23.php index 4ec56c3..4255b47 100644 --- a/pages/account/23.php +++ b/pages/account/23.php @@ -30,7 +30,7 @@ } $row = mysql_fetch_assoc($res); $crtname=escapeshellarg($row['crt_name']); - $cert = `/usr/bin/openssl x509 -in $crtname`; + $cert = shell_exec("/usr/bin/openssl x509 -in $crtname"); ?> <h3><?=_("Below is your Server Certificate")?></h3> <pre> diff --git a/pages/account/6.php b/pages/account/6.php index 305fccb..de8d1a3 100644 --- a/pages/account/6.php +++ b/pages/account/6.php @@ -60,7 +60,7 @@ if (array_key_exists('format', $_REQUEST)) { } $crtname=escapeshellarg($row['crt_name']); - $cert = `/usr/bin/openssl x509 -in $crtname $outform`; + $cert = shell_exec("/usr/bin/openssl x509 -in $crtname $outform"); header("Content-Type: application/pkix-cert"); header("Content-Length: ".strlen($cert)); @@ -82,7 +82,7 @@ if (array_key_exists('format', $_REQUEST)) { } else { // All other browsers $crtname=escapeshellarg($row['crt_name']); - $cert = `/usr/bin/openssl x509 -in $crtname -outform DER`; + $cert = shell_exec("/usr/bin/openssl x509 -in $crtname -outform DER"); header("Content-Type: application/x-x509-user-cert"); header("Content-Length: ".strlen($cert)); @@ -111,7 +111,7 @@ if (array_key_exists('format', $_REQUEST)) { // Allow to directly copy and paste the cert in PEM format $crtname=escapeshellarg($row['crt_name']); - $cert = `/usr/bin/openssl x509 -in $crtname -outform PEM`; + $cert = shell_exec("/usr/bin/openssl x509 -in $crtname -outform PEM"); echo "<pre>$cert</pre>"; ?> |