Made since and before working at the same time

src/de/diddiz/LogBlock/CommandsHandler.java

@@ -215,7 +215,7 @@ public class CommandsHandler implements CommandExecutor
 				} else if (command.equals("rollback") || command.equals("undo") || command.equals("rb")) {
 					if (logblock.hasPermission(sender, "logblock.rollback")) {
 						final QueryParams params = new QueryParams(logblock);
-						params.minutes = logblock.getConfig().defaultTime;
+						params.since = logblock.getConfig().defaultTime;
 						params.bct = BlockChangeType.ALL;
 						params.parseArgs(sender, argsToList(args, 1));
 						new CommandRollback(sender, params, true);
@@ -224,7 +224,7 @@ public class CommandsHandler implements CommandExecutor
 				} else if (command.equals("redo")) {
 					if (logblock.hasPermission(sender, "logblock.rollback")) {
 						final QueryParams params = new QueryParams(logblock);
-						params.minutes = logblock.getConfig().defaultTime;
+						params.since = logblock.getConfig().defaultTime;
 						params.bct = BlockChangeType.ALL;
 						params.parseArgs(sender, argsToList(args, 1));
 						new CommandRedo(sender, params, true);
@@ -326,7 +326,7 @@ public class CommandsHandler implements CommandExecutor
 	private boolean checkRestrictions(CommandSender sender, QueryParams params) {
 		if (logblock.hasPermission(sender, "logblock.ignoreRestrictions"))
 			return true;
-		if (config.rollbackMaxTime > 0 && (params.minutes <= 0 || params.minutes > config.rollbackMaxTime)) {
+		if (config.rollbackMaxTime > 0 && (params.before <= 0 || params.since > config.rollbackMaxTime)) {
 			sender.sendMessage(ChatColor.RED + "You are not allowed to rollback more than " + config.rollbackMaxTime + " minutes");
 			return false;
 		}

src/de/diddiz/LogBlock/LBToolListener.java

@@ -78,7 +78,7 @@ class LBToolListener extends PlayerListener
 		if (split.length > 1 && split[0].equalsIgnoreCase("/ban") && logblock.hasPermission(event.getPlayer(), logblock.getConfig().banPermission)) {
 			final QueryParams p = new QueryParams(logblock);
 			p.setPlayer(split[1].equalsIgnoreCase("g") ? split[2] : split[1]);
-			p.minutes = 0;
+			p.since = 0;
 			p.silent = false;
 			logblock.getServer().getScheduler().scheduleAsyncDelayedTask(logblock, new Runnable() {
 				@Override

src/de/diddiz/LogBlock/LogBlock.java

@@ -157,7 +157,7 @@ public class LogBlock extends JavaPlugin
 			log.info("[LogBlock] Permissions plugin not found. Using Bukkit Permissions.");
 		if (config.keepLogDays >= 0) {
 			final QueryParams params = new QueryParams(this);
-			params.minutes = config.keepLogDays * -1440;
+			params.before = config.keepLogDays * 1440;
 			params.bct = BlockChangeType.ALL;
 			for (final World world : getServer().getWorlds())
 				if (config.worlds.containsKey(world.getName().hashCode())) {

src/de/diddiz/LogBlock/QueryParams.java

@@ -27,7 +27,7 @@ public class QueryParams implements Cloneable
 {
 	private static final Set<Integer> keywords = new HashSet<Integer>(Arrays.asList("player".hashCode(), "area".hashCode(), "selection".hashCode(), "sel".hashCode(), "block".hashCode(), "type".hashCode(), "sum".hashCode(), "destroyed".hashCode(), "created".hashCode(), "chestaccess".hashCode(), "all".hashCode(), "time".hashCode(), "since".hashCode(), "before".hashCode(), "limit".hashCode(), "world".hashCode(), "asc".hashCode(), "desc".hashCode(), "last".hashCode(), "coords".hashCode(), "silent".hashCode(), "chat".hashCode(), "search".hashCode(), "match".hashCode()));
 	public BlockChangeType bct = BlockChangeType.BOTH;
-	public int limit = -1, minutes = 0, radius = -1;
+	public int limit = -1, before = 0, since = 0, radius = -1;
 	public Location loc = null;
 	public Order order = Order.DESC;
 	public List<String> players = new ArrayList<String>();
@@ -136,10 +136,12 @@ public class QueryParams implements Cloneable
 			title.append((excludePlayersMode ? "without" : "from") + " player" + (players.size() != 1 ? "s" : "") + " " + listing(players.toArray(new String[players.size()]), ", ", " and ") + " ");
 		if (match != null && match.length() > 0)
 			title.append("matching '" + match + "' ");
-		if (minutes > 0)
+		if (before > 0 && since > 0)
-			title.append("in the last " + minutes + " minutes ");
+			title.append("between " + since + " and " + before + " minutes ago ");
-		if (minutes < 0)
+		else if (since > 0)
-			title.append("more than " + minutes * -1 + " minutes ago ");
+			title.append("in the last " + since + " minutes ");
+		else if (before > 0)
+			title.append("more than " + before * -1 + " minutes ago ");
 		if (loc != null) {
 			if (radius > 0)
 				title.append("within " + radius + " blocks of " + (prepareToolQuery ? "clicked block" : "you") + " ");
@@ -247,10 +249,10 @@ public class QueryParams implements Cloneable
 			} else
 				for (final String playerName : players)
 					where.append("playername != '" + playerName + "' AND ");
-		if (minutes > 0)
+		if (since > 0)
-			where.append("date > date_sub(now(), INTERVAL " + minutes + " MINUTE) AND ");
+			where.append("date > date_sub(now(), INTERVAL " + since + " MINUTE) AND ");
-		if (minutes < 0)
+		if (before > 0)
-			where.append("date < date_sub(now(), INTERVAL " + minutes * -1 + " MINUTE) AND ");
+			where.append("date < date_sub(now(), INTERVAL " + before + " MINUTE) AND ");
 		if (where.length() > 6)
 			where.delete(where.length() - 4, where.length());
 		else
@@ -324,18 +326,18 @@ public class QueryParams implements Cloneable
 					throw new IllegalArgumentException("You have to define a cuboid selection");
 				setSelection(selection);
 			} else if (param.equals("time") || param.equals("since")) {
-				if (values == null)
+				if (values.length == 0)
-					minutes = logblock.getConfig().defaultTime;
+					since = logblock.getConfig().defaultTime;
 				else
-					minutes = parseTimeSpec(values);
+					since = parseTimeSpec(values);
-				if (minutes == -1)
+				if (since == -1)
 					throw new IllegalArgumentException("Failed to parse time spec for '" + param + "'");
 			} else if (param.equals("before")) {
-				if (values == null)
+				if (values.length == 0)
-					minutes = -logblock.getConfig().defaultTime;
+					before = logblock.getConfig().defaultTime;
 				else
-					minutes = -parseTimeSpec(values);
+					before = parseTimeSpec(values);
-				if (minutes == 1)
+				if (before == -1)
 					throw new IllegalArgumentException("Faile to parse time spec for '" + param + "'");
 			} else if (param.equals("sum")) {
 				if (values == null || values.length != 1)
@@ -457,8 +459,9 @@ public class QueryParams implements Cloneable
 		loc = p.loc;
 		radius = p.radius;
 		sel = p.sel;
-		if (p.minutes != 0 || minutes != logblock.getConfig().defaultTime)
+		if (p.since != 0 || since != logblock.getConfig().defaultTime)
-			minutes = p.minutes;
+			since = p.since;
+		before = p.before;
 		sum = p.sum;
 		bct = p.bct;
 		limit = p.limit;