narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed #403

Browse source
This commit is contained in:
iNPUTmice 2014-09-01 13:51:49 +02:00
parent 9ad5c6925d
commit d42ea45b1c
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/eu/siacs/conversations/utils/XmlHelper.java Normal file
View file

@ -0,0 +1,12 @@
package eu.siacs.conversations.utils;
public class XmlHelper {
public static String encodeEntities(String content) {
content = content.replace("&", "&");
content = content.replace("<", "&lt;");
content = content.replace(">", "&gt;");
content = content.replace("\"", "&quot;");
content = content.replace("'", "&apos;");
return content;
}
}

13
src/eu/siacs/conversations/xml/Element.java
View file

@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List; import java.util.List;
import eu.siacs.conversations.utils.XmlHelper;
public class Element { public class Element {
protected String name; protected String name;
protected Hashtable<String, String> attributes = new Hashtable<String, String>(); protected Hashtable<String, String> attributes = new Hashtable<String, String>();
@ -116,7 +118,7 @@ public class Element {
startTag.setAtttributes(this.attributes); startTag.setAtttributes(this.attributes);
elementOutput.append(startTag); elementOutput.append(startTag);
if (content != null) { if (content != null) {
elementOutput.append(encodeEntities(content)); elementOutput.append(XmlHelper.encodeEntities(content));
} else { } else {
for (Element child : children) { for (Element child : children) {
elementOutput.append(child.toString()); elementOutput.append(child.toString());
@ -132,15 +134,6 @@ public class Element {
return name; return name;
} }
private String encodeEntities(String content) {
content = content.replace("&", "&amp;");
content = content.replace("<", "&lt;");
content = content.replace(">", "&gt;");
content = content.replace("\"", "&quot;");
content = content.replace("'", "&apos;");
return content;
}
public void clearChildren() { public void clearChildren() {
this.children.clear(); this.children.clear();
} }

4
src/eu/siacs/conversations/xml/Tag.java
View file

@ -5,6 +5,8 @@ import java.util.Iterator;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import eu.siacs.conversations.utils.XmlHelper;
public class Tag { public class Tag {
public static final int NO = -1; public static final int NO = -1;
public static final int START = 0; public static final int START = 0;
@ -84,7 +86,7 @@ public class Tag {
tagOutput.append(' '); tagOutput.append(' ');
tagOutput.append(entry.getKey()); tagOutput.append(entry.getKey());
tagOutput.append("=\""); tagOutput.append("=\"");
tagOutput.append(entry.getValue()); tagOutput.append(XmlHelper.encodeEntities(entry.getValue()));
tagOutput.append('"'); tagOutput.append('"');
} }
} }