From be2fd5375b9b58ceb071307007828cafc81d95c2 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Mon, 16 Sep 2024 16:10:12 +0200
Subject: [PATCH 1/3] Only consider files (not directories) to be nightly
 builds.

---
 src/main/webapp/downloads/nightly_openfire.jsp | 1 +
 src/main/webapp/downloads/nightly_smack.jsp    | 1 +
 src/main/webapp/downloads/nightly_spark.jsp    | 1 +
 src/main/webapp/downloads/nightly_xiff.jsp     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/main/webapp/downloads/nightly_openfire.jsp b/src/main/webapp/downloads/nightly_openfire.jsp
index 1e16c9f9..01eea870 100644
--- a/src/main/webapp/downloads/nightly_openfire.jsp
+++ b/src/main/webapp/downloads/nightly_openfire.jsp
@@ -90,6 +90,7 @@
         final SortedMap<String, List<File>> filesByDate = new TreeMap<>( Collections.reverseOrder() );
         filesByDate.putAll(
             Arrays.stream( allFiles )
+                .filter(File::isFile)
                 .sorted( new FileComparator() )
                 .collect( Collectors.groupingBy(file -> {
                     final Matcher matcher = datePattern.matcher( file.getName() );
diff --git a/src/main/webapp/downloads/nightly_smack.jsp b/src/main/webapp/downloads/nightly_smack.jsp
index e67138b0..e05aabad 100644
--- a/src/main/webapp/downloads/nightly_smack.jsp
+++ b/src/main/webapp/downloads/nightly_smack.jsp
@@ -70,6 +70,7 @@
                         final SortedMap<Date, File> filesByDate = new TreeMap<>(Collections.reverseOrder());
                         filesByDate.putAll(
                             Arrays.stream(allFiles)
+                                .filter(File::isFile)
                                 .collect(Collectors.toMap(file -> {
                                     final Matcher matcher = datePattern.matcher(file.getName());
                                     if (matcher.find()) {
diff --git a/src/main/webapp/downloads/nightly_spark.jsp b/src/main/webapp/downloads/nightly_spark.jsp
index 14041aed..56621345 100644
--- a/src/main/webapp/downloads/nightly_spark.jsp
+++ b/src/main/webapp/downloads/nightly_spark.jsp
@@ -86,6 +86,7 @@
         final SortedMap<String, List<File>> filesByDate = new TreeMap<>( Collections.reverseOrder() );
         filesByDate.putAll(
             Arrays.stream( allFiles )
+                .filter(File::isFile)
                 .sorted( new FileComparator() )
                 .collect( Collectors.groupingBy(file -> {
                     final Matcher matcher = datePattern.matcher( file.getName() );
diff --git a/src/main/webapp/downloads/nightly_xiff.jsp b/src/main/webapp/downloads/nightly_xiff.jsp
index d4d6b5fe..55bab70a 100644
--- a/src/main/webapp/downloads/nightly_xiff.jsp
+++ b/src/main/webapp/downloads/nightly_xiff.jsp
@@ -70,6 +70,7 @@
                         final SortedMap<Date, File> filesByDate = new TreeMap<>(Collections.reverseOrder());
                         filesByDate.putAll(
                             Arrays.stream(allFiles)
+                                .filter(File::isFile)
                                 .collect(Collectors.toMap(file -> {
                                     final Matcher matcher = datePattern.matcher(file.getName());
                                     if (matcher.find()) {

From 300218b2d80e8fa06a60202d6391d991a0d03439 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Mon, 16 Sep 2024 16:11:38 +0200
Subject: [PATCH 2/3] Fix more string concat issues

---
 src/main/webapp/projects/openfire/plugin-archive.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/projects/openfire/plugin-archive.jsp b/src/main/webapp/projects/openfire/plugin-archive.jsp
index 0454f205..b34f2b47 100644
--- a/src/main/webapp/projects/openfire/plugin-archive.jsp
+++ b/src/main/webapp/projects/openfire/plugin-archive.jsp
@@ -177,7 +177,7 @@
                                     </td>
                                     <td class="c4" style="white-space: nowrap; text-align: center">
                                         <c:out value="${not empty plugin.minimumRequiredOpenfireVersion ? plugin.minimumRequiredOpenfireVersion : ''}"/>
-                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '<br>- ' + plugin.priorToOpenfireVersion : '+'}"/>
+                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '- '.concat(plugin.priorToOpenfireVersion) : '+'}"/>
                                     </td>
                                 </tr>
                             </c:forEach>
@@ -264,7 +264,7 @@
                                     </td>
                                     <td class="c4" style="white-space: nowrap; text-align: center">
                                         <c:out value="${not empty plugin.minimumRequiredOpenfireVersion ? plugin.minimumRequiredOpenfireVersion : ''}"/>
-                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '<br>- ' + plugin.priorToOpenfireVersion : '+'}"/>
+                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '- '.concat(plugin.priorToOpenfireVersion) : '+'}"/>
                                     </td>
                                 </tr>
 

From 13d190729125e23b80c094d03b85bfe53db53d22 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Mon, 16 Sep 2024 16:13:46 +0200
Subject: [PATCH 3/3] Fix line-order (??) in connection_manager.jsp

---
 src/main/webapp/projects/openfire/connection_manager.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/projects/openfire/connection_manager.jsp b/src/main/webapp/projects/openfire/connection_manager.jsp
index 184a098b..3dd2b6a5 100644
--- a/src/main/webapp/projects/openfire/connection_manager.jsp
+++ b/src/main/webapp/projects/openfire/connection_manager.jsp
@@ -44,8 +44,8 @@
 </head>
 <body>
 
-        <jsp:param name="project" value="openfire"/>
     <jsp:include page="/includes/navigation.jspf">
+        <jsp:param name="project" value="openfire"/>
     </jsp:include>
 
 <section id="ignite_body">