merge

53 files changed, 1705 insertions, 479 deletions

diff --git a/module/plugins/BluehostTo.py b/module/plugins/BluehostTo.py
deleted file mode 100644
index eff8ebcd8..000000000
--- a/module/plugins/BluehostTo.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-import time
-
-from module.Plugin import Plugin
-
-class BluehostTo(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "BluehostTo"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www.)?bluehost.to/file/"
-        props['version'] = "0.1"
-        props['description'] = """Bluehost Download PLugin"""
-        props['author_name'] = ("RaNaN")
-        props['author_mail'] = ("RaNaN@pyload.org")
-        self.props = props
-        self.parent = parent
-        self.html = None
-        self.multi_dl = False
-
-    def download_html(self):
-        url = self.parent.url
-        self.html = self.req.load(url)
-        time.sleep(1.5)
-        self.html = self.req.load(url, cookies=True)
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        if self.html == None:
-            self.download_html()
-
-        inputs = re.findall(r"(<(input|form)[^>]+)", self.html)
-        for i in inputs:
-            if re.search(r"name=\"BluehostVers2dl\"",i[0]):
-                self.BluehostVers2dl = re.search(r"value=\"([^\"]+)", i[0]).group(1)
-            elif re.search(r"name=\"PHPSESSID\"",i[0]):
-                self.PHPSESSID = re.search(r"value=\"([^\"]+)", i[0]).group(1)
-            elif re.search(r"name=\"DownloadV2Hash\"",i[0]):
-                self.DownloadV2Hash = re.search(r"value=\"([^\"]+)", i[0]).group(1)
-            elif re.search(r"name=\"access\"",i[0]):
-                self.access = re.search(r"value=\"([^\"]+)", i[0]).group(1)
-            elif re.search(r"name=\"download\"",i[0]):
-                url = re.search(r"action=\"([^\"]+)", i[0]).group(1)
-
-        return url
-
-    def get_file_name(self):
-        if self.html == None:
-            self.download_html()
-        file_name_pattern = r"<center><b>.+: (.+)<\/b><\/center>"
-        return re.search(file_name_pattern, self.html).group(1)
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if self.html == None:
-            self.download_html()
-
-        if re.search(r"html", self.html) == None:
-            return False
-        else:
-            return True
-
-    def proceed(self, url, location):
-        self.req.download(url, location, {'BluehostVers2dl': self.BluehostVers2dl, 'DownloadV2Hash': self.DownloadV2Hash, 'PHPSESSID': self.PHPSESSID, 'access': self.access})
diff --git a/module/plugins/DLC.pyc b/module/plugins/DLC.pyc
deleted file mode 100644
index 980dd8ace..000000000
--- a/module/plugins/DLC.pyc
+++ /dev/null
diff --git a/module/plugins/Hook.py b/module/plugins/Hook.py
new file mode 100644
index 000000000..541d0c2e9
--- /dev/null
+++ b/module/plugins/Hook.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+    
+    @author: mkaay
+    @interface-version: 0.1
+"""
+
+import logging
+
+
+class Hook():
+    def __init__(self, core):
+        self.logger = logging.getLogger("log")
+        self.configParser = core.parser_plugins
+        self.config = {}
+        props = {}
+        props['name'] = "Hook"
+        props['version'] = "0.1"
+        props['description'] = """interface for hook"""
+        props['author_name'] = ("mkaay")
+        props['author_mail'] = ("mkaay@mkaay.de")
+        self.props = props
+        self.core = core
+    
+    def readConfig(self):
+        self.configParser.loadData()
+        section = self.props['name']
+        try:
+            self.config = self.configParser.getConfig()[section]
+        except:
+            self.setup()
+    
+    def setup(self):
+        self.configParser.set(self.props["name"], {"option": "activated", "type": "bool", "name": "Activated"}, True)
+        self.readConfig()
+    
+    def isActivated(self):
+        return self.config["activated"]
+    
+    def downloadStarts(self, pyfile):
+        pass
+    
+    def downloadFinished(self, pyfile):
+        pass
+    
+    def packageFinished(self, pypack):
+        """
+            not implemented!
+        """
+        pass
+    
+    def beforeReconnecting(self, ip):
+        pass
+    
+    def afterReconnecting(self, ip):
+        pass
diff --git a/module/plugins/MyvideoDe.py b/module/plugins/MyvideoDe.py
deleted file mode 100644
index 5e2eb0b39..000000000
--- a/module/plugins/MyvideoDe.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from module.Plugin import Plugin
-
-class MyvideoDe(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "MyvideoDe"
-        props['type'] = "hoster"
-        props['pattern'] = r"http://(www\.)?myvideo.de/watch/"
-        props['version'] = "0.1"
-        props['description'] = """Youtube.com Video Download Plugin"""
-        props['author_name'] = ("spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
-        self.parent = parent
-        self.html = None
-        self.html_old = None         #time() where loaded the HTML
-        self.time_plus_wait = None   #time() + wait in seconds
-
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        if self.html == None:
-            self.download_html()
-        self.parent.status.filename = self.get_file_name()
-        self.parent.status.url = self.get_file_url()
-        self.parent.status.wait = self.wait_until()
-
-    def download_html(self):
-        url = self.parent.url
-        self.html = self.req.load(url)
-
-    def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        if self.html == None:
-            self.download_html()
-        videoId = re.search(r"addVariable\('_videoid','(.*)'\);p.addParam\('quality'", self.html).group(1)
-        videoServer = re.search("rel='image_src' href='(.*)thumbs/.*' />", self.html).group(1)
-        file_url = videoServer + videoId + ".flv"
-        print videoId
-        print videoServer
-        print file_url
-        return file_url
-
-    def get_file_name(self):
-        if self.html == None:
-            self.download_html()
-        file_name_pattern = r"<h1 class='globalHd'>(.*)</h1>"
-        return re.search(file_name_pattern, self.html).group(1).replace("/", "") + '.flv'
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if self.html == None:
-            self.download_html()
-        if re.search(r"(.* Das angeforderte Video ist nicht.*)", self.html) != None:
-            return False
-        else:
-            return True
diff --git a/module/plugins/RSDF.py b/module/plugins/RSDF.py
deleted file mode 100644
index 50fca9b1f..000000000
--- a/module/plugins/RSDF.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import base64
-import binascii
-
-from module.Plugin import Plugin
-
-class RSDF(Plugin):
-
-    def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "RSDF"
-        props['type'] = "container"
-        props['pattern'] = r".*\.rsdf"
-        props['version'] = "0.2"
-        props['description'] = """RSDF Container Decode Plugin"""
-        props['author_name'] = ("RaNaN", "spoob")
-        props['author_mail'] = ("RaNaN@pyload.org", "spoob@pyload.org")
-        self.props = props
-        self.parent = parent
-        self.multi_dl = True
-        self.links = []
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        return True
-
-    def proceed(self, url, location):
-        try:
-            from Crypto.Cipher import AES
-
-            infile = url.replace("\n", "")
-            Key = binascii.unhexlify('8C35192D964DC3182C6F84F3252239EB4A320D2500000000')
-
-            IV = binascii.unhexlify('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF')
-            IV_Cipher = AES.new(Key, AES.MODE_ECB)
-            IV = IV_Cipher.encrypt(IV)
-
-            obj = AES.new(Key, AES.MODE_CFB, IV)
-
-            rsdf = open(infile, 'r')
-
-            data = rsdf.read()
-            data = binascii.unhexlify(''.join(data.split()))
-            data = data.splitlines()
-
-            for link in data:
-                link = base64.b64decode(link)
-                link = obj.decrypt(link)
-                decryptedUrl = link.replace('CCF: ', '')
-                self.links.append(decryptedUrl)
-
-            rsdf.close()
-
-        except:
-            print "Kein Crypto installiert, RSDF Plugin kann nicht genutzt werden"
diff --git a/module/plugins/__init__.py b/module/plugins/__init__.py
index 8d1c8b69c..e69de29bb 100644
--- a/module/plugins/__init__.py
+++ b/module/plugins/__init__.py
@@ -1 +0,0 @@
- 
diff --git a/module/plugins/captcha/GigasizeCom.py b/module/plugins/captcha/GigasizeCom.py
new file mode 100644
index 000000000..136092181
--- /dev/null
+++ b/module/plugins/captcha/GigasizeCom.py
@@ -0,0 +1,15 @@
+from captcha import OCR
+
+class GigasizeCom(OCR):
+    def __init__(self):
+        OCR.__init__(self)
+        
+    def get_captcha(self, image):
+        self.load_image(image)
+        self.threshold(2.8)
+        self.run_gocr()
+        return self.result_captcha
+
+if __name__ == '__main__':
+    ocr = GigasizeCom()
+    print  ocr.get_captcha('gigasize-com/7.jpg')
diff --git a/module/plugins/captcha/LinksaveIn.py b/module/plugins/captcha/LinksaveIn.py
new file mode 100644
index 000000000..d6f61e362
--- /dev/null
+++ b/module/plugins/captcha/LinksaveIn.py
@@ -0,0 +1,161 @@
+from captcha import OCR
+import Image
+from os import sep
+from os.path import dirname
+from os.path import abspath
+from glob import glob
+import tempfile
+
+
+class LinksaveIn(OCR):
+    def __init__(self):
+        OCR.__init__(self)
+        self.data_dir = dirname(abspath(__file__)) + sep + "LinksaveIn" + sep
+    
+    def load_image(self, image):
+        im = Image.open(image)
+        frame_nr = 0
+
+        lut = im.resize((256, 1))
+        lut.putdata(range(256))
+        lut = list(lut.convert("RGB").getdata())
+
+        new = Image.new("RGB", im.size)
+        npix = new.load()
+        while True:
+            try:
+                im.seek(frame_nr)
+            except EOFError:
+                break
+            frame = im.copy()
+            pix = frame.load()
+            for x in range(frame.size[0]):
+                for y in range(frame.size[1]):
+                    if lut[pix[x, y]] != (0,0,0):
+                        npix[x, y] = lut[pix[x, y]]
+            frame_nr += 1
+        new.save(self.data_dir+"unblacked.png")
+        self.image = new.copy()
+        self.pixels = self.image.load()
+        self.result_captcha = ''
+    
+    def get_bg(self):
+        stat = {}
+        cstat = {}
+        img = self.image.convert("P")
+        for bgpath in glob(self.data_dir+"bg/*.gif"):
+            stat[bgpath] = 0
+            bg = Image.open(bgpath)
+            
+            bglut = bg.resize((256, 1))
+            bglut.putdata(range(256))
+            bglut = list(bglut.convert("RGB").getdata())
+            
+            lut = img.resize((256, 1))
+            lut.putdata(range(256))
+            lut = list(lut.convert("RGB").getdata())
+            
+            bgpix = bg.load()
+            pix = img.load()
+            for x in range(bg.size[0]):
+                for y in range(bg.size[1]):
+                    rgb_bg = bglut[bgpix[x, y]]
+                    rgb_c = lut[pix[x, y]]
+                    try:
+                        cstat[rgb_c] += 1
+                    except:
+                        cstat[rgb_c] = 1
+                    if rgb_bg == rgb_c:
+                        stat[bgpath] += 1
+        max_p = 0
+        bg = ""
+        for bgpath, value in stat.items():
+            if max_p < value:
+                bg = bgpath
+                max_p = value
+        return bg
+    
+    def substract_bg(self, bgpath):
+        bg = Image.open(bgpath)
+        img = self.image.convert("P")
+        
+        bglut = bg.resize((256, 1))
+        bglut.putdata(range(256))
+        bglut = list(bglut.convert("RGB").getdata())
+        
+        lut = img.resize((256, 1))
+        lut.putdata(range(256))
+        lut = list(lut.convert("RGB").getdata())
+        
+        bgpix = bg.load()
+        pix = img.load()
+        orgpix = self.image.load()
+        for x in range(bg.size[0]):
+            for y in range(bg.size[1]):
+                rgb_bg = bglut[bgpix[x, y]]
+                rgb_c = lut[pix[x, y]]
+                if rgb_c == rgb_bg:
+                    orgpix[x, y] = (255,255,255)
+    
+    def eval_black_white(self):
+        new = Image.new("RGB", (140, 75))
+        pix = new.load()
+        orgpix = self.image.load()
+        thresh = 4
+        for x in range(new.size[0]):
+            for y in range(new.size[1]):
+                rgb = orgpix[x, y]
+                r, g, b = rgb
+                pix[x, y] = (255,255,255)
+                if r > max(b, g)+thresh:
+                    pix[x, y] = (0,0,0)
+                if g < min(r, b):
+                    pix[x, y] = (0,0,0)
+                if g > max(r, b)+thresh:
+                    pix[x, y] = (0,0,0)
+                if b > max(r, g)+thresh:
+                    pix[x, y] = (0,0,0)
+        self.image = new
+        self.pixels = self.image.load()
+    
+    def run_tesser(self):
+        self.logger.debug("create tmp tif")
+        tmp = tempfile.NamedTemporaryFile(suffix=".tif")
+        self.logger.debug("create tmp txt")
+        tmpTxt = tempfile.NamedTemporaryFile(suffix=".txt")
+        self.logger.debug("save tiff")
+        self.image.save(tmp.name, 'TIFF')
+        self.logger.debug("run tesseract")
+        self.run(['tesseract', tmp.name, tmpTxt.name.replace(".txt", ""), "nobatch", self.data_dir+"tesser_conf"])
+        self.logger.debug("read txt")
+
+        with open(tmpTxt.name, 'r') as f:
+            self.result_captcha = f.read().replace("\n", "")
+
+    def get_captcha(self, image):
+        self.load_image(image)
+        bg = self.get_bg()
+        self.substract_bg(bg)
+        self.eval_black_white()
+        self.to_greyscale()
+        self.image.save(self.data_dir+"cleaned_pass1.png")
+        self.clean(4)
+        self.clean(4)
+        self.image.save(self.data_dir+"cleaned_pass2.png")
+        letters = self.split_captcha_letters()
+        final = ""
+        for n, letter in enumerate(letters):
+            self.image = letter
+            self.image.save(ocr.data_dir+"letter%d.png" % n)
+            self.run_tesser()
+            final += self.result_captcha
+        
+        return final
+
+if __name__ == '__main__':
+    import urllib
+    ocr = LinksaveIn()
+    testurl = "http://linksave.in/captcha/cap.php?hsh=2229185&code=ZzHdhl3UffV3lXTH5U4b7nShXj%2Bwma1vyoNBcbc6lcc%3D"
+    urllib.urlretrieve(testurl, ocr.data_dir+"captcha.gif")
+    
+    print ocr.get_captcha(ocr.data_dir+'captcha.gif')
diff --git a/module/plugins/captcha/MegauploadCom.py b/module/plugins/captcha/MegauploadCom.py
new file mode 100644
index 000000000..374bcd678
--- /dev/null
+++ b/module/plugins/captcha/MegauploadCom.py
@@ -0,0 +1,13 @@
+from captcha import OCR
+
+class MegauploadCom(OCR):
+    def __init__(self):
+        OCR.__init__(self)
+        
+    def get_captcha(self, image):
+        self.load_image(image)
+        self.run_tesser()
+        return self.result_captcha
+
+if __name__ == '__main__':
+    ocr = MegauploadCom()
diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py
new file mode 100644
index 000000000..9799a6a2b
--- /dev/null
+++ b/module/plugins/captcha/NetloadIn.py
@@ -0,0 +1,25 @@
+from captcha import OCR
+
+class NetloadIn(OCR):
+    def __init__(self):
+        OCR.__init__(self)
+
+    def get_captcha(self, image):
+        self.load_image(image)
+        self.to_greyscale()
+        self.clean(3)
+        self.clean(3)
+        self.run_tesser()
+
+        self.correct({
+        ("$", "g"): "5",
+        })
+
+        return self.result_captcha
+
+if __name__ == '__main__':
+    import urllib
+    ocr = NetloadIn()
+    urllib.urlretrieve("http://netload.in/share/includes/captcha.php", "captcha.png")
+
+    print  ocr.get_captcha('captcha.png')
diff --git a/module/plugins/captcha/ShareonlineBiz.py b/module/plugins/captcha/ShareonlineBiz.py
new file mode 100644
index 000000000..91124f181
--- /dev/null
+++ b/module/plugins/captcha/ShareonlineBiz.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+#Copyright (C) 2009 kingzero, RaNaN
+#
+#This program is free software; you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation; either version 3 of the License,
+#or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#See the GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+###
+from captcha import OCR
+
+class ShareonlineBiz(OCR):
+    def __init__(self):
+        OCR.__init__(self)
+        
+    def get_captcha(self, image): 
+        self.load_image(image)
+        self.to_greyscale()
+        self.image = self.image.resize((160, 50))
+        self.pixels = self.image.load()
+        self.threshold(1.85)
+        #self.eval_black_white(240)
+        #self.derotate_by_average()
+
+        letters = self.split_captcha_letters()
+        
+        final = ""
+        for letter in letters:
+            self.image = letter
+            self.run_tesser()
+            final += self.result_captcha
+
+        #replace common errors
+        final = self.correct({
+        "A": "4",
+        "‘5": "3",
+        ("‘1", "T"): "7",
+        ("‘L", "B", "'L"): "2",
+        "b": "6",
+        ("I", "X"): "1"
+        }, final)
+
+        return final
+
+        #tesseract at 60%
+
+if __name__ == '__main__':
+    import urllib
+    ocr = ShareonlineBiz()
+    urllib.urlretrieve("http://www.share-online.biz/captcha.php", "captcha.jpeg")
+    print  ocr.get_captcha('captcha.jpeg')
diff --git a/module/plugins/captcha/__init__.py b/module/plugins/captcha/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/module/plugins/captcha/__init__.py
diff --git a/module/plugins/captcha/captcha.py b/module/plugins/captcha/captcha.py
new file mode 100644
index 000000000..283b171e0
--- /dev/null
+++ b/module/plugins/captcha/captcha.py
@@ -0,0 +1,295 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+#Copyright (C) 2009 kingzero, RaNaN
+#
+#This program is free software; you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation; either version 3 of the License,
+#or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#See the GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+###
+from __future__ import with_statement
+import logging
+import subprocess
+import tempfile
+import threading
+
+import Image
+
+class RunThread(threading.Thread):
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+    def e(self, command, inputdata=None):
+        """execute command """
+        self.command = command
+        self.inputdata = inputdata
+        self.result = ""
+        self.start()
+        self.join(10)
+        return self.result
+
+    def run(self):
+        """Run a command and return standard output"""
+        pipe = subprocess.PIPE
+        popen = subprocess.Popen(self.command, stdout=pipe, stderr=pipe)
+        outputdata, errdata = popen.communicate(self.inputdata)
+        assert (popen.returncode == 0), \
+            "Error running: %s\n\n%s" % (self.command, errdata)
+        self.result = outputdata
+
+class OCR(object):
+    def __init__(self):
+        self.logger = logging.getLogger("log")
+
+    def load_image(self, image):
+        self.image = Image.open(image)
+        self.pixels = self.image.load()
+        self.result_captcha = ''
+
+    def unload(self):
+        """delete all tmp images"""
+        pass
+
+    def threshold(self, value):
+        self.image = self.image.point(lambda a: a * value + 10)
+
+    def run(self, command, inputdata=None):
+        """Run a command and return standard output"""
+    #        OLD METHOD
+    #        pipe = subprocess.PIPE
+    #        popen = subprocess.Popen(command, stdout=pipe, stderr=pipe)
+    #        outputdata, errdata = popen.communicate(inputdata)
+    #        assert (popen.returncode == 0), \
+    #            "Error running: %s\n\n%s" % (command, errdata)
+    #        return outputdata
+
+        thread = RunThread()
+        result = thread.e(command, inputdata)
+        return result
+
+    def run_gocr(self):
+        tmp = tempfile.NamedTemporaryFile(suffix=".jpg")
+        self.image.save(tmp)
+        self.result_captcha = self.run(['gocr', tmp.name]).replace("\n", "")
+
+    def run_tesser(self):
+        self.logger.debug("create tmp tif")
+        tmp = tempfile.NamedTemporaryFile(suffix=".tif")
+        self.logger.debug("create tmp txt")
+        tmpTxt = tempfile.NamedTemporaryFile(suffix=".txt")
+        self.logger.debug("save tiff")
+        self.image.save(tmp.name, 'TIFF')
+        self.logger.debug("run tesseract")
+        self.run(['tesseract', tmp.name, tmpTxt.name.replace(".txt", "")])
+        self.logger.debug("read txt")
+
+        with open(tmpTxt.name, 'r') as f:
+            self.result_captcha = f.read().replace("\n", "")
+
+    def get_captcha(self):
+        raise NotImplementedError
+
+    def to_greyscale(self):
+        if self.image.mode != 'L':
+            self.image = self.image.convert('L')
+
+        self.pixels = self.image.load()
+
+    def eval_black_white(self, limit):
+        self.pixels = self.image.load()
+        w, h = self.image.size
+        for x in xrange(w):
+            for y in xrange(h):
+                if self.pixels[x, y] > limit:
+                    self.pixels[x, y] = 255
+                else:
+                    self.pixels[x, y] = 0
+
+    def clean(self, allowed):
+        pixels = self.pixels
+
+        w, h = self.image.size
+
+        for x in xrange(w):
+            for y in xrange(h):
+                if pixels[x, y] == 255: continue
+                # no point in processing white pixels since we only want to remove black pixel
+                count = 0
+
+                try:
+                    if pixels[x-1, y-1] != 255: count += 1
+                    if pixels[x-1, y] != 255: count += 1
+                    if pixels[x-1, y + 1] != 255: count += 1
+                    if pixels[x, y + 1] != 255: count += 1
+                    if pixels[x + 1, y + 1] != 255: count += 1
+                    if pixels[x + 1, y] != 255: count += 1
+                    if pixels[x + 1, y-1] != 255: count += 1
+                    if pixels[x, y-1] != 255: count += 1
+                except:
+                    pass
+
+        # not enough neighbors are dark pixels so mark this pixel
+            # to be changed to white
+                if count < allowed:
+                    pixels[x, y] = 1
+
+            # second pass: this time set all 1's to 255 (white)
+        for x in xrange(w):
+            for y in xrange(h):
+                if pixels[x, y] == 1: pixels[x, y] = 255
+
+        self.pixels = pixels
+
+    def derotate_by_average(self):
+        """rotate by checking each angle and guess most suitable"""
+
+        w, h = self.image.size
+        pixels = self.pixels
+
+        for x in xrange(w):
+            for y in xrange(h):
+                if pixels[x, y] == 0:
+                    pixels[x, y] = 155
+
+        highest = {}
+        counts = {}
+
+        for angle in range(-45, 45):
+
+            tmpimage = self.image.rotate(angle)
+
+            pixels = tmpimage.load()
+
+            w, h = self.image.size
+
+            for x in xrange(w):
+                for y in xrange(h):
+                    if pixels[x, y] == 0:
+                        pixels[x, y] = 255
+
+
+            count = {}
+
+            for x in xrange(w):
+                count[x] = 0
+                for y in xrange(h):
+                    if pixels[x, y] == 155:
+                        count[x] += 1
+
+            sum = 0
+            cnt = 0
+
+            for x in count.values():
+                if x != 0:
+                    sum += x
+                    cnt += 1
+
+            avg = sum / cnt
+            counts[angle] = cnt
+            highest[angle] = 0
+            for x in count.values():
+                if x > highest[angle]:
+                    highest[angle] = x
+
+            highest[angle] = highest[angle] - avg
+
+        hkey = 0
+        hvalue = 0
+
+        for key, value in highest.iteritems():
+            if value > hvalue:
+                hkey = key
+                hvalue = value
+
+        self.image = self.image.rotate(hkey)
+        pixels = self.image.load()
+
+        for x in xrange(w):
+            for y in xrange(h):
+                if pixels[x, y] == 0:
+                    pixels[x, y] = 255
+
+                if pixels[x, y] == 155:
+                    pixels[x, y] = 0
+
+        self.pixels = pixels
+
+    def split_captcha_letters(self):
+        captcha = self.image
+        started = False
+        letters = []
+        width, height = captcha.size
+        bottomY, topY = 0, height
+        pixels = captcha.load()
+
+        for x in xrange(width):
+            black_pixel_in_col = False
+            for y in xrange(height):
+                if pixels[x, y] != 255:
+                    if started == False:
+                        started = True
+                        firstX = x
+                        lastX = x
+
+                    if y > bottomY: bottomY = y
+                    if y < topY: topY = y
+                    if x > lastX: lastX = x
+
+                    black_pixel_in_col = True
+
+            if black_pixel_in_col == False and started == True:
+                rect = (firstX, topY, lastX, bottomY)
+                new_captcha = captcha.crop(rect)
+
+                w, h = new_captcha.size
+                if w > 5 and h > 5:
+                    letters.append(new_captcha)
+
+                started = False
+                bottomY, topY = 0, height
+
+        return letters
+
+    def correct(self, values, var=None):
+
+        if var:
+            result = var
+        else:
+            result = self.result_captcha
+
+        for key, item in values.iteritems():
+
+            if key.__class__ == str:
+                result = result.replace(key, item)
+            else:
+                for expr in key:
+                    result = result.replace(expr, item)
+
+        if var:
+            return result
+        else:
+            self.result_captcha = result
+
+
+if __name__ == '__main__':
+    ocr = OCR()
+    ocr.load_image("B.jpg")
+    ocr.to_greyscale()
+    ocr.eval_black_white(140)
+    ocr.derotate_by_avergage()
+    ocr.run_gocr()
+    print "GOCR", ocr.result_captcha
+    ocr.run_tesser()
+    print "Tesseract", ocr.result_captcha
+    ocr.image.save("derotated.jpg")
+    
diff --git a/module/plugins/CCF.py b/module/plugins/container/CCF.py
index ba5b1c77d..88b567904 100644
--- a/module/plugins/CCF.py
+++ b/module/plugins/container/CCF.py
@@ -17,7 +17,7 @@ class CCF(Plugin):
         props = {}
         props['name'] = "CCF"
         props['type'] = "container"
-        props['pattern'] = r".*\.ccf"
+        props['pattern'] = r"(?!http://).*\.ccf"
         props['version'] = "0.1"
         props['description'] = """CCF Container Convert Plugin"""
         props['author_name'] = ("Willnix")
@@ -27,11 +27,6 @@ class CCF(Plugin):
         self.multi_dl = True
         self.links = []
 
-    def file_exists(self):
-        """ returns True or False
-        """
-        return True
-
     def proceed(self, url, location):
         infile = url.replace("\n", "")
 
diff --git a/module/plugins/container/DLC.pyc b/module/plugins/container/DLC.pyc
new file mode 100644
index 000000000..14d5d39a4
--- /dev/null
+++ b/module/plugins/container/DLC.pyc
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
new file mode 100644
index 000000000..92508ce29
--- /dev/null
+++ b/module/plugins/container/LinkList.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+
+from module.Plugin import Plugin
+
+class LinkList(Plugin):
+
+    def __init__(self, parent):
+        Plugin.__init__(self, parent)
+        props = {}
+        props['name'] = "LinkList"
+        props['type'] = "container"
+        props['pattern'] = r"(?!http://).*\.txt"
+        props['version'] = "0.1"
+        props['description'] = """Read Link Lists in txt format"""
+        props['author_name'] = ("Spoob")
+        props['author_mail'] = ("spoob@pyload.org")
+        self.props = props
+        self.parent = parent
+        self.html = None
+        self.read_config()
+
+    def proceed(self, linkList, location):
+        tmpLinks = []
+        txt = open(linkList, 'r')
+        links = txt.readlines()
+        for link in links:
+            if link != "\n":
+                tmpLinks.append(link.replace("\n", ""))
+        txt.close()
+
+        if not self.parent.core.config['general']['debug_mode']:
+            txt = open(linkList, 'w')
+            txt.write("")
+            txt.close()
+            #@TODO: maybe delete read txt file?
+            
+        self.links = tmpLinks
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
new file mode 100644
index 000000000..0b6a63722
--- /dev/null
+++ b/module/plugins/container/RSDF.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import base64
+import binascii
+
+from module.Plugin import Plugin
+
+class RSDF(Plugin):
+
+    def __init__(self, parent):
+        Plugin.__init__(self, parent)
+        props = {}
+        props['name'] = "RSDF"
+        props['type'] = "container"
+        props['pattern'] = r"(?!http://).*\.rsdf"
+        props['version'] = "0.2"
+        props['description'] = """RSDF Container Decode Plugin"""
+        props['author_name'] = ("RaNaN", "spoob")
+        props['author_mail'] = ("RaNaN@pyload.org", "spoob@pyload.org")
+        self.props = props
+        self.parent = parent
+        self.multi_dl = True
+        self.links = []
+
+    def proceed(self, url, location):
+        from Crypto.Cipher import AES
+
+        infile = url.replace("\n", "")
+        Key = binascii.unhexlify('8C35192D964DC3182C6F84F3252239EB4A320D2500000000')
+
+        IV = binascii.unhexlify('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF')
+        IV_Cipher = AES.new(Key, AES.MODE_ECB)
+        IV = IV_Cipher.encrypt(IV)
+
+        obj = AES.new(Key, AES.MODE_CFB, IV)
+
+        rsdf = open(infile, 'r')
+
+        data = rsdf.read()
+        data = binascii.unhexlify(''.join(data.split()))
+        data = data.splitlines()
+
+        for link in data:
+            link = base64.b64decode(link)
+            link = obj.decrypt(link)
+            decryptedUrl = link.replace('CCF: ', '')
+            self.links.append(decryptedUrl)
+
+        rsdf.close()
diff --git a/module/plugins/container/__init__.py b/module/plugins/container/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/module/plugins/container/__init__.py
diff --git a/module/plugins/DDLMusicOrg.py b/module/plugins/decrypter/DDLMusicOrg.py
index e34e6fbde..c927d261c 100644
--- a/module/plugins/DDLMusicOrg.py
+++ b/module/plugins/decrypter/DDLMusicOrg.py
@@ -21,6 +21,7 @@ class DDLMusicOrg(Plugin):
         self.props = props
         self.parent = parent
         self.html = None
+        self.multi_dl = False
 
     def download_html(self):
         url = self.parent.url
@@ -29,7 +30,8 @@ class DDLMusicOrg(Plugin):
     def file_exists(self):
         """ returns True or False
         """
-        self.download_html()
+        if not self.html:
+            self.download_html()
         if re.search(r"Wer dies nicht rechnen kann", self.html) != None:
             return True
         return False
@@ -48,7 +50,7 @@ class DDLMusicOrg(Plugin):
             else:
                 solve = int(math.group(1)) - int(math.group(3))
             sleep(3)
-            htmlwithlink = self.req.load("http://ddl-music.org%s" % posturl, cookies=True, post={"calc0":solve, "send0":"Send", "id":id, "linknr":linknr})
+            htmlwithlink = self.req.load("http://ddl-music.org%s" % posturl, cookies=True, post={"calc%s" % linknr:solve, "send%s" % linknr:"Send", "id":id, "linknr":linknr})
             m = re.search(r"<form id=\"ff\" action=\"(.*?)\" method=\"post\">", htmlwithlink)
             if m:
                 self.links = [m.group(1)]
diff --git a/module/plugins/FourChanOrg.py b/module/plugins/decrypter/FourChanOrg.py
index e3b00c1f7..e3b00c1f7 100644
--- a/module/plugins/FourChanOrg.py
+++ b/module/plugins/decrypter/FourChanOrg.py
diff --git a/module/plugins/HoerbuchIn.py b/module/plugins/decrypter/HoerbuchIn.py
index ae7ae9774..2c3fd4123 100644
--- a/module/plugins/HoerbuchIn.py
+++ b/module/plugins/decrypter/HoerbuchIn.py
@@ -12,8 +12,8 @@ class HoerbuchIn(Plugin):
         props = {}
         props['name'] = "HoerbuchIn"
         props['type'] = "container"
-        props['pattern'] = r"http://(www\.)?hoerbuch\.in/blog\.php\?id="
-        props['version'] = "0.3"
+        props['pattern'] = r"http://(www\.)?hoerbuch\.in/(blog\.php\?id=|download_(.*)\.html)"
+        props['version'] = "0.4"
         props['description'] = """Hoerbuch.in Container Plugin"""
         props['author_name'] = ("spoob")
         props['author_mail'] = ("spoob@pyload.org")
diff --git a/module/plugins/LixIn.py b/module/plugins/decrypter/LixIn.py
index d7ef6521d..d7ef6521d 100644
--- a/module/plugins/LixIn.py
+++ b/module/plugins/decrypter/LixIn.py
diff --git a/module/plugins/OneKhDe.py b/module/plugins/decrypter/OneKhDe.py
index 5f24b543a..5f24b543a 100644
--- a/module/plugins/OneKhDe.py
+++ b/module/plugins/decrypter/OneKhDe.py
diff --git a/module/plugins/RSLayerCom.py b/module/plugins/decrypter/RSLayerCom.py
index 20cadbe18..20cadbe18 100644
--- a/module/plugins/RSLayerCom.py
+++ b/module/plugins/decrypter/RSLayerCom.py
diff --git a/module/plugins/RelinkUs.py b/module/plugins/decrypter/RelinkUs.py
index 786733558..71b441116 100644
--- a/module/plugins/RelinkUs.py
+++ b/module/plugins/decrypter/RelinkUs.py
@@ -4,7 +4,7 @@
 import re
 import time
 
-from Plugin import Plugin
+from module.Plugin import Plugin
 
 class RelinkUs(Plugin):
 
@@ -14,10 +14,10 @@ class RelinkUs(Plugin):
         props['name'] = "RelinkUs"
         props['type'] = "container"
         props['pattern'] = r"http://(www\.)?relink.us/(f|((view|go).php))"
-        props['version'] = "0.2"
+        props['version'] = "1"
         props['description'] = """Relink.us Container Plugin"""
-        props['author_name'] = ("Sleeper-")
-        props['author_mail'] = ("@nonymous")
+        props['author_name'] = ("Sleeper-", "spoob")
+        props['author_mail'] = ("@nonymous", "spoob@pyload.org")
         self.props = props
         self.parent = parent
         self.html = None
@@ -55,7 +55,6 @@ class RelinkUs(Plugin):
                 # Wait some secs for relink.us server...
                 time.sleep(5)
 
-            print new_link
             temp_links.append(new_link)
 
         self.links = temp_links
diff --git a/module/plugins/decrypter/SecuredIn.py b/module/plugins/decrypter/SecuredIn.py
new file mode 100644
index 000000000..510d48b28
--- /dev/null
+++ b/module/plugins/decrypter/SecuredIn.py
@@ -0,0 +1,335 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.Plugin import Plugin
+from module.BeautifulSoup import BeautifulSoup
+
+from math import ceil
+
+class SecuredIn(Plugin):
+    def __init__(self, parent):
+        Plugin.__init__(self, parent)
+        props = {}
+        props['name'] = "SecuredIn"
+        props['type'] = "container"
+        props['pattern'] = r"http://[\w\.]*?secured\.in/download-[\d]+-[\w]{8}\.html"
+        props['version'] = "0.1"
+        props['description'] = """secured.in Container Plugin"""
+        props['author_name'] = ("mkaay")
+        props['author_mail'] = ("mkaay@mkaay.de")
+        self.props = props
+        self.parent = parent
+        self.html = None
+        self.multi_dl = False
+    
+    def file_exists(self):
+        return True
+    
+    def proceed(self, url, location):
+        links = []
+        ajaxUrl = "http://secured.in/ajax-handler.php"
+        src = self.req.load(url, cookies=True)
+        soup = BeautifulSoup(src)
+        img = soup.find("img", attrs={"id":"captcha_img"})
+        for i in range(3):
+            form = soup.find("form", attrs={"id":"frm_captcha"})
+            captchaHash = form.find("input", attrs={"id":"captcha_hash"})["value"]
+            captchaUrl = "http://secured.in/%s" % img["src"]
+            captchaData = self.req.load(str(captchaUrl), cookies=True)
+            result = self.waitForCaptcha(captchaData, "jpg")
+            src = self.req.load(url, cookies=True, post={"captcha_key":result, "captcha_hash":captchaHash})
+            soup = BeautifulSoup(src)
+            img = soup.find("img", attrs={"id":"captcha_img"})
+            if not img:
+                files = soup.findAll("tr", attrs={"id":re.compile("file-\d+")})
+                dlIDPattern = re.compile("accessDownload\(\d, \d+, '(.*?)', \d\)")
+                cypher = self.Cypher()
+                for cfile in files:
+                    m = dlIDPattern.search(cfile["onclick"])
+                    if m:
+                        crypted = self.req.load(ajaxUrl, cookies=True, post={"cmd":"download", "download_id":m.group(1)})
+                        cypher.reset()
+                        link = cypher.cypher(crypted)
+                        links.append(link)
+                break
+        self.links = links
+
+    class Cypher():
+        def __init__(self):
+            self.reset()
+        
+        def reset(self):
+            self.iatwbfrd = [
+                0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2,
+                0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5,
+                0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1,
+                0xbd314b27, 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+                0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, 0x7a325381,
+                0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1,
+                0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842,
+                0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+                0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, 0xe06f75d8, 0x85c12073, 0x401a449f,
+                0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b,
+                0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, 0x68fb6faf,
+                0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+                0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8,
+                0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0,
+                0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98,
+                0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+                0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f,
+                0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777,
+                0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266,
+                0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+                0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2,
+                0x02e5b9c5, 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, 0xd60f573f, 0xbc9bc6e4,
+                0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d,
+                0xa99f8fa1, 0x08ba4799, 0x6e85076a
+            ]

+

+            self.olkemfjq = [
+                0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf,
+                0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b
+            ]

+

+            self.oqlaoymh = 0
+            self.oqmykrna = 0
+            self.pqmyzkid = 0
+            self.pldmjnde = 0
+            self.ldiwkqly = 0

+

+            self.plkodnyq = [
+                0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e,
+                0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d,
+                0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8,
+                0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+                0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9,
+                0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6,
+                0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4,
+                0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+                0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, 0x4de81751, 0x3830dc8e, 0x379d5862,
+                0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224,
+                0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, 0xdda26a7e,
+                0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+                0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4,
+                0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b,
+                0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a,
+                0xc6913667, 0x8df9317c, 0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+                0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be,
+                0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e,
+                0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357,
+                0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+                0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c,
+                0xcd769c2b, 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, 0x85cbfe4e, 0x8ae88dd8,
+                0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132,
+                0xce77e25b, 0x578fdfe3, 0x3ac372e6
+            ]

+

+            self.pnjzokye = None

+

+            self.thdlpsmy = [
+                0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7,
+                0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785,
+                0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, 0x68dc1462,
+                0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+                0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7,
+                0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58,
+                0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548,
+                0xe4c66d22, 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+                0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1, 0x3b240b62,
+                0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa,
+                0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, 0xc67b5510,
+                0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+                0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc,
+                0x782ef11c, 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386,
+                0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346,
+                0xf6381fb0, 0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+                0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, 0x846a0e79,
+                0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09,
+                0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83,
+                0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+                0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1,
+                0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5,
+                0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234,
+                0x92638212, 0x670efa8e, 0x406000e0
+            ]

+

+            self.ybghjtik = [
+                0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c,
+                0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5,
+                0x4d2d38e6, 0xf0255dc1, 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1, 0x687f3584,
+                0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+                0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, 0xc8b57634,
+                0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908,
+                0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f,
+                0x2e6b7124, 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+                0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, 0x71dff89e, 0x10314e55, 0x81ac77d6,
+                0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570, 0xeae96fb1,
+                0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, 0xc6150eba,
+                0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+                0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad,
+                0x5b6e2f84, 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239,
+                0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, 0x40685a32,
+                0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+                0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, 0x8fd948e4,
+                0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea,
+                0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2,
+                0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+                0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7,
+                0xce77326e, 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, 0x9e447a2e, 0xc3453484,
+                0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7,
+                0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+            ]
+        
+        def cypher(self, code):

+            return self.lskdqpyr(code, "")

+

+        def lskdqpyr(self, alokfmth, yoaksjdh):
+            if self.pnjzokye == None or self.pnjzokye.lower() == yoaksjdh:

+                self.yoliukev(yoaksjdh)

+                self.pnjzokye = yoaksjdh

+            alokfmth = self.plaomtje(alokfmth)

+            ykaiumgp = ""

+            alokijuh = len(alokfmth)

+            lokimyas = self.ylomiktb(alokfmth[0:8])

+            palsiuzt = lokimyas[0]

+            tzghbndf = lokimyas[1]

+            awsedrft = [None, None]

+            for kiujzhqa in range(8, alokijuh, 8):

+                lokimyas = self.ylomiktb(alokfmth[kiujzhqa:kiujzhqa+8])

+                awsedrft[0] = lokimyas[0]

+                awsedrft[1] = lokimyas[1]

+                lokimyas = self.okaqnhlp(lokimyas[0], lokimyas[1])

+                lokimyas[0] ^= palsiuzt

+                lokimyas[1] ^= tzghbndf

+                palsiuzt = awsedrft[0]

+                tzghbndf = awsedrft[1]

+                ykaiumgp += self.ykijmtkd(lokimyas)

+            return ykaiumgp

+

+        def okaqnhlp(self, lahgrnvp, trenlpys):
+            ujhaqylw = 0

+            for yalmhopr in range(17, 1, -1):

+                lahgrnvp ^= self.ldiwkqly[yalmhopr]

+                trenlpys ^= (self.oqlaoymh[lahgrnvp >> 24 & 0xff] + self.oqmykrna[lahgrnvp >> 16 & 0xff] ^ self.pqmyzkid[lahgrnvp >> 8 & 0xff]) + self.pldmjnde[lahgrnvp & 0xff]

+                ujhaqylw = lahgrnvp

+                lahgrnvp = trenlpys

+                trenlpys = ujhaqylw

+            ujhaqylw = lahgrnvp

+            lahgrnvp = trenlpys

+            trenlpys = ujhaqylw

+            trenlpys ^= self.ldiwkqly[1]

+            lahgrnvp ^= self.ldiwkqly[0]

+            return [lahgrnvp, trenlpys]

+

+        def plaomtje(self, yoiumqpy):
+            qkailkzt = ""

+            xoliuzem = 0

+            lyomiujt = 0

+            yploemju = -1

+            for i in range(0, len(yoiumqpy)):

+                yploamzu = ord(yoiumqpy[i])

+                if ord('A') <= yploamzu and yploamzu <= ord('Z'):

+                    xoliuzem = ord(yoiumqpy[i]) - 65

+                elif ord('a') <= yploamzu and yploamzu <= ord('z'):

+                    xoliuzem = ord(yoiumqpy[i]) - 97 + 26

+                elif ord('0') <= yploamzu and yploamzu <= ord('9'):

+                    xoliuzem = ord(yoiumqpy[i]) - 48 + 52

+                elif yploamzu == ord('+'):

+                    xoliuzem = 62

+                elif yploamzu == ord('/'):

+                    xoliuzem = 63

+                else:

+                    continue

+                yploemju += 1

+

+                lxkdmizj = 0

+                switch = yploemju % 4

+                if switch == 0:

+                    lyomiujt = xoliuzem

+                    continue

+                elif switch == 1:

+                    lxkdmizj = lyomiujt << 2 | xoliuzem >> 4

+                    lyomiujt = xoliuzem & 0x0F

+                elif switch == 2:

+                    lxkdmizj = lyomiujt << 4 | xoliuzem >> 2

+                    lyomiujt = xoliuzem & 0x03

+                elif switch == 3:

+                    lxkdmizj = lyomiujt << 6 | xoliuzem >> 0

+                    lyomiujt = xoliuzem & 0x00

+                qkailkzt += unichr(lxkdmizj)

+            return qkailkzt

+

+        def qmyjuila(self, oqlamykt, yalkionj):
+            dolizmvw = 0

+            for iumswkya in range(0, 16):

+                oqlamykt ^= self.ldiwkqly[iumswkya]

+                yalkionj ^= (self.oqlaoymh[oqlamykt >> 24 & 0xff] + self.oqmykrna[oqlamykt >> 16 & 0xff] ^ self.pqmyzkid[oqlamykt >> 8 & 0xff]) + self.pldmjnde[oqlamykt & 0xff]

+                dolizmvw = oqlamykt

+                oqlamykt = yalkionj

+                yalkionj = dolizmvw

+            dolizmvw = oqlamykt

+            oqlamykt = yalkionj

+            yalkionj = dolizmvw

+            yalkionj ^= self.ldiwkqly[16]

+            oqlamykt ^= self.ldiwkqly[17]

+            return [oqlamykt, yalkionj]

+

+        def ykijmtkd(self, yoirlkqw):
+            loipamyu = len(yoirlkqw)

+            yoirlkqwchar = []

+            for ymujtnbq in range(0, loipamyu):

+                yoir = [yoirlkqw[ymujtnbq] >> 24 & 0xff, yoirlkqw[ymujtnbq] >> 16 & 0xff, yoirlkqw[ymujtnbq] >> 8 & 0xff, yoirlkqw[ymujtnbq] & 0xff]

+                for c in yoir:

+                    yoirlkqwchar.append(chr(c))

+            return "".join(yoirlkqwchar)

+

+        def ylomiktb(self, lofiuzmq):
+            plokimqw = int(ceil(len(lofiuzmq) / 4.0))

+            lopkisdq = []
+            for ypoqlktz in range(0, plokimqw):

+                lopkisdq.append(ord(lofiuzmq[(ypoqlktz << 2) + 3]) + (ord(lofiuzmq[(ypoqlktz << 2) + 2]) << 8) + (ord(lofiuzmq[(ypoqlktz << 2) + 1]) << 16) + (ord(lofiuzmq[(ypoqlktz << 2)]) << 24))
+            return lopkisdq

+

+        def yoliukev(self, kaiumylq):
+            self.oqlaoymh = self.iatwbfrd

+            self.oqmykrna = self.ybghjtik

+            self.pqmyzkid = self.thdlpsmy

+            self.pldmjnde = self.plkodnyq

+

+            yaqpolft = [0 for i in range(len(kaiumylq))]

+

+            yaqwsedr = 0
+            btzqwsay = 0

+            while yaqwsedr < len(kaiumylq):

+                wlqoakmy = 0

+                for lopiuztr in range(0, 4):

+                    wlqoakmy = wlqoakmy << 8 | ord(kaiumylq[yaqwsedr % len(kaiumylq)])

+                    yaqwsedr += 1

+                yaqpolft[btzqwsay] = wlqoakmy
+                btzqwsay += 1

+            self.ldiwkqly = []

+            for btzqwsay in range(0, 18):

+                self.ldiwkqly.append(self.olkemfjq[btzqwsay])

+            yalopiuq = [0, 0]

+            for btzqwsay in range(0, 18, 2):

+                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

+                self.ldiwkqly[btzqwsay] = yalopiuq[0]

+                self.ldiwkqly[btzqwsay + 1] = yalopiuq[1]

+            for btzqwsay in range(0, 256, 2):

+                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

+                self.oqlaoymh[btzqwsay] = yalopiuq[0]

+                self.oqlaoymh[btzqwsay + 1] = yalopiuq[1]

+            for btzqwsay in range(0, 256, 2):

+                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

+                self.oqmykrna[btzqwsay] = yalopiuq[0]

+                self.oqmykrna[btzqwsay + 1] = yalopiuq[1]

+            for btzqwsay in range(0, 256, 2):

+                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

+                self.pqmyzkid[btzqwsay] = yalopiuq[0]

+                self.pqmyzkid[btzqwsay + 1] = yalopiuq[1]

+            for btzqwsay in range(0, 256, 2):

+                yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1])

+                self.pldmjnde[btzqwsay] = yalopiuq[0]

+                self.pldmjnde[btzqwsay + 1] = yalopiuq[1]
+
diff --git a/module/plugins/decrypter/SerienjunkiesOrg.py b/module/plugins/decrypter/SerienjunkiesOrg.py
new file mode 100644
index 000000000..af7dc8169
--- /dev/null
+++ b/module/plugins/decrypter/SerienjunkiesOrg.py
@@ -0,0 +1,216 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.Plugin import Plugin
+from module.BeautifulSoup import BeautifulSoup
+from module.unescape import unescape
+
+class SerienjunkiesOrg(Plugin):
+    def __init__(self, parent):
+        Plugin.__init__(self, parent)
+        props = {}
+        props['name'] = "SerienjunkiesOrg"
+        props['type'] = "container"
+        props['pattern'] = r"http://.*?serienjunkies.org/.*?"
+        props['version'] = "0.2"
+        props['description'] = """serienjunkies.org Container Plugin"""
+        props['author_name'] = ("mkaay")
+        props['author_mail'] = ("mkaay@mkaay.de")
+        self.props = props
+        self.parent = parent
+        self.html = None
+        self.multi_dl = False
+        
+        self.hosterMap = {
+            "rc": "RapidshareCom",
+            "ff": "FilefactoryCom",
+            "ut": "UploadedTo",
+            "ul": "UploadedTo",
+            "nl": "NetloadIn",
+            "rs": "RapidshareDe"
+        }
+        self.hosterMapReverse = dict((v,k) for k, v in self.hosterMap.iteritems())
+        episodePattern = re.compile("^http://download.serienjunkies.org/f-.*?.html$")
+        oldStyleLink = re.compile("^http://serienjunkies.org/safe/(.*)$")
+        if episodePattern.match(self.parent.url) or oldStyleLink.match(self.parent.url):
+            self.decryptNow = False
+        else:
+            self.decryptNow = True
+    
+    def prepare(self, thread):
+        pyfile = self.parent
+
+        self.want_reconnect = False
+
+        pyfile.status.exists = self.file_exists()
+
+        if not pyfile.status.exists:
+            raise Exception, "File not found"
+            return False
+
+        pyfile.status.filename = self.get_file_name()
+            
+        pyfile.status.waituntil = self.time_plus_wait
+        pyfile.status.url = self.get_file_url()
+        pyfile.status.want_reconnect = self.want_reconnect
+
+        thread.wait(self.parent)
+        
+        return True
+    
+    def get_file_name(self):
+        showPattern = re.compile("^http://serienjunkies.org/serie/(.*)/$")
+        seasonPattern = re.compile("^http://serienjunkies.org/.*?/(.*)/$")
+        m = showPattern.match(self.parent.url)
+        if not m:
+            m = seasonPattern.match(self.parent.url)
+        if m:
+            return m.group(1)
+        return "n/a"
+    
+    def getSJSrc(self, url):
+        src = self.req.load(str(url))
+        if not src.find("Enter Serienjunkies") == -1:
+            src = self.req.load(str(url))
+        return src
+    
+    def file_exists(self):
+        return True
+    
+    def handleSeason(self, url):
+        src = self.getSJSrc(url)
+        soup = BeautifulSoup(src)
+        post = soup.find("div", attrs={"class": "post-content"})
+        ps = post.findAll("p")
+        hosterPattern = re.compile("^http://download\.serienjunkies\.org/f-.*?/([rcfultns]{2})_.*?\.html$")
+        preferredHoster = self.get_config("preferredHoster").split(",")
+        self.logger.debug("Preferred hoster: %s" % ", ".join(preferredHoster))
+        groups = {}
+        gid = -1
+        seasonName = unescape(soup.find("a", attrs={"rel":"bookmark"}).string)
+        for p in ps:
+            if re.search("<strong>Dauer|<strong>Sprache|<strong>Format", str(p)):
+                var = p.findAll("strong")
+                opts = {"Dauer": "", "Uploader": "", "Sprache": "", "Format": "", u"Größe": ""}
+                for v in var:
+                    n = unescape(v.string)
+                    val = v.nextSibling
+                    val = val.encode("utf-8")
+                    val = unescape(val)
+                    val = val.replace("|", "").strip()
+                    n = n.strip()
+                    n = re.sub(r"^([:]?)(.*?)([:]?)$", r'\2', n)
+                    val = val.strip()
+                    val = re.sub(r"^([:]?)(.*?)([:]?)$", r'\2', val)
+                    opts[n.strip()] = val.strip()
+                gid += 1
+                groups[gid] = {}
+                groups[gid]["ep"] = []
+                groups[gid]["opts"] = opts
+            elif re.search("<strong>Download:", str(p)):
+                links1 = p.findAll("a", attrs={"href": hosterPattern})
+                links2 = p.findAll("a", attrs={"href": re.compile("^http://serienjunkies.org/safe/.*$")})
+                for link in links1 + links2:
+                    groups[gid]["ep"].append(link["href"])
+        packages = {}
+        for g in groups.values():
+            links = []
+            linklist = g["ep"]
+            package = "%s (%s, %s)" % (seasonName, g["opts"]["Format"], g["opts"]["Sprache"])
+            linkgroups = {}
+            for link in linklist:
+                key = re.sub("^http://download\.serienjunkies\.org/f-.*?/([rcfultns]{2})_", "", link)
+                if not linkgroups.has_key(key):
+                    linkgroups[key] = []
+                linkgroups[key].append(link)
+            for group in linkgroups.values():
+                for pHoster in preferredHoster:
+                    hmatch = False
+                    for link in group:
+                        m = hosterPattern.match(link)
+                        if m:
+                            if pHoster == self.hosterMap[m.group(1)]:
+                                links.append(link)
+                                hmatch = True
+                                break
+                    if hmatch:
+                        break
+            packages[package] = links
+        return packages
+    
+    def handleEpisode(self, url):
+        if not self.parent.core.isGUIConnected():
+            raise CaptchaError
+        for i in range(3):
+            src = self.getSJSrc(url)
+            if not src.find("Du hast das Download-Limit &uuml;berschritten! Bitte versuche es sp&auml;ter nocheinmal.") == -1:
+                self.logger.info("Downloadlimit reached")
+                return False
+            else:
+                soup = BeautifulSoup(src)
+                form = soup.find("form")
+                captchaTag = soup.find(attrs={"src":re.compile("^/secure/")})
+                captchaUrl = "http://download.serienjunkies.org"+captchaTag["src"]
+                captchaData = self.req.load(str(captchaUrl))
+                result = self.waitForCaptcha(captchaData, "png")
+                url = "http://download.serienjunkies.org"+form["action"]
+                sinp = form.find(attrs={"name":"s"})
+                
+                sj = self.req.load(str(url), post={'s': sinp["value"], 'c': result, 'action': "Download"})
+                
+                soup = BeautifulSoup(sj)
+                rawLinks = soup.findAll(attrs={"action": re.compile("^http://download.serienjunkies.org/")})
+                
+                if not len(rawLinks) > 0:
+                    continue
+                
+                links = []
+                for link in rawLinks:
+                    frameUrl = link["action"].replace("/go-", "/frame/go-")
+                    links.append(self.handleFrame(frameUrl))
+                return links
+    
+    def handleOldStyleLink(self, url):
+        if not self.parent.core.isGUIConnected():
+            raise CaptchaError
+        for i in range(3):
+            sj = self.req.load(str(url))
+            soup = BeautifulSoup(sj)
+            form = soup.find("form", attrs={"action":re.compile("^http://serienjunkies.org")})
+            captchaTag = form.find(attrs={"src":re.compile("^/safe/secure/")})
+            captchaUrl = "http://serienjunkies.org"+captchaTag["src"]
+            captchaData = self.req.load(str(captchaUrl))
+            result = self.waitForCaptcha(captchaData, "png")
+            url = form["action"]
+            sinp = form.find(attrs={"name":"s"})
+            
+            self.req.load(str(url), post={'s': sinp["value"], 'c': result, 'dl.start': "Download"}, cookies=False, just_header=True)
+            decrypted = self.req.lastEffectiveURL
+            if decrypted == str(url):
+                continue
+            return [decrypted]
+        return False
+    
+    def handleFrame(self, url):
+        self.req.load(str(url), cookies=False, just_header=True)
+        return self.req.lastEffectiveURL
+    
+    def proceed(self, url, location):
+        links = False
+        episodePattern = re.compile("^http://download.serienjunkies.org/f-.*?.html$")
+        oldStyleLink = re.compile("^http://serienjunkies.org/safe/(.*)$")
+        framePattern = re.compile("^http://download.serienjunkies.org/frame/go-.*?/$")
+        showPattern = re.compile("^http://serienjunkies.org/serie/.*/$")
+        seasonPattern = re.compile("^http://serienjunkies.org/.*?/.*/$")
+        if framePattern.match(url):
+            links = [self.handleFrame(url)]
+        elif episodePattern.match(url):
+            links = self.handleEpisode(url)
+        elif oldStyleLink.match(url):
+            links = self.handleOldStyleLink(url)
+        elif showPattern.match(url):
+            pass
+        elif seasonPattern.match(url):
+            links = self.handleSeason(url)
+        self.links = links
diff --git a/module/plugins/StealthTo.py b/module/plugins/decrypter/StealthTo.py
index 855aae001..855aae001 100644
--- a/module/plugins/StealthTo.py
+++ b/module/plugins/decrypter/StealthTo.py
diff --git a/module/plugins/YoutubeChannel.py b/module/plugins/decrypter/YoutubeChannel.py
index 27a4ff8a7..ba2ca1472 100644
--- a/module/plugins/YoutubeChannel.py
+++ b/module/plugins/decrypter/YoutubeChannel.py
@@ -13,7 +13,7 @@ class YoutubeChannel(Plugin):
         props['name'] = "YoutubeChannel"
         props['type'] = "container"
         props['pattern'] = r"http://(www\.)?(de\.)?\youtube\.com/user/*"
-        props['version'] = "0.3"
+        props['version'] = "0.9"
         props['description'] = """Youtube.com Channel Download Plugin"""
         props['author_name'] = ("RaNaN", "Spoob")
         props['author_mail'] = ("RaNaN@pyload.org", "spoob@pyload.org")
@@ -21,29 +21,34 @@ class YoutubeChannel(Plugin):
         self.parent = parent
         self.html = None
         self.read_config()
+        self.user = re.search(r"/user/(.+)", self.parent.url).group(1)
 
     def file_exists(self):
-        """ returns True or False
-        """
+        if "User not found" in self.req.load("http://gdata.youtube.com/feeds/api/users/%s" % self.user):
+            return False
         return True
 
     def proceed(self, url, location):
-        self.user = re.search(r"/user/(.+)", self.parent.url).group(1)
         max_videos = self.config['max_videos']
         if not max_videos:
             max_videos = 1000 #max video a user can upload
         page = 0
         temp_links = []
-        for start_index in range(1, int(max_videos), 50):
-            max_results = max_videos - page * 50
-            if max_results > 50:
-                max_results = 50
-            url = "http://gdata.youtube.com/feeds/api/users/" + self.user + "/uploads?max-results=" + str(max_results) + "&start-index=" + str(start_index)
-            rep = self.req.load(url)
-            new_links = re.findall(r"href\='(http:\/\/www.youtube.com\/watch\?v\=[^']+)", rep)
-            if new_links != []:
-                temp_links.extend(new_links)
-            else:
-                break
-            page += 1
+        if "," in self.config['video_groups']:
+            video_groups = self.config['video_groups'].split(",")
+        else:
+            video_groups = [self.config['video_groups']]
+        for group in video_groups:
+            for start_index in range(1, int(max_videos), 50):
+                max_results = max_videos - page * 50
+                if max_results > 50:
+                    max_results = 50
+                url = "http://gdata.youtube.com/feeds/api/users/%s/%s?max-results=%i&start-index=%i" % (self.user, group, max_results, start_index)
+                rep = self.req.load(url)
+                new_links = re.findall(r"href\='(http:\/\/www.youtube.com\/watch\?v\=[^']+)", rep)
+                if new_links != []:
+                    temp_links.extend(new_links)
+                else:
+                    break
+                page += 1
         self.links = temp_links
diff --git a/module/plugins/decrypter/__init__.py b/module/plugins/decrypter/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/module/plugins/decrypter/__init__.py
diff --git a/module/plugins/hooks/ContainerDownload.py b/module/plugins/hooks/ContainerDownload.py
new file mode 100644
index 000000000..f520b705c
--- /dev/null
+++ b/module/plugins/hooks/ContainerDownload.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+    
+    @author: mkaay
+    @interface-version: 0.1
+"""
+
+from module.plugins.Hook import Hook
+
+from os.path import join, abspath
+
+class ContainerDownload(Hook):
+    def __init__(self, core):
+        Hook.__init__(self, core)
+        props = {}
+        props['name'] = "ContainerDownload"
+        props['version'] = "0.1"
+        props['description'] = """add the downloaded container to current package"""
+        props['author_name'] = ("mkaay")
+        props['author_mail'] = ("mkaay@mkaay.de")
+        self.props = props
+    
+    def downloadFinished(self, pyfile):
+        filename = pyfile.status.filename
+        if not pyfile.url.startswith("http"):
+            return
+        if filename.endswith(".dlc") or filename.endswith(".ccf") or filename.endswith(".rsdf"):
+            self.logger.info("ContainerDownload: adding container file")
+            location = abspath(join(pyfile.folder, filename))
+            newFile = self.core.file_list.collector.addLink(location)
+            self.core.file_list.packager.addFileToPackage(pyfile.package.data["id"], self.core.file_list.collector.popFile(newFile))
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
new file mode 100644
index 000000000..30bd43770
--- /dev/null
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+    
+    @author: mkaay
+    @interface-version: 0.1
+"""
+
+from module.plugins.Hook import Hook
+import subprocess
+from os import listdir, sep
+from os.path import join
+
+class ExternalScripts(Hook):
+    def __init__(self, core):
+        Hook.__init__(self, core)
+        props = {}
+        props['name'] = "ExternalScripts"
+        props['version'] = "0.1"
+        props['description'] = """run external scripts"""
+        props['author_name'] = ("mkaay", "RaNaN", "spoob")
+        props['author_mail'] = ("mkaay@mkaay.de", "ranan@pyload.org", "spoob@pyload.org")
+        self.props = props
+        self.core = core
+        self.scripts = {}
+        
+        script_folders = ['scripts'+sep+'download_preparing'+sep,
+                          'scripts'+sep+'download_finished'+sep,
+                          'scripts'+sep+'package_finished'+sep,
+                          'scripts'+sep+'before_reconnect'+sep,
+                          'scripts'+sep+'after_reconnect'+sep]

+        self.core.check_file(script_folders, _("folders for scripts"), True)
+        
+        f = lambda x: False if x.startswith("#") or x.endswith("~") else True
+        self.scripts = {}
+
+        folder = join(self.core.path, "scripts")
+
+        self.scripts['download_preparing'] = filter(f, listdir(join(folder, 'download_preparing')))
+        self.scripts['download_finished'] = filter(f, listdir(join(folder, 'download_finished')))
+        self.scripts['package_finished'] = filter(f, listdir(join(folder, 'package_finished')))
+        self.scripts['before_reconnect'] = filter(f, listdir(join(folder, 'before_reconnect')))
+        self.scripts['after_reconnect'] = filter(f, listdir(join(folder, 'after_reconnect')))
+
+        for script_type, script_name in self.scripts.iteritems():
+            if script_name != []:
+                self.logger.info("Installed %s Scripts: %s" % (script_type, ", ".join(script_name)))
+
+        #~ self.core.logger.info("Installed Scripts: %s" % str(self.scripts))
+
+        self.folder = folder
+    
+    def downloadStarts(self, pyfile):
+    	for script in self.scripts['download_preparing']:
+            try:
+                out = subprocess.Popen([join(self.folder, 'download_preparing', script), pyfile.plugin.props['name'], pyfile.url], stdout=subprocess.PIPE)
+                out.wait()
+            except:
+                pass
+    
+    def downloadFinished(self, pyfile):
+        for script in self.scripts['download_finished']:
+            try:
+                out = subprocess.Popen([join(self.folder, 'download_finished', script), pyfile.plugin.props['name'], pyfile.url, pyfile.status.name, \
+                join(self.core.path,self.core.config['general']['download_folder'], pyfile.folder, pyfile.status.name)], stdout=subprocess.PIPE)
+            except:
+                pass
+    
+    def packageFinished(self, pypack):
+        """
+            not implemented!
+        """
+        pass
+    
+    def beforeReconnecting(self, ip):
+        for script in self.scripts['before_reconnect']:
+            try:
+                out = subprocess.Popen([join(self.folder, 'before_reconnect', script), ip], stdout=subprocess.PIPE)
+                out.wait()
+            except:
+                pass
+    
+    def afterReconnecting(self, ip):
+        for script in self.scripts['after_reconnect']:
+            try:
+                out = subprocess.Popen([join(self.folder, 'download_preparing', script), ip], stdout=subprocess.PIPE)
+            except:
+                pass
diff --git a/module/plugins/hooks/__init__.py b/module/plugins/hooks/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/module/plugins/hooks/__init__.py
diff --git a/module/plugins/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 6c5748096..6c5748096 100644
--- a/module/plugins/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
diff --git a/module/plugins/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py
index ff069b20f..5b7db301d 100644
--- a/module/plugins/FilefactoryCom.py
+++ b/module/plugins/hoster/FilefactoryCom.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import re
-import urllib
 from module.Plugin import Plugin
 from time import time
 
diff --git a/module/plugins/FilesmonsterCom.py b/module/plugins/hoster/FilesmonsterCom.py
index 27c687363..27c687363 100644
--- a/module/plugins/FilesmonsterCom.py
+++ b/module/plugins/hoster/FilesmonsterCom.py
diff --git a/module/plugins/FreakshareNet.py b/module/plugins/hoster/FreakshareNet.py
index 0768b5476..0768b5476 100644
--- a/module/plugins/FreakshareNet.py
+++ b/module/plugins/hoster/FreakshareNet.py
diff --git a/module/plugins/GigasizeCom.py b/module/plugins/hoster/GigasizeCom.py
index e22fe8593..e22fe8593 100644
--- a/module/plugins/GigasizeCom.py
+++ b/module/plugins/hoster/GigasizeCom.py
diff --git a/module/plugins/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
index 7ae432c78..a9853100c 100644
--- a/module/plugins/HotfileCom.py
+++ b/module/plugins/hoster/HotfileCom.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import re
-import urllib
 from time import time
 from module.Plugin import Plugin
 
@@ -20,17 +19,18 @@ class HotfileCom(Plugin):
         props['author_mail'] = ("sitacuisses@yhoo.de","spoob@pyload.org","mkaay@mkaay.de")
         self.props = props
         self.parent = parent
-        self.html = None
+        self.html = [None, None]
         self.want_reconnect = False
         self.multi_dl = False
         self.htmlwithlink = None
         self.url = None
-
+        
     def prepare(self, thread):
         pyfile = self.parent
 
         self.want_reconnect = False
-
+        
+        self.download_html()
         pyfile.status.exists = self.file_exists()
 
         if not pyfile.status.exists:
@@ -46,47 +46,31 @@ class HotfileCom(Plugin):
         thread.wait(self.parent)
         
         pyfile.status.url = self.get_file_url()
-
         return True
 
     def download_html(self):
         self.url = self.parent.url
-        self.html = self.req.load(self.url)
+        self.html[0] = self.req.load(self.url, cookies=True)
 
     def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
-        if self.html == None:
-            self.download_html()
-        if not self.want_reconnect:
-            self.get_download_page()
-            file_url = re.search("a href=\"(http://hotfile\.com/get/\S*?)\"", self.htmlwithlink).group(1)
-            return file_url
-        else:
-            return False
+        form_content = re.search(r"<form style=.*(\n<.*>\s*)*?\n<tr>", self.html[0]).group(0)
+        form_posts = re.findall(r"<input\stype=hidden\sname=(\S*)\svalue=(\S*)>", form_content)
+        self.html[1] = self.req.load(self.url, post=form_posts, cookies=True)
+        file_url = re.search("a href=\"(http://hotfile\.com/get/\S*?)\"", self.html[1]).group(1)
+        return file_url
 
     def get_file_name(self):
-        if self.html == None:
-            self.download_html()
-        if not self.want_reconnect:
-            file_name = re.search('Downloading\s<b>(.*?)</b>', self.html).group(1)
-            return file_name
-        else:
-            return self.parent.url
+        file_name = re.search('Downloading\s<b>(.*?)</b>', self.html[0]).group(1)
+        return file_name
 
     def file_exists(self):
-        """ returns True or False
-        """
-        if self.html == None:
-            self.download_html()
-        if re.search(r"Such file does not exist or it has been removed for infringement of copyrights.", self.html) != None:
+        if re.search(r"Such file does not exist or it has been removed for infringement of copyrights.", self.html[0]) != None:
             return False
-        else:
-            return True
+        return True
     
     def get_wait_time(self):
         free_limit_pattern = re.compile(r"timerend=d\.getTime\(\)\+(\d+);")
-        matches = free_limit_pattern.findall(self.html)
+        matches = free_limit_pattern.findall(self.html[0])
         if matches:
             for match in matches:
                 if int(match) == 60000:
@@ -98,14 +82,3 @@ class HotfileCom(Plugin):
                     self.want_reconnect = True
                     return True
             self.time_plus_wait = time() + 65
-
-    def get_download_page(self):
-        herewego = re.search(r"<form style=.*(\n<.*>\s*)*?\n<tr>", self.html).group(0)
-        all_the_tuples = re.findall(r"<input\stype=hidden\sname=(\S*)\svalue=(\S*)>", herewego)
-        
-        self.htmlwithlink = self.req.load(self.url, None, all_the_tuples)
-
-    def proceed(self, url, location):
-
-        self.req.download(url, location)
-
diff --git a/module/plugins/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index 3736503c0..3eb21a591 100644
--- a/module/plugins/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -4,6 +4,7 @@
 import os
 import re
 import tempfile
+from time import time
 
 from module.Plugin import Plugin
 
@@ -21,6 +22,8 @@ class MegauploadCom(Plugin):
         props['author_mail'] = ("spoob@pyload.org")
         self.props = props
         self.parent = parent
+        self.time_plus_wait = None   #time() + wait in seconds
+
         self.html = [None, None]
         self.want_reconnect = False
         self.init_ocr()
@@ -30,19 +33,19 @@ class MegauploadCom(Plugin):
         url = self.parent.url
 
         captcha_image = tempfile.NamedTemporaryFile(suffix=".gif").name
-
+        
         for i in range(5):
             self.html[0] = self.req.load(url, cookies=True)
             url_captcha_html = re.search('(http://www.{,3}\.megaupload\.com/gencap.php\?.*\.gif)', self.html[0]).group(1)
             self.req.download(url_captcha_html, captcha_image, cookies=True)
             captcha = self.ocr.get_captcha(captcha_image)
+            os.remove(captcha_image)            
             captchacode = re.search('name="captchacode" value="(.*)"', self.html[0]).group(1)
             megavar = re.search('name="megavar" value="(.*)">', self.html[0]).group(1)
             self.html[1] = self.req.load(url, post={"captcha": captcha, "captchacode": captchacode, "megavar": megavar}, cookies=True)
             if re.search(r"Waiting time before each download begins", self.html[1]) != None:
                 break
-
-        os.remove(captcha_image)
+        self.time_plus_wait = time() + 45
 
     def get_file_url(self):
         """ returns the absolute downloadable filepath
