Improved cleanup of expired and deleted vhosts

diff --git a/vizon/src/main/java/net/rizon/acid/plugins/vizon/commands/DeleteCommand.java b/vizon/src/main/java/net/rizon/acid/plugins/vizon/commands/DeleteCommand.java
index b44d29248800a84f678afc9378d08121a98e4201..5ccd889d4ab55584b38f4bb3f698a9f4966b5810 100644 (file)
--- a/vizon/src/main/java/net/rizon/acid/plugins/vizon/commands/DeleteCommand.java
+++ b/vizon/src/main/java/net/rizon/acid/plugins/vizon/commands/DeleteCommand.java
@@ -58,11 +58,14 @@ public class DeleteCommand extends Command
                        return;
                }
 
+               user.setObtained(null);
                user.setEligible(false);
                user.setVhost(null);
                user.setBold(false);
                user.setPermanent(false);
                user.setJackpot(false);
+               user.resetMultiplier();
+               user.resetDays();
 
                if (Vizon.getVizonDatabase().updateUser(user))
                {

diff --git a/vizon/src/main/java/net/rizon/acid/plugins/vizon/db/VizonDatabase.java b/vizon/src/main/java/net/rizon/acid/plugins/vizon/db/VizonDatabase.java
index 36bf4d2338325dd56feeb72bf1bb5f0c1227bd66..5ea8327c6e96c914426d8bbe1aabc643625bd4d0 100644 (file)
--- a/vizon/src/main/java/net/rizon/acid/plugins/vizon/db/VizonDatabase.java
+++ b/vizon/src/main/java/net/rizon/acid/plugins/vizon/db/VizonDatabase.java
@@ -756,6 +756,8 @@ public class VizonDatabase
                                        + "obtained = null, "
                                        + "obtained_id = -1, "
                                        + "multiplier = 0, "
+                                       + "permanent = 0, "
+                                       + "days = 0, "
                                        + "bold = 0 "
                                        + "WHERE permament = 0 "
                                        + "AND DATE_ADD(obtained, INTERVAL days DAY) < NOW()");

diff --git a/vizon/src/main/java/net/rizon/acid/plugins/vizon/db/VizonUser.java b/vizon/src/main/java/net/rizon/acid/plugins/vizon/db/VizonUser.java
index aa8a7f7443cedf1c6cbb2fd4a297354926080533..6386a370434854e80851aa5f26088b838757abec 100644 (file)
--- a/vizon/src/main/java/net/rizon/acid/plugins/vizon/db/VizonUser.java
+++ b/vizon/src/main/java/net/rizon/acid/plugins/vizon/db/VizonUser.java
@@ -177,6 +177,11 @@ public class VizonUser
                return days;
        }
 
+       public void resetDays()
+       {
+               this.days = 0;
+       }
+
        public void addDays(int days)
        {
                this.days += days;