filter special characters when exporting documents. issue #2207.

jlawyerorg · Nov 26, 2023 · 671143b · 671143b
1 parent 8a2255c
commit 671143b
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/export/HTMLExport.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/export/HTMLExport.java
@@ -886,7 +886,7 @@ public String export(ArchiveFileBean dto, Date lastModified) throws Exception {
         }
         try {
             sContent = sContent.replaceAll("\\{\\{history\\}\\}", sb.toString());
-        } catch (Throwable t) {
+        } catch (Exception t) {
             log.error("failed to add history to export, replacement string was " + sb.toString(), t);
         }
 
@@ -918,24 +918,24 @@ public String export(ArchiveFileBean dto, Date lastModified) throws Exception {
 
                 String dbNewName = removeSonderzeichen(db.getName());
 
-                dbNewName = dbNewName.replaceAll(",", "");
-                dbNewName = dbNewName.replaceAll("\"", "");
-                dbNewName = dbNewName.replaceAll("§", "");
-                dbNewName = dbNewName.replaceAll("%", "");
-                dbNewName = dbNewName.replaceAll("&", "");
-                dbNewName = dbNewName.replaceAll("/", "");
-                dbNewName = dbNewName.replaceAll("=", "");
-                dbNewName = dbNewName.replaceAll("\\?", "");
-                dbNewName = dbNewName.replaceAll("\\{", "");
-                dbNewName = dbNewName.replaceAll("\\}", "");
-                dbNewName = dbNewName.replaceAll("\\[", "");
-                dbNewName = dbNewName.replaceAll("\\]", "");
-                dbNewName = dbNewName.replaceAll("\\\\", "");
-                dbNewName = dbNewName.replaceAll("\\*", "");
-                dbNewName = dbNewName.replaceAll("#", "");
-                dbNewName = dbNewName.replaceAll("'", "");
-                dbNewName = dbNewName.replaceAll(":", "");
-                dbNewName = dbNewName.replaceAll(";", "");
+                dbNewName = dbNewName.replace(",", "");
+                dbNewName = dbNewName.replace("\"", "");
+                dbNewName = dbNewName.replace("§", "");
+                dbNewName = dbNewName.replace("%", "");
+                dbNewName = dbNewName.replace("&", "");
+                dbNewName = dbNewName.replace("/", "");
+                dbNewName = dbNewName.replace("=", "");
+                dbNewName = dbNewName.replace("\\?", "");
+                dbNewName = dbNewName.replace("\\{", "");
+                dbNewName = dbNewName.replace("\\}", "");
+                dbNewName = dbNewName.replace("\\[", "");
+                dbNewName = dbNewName.replace("\\]", "");
+                dbNewName = dbNewName.replace("\\\\", "");
+                dbNewName = dbNewName.replace("\\*", "");
+                dbNewName = dbNewName.replace("#", "");
+                dbNewName = dbNewName.replace("'", "");
+                dbNewName = dbNewName.replace(":", "");
+                dbNewName = dbNewName.replace(";", "");
 
                 if(dbNewName.length()==0) {
                     log.warn("invalid file name: " + dbNewName);