summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-06-08 04:02:12 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-06-08 04:02:12 +0200
commit6283481a29e49776703ce6688b3e4fcb5dd11bf2 (patch)
treeab61e993b8c8578f412272c69a07d14a9f7bbe72 /module/plugins/hooks
parent[UploadedTo] Fixup (2) (diff)
downloadpyload-6283481a29e49776703ce6688b3e4fcb5dd11bf2.tar.xz
[FreeWayMe] Fixup
Diffstat (limited to 'module/plugins/hooks')
-rw-r--r--module/plugins/hooks/FreeWayMeHook.py13
-rw-r--r--module/plugins/hooks/PremiumizeMeHook.py2
2 files changed, 4 insertions, 11 deletions
diff --git a/module/plugins/hooks/FreeWayMeHook.py b/module/plugins/hooks/FreeWayMeHook.py
index baea44540..b4219a953 100644
--- a/module/plugins/hooks/FreeWayMeHook.py
+++ b/module/plugins/hooks/FreeWayMeHook.py
@@ -6,7 +6,7 @@ from module.plugins.internal.MultiHook import MultiHook
class FreeWayMeHook(MultiHook):
__name__ = "FreeWayMeHook"
__type__ = "hook"
- __version__ = "0.15"
+ __version__ = "0.16"
__config__ = [("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"),
("pluginlist" , "str" , "Plugin list (comma separated)" , "" ),
@@ -20,13 +20,6 @@ class FreeWayMeHook(MultiHook):
def getHosters(self):
- # Get account data
- if not self.account or not self.account.canUse():
- hostis = self.getURL("https://www.free-way.me/ajax/jd.php", get={"id": 3}).replace("\"", "").strip()
- else:
- self.logDebug("AccountInfo available - Get HosterList with User Pass")
- (user, data) = self.account.selectAccount()
- hostis = self.getURL("https://www.free-way.me/ajax/jd.php", get={"id": 3, "user": user, "pass": data['password']}).replace("\"", "").strip()
-
- self.logDebug("hosters: %s" % hostis)
+ user, data = self.account.selectAccount()
+ hostis = self.getURL("http://www.free-way.bz/ajax/jd.php", get={"id": 3, "user": user, "pass": data['password']}).replace("\"", "") #@TODO: Revert to `https` in 0.4.10
return [x.strip() for x in hostis.split(",") if x.strip()]
diff --git a/module/plugins/hooks/PremiumizeMeHook.py b/module/plugins/hooks/PremiumizeMeHook.py
index f13520323..35ad70970 100644
--- a/module/plugins/hooks/PremiumizeMeHook.py
+++ b/module/plugins/hooks/PremiumizeMeHook.py
@@ -26,7 +26,7 @@ class PremiumizeMeHook(MultiHook):
# Get supported hosters list from premiumize.me using the
# json API v1 (see https://secure.premiumize.me/?show=api)
- answer = self.getURL("http://api.premiumize.me/pm-api/v1.php",
+ answer = self.getURL("http://api.premiumize.me/pm-api/v1.php", #@TODO: Revert to `https` in 0.4.10
get={'method': "hosterlist", 'params[login]': user, 'params[pass]': data['password']})
data = json_loads(answer)