@@ -52,7 +55,7 @@ class MegauploadCom(Plugin):
         if not self.want_reconnect:
             file_url_pattern = 'id="downloadlink"><a href="(.*)" onclick="'
             search = re.search(file_url_pattern, self.html[1])
-            return search.group(1)
+            return search.group(1).replace(" ", "%20")
         else:
             return False
 
@@ -75,3 +78,6 @@ class MegauploadCom(Plugin):
             return False
         else:
             return True
+            
+    def proceed(self, url, location):
+        self.req.download(url, location, cookies=True)
diff --git a/module/plugins/hoster/MyvideoDe.py b/module/plugins/hoster/MyvideoDe.py
new file mode 100644
index 000000000..0fe315547
--- /dev/null
+++ b/module/plugins/hoster/MyvideoDe.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+import re
+from module.Plugin import Plugin
+
+class MyvideoDe(Plugin):
+    def __init__(self, parent):
+        Plugin.__init__(self, parent)
+        props = {}
+        props['name'] = "MyvideoDe"
+        props['type'] = "hoster"
+        props['pattern'] = r"http://(www\.)?myvideo.de/watch/"
+        props['version'] = "0.9"
+        props['description'] = """Myvideo.de Video Download Plugin"""
+        props['author_name'] = ("spoob")
+        props['author_mail'] = ("spoob@pyload.org")
+        self.props = props
+        self.parent = parent
+        self.html = None
+        self.url = self.parent.url
+
+    def download_html(self):
+        self.html = self.req.load(self.url)
+
+    def get_file_url(self):
+        videoId = re.search(r"addVariable\('_videoid','(.*)'\);p.addParam\('quality'", self.html).group(1)
+        videoServer = re.search("rel='image_src' href='(.*)thumbs/.*' />", self.html).group(1)
+        file_url = videoServer + videoId + ".flv"
+        return file_url
+
+    def get_file_name(self):
+        file_name_pattern = r"<h1 class='globalHd'>(.*)</h1>"
+        return re.search(file_name_pattern, self.html).group(1).replace("/", "") + '.flv'
+
+    def file_exists(self):
+        self.download_html()
+        self.req.load(str(self.url), cookies=False, just_header=True)
+        if self.req.lastEffectiveURL == "http://www.myvideo.de/":
+            return False
+        return True
diff --git a/module/plugins/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index b9fb4cfed..46afc4080 100644
--- a/module/plugins/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -37,103 +37,75 @@ class NetloadIn(Plugin):
 
     def prepare(self, thread):
         pyfile = self.parent
