X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FEmailPinger.java;h=dfb2b74a54017fc1fb70190ec8f56e750189067b;hp=9cc9c3518fa0cf9a19f2051ce0f98ee0c053e945;hb=33a87a70ba2320451c3b3b1faa9b487dbcbd3540;hpb=ef6c1c7fe9290cfefb355a6c0d4794ab220c4619 diff --git a/src/org/cacert/gigi/ping/EmailPinger.java b/src/org/cacert/gigi/ping/EmailPinger.java index 9cc9c351..dfb2b74a 100644 --- a/src/org/cacert/gigi/ping/EmailPinger.java +++ b/src/org/cacert/gigi/ping/EmailPinger.java @@ -1,7 +1,9 @@ package org.cacert.gigi.ping; import java.io.IOException; +import java.util.Locale; +import org.cacert.gigi.dbObjects.CertificateOwner; import org.cacert.gigi.dbObjects.Domain; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.email.MailProbe; @@ -11,12 +13,17 @@ import org.cacert.gigi.util.RandomToken; public class EmailPinger extends DomainPinger { @Override - public void ping(Domain domain, String configuration, User u, int confId) { + public void ping(Domain domain, String configuration, CertificateOwner u, int confId) { String mail = configuration + "@" + domain.getSuffix(); String token = RandomToken.generateToken(16); try { enterPingResult(confId, PING_STILL_PENDING, "", token); - MailProbe.sendMailProbe(Language.getInstance(u.getPreferredLocale()), "domain", domain.getId(), token, mail); + 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(); updatePingResult(confId, "error", "Mail connection interrupted", token);