merged stable into default

1 files changed, 14 insertions, 10 deletions

diff --git a/module/plugins/accounts/Premium4Me.py b/module/plugins/accounts/Premium4Me.py
index de4fdc219..6a52cb61a 100644
--- a/module/plugins/accounts/Premium4Me.py
+++ b/module/plugins/accounts/Premium4Me.py
@@ -1,23 +1,27 @@
-from module.plugins.Account import Account

+# -*- coding: utf-8 -*-

+from module.plugins.MultiHoster import MultiHoster

 

-class Premium4Me(Account):

+class Premium4Me(MultiHoster):

     __name__ = "Premium4Me"

-    __version__ = "0.02"

+    __version__ = "0.10"

     __type__ = "account"

     __description__ = """Premium4.me account plugin"""

     __author_name__ = ("RaNaN", "zoidberg")

     __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")

 

-    def loadAccountInfo(self, user, req):

+    def loadAccountInfo(self, req):

         traffic = req.load("http://premium4.me/api/traffic.php?authcode=%s" % self.authcode)

 

-        account_info = {"trafficleft": int(traffic) / 1024,

-                        "validuntil": -1}

+        account_info = {"trafficleft": int(traffic) / 1024, "validuntil": -1}

 

         return account_info

 

-    def login(self, user, data, req):

-        self.authcode = req.load("http://premium4.me/api/getauthcode.php?username=%s&password=%s" % (user, data["password"])).strip()

-        

+    def login(self, req):

+        self.authcode = req.load("http://premium4.me/api/getauthcode.php?username=%s&password=%s" % (self.loginname, self.password)).strip()

+

         if "wrong username" in self.authcode:

-            self.wrongPassword()
\ No newline at end of file
+            self.wrongPassword()

+        

+    def loadHosterList(self, req):

+        page = req.load("http://premium4.me/api/hosters.php?authcode=%s" % self.authcode)

+        return [x.strip() for x in page.replace("\"", "").split(";")]
\ No newline at end of file