From 45bcd95467ffc2fce3b246c9c26c9070e29ae86d Mon Sep 17 00:00:00 2001 From: deva Date: Fri, 26 Feb 2010 10:58:02 +0000 Subject: Make xml escaped characters show up correclty in the client. --- server/src/server.cc | 2 +- server/src/widgetgenerator.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'server/src') diff --git a/server/src/server.cc b/server/src/server.cc index 9c653f8..727ac28 100644 --- a/server/src/server.cc +++ b/server/src/server.cc @@ -239,7 +239,7 @@ static std::string handleRequest(Transaction *transaction, if(completed) { answer += " "; - answer += db.getResume(transaction->cpr, macro, time(NULL) - Conf::db_max_ttl); + answer += xml_encode(db.getResume(transaction->cpr, macro, time(NULL) - Conf::db_max_ttl)); answer += "\n"; } diff --git a/server/src/widgetgenerator.cc b/server/src/widgetgenerator.cc index 1e60479..57be1f2 100644 --- a/server/src/widgetgenerator.cc +++ b/server/src/widgetgenerator.cc @@ -152,7 +152,7 @@ static std::string send_macro_widget(Macro ¯o, while(p != widget.attributes.end()) { if(p->first != "tagname" && p->first != "map") { if( ! (p->first == "name" && p->second == "") ) - result += " " + p->first + "=\"" + p->second + "\""; + result += " " + p->first + "=\"" + xml_encode(p->second) + "\""; } p++; } -- cgit v1.2.3