-
+        self.req.clear_cookies()
         self.want_reconnect = False
 
-        tries = 0
-
-        while not pyfile.status.url:
-
-            self.req.clear_cookies()
-            self.download_html()
-
-            pyfile.status.exists = self.file_exists()
-
-            if not pyfile.status.exists:
-                raise Exception, "The file was not found on the server."
-                
-            self.download_api_data()
-
+        self.download_api_data()
+        if self.file_exists():
             pyfile.status.filename = self.get_file_name()
-            
+
             if self.config['premium']:
+                self.req.load("http://netload.in/index.php", None, { "txtuser" : self.config['username'], "txtpass" : self.config['password'], "txtcheck" : "login", "txtlogin" : ""}, cookies=True)
+                self.logger.info("Netload: Use Premium Account")
                 pyfile.status.url = self.parent.url
                 return True
-            
-            self.download_html2()
 
-            self.get_wait_time()
-
-            pyfile.status.waituntil = self.time_plus_wait
-            pyfile.status.want_reconnect = self.want_reconnect
-
-            thread.wait(self.parent)
-
-            pyfile.status.url = self.get_file_url()
-
-            tries += 1
-            if tries > 3:
-                raise Exception, "Error while preparing DL, HTML dump: %s %s" % (self.html[0], self.html[1])
+            while not pyfile.status.url:
+                self.download_html()
+                self.get_wait_time()
+                pyfile.status.waituntil = self.time_plus_wait
+                pyfile.status.want_reconnect = self.want_reconnect
+                thread.wait(self.parent)
+                
+                pyfile.status.url = self.get_file_url()
 
