Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/hoster/BillionuploadsCom.py
	pyload/plugin/account/ShareonlineBiz.py
	pyload/plugin/account/UnrestrictLi.py
	pyload/plugin/addon/ClickNLoad.py
	pyload/plugin/hook/LinkdecrypterCom.py
	pyload/plugin/hook/UnrestrictLi.py
	pyload/plugin/hoster/FilefactoryCom.py
	pyload/plugin/hoster/UnrestrictLi.py
	pyload/plugin/internal/MultiHook.py
	pyload/plugin/internal/XFSCrypter.py

2 files changed, 2 insertions, 46 deletions

diff --git a/pyload/plugin/account/ShareonlineBiz.py b/pyload/plugin/account/ShareonlineBiz.py
index 06b2818c9..97f45e0ab 100644
--- a/pyload/plugin/account/ShareonlineBiz.py
+++ b/pyload/plugin/account/ShareonlineBiz.py
@@ -8,7 +8,7 @@ from pyload.plugin.Account import Account
 class ShareonlineBiz(Account):
     __name    = "ShareonlineBiz"
     __type    = "account"
-    __version = "0.31"
+    __version = "0.32"
 
     __description = """Share-online.biz account plugin"""
     __license     = "GPLv3"
@@ -40,7 +40,7 @@ class ShareonlineBiz(Account):
         if api['a'].lower() != "not_available":
             req.cj.setCookie("share-online.biz", 'a', api['a'])
 
-            premium = api['group'] in ("Premium", "PrePaid")
+            premium = api['group'] in ("PrePaid", "Premium", "Penalty-Premium")
 
             validuntil = float(api['expire_date'])
 
diff --git a/pyload/plugin/account/UnrestrictLi.py b/pyload/plugin/account/UnrestrictLi.py
deleted file mode 100644
index d57b998ca..000000000
--- a/pyload/plugin/account/UnrestrictLi.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from pyload.plugin.Account import Account
-from pyload.utils import json_loads
-
-
-class UnrestrictLi(Account):
-    __name    = "UnrestrictLi"
-    __type    = "account"
-    __version = "0.05"
-
-    __description = """Unrestrict.li account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
-
-
-    def loadAccountInfo(self, user, req):
-        json_data = req.load('http://unrestrict.li/api/jdownloader/user.php?format=json')
-        self.logDebug("JSON data: " + json_data)
-        json_data = json_loads(json_data)
-
-        if 'vip' in json_data['result'] and json_data['result']['vip'] == 0:
-            return {"premium": False}
-
-        validuntil = json_data['result']['expires']
-        trafficleft = float(json_data['result']['traffic'])
-
-        return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
-
-
-    def login(self, user, data, req):
-        req.cj.setCookie("unrestrict.li", "lang", "EN")
-        html = req.load("https://unrestrict.li/sign_in", decode=True)
-
-        if 'solvemedia' in html:
-            self.logError(_("A Captcha is required. Go to http://unrestrict.li/sign_in and login, then retry"))
-            return
-
-        post_data = {"username": user, "password": data['password'],
-                     "remember_me": "remember", "signin": "Sign in"}
-        html = req.load("https://unrestrict.li/sign_in", post=post_data, decode=True)
-
-        if 'sign_out' not in html:
-            self.wrongPassword()