From 91f7e11751e65622942c2b7dfff1fbe990849f13 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jandd@cacert.org>
Date: Sat, 16 Sep 2023 21:27:10 +0200
Subject: [PATCH 1/2] Add link to new CSR generator application

addresses https://bugs.cacert.org/view.php?id=1551
---
 pages/account/3.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pages/account/3.php b/pages/account/3.php
index cd62ce0..25c62fc 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -26,15 +26,19 @@
 
 <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>
 
+<h4><?= _("There is a new method for generating a CSR for this page.") ?></h5>
+<p><?= _("It is completely described in https://wiki.cacert.org/TutorialsHowto/Generate-new-CSR, which you should follow.  At the point where it says \"Copy CSR to Clipboard\" do that and come back to this page and paste the result into the textbox at the bottom of this page.") ?></p>
+<p><a href='https://community.cacert.org/clientcert' target=_blank ><?= _("Here is a link to that procedure. It will open in a new tab.") ?></p>
+
 <form method="post" action="account.php">
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
-  <tr>
-    <td colspan="2" class="title"><?=_("New Client Certificate")?></td>
-  </tr>
-  <tr>
-    <td class="DataTD"><?=_("Add")?></td>
-    <td class="DataTD"><?=_("Address")?></td>
-  </tr>
+  <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+    <tr>
+      <td colspan="2" class="title"><?=_("New Client Certificate")?></td>
+    </tr>
+    <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`=''";

From 3ecb1a6d1a6781fb44fcffab6d55d1e0b413d829 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jandd@cacert.org>
Date: Sat, 16 Sep 2023 21:28:23 +0200
Subject: [PATCH 2/2] Enable expert options by default

addresses https://bugs.cacert.org/view.php?id=1551
---
 pages/account/3.php | 272 ++++++++++++++++++++------------------------
 1 file changed, 122 insertions(+), 150 deletions(-)

diff --git a/pages/account/3.php b/pages/account/3.php
index 25c62fc..5bfa085 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -40,161 +40,133 @@
       <td class="DataTD"><?=_("Address")?></td>
     </tr>
 
-<?
-	$query = "select * from `email` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `hash`=''";
-	$res = mysql_query($query);
-	while($row = mysql_fetch_assoc($res))
-	{ ?>
-  <tr>
-    <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)
-{
-	$fname = $_SESSION['profile']['fname'];
-	$mname = $_SESSION['profile']['mname'];
-	$lname = $_SESSION['profile']['lname'];
-	$suffix = $_SESSION['profile']['suffix'];
-?>
-  <tr>
-    <td class="DataTD" colspan="2" align="left">
-      <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 />
+    <?
+      $query = "select * from `email` where `memid`='" . intval($_SESSION[ 'profile' ][ 'id' ] ) . "' and `deleted`=0 and `hash`=''";
+      $res   = mysql_query($query );
+      while ($row = mysql_fetch_assoc($res))
+      { ?>
+        <tr>
+          <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 )
+      {
+        $fname  = $_SESSION[ 'profile' ][ 'fname' ];
+        $mname  = $_SESSION[ 'profile' ][ 'mname' ];
+        $lname  = $_SESSION[ 'profile' ][ 'lname' ];
+        $suffix = $_SESSION[ 'profile' ][ 'suffix' ];
+        ?>
+        <tr>
+          <td class="DataTD" colspan="2" align="left">
+            <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>
       <? } ?>
-      <? 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" id="login" name="login" value="1" checked="checked" />
-    </td>
-    <td class="DataTD" align="left">
-      <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>
-    <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" id="expertbox" name="expertbox" onchange="showExpert(this.checked)" />
-    </td>
-    <td class="DataTD" align="left">
-      <label for="expertbox"><?=_("Show advanced options")?></label>
-    </td>
-  </tr>
+      <tr>
+        <td class="DataTD">
+          <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") ?><br/>
+          <?= _("By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .") ?></label>
+        </td>
+      </tr>
+      <tr>
+        <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>
 
 <?
-if($_SESSION['profile']['points'] >= 50)
-{
-?>
-  <tr name="expert">
-    <td class="DataTD" colspan="2" align="left">
-      <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>
-<? } ?>
-
-  <tr name="expert">
-    <td class="DataTD" colspan="2" align="left">
-      <?=_("Hash algorithm used when signing the certificate:")?><br />
-      <?
-      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_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label><br />
-      <?
-      }
+	if($_SESSION['profile']['points'] >= 50)
+	{
       ?>
-    </td>
-  </tr>
-
-<? if($_SESSION['profile']['points'] >= 100 && $_SESSION['profile']['codesign'] > 0) { ?>
-  <tr name="expert">
-    <td class="DataTD">
-      <input type="checkbox" id="codesign" name="codesign" value="1" />
-    </td>
-    <td class="DataTD" align="left">
-      <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>
+      <tr>
+        <td class="DataTD" colspan="2" align="left">
+          <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>
 <? } ?>
 
-  <tr name="expert">
-    <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")?><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></label>
-    </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>
-    <td class="DataTD">
-      <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><br />
-      <?=_("Please note: You need to accept the CCA to proceed.")?></label>
-    </td>
-  </tr>
-  <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>" /></td>
-  </tr>
-</table>
-<input type="hidden" name="oldid" value="<?=$id?>" />
-</form>
+      <tr>
+        <td class="DataTD" colspan="2" align="left">
+        <?= _("Hash algorithm used when signing the certificate:") ?><br/>
+        <?
+        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_info[ 'name' ] ?><?= $display_info[ 'info' ] ? ' - ' . $display_info[ 'info' ] : '' ?></label><br/>
+        <?
+          }
+        ?>
+        </td>
+      </tr>
+
+      <? if ($_SESSION[ 'profile' ][ 'points' ] >= 100 && $_SESSION[ 'profile' ][ 'codesign' ] > 0 ) { ?>
+        <tr>
+          <td class="DataTD">
+            <input type="checkbox" id="codesign" name="codesign" value="1"/>
+          </td>
+          <td class="DataTD" align="left">
+            <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>
+      <? } ?>
 
-<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>
+      <tr>
+        <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") ?><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></label>
+        </td>
+      </tr>
+
+      <tr>
+        <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>
+        <td class="DataTD">
+          <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><br/>
+          <?= _("Please note: You need to accept the CCA to proceed.") ?></label>
+        </td>
+      </tr>
+
+      <tr>
+        <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?= _("Next") ?>"/></td>
+      </tr>
+    </table>
+  <input type="hidden" name="oldid" value="<?= $id ?>"/>
+</form>