summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter/SafelinkingNet.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/crypter/SafelinkingNet.py')
-rw-r--r--module/plugins/crypter/SafelinkingNet.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py
index 709083b51..7f0915065 100644
--- a/module/plugins/crypter/SafelinkingNet.py
+++ b/module/plugins/crypter/SafelinkingNet.py
@@ -2,8 +2,6 @@
import re
-from pycurl import FOLLOWLOCATION
-
from BeautifulSoup import BeautifulSoup
from module.common.json_layer import json_loads
@@ -14,11 +12,11 @@ from module.plugins.internal.CaptchaService import SolveMedia
class SafelinkingNet(Crypter):
__name__ = "SafelinkingNet"
__type__ = "crypter"
- __version__ = "0.11"
+ __version__ = "0.14"
__pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+'
- __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
- ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+ __config__ = [("use_subfolder" , "bool", "Save package to subfolder" , True),
+ ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
__description__ = """Safelinking.net decrypter plugin"""
__license__ = "GPLv3"
@@ -42,6 +40,8 @@ class SafelinkingNet(Crypter):
else:
postData = {"post-protect": "1"}
+ self.html = self.load(url)
+
if "link-password" in self.html:
postData['link-password'] = self.getPassword()
@@ -55,7 +55,7 @@ class SafelinkingNet(Crypter):
else:
self.fail(_("Error parsing captcha"))
- challenge, response = captcha.challenge(captchaKey)
+ response, challenge = captcha.challenge(captchaKey)
postData['adcopy_challenge'] = challenge
postData['adcopy_response'] = response