From db7bd72bdf0c4fcb5ed5da179bb74526987f9b81 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 12 Jan 2016 14:33:13 +0000
Subject: [PATCH] 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
---
 .../cms/contenttypes/SiteProxyExtraXMLGenerator.java  |  4 ++++
 .../com/arsdigita/cms/dispatcher/SiteProxyPanel.java  |  6 +++++-
 .../foundry/foundry/lib/template-tags/html-tags.xsl   | 11 ++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyExtraXMLGenerator.java b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyExtraXMLGenerator.java
index a464ad226..fa81069ec 100644
--- a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyExtraXMLGenerator.java
+++ b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyExtraXMLGenerator.java
@@ -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) {
diff --git a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java
index c2931c852..d70a463a6 100755
--- a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java
+++ b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java
@@ -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 {
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index 785ac1cdb..b902357e8 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -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>