-        return True
-        
+        else:
+            raise Exception, "The file was not found on the server."
+            
     def download_api_data(self):
         url = self.parent.url
-        id_regex = re.compile("http://netload.in/datei(.*?)(?:\.htm|/)")
+        id_regex = re.compile("http://.*netload.in/datei(.*?)(?:\.htm|/)")
         match = id_regex.search(url)
         if match:
             apiurl = "http://netload.in/share/fileinfos2.php"
             src = self.req.load(apiurl, cookies=False, get={"file_id": match.group(1)})
             self.api_data = {}
-            lines = src.split(";")
-            self.api_data["fileid"] = lines[0]
-            self.api_data["filename"] = lines[1]
-            self.api_data["size"] = lines[2] #@TODO formatting? (ex: '2.07 KB')
-            self.api_data["status"] = lines[3]
-            self.api_data["checksum"] = lines[4]
-
+            if not src == "unknown file_data":
+                lines = src.split(";")
+                self.api_data["exists"] = True
+                self.api_data["fileid"] = lines[0]
+                self.api_data["filename"] = lines[1]
+                self.api_data["size"] = lines[2] #@TODO formatting? (ex: '2.07 KB')
+                self.api_data["status"] = lines[3]
+                self.api_data["checksum"] = lines[4].strip()
+            else:
+                self.api_data["exists"] = False
 
     def download_html(self):
