summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-06-23 22:35:55 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-06-23 22:35:55 +0200
commit2a67b4b86fae88c2ddab0a729280d5f79e315f48 (patch)
tree52cbe157a599c8347c829adc8a9113606fa6cfcc /module/plugins
parentMerge pull request #1534 from frederikmoellers/stable (diff)
parentUpdate DlProtectCom.py (diff)
downloadpyload-2a67b4b86fae88c2ddab0a729280d5f79e315f48.tar.xz
Merge pull request #1535 from GammaC0de/patch-1
[DlProtectCom] fix #1531
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/crypter/DlProtectCom.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py
index a9f39c6f3..fde43ff43 100644
--- a/module/plugins/crypter/DlProtectCom.py
+++ b/module/plugins/crypter/DlProtectCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
class DlProtectCom(SimpleCrypter):
__name__ = "DlProtectCom"
__type__ = "crypter"
- __version__ = "0.03"
+ __version__ = "0.04"
__pattern__ = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+'
__config__ = [("use_premium" , "bool", "Use premium account if available" , True),
@@ -36,7 +36,7 @@ class DlProtectCom(SimpleCrypter):
post_req = {'key' : re.search(r'name="key" value="(.+?)"', self.html).group(1),
'submitform': ""}
- if "Please click on continue to see the content" in self.html:
+ if "Please click on continue to see the links" in self.html:
post_req['submitform'] = "Continue"
self.wait(2)
@@ -51,11 +51,10 @@ class DlProtectCom(SimpleCrypter):
post_req['pwd'] = self.getPassword()
if "Security Code" in self.html:
- captcha_id = re.search(r'/captcha\.php\?uid=(.+?)"', self.html).group(1)
- captcha_url = "http://www.dl-protect.com/captcha.php?uid=" + captcha_id
- captcha_code = self.decryptCaptcha(captcha_url, imgtype="gif")
-
- post_req['secure'] = captcha_code
+ m = re.search(r'/captcha\.php\?key=(.+?)"', self.html)
+ if m:
+ captcha_code = self.decryptCaptcha("http://www.dl-protect.com/captcha.php?key=" + m.group(1), imgtype="gif")
+ post_req['secure'] = captcha_code
self.html = self.load(self.pyfile.url, post=post_req)