FR [1868756] - Enable smtp gmail support

https://sourceforge.net/tracker/index.php?func=detail&aid=1868756&group_id=176962&atid=879335
Implement gmail support in RUN_setup
This commit is contained in:
Carlos Ruiz 2009-09-12 03:35:41 +00:00
parent 9f395748b1
commit 58e9c3af40
1 changed files with 10 additions and 4 deletions

View File

@ -560,9 +560,10 @@ public class ConfigurationData
private boolean testMailServer(InetAddress mailServer, InternetAddress adminEMail, private boolean testMailServer(InetAddress mailServer, InternetAddress adminEMail,
String mailUser, String mailPassword) String mailUser, String mailPassword)
{ {
boolean isGmail = mailServer.getHostName().equalsIgnoreCase("smtp.gmail.com");
boolean smtpOK = false; boolean smtpOK = false;
boolean imapOK = false; boolean imapOK = false;
if (testPort (mailServer, 25, true)) if (testPort (mailServer, isGmail ? 587 : 25, true))
{ {
log.config("OK: SMTP Server contacted"); log.config("OK: SMTP Server contacted");
smtpOK = true; smtpOK = true;
@ -570,11 +571,11 @@ public class ConfigurationData
else else
log.info("SMTP Server NOT available"); log.info("SMTP Server NOT available");
// //
if (testPort (mailServer, 110, true)) if (testPort (mailServer, isGmail ? 995 : 110, true))
log.config("OK: POP3 Server contacted"); log.config("OK: POP3 Server contacted");
else else
log.info("POP3 Server NOT available"); log.info("POP3 Server NOT available");
if (testPort (mailServer, 143, true)) if (testPort (mailServer, isGmail ? 993 : 143, true))
{ {
log.config("OK: IMAP4 Server contacted"); log.config("OK: IMAP4 Server contacted");
imapOK = true; imapOK = true;
@ -626,6 +627,11 @@ public class ConfigurationData
props.put("mail.host", mailServer.getHostName()); props.put("mail.host", mailServer.getHostName());
props.put("mail.user", mailUser); props.put("mail.user", mailUser);
props.put("mail.smtp.auth", "true"); props.put("mail.smtp.auth", "true");
if (isGmail) {
props.put("impa.smtp.port", "993");
props.put("mail.store.protocol", "imaps");
}
log.config("Connecting to " + mailServer.getHostName()); log.config("Connecting to " + mailServer.getHostName());
// //
Session session = null; Session session = null;
@ -637,7 +643,7 @@ public class ConfigurationData
session.setDebug (CLogMgt.isLevelFinest()); session.setDebug (CLogMgt.isLevelFinest());
log.config("Session=" + session); log.config("Session=" + session);
// Connect to Store // Connect to Store
store = session.getStore("imap"); store = session.getStore(isGmail ? "imaps" : "imap");
log.config("Store=" + store); log.config("Store=" + store);
} }
catch (NoSuchProviderException nsp) catch (NoSuchProviderException nsp)