Fix minor stuff in "add mail certificate" (still incomplete)

diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
index 7d8a8777c2bae818dd39df90e9b3200d06a3efa5..b1c1d5c9d7c89c048d5d0f8d583c80442bf4dd87 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
@@ -1,6 +1,7 @@
 package org.cacert.gigi.pages.account;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
@@ -21,5 +22,15 @@ public class MailCertificateAdd extends Page {
                HashMap<String, Object> vars = new HashMap<String, Object>();
                getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
        }
+       @Override
+       public void doPost(HttpServletRequest req, HttpServletResponse resp)
+                       throws IOException {
+               PrintWriter out = resp.getWriter();
+               if (req.getParameter("optionalCSR") == null
+                               || req.getParameter("optionalCSR").equals("")) {
+                       out.println("csr missing");
+               }
+               out.println("could now start processing the cert request");
+       }
 
 }

diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ
index 553ddda91c71ddd590aa54e2bd3987011127b7a1..7d55930c36cd9192bd59637a21701a7ac6f49c40 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ
+++ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ
@@ -7,7 +7,7 @@
 
 <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">
+<form method="post">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
     <td colspan="2" class="title"><?=_New Client Certificate?></td>
@@ -48,9 +48,9 @@
     </td>
   </tr>
 
-  <tr class="expertoff" style="display:none">
+  <tr class="expertoff">
     <td class="DataTD">
-      <input type="checkbox" id="expertbox" name="expertbox" onchange="showExpert(this.checked)" />
+      <input type="checkbox" id="expertbox" name="expertbox"/>
     </td>
     <td class="DataTD" align="left">
       <label for="expertbox"><?=_Show advanced options?></label>