From edd3dc5109f2dbeaf1797c7643d85ba36d0b3763 Mon Sep 17 00:00:00 2001 From: Janis Streib Date: Wed, 23 Jul 2014 05:03:05 +0200 Subject: [PATCH] UPD: Send verify mail on insert --- src/org/cacert/gigi/EmailAddress.java | 23 ++++++++++++++++++- .../gigi/pages/account/MailOverview.java | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/org/cacert/gigi/EmailAddress.java b/src/org/cacert/gigi/EmailAddress.java index 646b0955..3f4211a5 100644 --- a/src/org/cacert/gigi/EmailAddress.java +++ b/src/org/cacert/gigi/EmailAddress.java @@ -1,9 +1,13 @@ package org.cacert.gigi; +import java.io.IOException; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; + import org.cacert.gigi.database.DatabaseConnection; +import org.cacert.gigi.email.EmailProvider; +import org.cacert.gigi.util.ServerConstants; public class EmailAddress { private String address; @@ -33,7 +37,7 @@ public class EmailAddress { this.hash = hash; } - public void insert() { + public void insert(Language l) { if (id != 0) { throw new IllegalStateException("already inserted."); } @@ -45,8 +49,25 @@ public class EmailAddress { ps.setString(3, address); ps.execute(); id = DatabaseConnection.lastInsertId(ps); + StringBuffer body = new StringBuffer(); + body.append(l + .getTranslation("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\nhttps://"); + body.append(ServerConstants.getWwwHostNamePort()); + body.append("/verify?type=email&id="); + body.append(id); + body.append("&hash="); + body.append(hash); + body.append("\n\n"); + body.append(l.getTranslation("Best regards")); + body.append("\n"); + body.append(l.getTranslation("CAcert.org Support!")); + EmailProvider.getInstance().sendmail(address, "[CAcert.org] " + l.getTranslation("Mail Probe"), + body.toString(), "support@cacert.org", null, null, null, null, false); } catch (SQLException e) { e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); } } diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/MailOverview.java index 5c5c9f35..15be75c4 100644 --- a/src/org/cacert/gigi/pages/account/MailOverview.java +++ b/src/org/cacert/gigi/pages/account/MailOverview.java @@ -60,7 +60,7 @@ public class MailOverview extends Page { MailAddForm f = Form.getForm(req, MailAddForm.class); if (f.submit(out, req)) { EmailAddress addr = new EmailAddress(f.getMail(), us, RandomToken.generateToken(16)); - addr.insert(); + addr.insert(Page.getLanguage(req)); } } else if (req.getParameter("makedefault") != null || req.getParameter("delete") != null) { System.out.println("MakeDefault/Delete"); -- 2.39.2