From bf4b7fb8869a6656dfaa86742fec9cdf19c4eab7 Mon Sep 17 00:00:00 2001
From: Torsten Krause <krause.torsten@ub.uni-kiel.de>
Date: Wed, 14 Feb 2024 15:47:30 +0100
Subject: [PATCH] MIR-1279 Consider file names continaing characters that need
 to be encoded in URLs

---
 .../resources/META-INF/resources/hbs/derivate-fileList.hbs  | 6 +++---
 .../META-INF/resources/js/mir/derivate-fileList.js          | 4 ++--
 mir-module/src/main/resources/xsl/metadata/mir-viewer.xsl   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mir-module/src/main/resources/META-INF/resources/hbs/derivate-fileList.hbs b/mir-module/src/main/resources/META-INF/resources/hbs/derivate-fileList.hbs
index 3f045a1606..bfe8124805 100644
--- a/mir-module/src/main/resources/META-INF/resources/hbs/derivate-fileList.hbs
+++ b/mir-module/src/main/resources/META-INF/resources/hbs/derivate-fileList.hbs
@@ -83,7 +83,7 @@
                              data-derivateid="{{../mycorederivate}}"
                              data-objectid="{{../mycoreobject}}"
                              data-file="{{name}}"
-                             data-path="{{path}}"
+                             data-path="{{urlPath}}"
                              class="option mir_mainfile dropdown-item">
                             <span class="fas fa-star"></span>
                             {{getI18n "IFS.mainFile"}}
@@ -94,7 +94,7 @@
                     {{#if ../permDelete}}
                         {{#is type "file"}}
                             <li>
-                                <a href="{{../serverBaseURL}}servlets/MCRDerivateServlet?derivateid={{../mycorederivate}}&amp;objectid={{../mycoreobject}}&amp;todo=smovfile&amp;file={{path}}"
+                                <a href="{{../serverBaseURL}}servlets/MCRDerivateServlet?derivateid={{../mycorederivate}}&amp;objectid={{../mycoreobject}}&amp;todo=smovfile&amp;file={{urlPath}}"
                                 class="option rename dropdown-item"
                                 title="{{getI18n (concat "IFS." type "Rename")}}">
                                 <span class="fas fa-file-signature"></span>
@@ -103,7 +103,7 @@
                             </li>
                         {{/is}}
                         <li>
-                          <a href="{{../serverBaseURL}}servlets/MCRDerivateServlet?derivateid={{../mycorederivate}}&amp;objectid={{../mycoreobject}}&amp;todo=sdelfile&amp;file={{path}}"
+                          <a href="{{../serverBaseURL}}servlets/MCRDerivateServlet?derivateid={{../mycorederivate}}&amp;objectid={{../mycoreobject}}&amp;todo=sdelfile&amp;file={{urlPath}}"
                              class="option confirm_deletion dropdown-item"
                              data-text="{{getI18n (concat "mir.confirm." type ".text")}}"
                              title="{{getI18n (concat "IFS." type "Delete")}}">
diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/derivate-fileList.js b/mir-module/src/main/resources/META-INF/resources/js/mir/derivate-fileList.js
index 5d18b7083a..c7e2c4298a 100644
--- a/mir-module/src/main/resources/META-INF/resources/js/mir/derivate-fileList.js
+++ b/mir-module/src/main/resources/META-INF/resources/js/mir/derivate-fileList.js
@@ -419,7 +419,7 @@
 				directory = fileParam.substr(0, lastSlashInFile+1);
 				let oldName = fileParam.substr(directory.length);
 
-				let newName = prompt(i18nKeys["IFS.fileRename.to"], oldName);
+				let newName = prompt(i18nKeys["IFS.fileRename.to"], decodeURI(oldName));
 				if (newName == null) {
 					e.preventDefault();
 				} else {
@@ -428,7 +428,7 @@
 					if (lastSlashInName > 0) {
 						newName = newName.substr(lastSlashInName);
 					}
-					$(this).attr("href", href + "&file2=" + directory + newName);
+					$(this).attr("href", href + "&file2=" + directory + encodeURI(newName));
 				}
 			});
 		}
diff --git a/mir-module/src/main/resources/xsl/metadata/mir-viewer.xsl b/mir-module/src/main/resources/xsl/metadata/mir-viewer.xsl
index 2c9c68ba39..b2259764a3 100644
--- a/mir-module/src/main/resources/xsl/metadata/mir-viewer.xsl
+++ b/mir-module/src/main/resources/xsl/metadata/mir-viewer.xsl
@@ -132,7 +132,7 @@
   <xsl:template name="loadViewer">
     <xsl:param name="derivate" />
     <xsl:param name="file" />
-    <script src="{$WebApplicationBaseURL}rsc/viewer/{$derivate}{$file}?embedded=true&amp;XSL.Style=js">
+    <script src="{$WebApplicationBaseURL}rsc/viewer/{$derivate}{mcrxsl:encodeURIPath($file)}?embedded=true&amp;XSL.Style=js">
     </script>
   </xsl:template>