From 2d5c9ce4b45d2bdea60e0c9a5d3041b15fa51925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Thu, 13 Mar 2014 00:31:48 +0100
Subject: bug 807: Fix markup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/3.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pages/account')

diff --git a/pages/account/3.php b/pages/account/3.php
index 7e34300..0b89029 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -34,6 +34,7 @@
   <tr>
     <td class="DataTD"><?=_("Add")?></td>
     <td class="DataTD"><?=_("Address")?></td>
+  </tr>
 
 <?
 	$query = "select * from `email` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `hash`=''";
@@ -52,6 +53,7 @@ if($_SESSION['profile']['points'] >= 50)
 	$lname = $_SESSION['profile']['lname'];
 	$suffix = $_SESSION['profile']['suffix'];
 ?>
+  <tr>
     <td class="DataTD" colspan="2" align="left">
       <input type="radio" name="rootcert" value="1" checked /> <?=_("Sign by class 1 root certificate")?><br />
       <input type="radio" name="rootcert" value="2" /> <?=_("Sign by class 3 root certificate")?><br />
-- 
cgit v1.2.1


From 1c5409b02e58e938e44ab7f8f12eabd9288ed01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Wed, 19 Mar 2014 00:24:10 +0100
Subject: bug 807: Introduce an advanced settings field in all cert creation
 pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/10.php | 35 +++++++++++++++++++++++++++++------
 pages/account/16.php | 34 +++++++++++++++++++++++++++++++---
 pages/account/20.php | 29 ++++++++++++++++++++++++-----
 pages/account/3.php  | 43 +++++++++++++++++++++++++------------------
 4 files changed, 109 insertions(+), 32 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/10.php b/pages/account/10.php
index 8908400..e8affff 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -30,17 +30,40 @@
 <p><?=_("If you are a valid organisation and would like the organisation name in the certificates you can apply for an organisation assurance. Contact us via support@cacert.org for more information.")?></p>
 
 <form method="post" action="account.php">
+<p><?=_("Optional comment, only used in the certificate overview")?><br>
+	<input type="text" name="description" maxlength="80" size=80/></p>
+<p><?=_("Paste your CSR(Certificate Signing Request) below...")?><br />
+	<textarea name="CSR" cols="80" rows="15"></textarea>
+</p>
+
+<p id="expertoff" style="display:none"><input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" /> <label for="expertbox"><?=_("Show advanced options")?></label></p>
+<div id="advanced_options" style="border: 1px solid">
+
 <? if($_SESSION['profile']['points'] >= 50) { ?>
-<input type="radio" name="rootcert" value="1"/> <?=_("Sign by class 1 root certificate")?><br />
-<input type="radio" name="rootcert" value="2" checked/> <?=_("Sign by class 3 root certificate")?><br />
+<p>
+	<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/> <label for="root2"><?=_("Sign by class 3 root certificate")?></label>
+</p>
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 <? } ?>
-<p><?=_("Optional comment, only used in the certificate overview")?><br>
-       <input type="text" name="description" maxlength="80" size=80/></p>
-<p><?=_("Paste your CSR(Certificate Signing Request) below...")?></p>
-<textarea name="CSR" cols="80" rows="15"></textarea><br />
+
+</div>
+
 <p><input type="checkbox" name="CCA" /> <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.")?></p>
 <input type="submit" name="process" value="<?=_("Submit")?>" />
 <input type="hidden" name="oldid" value="<?=$id?>" />
 </form>
+
+
+<script language="javascript">
+function showExpert(a)
+{
+	var options=document.getElementById("advanced_options");
+	options.style.display = (a) ? "" : "none";
+
+	var checkbox=document.getElementById("expertoff");
+	checkbox.style.display = "";
+}
+showExpert(false);
+</script>
diff --git a/pages/account/16.php b/pages/account/16.php
index 564463e..707be04 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -44,7 +44,16 @@
     <td class="DataTD"><?=_("Department")?>:</td>
     <td class="DataTD"><input type="text" name="OU" value="<?=array_key_exists('OU',$_SESSION['_config'])?($_SESSION['_config']['OU']):''?>"/></td>
   </tr>
-  <tr>
+
+  <tr name="expertoff" style="display:none">
+    <td class="DataTD">
+      <input type="checkbox" name="expertbox" onchange="showExpert(this.checked)" />
+    </td>
+    <td class="DataTD">
+      <?=_("Show advanced options")?>
+    </td>
+  </tr>
+  <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
         <input type="radio" name="rootcert" value="1" checked /> <?=_("Sign by class 1 root certificate")?><br />
         <input type="radio" name="rootcert" value="2" /> <?=_("Sign by class 3 root certificate")?><br />
@@ -52,11 +61,11 @@
     </td>
   </tr>
 <? if($_SESSION['profile']['codesign'] && $_SESSION['profile']['points'] >= 100) { ?>
-  <tr>
+  <tr name="expert">
     <td class="DataTD" colspan="2" align="left"><input type="checkbox" name="codesign" value="1" /><?=_("Code Signing")?></td>
   </tr>
 <? } ?>
-   <tr>
+  <tr>
    <td class="DataTD" colspan="2" align="left">
       <?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="80" size=80 />
@@ -69,3 +78,22 @@
 </table>
 <input type="hidden" name="oldid" value="<?=$id?>">
 </form>
