From a63087b8fc9d6b3b08af1ad4c2dcd390271b9d63 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Wed, 1 Jul 2015 14:31:27 +0200 Subject: [PATCH 1/3] Change Mail Sending --- .../java/fr/xephi/authme/SendMailSSL.java | 46 +++++++++++-------- .../authme/listener/AuthMePlayerListener.java | 2 +- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java index c1d433ad..29e56cba 100644 --- a/src/main/java/fr/xephi/authme/SendMailSSL.java +++ b/src/main/java/fr/xephi/authme/SendMailSSL.java @@ -4,12 +4,16 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.util.Properties; +import javax.mail.BodyPart; import javax.mail.Message; -import javax.mail.PasswordAuthentication; +import javax.mail.MessagingException; +import javax.mail.Multipart; import javax.mail.Session; import javax.mail.Transport; import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; import org.bukkit.Bukkit; @@ -37,20 +41,16 @@ public class SendMailSSL { sendername = Settings.getmailSenderName; } + String port = String.valueOf(Settings.getMailPort); Properties props = new Properties(); props.put("mail.smtp.host", Settings.getmailSMTP); - props.put("mail.smtp.socketFactory.port", String.valueOf(Settings.getMailPort)); - props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory"); props.put("mail.smtp.auth", "true"); - props.put("mail.smtp.port", String.valueOf(Settings.getMailPort)); + props.put("mail.smtp.port", port); + props.put("mail.smtp.starttls.enable", true); try { - Session session = Session.getInstance(props, new javax.mail.Authenticator() { + Session session = Session.getInstance(props, null); - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(Settings.getmailAccount, Settings.getmailPassword); - } - }); final Message message = new MimeMessage(session); try { message.setFrom(new InternetAddress(Settings.getmailAccount, sendername)); @@ -60,26 +60,34 @@ public class SendMailSSL { message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(auth.getEmail())); message.setSubject(Settings.getMailSubject); message.setSentDate(new Date()); + BodyPart messageBodyPart = new MimeBodyPart(); String text = Settings.getMailText; - text = text.replace("", auth.getNickname()); - text = text.replace("", plugin.getServer().getServerName()); - text = text.replace("", newPass); - message.setContent(text, "text/html"); + messageBodyPart.setText(text); + + Multipart multipart = new MimeMultipart(); + + multipart.addBodyPart(messageBodyPart); + + messageBodyPart = new MimeBodyPart(); + + multipart.addBodyPart(messageBodyPart); + message.setContent(multipart); + final Transport transport = session.getTransport("smtp"); + transport.connect(Settings.getmailSMTP, Settings.getmailAccount, Settings.getmailPassword); Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() { @Override public void run() { try { - Transport.send(message); - } catch (Exception e) { - ConsoleLogger.showError("Some error appears while trying to send mail to " + auth.getEmail()); + transport.sendMessage(message, message.getAllRecipients()); + } catch (MessagingException e) { + System.out.println("Some error occured while trying to send a mail to " + auth.getEmail()); } } + }); - if (!Settings.noConsoleSpam) - ConsoleLogger.info("Email sent to : " + auth.getNickname()); } catch (Exception e) { - ConsoleLogger.showError("Some error appears while trying to send mail to " + auth.getEmail()); + System.out.println("Some error occured while trying to send a mail to " + auth.getEmail()); } } } diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 74840fcb..afa6c5aa 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -606,7 +606,7 @@ public class AuthMePlayerListener implements Listener { Player player = event.getPlayer(); - if ((!Settings.isForceSingleSessionEnabled) && (event.getReason().contains("You logged in from another location"))) { + if ((!Settings.isForceSingleSessionEnabled) && (event.getReason().contains(m.getString("same_nick")))) { event.setCancelled(true); return; } From 534d78f52b3efa414c80838313951c333903d8ee Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Wed, 1 Jul 2015 15:44:08 +0200 Subject: [PATCH 2/3] Remove useless repos --- pom.xml | 50 +++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index cabce65b..1ed517e0 100644 --- a/pom.xml +++ b/pom.xml @@ -97,28 +97,20 @@ - - citizens-repo - http://repo.citizensnpcs.co - + - - ess-repo - http://repo.ess3.net/content/groups/public - + - - minelink-thirdparty - http://repo.minelink.net/content/repositories/public - + - + @@ -198,7 +190,7 @@ ${bukkitVersion} - + com.comphenix.attribute AttributeStorage @@ -212,7 +204,7 @@ org.bukkit craftbukkit - + @@ -229,7 +221,7 @@ org.bukkit craftbukkit - + @@ -246,7 +238,7 @@ org.bukkit craftbukkit - + @@ -265,7 +257,7 @@ org.bukkit craftbukkit - + @@ -282,7 +274,7 @@ org.bukkit craftbukkit - + @@ -299,7 +291,7 @@ org.bukkit craftbukkit - + @@ -316,7 +308,7 @@ org.bukkit craftbukkit - + @@ -333,7 +325,7 @@ org.bukkit craftbukkit - + @@ -350,11 +342,11 @@ org.bukkit craftbukkit - + - + com.Acrobot @@ -371,7 +363,7 @@ org.bukkit craftbukkit - + From 9dccab164d1f6c100ebbd3172adc3324df078298 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Wed, 1 Jul 2015 15:47:07 +0200 Subject: [PATCH 3/3] Fix Previous Commit - change to VaultAPI --- pom.xml | 54 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 1ed517e0..b25cadc8 100644 --- a/pom.xml +++ b/pom.xml @@ -97,20 +97,28 @@ - + + citizens-repo + http://repo.citizensnpcs.co + - + + ess-repo + http://repo.ess3.net/content/groups/public + - + + minelink-thirdparty + http://repo.minelink.net/content/repositories/public + - + @@ -190,7 +198,7 @@ ${bukkitVersion} - + com.comphenix.attribute AttributeStorage @@ -204,14 +212,14 @@ org.bukkit craftbukkit - + net.milkbowl.vault - Vault - 1.5.4 + VaultAPI + 1.5 org.bukkit @@ -221,7 +229,7 @@ org.bukkit craftbukkit - + @@ -238,7 +246,7 @@ org.bukkit craftbukkit - + @@ -257,7 +265,7 @@ org.bukkit craftbukkit - + @@ -274,7 +282,7 @@ org.bukkit craftbukkit - + @@ -291,7 +299,7 @@ org.bukkit craftbukkit - + @@ -308,7 +316,7 @@ org.bukkit craftbukkit - + @@ -325,7 +333,7 @@ org.bukkit craftbukkit - + @@ -342,11 +350,11 @@ org.bukkit craftbukkit - + - + com.Acrobot @@ -363,7 +371,7 @@ org.bukkit craftbukkit - +