From faf6fbc956f8c23871c0bcb91a84986ffd689201 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 5 Oct 2010 20:07:44 +0200
Subject: changed dl function for test purpose

---
 module/network/Request.py                  | 8 +++++---
 module/plugins/Account.py                  | 2 +-
 module/plugins/accounts/HotfileCom.py      | 5 ++++-
 module/web/pyload/views.py                 | 2 +-
 module/web/templates/default/settings.html | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'module')

diff --git a/module/network/Request.py b/module/network/Request.py
index f5c856f6f..21159dde1 100755
--- a/module/network/Request.py
+++ b/module/network/Request.py
@@ -287,8 +287,9 @@ class Request:
             self.chunkRead += chunkSize
             self.dl_arrived += chunkSize
             
-        self.pycurl.setopt(pycurl.WRITEFUNCTION, writefunc)
-        
+        #self.pycurl.setopt(pycurl.WRITEFUNCTION, writefunc)
+        self.pycurl.setopt(pycurl.WRITEDATA, self.fp)
+
         try:
             self.pycurl.perform()
         except Exception, e:
@@ -344,7 +345,8 @@ class Request:
 
     def get_speed(self):
         try:
-            return self.dl_speed
+            #return self.dl_speed
+            return (self.dl_arrived / (time.time()- self.dl_time)) / 1024
         except:
             return 0
 
diff --git a/module/plugins/Account.py b/module/plugins/Account.py
index 727356ee4..d93ff7e08 100644
--- a/module/plugins/Account.py
+++ b/module/plugins/Account.py
@@ -180,7 +180,7 @@ class Account():
 
     def empty(self, user):
         if self.infos.has_key(user):
-            self.core.log.warning(_("%(plugin)s Account %(user)s has not enough trafficE") % {"plugin" : self.__name__, "user": user})
+            self.core.log.warning(_("%(plugin)s Account %(user)s has not enough traffic") % {"plugin" : self.__name__, "user": user})
             self.infos[user].update({"trafficleft": 0})
 
     def expired(self, user):
diff --git a/module/plugins/accounts/HotfileCom.py b/module/plugins/accounts/HotfileCom.py
index f623e56f1..52bff87fe 100644
--- a/module/plugins/accounts/HotfileCom.py
+++ b/module/plugins/accounts/HotfileCom.py
@@ -75,4 +75,7 @@ class HotfileCom(Account):
         cj = self.getAccountCookies(user)
         cj.setCookie("hotfile.com", "lang", "en")
         req.load("http://hotfile.com/", cookies=True)
-        req.load("http://hotfile.com/login.php", post={"returnto": "/", "user": user, "pass": data["password"]}, cookies=True)
+        page = req.load("http://hotfile.com/login.php", post={"returnto": "/", "user": user, "pass": data["password"]}, cookies=True)
+
+        if "Bad username/password" in page:
+            self.wrongPassword()
\ No newline at end of file
diff --git a/module/web/pyload/views.py b/module/web/pyload/views.py
index 523fe60ea..a69e7da86 100644
--- a/module/web/pyload/views.py
+++ b/module/web/pyload/views.py
@@ -357,7 +357,7 @@ def config(request):
                 data["validuntil"] = _("not available")
             else:
                 t = localtime(data["validuntil"])
-                data["validuntil"] = strftime("%d-%m-%Y",t)
+                data["validuntil"] = strftime("%d.%m.%Y",t)
 
             if data["options"].has_key("time"):
                 data["time"] = data["options"]["time"][0]
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index 09fe2e8b1..6c9c2982a 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -138,10 +138,10 @@
                             <td>
                             {% trans "Status:" %}
                             {% if account.valid %}
-                                <span style="font-weight: bold; color:#90ee90;">
+                                <span style="font-weight: bold; color: #006400;">
                                 {% trans "valid"  %}
                             {% else %}
-                                <span style="font-weight: bold; color: #f08080;">
+                                <span style="font-weight: bold; color: #8b0000;">
                                 {% trans "not valid"  %}
                             {% endif %}
                             </span>
-- 
cgit v1.2.3