[Backport 4.2.x] Formatters / Properly detect URL ending in 1,2,3 or 5 (

#8564) * Formatters / Properly detect URL ending in 1,2,3 or 5 Fixes #8226 * Update utility-tpl.xsl --------- Co-authored-by: François Prunayre <[email protected]>
geonetwork · Dec 16, 2024 · 04eed35 · 04eed35
1 parent 5e80dc5
commit 04eed35
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/web/src/main/webapp/xslt/common/utility-tpl.xsl b/web/src/main/webapp/xslt/common/utility-tpl.xsl
@@ -22,6 +22,7 @@
   -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 version="2.0">
 
   <xsl:template name="replaceString">
@@ -125,8 +126,10 @@
 
   <xsl:template name="hyperlink">
     <xsl:param name="string" select="." />
+    <xsl:variable name="regex" as="xs:string">((http|https|ftp)://[^\s()]+[^\s\[\]`!(){};:'\\".,?«»“”‘’])</xsl:variable>
+
     <xsl:analyze-string select="$string"
-                        regex="(http|https|ftp)://[^\s()&gt;&lt;]+[^\s`!()\[\]&amp;#123;&amp;#125;;:'&apos;&quot;.,&gt;&lt;?«»“”‘’]">
+                        regex="{$regex}">
       <xsl:matching-substring>
         <a href="{.}">
           <xsl:value-of select="." />