Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/hooks/ClickAndLoad.py
	module/plugins/internal/CaptchaService.py
	pyload/plugins/addon/Checksum.py
	pyload/plugins/addon/DownloadScheduler.py
	pyload/plugins/addon/ExternalScripts.py
	pyload/plugins/addon/ExtractArchive.py
	pyload/plugins/addon/IRCInterface.py
	pyload/plugins/addon/MergeFiles.py
	pyload/plugins/addon/MultiHome.py
	pyload/plugins/addon/SkipRev.py
	pyload/plugins/addon/UnSkipOnFail.py
	pyload/plugins/addon/WindowsPhoneToastNotify.py
	pyload/plugins/container/CCF.py
	pyload/plugins/hook/BypassCaptcha.py
	pyload/plugins/hook/Captcha9kw.py
	pyload/plugins/hook/CaptchaBrotherhood.py
	pyload/plugins/hook/DeathByCaptcha.py
	pyload/plugins/hook/ExpertDecoders.py
	pyload/plugins/hook/ImageTyperz.py
	pyload/plugins/hoster/DlFreeFr.py
	pyload/plugins/internal/OCR.py

9 files changed, 23 insertions, 23 deletions

diff --git a/pyload/plugins/account/DepositfilesCom.py b/pyload/plugins/account/DepositfilesCom.py
index df3ebe4f2..688fcc505 100644
--- a/pyload/plugins/account/DepositfilesCom.py
+++ b/pyload/plugins/account/DepositfilesCom.py
@@ -10,7 +10,7 @@ from pyload.plugins.internal.Account import Account
 class DepositfilesCom(Account):
     __name__    = "DepositfilesCom"
     __type__    = "account"
-    __version__ = "0.3"
+    __version__ = "0.30"
 
     __description__ = """Depositfiles.com account plugin"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/account/FilesMailRu.py b/pyload/plugins/account/FilesMailRu.py
index bfd9d7ffb..b42a7c559 100644
--- a/pyload/plugins/account/FilesMailRu.py
+++ b/pyload/plugins/account/FilesMailRu.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.Account import Account
 class FilesMailRu(Account):
     __name__    = "FilesMailRu"
     __type__    = "account"
-    __version__ = "0.1"
+    __version__ = "0.10"
 
     __description__ = """Filesmail.ru account plugin"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/account/FileserveCom.py b/pyload/plugins/account/FileserveCom.py
index 5a014ab03..8c570b575 100644
--- a/pyload/plugins/account/FileserveCom.py
+++ b/pyload/plugins/account/FileserveCom.py
@@ -9,7 +9,7 @@ from pyload.utils import json_loads
 class FileserveCom(Account):
     __name__    = "FileserveCom"
     __type__    = "account"
