diff options
Diffstat (limited to 'pyload/plugin/account')
| -rw-r--r-- | pyload/plugin/account/FilefactoryCom.py | 5 | ||||
| -rw-r--r-- | pyload/plugin/account/LinksnappyCom.py | 6 | ||||
| -rw-r--r-- | pyload/plugin/account/OboomCom.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/account/OneFichierCom.py | 5 | ||||
| -rw-r--r-- | pyload/plugin/account/UlozTo.py | 5 | ||||
| -rw-r--r-- | pyload/plugin/account/WebshareCz.py | 6 |
6 files changed, 12 insertions, 17 deletions
diff --git a/pyload/plugin/account/FilefactoryCom.py b/pyload/plugin/account/FilefactoryCom.py index 71a040b65..5c80c6e1c 100644 --- a/pyload/plugin/account/FilefactoryCom.py +++ b/pyload/plugin/account/FilefactoryCom.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- +import pycurl import re import time -from pycurl import REFERER - from pyload.plugin.Account import Account @@ -38,7 +37,7 @@ class FilefactoryCom(Account): def login(self, user, data, req): - req.http.c.setopt(REFERER, "http://www.filefactory.com/member/login.php") + req.http.c.setopt(pycurl.REFERER, "http://www.filefactory.com/member/login.php") html = req.load("http://www.filefactory.com/member/signin.php", post={"loginEmail" : user, diff --git a/pyload/plugin/account/LinksnappyCom.py b/pyload/plugin/account/LinksnappyCom.py index 4b91042e2..942cefbee 100644 --- a/pyload/plugin/account/LinksnappyCom.py +++ b/pyload/plugin/account/LinksnappyCom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from hashlib import md5 +import hashlib from pyload.plugin.Account import Account from pyload.utils import json_loads @@ -18,7 +18,7 @@ class LinksnappyCom(Account): def loadAccountInfo(self, user, req): data = self.getAccountData(user) r = req.load('http://gen.linksnappy.com/lseAPI.php', - get={'act': 'USERDETAILS', 'username': user, 'password': md5(data['password']).hexdigest()}) + get={'act': 'USERDETAILS', 'username': user, 'password': hashlib.md5(data['password']).hexdigest()}) self.logDebug("JSON data: " + r) @@ -50,7 +50,7 @@ class LinksnappyCom(Account): r = req.load("http://gen.linksnappy.com/lseAPI.php", get={'act' : 'USERDETAILS', 'username': user, - 'password': md5(data['password']).hexdigest()}, + 'password': hashlib.md5(data['password']).hexdigest()}, decode=True) if 'Invalid Account Details' in r: diff --git a/pyload/plugin/account/OboomCom.py b/pyload/plugin/account/OboomCom.py index 8b33d0612..4669ca61e 100644 --- a/pyload/plugin/account/OboomCom.py +++ b/pyload/plugin/account/OboomCom.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- -import time - try: from beaker.crypto.pbkdf2 import PBKDF2 diff --git a/pyload/plugin/account/OneFichierCom.py b/pyload/plugin/account/OneFichierCom.py index fbe5ed022..531f5f735 100644 --- a/pyload/plugin/account/OneFichierCom.py +++ b/pyload/plugin/account/OneFichierCom.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- +import pycurl import re import time -from pycurl import REFERER - from pyload.plugin.Account import Account @@ -45,7 +44,7 @@ class OneFichierCom(Account): def login(self, user, data, req): - req.http.c.setopt(REFERER, "https://1fichier.com/login.pl?lg=en") + req.http.c.setopt(pycurl.REFERER, "https://1fichier.com/login.pl?lg=en") html = req.load("https://1fichier.com/login.pl?lg=en", post={'mail' : user, diff --git a/pyload/plugin/account/UlozTo.py b/pyload/plugin/account/UlozTo.py index c43246e7d..20f03f907 100644 --- a/pyload/plugin/account/UlozTo.py +++ b/pyload/plugin/account/UlozTo.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- import re - -from urlparse import urljoin +import urlparse from pyload.plugin.Account import Account @@ -37,7 +36,7 @@ class UlozTo(Account): action = re.findall('<form action="(.+?)"', login_page)[1].replace('&', '&') token = re.search('_token_" value="(.+?)"', login_page).group(1) - html = req.load(urljoin("http://www.ulozto.net/", action), + html = req.load(urlparse.urljoin("http://www.ulozto.net/", action), post={'_token_' : token, 'do' : "loginForm-submit", 'login' : u"Přihlásit", diff --git a/pyload/plugin/account/WebshareCz.py b/pyload/plugin/account/WebshareCz.py index 5cbe6b1b8..c547534ba 100644 --- a/pyload/plugin/account/WebshareCz.py +++ b/pyload/plugin/account/WebshareCz.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- +import hashlib import re import time -from hashlib import md5, sha1 from passlib.hash import md5_crypt from pyload.plugin.Account import Account @@ -51,8 +51,8 @@ class WebshareCz(Account): self.wrongPassword() salt = re.search('<salt>(.+)</salt>', salt).group(1) - password = sha1(md5_crypt.encrypt(data['password'], salt=salt)).hexdigest() - digest = md5(user + ":Webshare:" + password).hexdigest() + password = hashlib.sha1(md5_crypt.encrypt(data['password'], salt=salt)).hexdigest() + digest = hashlib.md5(user + ":Webshare:" + password).hexdigest() login = req.load("https://webshare.cz/api/login/", post={'digest' : digest, |