Fix-201: Added filtering of report filename in case using {mlang}.

michael-milette · Nov 14, 2023 · aa80d62 · aa80d62
1 parent 35006b2
commit aa80d62
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/editcomp.php b/editcomp.php
@@ -132,9 +132,9 @@
 $managereporturl = new \moodle_url('/blocks/configurable_reports/managereport.php', ['courseid' => $courseid]);
 $PAGE->navbar->add(get_string('managereports', 'block_configurable_reports'), $managereporturl);
 
-$PAGE->navbar->add($report->name);
-
 $title = format_string($report->name);
+$PAGE->navbar->add($title);
+
 $PAGE->set_title($title);
 $PAGE->set_heading($title);
 $PAGE->set_cacheable(true);
@@ -221,4 +221,4 @@
     echo '</div>';
 }
 
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();
diff --git a/export/csv/export.php b/export/csv/export.php
@@ -28,7 +28,7 @@ function export_report($report) {
 
     $table = $report->table;
     $matrix = array();
-    $filename = 'report';
+    $filename = format_string($report->name) ?? 'report';
 
     if (!empty($table->head)) {
         $countcols = count($table->head);

diff --git a/export/json/export.php b/export/json/export.php
@@ -24,7 +24,8 @@
  */
 function export_report($report){
     $table = $report->table;
-    $filename = 'report_' . (time()) . '.json';
+    $report_name = format_string($report->name) ?? 'report';
+    $filename = $report_name.'_'.(time()).'.json';
     $json = [];
     $headers = $table->head;
     foreach ($table->data as $data) {
@@ -40,4 +41,4 @@ function export_report($report){
     header('Content-type: application/json');
     echo json_encode($json);
     exit;
-}
+}
diff --git a/export/ods/export.php b/export/ods/export.php
@@ -28,7 +28,8 @@ function export_report($report) {
 
     $table = $report->table;
     $matrix = array();
-    $filename = 'report_'.(time()).'.ods';
+    $report_name = format_string($report->name) ?? 'report';
+    $filename = $report_name.'_'.(time()).'.ods';
 
     if (!empty($table->head)) {
         $countcols = count($table->head);

diff --git a/export/xls/export.php b/export/xls/export.php
@@ -28,7 +28,8 @@ function export_report($report) {
 
     $table = $report->table;
     $matrix = array();
-    $filename = 'report_'.(time()).'.xls';
+    $report_name = format_string($report->name) ?? 'report';
+    $filename = $report_name.'_'.(time()).'.xlsx';
 
     if (!empty($table->head)) {
         $countcols = count($table->head);