Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/MegaRapidCz.py
	module/plugins/accounts/ShareRapidCom.py
	module/plugins/crypter/HotfileComFolder.py
	module/plugins/crypter/HotfileFolderCom.py
	module/plugins/hoster/Keep2shareCC.py
	module/plugins/hoster/Keep2shareCc.py
	module/plugins/hoster/MegaCoNz.py
	module/plugins/hoster/MegaNz.py
	module/plugins/hoster/MegaRapidCz.py
	module/plugins/hoster/ShareRapidCom.py
	module/plugins/internal/CaptchaService.py
	pyload/api/__init__.py
	pyload/manager/AccountManager.py
	pyload/manager/PluginManager.py
	pyload/manager/thread/PluginThread.py
	pyload/network/HTTPRequest.py
	pyload/network/XDCCRequest.py
	pyload/plugins/Plugin.py
	pyload/plugins/account/BillionuploadsCom.py
	pyload/plugins/account/CramitIn.py
	pyload/plugins/account/EasybytezCom.py
	pyload/plugins/account/FastshareCz.py
	pyload/plugins/account/File4safeCom.py
	pyload/plugins/account/FileParadoxIn.py
	pyload/plugins/account/FileomCom.py
	pyload/plugins/account/FilerNet.py
	pyload/plugins/account/FilerioCom.py
	pyload/plugins/account/FourSharedCom.py
	pyload/plugins/account/Ftp.py
	pyload/plugins/account/Http.py
	pyload/plugins/account/HugefilesNet.py
	pyload/plugins/account/HundredEightyUploadCom.py
	pyload/plugins/account/LomafileCom.py
	pyload/plugins/account/MovReelCom.py
	pyload/plugins/account/MultishareCz.py
	pyload/plugins/account/MyfastfileCom.py
	pyload/plugins/account/NosuploadCom.py
	pyload/plugins/account/NovafileCom.py
	pyload/plugins/account/QuickshareCz.py
	pyload/plugins/account/RarefileNet.py
	pyload/plugins/account/RyushareCom.py
	pyload/plugins/account/SecureUploadEu.py
	pyload/plugins/account/SendmywayCom.py
	pyload/plugins/account/ShareRapidCom.py
	pyload/plugins/account/StahnuTo.py
	pyload/plugins/account/StreamcloudEu.py
	pyload/plugins/account/TusfilesNet.py
	pyload/plugins/account/UploadingCom.py
	pyload/plugins/account/UptoboxCom.py
	pyload/plugins/account/VidPlayNet.py
	pyload/plugins/addon/Checksum.py
	pyload/plugins/addon/ClickAndLoad.py
	pyload/plugins/addon/DeleteFinished.py
	pyload/plugins/addon/DownloadScheduler.py
	pyload/plugins/addon/ExternalScripts.py
	pyload/plugins/addon/ExtractArchive.py
	pyload/plugins/addon/HotFolder.py
	pyload/plugins/addon/IRCInterface.py
	pyload/plugins/addon/MergeFiles.py
	pyload/plugins/addon/MultiHome.py
	pyload/plugins/addon/RestartFailed.py
	pyload/plugins/addon/UnSkipOnFail.py
	pyload/plugins/addon/WindowsPhoneToastNotify.py
	pyload/plugins/addon/XMPPInterface.py
	pyload/plugins/base/Container.py
	pyload/plugins/base/Crypter.py
	pyload/plugins/base/Hook.py
	pyload/plugins/base/OCR.py
	pyload/plugins/container/RSDF.py
	pyload/plugins/crypter/DuploadOrgFolder.py
	pyload/plugins/crypter/EasybytezComFolder.py
	pyload/plugins/crypter/FiredriveComFolder.py
	pyload/plugins/crypter/HotfileFolderCom.py
	pyload/plugins/crypter/LinkSaveIn.py
	pyload/plugins/crypter/MultiuploadCom.py
	pyload/plugins/crypter/ShareRapidComFolder.py
	pyload/plugins/crypter/TusfilesNetFolder.py
	pyload/plugins/crypter/UploadableChFolder.py
	pyload/plugins/crypter/UploadedToFolder.py
	pyload/plugins/hook/Captcha9kw.py
	pyload/plugins/hook/MyfastfileCom.py
	pyload/plugins/hoster/BillionuploadsCom.py
	pyload/plugins/hoster/CramitIn.py
	pyload/plugins/hoster/EasybytezCom.py
	pyload/plugins/hoster/File4safeCom.py
	pyload/plugins/hoster/FileParadoxIn.py
	pyload/plugins/hoster/FilefactoryCom.py
	pyload/plugins/hoster/FileomCom.py
	pyload/plugins/hoster/FilerioCom.py
	pyload/plugins/hoster/FileshareInUa.py
	pyload/plugins/hoster/FiredriveCom.py
	pyload/plugins/hoster/Ftp.py
	pyload/plugins/hoster/HugefilesNet.py
	pyload/plugins/hoster/HundredEightyUploadCom.py
	pyload/plugins/hoster/Keep2shareCC.py
	pyload/plugins/hoster/LoadTo.py
	pyload/plugins/hoster/LomafileCom.py
	pyload/plugins/hoster/MegaNz.py
	pyload/plugins/hoster/MegacrypterCom.py
	pyload/plugins/hoster/MovReelCom.py
	pyload/plugins/hoster/MyvideoDe.py
	pyload/plugins/hoster/NosuploadCom.py
	pyload/plugins/hoster/NovafileCom.py
	pyload/plugins/hoster/PandaPlaNet.py
	pyload/plugins/hoster/PremiumTo.py
	pyload/plugins/hoster/RarefileNet.py
	pyload/plugins/hoster/RyushareCom.py
	pyload/plugins/hoster/SecureUploadEu.py
	pyload/plugins/hoster/SendmywayCom.py
	pyload/plugins/hoster/ShareRapidCom.py
	pyload/plugins/hoster/SockshareCom.py
	pyload/plugins/hoster/StreamcloudEu.py
	pyload/plugins/hoster/TurbobitNet.py
	pyload/plugins/hoster/TusfilesNet.py
	pyload/plugins/hoster/UptoboxCom.py
	pyload/plugins/hoster/VidPlayNet.py
	pyload/plugins/hoster/WebshareCz.py
	pyload/plugins/internal/DeadCrypter.py
	pyload/plugins/internal/DeadHoster.py
	pyload/plugins/internal/MultiHoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/SimpleHoster.py
	pyload/plugins/internal/UpdateManager.py
	pyload/plugins/internal/XFSPAccount.py
	pyload/plugins/internal/XFSPHoster.py
	pyload/utils/__init__.py
	pyload/utils/packagetools.py
	pyload/webui/app/cnl.py