+
+<script language="javascript">
+function showExpert(a)
+{
+  b=document.getElementsByName("expert");
+  for(i=0;b.length>i;i++)
+  {
+    if(!a) {b[i].setAttribute("style","display:none"); }
+    else {b[i].removeAttribute("style");}
+  }
+  b=document.getElementsByName("expertoff");
+  for(i=0;b.length>i;i++)
+  {
+    b[i].removeAttribute("style");
+  }
+
+}
+showExpert(false);
+</script>
diff --git a/pages/account/20.php b/pages/account/20.php
index ee16dd4..e26309b 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -27,13 +27,32 @@
 <p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
 
 <form method="post" action="account.php">
-<input type="radio" name="rootcert" value="1" /> <?=_("Sign by class 1 root certificate")?><br />
-<input type="radio" name="rootcert" value="2" checked /> <?=_("Sign by class 3 root certificate")?><br />
 <p> <?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="80" size=80 /></p>
+<p><?=_("Paste your CSR below...")?><br />
+<textarea name="CSR" cols="80" rows="15"></textarea></p>
+
+<p id="expertoff" style="display:none"><input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" /> <label for="expertbox"><?=_("Show advanced options")?></label></p>
+<div id="advanced_options" style="border: 1px solid">
+<p>
+	<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 /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label>
+</p>
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
-<p><?=_("Paste your CSR below...")?></p>
-<textarea name="CSR" cols="80" rows="15"></textarea><br />
+</div>
+
 <input type="submit" name="process" value="<?=_("Submit")?>" />
 <input type="hidden" name="oldid" value="<?=$id?>" />
-</form>
\ No newline at end of file
+</form>
+
+<script language="javascript">
+function showExpert(a)
+{
+	var options=document.getElementById("advanced_options");
+	options.style.display = (a) ? "" : "none";
+
+	var checkbox=document.getElementById("expertoff");
+	checkbox.style.display = "";
+}
+showExpert(false);
+</script>
diff --git a/pages/account/3.php b/pages/account/3.php
index 0b89029..2ff57ed 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -53,13 +53,6 @@ if($_SESSION['profile']['points'] >= 50)
 	$lname = $_SESSION['profile']['lname'];
 	$suffix = $_SESSION['profile']['suffix'];
 ?>
-  <tr>
-    <td class="DataTD" colspan="2" align="left">
-      <input type="radio" name="rootcert" value="1" checked /> <?=_("Sign by class 1 root certificate")?><br />
-      <input type="radio" name="rootcert" value="2" /> <?=_("Sign by class 3 root certificate")?><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))?>
-    </td>
-  </tr>
   <tr>
     <td class="DataTD" colspan="2" align="left">
       <input type="radio" name="incname" value="0" checked /> <?=_("No Name")?><br />
@@ -70,17 +63,6 @@ if($_SESSION['profile']['points'] >= 50)
     </td>
   </tr>
 <? } ?>
-<? 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">
-      <?=_("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">
@@ -106,6 +88,31 @@ if($_SESSION['profile']['points'] >= 50)
     </td>
   </tr>
 
+<?
+if($_SESSION['profile']['points'] >= 50)
+{
+?>
+  <tr name="expert">
+    <td class="DataTD" colspan="2" align="left">
+      <input type="radio" name="rootcert" value="1" checked /> <?=_("Sign by class 1 root certificate")?><br />
+      <input type="radio" name="rootcert" value="2" /> <?=_("Sign by class 3 root certificate")?><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))?>
+    </td>
+  </tr>
+<? } ?>
+
+<? if($_SESSION['profile']['points'] >= 100 && $_SESSION['profile']['codesign'] > 0) { ?>
+  <tr name="expert">
+    <td class="DataTD">
+      <input type="checkbox" name="codesign" value="1" />
+    </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 name="expert">
     <td class="DataTD" colspan="2" align="left">
 	<input type="radio" name="SSO" value="0" checked /> <?=_("No Single Sign On ID")?><br />
-- 
cgit v1.2.1


From 233557135e4849f974bd893ab4250edac55a128d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Wed, 19 Mar 2014 01:06:49 +0100
Subject: bug 807: Some HTML cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/10.php | 18 ++++++++++++------
 pages/account/20.php | 17 ++++++++++++-----
 2 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/10.php b/pages/account/10.php
index e8affff..b2be1ff 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -30,14 +30,19 @@
 <p><?=_("If you are a valid organisation and would like the organisation name in the certificates you can apply for an organisation assurance. Contact us via support@cacert.org for more information.")?></p>
 
 <form method="post" action="account.php">
-<p><?=_("Optional comment, only used in the certificate overview")?><br>
-	<input type="text" name="description" maxlength="80" size=80/></p>
+<p><?=_("Optional comment, only used in the certificate overview")?><br />
+	<input type="text" name="description" maxlength="80" size=80 />
+</p>
 <p><?=_("Paste your CSR(Certificate Signing Request) below...")?><br />
 	<textarea name="CSR" cols="80" rows="15"></textarea>
 </p>
 
-<p id="expertoff" style="display:none"><input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" /> <label for="expertbox"><?=_("Show advanced options")?></label></p>
-<div id="advanced_options" style="border: 1px solid">
+<fieldset>
+<legend>
+	<input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" style="display:none" />
+	<label for="expertbox"><?=_("Advanced Options")?></label>
+</legend>
+<div id="advanced_options">
 
 <? if($_SESSION['profile']['points'] >= 50) { ?>
 <p>
@@ -48,8 +53,9 @@
 <? } ?>
 
 </div>
+</fieldset>
 
-<p><input type="checkbox" name="CCA" /> <strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
+<p><input type="checkbox" id="CCA" name="CCA" /> <label for="CCA"><strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong></label><br />
   <?=_("Please Note: You need to accept the CCA to proceed.")?></p>
 <input type="submit" name="process" value="<?=_("Submit")?>" />
 <input type="hidden" name="oldid" value="<?=$id?>" />
@@ -62,7 +68,7 @@ function showExpert(a)
 	var options=document.getElementById("advanced_options");
 	options.style.display = (a) ? "" : "none";
 
-	var checkbox=document.getElementById("expertoff");
+	var checkbox=document.getElementById("expertbox");
 	checkbox.style.display = "";
 }
 showExpert(false);