-        if self.config['premium']:
-            self.config['username'], self.config['password']
-            self.req.load("http://netload.in/index.php", None, { "txtuser" : self.config['username'], "txtpass" : self.config['password'], "txtcheck" : "login", "txtlogin" : ""})
-        url = self.parent.url
-        self.html[0] = self.req.load(url, cookies=True)
-
-    def download_html2(self):
-        
+        self.html[0] = self.req.load(self.parent.url, cookies=True)
         url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&amp;.*&amp;captcha=1)', self.html[0]).group(1).replace("amp;", "")
-
         for i in range(6):
             self.html[1] = self.req.load(url_captcha_html, cookies=True)
-
             try:
                 captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', self.html[1]).group(1)
             except:
                 url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&amp;.*&amp;captcha=1)', self.html[1]).group(1).replace("amp;", "")
                 self.html[1] = self.req.load(url_captcha_html, cookies=True)
                 captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', self.html[1]).group(1)
-           
-            file_id = re.search('<input name="file_id" type="hidden" value="(.*)" />', self.html[1]).group(1)
 
+            file_id = re.search('<input name="file_id" type="hidden" value="(.*)" />', self.html[1]).group(1)
             captcha_image = tempfile.NamedTemporaryFile(suffix=".png").name
-            
             self.req.download(captcha_url, captcha_image, cookies=True)
             captcha = self.ocr.get_captcha(captcha_image)
