3 files changed, 4 insertions, 57 deletions
diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py
deleted file mode 100644
index b967a74a1..000000000
--- a/module/plugins/crypter/FilesonicComFolder.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Crypter import Crypter
-
-class FilesonicComFolder(Crypter):
-    __name__ = "FilesonicComFolder"
-    __type__ = "crypter"
-    __pattern__ = r"http://(\w*\.)?(sharingmatrix|filesonic|wupload)\.[^/]*/folder/\w+/?"
-    __version__ = "0.11"
-    __description__ = """Filesonic.com/Wupload.com Folder Plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
-
-    FOLDER_PATTERN = r'<table>\s*<caption>Files Folder</caption>(.*?)</table>'
-    LINK_PATTERN = r'<a href="([^"]+)">'
-
-    def decrypt(self, pyfile):
-        html = self.load(self.pyfile.url)
-
-        new_links = []
-
-        folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
-        if not folder: self.fail("Parse error (FOLDER)")
-
-        new_links.extend(re.findall(self.LINK_PATTERN, folder.group(1)))
-
-        if new_links:
-            self.core.files.addLinks(new_links, self.pyfile.package().id)
-        else:
-            self.fail('Could not extract any links')
-\ No newline at end of file
diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py
deleted file mode 100644
index e18c10758..000000000
--- a/module/plugins/crypter/MegauploadComFolder.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.SimpleCrypter import SimpleCrypter
-from re import search
-from time import time 
-
-class MegauploadComFolder(SimpleCrypter):
-    __name__ = "MegauploadComFolder"
-    __type__ = "crypter"
-    __pattern__ = r"http://(?:www\.)?megaupload.com/(?:\?f|xml/folderfiles.php\?folderid)=(\w+)"
-    __version__ = "0.01"
-    __description__ = """Depositfiles.com Folder Plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
-    
-    LINK_PATTERN = r'<ROW[^>]*?url="([^"]+)[^>]*?expired="0"></ROW>'
-    
-    def init (self):
-        folderid = search(self.__pattern__, self.pyfile.url).group(1)
-        uniq = time() * 1000
-        self.url = "http://www.megaupload.com/xml/folderfiles.php?folderid=%s&uniq=%d" % (folderid, uniq)
-
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index 0df26110e..0009253e1 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -12,7 +12,7 @@ class ShareLinksBiz(Crypter):
     __name__ = "ShareLinksBiz"
     __type__ = "crypter"
     __pattern__ = r"(?P<base>http://[\w\.]*?(share-links|s2l)\.biz)/(?P<id>_?[0-9a-z]+)(/.*)?"
-    __version__ = "1.1"
+    __version__ = "1.11"
     __description__ = """Share-Links.biz Crypter"""
     __author_name__ = ("fragonib")
     __author_mail__ = ("fragonib[AT]yahoo[DOT]es")
@@ -32,7 +32,7 @@ class ShareLinksBiz(Crypter):
         
         # Request package
         url = self.baseUrl + '/' + self.fileId
-        self.html = self.load(url)
+        self.html = self.load(url, decode=True)
         
         # Unblock server (load all images)
         self.unblockServer()
@@ -96,7 +96,7 @@ class ShareLinksBiz(Crypter):
         self.logDebug("Submitting password [%s] for protected links" % password)
         post = {"password": password, 'login': 'Submit form'}
         url = self.baseUrl + '/' + self.fileId
-        self.html = self.load(url, post=post)
+        self.html = self.load(url, post=post, decode=True)
 
     def unlockCaptchaProtection(self):
         # Get captcha map
@@ -119,7 +119,7 @@ class ShareLinksBiz(Crypter):
             self.wait()
             self.retry()
         url = self.baseUrl + href
-        self.html = self.load(url)
+        self.html = self.load(url, decode=True)
         
     def _getCaptchaMap(self):
         map = {}