summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-03-19 19:03:06 +0100
committerMichael Tänzer <neo@nhng.de>2014-03-19 19:03:06 +0100
commit1d08addf60c2db2dbe673dc0644555897927379d (patch)
tree1930be701d4523b12f8803f8478a252e667b2aae
parent50d8cd64b022d3e2c7cd8779aa87c00fbdecaf0e (diff)
downloadcacert-devel-1d08addf60c2db2dbe673dc0644555897927379d.tar.gz
cacert-devel-1d08addf60c2db2dbe673dc0644555897927379d.tar.xz
cacert-devel-1d08addf60c2db2dbe673dc0644555897927379d.zip
bug 807: Consistently make the class 3 root the default
Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r--pages/account/16.php6
-rw-r--r--pages/account/3.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/pages/account/16.php b/pages/account/16.php
index a53097f..ad86e3d 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -61,9 +61,9 @@ if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_conf
</tr>
<tr name="expert">
<td class="DataTD" colspan="2" align="left">
- <input type="radio" id="root1" name="rootcert" value="1" checked="checked" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br />
- <input type="radio" id="root2" name="rootcert" value="2" /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label><br />
- <?=str_replace("\n", "<br>\n", wordwrap(_("Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people"), 60))?>
+ <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br />
+ <input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label><br />
+ <?=str_replace("\n", "<br>\n", wordwrap(_("Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain."), 60))?>
</td>
</tr>
<? if($_SESSION['profile']['codesign'] && $_SESSION['profile']['points'] >= 100) { ?>
diff --git a/pages/account/3.php b/pages/account/3.php
index 49b7a90..d558ed9 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -108,9 +108,9 @@ if($_SESSION['profile']['points'] >= 50)
?>
<tr name="expert">
<td class="DataTD" colspan="2" align="left">
- <input type="radio" id="root1" name="rootcert" value="1" checked="checked" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br />
- <input type="radio" id="root2" name="rootcert" value="2" /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label><br />
- <?=str_replace("\n", "<br />\n", wordwrap(_("Please note: The class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain. Until we are included in browsers this might not be a desirable option for most people"), 125))?>
+ <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br />
+ <input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label><br />
+ <?=str_replace("\n", "<br />\n", wordwrap(_("Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain."), 125))?>
</td>
</tr>
<? } ?>