Enforce Output of CSRF token.

[gigi.git] / src / org / cacert / gigi / pages / main / Signup.java

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 2a7ea912ad05d7a0564e361b8855ff858f6a4195..bd4037a1d5c8e9fa18ecfc2418ef789de2b97291 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -7,11 +7,10 @@ import java.io.UnsupportedEncodingException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Date;
+import java.sql.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Language;
@@ -28,7 +27,7 @@ import org.cacert.gigi.util.PasswordStrengthChecker;
 import org.cacert.gigi.util.RandomToken;
 import org.cacert.gigi.util.ServerConstants;
 
-public class Signup implements Form {
+public class Signup extends Form {
        User buildup = new User();
        Template t;
        boolean general = true, country = true, regional = true, radius = true;
@@ -48,7 +47,8 @@ public class Signup implements Form {
        }
        DateSelector myDoB = new DateSelector("day", "month", "year");
 
-       public void output(PrintWriter out, Language l,
+       @Override
+       public void outputContent(PrintWriter out, Language l,
                        Map<String, Object> outerVars) {
                HashMap<String, Object> vars = new HashMap<String, Object>();
                vars.put("fname", HTMLEncoder.encodeHTML(buildup.getFname()));
@@ -92,6 +92,7 @@ public class Signup implements Form {
                myDoB.update(r);
        }
 
+       @Override
        public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
                update(req);
                boolean failed = false;
@@ -218,11 +219,6 @@ public class Signup implements Form {
                }
                return true;
        }
-       private void outputError(PrintWriter out, ServletRequest req, String text) {
-               out.print("<div>");
-               out.print(Page.translate(req, text));
-               out.println("</div>");
-       }
 
        private void run(HttpServletRequest req, String password)
                        throws SQLException {
@@ -260,8 +256,8 @@ public class Signup implements Form {
                                        .translate(
                                                        req,
                                                        "Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!"));
-                       body.append("\n\n");
-                       body.append(ServerConstants.NORMAL_HOST_NAME);
+                       body.append("\n\nhttps://");
+                       body.append(ServerConstants.getWwwHostNamePort());
                        body.append("/verify?type=email&id=");
                        body.append(emailid);
                        body.append("&hash=");