From 1ef8f2435ec72fac64505fc11939e94665e11eef Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sun, 24 Apr 2011 19:46:59 +0200
Subject: parse content disposition

---
 module/web/pyload_app.py               |  9 ++++++---
 module/web/templates/default/info.html | 10 +++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'module/web')

diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py
index 102638885..fc2302809 100644
--- a/module/web/pyload_app.py
+++ b/module/web/pyload_app.py
@@ -18,11 +18,12 @@
 """
 from copy import deepcopy
 from datetime import datetime
-from itertools import chain
 from operator import itemgetter
-import os
+
 
 import time
+import os
+import sys
 from os import listdir
 from os.path import isdir, isfile, join ,abspath
 from sys import getfilesystemencoding
@@ -514,7 +515,9 @@ def info():
 
     conf = PYLOAD.get_config()
 
-    data = {"version": PYLOAD.get_server_version(),
+    data = {"python": sys.version,
+            "os": " ".join((os.name,) + os.uname()),
+            "version": PYLOAD.get_server_version(),
             "folder": abspath(PYLOAD_DIR), "config": abspath(""),
             "download": abspath(conf["general"]["download_folder"]["value"]),
             "remote": conf["remote"]["port"]["value"],
diff --git a/module/web/templates/default/info.html b/module/web/templates/default/info.html
index f1ef06814..b9ee3b1bd 100644
--- a/module/web/templates/default/info.html
+++ b/module/web/templates/default/info.html
@@ -20,8 +20,16 @@
 
     <h3>{{ _("System") }}</h3>
     <table class="system">
+         <tr>
+            <td>{{ _("Python:") }}</td>
+            <td>{{ python }}</td>
+        </tr>
+        <tr>
+            <td>{{ _("OS:") }}</td>
+            <td>{{ os }}</td>
+        </tr>
         <tr>
-            <td>{{ _("Version:") }}</td>
+            <td>{{ _("pyLoad version:") }}</td>
             <td>{{ version }}</td>
         </tr>
         <tr>
-- 
cgit v1.2.3