get rid of deprecated methods and new popup stuff

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

diff --git a/source/mircoders/servlet/ServletModuleMessage.java b/source/mircoders/servlet/ServletModuleMessage.java
index 2325408..f9b8a93 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleMessage.java
+++ b/source/mircoders/servlet/ServletModuleMessage.java
@@ -32,7 +32,7 @@ public class ServletModuleMessage extends ServletModule
        public static ServletModule getInstance() { return instance; }
 
        private ServletModuleMessage() {
-               theLog = Logfile.getInstance(this.getClass().getName());
+               theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Messages.Logfile"));
                templateListString = MirConfig.getProp("ServletModule.Messages.ListTemplate");
                templateObjektString = MirConfig.getProp("ServletModule.Messages.ObjektTemplate");
                templateConfirmString = MirConfig.getProp("ServletModule.Messages.ConfirmTemplate");
@@ -54,7 +54,7 @@ public class ServletModuleMessage extends ServletModule
                        if (offset==null || offset.equals("")) offset="0";
                        mergeData.put("offset",offset);
                        EntityList theList = mainModule.getByWhereClause(null, "webdb_create desc", (new Integer(offset)).intValue());
-                       mergeData.put("contentlist",HTMLTemplateProcessor.makeSimpleList(theList));
+                       mergeData.put("contentlist",theList);
                        if(theList.getOrder()!=null) {
                                mergeData.put("order", theList.getOrder());
                                mergeData.put("order_encoded", URLEncoder.encode(theList.getOrder()));
@@ -68,7 +68,7 @@ public class ServletModuleMessage extends ServletModule
                                mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
 
                        // raus damit
-                       HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateListString, mergeData, res.getWriter());
+                       HTMLTemplateProcessor.process(res, templateListString, mergeData, res.getWriter(), getLocale(req));
 
                }
                catch (ModuleException e) {throw new ServletModuleException(e.toString());}