Video.Host.. instead of VideoHost

[mir.git] / source / mir / misc / HTMLTemplateProcessor.java

diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java
index 63f088e..c27be00 100755 (executable)
--- a/source/mir/misc/HTMLTemplateProcessor.java
+++ b/source/mir/misc/HTMLTemplateProcessor.java
@@ -87,13 +87,13 @@ public final class HTMLTemplateProcessor {
          //actionRoot = docRoot + "/servlet/" + MirConfig.getProp("ServletName");
     //actionRoot = docRoot + "/servlet/NadirAktuell";
 
-    actionRoot = docRoot + "/servlet/Mir";
+    actionRoot = docRoot + "/Mir";
 
-    defEncoding = MirConfig.getProp("Mir.DefaultEncoding");
+    defEncoding = MirConfig.getProp("Mir.DefaultHTMLCharset");
     openAction = MirConfig.getProp("Producer.OpenAction");
     productionHost = MirConfig.getProp("Producer.ProductionHost");
-    videoHost = MirConfig.getProp("Producer.VideoHost");
-    audioHost = MirConfig.getProp("Producer.AudioHost");
+    videoHost = MirConfig.getProp("Producer.Video.Host");
+    audioHost = MirConfig.getProp("Producer.Audio.Host");
     imageHost = MirConfig.getProp("Producer.Image.Host");
     imagePath = MirConfig.getProp("Producer.Image.Path");
     producerDocRoot = MirConfig.getProp("Producer.DocRoot");
@@ -298,6 +298,8 @@ public final class HTMLTemplateProcessor {
                MessageResources messages = MessageResources.getMessageResources("bundles.admin");
                outPutHash.put("lang", new MessageMethodModel(locale, messages) );
 
+               outPutHash.put("encodeHTML", new EncodeHTMLMethodModel() );
+
                tmpl.process(outPutHash,out);
        }