diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 86f541bb..b44a581c 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -86,6 +86,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static fr.xephi.authme.settings.properties.EmailSettings.MAIL_ACCOUNT;
+import static fr.xephi.authme.settings.properties.EmailSettings.MAIL_PASSWORD;
import static fr.xephi.authme.settings.properties.PluginSettings.HELP_HEADER;
/**
@@ -328,12 +330,9 @@ public class AuthMe extends JavaPlugin {
*/
private void setupMailApi() {
// Make sure the mail API is enabled
- if (Settings.getmailAccount.isEmpty() || Settings.getmailPassword.isEmpty()) {
- return;
+ if (!newSettings.getProperty(MAIL_ACCOUNT).isEmpty() && !newSettings.getProperty(MAIL_PASSWORD).isEmpty()) {
+ this.mail = new SendMailSSL(this, newSettings);
}
-
- // Set up the mail API
- this.mail = new SendMailSSL(this);
}
/**
@@ -483,7 +482,7 @@ public class AuthMe extends JavaPlugin {
Graph databaseBackend = metrics.createGraph("Database backend");
// Custom graphs
- if (Settings.messageFile.exists()) {
+ if (newSettings.getMessagesFile().exists()) {
messagesLanguage.addPlotter(new Metrics.Plotter(Settings.messagesLanguage) {
@Override
diff --git a/src/main/java/fr/xephi/authme/mail/SendMailSSL.java b/src/main/java/fr/xephi/authme/mail/SendMailSSL.java
index 692497d0..8279b8df 100644
--- a/src/main/java/fr/xephi/authme/mail/SendMailSSL.java
+++ b/src/main/java/fr/xephi/authme/mail/SendMailSSL.java
@@ -1,25 +1,26 @@
package fr.xephi.authme.mail;
-import java.io.File;
-import java.io.IOException;
-import java.security.Security;
-import java.util.Properties;
-
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
-import javax.imageio.ImageIO;
-import javax.mail.Session;
-
-import org.apache.commons.mail.EmailException;
-import org.apache.commons.mail.HtmlEmail;
-import org.bukkit.Bukkit;
-
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.ImageGenerator;
import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.properties.EmailSettings;
import fr.xephi.authme.util.StringUtils;
+import org.apache.commons.mail.EmailConstants;
+import org.apache.commons.mail.EmailException;
+import org.apache.commons.mail.HtmlEmail;
+import org.bukkit.Bukkit;
+
+import javax.activation.DataSource;
+import javax.activation.FileDataSource;
+import javax.imageio.ImageIO;
+import javax.mail.Session;
+import java.io.File;
+import java.io.IOException;
+import java.security.Security;
+import java.util.Properties;
+
/**
* @author Xephi59
@@ -27,13 +28,15 @@ import fr.xephi.authme.util.StringUtils;
public class SendMailSSL {
private final AuthMe plugin;
+ private final NewSetting settings;
- public SendMailSSL(AuthMe plugin) {
+ public SendMailSSL(AuthMe plugin, NewSetting settings) {
this.plugin = plugin;
+ this.settings = settings;
}
public void main(final PlayerAuth auth, final String newPass) {
- final String mailText = replaceMailTags(Settings.getMailText, plugin, auth, newPass);
+ final String mailText = replaceMailTags(settings.getEmailMessage(), plugin, auth, newPass);
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override
@@ -41,21 +44,23 @@ public class SendMailSSL {
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
HtmlEmail email;
try {
- email = initializeMail(auth);
+ email = initializeMail(auth, settings);
} catch (EmailException e) {
- ConsoleLogger.showError("Failed to create email with the given settings: " + StringUtils.formatException(e));
+ ConsoleLogger.showError("Failed to create email with the given settings: "
+ + StringUtils.formatException(e));
return;
}
String content = mailText;
// Generate an image?
File file = null;
- if (Settings.generateImage) {
+ if (settings.getProperty(EmailSettings.PASSWORD_AS_IMAGE)) {
try {
file = generateImage(auth, plugin, newPass);
content = embedImageIntoEmailContent(file, email, content);
} catch (IOException | EmailException e) {
- ConsoleLogger.showError("Unable to send new password as image for email " + auth.getEmail() + ": " + StringUtils.formatException(e));
+ ConsoleLogger.showError("Unable to send new password as image for email " + auth.getEmail()
+ + ": " + StringUtils.formatException(e));
}
}
@@ -68,43 +73,39 @@ public class SendMailSSL {
});
}
- private static File generateImage(PlayerAuth auth, AuthMe plugin,
- String newPass) throws IOException {
+ private static File generateImage(PlayerAuth auth, AuthMe plugin, String newPass) throws IOException {
ImageGenerator gen = new ImageGenerator(newPass);
- File file = new File(plugin.getDataFolder() + File.separator + auth.getNickname() + "_new_pass.jpg");
+ File file = new File(plugin.getDataFolder(), auth.getNickname() + "_new_pass.jpg");
ImageIO.write(gen.generateImage(), "jpg", file);
return file;
}
- private static String embedImageIntoEmailContent(File image,
- HtmlEmail email, String content) throws EmailException {
+ private static String embedImageIntoEmailContent(File image, HtmlEmail email, String content)
+ throws EmailException {
DataSource source = new FileDataSource(image);
String tag = email.embed(source, image.getName());
return content.replace("", "![](\"cid:")
");
}
- private static HtmlEmail initializeMail(PlayerAuth auth)
+ private static HtmlEmail initializeMail(PlayerAuth auth, NewSetting settings)
throws EmailException {
- String senderName;
- if (StringUtils.isEmpty(Settings.getmailSenderName)) {
- senderName = Settings.getmailAccount;
- } else {
- senderName = Settings.getmailSenderName;
- }
- String senderMail = Settings.getmailAccount;
- String mailPassword = Settings.getmailPassword;
- int port = Settings.getMailPort;
+ String senderMail = settings.getProperty(EmailSettings.MAIL_ACCOUNT);
+ String senderName = StringUtils.isEmpty(settings.getProperty(EmailSettings.MAIL_SENDER_NAME))
+ ? senderMail
+ : settings.getProperty(EmailSettings.MAIL_SENDER_NAME);
+ String mailPassword = settings.getProperty(EmailSettings.MAIL_PASSWORD);
+ int port = settings.getProperty(EmailSettings.SMTP_PORT);
HtmlEmail email = new HtmlEmail();
- email.setCharset(org.apache.commons.mail.EmailConstants.UTF_8);
+ email.setCharset(EmailConstants.UTF_8);
email.setSmtpPort(port);
- email.setHostName(Settings.getmailSMTP);
+ email.setHostName(settings.getProperty(EmailSettings.SMTP_HOST));
email.addTo(auth.getEmail());
email.setFrom(senderMail, senderName);
- email.setSubject(Settings.getMailSubject);
+ email.setSubject(settings.getProperty(EmailSettings.RECOVERY_MAIL_SUBJECT));
email.setAuthentication(senderMail, mailPassword);
- setPropertiesForPort(email, port);
+ setPropertiesForPort(email, port, settings);
return email;
}
@@ -113,7 +114,8 @@ public class SendMailSSL {
email.setHtmlMsg(content);
email.setTextMsg(content);
} catch (EmailException e) {
- ConsoleLogger.showError("Your email.html config contains an error and cannot be sent: " + StringUtils.formatException(e));
+ ConsoleLogger.showError("Your email.html config contains an error and cannot be sent: "
+ + StringUtils.formatException(e));
return false;
}
try {
@@ -125,17 +127,19 @@ public class SendMailSSL {
}
}
- private static String replaceMailTags(String mailText, AuthMe plugin,
- PlayerAuth auth, String newPass) {
- return mailText.replace("", auth.getNickname()).replace("", plugin.getServer().getServerName()).replace("", newPass);
+ private static String replaceMailTags(String mailText, AuthMe plugin, PlayerAuth auth, String newPass) {
+ return mailText
+ .replace("", auth.getNickname())
+ .replace("", plugin.getServer().getServerName())
+ .replace("", newPass);
}
- @SuppressWarnings("deprecation")
- private static void setPropertiesForPort(HtmlEmail email, int port)
+ private static void setPropertiesForPort(HtmlEmail email, int port, NewSetting settings)
throws EmailException {
switch (port) {
case 587:
- if (!Settings.emailOauth2Token.isEmpty()) {
+ String oAuth2Token = settings.getProperty(EmailSettings.OAUTH2_TOKEN);
+ if (!oAuth2Token.isEmpty()) {
if (Security.getProvider("Google OAuth2 Provider") == null) {
Security.addProvider(new OAuth2Provider());
}
@@ -146,7 +150,7 @@ public class SendMailSSL {
mailProperties.setProperty("mail.smtp.sasl.mechanisms", "XOAUTH2");
mailProperties.setProperty("mail.smtp.auth.login.disable", "true");
mailProperties.setProperty("mail.smtp.auth.plain.disable", "true");
- mailProperties.setProperty(OAuth2SaslClientFactory.OAUTH_TOKEN_PROP, Settings.emailOauth2Token);
+ mailProperties.setProperty(OAuth2SaslClientFactory.OAUTH_TOKEN_PROP, oAuth2Token);
email.setMailSession(Session.getInstance(mailProperties));
} else {
email.setStartTLSEnabled(true);
@@ -159,7 +163,7 @@ public class SendMailSSL {
email.setSSLCheckServerIdentity(true);
break;
case 465:
- email.setSslSmtpPort("" + port);
+ email.setSslSmtpPort(Integer.toString(port));
email.setSSL(true);
break;
default:
diff --git a/src/main/java/fr/xephi/authme/process/Management.java b/src/main/java/fr/xephi/authme/process/Management.java
index 5e62c711..80971e9c 100644
--- a/src/main/java/fr/xephi/authme/process/Management.java
+++ b/src/main/java/fr/xephi/authme/process/Management.java
@@ -36,7 +36,8 @@ public class Management {
@Override
public void run() {
- new AsynchronousLogin(player, password, forceLogin, plugin, plugin.getDataSource()).process();
+ new AsynchronousLogin(player, password, forceLogin, plugin, plugin.getDataSource(), settings)
+ .process();
}
});
}
@@ -56,7 +57,7 @@ public class Management {
@Override
public void run() {
- new AsyncRegister(player, password, email, plugin, plugin.getDataSource()).process();
+ new AsyncRegister(player, password, email, plugin, plugin.getDataSource(), settings).process();
}
});
}
diff --git a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
index 7109840f..f2c3660e 100644
--- a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
@@ -11,8 +11,11 @@ import fr.xephi.authme.permission.PlayerPermission;
import fr.xephi.authme.security.RandomString;
import fr.xephi.authme.output.MessageKey;
import fr.xephi.authme.output.Messages;
+import fr.xephi.authme.settings.NewSetting;
import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.task.MessageTask;
+import fr.xephi.authme.util.StringUtils;
import fr.xephi.authme.util.Utils;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@@ -34,6 +37,7 @@ public class AsynchronousLogin {
private final DataSource database;
private final Messages m;
private final String ip;
+ private final NewSetting settings;
/**
* Constructor for AsynchronousLogin.
@@ -43,8 +47,10 @@ public class AsynchronousLogin {
* @param forceLogin boolean
* @param plugin AuthMe
* @param data DataSource
+ * @param settings The settings
*/
- public AsynchronousLogin(Player player, String password, boolean forceLogin, AuthMe plugin, DataSource data) {
+ public AsynchronousLogin(Player player, String password, boolean forceLogin, AuthMe plugin, DataSource data,
+ NewSetting settings) {
this.m = plugin.getMessages();
this.player = player;
this.name = player.getName().toLowerCase();
@@ -54,6 +60,7 @@ public class AsynchronousLogin {
this.plugin = plugin;
this.database = data;
this.ip = plugin.getIP(player);
+ this.settings = settings;
}
protected boolean needsCaptcha() {
@@ -98,7 +105,7 @@ public class AsynchronousLogin {
msg = m.retrieve(MessageKey.REGISTER_MESSAGE);
}
BukkitTask msgT = Bukkit.getScheduler().runTaskAsynchronously(plugin,
- new MessageTask(plugin, name, msg, Settings.getWarnMessageInterval));
+ new MessageTask(plugin, name, msg, settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)));
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(msgT);
}
return null;
@@ -165,12 +172,10 @@ public class AsynchronousLogin {
if (!forceLogin)
m.send(player, MessageKey.LOGIN_SUCCESS);
- displayOtherAccounts(auth, player);
+ displayOtherAccounts(auth);
- if (Settings.recallEmail) {
- if (email == null || email.isEmpty() || email.equalsIgnoreCase("your@email.com")) {
- m.send(player, MessageKey.EMAIL_ADDED_SUCCESS);
- }
+ if (Settings.recallEmail && (StringUtils.isEmpty(email) || "your@email.com".equalsIgnoreCase(email))) {
+ m.send(player, MessageKey.EMAIL_ADDED_SUCCESS);
}
if (!Settings.noConsoleSpam) {
@@ -186,7 +191,7 @@ public class AsynchronousLogin {
// task, we schedule it in the end
// so that we can be sure, and have not to care if it might be
// processed in other order.
- ProcessSyncPlayerLogin syncPlayerLogin = new ProcessSyncPlayerLogin(player, plugin, database);
+ ProcessSyncPlayerLogin syncPlayerLogin = new ProcessSyncPlayerLogin(player, plugin, database, settings);
if (syncPlayerLogin.getLimbo() != null) {
if (syncPlayerLogin.getLimbo().getTimeoutTaskId() != null) {
syncPlayerLogin.getLimbo().getTimeoutTaskId().cancel();
@@ -215,7 +220,7 @@ public class AsynchronousLogin {
}
}
- public void displayOtherAccounts(PlayerAuth auth, Player p) {
+ public void displayOtherAccounts(PlayerAuth auth) {
if (!Settings.displayOtherAccounts) {
return;
}
@@ -223,30 +228,16 @@ public class AsynchronousLogin {
return;
}
List auths = this.database.getAllAuthsByName(auth);
- if (auths.isEmpty()) {
+ if (auths.isEmpty() || auths.size() == 1) {
return;
}
- if (auths.size() == 1) {
- return;
- }
- StringBuilder message = new StringBuilder("[AuthMe] ");
- int i = 0;
- for (String account : auths) {
- i++;
- message.append(account);
- if (i != auths.size()) {
- message.append(", ");
- } else {
- message.append('.');
- }
- }
-
+ String message = "[AuthMe] " + StringUtils.join(", ", auths) + ".";
for (Player player : Utils.getOnlinePlayers()) {
if (plugin.getPermissionsManager().hasPermission(player, PlayerPermission.SEE_OTHER_ACCOUNTS)
|| (player.getName().equals(this.player.getName())
&& plugin.getPermissionsManager().hasPermission(player, PlayerPermission.SEE_OWN_ACCOUNTS))) {
player.sendMessage("[AuthMe] The player " + auth.getNickname() + " has " + auths.size() + " accounts");
- player.sendMessage(message.toString());
+ player.sendMessage(message);
}
}
}
diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
index 27c09174..07c5b6d4 100644
--- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
@@ -1,5 +1,7 @@
package fr.xephi.authme.process.login;
+import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.properties.HooksSettings;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@@ -24,6 +26,8 @@ import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
+import static fr.xephi.authme.settings.properties.RestrictionSettings.PROTECT_INVENTORY_BEFORE_LOGIN;
+
/**
*/
public class ProcessSyncPlayerLogin implements Runnable {
@@ -36,24 +40,26 @@ public class ProcessSyncPlayerLogin implements Runnable {
private final DataSource database;
private final PluginManager pm;
private final JsonCache playerCache;
+ private final NewSetting settings;
/**
* Constructor for ProcessSyncPlayerLogin.
*
* @param player Player
* @param plugin AuthMe
- * @param data DataSource
+ * @param database DataSource
*/
public ProcessSyncPlayerLogin(Player player, AuthMe plugin,
- DataSource data) {
+ DataSource database, NewSetting settings) {
this.plugin = plugin;
- this.database = data;
+ this.database = database;
this.pm = plugin.getServer().getPluginManager();
this.player = player;
this.name = player.getName().toLowerCase();
this.limbo = LimboCache.getInstance().getLimboPlayer(name);
this.auth = database.getAuth(name);
this.playerCache = new JsonCache();
+ this.settings = settings;
}
/**
@@ -152,7 +158,7 @@ public class ProcessSyncPlayerLogin implements Runnable {
}
}
- if (Settings.protectInventoryBeforeLogInEnabled) {
+ if (settings.getProperty(PROTECT_INVENTORY_BEFORE_LOGIN)) {
restoreInventory();
}
@@ -188,27 +194,27 @@ public class ProcessSyncPlayerLogin implements Runnable {
// Login is finish, display welcome message if we use email registration
if (Settings.useWelcomeMessage && Settings.emailRegistration)
if (Settings.broadcastWelcomeMessage) {
- for (String s : Settings.welcomeMsg) {
+ for (String s : settings.getWelcomeMessage()) {
Bukkit.getServer().broadcastMessage(plugin.replaceAllInfo(s, player));
}
} else {
- for (String s : Settings.welcomeMsg) {
+ for (String s : settings.getWelcomeMessage()) {
player.sendMessage(plugin.replaceAllInfo(s, player));
}
}
- // Login is now finish , we can force all commands
+ // Login is now finished; we can force all commands
forceCommands();
sendTo();
}
private void sendTo() {
- if (Settings.sendPlayerTo.isEmpty())
- return;
- ByteArrayDataOutput out = ByteStreams.newDataOutput();
- out.writeUTF("Connect");
- out.writeUTF(Settings.sendPlayerTo);
- player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray());
+ if (!settings.getProperty(HooksSettings.BUNGEECORD_SERVER).isEmpty()) {
+ ByteArrayDataOutput out = ByteStreams.newDataOutput();
+ out.writeUTF("Connect");
+ out.writeUTF(settings.getProperty(HooksSettings.BUNGEECORD_SERVER));
+ player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray());
+ }
}
}
diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
index d1b1f900..60d3da15 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
@@ -9,6 +9,7 @@ import fr.xephi.authme.output.MessageKey;
import fr.xephi.authme.output.Messages;
import fr.xephi.authme.permission.PlayerPermission;
import fr.xephi.authme.security.crypts.HashedPassword;
+import fr.xephi.authme.settings.NewSetting;
import fr.xephi.authme.settings.Settings;
import org.bukkit.entity.Player;
@@ -24,8 +25,10 @@ public class AsyncRegister {
private final AuthMe plugin;
private final DataSource database;
private final Messages m;
+ private final NewSetting settings;
- public AsyncRegister(Player player, String password, String email, AuthMe plugin, DataSource data) {
+ public AsyncRegister(Player player, String password, String email, AuthMe plugin, DataSource data,
+ NewSetting settings) {
this.m = plugin.getMessages();
this.player = player;
this.password = password;
@@ -34,6 +37,7 @@ public class AsyncRegister {
this.plugin = plugin;
this.database = data;
this.ip = plugin.getIP(player);
+ this.settings = settings;
}
private boolean preRegisterCheck() throws Exception {
@@ -137,7 +141,7 @@ public class AsyncRegister {
plugin.getManagement().performLogin(player, "dontneed", true);
}
plugin.otherAccounts.addPlayer(player.getUniqueId());
- ProcessSyncPasswordRegister sync = new ProcessSyncPasswordRegister(player, plugin);
+ ProcessSyncPasswordRegister sync = new ProcessSyncPasswordRegister(player, plugin, settings);
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, sync);
}
}
diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java
index 1b4b0555..6d875ee0 100644
--- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java
@@ -1,5 +1,7 @@
package fr.xephi.authme.process.register;
+import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.properties.HooksSettings;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
@@ -30,6 +32,7 @@ public class ProcessSyncPasswordRegister implements Runnable {
protected final String name;
private final AuthMe plugin;
private final Messages m;
+ private final NewSetting settings;
/**
* Constructor for ProcessSyncPasswordRegister.
@@ -37,11 +40,12 @@ public class ProcessSyncPasswordRegister implements Runnable {
* @param player Player
* @param plugin AuthMe
*/
- public ProcessSyncPasswordRegister(Player player, AuthMe plugin) {
+ public ProcessSyncPasswordRegister(Player player, AuthMe plugin, NewSetting settings) {
this.m = plugin.getMessages();
this.player = player;
this.name = player.getName().toLowerCase();
this.plugin = plugin;
+ this.settings = settings;
}
private void sendBungeeMessage() {
@@ -63,11 +67,6 @@ public class ProcessSyncPasswordRegister implements Runnable {
}
}
- /**
- * Method forceLogin.
- *
- * @param player Player
- */
private void forceLogin(Player player) {
Utils.teleportToSpawn(player);
LimboCache cache = LimboCache.getInstance();
@@ -88,11 +87,6 @@ public class ProcessSyncPasswordRegister implements Runnable {
}
}
- /**
- * Method run.
- *
- * @see java.lang.Runnable#run()
- */
@Override
public void run() {
LimboPlayer limbo = LimboCache.getInstance().getLimboPlayer(name);
@@ -141,11 +135,11 @@ public class ProcessSyncPasswordRegister implements Runnable {
// Register is finish and player is logged, display welcome message
if (Settings.useWelcomeMessage) {
if (Settings.broadcastWelcomeMessage) {
- for (String s : Settings.welcomeMsg) {
+ for (String s : settings.getWelcomeMessage()) {
plugin.getServer().broadcastMessage(plugin.replaceAllInfo(s, player));
}
} else {
- for (String s : Settings.welcomeMsg) {
+ for (String s : settings.getWelcomeMessage()) {
player.sendMessage(plugin.replaceAllInfo(s, player));
}
}
@@ -161,18 +155,18 @@ public class ProcessSyncPasswordRegister implements Runnable {
sendBungeeMessage();
}
- // Register is now finish , we can force all commands
+ // Register is now finished; we can force all commands
forceCommands();
sendTo();
}
private void sendTo() {
- if (Settings.sendPlayerTo.isEmpty())
- return;
- ByteArrayDataOutput out = ByteStreams.newDataOutput();
- out.writeUTF("Connect");
- out.writeUTF(Settings.sendPlayerTo);
- player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray());
+ if (!settings.getProperty(HooksSettings.BUNGEECORD_SERVER).isEmpty()) {
+ ByteArrayDataOutput out = ByteStreams.newDataOutput();
+ out.writeUTF("Connect");
+ out.writeUTF(settings.getProperty(HooksSettings.BUNGEECORD_SERVER));
+ player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray());
+ }
}
}
diff --git a/src/main/java/fr/xephi/authme/settings/NewSetting.java b/src/main/java/fr/xephi/authme/settings/NewSetting.java
index 20ed0952..1361f227 100644
--- a/src/main/java/fr/xephi/authme/settings/NewSetting.java
+++ b/src/main/java/fr/xephi/authme/settings/NewSetting.java
@@ -1,9 +1,11 @@
package fr.xephi.authme.settings;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.io.Files;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.settings.domain.Property;
import fr.xephi.authme.settings.properties.PluginSettings;
+import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.settings.properties.SettingsFieldRetriever;
import fr.xephi.authme.settings.propertymap.PropertyMap;
import fr.xephi.authme.util.CollectionUtils;
@@ -16,6 +18,7 @@ import org.yaml.snakeyaml.Yaml;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -31,7 +34,10 @@ public class NewSetting {
private final File pluginFolder;
private final File configFile;
private FileConfiguration configuration;
+ /** The file with the localized messages based on {@link PluginSettings#MESSAGES_LANGUAGE}. */
private File messagesFile;
+ private List welcomeMessage;
+ private String emailMessage;
/**
* Constructor. Checks the given {@link FileConfiguration} object for completeness.
@@ -45,6 +51,8 @@ public class NewSetting {
this.configFile = configFile;
this.pluginFolder = pluginFolder;
messagesFile = buildMessagesFile();
+ welcomeMessage = readWelcomeMessage();
+ emailMessage = readEmailMessage();
PropertyMap propertyMap = SettingsFieldRetriever.getAllPropertyFields();
if (SettingsMigrationService.checkAndMigrate(configuration, propertyMap, pluginFolder)) {
@@ -110,6 +118,14 @@ public class NewSetting {
return messagesFile;
}
+ public String getEmailMessage() {
+ return emailMessage;
+ }
+
+ public List getWelcomeMessage() {
+ return welcomeMessage;
+ }
+
/**
* Reload the configuration.
*/
@@ -189,6 +205,54 @@ public class NewSetting {
makePath("messages", "messages_" + language + ".yml"));
}
+ private List readWelcomeMessage() {
+ if (getProperty(RegistrationSettings.USE_WELCOME_MESSAGE)) {
+ final File welcomeFile = new File(pluginFolder, "welcome.txt");
+ final Charset charset = Charset.forName("UTF-8");
+ if (!welcomeFile.exists()) {
+ try {
+ Files.write(
+ "Welcome {PLAYER} to {SERVER} server\n\nThis server uses AuthMe protection!",
+ welcomeFile, charset);
+ } catch (IOException e) {
+ ConsoleLogger.showError("Failed to create file '" + welcomeFile.getPath() + "': "
+ + StringUtils.formatException(e));
+ ConsoleLogger.writeStackTrace(e);
+ }
+ }
+ try {
+ return Files.readLines(welcomeFile, charset);
+ } catch (IOException e) {
+ ConsoleLogger.showError("Failed to read file '" + welcomeFile.getPath() + "': " +
+ StringUtils.formatException(e));
+ ConsoleLogger.writeStackTrace(e);
+ }
+ }
+ return new ArrayList<>(0);
+ }
+
+ private String readEmailMessage() {
+ final File emailFile = new File(pluginFolder, "email.txt");
+ final Charset charset = Charset.forName("UTF-8");
+ if (!emailFile.exists()) {
+ try {
+ Files.write("", emailFile, charset);
+ } catch (IOException e) {
+ ConsoleLogger.showError("Failed to create file '" + emailFile.getPath() + "': "
+ + StringUtils.formatException(e));
+ ConsoleLogger.writeStackTrace(e);
+ }
+ }
+ try {
+ return StringUtils.join("", Files.readLines(emailFile, charset));
+ } catch (IOException e) {
+ ConsoleLogger.showError("Failed to read file '" + emailFile.getPath() + "': " +
+ StringUtils.formatException(e));
+ ConsoleLogger.writeStackTrace(e);
+ }
+ return "";
+ }
+
private static Yaml newYaml(boolean useSingleQuotes) {
DumperOptions options = new DumperOptions();
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java
index 30fd3055..2ef20442 100644
--- a/src/main/java/fr/xephi/authme/settings/Settings.java
+++ b/src/main/java/fr/xephi/authme/settings/Settings.java
@@ -1,13 +1,10 @@
package fr.xephi.authme.settings;
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.datasource.DataSource.DataSourceType;
import fr.xephi.authme.security.HashAlgorithm;
-import fr.xephi.authme.util.StringUtils;
import fr.xephi.authme.util.Wrapper;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -30,12 +27,10 @@ public final class Settings {
public static final File PLUGIN_FOLDER = Wrapper.getInstance().getDataFolder();
public static final File MODULE_FOLDER = new File(PLUGIN_FOLDER, "modules");
public static final File CACHE_FOLDER = new File(PLUGIN_FOLDER, "cache");
- private static final File EMAIL_FILE = new File(PLUGIN_FOLDER, "email.html");
private static final File SETTINGS_FILE = new File(PLUGIN_FOLDER, "config.yml");
public static final File LOG_FILE = new File(PLUGIN_FOLDER, "authme.log");
// This is not an option!
public static boolean antiBotInAction = false;
- public static File messageFile;
public static List allowCommands;
public static List getJoinPermissions;
public static List getUnrestrictedName;
@@ -48,7 +43,6 @@ public final class Settings {
public static List forceCommandsAsConsole;
public static List forceRegisterCommands;
public static List forceRegisterCommandsAsConsole;
- public static List welcomeMsg;
public static List unsafePasswords;
public static List emailBlacklist;
public static List emailWhitelist;
@@ -85,11 +79,10 @@ public final class Settings {
backupWindowsPath, getRegisteredGroup,
messagesLanguage, getMySQLlastlocX, getMySQLlastlocY,
getMySQLlastlocZ, rakamakUsers, rakamakUsersIp, getmailAccount,
- getmailPassword, getmailSMTP, getMySQLColumnId, getmailSenderName,
- getMailSubject, getMailText, getMySQLlastlocWorld, defaultWorld,
+ getMySQLColumnId, getMySQLlastlocWorld, defaultWorld,
getPhpbbPrefix, getWordPressPrefix, getMySQLColumnLogged,
spawnPriority, crazyloginFileName, getPassRegex,
- getMySQLColumnRealName, emailOauth2Token, sendPlayerTo;
+ getMySQLColumnRealName, sendPlayerTo;
public static int getWarnMessageInterval, getSessionTimeout,
getRegistrationTimeout, getMaxNickLength, getMinNickLength,
getPasswordMinLen, getMovementRadius, getmaxRegPerIp,
@@ -129,7 +122,6 @@ public final class Settings {
if (exist) {
instance.saveDefaults();
}
- messageFile = new File(PLUGIN_FOLDER, "messages" + File.separator + "messages_" + messagesLanguage + ".yml");
}
public static void loadVariables() {
@@ -217,19 +209,14 @@ public final class Settings {
noConsoleSpam = configFile.getBoolean("Security.console.noConsoleSpam", false);
removePassword = configFile.getBoolean("Security.console.removePassword", true);
getmailAccount = configFile.getString("Email.mailAccount", "");
- getmailPassword = configFile.getString("Email.mailPassword", "");
- getmailSMTP = configFile.getString("Email.mailSMTP", "smtp.gmail.com");
getMailPort = configFile.getInt("Email.mailPort", 465);
getRecoveryPassLength = configFile.getInt("Email.RecoveryPasswordLength", 8);
getMySQLOtherUsernameColumn = configFile.getStringList("ExternalBoardOptions.mySQLOtherUsernameColumns");
displayOtherAccounts = configFile.getBoolean("settings.restrictions.displayOtherAccounts", true);
getMySQLColumnId = configFile.getString("DataSource.mySQLColumnId", "id");
- getmailSenderName = configFile.getString("Email.mailSenderName", "");
useCaptcha = configFile.getBoolean("Security.captcha.useCaptcha", false);
maxLoginTry = configFile.getInt("Security.captcha.maxLoginTry", 5);
captchaLength = configFile.getInt("Security.captcha.captchaLength", 5);
- getMailSubject = configFile.getString("Email.mailSubject", "Your new AuthMe Password");
- getMailText = loadEmailText();
emailRegistration = configFile.getBoolean("settings.registration.enableEmailRegistrationSystem", false);
saltLength = configFile.getInt("settings.security.doubleMD5SaltLength", 8);
getmaxRegPerEmail = configFile.getInt("Email.maxRegPerEmail", 1);
@@ -288,25 +275,8 @@ public final class Settings {
generateImage = configFile.getBoolean("Email.generateImage", false);
preventOtherCase = configFile.getBoolean("settings.preventOtherCase", false);
kickPlayersBeforeStopping = configFile.getBoolean("Security.stop.kickPlayersBeforeStopping", true);
- emailOauth2Token = configFile.getString("Email.emailOauth2Token", "");
sendPlayerTo = configFile.getString("Hooks.sendPlayerTo", "");
- // Load the welcome message
- getWelcomeMessage();
-
- }
-
- private static String loadEmailText() {
- if (!EMAIL_FILE.exists()) {
- plugin.saveResource("email.html", false);
- }
- try {
- return Files.toString(EMAIL_FILE, Charsets.UTF_8);
- } catch (IOException e) {
- ConsoleLogger.showError("Error loading email text: " + StringUtils.formatException(e));
- ConsoleLogger.writeStackTrace(e);
- return "";
- }
}
/**
@@ -388,37 +358,6 @@ public final class Settings {
}
}
- private static void getWelcomeMessage() {
- AuthMe plugin = AuthMe.getInstance();
- welcomeMsg = new ArrayList<>();
- if (!useWelcomeMessage) {
- return;
- }
- if (!(new File(plugin.getDataFolder() + File.separator + "welcome.txt").exists())) {
- try {
- FileWriter fw = new FileWriter(plugin.getDataFolder() + File.separator + "welcome.txt", true);
- BufferedWriter w = new BufferedWriter(fw);
- w.write("Welcome {PLAYER} on {SERVER} server");
- w.newLine();
- w.write("This server uses " + AuthMe.getPluginName() + " protection!");
- w.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- try {
- FileReader fr = new FileReader(plugin.getDataFolder() + File.separator + "welcome.txt");
- BufferedReader br = new BufferedReader(fr);
- String line;
- while ((line = br.readLine()) != null) {
- welcomeMsg.add(line);
- }
- br.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
/**
* Saves current configuration (plus defaults) to disk.
*