Updated to match upstream changes

The selection of Root Certicate type has been removed and only the Type 3
will be generated.

CommModule/client.pl

@@ -40,9 +40,6 @@ my $paranoid=1;
 
 my $debug=0;
 
-# number of attempts before giving up
-my $warn_threshold = 3;
-
 #my $serialport="/dev/ttyS0";
 my $serialport="/dev/ttyUSB0";
 
@@ -737,9 +734,7 @@ sub HandleCerts($$)
 
   SysLog "HandleCerts $table\n";
 
-  my $sth = $dbh->prepare(sprintf(
+  my $sth = $dbh->prepare("select * from $table where crt_name='' and csr_name!='' and warning<3");
-    "select * from %s where crt_name='' and csr_name!='' and warning<%d", $table, $warn_threshold
-  ));
   $sth->execute();
   #$rowdata;
   while ( my $rowdata = $sth->fetchrow_hashref() )
@@ -909,7 +904,7 @@ sub HandleCerts($$)
     else
     {
       SysLog("Could not find the issued certificate. $crtname ".$row{"id"}."\n");
-      $dbh->do(sprintf("update %s set warning=warning+1 where id=%d", $table, $row{'id'}));
+      $dbh->do("update `$table` set warning=warning+1 where `id`='".$row{'id'}."'");
     }
   }
 }
@@ -1083,9 +1078,7 @@ sub sendRevokeMail()
 
 sub HandleGPG()
 {
-  my $sth = $dbh->prepare(sprintf(
+  my $sth = $dbh->prepare("select * from gpg where crt='' and csr!='' ");
-    "select * from gpg where crt='' and csr!='' and warning<%d", $warn_threshold
-  ));
   $sth->execute();
   my $rowdata;
   while ( $rowdata = $sth->fetchrow_hashref() )
@@ -1151,7 +1144,7 @@ sub HandleGPG()
       sendmail($user{email}, "[CAcert.org] Your GPG/PGP Key", $body, "support\@cacert.org", "", "", "CAcert Support");
     } else {
       SysLog("Could not find the issued gpg key. ".$row{"id"}."\n");
-      $dbh->do(sprintf("update gpg set warning=warning+1 where id=%d", $row{'id'}));
+      #$dbh->do("delete from `gpg` where `id`='".$row{'id'}."'");
     }
   }
 }

pages/account/3.php

@@ -1,6 +1,6 @@
 <? /*
     LibreSSL - CAcert web application
-    Copyright (C) 2004-2008  CAcert Inc.
+    Copyright (C) 2004-2024  CAcert Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -103,9 +103,9 @@
       ?>
       <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="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/>
+          <input type="hidden" 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 ) ) ?>
+          <?= str_replace("\n", "<br />\n", wordwrap(_("Please note: both the class 1 and class 3 root certificates need to be imported into your email program so that your email program can build a full trust path chain."), 125 ) ) ?>
         </td>
       </tr>
 <? } ?>