Merge branch 'stable' into 0.4.10

Conflicts:
	module/PluginThread.py
	module/plugins/hoster/XFileSharingPro.py
	module/plugins/internal/CaptchaService.py
	pyload/api/__init__.py
	pyload/manager/AccountManager.py
	pyload/manager/AddonManager.py
	pyload/manager/CaptchaManager.py
	pyload/manager/PluginManager.py
	pyload/network/HTTPRequest.py
	pyload/network/XDCCRequest.py
	pyload/plugins/Plugin.py
	pyload/plugins/account/EasybytezCom.py
	pyload/plugins/crypter/C1neonCom.py
	pyload/plugins/crypter/CryptItCom.py
	pyload/plugins/crypter/DuploadOrg.py
	pyload/plugins/crypter/FilebeerInfo.py
	pyload/plugins/crypter/FilesonicCom.py
	pyload/plugins/crypter/FiredriveCom.py
	pyload/plugins/crypter/HotfileCom.py
	pyload/plugins/crypter/ILoadTo.py
	pyload/plugins/crypter/LofCc.py
	pyload/plugins/crypter/MBLinkInfo.py
	pyload/plugins/crypter/MegauploadCom.py
	pyload/plugins/crypter/Movie2kTo.py
	pyload/plugins/crypter/MultiuploadCom.py
	pyload/plugins/crypter/OronCom.py
	pyload/plugins/crypter/RSLayerCom.py
	pyload/plugins/crypter/SecuredIn.py
	pyload/plugins/crypter/SharingmatrixCom.py
	pyload/plugins/crypter/SpeedLoadOrg.py
	pyload/plugins/crypter/StealthTo.py
	pyload/plugins/crypter/TrailerzoneInfo.py
	pyload/plugins/crypter/WiiReloadedOrg.py
	pyload/plugins/crypter/WuploadCom.py
	pyload/plugins/internal/Account.py
	pyload/plugins/internal/Addon.py
	pyload/plugins/internal/BasePlugin.py
	pyload/plugins/internal/Container.py
	pyload/plugins/internal/Crypter.py
	pyload/plugins/internal/DeadCrypter.py
	pyload/plugins/internal/DeadHoster.py
	pyload/plugins/internal/Hoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/utils/__init__.py

2 files changed, 76 insertions, 0 deletions

diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
new file mode 100644
index 000000000..0acad3dba
--- /dev/null
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
+
+
+class XFileSharingPro(XFSHoster):
+    __name__    = "XFileSharingPro"
+    __type__    = "hoster"
+    __version__ = "0.43"
+
+    __pattern__ = r'^unmatchable$'
+
+    __description__ = """XFileSharingPro dummy hoster plugin for hook"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    URL_REPLACEMENTS = [("/embed-", "/")]
+
+
+    def _log(self, type, args):
+        msg = " | ".join([str(a).strip() for a in args if a])
+        logger = getattr(self.log, type)
+        logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
+
+
+    def init(self):
+        super(XFileSharingPro, self).init()
+
+        self.__pattern__ = self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
+
+        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group(1).lower()
+        self.HOSTER_NAME = "".join([str.capitalize() for str in self.HOSTER_DOMAIN.split('.')])
+
+        account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME)
+
+        if account and account.canUse():
+            self.account = account
+        elif self.account:
+            self.account.HOSTER_DOMAIN = self.HOSTER_DOMAIN
+        else:
+            return
+
+        self.user, data = self.account.selectAccount()
+        self.req = self.account.getAccountRequest(self.user)
+        self.premium = self.account.isPremium(self.user)
+
+
+    def setup(self):
+        self.chunkLimit = 1
+        self.resumeDownload = self.premium
+        self.multiDL = True
+
+
+getInfo = create_getInfo(XFileSharingPro)
diff --git a/module/plugins/hoster/ZShareNet.py b/module/plugins/hoster/ZShareNet.py
new file mode 100644
index 000000000..dc96facbe
--- /dev/null
+++ b/module/plugins/hoster/ZShareNet.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
+
+
+class ZShareNet(DeadHoster):
+    __name__    = "ZShareNet"
+    __type__    = "hoster"
+    __version__ = "0.21"
+
+    __pattern__ = r'https?://(?:ww[2w]\.)?zshares?\.net/.+'
+
+    __description__ = """ZShare.net hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("espes", None),
+                       ("Cptn Sandwich", None)]
+
+
+getInfo = create_getInfo(ZShareNet)