small fixes

diff --git a/etc/open/error.template b/etc/open/error.template
index 78b90f7..7c9e9a4 100755 (executable)
--- a/etc/open/error.template
+++ b/etc/open/error.template
@@ -20,7 +20,7 @@
   <tr>
     <td>
       <p>
-      <p align="center"><font color="red">${data.errorstring}</font>
+      <p align="center"><font color="red">${utility.encodeHTML(data.errorstring)}</font>
       <p>
     </td>
   </tr>

diff --git a/etc/open/usererror.template b/etc/open/usererror.template
index 4409c36..049c430 100755 (executable)
--- a/etc/open/usererror.template
+++ b/etc/open/usererror.template
@@ -19,7 +19,7 @@
   <tr>
     <td>
       <p>
-      <p align="center"><font size="5" color="Red"><b> ${data.errorstring}</b></font>
+      <p align="center"><font size="5" color="Red"><b> ${utility.encodeHTML(data.errorstring)}</b></font>
             <p>
       <p> 
     </td>

diff --git a/source/mir/config/MirPropertiesConfiguration.java b/source/mir/config/MirPropertiesConfiguration.java
index 125dff0..71d4132 100755 (executable)
--- a/source/mir/config/MirPropertiesConfiguration.java
+++ b/source/mir/config/MirPropertiesConfiguration.java
@@ -204,7 +204,7 @@ public class MirPropertiesConfiguration extends ExtendedProperties {
    */
   public Object getProperty(String key) {
     if (super.getProperty(key) == null) {
-      return new String();
+      return "";
     }
 
     return super.getProperty(key);

diff --git a/templates/admin/error.template b/templates/admin/error.template
index 402dbb8..a79d0e0 100755 (executable)
--- a/templates/admin/error.template
+++ b/templates/admin/error.template
@@ -10,7 +10,7 @@
 
       <p class="box-head" align="center"><font size="+2"><b>${lang("error.title")}</b></font></p>
       <p align="center">${lang("error.text", config["Mir.Tech-email.address"], config["Mir.Tech-email.name"])}</p>
-      <p align="center" class="bg-neutral"><br><font color="red">${date.format(config["Mir.DefaultDateTimeFormat"])} -- ${errorstring}</font><br><br></p>
+      <p align="center" class="bg-neutral"><br><font color="red">${date.format(config["Mir.DefaultDateTimeFormat"])} -- ${utility.encodeHTML(errorstring)}</font><br><br></p>
       <p align="center" class="bg-neutral"><br><font color="red">${utility.prettyEncodeHTML(stacktrace)}</font><br><br></p>
       <p align="center">${lang("error.text2", config["Mir.Tech-email.address"], config["Mir.Tech-email.name"])}</p>
 

diff --git a/templates/admin/usererror.template b/templates/admin/usererror.template
index 3b7bc0c..598ff7e 100755 (executable)
--- a/templates/admin/usererror.template
+++ b/templates/admin/usererror.template
@@ -9,7 +9,7 @@
     <table width="70%" align="center"><tr><td>
 
       <p class="box-head" align="center"><font size="+2"><b>${lang("usererror.title")}</b></font></p>
-      <p align="center" class="bg-neutral"><br><font color="red">${date.format(config["Mir.DefaultDateTimeFormat"])} -- ${errorstring}</font><br><br></p>
+      <p align="center" class="bg-neutral"><br><font color="red">${date.format(config["Mir.DefaultDateTimeFormat"])} -- ${utility.encodeHTML(errorstring)}</font><br><br></p>
       <p align="center">${lang("usererror.what_to_do")}</p>
 
     </td></tr></table>