+            os.remove(captcha_image)
             self.logger.debug("Captcha %s: %s" % (i, captcha))
             sleep(5)
             self.html[2] = self.req.load("http://netload.in/index.php?id=10", post={"file_id": file_id, "captcha_check": captcha}, cookies=True)
 
-            os.remove(captcha_image)
-
             if re.search(r"(We will prepare your download..|We had a reqeust with the IP)", self.html[2]) != None:
-                return True
-    
-        raise Exception, "Captcha reading failed"
+                break
 
     def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
         try:
             file_url_pattern = r"<a class=\"Orange_Link\" href=\"(http://.+)\" >Click here"
             return re.search(file_url_pattern, self.html[2]).group(1)
@@ -141,42 +113,45 @@ class NetloadIn(Plugin):
             return None
 
     def get_wait_time(self):
-        wait = int(re.search(r"countdown\((.+),'change\(\)'\)", self.html[2]).group(1))
-        self.time_plus_wait = time() + wait / 100
-
         if re.search(r"We had a reqeust with the IP", self.html[2]):
+            wait_minutes = int(re.search(r"countdown\((.+),'change\(\)'\)", self.html[2]).group(1)) / 6000
             self.want_reconnect = True
+            self.time_plus_wait = time() + wait_minutes * 60
+            return
+            
+        wait_seconds = int(re.search(r"countdown\((.+),'change\(\)'\)", self.html[2]).group(1)) / 100
+        self.time_plus_wait = time() + wait_seconds
         
     def get_file_name(self):