1 files changed, 0 insertions, 69 deletions

diff --git a/pyload/plugins/hoster/ShareRapidCom.py b/pyload/plugins/hoster/ShareRapidCom.py
deleted file mode 100644
index 0a56fa54d..000000000
--- a/pyload/plugins/hoster/ShareRapidCom.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from pycurl import HTTPHEADER
-
-from pyload.network.RequestFactory import getRequest
-from pyload.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
-
-
-def getInfo(urls):
-    h = getRequest()
-    h.c.setopt(HTTPHEADER,
-               ["Accept: text/html",
-                "User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0"])
-    for url in urls:
-        html = h.load(url, decode=True)
-        file_info = parseFileInfo(ShareRapidCom, url, html)
-        yield file_info
-
-
-class ShareRapidCom(SimpleHoster):
-    __name__ = "ShareRapidCom"
-    __type__ = "hoster"
-    __version__ = "0.54"
-
-    __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+'
-
-    __description__ = """MegaRapid.cz hoster plugin"""
-    __authors__ = [("MikyWoW", "mikywow@seznam.cz"),
-                   ("zoidberg", "zoidberg@mujmail.cz"),
-                   ("stickell", "l.stickell@yahoo.it"),
-                   ("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    FILE_NAME_PATTERN = r'<h1[^>]*><span[^>]*>(?:<a[^>]*>)?(?P<N>[^<]+)'
-    FILE_SIZE_PATTERN = r'<td class="i">Velikost:</td>\s*<td class="h"><strong>\s*(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</strong></td>'
-    OFFLINE_PATTERN = ur'Nastala chyba 404|Soubor byl smazán'
-
-    FORCE_CHECK_TRAFFIC = True
-
-    LINK_PATTERN = r'<a href="([^"]+)" title="Stahnout">([^<]+)</a>'
-    ERR_LOGIN_PATTERN = ur'<div class="error_div"><strong>Stahování je přístupné pouze přihlášeným uživatelům'
-    ERR_CREDIT_PATTERN = ur'<div class="error_div"><strong>Stahování zdarma je možné jen přes náš'
-
-
-    def setup(self):
-        self.chunkLimit = 1
-
-    def handlePremium(self):
-        try:
-            self.html = self.load(self.pyfile.url, decode=True)
-        except BadHeader, e:
-            self.account.relogin(self.user)
-            self.retry(max_tries=3, reason=str(e))
-
-        m = re.search(self.LINK_PATTERN, self.html)
-        if m:
-            link = m.group(1)
-            self.logDebug("Premium link: %s" % link)
-            self.download(link, disposition=True)
-        else:
-            if re.search(self.ERR_LOGIN_PATTERN, self.html):
-                self.relogin(self.user)
-                self.retry(max_tries=3, reason="User login failed")
-            elif re.search(self.ERR_CREDIT_PATTERN, self.html):
-                self.fail("Not enough credit left")
-            else:
-                self.fail("Download link not found")