diff --git a/pages/account/20.php b/pages/account/20.php
index e26309b..4f03061 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -28,18 +28,25 @@
 
 <form method="post" action="account.php">
 <p> <?=_("Optional comment, only used in the certificate overview")?><br />
-       <input type="text" name="description" maxlength="80" size=80 /></p>
+	<input type="text" name="description" maxlength="80" size=80 />
+</p>
 <p><?=_("Paste your CSR below...")?><br />
-<textarea name="CSR" cols="80" rows="15"></textarea></p>
+	<textarea name="CSR" cols="80" rows="15" />
+</p>
 
-<p id="expertoff" style="display:none"><input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" /> <label for="expertbox"><?=_("Show advanced options")?></label></p>
-<div id="advanced_options" style="border: 1px solid">
+<fieldset>
+<legend>
+	<input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" style="display:none" />
+	<label for="expertbox"><?=_("Advanced Options")?></label>
+</legend>
+<div id="advanced_options">
 <p>
 	<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 /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label>
 </p>
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 </div>
+</fieldset>
 
 <input type="submit" name="process" value="<?=_("Submit")?>" />
 <input type="hidden" name="oldid" value="<?=$id?>" />
@@ -51,7 +58,7 @@ function showExpert(a)
 	var options=document.getElementById("advanced_options");
 	options.style.display = (a) ? "" : "none";
 
-	var checkbox=document.getElementById("expertoff");
+	var checkbox=document.getElementById("expertbox");
 	checkbox.style.display = "";
 }
 showExpert(false);
-- 
cgit v1.2.1


From f90c5f995d3842e83fb41aaac2b5254414d8a262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Wed, 19 Mar 2014 01:19:57 +0100
Subject: bug 807: Some more HTML cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/10.php | 4 ++--
 pages/account/20.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/10.php b/pages/account/10.php
index b2be1ff..03e3bd3 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -46,8 +46,8 @@
 
 <? if($_SESSION['profile']['points'] >= 50) { ?>
 <p>
-	<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/> <label for="root2"><?=_("Sign by class 3 root certificate")?></label>
+	<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>
 </p>
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 <? } ?>
diff --git a/pages/account/20.php b/pages/account/20.php
index 4f03061..696f07f 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -42,7 +42,7 @@
 <div id="advanced_options">
 <p>
 	<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 /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label>
+	<input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label>
 </p>
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 </div>
-- 
cgit v1.2.1


From 49dfffa3a509951ac530c7b8907ac2780dc06896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Wed, 19 Mar 2014 01:26:39 +0100
Subject: bug 807: Doh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/20.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pages/account')

diff --git a/pages/account/20.php b/pages/account/20.php
index 696f07f..3a043fc 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -31,7 +31,7 @@
 	<input type="text" name="description" maxlength="80" size=80 />
 </p>
 <p><?=_("Paste your CSR below...")?><br />
-	<textarea name="CSR" cols="80" rows="15" />
+	<textarea name="CSR" cols="80" rows="15"></textarea>
 </p>
 
 <fieldset>
-- 
cgit v1.2.1


From 50d8cd64b022d3e2c7cd8779aa87c00fbdecaf0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Wed, 19 Mar 2014 18:54:35 +0100
Subject: bug 807: Some more markup changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/10.php | 10 +++---
 pages/account/16.php | 55 +++++++++++++++++++-------------
 pages/account/20.php |  8 ++---
 pages/account/3.php  | 90 +++++++++++++++++++++++++++++++---------------------
 4 files changed, 95 insertions(+), 68 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/10.php b/pages/account/10.php
index 03e3bd3..56d6730 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -30,11 +30,11 @@
 <p><?=_("If you are a valid organisation and would like the organisation name in the certificates you can apply for an organisation assurance. Contact us via support@cacert.org for more information.")?></p>
 
 <form method="post" action="account.php">
-<p><?=_("Optional comment, only used in the certificate overview")?><br />
-	<input type="text" name="description" maxlength="80" size=80 />
+<p><label for="description"><?=_("Optional comment, only used in the certificate overview")?></label><br />
+	<input type="text" id="description" name="description" maxlength="80" size="80" />
 </p>
-<p><?=_("Paste your CSR(Certificate Signing Request) below...")?><br />
-	<textarea name="CSR" cols="80" rows="15"></textarea>
+<p><label for="CSR"><?=_("Paste your CSR (Certificate Signing Request) below...")?></label><br />
+	<textarea id="CSR" name="CSR" cols="80" rows="15"></textarea>
 </p>
 
 <fieldset>
