summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-07-19 21:10:04 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-07-19 21:10:04 +0200
commit8c94f8e7214d9ee0a131584e672ae83277303f2b (patch)
treeb43da702fe8888883d18eaf622e9a170d4e4410b /module/web
parentfix in unrar plugin (diff)
downloadpyload-8c94f8e7214d9ee0a131584e672ae83277303f2b.tar.xz
use correct encoding header parsing
Diffstat (limited to 'module/web')
-rw-r--r--module/web/media/default/js/funktions.js2
-rw-r--r--module/web/pyload_app.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/module/web/media/default/js/funktions.js b/module/web/media/default/js/funktions.js
index 529b7056b..fe9ed699b 100644
--- a/module/web/media/default/js/funktions.js
+++ b/module/web/media/default/js/funktions.js
@@ -4,7 +4,7 @@ function humanFileSize(size) {
var loga = Math.log(size) / Math.log(1024);
var i = Math.floor(loga);
var a = Math.pow(1024, i);
- return (size == 0) ? "0 B" : (Math.round(size / a, 2) + " " + filesizename[i]);
+ return (size == 0) ? "0 B" : (Math.round(size * 100 / a) / 100 + " " + filesizename[i]);
}
function parseUri() {
diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py
index 923d5d756..7492114ca 100644
--- a/module/web/pyload_app.py
+++ b/module/web/pyload_app.py
@@ -168,7 +168,7 @@ def collector():
@route("/downloads")
@login_required('download')
def downloads():
- root = PYLOAD.getConfigValue("general", "download_folder")
+ root = fs_decode(PYLOAD.getConfigValue("general", "download_folder"))
if not isdir(root):
return base([_('Download directory not found.')])