Author: kishore
Date: Thu Mar 28 22:50:50 2019
New Revision: 1856508
URL: http://svn.apache.org/viewvc?rev=1856508&view=rev
Log:
Initial attempt to fix CONNECTORS-1597
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editgroup.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewmapper.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewnotification.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewtransformation.jsp
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp Thu
Mar 28 22:50:50 2019
@@ -130,7 +130,7 @@ try
String title = null;
if (description.length() > 0)
{
- title = Messages.getBodyString(pageContext.getRequest().getLocale(),
"editauthority.EditAuthority") + " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
+ title = Messages.getBodyString(pageContext.getRequest().getLocale(),
"editauthority.EditAuthority") + " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(description);
}
else
{
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
Thu Mar 28 22:50:50 2019
@@ -119,7 +119,7 @@ try
$.ManifoldCF.setTitle(
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"editconnection.ApacheManifoldCFEditConnection")%>',
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"editconnection.EditRepositoryConnection")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"editconnection.EditRepositoryConnection") + " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(connectionName) %>',
'repositories'
);
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editgroup.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editgroup.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editgroup.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editgroup.jsp Thu Mar
28 22:50:50 2019
@@ -87,7 +87,7 @@ try
String heading = null;
if (description.length() > 0)
{
- heading =
Messages.getBodyString(pageContext.getRequest().getLocale(),"editgroup.EditGroup")
+ " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
+ heading =
Messages.getBodyString(pageContext.getRequest().getLocale(),"editgroup.EditGroup")
+ " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(description);
}
else
{
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp Thu Mar
28 22:50:50 2019
@@ -306,7 +306,7 @@ try
String title = null;
if (description.length() > 0)
{
- title =
Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.EditJob")
+ " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
+ title =
Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.EditJob")
+ " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(description);
}
else
{
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp Thu
Mar 28 22:50:50 2019
@@ -112,7 +112,7 @@ try
String title = null;
if (description.length() > 0)
{
- title =
Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditMapping")
+ " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
+ title =
Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditMapping")
+ " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(description);
}
else
{
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp
Thu Mar 28 22:50:50 2019
@@ -102,7 +102,7 @@ try
String title = null;
if (description.length() > 0)
{
- title =
Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditNotificationConnection")
+ " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
+ title =
Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditNotificationConnection")
+ " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(description);
}
else
{
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp Thu
Mar 28 22:50:50 2019
@@ -102,7 +102,7 @@ try
if (description.length() > 0)
{
heading = Messages.getBodyString(pageContext.getRequest()
- .getLocale(),"editoutput.EditOutputConnection") + " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
+ .getLocale(),"editoutput.EditOutputConnection") + " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(description);
}
else
{
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
---
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp
(original)
+++
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp
Thu Mar 28 22:50:50 2019
@@ -103,7 +103,7 @@ try
String heading = null;
if (description.length() > 0)
{
- heading =
Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection")
+ " " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
+ heading =
Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection")
+ " " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(description);
}
else
{
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp Thu Mar 28
22:50:50 2019
@@ -1,3 +1,4 @@
+<%@ page import="org.apache.manifoldcf.core.util.URLEncoder" %>
<% response.setHeader("Pragma","No-cache");
response.setDateHeader("Expires",0);
response.setHeader("Cache-Control", "no-cache");
@@ -68,12 +69,13 @@ response.setContentType("text/html;chars
<div class="login-box-body">
<p class="login-box-msg">Sign in to start your session</p>
- <form class="standardform" name="loginform"
action="setupAdminProfile.jsp" method="POST">
+ <form class="standardform" name="loginform" autocomplete="off"
action="setupAdminProfile.jsp" method="POST">
+ <input autocomplete="false" name="hidden" type="text"
style="display:none;">
<%
if (request.getParameter("nextUrl") != null)
{
%>
- <input type="hidden" name="nextUrl"
value="<%=request.getParameter("nextUrl")%>">
+ <input type="hidden" name="nextUrl" value="<%=
URLEncoder.encode(request.getParameter("nextUrl"))%>">
<%
}
%>
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp Thu
Mar 28 22:50:50 2019
@@ -96,7 +96,7 @@ try
<!--
$.ManifoldCF.setTitle(
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewauthority.ApacheManifoldCFViewAuthorityConnectionStatus")%>',
-
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ViewAuthorityConnectionStatus")
+ " - " + connectionName %>',
+
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ViewAuthorityConnectionStatus")
+ " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(connectionName) %>',
'authorities'
);
function Delete(connectionName)
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
Thu Mar 28 22:50:50 2019
@@ -92,7 +92,7 @@ try
$.ManifoldCF.setTitle(
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus")%>',
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewconnection.ViewRepositoryConnectionStatus")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewconnection.ViewRepositoryConnectionStatus") + " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(connectionName) %>',
'repositories'
);
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp Thu Mar
28 22:50:50 2019
@@ -53,7 +53,7 @@ try
$.ManifoldCF.setTitle(
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewgroup.ApacheManifoldCFViewGroup")%>',
-
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.ViewAuthorityGroup")
+ " - " + groupName %>',
+
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.ViewAuthorityGroup")
+ " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(groupName) %>',
'authorities'
);
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp Thu Mar
28 22:50:50 2019
@@ -121,7 +121,7 @@ try
$.ManifoldCF.setTitle(
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewjob.ApacheManifoldCFViewJob")%>',
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewjob.ViewAJob")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewjob.ViewAJob") + " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(connectionName) %>',
'jobs'
);
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewmapper.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewmapper.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewmapper.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewmapper.jsp Thu
Mar 28 22:50:50 2019
@@ -87,7 +87,7 @@ try
<!--
$.ManifoldCF.setTitle(
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewmapper.ApacheManifoldCFViewMappingConnectionStatus")%>',
-
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.ViewMappingConnectionStatus")
+ " - " + connectionName %>',
+
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.ViewMappingConnectionStatus")
+ " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(connectionName) %>',
'authorities'
);
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewnotification.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewnotification.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewnotification.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewnotification.jsp
Thu Mar 28 22:50:50 2019
@@ -89,7 +89,7 @@ try
<!--
$.ManifoldCF.setTitle(
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewnotification.ApacheManifoldCFViewNotificationConnectionStatus")%>',
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewnotification.ViewNotificationConnectionStatus")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewnotification.ViewNotificationConnectionStatus") + " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(connectionName) %>',
'repositories'
);
function Delete(connectionName)
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp Thu
Mar 28 22:50:50 2019
@@ -89,7 +89,7 @@ try
<!--
$.ManifoldCF.setTitle(
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewoutput.ApacheManifoldCFViewOutputConnectionStatus")%>',
-
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.ViewOutputConnectionStatus")
+ " - " + connectionName %>',
+
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.ViewOutputConnectionStatus")
+ " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(connectionName) %>',
'outputs'
);
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewtransformation.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewtransformation.jsp?rev=1856508&r1=1856507&r2=1856508&view=diff
==============================================================================
---
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewtransformation.jsp
(original)
+++
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewtransformation.jsp
Thu Mar 28 22:50:50 2019
@@ -90,7 +90,7 @@ try
$.ManifoldCF.setTitle(
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewtransformation.ApacheManifoldCFViewTransformationConnectionStatus")%>',
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewtransformation.ViewTransformationConnectionStatus") + " - " +
connectionName%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewtransformation.ViewTransformationConnectionStatus") + " - " +
org.apache.manifoldcf.ui.util.Encoder.bodyJavascriptEscape(connectionName) %>',
'outputs'
);
