Merge pull request #215 from Tsheke/EXPORT_MLANG

Export multilanguage support
jleyva · Oct 3, 2024 · 1ada1cb · 1ada1cb
2 parents 09ccd7f + d7b4cf9
commit 1ada1cb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/export/csv/export.php b/export/csv/export.php
@@ -40,14 +40,14 @@ function export_report($report) {
 
     if (!empty($table->head)) {
         foreach ($table->head as $key => $heading) {
-            $matrix[0][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br($heading))));
+            $matrix[0][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br(format_string($heading)))));
         }
     }
 
     if (!empty($table->data)) {
         foreach ($table->data as $rkey => $row) {
             foreach ($row as $key => $item) {
-                $matrix[$rkey + 1][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br($item))));
+                $matrix[$rkey + 1][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br(format_string($item)))));
             }
         }
     }

diff --git a/export/json/export.php b/export/json/export.php
@@ -39,7 +39,7 @@ function export_report($report) {
     foreach ($table->data as $data) {
         $jsonobject = [];
         foreach ($data as $index => $value) {
-            $jsonobject[$headers[$index]] = $value;
+            $jsonobject[$headers[$index]] = format_string($value);
         }
         $json[] = $jsonobject;
     }

diff --git a/export/ods/export.php b/export/ods/export.php
@@ -40,14 +40,14 @@ function export_report($report) {
 
     if (!empty($table->head)) {
         foreach ($table->head as $key => $heading) {
-            $matrix[0][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br($heading))));
+            $matrix[0][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br(format_string($heading)))));
         }
     }
 
     if (!empty($table->data)) {
         foreach ($table->data as $rkey => $row) {
             foreach ($row as $key => $item) {
-                $matrix[$rkey + 1][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br($item))));
+                $matrix[$rkey + 1][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br(format_string($item)))));
             }
         }
     }

diff --git a/export/xls/export.php b/export/xls/export.php
@@ -40,14 +40,14 @@ function export_report($report) {
 
     if (!empty($table->head)) {
         foreach ($table->head as $key => $heading) {
-            $matrix[0][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br($heading))));
+            $matrix[0][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br(format_string($heading)))));
         }
     }
 
     if (!empty($table->data)) {
         foreach ($table->data as $rkey => $row) {
             foreach ($row as $key => $item) {
-                $matrix[$rkey + 1][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br($item))));
+                $matrix[$rkey + 1][$key] = str_replace("\n", ' ', htmlspecialchars_decode(strip_tags(nl2br(format_string($item)))));
             }
         }
     }