Merge pull request #2 from pyload/stable

sync with stable

1 files changed, 4 insertions, 6 deletions

diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index dabfc1932..bc56d4b96 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -9,7 +9,7 @@ from module.common.json_layer import json_loads
 class FileserveCom(Account):
     __name__    = "FileserveCom"
     __type__    = "account"
-    __version__ = "0.22"
+    __version__ = "0.24"
     __status__  = "testing"
 
     __description__ = """Fileserve.com account plugin"""
@@ -17,9 +17,7 @@ class FileserveCom(Account):
     __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
-    def parse_info(self, user, password, data, req):
-        data = self.get_data(user)
-
+    def grab_info(self, user, password, data):
         html = self.load("http://app.fileserve.com/api/login/",
                          post={'username': user,
                                'password': password,
@@ -33,7 +31,7 @@ class FileserveCom(Account):
             return {'premium': False, 'trafficleft': None, 'validuntil': None}
 
 
-    def login(self, user, password, data, req):
+    def signin(self, user, password, data):
         html = self.load("http://app.fileserve.com/api/login/",
                          post={'username': user,
                                'password': password,
@@ -41,7 +39,7 @@ class FileserveCom(Account):
         res = json_loads(html)
 
         if not res['type']:
-            self.login_fail()
+            self.fail_login()
 
         #: Login at fileserv html
         self.load("http://www.fileserve.com/login.php",