Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 12 insertions, 12 deletions

diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py
index ee309c425..7ed09e731 100644
--- a/module/plugins/accounts/FilesMailRu.py
+++ b/module/plugins/accounts/FilesMailRu.py
@@ -1,31 +1,31 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.Account import Account
+from module.plugins.internal.Account import Account
 
 
 class FilesMailRu(Account):
     __name__    = "FilesMailRu"
     __type__    = "account"
-    __version__ = "0.11"
+    __version__ = "0.13"
+    __status__  = "testing"
 
     __description__ = """Filesmail.ru account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
-    def loadAccountInfo(self, user, req):
-        return {"validuntil": None, "trafficleft": None}
+    def parse_info(self, user, password, data, req):
+        return {'validuntil': None, 'trafficleft': None}
 
 
-    def login(self, user, data, req):
+    def login(self, user, password, data, req):
         user, domain = user.split("@")
 
-        html = req.load("http://swa.mail.ru/cgi-bin/auth",
-                        post={"Domain": domain,
-                              "Login": user,
-                              "Password": data['password'],
-                              "Page": "http://files.mail.ru/"},
-                        decode=True)
+        html = self.load("https://swa.mail.ru/cgi-bin/auth",
+                         post={'Domain'  : domain,
+                               'Login'   : user,
+                               'Password': password,
+                               'Page'    : "http://files.mail.ru/"})
 
         if "Неверное имя пользователя или пароль" in html:
-            self.wrongPassword()
+            self.login_fail()