From 04eed35bdaddafa11a0cad664b01f476cdf20462 Mon Sep 17 00:00:00 2001
From: GeoNetwork opensource
 <59019313+geonetworkbuild@users.noreply.github.com>
Date: Mon, 16 Dec 2024 13:51:04 +0100
Subject: [PATCH] [Backport 4.2.x] Formatters / Properly detect URL ending in
 1,2,3 or 5 (#8564)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Formatters / Properly detect URL ending in 1,2,3 or 5

Fixes https://github.com/geonetwork/core-geonetwork/issues/8226

* Update utility-tpl.xsl

---------

Co-authored-by: François Prunayre <fx.prunayre@gmail.com>
---
 web/src/main/webapp/xslt/common/utility-tpl.xsl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/main/webapp/xslt/common/utility-tpl.xsl b/web/src/main/webapp/xslt/common/utility-tpl.xsl
index bd470fe94da..6b9d15bb653 100644
--- 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="." />