UPD: rename dns-txt testdomain to "<string>._cacert._auth.domain.tld"

[gigi.git] / src / org / cacert / gigi / EmailAddress.java

diff --git a/src/org/cacert/gigi/EmailAddress.java b/src/org/cacert/gigi/EmailAddress.java
index 365e95388a707f385b275e613e63238551c4a7ac..5259fbcdaf7aee47de93cb8627a139c29371e994 100644 (file)
--- a/src/org/cacert/gigi/EmailAddress.java
+++ b/src/org/cacert/gigi/EmailAddress.java
@@ -7,8 +7,9 @@ import java.sql.SQLException;
 
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.email.EmailProvider;
+import org.cacert.gigi.email.MailProbe;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.util.RandomToken;
-import org.cacert.gigi.util.ServerConstants;
 
 public class EmailAddress {
 
@@ -21,7 +22,7 @@ public class EmailAddress {
     private String hash = null;
 
     private EmailAddress(int id) throws SQLException {
-        PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, email, hash FROM `email` WHERE id=? AND deleted=0");
+        PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, email, hash FROM `emails` WHERE id=? AND deleted=0");
         ps.setInt(1, id);
 
         ResultSet rs = ps.executeQuery();
@@ -49,25 +50,13 @@ public class EmailAddress {
             throw new IllegalStateException("already inserted.");
         }
         try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `email` SET memid=?, hash=?, email=?");
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `emails` SET memid=?, hash=?, email=?");
             ps.setInt(1, owner.getId());
             ps.setString(2, hash);
             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);
+            MailProbe.sendMailProbe(l, "email", id, hash, address);
         } catch (SQLException e) {
             e.printStackTrace();
         } catch (IOException e) {
@@ -87,7 +76,7 @@ public class EmailAddress {
         if (this.hash.equals(hash)) {
 
             try {
-                PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `email` SET hash='' WHERE id=?");
+                PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `emails` SET hash='' WHERE id=?");
                 ps.setInt(1, id);
                 ps.execute();
                 hash = "";