Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/internal/CaptchaService.py
	pyload/plugins/account/CyberlockerCh.py
	pyload/plugins/account/EgoFilesCom.py
	pyload/plugins/account/HotfileCom.py
	pyload/plugins/crypter/HotfileFolderCom.py
	pyload/plugins/crypter/LinkSaveIn.py
	pyload/plugins/crypter/OneKhDe.py
	pyload/plugins/hoster/EgoFilesCom.py
	pyload/plugins/internal/XFSPAccount.py

1 files changed, 0 insertions, 44 deletions

diff --git a/pyload/plugins/account/EgoFilesCom.py b/pyload/plugins/account/EgoFilesCom.py
deleted file mode 100644
index 8947d24c7..000000000
--- a/pyload/plugins/account/EgoFilesCom.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import time
-
-from pyload.plugins.base.Account import Account
-from pyload.utils import parseFileSize
-
-
-class EgoFilesCom(Account):
-    __name__ = "EgoFilesCom"
-    __type__ = "account"
-    __version__ = "0.2"
-
-    __description__ = """Egofiles.com account plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
-
-    PREMIUM_ACCOUNT_PATTERN = '<br/>\s*Premium: (?P<P>[^/]*) / Traffic left: (?P<T>[\d.]*) (?P<U>\w*)\s*\\n\s*<br/>'
-
-
-    def loadAccountInfo(self, user, req):
-        html = req.load("http://egofiles.com")
-        if 'You are logged as a Free User' in html:
-            return {"premium": False, "validuntil": None, "trafficleft": None}
-
-        m = re.search(self.PREMIUM_ACCOUNT_PATTERN, html)
-        if m:
-            validuntil = int(time.mktime(time.strptime(m.group('P'), "%Y-%m-%d %H:%M:%S")))
-            trafficleft = parseFileSize(m.group('T'), m.group('U')) / 1024
-            return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
-        else:
-            self.logError("Unable to retrieve account information - Plugin may be out of date")
-
-    def login(self, user, data, req):
-        # Set English language
-        req.load("https://egofiles.com/ajax/lang.php?lang=en", just_header=True)
-
-        html = req.load("http://egofiles.com/ajax/register.php",
-                        post={"log": 1,
-                              "loginV": user,
-                              "passV": data['password']})
-        if 'Login successful' not in html:
-            self.wrongPassword()