1 files changed, 36 insertions, 19 deletions
diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py
index 7a6263ab3..04e71c9ad 100644
--- a/module/plugins/accounts/RehostTo.py
+++ b/module/plugins/accounts/RehostTo.py
@@ -4,34 +4,51 @@ from module.plugins.Account import Account
 
 
 class RehostTo(Account):
-    __name__ = "RehostTo"
-    __version__ = "0.1"
-    __type__ = "account"
+    __name__    = "RehostTo"
+    __type__    = "account"
+    __version__ = "0.16"
 
     __description__ = """Rehost.to account plugin"""
-    __author_name__ = "RaNaN"
-    __author_mail__ = "RaNaN@pyload.org"
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
-        data = self.getAccountData(user)
-        page = req.load("http://rehost.to/api.php?cmd=login&user=%s&pass=%s" % (user, data['password']))
-        data = [x.split("=") for x in page.split(",")]
-        ses = data[0][1]
-        long_ses = data[1][1]
+        premium     = False
+        trafficleft = None
+        validuntil  = -1
+        session     = ""
 
-        page = req.load("http://rehost.to/api.php?cmd=get_premium_credits&long_ses=%s" % long_ses)
-        traffic, valid = page.split(",")
+        html = req.load("http://rehost.to/api.php",
+                        get={'cmd' : "login", 'user': user,
+                             'pass': self.getAccountData(user)['password']})
+        try:
+            session = html.split(",")[1].split("=")[1]
 
-        account_info = {"trafficleft": int(traffic) * 1024,
-                        "validuntil": int(valid),
-                        "long_ses": long_ses,
-                        "ses": ses}
+            html = req.load("http://rehost.to/api.php",
+                            get={'cmd': "get_premium_credits", 'long_ses': session})
+
+            if html.strip() == "0,0" or "ERROR" in html:
+                self.logDebug(html)
+            else:
+                traffic, valid = html.split(",")
+
+                premium     = True
+                trafficleft = self.parseTraffic(traffic + "MB")
+                validuntil  = float(valid)
+
+        finally:
+            return {'premium'    : premium,
+                    'trafficleft': trafficleft,
+                    'validuntil' : validuntil,
+                    'session'    : session}
 
-        return account_info
 
     def login(self, user, data, req):
-        page = req.load("http://rehost.to/api.php?cmd=login&user=%s&pass=%s" % (user, data['password']))
+        html = req.load("http://rehost.to/api.php",
+                        get={'cmd': "login", 'user': user, 'pass': data['password']},
+                        decode=True)
 
-        if "Login failed." in page:
+        if "ERROR" in html:
+            self.logDebug(html)
             self.wrongPassword()