antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Implement more lenient macro tag sniffing.

Browse source 
* Change accessibility of Macro methods to default.
* Change unhandled macro handler name to onUnhandledMacro()
  as suggested by Tobi on helma-dev
This commit is contained in:
hns 2007-04-04 21:55:33 +00:00
parent 170af5b845
commit b401e17301
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/helma/framework/core/Skin.java
View file

@ -358,7 +358,7 @@ public final class Skin {
* @param start the start of the macro within the skin source * @param start the start of the macro within the skin source
* @param macroOffset offset of the macro content from the start index * @param macroOffset offset of the macro content from the start index
*/ */
public Macro(int start, int macroOffset) { Macro(int start, int macroOffset) {
this.start = start; this.start = start;
int i = parse(macroOffset, false); int i = parse(macroOffset, false);
@ -489,6 +489,12 @@ public final class Skin {
if (!escape && state == PARSE_PARAM) { if (!escape && state == PARSE_PARAM) {
if (quotechar == source[i]) { if (quotechar == source[i]) {
if (source[i + 1] != '%' && !Character.isWhitespace(source[i + 1]) && !lenient) {
// closing quotes and next character is not space or end tag -
// switch to lenient mode
reset();
return parse(macroOffset, true);
}
// add parameter // add parameter
addParameter(lastParamName, parseParameter(b.toString())); addParameter(lastParamName, parseParameter(b.toString()));
lastParamName = null; lastParamName = null;
@ -553,11 +559,8 @@ public final class Skin {
if (i == length - 2 && !lenient && if (i == length - 2 && !lenient &&
(state != PARSE_DONE ||quotechar != '\u0000')) { (state != PARSE_DONE ||quotechar != '\u0000')) {
filterChain = null; // macro tag is not properly terminated, switch to lenient mode
name = null; reset();
standardParams = new StandardParams();
namedParams = null;
positionalParams = null;
return parse(macroOffset, true); return parse(macroOffset, true);
} }
} }
@ -577,6 +580,14 @@ public final class Skin {
return i + 2; return i + 2;
} }
private void reset() {
filterChain = null;
name = null;
standardParams = new StandardParams();
namedParams = null;
positionalParams = null;
}
private Object parseParameter(String str) { private Object parseParameter(String str) {
int length = str.length(); int length = str.length();
if (length > 3 && str.charAt(0) == '$') { if (length > 3 && str.charAt(0) == '$') {
@ -694,12 +705,12 @@ public final class Skin {
if (value != null) if (value != null)
return filter(value, cx); return filter(value, cx);
} }
// display error message unless unhandledMacro is defined or silent failmode is on // display error message unless onUnhandledMacro is defined or silent failmode is on
if (!engine.hasProperty(handler, propName)) { if (!engine.hasProperty(handler, propName)) {
if (engine.hasFunction(handler, "unhandledMacro", false)) { if (engine.hasFunction(handler, "onUnhandledMacro", false)) {
Object[] arguments = prepareArguments(1, cx); Object[] arguments = prepareArguments(1, cx);
arguments[0] = propName; arguments[0] = propName;
value = cx.reval.invokeDirectFunction(handler, "unhandledMacro", arguments); value = cx.reval.invokeDirectFunction(handler, "onUnhandledMacro", arguments);
// if macro has a filter chain and didn't return anything, use output // if macro has a filter chain and didn't return anything, use output
// as filter argument. // as filter argument.
if (filterChain != null && value == null && buffer.length() > bufLength) { if (filterChain != null && value == null && buffer.length() > bufLength) {
@ -723,7 +734,7 @@ public final class Skin {
/** /**
* Render the macro given a handler object. * Render the macro given a handler object.
*/ */
public void render(RenderContext cx) void render(RenderContext cx)
throws RedirectException, UnsupportedEncodingException { throws RedirectException, UnsupportedEncodingException {
StringBuffer buffer = cx.reval.getResponse().getBuffer(); StringBuffer buffer = cx.reval.getResponse().getBuffer();
// remember length of response buffer before calling macro // remember length of response buffer before calling macro
@ -968,7 +979,7 @@ public final class Skin {
* Return the full name of the macro in handler.name notation * Return the full name of the macro in handler.name notation
* @return the macro name * @return the macro name
*/ */
public String getName() { String getName() {
return name; return name;
} }
} }