-        try:
-            if self.api_data and self.api_data["filename"]:
-                return self.api_data["filename"]
+        if self.api_data["filename"]:
+            return self.api_data["filename"]
+        elif self.html[0]:
             file_name_pattern = '\t\t\t(.+)<span style="color: #8d8d8d;">'
-            return re.search(file_name_pattern, self.html[0]).group(1)
-        except:
-            return self.parent.url
+            file_name_search = re.search(file_name_pattern, self.html[0])
+            if file_name_search:
+                return file_name_search.group(1)
+        return self.parent.url
 
     def file_exists(self):
-        """ returns True or False
-        """
-        if re.search(r"The file has been deleted", self.html[0]) != None:
-            return False
-        else:
+        if self.api_data["exists"]:
+            return self.api_data["exists"]
+        elif self.html[0] and re.search(r"The file has been deleted", self.html[0]) == None:
             return True
+        return False
 
     def proceed(self, url, location):
-
         self.req.download(url, location, cookies=True)
 
     def check_file(self, local_file):
         if self.api_data and self.api_data["checksum"]:
             h = hashlib.md5()
-            with open(local_file, "rb") as f:
-                h.update(f.read())
+            f = open(local_file, "rb")
+            h.update(f.read())
+            f.close()
             hexd = h.hexdigest()
             if hexd == self.api_data["checksum"]:
                 return (True, 0)
             else:
                 return (False, 1)
         else:
-        	return (True, 5)
+            return (True, 5)
diff --git a/module/plugins/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index 275fa761c..10654e5c8 100644
--- a/module/plugins/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
@@ -15,7 +15,7 @@ class RapidshareCom(Plugin):
         props['name'] = "RapidshareCom"
         props['type'] = "hoster"
         props['pattern'] = r"http://[\w\.]*?rapidshare.com/files/(\d*?)/(.*)"
-        props['version'] = "0.5"
+        props['version'] = "1.0"
         props['description'] = """Rapidshare.com Download Plugin"""
         props['author_name'] = ("spoob", "RaNaN", "mkaay")
         props['author_mail'] = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de")
@@ -26,6 +26,8 @@ class RapidshareCom(Plugin):
         self.time_plus_wait = None   #time() + wait in seconds
         self.want_reconnect = False
         self.no_slots = True
+        self.api_data = None
+        self.url = self.parent.url
         self.read_config()
         if self.config['premium']:
             self.multi_dl = True
@@ -36,60 +38,47 @@ class RapidshareCom(Plugin):
 
     def prepare(self, thread):
         pyfile = self.parent
-
+        self.req.clear_cookies()
         self.want_reconnect = False
 
-        tries = 0
-        
-        while not self.start_dl or not pyfile.status.url:
-
-            self.req.clear_cookies()
-
-            self.download_html()
-
-            pyfile.status.exists = self.file_exists()
-            
-            if not pyfile.status.exists:
-                raise Exception, "The file was not found on the server."
-            
-            self.download_api_data()
-            
+        self.download_api_data()
+        if self.api_data["status"] == "1":
             pyfile.status.filename = self.get_file_name()
             
-            if self.config['premium']:
+            if self.config["premium"]:
+                self.logger.info("Rapidshare: Use Premium Account (%sGB left)" % (self.props["premkbleft"]/1000000))
                 pyfile.status.url = self.parent.url
                 return True
 
+            self.download_html()
             while self.no_slots:
-                self.download_serverhtml()
+                self.get_wait_time()
                 pyfile.status.waituntil = self.time_plus_wait
                 pyfile.status.want_reconnect = self.want_reconnect
-                
                 thread.wait(pyfile)
 
             pyfile.status.url = self.get_file_url()
-            
-            if self.no_slots:
-                raise Exception, "No free slots!"
-
-            tries += 1
-            if tries > 5:
-                raise Exception, "Error while preparing, HTML dump:"+ str(self.html[0]) + str(self.html[1])
 
-        return True
+            return True
+        elif self.api_data["status"] == "2":
+            self.logger.info("Rapidshare: Traffic Share (direct download)")
+            pyfile.status.filename = self.get_file_name()
+            pyfile.status.url = self.parent.url
+            return True
+        else:
+            raise Exception, "The file was not found on the server."
 
     def download_api_data(self):
         """
         http://images.rapidshare.com/apidoc.txt
         """
-        url = self.parent.url
         api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
-        api_param = {"sub": "checkfiles_v1", "files": "", "filenames": "", "incmd5": "1"}
-        m = re.compile(self.props['pattern']).search(url)
+        api_param_file = {"sub": "checkfiles_v1", "files": "", "filenames": "", "incmd5": "1"}
+        m = re.compile(self.props['pattern']).search(self.url)
         if m:
-            api_param["files"] = m.group(1)
-            api_param["filenames"] = m.group(2)
-            src = self.req.load(api_url_base, cookies=False, get=api_param)
+            api_param_file["files"] = m.group(1)
+            api_param_file["filenames"] = m.group(2)
+            src = self.req.load(api_url_base, cookies=False, get=api_param_file)
             if src.startswith("ERROR"):
                 return
             fields = src.split(",")
@@ -114,84 +103,74 @@ class RapidshareCom(Plugin):
             
             self.api_data["mirror"] = "http://rs%(serverid)s%(shorthost)s.rapidshare.com/files/%(fileid)s/%(filename)s" % self.api_data
 
+        if self.config["premium"]:
+            api_param_prem = {"sub": "getaccountdetails_v1", "type": "prem", \
+                "login": self.config['username'], "password": self.config['password']}
+            src = self.req.load(api_url_base, cookies=False, get=api_param_prem)
+            if src.startswith("ERROR"):
+                self.config["premium"] = False
+                self.logger.info("Rapidshare: Login failed")
+                return
+            fields = src.split("\n")
+            premkbleft = int(fields[19].split("=")[1])
+            if premkbleft < int(self.api_data["size"][0:-3]):
+                self.logger.info("Rapidshare: Not enough traffic left")
+                self.config["premium"] = False
+            else:
+                self.props["premkbleft"] = premkbleft
+
     def download_html(self):
         """ gets the url from self.parent.url saves html in self.html and parses
         """
-        url = self.parent.url
-        self.html[0] = self.req.load(url, cookies=True)
+        self.html[0] = self.req.load(self.url, cookies=True)
         self.html_old = time()
 
-    def download_serverhtml(self):
+    def get_wait_time(self):
         """downloads html with the important informations
         """
         file_server_url = re.search(r"<form action=\"(.*?)\"", self.html[0]).group(1)
         self.html[1] = self.req.load(file_server_url, cookies=True, post={"dl.start": "Free"})
         
         self.html_old = time()
-        self.get_wait_time()
 
-    def get_wait_time(self):
-        if re.search(r"is already downloading", self.html[1]) != None:
-            self.time_plus_wait = time() + 10 * 60
+        if re.search(r"is already downloading", self.html[1]):
+            self.logger.info("Rapidshare: Already downloading, wait 30 minutes")
+            self.time_plus_wait = time() + 10 * 30
+            return
         self.no_slots = False
         try:
             wait_minutes = re.search(r"Or try again in about (\d+) minute", self.html[1]).group(1)
             self.time_plus_wait = time() + 60 * int(wait_minutes)
             self.want_reconnect = True
         except:
-            if re.search(r"(Currently a lot of users|There are no more download slots)", self.html[1], re.I) != None:
+            if re.search(r"(Currently a lot of users|no more download slots|servers are overloaded)", self.html[1], re.I) != None:
                 self.time_plus_wait = time() + 130
