From ab22498f73ba6376d0242c4f0a706b312cf6cdb6 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Wed, 18 Aug 2010 22:39:07 +0200
Subject: account fixes

---
 module/plugins/accounts/FileserveCom.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'module/plugins/accounts/FileserveCom.py')

diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index 2862e5ab0..a9b222a6a 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -31,21 +31,24 @@ class FileserveCom(Account):
     __author_mail__ = ("mkaay@mkaay.de")
     
     def getAccountInfo(self, user):
-        req = self.core.requestFactory.getRequest(self.__name__, user)
-        
-        src = req.load("http://fileserve.com/dashboard.php", cookies=True)
-        
-        out = Account.getAccountInfo(self, user)
-        
-        m = re.search(r"<td><h4>Premium Until</h4></th> <td><h5>(.*?) E(.)T</h5></td>", src)
-        if m:
-            zone = -5 if m.group(2) == "S" else -4
-            validuntil = int(mktime(strptime(m.group(1), "%d %B %Y"))) + 24*3600 + (zone*3600)
-            tmp = {"validuntil":validuntil, "trafficleft":-1}
-        else:
-            tmp = {"trafficleft":-1}
-        out.update(tmp)
-        return out
+        try:
+            req = self.core.requestFactory.getRequest(self.__name__, user)
+            
+            src = req.load("http://fileserve.com/dashboard.php", cookies=True)
+            
+            out = Account.getAccountInfo(self, user)
+            
+            m = re.search(r"<td><h4>Premium Until</h4></th> <td><h5>(.*?) E(.)T</h5></td>", src)
+            if m:
+                zone = -5 if m.group(2) == "S" else -4
+                validuntil = int(mktime(strptime(m.group(1), "%d %B %Y"))) + 24*3600 + (zone*3600)
+                tmp = {"validuntil":validuntil, "trafficleft":-1}
+            else:
+                tmp = {"trafficleft":-1}
+            out.update(tmp)
+            return out
+        except:
+            return Account.getAccountInfo(user)
     
     def login(self, user, data):
         req = self.core.requestFactory.getRequest(self.__name__, user)
-- 
cgit v1.2.3