summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-01-13 10:58:51 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-01-13 10:58:51 +0100
commitcda057e979cbdc8022687e1810b876b371c8c11f (patch)
treee31fd827931fc85465b4cee3d19d82d35a905c39 /module/web
parentadded setup.py, dropped GUI (diff)
downloadpyload-cda057e979cbdc8022687e1810b876b371c8c11f.tar.xz
fix info page, removed icons
Diffstat (limited to 'module/web')
-rw-r--r--module/web/pyload_app.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py
index a19dce24c..dcfc3266e 100644
--- a/module/web/pyload_app.py
+++ b/module/web/pyload_app.py
@@ -36,7 +36,7 @@ from utils import render_to_response, parse_permissions, parse_userdata, \
from filters import relpath, unquotepath
from module.utils import formatSize
-from module.utils.fs import save_join, fs_encode, fs_decode, listdir
+from module.utils.fs import save_join, fs_encode, fs_decode, listdir, free_space
# Helper
@@ -509,7 +509,7 @@ def setup():
@login_required("STATUS")
@route("/info")
def info():
- conf = PYLOAD.getConfigDict()
+ conf = PYLOAD.getConfigPointer()
if hasattr(os, "uname"):
extra = os.uname()
@@ -520,10 +520,10 @@ def info():
"os": " ".join((os.name, sys.platform) + extra),
"version": PYLOAD.getServerVersion(),
"folder": abspath(PYLOAD_DIR), "config": abspath(""),
- "download": abspath(conf["general"]["download_folder"]["value"]),
+ "download": abspath(conf["general"]["download_folder"]),
"freespace": formatSize(PYLOAD.freeSpace()),
- "remote": conf["remote"]["port"]["value"],
- "webif": conf["webinterface"]["port"]["value"],
- "language": conf["general"]["language"]["value"]}
+ "remote": conf["remote"]["port"],
+ "webif": conf["webinterface"]["port"],
+ "language": conf["general"]["language"]}
return render_to_response("info.html", data, [pre_processor])