summaryrefslogtreecommitdiff
path: root/pages/account/3.php
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-09-06 05:40:36 +0200
committerBenny Baumann <BenBE@geshi.org>2013-09-06 05:40:36 +0200
commit18a9f2205edaaf42ab15f48c2165c31883bba8e5 (patch)
tree2d68fc0f549cb1b7c1fd9ba087ee0e74c9e49ec9 /pages/account/3.php
parent0b92c4652f949b0a795e15064efe9f41c1eca769 (diff)
parent24603f28cde091813d8022daa9153eb4ab685ca4 (diff)
downloadcacert-devel-18a9f2205edaaf42ab15f48c2165c31883bba8e5.tar.gz
cacert-devel-18a9f2205edaaf42ab15f48c2165c31883bba8e5.tar.xz
cacert-devel-18a9f2205edaaf42ab15f48c2165c31883bba8e5.zip
Merge branch 'merge-bug-1177-893-1136-1123-1137' into release
Conflicts: www/gpg.php
Diffstat (limited to 'pages/account/3.php')
-rw-r--r--pages/account/3.php28
1 files changed, 22 insertions, 6 deletions
diff --git a/pages/account/3.php b/pages/account/3.php
index c2165c2..b760c11 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -70,17 +70,21 @@ if($_SESSION['profile']['points'] >= 50)
<? } ?>
<? if($_SESSION['profile']['points'] >= 100 && $_SESSION['profile']['codesign'] > 0) { ?>
<tr>
+ <td class="DataTD">
+ <input type="checkbox" name="codesign" value="1" />
+ </td>
<td class="DataTD" align="left">
- <input type="checkbox" name="codesign" value="1" /> <?=_("Code Signing")?></td>
- <td class="DataTD" align="left">
+ <?=_("Code Signing")?><br />
<?=_("Please Note: By ticking this box you will automatically have your name included in any certificates.")?>
</td>
</tr>
<? } ?>
<tr>
- <td class="DataTD" colspan="2" align="left">
- <input type="checkbox" name="login" value="1" checked="checked" /> <?=_("Enable certificate login with this certificate")?><br />
+ <td class="DataTD">
+ <input type="checkbox" name="login" value="1" checked="checked" />
+ </td>
+ <td class="DataTD"> <?=_("Enable certificate login with this certificate")?><br />
<?=_("By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .")?><br/>
</td>
</tr>
@@ -92,8 +96,11 @@ if($_SESSION['profile']['points'] >= 50)
</tr>
<tr name="expertoff" style="display:none">
- <td class="DataTD" colspan="2" align="left">
- <input type="checkbox" name="expertbox" onchange="showExpert(this.checked)"/><?=_("Show advanced options")?>
+ <td class="DataTD">
+ <input type="checkbox" name="expertbox" onchange="showExpert(this.checked)" />
+ </td>
+ <td class="DataTD">
+ <?=_("Show advanced options")?>
</td>
</tr>
@@ -114,6 +121,15 @@ if($_SESSION['profile']['points'] >= 50)
<td class="DataTD" colspan="2"><textarea name="optionalCSR" cols="80" rows="5"></textarea></td>
</tr>
<tr>
+ <td class="DataTD">
+ <input type="checkbox" name="CCA" />
+ </td>
+ <td class="DataTD" align="left">
+ <strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
+ <?=_("Please Note: You need to accept the CCA to proceed.")?>
+ </td>
+ </tr>
+ <tr>
<td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>" /></td>
</tr>
</table>