From 1064072f30ee3e71b6f8034f882a7123844fad2c Mon Sep 17 00:00:00 2001
From: zoidberg10 <zoidberg@mujmail.cz>
Date: Thu, 1 Nov 2012 21:58:49 +0100
Subject: update lix.in crypter - closed #707, hotfile.com - decode, enable
 checksum

---
 module/plugins/crypter/LixIn.py     |  4 ++--
 module/plugins/hoster/HotfileCom.py | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'module')

diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py
index 379b10764..1ed5510fd 100644
--- a/module/plugins/crypter/LixIn.py
+++ b/module/plugins/crypter/LixIn.py
@@ -9,12 +9,12 @@ class LixIn(Crypter):
     __name__ = "LixIn"
     __type__ = "container"
     __pattern__ = r"http://(www.)?lix.in/(?P<id>.*)"
-    __version__ = "0.21"
+    __version__ = "0.22"
     __description__ = """Lix.in Container Plugin"""
     __author_name__ = ("spoob")
     __author_mail__ = ("spoob@pyload.org")
     
-    CAPTCHA_PATTERN='<img src="(?P<image>captcha_img.php\?PHPSESSID=.*?)"'
+    CAPTCHA_PATTERN='<img src="(?P<image>captcha_img.php\?.*?)"'
     SUBMIT_PATTERN=r"value='continue.*?'"
     LINK_PATTERN=r'name="ifram" src="(?P<link>.*?)"'
     
diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
index bf4250767..d0268b3ab 100644
--- a/module/plugins/hoster/HotfileCom.py
+++ b/module/plugins/hoster/HotfileCom.py
@@ -13,7 +13,7 @@ def getInfo(urls):
     
     for chunk in chunks(urls, 90):
         api_param_file = {"action":"checklinks","links": ",".join(chunk),"fields":"id,status,name,size"} #api only supports old style links
-        src = getURL(api_url_base, post=api_param_file)
+        src = getURL(api_url_base, post=api_param_file, decode=True)
         result = []
         for i, res in enumerate(src.split("\n")):
             if not res:
@@ -32,7 +32,7 @@ class HotfileCom(Hoster):
     __name__ = "HotfileCom"
     __type__ = "hoster"
     __pattern__ = r"http://(www.)?hotfile\.com/dl/\d+/[0-9a-zA-Z]+/"
-    __version__ = "0.34"
+    __version__ = "0.35"
     __description__ = """Hotfile.com Download Hoster"""
     __author_name__ = ("sitacuisses","spoob","mkaay","JoKoT3")
     __author_mail__ = ("sitacuisses@yhoo.de","spoob@pyload.org","mkaay@mkaay.de","jokot3@gmail.com")
@@ -66,14 +66,14 @@ class HotfileCom(Hoster):
         
         args = {"links":self.pyfile.url, "fields":"id,status,name,size,sha1"}
         resp = self.apiCall("checklinks", args)
-        self.apiData = {}
+        self.api_data = {}
         for k, v in zip(args["fields"].split(","), resp.strip().split(",")):
-            self.apiData[k] = v
+            self.api_data[k] = v
         
-        if self.apiData["status"] == "0":
+        if self.api_data["status"] == "0":
             self.offline()
 
-        pyfile.name = self.apiData["name"]
+        pyfile.name = self.api_data["name"]
         
         if not self.premium:
             self.downloadHTML()
-- 
cgit v1.2.3