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, 35 insertions, 56 deletions

diff --git a/pyload/plugins/hoster/LetitbitNet.py b/pyload/plugins/hoster/LetitbitNet.py
index f1256f53a..16f01bf06 100644
--- a/pyload/plugins/hoster/LetitbitNet.py
+++ b/pyload/plugins/hoster/LetitbitNet.py
@@ -9,6 +9,7 @@
 import re
 
 from urllib import urlencode, urlopen
+from urlparse import urljoin
 
 from pyload.utils import json_loads, json_dumps
 from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight
@@ -34,28 +35,27 @@ def getInfo(urls):
 
 
 class LetitbitNet(SimpleHoster):
-    __name__ = "LetitbitNet"
-    __type__ = "hoster"
-    __version__ = "0.24"
+    __name__    = "LetitbitNet"
+    __type__    = "hoster"
+    __version__ = "0.26"
 
-    __pattern__ = r'http://(?:www\.)?(letitbit|shareflare).net/download/.*'
+    __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.*'
 
     __description__ = """Letitbit.net hoster plugin"""
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("z00nx", "z00nx0@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("z00nx", "z00nx0@gmail.com")]
 
 
-    FILE_URL_REPLACEMENTS = [(r"(?<=http://)([^/]+)", "letitbit.net")]
-
-    HOSTER_NAME = "letitbit.net"
+    URL_REPLACEMENTS = [(r"(?<=http://)([^/]+)", "letitbit.net")]
 
     SECONDS_PATTERN = r'seconds\s*=\s*(\d+);'
-    CAPTCHA_CONTROL_FIELD = r"recaptcha_control_field\s=\s'(?P<value>[^']+)'"
+    CAPTCHA_CONTROL_FIELD = r'recaptcha_control_field\s=\s\'(?P<value>.+?)\''
 
 
     def setup(self):
         self.resumeDownload = True
-        #TODO confirm that resume works
+
 
     def getFileInfo(self):
         api_rep = api_download_info(self.pyfile.url)
@@ -66,33 +66,17 @@ class LetitbitNet(SimpleHoster):
         else:
             self.offline()
 
+
     def handleFree(self):
         action, inputs = self.parseHtmlForm('id="ifree_form"')
         if not action:
-            self.parseError("page 1 / ifree_form")
+            self.error(_("ifree_form"))
 
-        domain = "http://www." + self.HOSTER_NAME
         self.pyfile.size = float(inputs['sssize'])
         self.logDebug(action, inputs)
         inputs['desc'] = ""
 
-        self.html = self.load(domain + action, post=inputs, cookies=True)
-
-        # action, inputs = self.parseHtmlForm('id="d3_form"')
-        # if not action:
-        #     self.parseError("page 2 / d3_form")
-        # self.logDebug(action, inputs)
-        #
-        # self.html = self.load(action, post = inputs, cookies = True)
-        #
-        # try:
-        #     ajax_check_url, captcha_url = re.search(self.CHECK_URL_PATTERN, self.html).groups()
-        #     m = re.search(self.SECONDS_PATTERN, self.html)
-        #     seconds = int(m.group(1)) if m else 60
-        #     self.wait(seconds+1)
-        # except Exception, e:
-        #     self.logError(e)
-        #     self.parseError("page 3 / js")
+        self.html = self.load(urljoin("http://letitbit.net/", action), post=inputs, cookies=True)
 
         m = re.search(self.SECONDS_PATTERN, self.html)
         seconds = int(m.group(1)) if m else 60
@@ -100,53 +84,48 @@ class LetitbitNet(SimpleHoster):
         m = re.search(self.CAPTCHA_CONTROL_FIELD, self.html)
         recaptcha_control_field = m.group(1)
         self.logDebug("ReCaptcha control field found", recaptcha_control_field)
-        self.wait(seconds + 1)
+        self.wait(seconds)
 
-        response = self.load("%s/ajax/download3.php" % domain, post=" ", cookies=True)
-        if response != '1':
-            self.parseError('Unknown response - ajax_check_url')
-        self.logDebug(response)
+        res = self.load("http://letitbit.net/ajax/download3.php", post=" ", cookies=True)
+        if res != '1':
+            self.error(_("Unknown response - ajax_check_url"))
+        self.logDebug(res)
 
         recaptcha = ReCaptcha(self)
+        challenge, response = recaptcha.challenge()
 
-        captcha_key = recaptcha.detect_key()
-        if captcha_key is None:
-            self.parseError("ReCaptcha key not found")
-
-        challenge, response = recaptcha.challenge(captcha_key)
-
-        post_data = {"recaptcha_challenge_field": challenge, "recaptcha_response_field": response,
+        post_data = {"recaptcha_challenge_field": challenge,
+                     "recaptcha_response_field": response,
                      "recaptcha_control_field": recaptcha_control_field}
         self.logDebug("Post data to send", post_data)
-        response = self.load('%s/ajax/check_recaptcha.php' % domain, post=post_data, cookies=True)
-        self.logDebug(response)
-        if not response:
+        res = self.load("http://letitbit.net/ajax/check_recaptcha.php", post=post_data, cookies=True)
+        self.logDebug(res)
+        if not res:
             self.invalidCaptcha()
-        if response == "error_free_download_blocked":
-            self.logWarning("Daily limit reached")
+        if res == "error_free_download_blocked":
+            self.logWarning(_("Daily limit reached"))
             self.wait(secondsToMidnight(gmt=2), True)
-        if response == "error_wrong_captcha":
-            self.logError("Wrong Captcha")
+        if res == "error_wrong_captcha":
             self.invalidCaptcha()
             self.retry()
-        elif response.startswith('['):
-            urls = json_loads(response)
-        elif response.startswith('http://'):
-            urls = [response]
+        elif res.startswith('['):
+            urls = json_loads(res)
+        elif res.startswith('http://'):
+            urls = [res]
         else:
-            self.parseError("Unknown response - captcha check")
+            self.error(_("Unknown response - captcha check"))
 
         self.correctCaptcha()
 
         for download_url in urls:
             try:
-                self.logDebug("Download URL", download_url)
                 self.download(download_url)
                 break
             except Exception, e:
                 self.logError(e)
         else:
-            self.fail("Download did not finish correctly")
+            self.fail(_("Download did not finish correctly"))
+
 
     def handlePremium(self):
         api_key = self.user