@@ -56,7 +56,7 @@
 </fieldset>
 
 <p><input type="checkbox" id="CCA" name="CCA" /> <label for="CCA"><strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong></label><br />
-  <?=_("Please Note: You need to accept the CCA to proceed.")?></p>
+  <?=_("Please note: You need to accept the CCA to proceed.")?></p>
 <input type="submit" name="process" value="<?=_("Submit")?>" />
 <input type="hidden" name="oldid" value="<?=$id?>" />
 </form>
diff --git a/pages/account/16.php b/pages/account/16.php
index 707be04..a53097f 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -25,55 +25,66 @@
   <tr>
     <td class="DataTD"><?=_("Add")?></td>
     <td class="DataTD"><?=_("Address")?></td>
-<? if(array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_config']['emails']))
-	foreach($_SESSION['_config']['emails'] as $val) { ?>
+<?
+if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_config']['emails'])) {
+	$i = 1;
+	foreach($_SESSION['_config']['emails'] as $val) {
+?>
   <tr>
-    <td class="DataTD"><?=_("Email")?>:</td>
-    <td class="DataTD"><input type="text" name="emails[]" value="<?=$val?>"/></td>
+    <td class="DataTD"><label for="email<?=$i?>"><?=_("Email")?></label></td>
+    <td class="DataTD"><input type="text" id="email<?=$i?>" name="emails[]" value="<?=$val?>"/></td>
   </tr>
-<? } ?>
+<?
+		$i++;
+	}
+} ?>
   <tr>
-    <td class="DataTD"><?=_("Email")?>:</td>
-    <td class="DataTD"><input type="text" name="emails[]"/></td>
+    <td class="DataTD"><label for="email0"><?=_("Email")?></td>
+    <td class="DataTD"><input type="text" id="email0" name="emails[]"/></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Name")?>:</td>
-    <td class="DataTD"><input type="text" name="name" value="<?=array_key_exists('name',$_SESSION['_config'])?($_SESSION['_config']['name']):''?>"/></td>
+    <td class="DataTD"><label for="name"><?=_("Name")?></label></td>
+    <td class="DataTD"><input type="text" id="name" name="name" value="<?=array_key_exists('name',$_SESSION['_config'])?($_SESSION['_config']['name']):''?>"/></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Department")?>:</td>
-    <td class="DataTD"><input type="text" name="OU" value="<?=array_key_exists('OU',$_SESSION['_config'])?($_SESSION['_config']['OU']):''?>"/></td>
+    <td class="DataTD"><label for="OU"><?=_("Department")?></label></td>
+    <td class="DataTD"><input type="text" id="OU" name="OU" value="<?=array_key_exists('OU',$_SESSION['_config'])?($_SESSION['_config']['OU']):''?>"/></td>
   </tr>
 
   <tr name="expertoff" style="display:none">
     <td class="DataTD">
-      <input type="checkbox" name="expertbox" onchange="showExpert(this.checked)" />
+      <input type="checkbox" id="expertbox" name="expertbox" onchange="showExpert(this.checked)" />
     </td>
     <td class="DataTD">
-      <?=_("Show advanced options")?>
+      <label for="expertbox"><?=_("Show advanced options")?></label>
     </td>
   </tr>
   <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
-        <input type="radio" name="rootcert" value="1" checked /> <?=_("Sign by class 1 root certificate")?><br />
-        <input type="radio" name="rootcert" value="2" /> <?=_("Sign by class 3 root certificate")?><br />
+        <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))?>
     </td>
   </tr>
 <? if($_SESSION['profile']['codesign'] && $_SESSION['profile']['points'] >= 100) { ?>
   <tr name="expert">
-    <td class="DataTD" colspan="2" align="left"><input type="checkbox" name="codesign" value="1" /><?=_("Code Signing")?></td>
+    <td class="DataTD" colspan="2" align="left">
+      <input type="checkbox" id="codesign" name="codesign" value="1" />
+      <label for="codesign"><?=_("Code Signing")?></label>
+    </td>
   </tr>
 <? } ?>
   <tr>
-   <td class="DataTD" colspan="2" align="left">
-      <?=_("Optional comment, only used in the certificate overview")?><br />
-       <input type="text" name="description" maxlength="80" size=80 />
-   </td>
+    <td class="DataTD" colspan="2" align="left">
+      <label for="description"><?=_("Optional comment, only used in the certificate overview")?></label><br />
+      <input type="text" id="description" name="description" maxlength="80" size="80" />
+    </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="add_email" value="<?=_("Another Email")?>">
-			<input type="submit" name="process" value="<?=_("Next")?>" /></td>
+    <td class="DataTD" colspan="2">
+      <input type="submit" name="add_email" value="<?=_("Add Another Email Address")?>">
+      <input type="submit" name="process" value="<?=_("Next")?>" />
+    </td>
   </tr>
 </table>
 <input type="hidden" name="oldid" value="<?=$id?>">
diff --git a/pages/account/20.php b/pages/account/20.php
index 3a043fc..c90d9b4 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -27,11 +27,11 @@
 <p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
 
 <form method="post" action="account.php">
