Merge remote-tracking branch 'origin/develop' into develop

src/commands/CommandGuildRoleNotAllowed.java

@@ -0,0 +1,39 @@
+package commands;
+
+import core.Command;
+import core.LocStrings;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.Response;
+import dataStructures.UserInput;
+
+public class CommandGuildRoleNotAllowed extends Command
+{
+	public CommandGuildRoleNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String HelpText() { return LocStrings.Stub("GuildRoleNotAllowedInfo"); }
+	
+	@Override
+	public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		String [] roles = input.args.split(",");
+		String role;
+		for(int i = 0; i < roles.length; i++)
+		{
+			role = roles[i].trim();
+			if(guild.allowedRole.contains(role))
+			{
+				guild.allowedRole.remove(role);
+				res.Call(LocStrings.Stub("GuildRoleNotAllowedSuccess"));
+			}
+			else
+			{
+				res.Call(String.format(LocStrings.Stub("GuildRoleNotAllowedFailure"), role));
+			}
+		}
+	}
+}

src/core/ObjectBuilderFactory.java

@@ -342,6 +342,7 @@ public class ObjectBuilderFactory
 		manager.Register(LocCommands.Stub("rating"), new CommandRating(KittyRole.Admin, KittyRating.Safe));
 		manager.Register(LocCommands.Stub("indicator"), new CommandChangeIndicator(KittyRole.Admin, KittyRating.Safe));
 		manager.Register(LocCommands.Stub("guildroleallowed"), new CommandGuildRoleAllowed(KittyRole.Admin, KittyRating.Safe));
+		manager.Register(LocCommands.Stub("guildrolenotallowed"), new CommandGuildRoleNotAllowed(KittyRole.Admin, KittyRating.Safe));
 		
 		manager.Register(LocCommands.Stub("poll"), new CommandPollManage(KittyRole.Mod, KittyRating.Safe));
 		manager.Register(LocCommands.Stub("givebeans"), new CommandGiveBeans(KittyRole.Mod, KittyRating.Safe));

src/core/lua/Plugin.java

@@ -36,11 +36,9 @@ public class Plugin
 			contents = contentBuilder.toString();
 			
 			globals = JsePlatform.standardGlobals();
-
+			
 			globals.load(contents).call();
 			func_plugin = globals.get("plugin");
-			
-			String output = null;
 		}
 		catch (IOException e)
 		{

src/utils/GlobalLog.java

@@ -3,6 +3,9 @@ package utils;
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class GlobalLog 
 {
@@ -14,7 +17,9 @@ public class GlobalLog
 	
 	public static void initialize() throws FileNotFoundException, UnsupportedEncodingException
 	{
-		outputLog =  new PrintWriter("OutputLog.txt", "UTF-8");
+		DateFormat dF = new SimpleDateFormat("yyyy_MM_dd_HH-mm");
+		Date today = new Date(); 
+		outputLog =  new PrintWriter((dF.format(today) + ".log"), "UTF-8");
 	}
 	
 	private static void Write(String status, LogFilter filter, String body)