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, 21 insertions, 23 deletions

diff --git a/pyload/plugins/hoster/CrockoCom.py b/pyload/plugins/hoster/CrockoCom.py
index 81566e10c..012fb7f0b 100644
--- a/pyload/plugins/hoster/CrockoCom.py
+++ b/pyload/plugins/hoster/CrockoCom.py
@@ -7,34 +7,35 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class CrockoCom(SimpleHoster):
-    __name__ = "CrockoCom"
-    __type__ = "hoster"
-    __version__ = "0.16"
+    __name__    = "CrockoCom"
+    __type__    = "hoster"
+    __version__ = "0.17"
 
-    __pattern__ = r'http://(?:www\.)?(crocko|easy-share).com/\w+'
+    __pattern__ = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+'
 
     __description__ = """Crocko hoster plugin"""
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    FILE_NAME_PATTERN = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)'
-    FILE_SIZE_PATTERN = r'<span class="tip1"><span class="inner">(?P<S>[^<]+)</span></span>'
-    OFFLINE_PATTERN = r"<h1>Sorry,<br />the page you're looking for <br />isn't here.</h1>|File not found"
+    NAME_PATTERN = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)'
+    SIZE_PATTERN = r'<span class="tip1"><span class="inner">(?P<S>[^<]+)</span></span>'
+    OFFLINE_PATTERN = r'<h1>Sorry,<br />the page you\'re looking for <br />isn\'t here.</h1>|File not found'
 
-    CAPTCHA_URL_PATTERN = re.compile(r"u='(/file_contents/captcha/\w+)';\s*w='(\d+)';")
+    CAPTCHA_PATTERN = re.compile(r"u='(/file_contents/captcha/\w+)';\s*w='(\d+)';")
 
     FORM_PATTERN = r'<form  method="post" action="([^"]+)">(.*?)</form>'
     FORM_INPUT_PATTERN = r'<input[^>]* name="?([^" ]+)"? value="?([^" ]+)"?[^>]*>'
 
-    FILE_NAME_REPLACEMENTS = [(r'<[^>]*>', '')]
+    NAME_REPLACEMENTS = [(r'<[^>]*>', '')]
 
 
     def handleFree(self):
         if "You need Premium membership to download this file." in self.html:
-            self.fail("You need Premium membership to download this file.")
+            self.fail(_("You need Premium membership to download this file"))
 
-        for _ in xrange(5):
-            m = re.search(self.CAPTCHA_URL_PATTERN, self.html)
+        for _i in xrange(5):
+            m = re.search(self.CAPTCHA_PATTERN, self.html)
             if m:
                 url, wait_time = 'http://crocko.com' + m.group(1), m.group(2)
                 self.wait(wait_time)
@@ -42,19 +43,16 @@ class CrockoCom(SimpleHoster):
             else:
                 break
 
-        recaptcha = ReCaptcha(self)
-        captcha_key = recaptcha.detect_key()
-        if captcha_key is None:
-            self.parseError("ReCaptcha captcha key not found")
-
-        m = re.search(self.FORM_PATTERN, self.html, re.DOTALL)
+        m = re.search(self.FORM_PATTERN, self.html, re.S)
         if m is None:
-            self.parseError('ACTION')
+            self.error(_("FORM_PATTERN not found"))
+
         action, form = m.groups()
         inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form))
+        recaptcha = ReCaptcha(self)
 
-        for _ in xrange(5):
-            inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(captcha_key)
+        for _i in xrange(5):
+            inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge()
             self.download(action, post=inputs)
 
             check = self.checkDownload({
@@ -66,7 +64,7 @@ class CrockoCom(SimpleHoster):
             else:
                 break
         else:
-            self.fail('No valid captcha solution received')
+            self.fail(_("No valid captcha solution received"))
 
 
 getInfo = create_getInfo(CrockoCom)