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

support different encodings for macros handled by param, request and response

Browse source
This commit is contained in:
hns 2001-07-25 15:55:52 +00:00
parent bfd3c0ae6a
commit 5e00718453
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,8 @@ import FESI.Exceptions.*;
import helma.objectmodel.INode; import helma.objectmodel.INode;
import helma.objectmodel.IServer; import helma.objectmodel.IServer;
import helma.objectmodel.ConcurrencyException; import helma.objectmodel.ConcurrencyException;
import helma.util.HtmlEncoder;
import helma.util.UrlEncoder;
/** /**
* This represents a HOP skin, i.e. a template created from JavaScript. It uses the request path array * This represents a HOP skin, i.e. a template created from JavaScript. It uses the request path array
@ -259,34 +260,51 @@ public class Skin {
} }
private void renderFromResponse (RequestEvaluator reval) { private void renderFromResponse (RequestEvaluator reval) {
String encoding = (String) parameters.get ("encoding");
if ("title".equals (name) && reval.res.title != null) if ("title".equals (name) && reval.res.title != null)
reval.res.write (reval.res.title); reval.res.write (encode (reval.res.title, encoding));
else if ("head".equals (name) && reval.res.head != null) else if ("head".equals (name) && reval.res.head != null)
reval.res.write (reval.res.head); reval.res.write (encode (reval.res.head, encoding));
else if ("body".equals (name) && reval.res.body != null) else if ("body".equals (name) && reval.res.body != null)
reval.res.write (reval.res.body); reval.res.write (encode (reval.res.body, encoding));
else if ("message".equals (name) && reval.res.message != null) else if ("message".equals (name) && reval.res.message != null)
reval.res.write (reval.res.message); reval.res.write (encode (reval.res.message, encoding));
} }
private void renderFromRequest (RequestEvaluator reval) { private void renderFromRequest (RequestEvaluator reval) {
String encoding = (String) parameters.get ("encoding");
Object value = reval.req.get (name); Object value = reval.req.get (name);
if (value != null) if (value != null)
reval.res.write (value); reval.res.write (encode (value.toString (), encoding));
} }
private void renderFromParam (RequestEvaluator reval, ESObject paramObject) { private void renderFromParam (RequestEvaluator reval, ESObject paramObject) {
String encoding = (String) parameters.get ("encoding");
if (paramObject == null) if (paramObject == null)
reval.res.write ("[HopMacro error: Skin requires a parameter object]"); reval.res.write ("[HopMacro error: Skin requires a parameter object]");
else { else {
try { try {
ESValue value = paramObject.getProperty (name, name.hashCode()); ESValue value = paramObject.getProperty (name, name.hashCode());
if (value != null && value != ESUndefined.theUndefined && value != ESNull.theNull) if (value != null && value != ESUndefined.theUndefined && value != ESNull.theNull)
reval.res.write (value); reval.res.write (encode (value.toString (), encoding));
} catch (EcmaScriptException ignore) {} } catch (EcmaScriptException ignore) {}
} }
} }
public String encode (String text, String encoding) {
if (encoding == null || text == null)
return text;
if ("html".equalsIgnoreCase (encoding))
return HtmlEncoder.encodeSoft (text);
if ("xml".equalsIgnoreCase (encoding))
return HtmlEncoder.encodeXml (text);
if ("form".equalsIgnoreCase (encoding))
return HtmlEncoder.encodeFormValue (text);
if ("url".equalsIgnoreCase (encoding))
return UrlEncoder.encode (text);
return text;
}
public String toString () { public String toString () {
return "[HopMacro: "+handler+","+name+"]"; return "[HopMacro: "+handler+","+name+"]";
} }