-<p> <?=_("Optional comment, only used in the certificate overview")?><br />
-	<input type="text" name="description" maxlength="80" size=80 />
+<p><label for="description"><?=_("Optional comment, only used in the certificate overview")?></label><br />
+	<input type="text" id="description" name="description" maxlength="80" size="80" />
 </p>
-<p><?=_("Paste your CSR below...")?><br />
-	<textarea name="CSR" cols="80" rows="15"></textarea>
+<p><label for="CSR"><?=_("Paste your CSR (Certificate Signing Request) below...")?></label><br />
+	<textarea id="CSR" name="CSR" cols="80" rows="15"></textarea>
 </p>
 
 <fieldset>
diff --git a/pages/account/3.php b/pages/account/3.php
index 2ff57ed..49b7a90 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -42,8 +42,8 @@
 	while($row = mysql_fetch_assoc($res))
 	{ ?>
   <tr>
-    <td class="DataTD"><input type="checkbox" name="addid[]" value="<?=intval($row['id'])?>"></td>
-    <td class="DataTD"><?=sanitizeHTML($row['email'])?></td>
+    <td class="DataTD"><input type="checkbox" id="addid<?=intval($row['id'])?>" name="addid[]" value="<?=intval($row['id'])?>"></td>
+    <td class="DataTD" align="left"><label for="addid<?=intval($row['id'])?>"><?=sanitizeHTML($row['email'])?></label></td>
   </tr>
 <? }
 if($_SESSION['profile']['points'] >= 50)
@@ -55,36 +55,50 @@ if($_SESSION['profile']['points'] >= 50)
 ?>
   <tr>
     <td class="DataTD" colspan="2" align="left">
-      <input type="radio" name="incname" value="0" checked /> <?=_("No Name")?><br />
-      <? if($fname && $lname) { ?><input type="radio" name="incname" value="1" /> <?=_("Include")?> '<?=$fname." ".$lname?>'<br /><? } ?>
-      <? if($fname && $mname && $lname) { ?><input type="radio" name="incname" value="2" /> <?=_("Include")?> '<?=$fname." ".$mname." ".$lname?>'<br /><? } ?>
-      <? if($fname && $lname && $suffix) { ?><input type="radio" name="incname" value="3" /> <?=_("Include")?> '<?=$fname." ".$lname." ".$suffix?>'<br /><? } ?>
-      <? if($fname && $mname && $lname && $suffix) { ?><input type="radio" name="incname" value="4" /> <?=_("Include")?> '<?=$fname." ".$mname." ".$lname." ".$suffix?>'<br /><? } ?>
+      <input type="radio" id="incname0" name="incname" value="0" checked="checked" />
+        <label for="incname0"><?=_("No Name")?></label><br />
+      <? if($fname && $lname) { ?>
+        <input type="radio" id="incname1" name="incname" value="1" />
+        <label for="incname1"><?=_("Include")?> '<?=$fname." ".$lname?>'</label><br />
+      <? } ?>
+      <? if($fname && $mname && $lname) { ?>
+        <input type="radio" id="incname2" name="incname" value="2" />
+        <label for="incname2"><?=_("Include")?> '<?=$fname." ".$mname." ".$lname?>'</label><br />
+      <? } ?>
+      <? if($fname && $lname && $suffix) { ?>
+        <input type="radio" id="incname3" name="incname" value="3" />
+        <label for="incname3"><?=_("Include")?> '<?=$fname." ".$lname." ".$suffix?>'</label><br />
+      <? } ?>
+      <? if($fname && $mname && $lname && $suffix) { ?>
+        <input type="radio" id="incname4" name="incname" value="4" />
+        <label for="incname4"><?=_("Include")?> '<?=$fname." ".$mname." ".$lname." ".$suffix?>'</label><br />
+      <? } ?>
     </td>
   </tr>
 <? } ?>
 
   <tr>
     <td class="DataTD">
-      <input type="checkbox" name="login" value="1" checked="checked" />
+      <input type="checkbox" id="login" name="login" value="1" checked="checked" />
     </td>
-    <td class="DataTD"> <?=_("Enable certificate login with this certificate")?><br />
+    <td class="DataTD" align="left">
+      <label for="login"><?=_("Enable certificate login with this certificate")?></label><br />
       <?=_("By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .")?><br/>
     </td>
   </tr>
   <tr>
-   <td class="DataTD" colspan="2" align="left">
-      <?=_("Optional comment, only used in the certificate overview")?><br />
-       <input type="text" name="description" maxlength="100" size="100" />
-   </td>
+    <td class="DataTD" colspan="2" align="left">
+      <label for="description"><?=_("Optional comment, only used in the certificate overview")?></label><br />
+      <input type="text" id="description" name="description" maxlength="100" size="100" />
+    </td>
   </tr>
 
   <tr name="expertoff" style="display:none">
     <td class="DataTD">
-      <input type="checkbox" name="expertbox" onchange="showExpert(this.checked)" />
+      <input type="checkbox" id="expertbox" name="expertbox" onchange="showExpert(this.checked)" />
     </td>
-    <td class="DataTD">
-      <?=_("Show advanced options")?>
+    <td class="DataTD" align="left">
+      <label for="expertbox"><?=_("Show advanced options")?></label>
     </td>
   </tr>
 
@@ -94,8 +108,8 @@ if($_SESSION['profile']['points'] >= 50)
 ?>
   <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
