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, 34 insertions, 25 deletions

diff --git a/pyload/plugins/hook/CaptchaBrotherhood.py b/pyload/plugins/hook/CaptchaBrotherhood.py
index 79216923e..03821b8b6 100644
--- a/pyload/plugins/hook/CaptchaBrotherhood.py
+++ b/pyload/plugins/hook/CaptchaBrotherhood.py
@@ -23,48 +23,53 @@ class CaptchaBrotherhoodException(Exception):
     def __init__(self, err):
         self.err = err
 
+
     def getCode(self):
         return self.err
 
+
     def __str__(self):
         return "<CaptchaBrotherhoodException %s>" % self.err
 
+
     def __repr__(self):
         return "<CaptchaBrotherhoodException %s>" % self.err
 
 
 class CaptchaBrotherhood(Hook):
-    __name__ = "CaptchaBrotherhood"
-    __type__ = "hook"
+    __name__    = "CaptchaBrotherhood"
+    __type__    = "hook"
     __version__ = "0.05"
 
-    __config__ = [("activated", "bool", "Activated", False),
-                  ("username", "str", "Username", ""),
+    __config__ = [("username", "str", "Username", ""),
                   ("force", "bool", "Force CT even if client is connected", False),
                   ("passkey", "password", "Password", "")]
 
     __description__ = """Send captchas to CaptchaBrotherhood.com"""
-    __authors__ = [("RaNaN", "RaNaN@pyload.org"),
-                   ("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+                       ("zoidberg", "zoidberg@mujmail.cz")]
 
 
     API_URL = "http://www.captchabrotherhood.com/"
 
 
     def setup(self):
-        self.info = {}
+        self.info = {}  #@TODO: Remove in 0.4.10
+
 
     def getCredits(self):
-        response = getURL(self.API_URL + "askCredits.aspx",
-                          get={"username": self.getConfig("username"), "password": self.getConfig("passkey")})
-        if not response.startswith("OK"):
-            raise CaptchaBrotherhoodException(response)
+        res = getURL(self.API_URL + "askCredits.aspx",
+                     get={"username": self.getConfig("username"), "password": self.getConfig("passkey")})
+        if not res.startswith("OK"):
+            raise CaptchaBrotherhoodException(res)
         else:
-            credits = int(response[3:])
+            credits = int(res[3:])
             self.logInfo(_("%d credits left") % credits)
             self.info['credits'] = credits
             return credits
 
+
     def submit(self, captcha, captchaType="file", match=None):
         try:
             img = Image.open(captcha)
@@ -96,34 +101,36 @@ class CaptchaBrotherhood(Hook):
 
         try:
             req.c.perform()
-            response = req.getResponse()
+            res = req.getResponse()
         except Exception, e:
             raise CaptchaBrotherhoodException("Submit captcha image failed")
 
         req.close()
 
-        if not response.startswith("OK"):
-            raise CaptchaBrotherhoodException(response[1])
+        if not res.startswith("OK"):
+            raise CaptchaBrotherhoodException(res[1])
 
-        ticket = response[3:]
+        ticket = res[3:]
 
-        for _ in xrange(15):
+        for _i in xrange(15):
             sleep(5)
-            response = self.get_api("askCaptchaResult", ticket)
-            if response.startswith("OK-answered"):
-                return ticket, response[12:]
+            res = self.get_api("askCaptchaResult", ticket)
+            if res.startswith("OK-answered"):
+                return ticket, res[12:]
 
         raise CaptchaBrotherhoodException("No solution received in time")
 
+
     def get_api(self, api, ticket):
-        response = getURL("%s%s.aspx" % (self.API_URL, api),
+        res = getURL("%s%s.aspx" % (self.API_URL, api),
                           get={"username": self.getConfig("username"),
                                "password": self.getConfig("passkey"),
                                "captchaID": ticket})
-        if not response.startswith("OK"):
-            raise CaptchaBrotherhoodException("Unknown response: %s" % response)
+        if not res.startswith("OK"):
+            raise CaptchaBrotherhoodException("Unknown response: %s" % res)
+
+        return res
 
-        return response
 
     def newCaptchaTask(self, task):
         if "service" in task.data:
@@ -146,9 +153,11 @@ class CaptchaBrotherhood(Hook):
         else:
             self.logInfo(_("Your CaptchaBrotherhood Account has not enough credits"))
 
+
     def captchaInvalid(self, task):
         if task.data['service'] == self.__name__ and "ticket" in task.data:
-            response = self.get_api("complainCaptcha", task.data['ticket'])
+            res = self.get_api("complainCaptcha", task.data['ticket'])
+
 
     def processCaptcha(self, task):
         c = task.captchaFile