reg exp replace now available in templates

diff --git a/source/mircoders/accesscontrol/AccessControl.java b/source/mircoders/accesscontrol/AccessControl.java
index 6db8bec..fcfb3dc 100755 (executable)
--- a/source/mircoders/accesscontrol/AccessControl.java
+++ b/source/mircoders/accesscontrol/AccessControl.java
@@ -30,11 +30,12 @@
 
 package mircoders.accesscontrol;
 
-import java.util.*;
-import mir.log.*;
-import mir.config.*;
-import mircoders.entity.*;
-import mircoders.global.*;
+import java.util.List;
+import java.util.Vector;
+
+import mir.config.MirPropertiesConfiguration;
+import mir.log.LoggerWrapper;
+import mircoders.entity.EntityUsers;
 
 public class AccessControl {
   private UserAccessControl user;

diff --git a/source/mircoders/global/Abuse.java b/source/mircoders/global/Abuse.java
index f979598..adf4034 100755 (executable)
--- a/source/mircoders/global/Abuse.java
+++ b/source/mircoders/global/Abuse.java
@@ -55,7 +55,7 @@ import mir.session.Request;
 import mir.util.DateToMapAdapter;
 import mir.util.InternetFunctions;
 import mir.util.StringRoutines;
-import mircoders.entity.EntityComment;
+import mircoders.entity.*;
 import mircoders.entity.EntityContent;
 import mircoders.localizer.MirAdminInterfaceLocalizer;
 
@@ -66,6 +66,7 @@ public class Abuse {
   private List filters;
   private int maxIdentifier;
   private LoggerWrapper logger;
+  private LoggerWrapper adminUsageLogger;
   private int logSize;
   private boolean logEnabled;
   private boolean openPostingDisabled;
@@ -84,6 +85,7 @@ public class Abuse {
 
   public Abuse() {
     logger = new LoggerWrapper("Global.Abuse");
+    adminUsageLogger = new LoggerWrapper("AdminUsage");
     filters = new Vector();
     maxIdentifier = 0;
     log = new Vector();
@@ -663,4 +665,15 @@ public class Abuse {
     }
   }
 
+  public void logAdminUsage(EntityUsers aUser, String aDescription) {
+    try {
+      String user = "unknown (" + aUser.toString() +")";
+      if (user!=null)
+        user = aUser.getValue("login");
+      adminUsageLogger.info(user + ": " + aDescription);
+    }
+    catch (Throwable t) {
+      logger.error("Error while logging admin usage ("+aUser.toString()+", "+aDescription+"): " +t.toString());
+    }
+  }
 }
\ No newline at end of file

diff --git a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
index a7aefa5..d56ce9f 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
@@ -44,7 +44,8 @@ import mir.log.LoggerWrapper;
 import mir.media.MediaHelper;
 import mir.media.MirMedia;
 import mir.util.ParameterExpander;
-import mir.util.*;
+import mir.util.RewindableIterator;
+import mir.util.StructuredContentParser;
 import mircoders.entity.EntityUploadedMedia;
 import mircoders.global.MirGlobal;
 import mircoders.localizer.MirAdminInterfaceLocalizer;
@@ -54,9 +55,10 @@ import mircoders.localizer.MirLocalizerFailure;
 import mircoders.storage.DatabaseArticleType;
 import mircoders.storage.DatabaseAudio;
 import mircoders.storage.DatabaseBreaking;
-import mircoders.storage.*;
+import mircoders.storage.DatabaseComment;
 import mircoders.storage.DatabaseCommentStatus;
 import mircoders.storage.DatabaseContent;
+import mircoders.storage.DatabaseContentToTopics;
 import mircoders.storage.DatabaseImageType;
 import mircoders.storage.DatabaseImages;
 import mircoders.storage.DatabaseLanguage;

diff --git a/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
index 062db12..00d5131 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
@@ -41,7 +41,7 @@ import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
 import mir.util.DateToMapAdapter;
 import mir.util.GeneratorExpressionFunctions;
-import mir.util.GeneratorHTMLFunctions;
+import mir.util.*;
 import mir.util.GeneratorIntegerFunctions;
 import mir.util.GeneratorListFunctions;
 import mir.util.GeneratorStringFunctions;
@@ -89,8 +89,7 @@ public class MirBasicProducerAssistantLocalizer implements MirProducerAssistantL
       utilityMap.put("evaluate", new GeneratorExpressionFunctions.evaluateExpressionFunction());
       utilityMap.put("constructString", new GeneratorStringFunctions.constructStructuredStringFunction());
       utilityMap.put("escapeJDBCString", new GeneratorStringFunctions.jdbcStringEscapeFunction());
-
-
+      utilityMap.put("regexpreplace", new GeneratorRegularExpressionFunctions.regularExpressionReplaceFunction());
 
       aValueSet.put("config", configMap);
       aValueSet.put("utility", utilityMap);

diff --git a/source/mircoders/servlet/ServletModuleUsers.java b/source/mircoders/servlet/ServletModuleUsers.java
index 35fbda7..d9320a8 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleUsers.java
+++ b/source/mircoders/servlet/ServletModuleUsers.java
@@ -30,26 +30,29 @@
 
 package mircoders.servlet;
 
-import java.util.*;
-
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import freemarker.template.SimpleHash;
-
+import mir.entity.adapter.EntityAdapterModel;
+import mir.entity.adapter.EntityIteratorAdapter;
 import mir.log.LoggerWrapper;
 import mir.servlet.ServletModule;
 import mir.servlet.ServletModuleExc;
 import mir.servlet.ServletModuleFailure;
 import mir.servlet.ServletModuleUserExc;
 import mir.storage.StorageObjectFailure;
-import mir.util.*;
-import mir.entity.adapter.*;
+import mir.util.CachingRewindableIterator;
+import mir.util.HTTPRequestParser;
+import mir.util.URLBuilder;
+import mircoders.entity.EntityUsers;
+import mircoders.global.MirGlobal;
 import mircoders.module.ModuleUsers;
 import mircoders.storage.DatabaseUsers;
-import mircoders.global.*;
-import mircoders.entity.*;
-import mircoders.servlet.*;
 
 /*
  *  ServletModuleUsers -