3 files changed, 5 insertions, 6 deletions
diff --git a/module/web/api_app.py b/module/web/api_app.py
index db735a5b9..1629c1677 100644
--- a/module/web/api_app.py
+++ b/module/web/api_app.py
@@ -7,19 +7,18 @@ from traceback import format_exc, print_exc
 
 from bottle import route, request, response, HTTPError
 
-from thrift.protocol.TBase import TBase
-
 from utils import toDict, set_session
 from webinterface import PYLOAD
 
 from module.common.json_layer import json
 from module.lib.SafeEval import const_eval as literal_eval
+from module.Api import BaseObject
 
 # json encoder that accepts TBase objects
 class TBaseEncoder(json.JSONEncoder):
 
     def default(self, o):
-        if isinstance(o, TBase):
+        if isinstance(o, BaseObject):
             return toDict(o)
         return json.JSONEncoder.default(self, o)
 
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index b11910bac..c88fa3568 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -28,6 +28,7 @@ document.addEvent("domready", function(){
 {% endblock %}
 
 {% block content %}
+{% autoescape true %}
 
 <ul id="package-list" style="list-style: none; padding-left: 0; margin-top: -10px;">
 {% for package in content %}
@@ -69,6 +70,7 @@ document.addEvent("domready", function(){
     </li>
 {% endfor %}
 </ul>
+{% endautoescape %}
 {% endblock %}
 
 {% block hidden %}
diff --git a/module/web/webinterface.py b/module/web/webinterface.py
index b531d0583..68724e3f6 100644
--- a/module/web/webinterface.py
+++ b/module/web/webinterface.py
@@ -79,7 +79,7 @@ loader = PrefixLoader({
     'js': FileSystemLoader(join(PROJECT_DIR, 'media', 'js'))
 })
 
-env = Environment(loader=loader, extensions=['jinja2.ext.i18n'], trim_blocks=True, auto_reload=False,
+env = Environment(loader=loader, extensions=['jinja2.ext.i18n', 'jinja2.ext.autoescape'], trim_blocks=True, auto_reload=False,
     bytecode_cache=bcc)
 
 from filters import quotepath, path_make_relative, path_make_absolute, truncate, date
@@ -118,8 +118,6 @@ web = GZipMiddleWare(web)
 if PREFIX:
     web = PrefixMiddleware(web, prefix=PREFIX)
 
-#TODO: compress plugin, install(otfcompress)
-
 import pyload_app
 import json_app
 import cnl_app