-    __version__ = "0.2"
+    __version__ = "0.20"
 
     __description__ = """Fileserve.com account plugin"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/account/KingfilesNet.py b/pyload/plugins/account/KingfilesNet.py
index d49c7a320..b2d7d122a 100644
--- a/pyload/plugins/account/KingfilesNet.py
+++ b/pyload/plugins/account/KingfilesNet.py
@@ -36,17 +36,17 @@ class KingfilesNet(SimpleHoster):
 
     def handleFree(self):
         # Click the free user button
-        post_data = {'op': "download1",
-                     'usr_login': "",
-                     'id': self.info['pattern']['ID'],
-                     'fname': self.pyfile.name,
-                     'referer': "",
+        post_data = {'op'         : "download1",
+                     'usr_login'  : "",
+                     'id'         : self.info['pattern']['ID'],
+                     'fname'      : self.pyfile.name,
+                     'referer'    : "",
                      'method_free': "+"}
 
         self.html = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True)
 
         solvemedia = SolveMedia(self)
-        captcha_challenge, captcha_response = solvemedia.challenge()
+        challenge, response = solvemedia.challenge()
 
         # Make the downloadlink appear and load the file
         m = re.search(self.RAND_ID_PATTERN, self.html)
@@ -56,15 +56,15 @@ class KingfilesNet(SimpleHoster):
         rand = m.group(1)
         self.logDebug("rand = ", rand)
 
-        post_data = {'op': "download2",
-                     'id': self.info['pattern']['ID'],
-                     'rand': rand,
-                     'referer': self.pyfile.url,
-                     'method_free': "+",
-                     'method_premium': "",
-                     'adcopy_response': captcha_response,
-                     'adcopy_challenge': captcha_challenge,
-                     'down_direct': "1"}
+        post_data = {'op'              : "download2",
+                     'id'              : self.info['pattern']['ID'],
+                     'rand'            : rand,
+                     'referer'         : self.pyfile.url,
+                     'method_free'     : "+",
+                     'method_premium'  : "",
+                     'adcopy_response' : response,
+                     'adcopy_challenge': challenge,
+                     'down_direct'     : "1"}
 
         self.html = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True)
 
diff --git a/pyload/plugins/account/MegaDebridEu.py b/pyload/plugins/account/MegaDebridEu.py
index 3db0caa35..390cc232e 100644
--- a/pyload/plugins/account/MegaDebridEu.py
+++ b/pyload/plugins/account/MegaDebridEu.py
@@ -7,7 +7,7 @@ from pyload.utils import json_loads
 class MegaDebridEu(Account):
     __name__    = "MegaDebridEu"
     __type__    = "account"
-    __version__ = "0.2"
+    __version__ = "0.20"
 
     __description__ = """mega-debrid.eu account plugin"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/account/RPNetBiz.py b/pyload/plugins/account/RPNetBiz.py
index 417ca14a4..70622ff45 100644
--- a/pyload/plugins/account/RPNetBiz.py
+++ b/pyload/plugins/account/RPNetBiz.py
@@ -7,7 +7,7 @@ from pyload.utils import json_loads
 class RPNetBiz(Account):
     __name__    = "RPNetBiz"
     __type__    = "account"
-    __version__ = "0.1"
+    __version__ = "0.10"
 
     __description__ = """RPNet.biz account plugin"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/account/RehostTo.py b/pyload/plugins/account/RehostTo.py
index 070cdda3a..23c1eeda1 100644
--- a/pyload/plugins/account/RehostTo.py
+++ b/pyload/plugins/account/RehostTo.py
@@ -6,7 +6,7 @@ from pyload.plugins.internal.Account import Account
 class RehostTo(Account):
     __name__    = "RehostTo"
     __type__    = "account"
-    __version__ = "0.1"
+    __version__ = "0.10"
 
     __description__ = """Rehost.to account plugin"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/account/SimplydebridCom.py b/pyload/plugins/account/SimplydebridCom.py
index 636828146..1942e178c 100644
--- a/pyload/plugins/account/SimplydebridCom.py
+++ b/pyload/plugins/account/SimplydebridCom.py
@@ -8,7 +8,7 @@ from pyload.plugins.internal.Account import Account
 class SimplydebridCom(Account):
     __name__    = "SimplydebridCom"
     __type__    = "account"
-    __version__ = "0.1"
+    __version__ = "0.10"
 
     __description__ = """Simply-Debrid.com account plugin"""
     __license__     = "GPLv3"
diff --git a/pyload/plugins/account/UploadheroCom.py b/pyload/plugins/account/UploadheroCom.py
index be1d444be..9406de38f 100644
--- a/pyload/plugins/account/UploadheroCom.py
+++ b/pyload/plugins/account/UploadheroCom.py
@@ -10,7 +10,7 @@ from pyload.plugins.internal.Account import Account
 class UploadheroCom(Account):
     __name__    = "UploadheroCom"
     __type__    = "account"
-    __version__ = "0.2"
+    __version__ = "0.20"
 
     __description__ = """Uploadhero.co account plugin"""
     __license__     = "GPLv3"