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, 45 insertions, 31 deletions

diff --git a/pyload/plugins/hook/DeathByCaptcha.py b/pyload/plugins/hook/DeathByCaptcha.py
index 293326d86..f3e4bb808 100644
--- a/pyload/plugins/hook/DeathByCaptcha.py
+++ b/pyload/plugins/hook/DeathByCaptcha.py
@@ -25,45 +25,51 @@ class DeathByCaptchaException(Exception):
                   'invalid-request': 'Invalid request',
                   'timed-out': 'No CAPTCHA solution received in time'}
 
+
     def __init__(self, err):
         self.err = err
 
+
     def getCode(self):
         return self.err
 
+
     def getDesc(self):
         if self.err in self.DBC_ERRORS.keys():
             return self.DBC_ERRORS[self.err]
         else:
             return self.err
 
+
     def __str__(self):
         return "<DeathByCaptchaException %s>" % self.err
 
+
     def __repr__(self):
         return "<DeathByCaptchaException %s>" % self.err
 
 
 class DeathByCaptcha(Hook):
-    __name__ = "DeathByCaptcha"
-    __type__ = "hook"
+    __name__    = "DeathByCaptcha"
+    __type__    = "hook"
     __version__ = "0.03"
 
-    __config__ = [("activated", "bool", "Activated", False),
-                  ("username", "str", "Username", ""),
+    __config__ = [("username", "str", "Username", ""),
                   ("passkey", "password", "Password", ""),
                   ("force", "bool", "Force DBC even if client is connected", False)]
 
     __description__ = """Send captchas to DeathByCaptcha.com"""
-    __authors__ = [("RaNaN", "RaNaN@pyload.org"),
-                   ("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+                       ("zoidberg", "zoidberg@mujmail.cz")]
 
 
     API_URL = "http://api.dbcapi.me/api/"
 
 
     def setup(self):
-        self.info = {}
+        self.info = {}  #@TODO: Remove in 0.4.10
+
 
     def call_api(self, api="captcha", post=False, multipart=False):
         req = getRequest()
@@ -75,18 +81,18 @@ class DeathByCaptcha(Hook):
             post.update({"username": self.getConfig("username"),
                          "password": self.getConfig("passkey")})
 
-        response = None
+        res = None
         try:
             json = req.load("%s%s" % (self.API_URL, api),
                             post=post,
                             multipart=multipart)
             self.logDebug(json)
-            response = json_loads(json)
+            res = json_loads(json)
 
-            if "error" in response:
-                raise DeathByCaptchaException(response['error'])
-            elif "status" not in response:
-                raise DeathByCaptchaException(str(response))
+            if "error" in res:
+                raise DeathByCaptchaException(res['error'])
+            elif "status" not in res:
+                raise DeathByCaptchaException(str(res))
 
         except BadHeader, e:
             if 403 == e.code:
@@ -103,27 +109,30 @@ class DeathByCaptcha(Hook):
         finally:
             req.close()
 
-        return response
+        return res
+
 
     def getCredits(self):
-        response = self.call_api("user", True)
+        res = self.call_api("user", True)
 
-        if 'is_banned' in response and response['is_banned']:
+        if 'is_banned' in res and res['is_banned']:
             raise DeathByCaptchaException('banned')
-        elif 'balance' in response and 'rate' in response:
-            self.info.update(response)
+        elif 'balance' in res and 'rate' in res:
+            self.info.update(res)
         else:
-            raise DeathByCaptchaException(response)
+            raise DeathByCaptchaException(res)
+
 
     def getStatus(self):
-        response = self.call_api("status", False)
+        res = self.call_api("status", False)
 
-        if 'is_service_overloaded' in response and response['is_service_overloaded']:
+        if 'is_service_overloaded' in res and res['is_service_overloaded']:
             raise DeathByCaptchaException('service-overload')
 
+
     def submit(self, captcha, captchaType="file", match=None):
         #workaround multipart-post bug in HTTPRequest.py
-        if re.match("^[A-Za-z0-9]*$", self.getConfig("passkey")):
+        if re.match("^\w*$", self.getConfig("passkey")):
             multipart = True
             data = (FORM_FILE, captcha)
         else:
@@ -132,25 +141,26 @@ class DeathByCaptcha(Hook):
                 data = f.read()
             data = "base64:" + b64encode(data)
 
-        response = self.call_api("captcha", {"captchafile": data}, multipart)
+        res = self.call_api("captcha", {"captchafile": data}, multipart)
 
-        if "captcha" not in response:
-            raise DeathByCaptchaException(response)
-        ticket = response['captcha']
+        if "captcha" not in res:
+            raise DeathByCaptchaException(res)
+        ticket = res['captcha']
 
-        for _ in xrange(24):
+        for _i in xrange(24):
             sleep(5)
-            response = self.call_api("captcha/%d" % ticket, False)
-            if response['text'] and response['is_correct']:
+            res = self.call_api("captcha/%d" % ticket, False)
+            if res['text'] and res['is_correct']:
                 break
         else:
             raise DeathByCaptchaException('timed-out')
 
-        result = response['text']
+        result = res['text']
         self.logDebug("Result %s : %s" % (ticket, result))
 
         return ticket, result
 
+
     def newCaptchaTask(self, task):
         if "service" in task.data:
             return False
@@ -182,15 +192,19 @@ class DeathByCaptcha(Hook):
             task.setWaiting(180)
             start_new_thread(self.processCaptcha, (task,))
 
+
     def captchaInvalid(self, task):
         if task.data['service'] == self.__name__ and "ticket" in task.data:
             try:
-                response = self.call_api("captcha/%d/report" % task.data['ticket'], True)
+                res = self.call_api("captcha/%d/report" % task.data['ticket'], True)
+
             except DeathByCaptchaException, e:
                 self.logError(e.getDesc())
+
             except Exception, e:
                 self.logError(e)
 
+
     def processCaptcha(self, task):
         c = task.captchaFile
         try: