dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Encode environments args in html

Browse Source
This commit is contained in:
Ruud
2014-06-16 22:39:02 +02:00
parent 76126271fc
commit f65ddbbb9e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
couchpotato/environment.py
View File

@@ -2,6 +2,7 @@ import os
from couchpotato.core.database import Database from couchpotato.core.database import Database
from couchpotato.core.event import fireEvent, addEvent from couchpotato.core.event import fireEvent, addEvent
from couchpotato.core.helpers.encoding import toUnicode
from couchpotato.core.loader import Loader from couchpotato.core.loader import Loader
from couchpotato.core.settings import Settings from couchpotato.core.settings import Settings
@@ -38,8 +39,11 @@ class Env(object):
return Env._debug return Env._debug
@staticmethod @staticmethod
def get(attr): def get(attr, unicode = False):
return getattr(Env, '_' + attr) if unicode:
return toUnicode(getattr(Env, '_' + attr))
else:
return getattr(Env, '_' + attr)
@staticmethod @staticmethod
def all(): def all():

6
couchpotato/templates/index.html
View File

@@ -73,10 +73,10 @@
App.setup({ App.setup({
'base_url': {{ json_encode(Env.get('web_base')) }}, 'base_url': {{ json_encode(Env.get('web_base')) }},
'args': {{ json_encode(Env.get('args')) }}, 'args': {{ json_encode(Env.get('args', unicode = True)) }},
'options': {{ json_encode(('%s' % Env.get('options'))) }}, 'options': {{ json_encode(('%s' % Env.get('options'))) }},
'app_dir': {{ json_encode(Env.get('app_dir')) }}, 'app_dir': {{ json_encode(Env.get('app_dir', unicode = True)) }},
'data_dir': {{ json_encode(Env.get('data_dir')) }}, 'data_dir': {{ json_encode(Env.get('data_dir', unicode = True)) }},
'pid': {{ json_encode(Env.getPid()) }}, 'pid': {{ json_encode(Env.getPid()) }},
'userscript_version': {{ json_encode(fireEvent('userscript.get_version', single = True)) }} 'userscript_version': {{ json_encode(fireEvent('userscript.get_version', single = True)) }}
}); });