Author: pbenedict
Date: Wed Sep 16 08:19:00 2009
New Revision: 815660
URL: http://svn.apache.org/viewvc?rev=815660&view=rev
Log:
STR-3191: Filter attributes
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionTag.java
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsCollectionTag.java
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java?rev=815660&r1=815659&r2=815660&view=diff
==============================================================================
---
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
(original)
+++
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
Wed Sep 16 08:19:00 2009
@@ -913,7 +913,7 @@
protected void prepareIndex(StringBuffer handlers, String name)
throws JspException {
if (name != null) {
- handlers.append(name);
+ handlers.append(TagUtils.getInstance().filter(name));
}
handlers.append("[");
@@ -1156,9 +1156,9 @@
Object value) {
if (value != null) {
handlers.append(" ");
- handlers.append(name);
+ handlers.append(TagUtils.getInstance().filter(name));
handlers.append("=\"");
- handlers.append(value);
+ handlers.append(TagUtils.getInstance().filter(value.toString()));
handlers.append("\"");
}
}
@@ -1221,4 +1221,5 @@
property, beanName));
}
}
+
}
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java?rev=815660&r1=815659&r2=815660&view=diff
==============================================================================
---
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
(original)
+++
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
Wed Sep 16 08:19:00 2009
@@ -177,18 +177,20 @@
.getContextPath());
contextBase.append("/");
- tag.append(RequestUtils.createServerUriStringBuffer(scheme,
- serverName, port, contextBase.toString()).toString());
+ tag.append(TagUtils.getInstance().filter(
+ RequestUtils.createServerUriStringBuffer(scheme,
+ serverName, port, contextBase.toString()).toString()));
} else {
- tag.append(RequestUtils.createServerUriStringBuffer(scheme,
- serverName, port, uri).toString());
+ tag.append(TagUtils.getInstance().filter(
+ RequestUtils.createServerUriStringBuffer(scheme,
+ serverName, port, uri).toString()));
}
tag.append("\"");
if (this.target != null) {
tag.append(" target=\"");
- tag.append(this.target);
+ tag.append(TagUtils.getInstance().filter(this.target));
tag.append("\"");
}
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java?rev=815660&r1=815659&r2=815660&view=diff
==============================================================================
---
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
(original)
+++
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
Wed Sep 16 08:19:00 2009
@@ -608,9 +608,10 @@
(HttpServletResponse) this.pageContext.getResponse();
results.append(" action=\"");
- results.append(response.encodeURL(
+ results.append(TagUtils.getInstance().filter(
+ response.encodeURL(
TagUtils.getInstance().getActionMappingURL(calcAction,
- this.pageContext)));
+ this.pageContext))));
results.append("\"");
}
@@ -641,7 +642,7 @@
results.append("<div><input type=\"hidden\" name=\"");
results.append(Constants.TOKEN_KEY);
results.append("\" value=\"");
- results.append(token);
+ results.append(TagUtils.getInstance().filter(token));
if (this.isXhtml()) {
results.append("\" />");
@@ -663,9 +664,9 @@
String value) {
if (value != null) {
results.append(" ");
- results.append(attribute);
+ results.append(TagUtils.getInstance().filter(attribute));
results.append("=\"");
- results.append(value);
+ results.append(TagUtils.getInstance().filter(value));
results.append("\"");
}
}
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java?rev=815660&r1=815659&r2=815660&view=diff
==============================================================================
---
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
(original)
+++
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
Wed Sep 16 08:19:00 2009
@@ -200,7 +200,7 @@
throw e;
}
- prepareAttribute(results, "value",
TagUtils.getInstance().filter(value));
+ prepareAttribute(results, "value", value);
return value;
}
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionTag.java?rev=815660&r1=815659&r2=815660&view=diff
==============================================================================
---
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionTag.java
(original)
+++
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionTag.java
Wed Sep 16 08:19:00 2009
@@ -304,31 +304,31 @@
if (style != null) {
results.append(" style=\"");
- results.append(style);
+ results.append(TagUtils.getInstance().filter(style));
results.append("\"");
}
if (styleId != null) {
results.append(" id=\"");
- results.append(styleId);
+ results.append(TagUtils.getInstance().filter(styleId));
results.append("\"");
}
if (styleClass != null) {
results.append(" class=\"");
- results.append(styleClass);
+ results.append(TagUtils.getInstance().filter(styleClass));
results.append("\"");
}
if (dir != null) {
results.append(" dir=\"");
- results.append(dir);
+ results.append(TagUtils.getInstance().filter(dir));
results.append("\"");
}
if (lang != null) {
results.append(" lang=\"");
- results.append(lang);
+ results.append(TagUtils.getInstance().filter(lang));
results.append("\"");
}
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsCollectionTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsCollectionTag.java?rev=815660&r1=815659&r2=815660&view=diff
==============================================================================
---
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsCollectionTag.java
(original)
+++
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsCollectionTag.java
Wed Sep 16 08:19:00 2009
@@ -323,13 +323,13 @@
if (style != null) {
sb.append(" style=\"");
- sb.append(style);
+ sb.append(TagUtils.getInstance().filter(style));
sb.append("\"");
}
if (styleClass != null) {
sb.append(" class=\"");
- sb.append(styleClass);
+ sb.append(TagUtils.getInstance().filter(styleClass));
sb.append("\"");
}
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java?rev=815660&r1=815659&r2=815660&view=diff
==============================================================================
---
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
(original)
+++
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
Wed Sep 16 08:19:00 2009
@@ -332,13 +332,13 @@
if (style != null) {
sb.append(" style=\"");
- sb.append(style);
+ sb.append(TagUtils.getInstance().filter(style));
sb.append("\"");
}
if (styleClass != null) {
sb.append(" class=\"");
- sb.append(styleClass);
+ sb.append(TagUtils.getInstance().filter(styleClass));
sb.append("\"");
}
