Skip to content

Commit

Permalink
OF-2906: Fix setup page that checks config files
Browse files Browse the repository at this point in the history
Fixes a copy/paste error that prevented the security config file from being parsed properly.

Fixes an error where a non-existing variable is checked, thus never passing the check.

(cherry picked from commit db44f7f)
  • Loading branch information
guusdk authored and github-actions[bot] committed Nov 11, 2024
1 parent c99e7c5 commit 839ca79
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions xmppserver/src/main/webapp/setup/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
</c:if>

<c:choose>
<c:when test="${not jreVersionCompatible or not servlet22Installed or not jsp11Installed or not jiveJarsInstalled or not openfireHomeExists or not configFailedLoading}">
<c:when test="${not jreVersionCompatible or not servlet22Installed or not jsp11Installed or not jiveJarsInstalled or not openfireHomeExists or not configLocationExistsAndAccessible or not securityConfigLocationExistsAndAccessible}">
<div class="error">
<fmt:message key="setup.env.check.error"/> <fmt:message key="title"/> <fmt:message key="setup.title"/>.
</div>
Expand Down Expand Up @@ -265,7 +265,7 @@
<tr>
<td><img src="../images/check.gif" width="13" height="13"></td>
<td><fmt:message key="setup.env.check.config_found">
<fmt:param><c:out value="${configLocation}"/></fmt:param>
<fmt:param><c:out value="${securityConfigLocation}"/></fmt:param>
</fmt:message>
</td>
</tr>
Expand All @@ -274,7 +274,7 @@
<tr>
<td><img src="../images/x.gif" width="13" height="13"></td>
<td><fmt:message key="setup.env.check.config_not_loaded">
<fmt:param><c:out value="${configLocation}"/></fmt:param>
<fmt:param><c:out value="${securityConfigLocation}"/></fmt:param>
</fmt:message>
</td>
</tr>
Expand Down

0 comments on commit 839ca79

Please sign in to comment.