Author: kishore
Date: Wed Oct 10 21:15:34 2018
New Revision: 1843509
URL: http://svn.apache.org/viewvc?rev=1843509&view=rev
Log:
Fix for CONNECTORS-1545
Modified:
manifoldcf/trunk/CHANGES.txt
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
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1843509&r1=1843508&r2=1843509&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Oct 10 21:15:34 2018
@@ -3,6 +3,9 @@ $Id$
======================= 2.12-dev =====================
+CONNECTORS-1545: Fix UI - tab names are unescaped in javascript:SelectTab
method
+(Julien Massiera, Kishore Kumar)
+
CONNECTORS-1541: Fix occasional zero-length CMIS output file.
(Douglas C. R. Paes)
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=1843509&r1=1843508&r2=1843509&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp Wed
Oct 10 21:15:34 2018
@@ -312,7 +312,7 @@ try
<li>
<a href="#tab_<%=tabNum%>"
alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"
"+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.tab")%>'
- onclick='<%="javascript:SelectTab(\""+tab+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
+
onclick='<%="javascript:SelectTab(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
</li>
<%
}
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=1843509&r1=1843508&r2=1843509&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
Wed Oct 10 21:15:34 2018
@@ -308,7 +308,7 @@ try
<li>
<a href="#tab_<%=tabNum%>"
alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"
"+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.tab")%>'
- onclick='<%="javascript:SelectTab(\""+tab+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
+
onclick='<%="javascript:SelectTab(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
</li>
<%
}
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=1843509&r1=1843508&r2=1843509&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editgroup.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editgroup.jsp Wed Oct
10 21:15:34 2018
@@ -207,7 +207,7 @@ try
<li>
<a href="#tab_<%=tabNum%>"
alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"
"+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editgroup.tab")%>'
- onclick='<%="javascript:SelectTab(\""+tab+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
+
onclick='<%="javascript:SelectTab(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
</li>
<%
}
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=1843509&r1=1843508&r2=1843509&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp Wed Oct
10 21:15:34 2018
@@ -825,7 +825,7 @@ function isRegularExpression(value)
if(activeClass.length() == 0)
{
%>
-
onclick='<%="javascript:SelectSequencedTab(\""+tab+"\",\""+((sequenceNumber==null)?"":sequenceNumber.toString())+"\");return
false;"%>'
+
onclick='<%="javascript:SelectSequencedTab(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"\",\""+((sequenceNumber==null)?"":sequenceNumber.toString())+"\");return
false;"%>'
<%
}
%>
@@ -858,7 +858,7 @@ function isRegularExpression(value)
if(activeClass.length() == 0)
{
%>
-
onclick='<%="javascript:SelectSequencedTab(\""+tab+"\",\""+((sequenceNumber==null)?"":sequenceNumber.toString())+"\");return
false;"%>'
+
onclick='<%="javascript:SelectSequencedTab(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"\",\""+((sequenceNumber==null)?"":sequenceNumber.toString())+"\");return
false;"%>'
<%
}
%>
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=1843509&r1=1843508&r2=1843509&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp Wed
Oct 10 21:15:34 2018
@@ -284,7 +284,7 @@ try
<li>
<a href="#tab_<%=tabNum%>"
alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"
"+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.tab")%>'
- onclick='<%="javascript:SelectTab(\""+tab+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
+
onclick='<%="javascript:SelectTab(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
</li>
<%
}
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=1843509&r1=1843508&r2=1843509&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp
Wed Oct 10 21:15:34 2018
@@ -277,7 +277,7 @@ try
<li>
<a href="#tab_<%=tabNum%>"
alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"
"+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.tab")%>'
- onclick='<%="javascript:SelectTab(\""+tab+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
+
onclick='<%="javascript:SelectTab(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
</li>
<%
}
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=1843509&r1=1843508&r2=1843509&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp Wed
Oct 10 21:15:34 2018
@@ -282,7 +282,7 @@ try
<li>
<a href="#tab_<%=tabNum%>"
alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"
"+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.tab")%>'
- onclick='<%="javascript:SelectTab(\""+tab+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
+
onclick='<%="javascript:SelectTab(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
</li>
<%
}
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=1843509&r1=1843508&r2=1843509&view=diff
==============================================================================
---
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp
(original)
+++
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp
Wed Oct 10 21:15:34 2018
@@ -275,7 +275,7 @@ try
<li>
<a href="#tab_<%=tabNum%>"
alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"
"+Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.tab")%>'
- onclick='<%="javascript:SelectTab(\""+tab+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
+
onclick='<%="javascript:SelectTab(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+"\");return
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
</li>
<%
}
