From a3d1e63fe5d8e674f2850fec98c5748cc274e954 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 28 Jul 2015 00:24:44 +0200
Subject: Fix https://github.com/pyload/pyload/issues/1545
---
module/plugins/accounts/OboomCom.py | 4 ++--
module/plugins/hoster/OboomCom.py | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py
index fcb309132..380368b70 100644
--- a/module/plugins/accounts/OboomCom.py
+++ b/module/plugins/accounts/OboomCom.py
@@ -23,7 +23,7 @@ from module.plugins.internal.Account import Account
class OboomCom(Account):
__name__ = "OboomCom"
__type__ = "account"
- __version__ = "0.26"
+ __version__ = "0.27"
__status__ = "testing"
__description__ = """Oboom.com account plugin"""
@@ -36,7 +36,7 @@ class OboomCom(Account):
salt = passwd[::-1]
pbkdf2 = PBKDF2(passwd, salt, 1000).hexread(16)
- result = json_loads(self.load("https://www.oboom.com/1/login",
+ result = json_loads(self.load("http://www.oboom.com/1/login", #@TODO: Revert to `https` in 0.4.10
get={'auth': user,
'pass': pbkdf2}))
diff --git a/module/plugins/hoster/OboomCom.py b/module/plugins/hoster/OboomCom.py
index 480febf61..8420c6f02 100644
--- a/module/plugins/hoster/OboomCom.py
+++ b/module/plugins/hoster/OboomCom.py
@@ -13,7 +13,7 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha
class OboomCom(Hoster):
__name__ = "OboomCom"
__type__ = "hoster"
- __version__ = "0.35"
+ __version__ = "0.36"
__status__ = "testing"
__pattern__ = r'https?://(?:www\.)?oboom\.com/(?:#(?:id=|/)?)?(?P<ID>\w{8})'
@@ -43,7 +43,7 @@ class OboomCom(Hoster):
if not self.premium:
self.solve_captcha()
self.get_download_ticket()
- self.download("https://%s/1.0/dlh" % self.download_domain, get={'ticket': self.download_ticket, 'http_errors': 0})
+ self.download("http://%s/1.0/dlh" % self.download_domain, get={'ticket': self.download_ticket, 'http_errors': 0})
def load_url(self, url, get=None):
@@ -64,7 +64,7 @@ class OboomCom(Hoster):
else:
self.fail(_("Could not retrieve premium session"))
else:
- apiUrl = "https://www.oboom.com/1.0/guestsession"
+ apiUrl = "http://www.oboom.com/1.0/guestsession"
result = self.load_url(apiUrl)
if result[0] == 200:
self.session_token = result[1]
@@ -77,7 +77,7 @@ class OboomCom(Hoster):
for _i in xrange(5):
response, challenge = recaptcha.challenge(self.RECAPTCHA_KEY)
- apiUrl = "https://www.oboom.com/1.0/download/ticket"
+ apiUrl = "http://www.oboom.com/1.0/download/ticket"
params = {'recaptcha_challenge_field': challenge,
'recaptcha_response_field': response,
'download_id': self.file_id,
@@ -112,7 +112,7 @@ class OboomCom(Hoster):
def get_fileInfo(self, token, fileId):
- apiUrl = "https://api.oboom.com/1.0/info"
+ apiUrl = "http://api.oboom.com/1.0/info"
params = {'token': token, 'items': fileId, 'http_errors': 0}
result = self.load_url(apiUrl, params)
@@ -128,7 +128,7 @@ class OboomCom(Hoster):
def get_download_ticket(self):
- apiUrl = "https://api.oboom.com/1/dl"
+ apiUrl = "http://api.oboom.com/1/dl"
params = {'item': self.file_id, 'http_errors': 0}
if self.premium:
params['token'] = self.session_token
--
cgit v1.2.3