Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/hoster/NowDownloadEu.py
	module/plugins/hoster/NowDownloadSx.py
	module/plugins/hoster/NowVideoAt.py
	module/plugins/hoster/NowVideoSx.py
	pyload/plugins/account/RapidshareCom.py
	pyload/plugins/addon/ExtractArchive.py
	pyload/plugins/addon/HotFolder.py
	pyload/plugins/addon/UpdateManager.py
	pyload/plugins/hook/Captcha9kw.py
	pyload/plugins/hook/DebridItaliaCom.py
	pyload/plugins/hoster/DebridItaliaCom.py
	pyload/plugins/hoster/Keep2shareCc.py
	pyload/plugins/hoster/NetloadIn.py
	pyload/plugins/hoster/NowDownloadEu.py
	pyload/plugins/hoster/NowVideoAt.py
	pyload/plugins/hoster/RapidshareCom.py
	pyload/plugins/hoster/ShareonlineBiz.py
	pyload/plugins/internal/MultiHoster.py
	pyload/plugins/internal/SimpleHoster.py

1 files changed, 17 insertions, 14 deletions

diff --git a/pyload/plugins/hook/Captcha9kw.py b/pyload/plugins/hook/Captcha9kw.py
index fa4710542..f01f45011 100644
--- a/pyload/plugins/hook/Captcha9kw.py
+++ b/pyload/plugins/hook/Captcha9kw.py
@@ -16,18 +16,19 @@ from pyload.plugins.internal.Addon import Hook
 class Captcha9kw(Hook):
     __name__    = "Captcha9kw"
     __type__    = "hook"
-    __version__ = "0.24"
-
-    __config__ = [("ssl", "bool", "Use HTTPS", True),
-                  ("force", "bool", "Force captcha resolving even if client is connected", True),
-                  ("confirm", "bool", "Confirm Captcha (cost +6 credits)", False),
-                  ("captchaperhour", "int", "Captcha per hour", "9999"),
-                  ("prio", "int", "Priority (max 10)(cost +0 -> +10 credits)", "0"),
-                  ("queue", "int", "Max. Queue (max 999)", "50"),
-                  ("hoster_options", "string", "Hoster options (format: pluginname:prio=1:selfsolfe=1:confirm=1:timeout=900|...)", "ShareonlineBiz:prio=0:timeout=999 | UploadedTo:prio=0:timeout=999"),
-                  ("selfsolve", "bool", "Selfsolve (manually solve your captcha in your 9kw client if active)", "0"),
-                  ("passkey", "password", "API key", ""),
-                  ("timeout", "int", "Timeout in seconds (min 60, max 3999)", "900")]
+    __version__ = "0.25"
+
+    __config__ = [("ssl"           , "bool"    , "Use HTTPS"                                                                       , True                                                               ),
+                  ("force"         , "bool"    , "Force captcha resolving even if client is connected"                             , True                                                               ),
+                  ("confirm"       , "bool"    , "Confirm Captcha (cost +6 credits)"                                               , False                                                              ),
+                  ("captchaperhour", "int"     , "Captcha per hour"                                                                , "9999"                                                             ),
+                  ("captchapermin" , "int"     , "Captcha per minute"                                                              , "9999"                                                             ),
+                  ("prio"          , "int"     , "Priority (max 10)(cost +0 -> +10 credits)"                                       , "0"                                                                ),
+                  ("queue"         , "int"     , "Max. Queue (max 999)"                                                            , "50"                                                               ),
+                  ("hoster_options", "string"  , "Hoster options (format: pluginname:prio=1:selfsolfe=1:confirm=1:timeout=900|...)", "ShareonlineBiz:prio=0:timeout=999 | UploadedTo:prio=0:timeout=999"),
+                  ("selfsolve"     , "bool"    , "Selfsolve (manually solve your captcha in your 9kw client if active)"            , "0"                                                                ),
+                  ("passkey"       , "password", "API key"                                                                         , ""                                                                 ),
+                  ("timeout"       , "int"     , "Timeout in seconds (min 60, max 3999)"                                           , "900"                                                              )]
 
     __description__ = """Send captchas to 9kw.eu"""
     __license__     = "GPLv3"
@@ -52,7 +53,7 @@ class Captcha9kw(Hook):
 
         if res.isdigit():
             self.logInfo(_("%s credits left") % res)
-            credits = self.info["credits"] = int(res)
+            credits = self.info['credits'] = int(res)
             return credits
         else:
             self.logError(res)
@@ -82,7 +83,8 @@ class Captcha9kw(Hook):
                   'confirm'       : self.getConfig("confirm"),
                   'timeout'       : min(max(self.getConfig("timeout"), 300), 3999),
                   'selfsolve'     : self.getConfig("selfsolve"),
-                  'cph'           : self.getConfig("captchaperhour")}
+                  'cph'           : self.getConfig("captchaperhour"),
+                  'cpm'           : self.getConfig("captchapermin")}
 
         for opt in str(self.getConfig("hoster_options").split('|')):
 
@@ -109,6 +111,7 @@ class Captcha9kw(Hook):
                      'maxtimeout'    : option['timeout'],
                      'selfsolve'     : option['selfsolve'],
                      'captchaperhour': option['cph'],
+                     'captchapermin' : option['cpm'],
                      'case-sensitive': option['case_sensitive'],
                      'min_len'       : option['min'],
                      'max_len'       : option['max'],