cleanup + misc. fixes

[mir.git] / source / mircoders / servlet / ServletModuleAbuse.java

diff --git a/source/mircoders/servlet/ServletModuleAbuse.java b/source/mircoders/servlet/ServletModuleAbuse.java
index 4ceb5e7..a8afbb2 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleAbuse.java
+++ b/source/mircoders/servlet/ServletModuleAbuse.java
@@ -30,13 +30,7 @@
 
 package mircoders.servlet;
 
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import mir.log.LoggerWrapper;
-import mir.servlet.ServletModule;
+import mir.servlet.AdminServletModule;
 import mir.servlet.ServletModuleExc;
 import mir.servlet.ServletModuleFailure;
 import mir.storage.DatabaseExc;
@@ -45,8 +39,11 @@ import mir.util.URLBuilder;
 import mircoders.abuse.FilterEngine;
 import mircoders.global.MirGlobal;
 
-public class ServletModuleAbuse extends ServletModule {
-  private static ServletModuleAbuse instance = new ServletModuleAbuse();
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+public class ServletModuleAbuse extends AdminServletModule {
   private String editFilterTemplate;
   private String listFiltersTemplate;
   private String editFilterGroupTemplate;
@@ -54,18 +51,17 @@ public class ServletModuleAbuse extends ServletModule {
   private String mainTemplate;
   private String viewLogTemplate;
 
-  public static ServletModule getInstance() { return instance; }
-
-  private ServletModuleAbuse() {
-    logger = new LoggerWrapper("ServletModule.Abuse");
-    defaultAction = "showsettings";
+  public ServletModuleAbuse() {
+    editFilterTemplate = getConfiguration().getString("ServletModule.Abuse.EditFilter.Template");
+    listFiltersTemplate = getConfiguration().getString("ServletModule.Abuse.ListFilters.Template");
+    editFilterGroupTemplate = getConfiguration().getString("ServletModule.Abuse.EditFilterGroup.Template");
+    listFilterGroupsTemplate = getConfiguration().getString("ServletModule.Abuse.ListFilterGroups.Template");
+    viewLogTemplate = getConfiguration().getString("ServletModule.Abuse.ViewLog.Template");
+    mainTemplate = getConfiguration().getString("ServletModule.Abuse.Main.Template");
+  }
 
-    editFilterTemplate = configuration.getString("ServletModule.Abuse.EditFilter.Template");
-    listFiltersTemplate = configuration.getString("ServletModule.Abuse.ListFilters.Template");
-    editFilterGroupTemplate = configuration.getString("ServletModule.Abuse.EditFilterGroup.Template");
-    listFilterGroupsTemplate = configuration.getString("ServletModule.Abuse.ListFilterGroups.Template");
-    viewLogTemplate = configuration.getString("ServletModule.Abuse.ViewLog.Template");
-    mainTemplate = configuration.getString("ServletModule.Abuse.Main.Template");
+  protected void defaultAction(HttpServletRequest aRequest, HttpServletResponse aResponse) {
+    showsettings(aRequest, aResponse);
   }
 
   public void editfilter(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
@@ -164,7 +160,7 @@ public class ServletModuleAbuse extends ServletModule {
     String id=requestParser.getParameter("id");
     String groupid=requestParser.getParameter("groupid");
     MirGlobal.abuse().getFilterEngine().deleteFilter(groupid, id);
-    MirGlobal.logAdminUsage(ServletHelper.getUser(aRequest), getOperationModuleName() + ":" + "filter:"+groupid+":"+id, "filter deleted");
+    MirGlobal.logAdminUsage(ServletHelper.getUser(aRequest), getName() + ":" + "filter:"+groupid+":"+id, "filter deleted");
 
     listfilters(aRequest, aResponse);
   }
@@ -175,7 +171,7 @@ public class ServletModuleAbuse extends ServletModule {
     String groupid=requestParser.getParameter("groupid");
     MirGlobal.abuse().getFilterEngine().deleteFilterGroup(groupid);
 
-    MirGlobal.logAdminUsage(ServletHelper.getUser(aRequest), getOperationModuleName() + ":" + "filtergroup:"+groupid, "filter group deleted");
+    MirGlobal.logAdminUsage(ServletHelper.getUser(aRequest), getName() + ":" + "filtergroup:"+groupid, "filter group deleted");
 
     showfiltergroups(aRequest, aResponse);
   }