Merge pull request #86 from Maxetto/master

Email recall at login, typo fix and ChangePassword Enhancements

src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java

@@ -54,14 +54,20 @@ public class ChangePasswordCommand implements CommandExecutor {
         }
 
         String lowpass = args[1].toLowerCase();
-        if ((lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null")) || !lowpass.matches(Settings.getPassRegex)) {
+        if ((lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null")) || !lowpass.matches(Settings.getPassRegex) || lowpass.equalsIgnoreCase(name)) {
             m.send(player, "password_error");
             return true;
         }
-        if (lowpass.equalsIgnoreCase(name)) {
-            m.send(player, "password_error");
+        if (lowpass.length() < Settings.getPasswordMinLen || lowpass.length() > Settings.passwordMaxLength) {
+            m.send(player, "pass_len");
             return true;
         }
+        if (!Settings.unsafePasswords.isEmpty()) {
+            if (Settings.unsafePasswords.contains(lowpass)) {
+                m.send(player, "password_error");
+                return true;
+            }
+        }
         try {
             String hashnew = PasswordSecurity.getHash(Settings.getPasswordHash, args[1], name);
 

src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java

@@ -100,7 +100,7 @@ public class AsyncronousJoin {
                 long timeout = Settings.getSessionTimeout * 60000;
                 long lastLogin = auth.getLastLogin();
                 long cur = new Date().getTime();
-                if ((cur - lastLogin < timeout || timeout == 0) && !auth.getIp().equals("198.18.0.1")) {
+                if ((cur - lastLogin < timeout || timeout == 0) && !auth.getIp().matches("198.168.(0|1).1")) {
                     if (auth.getNickname().equalsIgnoreCase(name) && auth.getIp().equals(ip)) {
                         if (PlayerCache.getInstance().getAuth(name) != null) {
                             PlayerCache.getInstance().updatePlayer(auth);

src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java

@@ -150,6 +150,12 @@ public class AsyncronousLogin {
             m.send(player, "login");
 
             displayOtherAccounts(auth, player);
+            
+            if (Settings.recallEmail) {
+                if (email == null || email.isEmpty() || email.equalsIgnoreCase("your@email.com"))
+                    m.send(player, "add_email");
+            }
+
 
             if (!Settings.noConsoleSpam)
                 ConsoleLogger.info(player.getName() + " logged in!");