BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- escape image alt attribute as it's breaking xml format in some metadata.xml

Browse Source
This commit is contained in:
Richard Alam 2017-03-28 20:16:26 +00:00
parent 7fdbc5b293
commit fcca81783e
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bbb-common-web/src/main/java/org/bigbluebutton/api/util/ResponseBuilder.java
View File

@ -39,7 +39,7 @@ public class ResponseBuilder {
Template ftl = null;
try {
ftl = cfg.getTemplate("get-meeting-info.ftl");
ftl = cfg.getTemplate("get-meeting-info.ftlx");
} catch (IOException e) {
log.error("Cannot find get-meeting-info.ftl template for meeting : " + meeting.getInternalId(), e);
}
@ -74,9 +74,9 @@ public class ResponseBuilder {
Template ftl = null;
try {
ftl = cfg.getTemplate("get-meetings.ftl");
ftl = cfg.getTemplate("get-meetings.ftlx");
} catch (IOException e) {
log.error("IO exception for get-meetings.ftl : ", e);
log.error("IO exception for get-meetings.ftlx : ", e);
}
StringWriter xmlText = new StringWriter();
@ -90,7 +90,7 @@ public class ResponseBuilder {
} catch (TemplateException e) {
log.error("Template exception : ", e);
} catch (IOException e) {
log.error("IO exception for get-meetings.ftl : ", e);
log.error("IO exception for get-meetings.ftlx : ", e);
}
return xmlText.toString();
@ -100,7 +100,7 @@ public class ResponseBuilder {
Template ftl = null;
try {
ftl = cfg.getTemplate("get-recordings.ftl");
ftl = cfg.getTemplate("get-recordings.ftlx");
} catch (IOException e) {
log.error("IO exception for get-recordings.ftl : ", e);
}
@ -116,7 +116,7 @@ public class ResponseBuilder {
} catch (TemplateException e) {
log.error("Template exception : ", e);
} catch (IOException e) {
log.error("IO exception for get-recordings.ftl : ", e);
log.error("IO exception for get-recordings.ftlx : ", e);
}
return xmlText.toString();

0
bbb-common-web/src/test/resources/get-meeting-info.ftl → bbb-common-web/src/test/resources/get-meeting-info.ftlx
View File

2
bbb-common-web/src/test/resources/get-recordings.ftl → bbb-common-web/src/test/resources/get-recordings.ftlx
View File

@ -11,7 +11,7 @@
<recordID>${r.getMetadataXml()?html}</recordID>
</error>
<#else>
<#include "include-recording.ftl">
<#include "include-recording.ftlx">
</#if>
</recording>
</#list>

0
bbb-common-web/src/test/resources/include-recording.ftl → bbb-common-web/src/test/resources/include-recording.ftlx
View File

0
bigbluebutton-web/web-app/WEB-INF/freemarker/get-meeting-info.ftl → bigbluebutton-web/web-app/WEB-INF/freemarker/get-meeting-info.ftlx
View File

0
bigbluebutton-web/web-app/WEB-INF/freemarker/get-meetings.ftl → bigbluebutton-web/web-app/WEB-INF/freemarker/get-meetings.ftlx
View File

2
bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl → bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftlx
View File

@ -11,7 +11,7 @@
<recordID>${r.getMetadataXml()?html}</recordID>
</error>
<#else>
<#include "include-recording.ftl">
<#include "include-recording.ftlx">
</#if>
</recording>
</#list>

2
bigbluebutton-web/web-app/WEB-INF/freemarker/include-recording.ftl → bigbluebutton-web/web-app/WEB-INF/freemarker/include-recording.ftlx
View File

@ -59,7 +59,7 @@
<images>
<#items as image>
<#if image??>
<image width="${image.getWidth()}" height="${image.getHeight()}" alt="${image.getAlt()}">${image.getValue()!"Link not found."}</image>
<image width="${image.getWidth()}" height="${image.getHeight()}" alt="${image.getAlt()?html}">${image.getValue()!"Link not found."}</image>
</#if>
</#items>
</images>