-      <input type="radio" name="rootcert" value="1" checked /> <?=_("Sign by class 1 root certificate")?><br />
-      <input type="radio" name="rootcert" value="2" /> <?=_("Sign by class 3 root certificate")?><br />
+      <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))?>
     </td>
   </tr>
@@ -104,38 +118,41 @@ if($_SESSION['profile']['points'] >= 50)
 <? if($_SESSION['profile']['points'] >= 100 && $_SESSION['profile']['codesign'] > 0) { ?>
   <tr name="expert">
     <td class="DataTD">
-      <input type="checkbox" name="codesign" value="1" />
+      <input type="checkbox" id="codesign" name="codesign" value="1" />
     </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.")?>
+      <label for="codesign"><?=_("Code Signing")?></label><br />
+      <?=_("Please note: By ticking this box you will automatically have your name included in the certificate.")?>
     </td>
   </tr>
 <? } ?>
 
   <tr name="expert">
-    <td class="DataTD" colspan="2" align="left">
-	<input type="radio" name="SSO" value="0" checked /> <?=_("No Single Sign On ID")?><br />
-	<input type="radio" name="SSO" value="1" /> <?=_("Add Single Sign On ID Information")?><br />
-	<?=str_replace("\n", "<br>\n", wordwrap(_("By adding Single Sign On (SSO) ID information to your certificates this could be used to track you, you can also issue certificates with no email addresses that are useful only for Authentication. Please see a more detailed description on our WIKI about it."), 125))?>
-	<a href="http://wiki.cacert.org/wiki/SSO"><?=_("SSO WIKI Entry")?></a>
+    <td class="DataTD">
+      <input type="checkbox" id="SSO" name="SSO" value="1" />
+    </td>
+    <td class="DataTD" align="left">
+      <label for="SSO"><?=_("Add Single Sign On ID Information")?></label><br />
+      <?=str_replace("\n", "<br>\n", wordwrap(_("By adding Single Sign On (SSO) ID information to your certificates this could be used to track you, you can also issue certificates with no email addresses that are useful only for Authentication. Please see a more detailed description on our WIKI about it."), 125))?>
+      <a href="http://wiki.cacert.org/wiki/SSO"><?=_("SSO WIKI Entry")?></a>
     </td>
   </tr>
 
+  <tr name="expert">
+    <td class="DataTD" colspan="2">
+      <label for="optionalCSR"><?=_("Optional Client CSR, no information on the certificate will be used")?></label><br />
+      <textarea id="optionalCSR" name="optionalCSR" cols="80" rows="5"></textarea>
+    </td>
+  </tr>
 
- <tr name="expert">
-    <td class="DataTD" colspan="2"><?=_("Optional Client CSR, no information on the certificate will be used")?></td>
- </tr>
- <tr name="expert">
-    <td class="DataTD" colspan="2"><textarea name="optionalCSR" cols="80" rows="5"></textarea></td>
- </tr>
- <tr>
+
+  <tr>
     <td class="DataTD">
-      <input type="checkbox" name="CCA" />
+      <input type="checkbox" id="CCA" 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.")?>
+      <label for="CCA"><strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong></label><br />
+      <?=_("Please note: You need to accept the CCA to proceed.")?>
     </td>
   </tr>
   <tr>
@@ -163,4 +180,3 @@ function showExpert(a)
 }
 showExpert(false);
 </script>
-
-- 
cgit v1.2.1


From 1d08addf60c2db2dbe673dc0644555897927379d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Wed, 19 Mar 2014 19:03:06 +0100
Subject: bug 807: Consistently make the class 3 root the default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/16.php | 6 +++---
 pages/account/3.php  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'pages/account')

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>
 <? } ?>
-- 
cgit v1.2.1


From 8df925a3427bb53432bd7cff8344e69e0c6c8526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Thu, 20 Mar 2014 00:43:07 +0100
Subject: bug 807: Allow changing the hash algorithm used in signing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/10.php | 27 +++++++++++++++++++++++----
 pages/account/16.php | 14 ++++++++++++++
 pages/account/20.php | 28 ++++++++++++++++++++++++----
 pages/account/3.php  | 13 +++++++++++++
 4 files changed, 74 insertions(+), 8 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/10.php b/pages/account/10.php
index 56d6730..82e4c87 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -45,13 +45,32 @@
 <div id="advanced_options">
 
 <? if($_SESSION['profile']['points'] >= 50) { ?>
-<p>
-	<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>
-</p>
+<ul class="no_indent">
+	<li>
+		<input type="radio" id="root1" name="rootcert" value="1" />
+		<label for="root1"><?=_("Sign by class 1 root certificate")?></label>
+	</li>
+	<li>
+		<input type="radio" id="root2" name="rootcert" value="2" checked="checked" />
+		<label for="root2"><?=_("Sign by class 3 root certificate")?></label>
+	</li>
+</ul>
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 <? } ?>
 
+<p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
+<ul class="no_indent">
+<?
+foreach (HASH_ALGORITHMS as $algorithm => $display_string) {
+?>
+	<li>
+		<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(DEFAULT_HASH_ALGORITHM === $algorithm)?'checked="checked"':''?> />
+		<label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label>
+	</li>
+<?
+} ?>
+</ul>
+
 </div>
 </fieldset>
 
