From 681e352bdcad7cdd43aec113e8c6cb3a137e8418 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Wed, 2 Mar 2016 17:06:02 +0100 Subject: [PATCH] Fix #570 add max_acc and reg_acc placeholders --- src/main/java/fr/xephi/authme/output/MessageKey.java | 2 +- .../xephi/authme/process/register/AsyncRegister.java | 10 ++++++---- src/main/resources/messages/messages_en.yml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/xephi/authme/output/MessageKey.java b/src/main/java/fr/xephi/authme/output/MessageKey.java index 0c96b6667..1ab8aaa4a 100644 --- a/src/main/java/fr/xephi/authme/output/MessageKey.java +++ b/src/main/java/fr/xephi/authme/output/MessageKey.java @@ -41,7 +41,7 @@ public enum MessageKey { REGISTER_EMAIL_MESSAGE("reg_email_msg"), - MAX_REGISTER_EXCEEDED("max_reg", "%acc_nb"), + MAX_REGISTER_EXCEEDED("max_reg", "%max_acc", "%reg_acc"), USAGE_REGISTER("usage_reg"), 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 97344ba04..0d71c6b8d 100644 --- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java @@ -73,6 +73,7 @@ public class AsyncRegister { //check this in both possiblities so don't use 'else if' Integer size = 0; + Integer maxReg = Settings.getmaxRegPerIp; if (database.isAuthAvailable(name)) { m.send(player, MessageKey.NAME_ALREADY_REGISTERED); return false; @@ -80,8 +81,8 @@ public class AsyncRegister { && !plugin.getPermissionsManager().hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS) && !ip.equalsIgnoreCase("127.0.0.1") && !ip.equalsIgnoreCase("localhost") - && (size = database.getAllAuthsByIp(ip).size()) >= Settings.getmaxRegPerIp) { - m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, size.toString()); + && (size = database.getAllAuthsByIp(ip).size()) >= maxReg) { + m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, maxReg.toString(), size.toString()); return false; } return true; @@ -98,11 +99,12 @@ public class AsyncRegister { } private void emailRegister() { + Integer maxReg = Settings.getmaxRegPerIp; Integer size = 0; if (Settings.getmaxRegPerEmail > 0 && !plugin.getPermissionsManager().hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS) - && (size = database.countAuthsByEmail(email)) >= Settings.getmaxRegPerEmail) { - m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, size.toString()); + && (size = database.getAllAuthsByIp(ip).size()) >= maxReg) { + m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, maxReg.toString(), size.toString()); return; } final HashedPassword hashedPassword = plugin.getPasswordSecurity().computeHash(password, name); diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml index 4e155bcfe..6c0189a36 100644 --- a/src/main/resources/messages/messages_en.yml +++ b/src/main/resources/messages/messages_en.yml @@ -12,7 +12,7 @@ login: '&2Successful login!' vb_nonActiv: '&cYour account isn''t activated yet, please check your emails!' user_regged: '&cYou already have registered this username!' usage_reg: '&cUsage: /register ' -max_reg: '&cYou have exceeded the maximum number of registrations (%acc_nb) for your connection!' +max_reg: '&cYou have exceeded the maximum number of registrations (%reg_acc/%max_acc) for your connection!' no_perm: '&4You don''t have the permission to perform this action!' error: '&4An unexpected error occurred, please contact an administrator!' login_msg: '&cPlease, login with the command "/login "'