fix info page, removed icons

3 files changed, 10 insertions, 17 deletions

diff --git a/module/Api.py b/module/Api.py
index fba02d574..ac9ea7f79 100644
--- a/module/Api.py
+++ b/module/Api.py
@@ -25,7 +25,8 @@ from itertools import chain
 
 
 from PyFile import PyFile
-from utils import freeSpace, compare_time, to_string
+from utils import compare_time, to_string
+from utils.fs import free_space
 from common.packagetools import parseNames
 from network.RequestFactory import getURL
 from remote import activated
@@ -213,7 +214,7 @@ class Api(Iface):
     @permission(PERMS.STATUS)
     def freeSpace(self):
         """Available free space at download directory in bytes"""
-        return freeSpace(self.core.config["general"]["download_folder"])
+        return free_space(self.core.config["general"]["download_folder"])
 
     @permission(PERMS.ALL)
     def getServerVersion(self):
diff --git a/module/utils/__init__.py b/module/utils/__init__.py
index 3b0fb673a..b68928f04 100644
--- a/module/utils/__init__.py
+++ b/module/utils/__init__.py
@@ -66,12 +66,6 @@ def formatSize(size):
 def formatSpeed(speed):
     return formatSize(speed) + "/s"
 
-
-def freeSpace(folder):
-    print "Deprecated freeSpace"
-    return free_space(folder)
-
-
 def uniqify(seq): #by Dave Kirby
     """ removes duplicates from list, preserve order """
     seen = set()
@@ -192,6 +186,4 @@ def html_unescape(text):
     return re.sub("&#?\w+;", fixup, text)
 
 if __name__ == "__main__":
-    print freeSpace(".")
-
-    print remove_chars("ab'cdgdsf''ds'", "'ghd")
\ No newline at end of file
+    print remove_chars("ab'cdgdsf''ds'", "'ghd")
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])