pages/account/3.php

@@ -26,6 +26,10 @@
 
 <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>
@@ -93,20 +97,11 @@ if($_SESSION['profile']['points'] >= 50)
         </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>
-
 <?
 	if($_SESSION['profile']['points'] >= 50)
 	{
       ?>
-  <tr name="expert">
+      <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/>
@@ -115,7 +110,7 @@ if($_SESSION['profile']['points'] >= 50)
       </tr>
 <? } ?>
 
-  <tr name="expert">
+      <tr>
         <td class="DataTD" colspan="2" align="left">
         <?= _("Hash algorithm used when signing the certificate:") ?><br/>
         <?
@@ -130,7 +125,7 @@ if($_SESSION['profile']['points'] >= 50)
       </tr>
 
       <? if ($_SESSION[ 'profile' ][ 'points' ] >= 100 && $_SESSION[ 'profile' ][ 'codesign' ] > 0 ) { ?>
-  <tr name="expert">
+        <tr>
           <td class="DataTD">
             <input type="checkbox" id="codesign" name="codesign" value="1"/>
           </td>
@@ -141,7 +136,7 @@ if($_SESSION['profile']['points'] >= 50)
         </tr>
       <? } ?>
 
-  <tr name="expert">
+      <tr>
         <td class="DataTD">
           <input type="checkbox" id="SSO" name="SSO" value="1"/>
         </td>
@@ -152,14 +147,13 @@ if($_SESSION['profile']['points'] >= 50)
         </td>
       </tr>
 
-  <tr name="expert">
+      <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"/>
@@ -169,28 +163,10 @@ if($_SESSION['profile']['points'] >= 50)
           <?= _("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>
-
-<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>