LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't include CCM internal parameters like app-id or output in the URL invoked by the site proxy 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3788 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2016-01-12 14:33:13 +00:00
parent a5fd5899dc
commit db7bd72bdf
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyExtraXMLGenerator.java
View File

@ -119,6 +119,10 @@ public class SiteProxyExtraXMLGenerator implements ExtraXMLGenerator {
Enumeration en = request.getParameterNames();
while (en.hasMoreElements()) {
String paramName = (String) en.nextElement();
if("app-id".equals(paramName)
|| "output".equals(paramName)) {
continue;
}
String[] paramValues = request.getParameterValues(paramName);
for (int i = 0; i < paramValues.length; ++i) {
if (sb.indexOf("?") < 0) {

6
ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java
View File

@ -188,8 +188,12 @@ public class SiteProxyPanel extends ContentPanel {
Enumeration en = request.getParameterNames();
while (en.hasMoreElements()) {
String paramName = (String) en.nextElement();
s_log.error(String.format("paramName = %s", paramName));
if ("app-id".equals(paramName)) {
continue;
}
String[] paramValues = request.getParameterValues(paramName);
for (int i = 0; i < paramValues.length; ++i) {
for (int i = 0; i < paramValues.length; ++i) {
if (sb.indexOf("?") < 0) {
sb.append("?");
} else {

11
ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
View File

@ -2183,9 +2183,14 @@
<xsl:with-param name="copy-attributes"
select="'autofocus disabled multiple required size'"/>
</xsl:call-template>
<xsl:if test="$name != ''">
<xsl:attribute name="name" select="$name"/>
</xsl:if>
<xsl:choose>
<xsl:when test="$name != ''">
<xsl:attribute name="name" select="$name"/>
</xsl:when>
<xsl:when test="./@name">
<xsl:attribute name="name" select="./@name"/>
</xsl:when>
</xsl:choose>
<xsl:if test="$disabled = true()">
<xsl:attribute name="disabled" select="'disabled'"/>
</xsl:if>