restore

Author: vladak

opengrok-web/src/main/webapp/eforbidden.jsp

@@ -16,13 +16,12 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
 --%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page session="false" import="org.opengrok.web.PageConfig" %>
 <%@ page import="jakarta.servlet.http.HttpServletResponse" %>
-<%@ page import="org.opengrok.indexer.web.Util" %>
 <%
 /* ---------------------- eforbidden.jsp start --------------------- */
 {
@@ -38,7 +37,7 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
     </header>
 <h3 class="error">Error: access forbidden</h3>
 <p>The request was forbidden. This can be either file/directory permissions problem or insufficient authorization.</p>
-<%= Util.htmlize(PageConfig.get(request).getEnv().getIncludeFiles().getForbiddenIncludeFileContent(false)) %>
+<%= PageConfig.get(request).getEnv().getIncludeFiles().getForbiddenIncludeFileContent(false) %>
 <%
 }
 /* ---------------------- eforbidden.jsp end --------------------- */

opengrok-web/src/main/webapp/error.jsp

@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
 Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
 
@@ -63,10 +63,10 @@ include file="/httpheader.jspf"
             + "not point to a valid directory! Please configure your webapp.";
     }
 %><h3 class="error">There was an error!</h3>
-    <p class="error"><%= Util.htmlize(configError) %></p><%
+    <p class="error"><%= configError %></p><%
     if (exception != null) {
 %>
-        <p class="error"><%= Util.htmlize(exception.getMessage()) %></p>
+        <p class="error"><%= exception.getMessage() %></p>
         <pre><%
         StringWriter wrt = new StringWriter();
         PrintWriter prt = new PrintWriter(wrt);

opengrok-web/src/main/webapp/foot.jspf

@@ -25,8 +25,7 @@ java.util.EnumSet,
 
 org.opengrok.indexer.Info,
 org.opengrok.web.PageConfig,
-org.opengrok.indexer.web.Prefix,
-org.opengrok.indexer.web.Util"
+org.opengrok.indexer.web.Prefix"
 %>
 <%!
 /* ---------------------- foot.jspf members start --------------------- */
@@ -50,7 +49,7 @@ org.opengrok.indexer.web.Util"
 <% if(dateForLastIndexRun != null) { %>
 <p>Last Index Update: <%= dateForLastIndexRun %></p>
 <%}%>
-    <%= Util.htmlize(cfg.getEnv().getIncludeFiles().getFooterIncludeFileContent(false)) %>
+    <%= cfg.getEnv().getIncludeFiles().getFooterIncludeFileContent(false) %>
     <%
     if (needAddDiv.contains(cfg.getPrefix())) {
         %></div><% // #content

opengrok-web/src/main/webapp/httpheader.jspf

@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
 Portions Copyright (c) 2017-2018, 2020, Chris Fraire <[email protected]>.
 Portions Copyright (c) 2020, Aleksandr Kirillov <[email protected]>.
@@ -38,7 +38,6 @@ to set the title of the document before the include directive for this fragment:
 org.opengrok.indexer.Info,
 org.opengrok.web.PageConfig,
 org.opengrok.indexer.web.Prefix,
-org.opengrok.indexer.web.Util,
 org.opengrok.web.Scripts"
 %><%
 /* ---------------------- httpheader.jsp start --------------------- */
@@ -93,8 +92,8 @@ org.opengrok.web.Scripts"
 
 if (cfg.getPrefix().equals(Prefix.HIST_L)) {
     out.write("<link rel=\"alternate\" type=\"application/rss+xml\" " +
-        "title=\"RSS feed for " + Util.htmlize(cfg.getPath()) + "\" " +
-        "href=\"" + ctxPath + Prefix.RSS_P + Util.uriEncodePath(cfg.getPath()) + "\" />");
+        "title=\"RSS feed for " + cfg.getPath() + "\" " +
+        "href=\"" + ctxPath + Prefix.RSS_P + cfg.getPath() + "\" />");
 }
 %>
 <link rel="search" href="<%=ctxPath%>/opensearch"