X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FEmailPinger.java;h=dfb2b74a54017fc1fb70190ec8f56e750189067b;hb=4ef7ef003efbb904af6d4bce0ea0ee1b5091b65f;hp=9dfa29587b55454630ecc2c1ae325f2c67c23572;hpb=785fe6cd9e7c9116b801aafc443b4f090cce870c;p=gigi.git

diff --git a/src/org/cacert/gigi/ping/EmailPinger.java b/src/org/cacert/gigi/ping/EmailPinger.java
index 9dfa2958..dfb2b74a 100644
--- a/src/org/cacert/gigi/ping/EmailPinger.java
+++ b/src/org/cacert/gigi/ping/EmailPinger.java
@@ -1,25 +1,33 @@
 package org.cacert.gigi.ping;
 
 import java.io.IOException;
+import java.util.Locale;
 
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.CertificateOwner;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.MailProbe;
 import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.util.RandomToken;
 
 public class EmailPinger extends DomainPinger {
 
     @Override
-    public String ping(Domain domain, String configuration, User u) {
-        String[] parts = configuration.split(":", 2);
-        String mail = parts[0] + "@" + domain.getSuffix();
+    public void ping(Domain domain, String configuration, CertificateOwner u, int confId) {
+        String mail = configuration + "@" + domain.getSuffix();
+        String token = RandomToken.generateToken(16);
         try {
-            MailProbe.sendMailProbe(Language.getInstance(u.getPreferredLocale()), "domain", domain.getId(), parts[1], mail);
+            enterPingResult(confId, PING_STILL_PENDING, "", token);
+            Locale l = Locale.ENGLISH;
+            if (u instanceof User) {
+                l = ((User) u).getPreferredLocale();
+                // TODO what to do with orgs?
+            }
+            MailProbe.sendMailProbe(Language.getInstance(l), "domain", domain.getId(), token, mail);
         } catch (IOException e) {
             e.printStackTrace();
-            return "Mail connection interrupted";
+            updatePingResult(confId, "error", "Mail connection interrupted", token);
         }
-        return PING_STILL_PENDING;
     }
 
 }