summaryrefslogtreecommitdiffstats
path: root/pyload/web/pyload_app.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-12-15 14:00:42 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-12-15 14:00:42 +0100
commit8fbde7a43b4f838df0379fdb4acd791713b639b7 (patch)
treebb7e78afc6a34823e078ab64c6965321c6866e85 /pyload/web/pyload_app.py
parentadded new file states (diff)
downloadpyload-8fbde7a43b4f838df0379fdb4acd791713b639b7.tar.xz
more options to get webUI through proxy working
Diffstat (limited to 'pyload/web/pyload_app.py')
-rw-r--r--pyload/web/pyload_app.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/pyload/web/pyload_app.py b/pyload/web/pyload_app.py
index 50d9b9731..1a54c4a93 100644
--- a/pyload/web/pyload_app.py
+++ b/pyload/web/pyload_app.py
@@ -21,7 +21,7 @@ from os.path import join, exists
from bottle import route, static_file, response, request, redirect, template
-from webinterface import PYLOAD, PROJECT_DIR, SETUP, APP_PATH, UNAVAILALBE
+from webinterface import PYLOAD, PROJECT_DIR, SETUP, APP_PATH, UNAVAILALBE, PREFIX
from utils import login_required, add_json_header, select_language
@@ -71,16 +71,17 @@ def index():
# set variable depending on setup mode
setup = 'false' if SETUP is None else 'true'
ws = PYLOAD.getWSAddress() if PYLOAD else False
+ external = PYLOAD.getConfigValue('webUI', 'external') if PYLOAD else None
web = None
if PYLOAD:
- web = PYLOAD.getConfigValue('webinterface', 'port')
+ web = PYLOAD.getConfigValue('webUI', 'port')
elif SETUP:
- web = SETUP.config['webinterface']['port']
+ web = SETUP.config['webUI']['port']
# Render variables into the html page
if resp.status_code == 200:
content = resp.body.read()
- resp.body = template(content, ws=ws, web=web, setup=setup)
+ resp.body = template(content, ws=ws, web=web, setup=setup, external=external, prefix=PREFIX)
resp.content_length = len(resp.body)
return resp