X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailCertificateAdd.templ;h=6ce1b15b1597fe104570f4b62d3cc3f4300cfe09;hb=ca82909d6bb910769eb756058d51d55e6d257914;hp=553ddda91c71ddd590aa54e2bd3987011127b7a1;hpb=7f22ccdc95d968a3f8a5affcab74687c22823d74;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ
index 553ddda9..6ce1b15b 100644
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ
+++ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ
@@ -7,90 +7,95 @@
 
 <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">
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+<form method="post">
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+  <thead>
   <tr>
-    <td colspan="2" class="title"><?=_New Client Certificate?></td>
+    <th colspan="2" class="title"><?=_New Client Certificate?></th>
   </tr>
+  </thead>
+  <tbody>
   <tr>
-    <td class="DataTD"><?=_Add?></td>
-    <td class="DataTD"><?=_Address?></td>
+    <td><?=_Add?></td>
+    <td><?=_Address?></td>
   </tr>
-<!-- For each mail -->
+<? foreach($emails) { ?>
   <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>
+    <td><input type="checkbox" id="addid<?=$id?>" name="addid[]" value="<?=$id?>"></td>
+    <td align="left"><label for="addid<?=$id?>"><?=$value?></label></td>
   </tr>
-<!-- For each mail -->
-<!-- if points > 50 -->
+<? } ?>
+
+<? if($points50) { ?>
   <tr>
-    <td class="DataTD" colspan="2" align="left">
+    <td colspan="2" align="left">
       <input type="radio" id="incname0" name="incname" value="0" checked="checked" />
         <label for="incname0"><?=_No Name?></label><br />
         <input type="radio" id="incname1" name="incname" value="1" />
         <label for="incname1"><?=_Include?> 'fnamelname'</label><br />
     </td>
   </tr>
+<? } ?>
 
   <tr>
-    <td class="DataTD">
+    <td>
       <input type="checkbox" id="login" name="login" value="1" checked="checked" />
     </td>
-    <td class="DataTD" align="left">
+    <td 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">
+    <td 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 class="expertoff" style="display:none">
-    <td class="DataTD">
-      <input type="checkbox" id="expertbox" name="expertbox" onchange="showExpert(this.checked)" />
+  <tr class="expertoff">
+    <td>
+      <input type="checkbox" id="expertbox" name="expertbox"/>
     </td>
-    <td class="DataTD" align="left">
+    <td align="left">
       <label for="expertbox"><?=_Show advanced options?></label>
     </td>
   </tr>
 
-<!-- if >50 points -->
+<? if($points50) { ?>
   <tr class="expert">
-    <td class="DataTD" colspan="2" align="left">
+    <td 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 />
       <?=_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.?>
     </td>
   </tr>
-<!-- if >50 points -->
+<? } ?>
 
   <tr class="expert">
-    <td class="DataTD" colspan="2" align="left">
+    <td colspan="2" align="left">
       <?=_Hash algorithm used when signing the certificate:?><br />
       <!-- Hash algs!!! -->
     </td>
   </tr>
 
-<!-- if codesign -->
+<? if($codesign) { ?>
   <tr class="expert">
-    <td class="DataTD">
+    <td>
       <input type="checkbox" id="codesign" name="codesign" value="1" />
     </td>
-    <td class="DataTD" align="left">
+    <td 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>
-<!-- if codesign -->
+<? } ?>
 
   <tr class="expert">
-    <td class="DataTD">
+    <td>
       <input type="checkbox" id="SSO" name="SSO" value="1" />
     </td>
-    <td class="DataTD" align="left">
+    <td align="left">
       <label for="SSO"><?=_Add Single Sign On ID Information?><br />
       <?=_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.?>
       <a href="http://wiki.cacert.org/wiki/SSO"><?=_SSO WIKI Entry?></a></label>
@@ -98,7 +103,7 @@
   </tr>
 
   <tr class="expert">
-    <td class="DataTD" colspan="2">
+    <td 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>
@@ -106,16 +111,17 @@
 
 
   <tr>
-    <td class="DataTD">
+    <td>
       <input type="checkbox" id="CCA" name="CCA" />
     </td>
-    <td class="DataTD" align="left">
-      <!--<label for="CCA"><strong>=s,I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a> </strong><br />-->
+    <td align="left">
+      <label for="CCA"><strong><?=s,$CCA,I accept the CAcert Community Agreement (%s).?> </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>
+    <td colspan="2"><input type="submit" name="process" value="<?=_Next?>" /></td>
   </tr>
+  </tbody>
 </table>
-</form>
\ No newline at end of file
+</form>