fixed printing of filenames from zip archives - SC#273; merged from MOODLE_16_STABLE

diff --git a/files/index.php b/files/index.php
index 76e455472f74a9f303957449f6a37b92ebae4f3d..238dd729e31b60d23fe48c7ccfd6cfdae90375b0 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -539,7 +539,7 @@
                     echo "<tr class=\"file\"><th align=\"left\" class=\"header name\">$strname</th><th align=\"right\" class=\"header size\">$strsize</th><th align=\"right\" class=\"header date\">$strmodified</th></tr>";
                     foreach ($list as $item) {
                         echo "<tr>";
-                        print_cell("left", $item['filename'], 'name');
+                        print_cell("left", s($item['filename']), 'name');
                         if (! $item['folder']) {
                             print_cell("right", display_size($item['size']), 'size');
                         } else {

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 0ca8b10344b69d447cfe0e4b0f528ae3f67289f7..bacf39e7ccd7b3ed2ac04d02c36bb63ced67e099 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6673,7 +6673,7 @@ function unzip_show_status ($list,$removepath) {
         foreach ($list as $item) {
             echo "<tr>";
             $item['filename'] = str_replace(cleardoubleslashes($removepath).'/', "", $item['filename']);
-            print_cell("left", $item['filename']);
+            print_cell("left", s($item['filename']));
             if (! $item['folder']) {
                 print_cell("right", display_size($item['size']));
             } else {
@@ -6690,7 +6690,7 @@ function unzip_show_status ($list,$removepath) {
         print_simple_box_start("center");
         echo "<pre>";
         foreach ($list as $item) {
-            echo str_replace(cleardoubleslashes($removepath.'/'), '', $item).'<br />';
+            echo s(str_replace(cleardoubleslashes($removepath.'/'), '', $item)).'<br />';
         }
         echo "</pre>";
         print_simple_box_end();