diff --git a/pages/account/16.php b/pages/account/16.php
index ad86e3d..d2c9787 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -66,6 +66,20 @@ if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_conf
         <?=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>
+
+  <tr name="expert">
+    <td class="DataTD" colspan="2" align="left">
+      <?=_("Hash algorithm used when signing the certificate:")?><br />
+      <?
+      foreach (HASH_ALGORITHMS as $algorithm => $display_string) {
+      ?>
+        <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(DEFAULT_HASH_ALGORITHM === $algorithm)?'checked="checked"':''?> />
+        <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label><br />
+      <?
+      } ?>
+    </td>
+  </tr>
+
 <? if($_SESSION['profile']['codesign'] && $_SESSION['profile']['points'] >= 100) { ?>
   <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
diff --git a/pages/account/20.php b/pages/account/20.php
index c90d9b4..f91440e 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -40,11 +40,31 @@
 	<label for="expertbox"><?=_("Advanced Options")?></label>
 </legend>
 <div id="advanced_options">
-<p>
-	<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>
-</p>
+<ul class="no_indent">
+	<li>
+		<input type="radio" id="root1" name="rootcert" value="1" />
+		<label for="root1"><?=_("Sign by class 1 root certificate")?></label>
+	</li>
+	<li>
+		<input type="radio" id="root2" name="rootcert" value="2" checked="checked" />
+		<label for="root2"><?=_("Sign by class 3 root certificate")?></label>
+	</li>
+</ul>
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
+
+<p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
+<ul class="no_indent">
+<?
+foreach (HASH_ALGORITHMS as $algorithm => $display_string) {
+?>
+	<li>
+		<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(DEFAULT_HASH_ALGORITHM === $algorithm)?'checked="checked"':''?> />
+		<label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label>
+	</li>
+<?
+} ?>
+</ul>
+
 </div>
 </fieldset>
 
diff --git a/pages/account/3.php b/pages/account/3.php
index d558ed9..7ce4267 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -115,6 +115,19 @@ if($_SESSION['profile']['points'] >= 50)
   </tr>
 <? } ?>
 
