Merge remote-tracking branch 'pyload/stable' into 0.4.10

Conflicts:
	module/plugins/accounts/MultiDebridCom.py
	module/plugins/accounts/MyfastfileCom.py
	module/plugins/hooks/MultiDebridCom.py
	module/plugins/hooks/MyfastfileCom.py
	module/plugins/hooks/Premium4Me.py
	module/plugins/hooks/PremiumTo.py
	module/plugins/hoster/MultiDebridCom.py
	module/plugins/hoster/MyfastfileCom.py
	module/plugins/hoster/Premium4Me.py
	module/plugins/hoster/PremiumTo.py
	pyload/plugins/accounts/MultiDebridCom.py
	pyload/plugins/accounts/Premium4Me.py
	pyload/plugins/hooks/MultiDebridCom.py
	pyload/plugins/hooks/Premium4Me.py
	pyload/plugins/hoster/MultiDebridCom.py
	pyload/plugins/hoster/Premium4Me.py

4 files changed, 47 insertions, 50 deletions

diff --git a/pyload/plugins/accounts/FourSharedCom.py b/pyload/plugins/accounts/FourSharedCom.py
index 217bd2874..e4df62956 100644
--- a/pyload/plugins/accounts/FourSharedCom.py
+++ b/pyload/plugins/accounts/FourSharedCom.py
@@ -7,28 +7,24 @@ from pyload.utils import json_loads
 class FourSharedCom(Account):
     __name__ = "FourSharedCom"
     __type__ = "account"
-    __version__ = "0.01"
+    __version__ = "0.03"
 
     __description__ = """FourShared.com account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
-
+    __author_name__ = ("zoidberg", "stickell")
+    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
     def loadAccountInfo(self, user, req):
-        #fixme
-        return {"validuntil": -1, "trafficleft": -1, "premium": False}
+        # Free mode only for now
+        return {"premium": False}
 
     def login(self, user, data, req):
-        req.cj.setCookie("www.4shared.com", "4langcookie", "en")
-        response = req.load('http://www.4shared.com/login',
+        req.cj.setCookie("4shared.com", "4langcookie", "en")
+        response = req.load('http://www.4shared.com/web/login',
                             post={"login": user,
                                   "password": data['password'],
-                                  "remember": "false",
-                                  "doNotRedirect": "true"})
-        self.logDebug(response)
-        response = json_loads(response)
+                                  "remember": "on",
+                                  "_remember": "on",
+                                  "returnTo": "http://www.4shared.com/account/home.jsp"})
 
-        if not "ok" in response or response['ok'] != True:
-            if "rejectReason" in response and response['rejectReason'] != True:
-                self.logError(response['rejectReason'])
+        if 'Please log in to access your 4shared account' in response:
             self.wrongPassword()
diff --git a/pyload/plugins/accounts/MultiDebridCom.py b/pyload/plugins/accounts/MyfastfileCom.py
index cca6a9849..b5d35d326 100644
--- a/pyload/plugins/accounts/MultiDebridCom.py
+++ b/pyload/plugins/accounts/MyfastfileCom.py
@@ -6,12 +6,12 @@ from pyload.plugins.Account import Account
 from pyload.utils import json_loads
 
 
-class MultiDebridCom(Account):
-    __name__ = "MultiDebridCom"
+class MyfastfileCom(Account):
+    __name__ = "MyfastfileCom"
     __type__ = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
-    __description__ = """Multi-debrid.com account plugin"""
+    __description__ = """Myfastfile.com account plugin"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
@@ -24,8 +24,8 @@ class MultiDebridCom(Account):
             self.logError('Unable to get account information')
 
     def login(self, user, data, req):
-        # Password to use is the API-Password written in http://multi-debrid.com/myaccount
-        html = req.load("http://multi-debrid.com/api.php",
+        # Password to use is the API-Password written in http://myfastfile.com/myaccount
+        html = req.load("http://myfastfile.com/api.php",
                              get={"user": user, "pass": data['password']})
         self.logDebug('JSON data: ' + html)
         self.json_data = json_loads(html)
diff --git a/pyload/plugins/accounts/Premium4Me.py b/pyload/plugins/accounts/Premium4Me.py
deleted file mode 100644
index 01b4b834e..000000000
--- a/pyload/plugins/accounts/Premium4Me.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from pyload.plugins.Account import Account
-
-
-class Premium4Me(Account):
-    __name__ = "Premium4Me"
-    __type__ = "account"
-    __version__ = "0.03"
-
-    __description__ = """Premium.to account plugin"""
-    __author_name__ = ("RaNaN", "zoidberg", "stickell")
-    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
-
-
-    def loadAccountInfo(self, user, req):
-        traffic = req.load("http://premium.to/api/traffic.php?authcode=%s" % self.authcode)
-
-        account_info = {"trafficleft": int(traffic) / 1024,
-                        "validuntil": -1}
-
-        return account_info
-
-    def login(self, user, data, req):
-        self.authcode = req.load("http://premium.to/api/getauthcode.php?username=%s&password=%s" % (
-                                 user, data['password'])).strip()
-
-        if "wrong username" in self.authcode:
-            self.wrongPassword()
diff --git a/pyload/plugins/accounts/PremiumTo.py b/pyload/plugins/accounts/PremiumTo.py
new file mode 100644
index 000000000..3b757bdf2
--- /dev/null
+++ b/pyload/plugins/accounts/PremiumTo.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+from pyload.plugins.Account import Account
+
+
+class PremiumTo(Account):
+    __name__ = "PremiumTo"
+    __type__ = "account"
+    __version__ = "0.04"
+
+    __description__ = """Premium.to account plugin"""
+    __author_name__ = ("RaNaN", "zoidberg", "stickell")
+    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+
+
+    def loadAccountInfo(self, user, req):
+        api_r = req.load("http://premium.to/api/straffic.php",
+                         get={'username': self.username, 'password': self.password})
+        traffic = sum(map(int, api_r.split(';')))
+
+        return {"trafficleft": int(traffic) / 1024, "validuntil": -1}
+
+    def login(self, user, data, req):
+        self.username = user
+        self.password = data['password']
+        authcode = req.load("http://premium.to/api/getauthcode.php?username=%s&password=%s" % (
+                                 user, self.password)).strip()
+
+        if "wrong username" in authcode:
+            self.wrongPassword()