-                self.parent.parent.logger.info("Rapidshare: No free slots!")
+                self.logger.info("Rapidshare: No free slots!")
                 self.no_slots = True
                 return True
             self.no_slots = False
             wait_seconds = re.search(r"var c=(.*);.*", self.html[1]).group(1)
             self.time_plus_wait = time() + int(wait_seconds) + 5
 
-    def file_exists(self):
-        """ returns True or False
-        """
-        if re.search("The file could not be found|This limit is reached| \
-            is momentarily not available|removed this file| \
-            contain illegal content", self.html[0], re.I) != None:
-            return False
-        else:
-            return True
-
     def get_file_url(self):
         """ returns the absolute downloadable filepath
         """
-        if self.config['premium']:
-            self.start_dl = True
-            if self.api_data and self.api_data["mirror"]:
-                return self.api_data["mirror"]
-            return self.parent.url
-
-        #if (self.html_old + 5 * 60) < time(): # nach einiger zeit ist die file_url nicht mehr aktuell
-        #   self.download_serverhtml()
-
-        try:
-            if self.no_slots:
-                self.start_dl = False
-                return False
-            if self.config['server'] == "":
-                file_url_pattern = r".*name=\"dlf\" action=\"(.*)\" method=.*"
-            else:
-                file_url_pattern = '(http://rs.*)\';" /> %s<br />' % self.config['server']
+        if self.config['server'] == "":
+            file_url_pattern = r".*name=\"dlf\" action=\"(.*)\" method=.*"
+        else:
+            file_url_pattern = '(http://rs.*)\';" /> %s<br />' % self.config['server']
 
-            self.start_dl = True
-            return re.search(file_url_pattern, self.html[1]).group(1)
-        except Exception, e:
-            self.start_dl = False
-            return False
-            #print self.html[1] #test print
-            #raise Exception, "Error when retrieving download url"
+        return re.search(file_url_pattern, self.html[1]).group(1)
 
     def get_file_name(self):
-        if self.api_data and self.api_data["filename"]:
+        if self.api_data["filename"]:
             return self.api_data["filename"]
-        file_name_pattern = r"<p class=\"downloadlink\">.+/(.+) <font"
-        return re.findall(file_name_pattern, self.html[0])[0]
+        elif self.html[0]:
+            file_name_pattern = r"<p class=\"downloadlink\">.+/(.+) <font"
+            file_name_search = re.search(file_name_pattern, self.html[0])
+            if file_name_search:
+                return file_name_search.group(1)
+        return self.url.split("/")[-1]
 
     def proceed(self, url, location):
         if self.config['premium']:
@@ -210,4 +189,4 @@ class RapidshareCom(Plugin):
             else:
                 return (False, 1)
         else:
-        	return (True, 5)
+            return (True, 5)
diff --git a/module/plugins/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index a798ccefa..63d05c47a 100644
--- a/module/plugins/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -6,6 +6,7 @@ import re
 import tempfile
 from time import time
 from base64 import b64decode
+import hashlib
 
 from module.Plugin import Plugin
 
@@ -26,11 +27,45 @@ class ShareonlineBiz(Plugin):
         self.html = [None, None]
         self.want_reconnect = False
         self.init_ocr()
+        self.url = self.parent.url
+        self.read_config()
         if self.config['premium']:
             self.multi_dl = True
         else:
             self.multi_dl = False
 
+    def prepare(self, thread):
+        pyfile = self.parent
+
+        self.download_api_data()
+        if self.api_data["status"]:
+            self.download_html()
+            pyfile.status.filename = self.api_data["filename"]
+            pyfile.status.waituntil = self.time_plus_wait
+            pyfile.status.url = self.get_file_url()
+            pyfile.status.want_reconnect = self.want_reconnect
+        else:
+            raise Exception, "File not found"
+            return False
+
+    def download_api_data(self):
+        """
+        http://images.rapidshare.com/apidoc.txt
+        """
+        api_url_base = "http://www.share-online.biz/linkcheck/linkcheck.php?md5=1"
+        api_param_file = {"links": self.url}
+        src = self.req.load(api_url_base, cookies=False, post=api_param_file)
+
+        fields = src.split(";")
+        self.api_data = {}
+        self.api_data["fileid"] = fields[0]
+        self.api_data["status"] = fields[1]
+        if self.api_data["status"] == "NOTFOUND":
+            return
+        self.api_data["filename"] = fields[2]
+        self.api_data["size"] = fields[3] # in bytes
+        self.api_data["checksum"] = fields[4].strip().lower().replace("\n\n", "") # md5        
+
     def download_html(self):
         if self.config['premium']:
             post_vars = {"act": "login",
@@ -47,11 +82,12 @@ class ShareonlineBiz(Plugin):
         if not self.config['premium']:
             captcha_image = tempfile.NamedTemporaryFile(suffix=".jpg").name
 
-            for i in range(5):
+            for i in range(10):
                 self.req.download("http://www.share-online.biz/captcha.php", captcha_image, cookies=True)
                 captcha = self.ocr.get_captcha(captcha_image)
+                self.logger.debug("Captcha %s: %s" % (i, captcha))
                 self.html[1] = self.req.load(url, post={"captchacode": captcha}, cookies=True)
-                if re.search(r"Der Download ist Ihnen zu langsam?", self.html[1]) != None:
+                if re.search(r"Der Download ist Ihnen zu langsam", self.html[1]) != None:
                     self.time_plus_wait = time() + 15
                     break
 
@@ -60,29 +96,22 @@ class ShareonlineBiz(Plugin):
     def get_file_url(self):
         """ returns the absolute downloadable filepath
         """
-        if self.html[0] == None:
-            self.download_html()
         if not self.want_reconnect:
             file_url_pattern = 'loadfilelink\.decode\("(.*)\); document'
             return b64decode(re.search(file_url_pattern, self.html[1]).group(1))
         else:
             return False
 
-    def get_file_name(self):
-        if self.html[0] == None:
-            self.download_html()
-        if not self.want_reconnect:
-            file_name_pattern = 'class="locatedActive">Download (.*)</span>'
-            return re.search(file_name_pattern, self.html[1]).group(1)
-        else:
-            return self.parent.url
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if self.html[0] == None:
-            self.download_html()
-        if re.search(r"nicht zum Download bereitgestellt werden", self.html[0]) != None:
-            return False
+    def check_file(self, local_file):
+        if self.api_data and self.api_data["checksum"]:
+            h = hashlib.md5()
+            f = open(local_file, "rb")
+            h.update(f.read())
+            f.close()
+            hexd = h.hexdigest()
+            if hexd == self.api_data["checksum"]:
+                return (True, 0)
+            else:
+                return (False, 1)
         else:
-            return True
+            return (True, 5)
diff --git a/module/plugins/ShragleCom.py b/module/plugins/hoster/ShragleCom.py
index c0cc9de72..c0cc9de72 100644
--- a/module/plugins/ShragleCom.py
+++ b/module/plugins/hoster/ShragleCom.py
diff --git a/module/plugins/StorageTo.py b/module/plugins/hoster/StorageTo.py
index dbff844ad..dbff844ad 100644
--- a/module/plugins/StorageTo.py
+++ b/module/plugins/hoster/StorageTo.py
diff --git a/module/plugins/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index 4bddbd6f1..619c9bba1 100644
--- a/module/plugins/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import re
@@ -13,7 +12,7 @@ class UploadedTo(Plugin):
         props = {}
         props['name'] = "UploadedTo"
         props['type'] = "hoster"
-        props['pattern'] = r"http://(?:www\.)?u(?:p)?l(?:oaded)?\.to/(?:file/)?(.*)"
+        props['pattern'] = r"http://(?:www\.)?u(?:p)?l(?:oaded)?\.to/(?:file/|\?id=)?(.+)"
         props['version'] = "0.3"
         props['description'] = """Uploaded.to Download Plugin"""
         props['author_name'] = ("spoob", "mkaay")
@@ -21,7 +20,6 @@ class UploadedTo(Plugin):
         self.props = props
         self.parent = parent
         self.html = None
-        self.html_old = None		#time() where loaded the HTML
         self.time_plus_wait = None	#time() + wait in seconds
         self.api_data = None
         self.want_reconnect = False
@@ -35,12 +33,11 @@ class UploadedTo(Plugin):
 
     def prepare(self, thread):
         pyfile = self.parent
-		
+        
         self.want_reconnect = False
         tries = 0
 
         while not pyfile.status.url:
-        
             self.req.clear_cookies()
             self.download_html()
 
@@ -84,11 +81,8 @@ class UploadedTo(Plugin):
             self.api_data["filename"] = lines[0]
             self.api_data["size"] = lines[1] # in kbytes
             self.api_data["checksum"] = lines[2] #sha1
-	
+
     def download_html(self):
-        if self.config['premium']:
-            self.config['username'], self.config['password']
-            self.req.load("http://uploaded.to/login", None, { "email" : self.config['username'], "password" : self.config['password']})
         url = self.parent.url
         self.html = self.req.load(url, cookies=False)
 
@@ -102,12 +96,9 @@ class UploadedTo(Plugin):
             self.time_plus_wait = 0
 
     def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
         if self.config['premium']:
             self.start_dl = True
             return self.parent.url
-            
         try:
             file_url_pattern = r".*<form name=\"download_form\" method=\"post\" action=\"(.*)\">"
             return re.search(file_url_pattern, self.html).group(1)
@@ -124,19 +115,28 @@ class UploadedTo(Plugin):
                 return file_name
             return file_name + file_suffix.group(1)
         except:
-            self.parent.status.url = None
             return self.parent.url
 
     def file_exists(self):
-        """ returns True or False
-        """
         if re.search(r"(File doesn't exist .*)", self.html) != None:
             return False
         else:
             return True
-
+    
+    def cleanUrl(self, url):
+        url = url.replace("ul.to/", "uploaded.to/file/")
+        url = url.replace("/?id=", "/file/")
+        url = url.replace("?id=", "file/")
+        url = re.sub("/\?(.*?)&id=", "/file/", url, 1)
+        return url
+    
     def proceed(self, url, location):
         if self.config['premium']:
+            self.req.load("http://uploaded.to/login", None, { "email" : self.config['username'], "password" : self.config['password']}, cookies=True)
+            self.req.load(url, cookies=True, just_header=True)
+            if self.cleanUrl(self.req.lastEffectiveURL) == self.cleanUrl(url):
+                self.logger.info("UploadedTo indirect download")
+                url = self.cleanUrl(url)+"?redirect"
             self.req.download(url, location, cookies=True)
         else:
             self.req.download(url, location, cookies=False, post={"download_submit": "Free Download"})
@@ -153,4 +153,4 @@ class UploadedTo(Plugin):
             else:
                 return (False, 1)
         else:
-        	return (True, 5)
+            return (True, 5)
diff --git a/module/plugins/XupIn.py b/module/plugins/hoster/XupIn.py
index d044f2389..d044f2389 100644
--- a/module/plugins/XupIn.py
+++ b/module/plugins/hoster/XupIn.py
diff --git a/module/plugins/YoupornCom.py b/module/plugins/hoster/YoupornCom.py
index e501954da..e501954da 100644
--- a/module/plugins/YoupornCom.py
+++ b/module/plugins/hoster/YoupornCom.py
diff --git a/module/plugins/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 38a4934df..38a4934df 100644
--- a/module/plugins/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
diff --git a/module/plugins/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 0c638087b..bec7f8c65 100644
--- a/module/plugins/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -30,14 +30,11 @@ class ZippyshareCom(Plugin):
     def get_file_url(self):
         """ returns the absolute downloadable filepath
         """
-        if self.html == None:
-            self.download_html()
-        if not self.want_reconnect:
-            file_url = urllib.unquote(re.search("var \w* = 'fck(.*)';", self.html).group(1))
-            return file_url
-        else:
-            return False
-
+        file_url_pattern = r"var \w* = '(http%.*?)';"
+        file_url_search = re.search(file_url_pattern, self.html).group(1)
+        file_url = urllib.unquote(file_url_search.replace("nnn", "aaa").replace("unlg", "v").replace("serwus", "zippyshare"))
+        return file_url
+        
     def get_file_name(self):
         if self.html == None:
             self.download_html()
diff --git a/module/plugins/ZshareNet.py b/module/plugins/hoster/ZshareNet.py
index 08f28a35c..08f28a35c 100644
--- a/module/plugins/ZshareNet.py
+++ b/module/plugins/hoster/ZshareNet.py
diff --git a/module/plugins/hoster/__init__.py b/module/plugins/hoster/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/module/plugins/hoster/__init__.py