+  <tr name="expert">
+    <td class="DataTD" colspan="2" align="left">
+      <?=_("Hash algorithm used when signing the certificate:")?><br />
+      <?
+      foreach (HASH_ALGORITHMS as $algorithm => $display_string) {
+      ?>
+        <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(DEFAULT_HASH_ALGORITHM === $algorithm)?'checked="checked"':''?> />
+        <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label><br />
+      <?
+      } ?>
+    </td>
+  </tr>
+
 <? if($_SESSION['profile']['points'] >= 100 && $_SESSION['profile']['codesign'] > 0) { ?>
   <tr name="expert">
     <td class="DataTD">
-- 
cgit v1.2.1


From 8872049b1d43ce98f528b9360e778bddd989067b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Thu, 20 Mar 2014 04:25:50 +0100
Subject: bug 807: PHP doesn't allow arrays in constants, let's use a class
 instead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/10.php | 4 ++--
 pages/account/16.php | 4 ++--
 pages/account/20.php | 4 ++--
 pages/account/3.php  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/10.php b/pages/account/10.php
index 82e4c87..317fc0e 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -61,10 +61,10 @@
 <p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
 <ul class="no_indent">
 <?
-foreach (HASH_ALGORITHMS as $algorithm => $display_string) {
+foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
 ?>
 	<li>
-		<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(DEFAULT_HASH_ALGORITHM === $algorithm)?'checked="checked"':''?> />
+		<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
 		<label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label>
 	</li>
 <?
diff --git a/pages/account/16.php b/pages/account/16.php
index d2c9787..2a9d734 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -71,9 +71,9 @@ if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_conf
     <td class="DataTD" colspan="2" align="left">
       <?=_("Hash algorithm used when signing the certificate:")?><br />
       <?
-      foreach (HASH_ALGORITHMS as $algorithm => $display_string) {
+      foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
       ?>
-        <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(DEFAULT_HASH_ALGORITHM === $algorithm)?'checked="checked"':''?> />
+        <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
         <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label><br />
       <?
       } ?>
diff --git a/pages/account/20.php b/pages/account/20.php
index f91440e..470b59a 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -55,10 +55,10 @@
 <p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
 <ul class="no_indent">
 <?
-foreach (HASH_ALGORITHMS as $algorithm => $display_string) {
+foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
 ?>
 	<li>
-		<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(DEFAULT_HASH_ALGORITHM === $algorithm)?'checked="checked"':''?> />
+		<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
 		<label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label>
 	</li>
 <?
diff --git a/pages/account/3.php b/pages/account/3.php
index 7ce4267..bfe8f1a 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -119,9 +119,9 @@ if($_SESSION['profile']['points'] >= 50)
     <td class="DataTD" colspan="2" align="left">
       <?=_("Hash algorithm used when signing the certificate:")?><br />
       <?
-      foreach (HASH_ALGORITHMS as $algorithm => $display_string) {
+      foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
       ?>
-        <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(DEFAULT_HASH_ALGORITHM === $algorithm)?'checked="checked"':''?> />
+        <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
         <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label><br />
       <?
       } ?>
-- 
cgit v1.2.1


From 1a9707d982c6978bbb6d70fa860291d9198d163a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Thu, 20 Mar 2014 05:10:22 +0100
Subject: bug 807: Enlarge labels so they are an easier target (and don't seem
 so arbitrary)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/10.php |  4 ++--
 pages/account/3.php  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/10.php b/pages/account/10.php
index 317fc0e..df95b48 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -74,8 +74,8 @@ foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
 </div>
 </fieldset>
 
-<p><input type="checkbox" id="CCA" name="CCA" /> <label for="CCA"><strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong></label><br />
-  <?=_("Please note: You need to accept the CCA to proceed.")?></p>
+<p><input type="checkbox" id="CCA" name="CCA" /> <label for="CCA"><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.")?></label></p>
 <input type="submit" name="process" value="<?=_("Submit")?>" />
 <input type="hidden" name="oldid" value="<?=$id?>" />
 </form>
diff --git a/pages/account/3.php b/pages/account/3.php
index bfe8f1a..8c386cd 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -82,8 +82,8 @@ if($_SESSION['profile']['points'] >= 50)
       <input type="checkbox" id="login" name="login" value="1" checked="checked" />
     </td>
     <td class="DataTD" align="left">
-      <label for="login"><?=_("Enable certificate login with this certificate")?></label><br />
-      <?=_("By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .")?><br/>
+      <label for="login"><?=_("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/ .")?></label>
     </td>
   </tr>
   <tr>
@@ -134,8 +134,8 @@ if($_SESSION['profile']['points'] >= 50)
       <input type="checkbox" id="codesign" name="codesign" value="1" />
     </td>
     <td class="DataTD" align="left">
-      <label for="codesign"><?=_("Code Signing")?></label><br />
-      <?=_("Please note: By ticking this box you will automatically have your name included in the certificate.")?>
+      <label for="codesign"><?=_("Code Signing")?><br />
+      <?=_("Please note: By ticking this box you will automatically have your name included in the certificate.")?></label>
     </td>
   </tr>
 <? } ?>
@@ -145,9 +145,9 @@ if($_SESSION['profile']['points'] >= 50)
       <input type="checkbox" id="SSO" name="SSO" value="1" />
     </td>
     <td class="DataTD" align="left">
-      <label for="SSO"><?=_("Add Single Sign On ID Information")?></label><br />
+      <label for="SSO"><?=_("Add Single Sign On ID Information")?><br />
       <?=str_replace("\n", "<br>\n", wordwrap(_("By adding Single Sign On (SSO) ID information to your certificates this could be used to track you, you can also issue certificates with no email addresses that are useful only for Authentication. Please see a more detailed description on our WIKI about it."), 125))?>
-      <a href="http://wiki.cacert.org/wiki/SSO"><?=_("SSO WIKI Entry")?></a>
+      <a href="http://wiki.cacert.org/wiki/SSO"><?=_("SSO WIKI Entry")?></a></label>
     </td>
   </tr>
 
@@ -164,8 +164,8 @@ if($_SESSION['profile']['points'] >= 50)
       <input type="checkbox" id="CCA" name="CCA" />
     </td>
     <td class="DataTD" align="left">
-      <label for="CCA"><strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong></label><br />
-      <?=_("Please note: You need to accept the CCA to proceed.")?>
+      <label for="CCA"><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.")?></label>
     </td>
   </tr>
   <tr>
-- 
cgit v1.2.1


From 9183b44586f9eb798057e0a42a9eee5be4f96160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Thu, 20 Mar 2014 17:19:55 +0100
Subject: bug 807: Avoid redundant data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/10.php | 7 ++++---
 pages/account/16.php | 7 ++++---
 pages/account/20.php | 7 ++++---
 pages/account/3.php  | 7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/10.php b/pages/account/10.php
index df95b48..17999a7 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -61,14 +61,15 @@
 <p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
 <ul class="no_indent">
 <?
-foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
+foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
 ?>
 	<li>
 		<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
-		<label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label>
+		<label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label>
 	</li>
 <?
-} ?>
+}
+?>
 </ul>
 
 </div>
diff --git a/pages/account/16.php b/pages/account/16.php
index 2a9d734..28aa614 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -71,12 +71,13 @@ if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_conf
     <td class="DataTD" colspan="2" align="left">
       <?=_("Hash algorithm used when signing the certificate:")?><br />
       <?
-      foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
+      foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
       ?>
         <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
-        <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label><br />
+        <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label><br />
       <?
-      } ?>
+      }
+      ?>
     </td>
   </tr>
 
diff --git a/pages/account/20.php b/pages/account/20.php
index 470b59a..89bbc30 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -55,14 +55,15 @@
 <p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
 <ul class="no_indent">
 <?
-foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
+foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
 ?>
 	<li>
 		<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
-		<label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label>
+		<label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label>
 	</li>
 <?
-} ?>
+}
+?>
 </ul>
 
 </div>
diff --git a/pages/account/3.php b/pages/account/3.php
index 8c386cd..cd62ce0 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -119,12 +119,13 @@ if($_SESSION['profile']['points'] >= 50)
     <td class="DataTD" colspan="2" align="left">
       <?=_("Hash algorithm used when signing the certificate:")?><br />
       <?
-      foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
+      foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
       ?>
         <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
-        <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label><br />
+        <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label><br />
       <?
-      } ?>
+      }
+      ?>
     </td>
   </tr>
 
-- 
cgit v1.2.1