From fd105f8e51768ec1943cda2375bdfdbe5b0a3951 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 00:35:51 +0100
Subject: "New Year" Update: hoster plugins

---
 module/plugins/hoster/AlldebridCom.py           |  26 ++---
 module/plugins/hoster/BasePlugin.py             |  11 ++-
 module/plugins/hoster/BezvadataCz.py            |   4 +-
 module/plugins/hoster/BitshareCom.py            |   9 +-
 module/plugins/hoster/CatShareNet.py            |  10 +-
 module/plugins/hoster/CloudzillaTo.py           |   8 +-
 module/plugins/hoster/CrockoCom.py              |  10 +-
 module/plugins/hoster/CzshareCom.py             |  34 ++++---
 module/plugins/hoster/DataHu.py                 |  12 +--
 module/plugins/hoster/DataportCz.py             |  10 +-
 module/plugins/hoster/DateiTo.py                |   4 +-
 module/plugins/hoster/DebridItaliaCom.py        |  10 +-
 module/plugins/hoster/DepositfilesCom.py        |  20 ++--
 module/plugins/hoster/DevhostSt.py              |  17 +---
 module/plugins/hoster/DlFreeFr.py               |   6 +-
 module/plugins/hoster/DropboxCom.py             |  10 +-
 module/plugins/hoster/EdiskCz.py                |   6 +-
 module/plugins/hoster/EuroshareEu.py            |  30 +++---
 module/plugins/hoster/ExtabitCom.py             |  12 +--
 module/plugins/hoster/FastixRu.py               |  20 ++--
 module/plugins/hoster/FastshareCz.py            |  16 +--
 module/plugins/hoster/FileParadoxIn.py          |  23 -----
 module/plugins/hoster/FileSharkPl.py            |  12 +--
 module/plugins/hoster/FileStoreTo.py            |   6 +-
 module/plugins/hoster/FilecloudIo.py            |  37 +++----
 module/plugins/hoster/FilefactoryCom.py         |  31 +++---
 module/plugins/hoster/FilepostCom.py            |   4 +-
 module/plugins/hoster/FilepupNet.py             |  12 +--
 module/plugins/hoster/FilerNet.py               |   8 +-
 module/plugins/hoster/FilesMailRu.py            |   5 +-
 module/plugins/hoster/FileserveCom.py           |  15 ++-
 module/plugins/hoster/FourSharedCom.py          |  61 ------------
 module/plugins/hoster/FreakshareCom.py          |  12 ++-
 module/plugins/hoster/FreeWayMe.py              |  10 +-
 module/plugins/hoster/FshareVn.py               |  46 +++------
 module/plugins/hoster/Ftp.py                    |   4 +-
 module/plugins/hoster/GigapetaCom.py            |   6 +-
 module/plugins/hoster/GooIm.py                  |   8 +-
 module/plugins/hoster/HellshareCz.py            |  37 +++----
 module/plugins/hoster/HundredEightyUploadCom.py |  24 -----
 module/plugins/hoster/IfileIt.py                |  55 +----------
 module/plugins/hoster/IfolderRu.py              |  24 ++---
 module/plugins/hoster/JumbofilesCom.py          |  14 ++-
 module/plugins/hoster/KingfilesNet.py           |  20 ++--
 module/plugins/hoster/LetitbitNet.py            |  30 ++++--
 module/plugins/hoster/LinestorageCom.py         |  21 ----
 module/plugins/hoster/LinksnappyCom.py          |  23 ++---
 module/plugins/hoster/LoadTo.py                 |  20 +---
 module/plugins/hoster/LuckyShareNet.py          |   7 +-
 module/plugins/hoster/MediafireCom.py           |   8 +-
 module/plugins/hoster/MegaDebridEu.py           |  14 +--
 module/plugins/hoster/MegaRapidCz.py            |  18 ++--
 module/plugins/hoster/MegacrypterCom.py         |  13 +--
 module/plugins/hoster/MegasharesCom.py          |   6 +-
 module/plugins/hoster/MultihostersCom.py        |  44 ++-------
 module/plugins/hoster/MultishareCz.py           |  10 +-
 module/plugins/hoster/MyfastfileCom.py          |  12 +--
 module/plugins/hoster/NarodRu.py                |  16 ++-
 module/plugins/hoster/NetloadIn.py              |   6 +-
 module/plugins/hoster/NitroflareCom.py          | 123 +++++++++++-------------
 module/plugins/hoster/NoPremiumPl.py            | 118 +++++++++++------------
 module/plugins/hoster/NowDownloadSx.py          |   8 +-
 module/plugins/hoster/NowVideoSx.py             |   4 +-
 module/plugins/hoster/OneFichierCom.py          |  60 ------------
 module/plugins/hoster/OverLoadMe.py             |  29 +++---
 module/plugins/hoster/PremiumTo.py              |  19 ++--
 module/plugins/hoster/PremiumizeMe.py           |  14 +--
 module/plugins/hoster/PromptfileCom.py          |  12 +--
 module/plugins/hoster/PutdriveCom.py            |  15 +++
 module/plugins/hoster/QuickshareCz.py           |  13 ++-
 module/plugins/hoster/RPNetBiz.py               |  12 +--
 module/plugins/hoster/RapideoPl.py              | 116 +++++++++++-----------
 module/plugins/hoster/RapidfileshareNet.py      |   6 +-
 module/plugins/hoster/RapidgatorNet.py          |  23 ++---
 module/plugins/hoster/RapiduNet.py              |   8 +-
 module/plugins/hoster/RealdebridCom.py          |  29 +++---
 module/plugins/hoster/RehostTo.py               |  12 +--
 module/plugins/hoster/RemixshareCom.py          |  10 +-
 module/plugins/hoster/SendmywayCom.py           |  21 ----
 module/plugins/hoster/SendspaceCom.py           |  10 +-
 module/plugins/hoster/ShareonlineBiz.py         |  36 +++----
 module/plugins/hoster/ShareplaceCom.py          |   4 +-
 module/plugins/hoster/SimplyPremiumCom.py       |   6 +-
 module/plugins/hoster/SimplydebridCom.py        |  16 ++-
 module/plugins/hoster/SmoozedCom.py             |  57 +++++------
 module/plugins/hoster/SpeedyshareCom.py         |  12 +--
 module/plugins/hoster/TurbobitNet.py            |  14 ++-
 module/plugins/hoster/TusfilesNet.py            |  15 ++-
 module/plugins/hoster/TwoSharedCom.py           |  41 --------
 module/plugins/hoster/UlozTo.py                 |  39 +++-----
 module/plugins/hoster/UloziskoSk.py             |  23 +++--
 module/plugins/hoster/UnibytesCom.py            |  14 ++-
 module/plugins/hoster/UnrestrictLi.py           |  10 +-
 module/plugins/hoster/UpleaCom.py               |   6 +-
 module/plugins/hoster/UploadableCh.py           |  22 ++---
 module/plugins/hoster/UploadheroCom.py          |  19 ++--
 module/plugins/hoster/UploadingCom.py           |  27 +++---
 module/plugins/hoster/UpstoreNet.py             |  12 +--
 module/plugins/hoster/VeohCom.py                |   7 +-
 module/plugins/hoster/VimeoCom.py               |   9 +-
 module/plugins/hoster/WebshareCz.py             |  11 +--
 module/plugins/hoster/WrzucTo.py                |   8 +-
 module/plugins/hoster/XFileSharingPro.py        |  19 ++--
 module/plugins/hoster/YibaishiwuCom.py          |  14 ++-
 module/plugins/hoster/YourfilesTo.py            |   4 +-
 module/plugins/hoster/ZeveraCom.py              |  35 ++++---
 module/plugins/hoster/ZippyshareCom.py          |  17 ++--
 module/plugins/hoster/_1FichierCom.py           |  60 ++++++++++++
 module/plugins/hoster/_2SharedCom.py            |  32 ++++++
 module/plugins/hoster/_4SharedCom.py            |  62 ++++++++++++
 110 files changed, 1030 insertions(+), 1290 deletions(-)
 delete mode 100644 module/plugins/hoster/FileParadoxIn.py
 delete mode 100644 module/plugins/hoster/FourSharedCom.py
 delete mode 100644 module/plugins/hoster/HundredEightyUploadCom.py
 delete mode 100644 module/plugins/hoster/LinestorageCom.py
 delete mode 100644 module/plugins/hoster/OneFichierCom.py
 create mode 100644 module/plugins/hoster/PutdriveCom.py
 delete mode 100644 module/plugins/hoster/SendmywayCom.py
 delete mode 100644 module/plugins/hoster/TwoSharedCom.py
 create mode 100644 module/plugins/hoster/_1FichierCom.py
 create mode 100644 module/plugins/hoster/_2SharedCom.py
 create mode 100644 module/plugins/hoster/_4SharedCom.py

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py
index 751ff415c..4db32da5d 100644
--- a/module/plugins/hoster/AlldebridCom.py
+++ b/module/plugins/hoster/AlldebridCom.py
@@ -13,11 +13,11 @@ from module.utils import parseFileSize
 class AlldebridCom(MultiHoster):
     __name__    = "AlldebridCom"
     __type__    = "hoster"
-    __version__ = "0.42"
+    __version__ = "0.43"
 
     __pattern__ = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+'
 
-    __description__ = """Alldebrid.com hoster plugin"""
+    __description__ = """Alldebrid.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Andy Voigt", "spamsales@online.de")]
 
@@ -38,11 +38,11 @@ class AlldebridCom(MultiHoster):
         self.chunkLimit = 16
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         password = self.getPassword()
 
         data = json_loads(self.load("http://www.alldebrid.com/service.php",
-                                     get={'link': self.pyfile.url, 'json': "true", 'pw': password}))
+                                     get={'link': pyfile.url, 'json': "true", 'pw': password}))
 
         self.logDebug("Json data", data)
 
@@ -53,9 +53,9 @@ class AlldebridCom(MultiHoster):
                 self.logWarning(data['error'])
                 self.tempOffline()
         else:
-            if self.pyfile.name and not self.pyfile.name.endswith('.tmp'):
-                self.pyfile.name = data['filename']
-            self.pyfile.size = parseFileSize(data['filesize'])
+            if pyfile.name and not pyfile.name.endswith('.tmp'):
+                pyfile.name = data['filename']
+            pyfile.size = parseFileSize(data['filesize'])
             self.link = data['link']
 
         if self.getConfig("https"):
@@ -63,19 +63,19 @@ class AlldebridCom(MultiHoster):
         else:
             self.link = self.link.replace("https://", "http://")
 
-        if self.link != self.pyfile.url:
+        if self.link != pyfile.url:
             self.logDebug("New URL: %s" % self.link)
 
-        if self.pyfile.name.startswith("http") or self.pyfile.name.startswith("Unknown"):
+        if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown"):
             #only use when name wasnt already set
-            self.pyfile.name = self.getFilename(self.link)
+            pyfile.name = self.getFilename(self.link)
 
 
     def checkFile(self):
-        super(AlldebridCom, self).checkFile()
-
-        if self.checkDownload({'error': "<title>An error occured while processing your request</title>"}) is "error":
+        if self.checkDownload({'error': "<title>An error occured while processing your request</title>"}) == "error":
             self.retry(wait_time=60, reason=_("An error occured while generating link"))
 
+        return super(AlldebridCom, self).checkFile()
+
 
 getInfo = create_getInfo(AlldebridCom)
diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py
index d0d8e7cc8..32ba7094a 100644
--- a/module/plugins/hoster/BasePlugin.py
+++ b/module/plugins/hoster/BasePlugin.py
@@ -13,7 +13,7 @@ from module.plugins.Hoster import Hoster
 class BasePlugin(Hoster):
     __name__    = "BasePlugin"
     __type__    = "hoster"
-    __version__ = "0.26"
+    __version__ = "0.27"
 
     __pattern__ = r'^unmatchable$'
 
@@ -58,7 +58,7 @@ class BasePlugin(Hoster):
 
                     if server in servers:
                         self.logDebug("Logging on to %s" % server)
-                        self.req.addAuth(account.accounts[server]['password'])
+                        self.req.addAuth(account.getAccountData(server)['password'])
                     else:
                         pwd = self.getPassword()
                         if ':' in pwd:
@@ -72,8 +72,11 @@ class BasePlugin(Hoster):
         else:
             self.fail(_("No file downloaded"))  #@TODO: Move to hoster class in 0.4.10
 
-        if self.checkDownload({'empty': re.compile(r"^$")}) is "empty":  #@TODO: Move to hoster in 0.4.10
-            self.fail(_("Empty file"))
+        check = self.checkDownload('empty file': re.compile(r'\A\Z'),
+                                   'html file' : re.compile(r'\A\s*<!DOCTYPE html'),
+                                   'html error': re.compile(r'\A\s*(<.+>)?\d{3}(\Z|\s+)')}):
+        if check:
+            self.fail(check.capitalize())
 
 
     def downloadFile(self, pyfile):
diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index 9ca4b4b1a..8d56f1ff6 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class BezvadataCz(SimpleHoster):
     __name__    = "BezvadataCz"
     __type__    = "hoster"
-    __version__ = "0.25"
+    __version__ = "0.26"
 
     __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+'
 
@@ -27,7 +27,7 @@ class BezvadataCz(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         #download button
         m = re.search(r'<a class="stahnoutSoubor".*?href="(.*?)"', self.html)
         if m is None:
diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py
index 1c5c53f55..f7b4d2709 100644
--- a/module/plugins/hoster/BitshareCom.py
+++ b/module/plugins/hoster/BitshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class BitshareCom(SimpleHoster):
     __name__    = "BitshareCom"
     __type__    = "hoster"
-    __version__ = "0.51"
+    __version__ = "0.52"
 
     __pattern__ = r'http://(?:www\.)?bitshare\.com/(files/)?(?(1)|\?f=)(?P<ID>\w+)(?(1)/(?P<NAME>.+?)\.html)'
 
@@ -73,12 +73,7 @@ class BitshareCom(SimpleHoster):
         # This may either download our file or forward us to an error page
         self.download(self.getDownloadUrl())
 
-        check = self.checkDownload({"404": ">404 Not Found<", "Error": ">Error occured<"})
-
-        if check == "404":
-            self.retry(3, 60, 'Error 404')
-
-        elif check == "error":
+        if self.checkDownload({"error": ">Error occured<"}):
             self.retry(5, 5 * 60, "Bitshare host : Error occured")
 
 
diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py
index 949a021dd..f2ddd64a0 100644
--- a/module/plugins/hoster/CatShareNet.py
+++ b/module/plugins/hoster/CatShareNet.py
@@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class CatShareNet(SimpleHoster):
     __name__    = "CatShareNet"
     __type__    = "hoster"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __pattern__ = r'http://(?:www\.)?catshare\.net/\w{16}'
 
@@ -27,7 +27,7 @@ class CatShareNet(SimpleHoster):
 
     IP_BLOCKED_PATTERN = ur'>Nasz serwis wykrył że Twój adres IP nie pochodzi z Polski.<'
     SECONDS_PATTERN = 'var\scount\s=\s(\d+);'
-    LINK_PATTERN = r'<form action="(.+?)" method="GET">'
+    LINK_FREE_PATTERN = r'<form action="(.+?)" method="GET">'
 
 
     def setup(self):
@@ -42,7 +42,7 @@ class CatShareNet(SimpleHoster):
         return super(CatShareNet, self).getFileInfo()
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         m = re.search(self.SECONDS_PATTERN, self.html)
         if m:
             wait_time = int(m.group(1))
@@ -51,11 +51,11 @@ class CatShareNet(SimpleHoster):
         recaptcha = ReCaptcha(self)
 
         challenge, response = recaptcha.challenge()
-        self.html = self.load(self.pyfile.url,
+        self.html = self.load(pyfile.url,
                               post={'recaptcha_challenge_field': challenge,
                                     'recaptcha_response_field' : response})
 
-        m = re.search(self.LINK_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.invalidCaptcha()
             self.retry(reason=_("Wrong captcha entered"))
diff --git a/module/plugins/hoster/CloudzillaTo.py b/module/plugins/hoster/CloudzillaTo.py
index d8b5e8b5d..58b1ac0dd 100644
--- a/module/plugins/hoster/CloudzillaTo.py
+++ b/module/plugins/hoster/CloudzillaTo.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class CloudzillaTo(SimpleHoster):
     __name__    = "CloudzillaTo"
     __type__    = "hoster"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)'
 
@@ -32,7 +32,7 @@ class CloudzillaTo(SimpleHoster):
             self.retry(reason="Wrong password")
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         self.html = self.load("http://www.cloudzilla.to/generateticket/",
                               post={'file_id': self.info['pattern']['ID'], 'key': self.getPassword()})
 
@@ -54,8 +54,8 @@ class CloudzillaTo(SimpleHoster):
                                                                               'ticket_id': ticket['ticket_id']}
 
 
-    def handlePremium(self):
-        return self.handleFree()
+    def handlePremium(self, pyfile):
+        return self.handleFree(pyfile)
 
 
 getInfo = create_getInfo(CloudzillaTo)
diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py
index e5f94800b..31d0eec95 100644
--- a/module/plugins/hoster/CrockoCom.py
+++ b/module/plugins/hoster/CrockoCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class CrockoCom(SimpleHoster):
     __name__    = "CrockoCom"
     __type__    = "hoster"
-    __version__ = "0.17"
+    __version__ = "0.18"
 
     __pattern__ = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+'
 
@@ -30,7 +30,7 @@ class CrockoCom(SimpleHoster):
     NAME_REPLACEMENTS = [(r'<[^>]*>', '')]
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         if "You need Premium membership to download this file." in self.html:
             self.fail(_("You need Premium membership to download this file"))
 
@@ -55,11 +55,7 @@ class CrockoCom(SimpleHoster):
             inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge()
             self.download(action, post=inputs)
 
-            check = self.checkDownload({
-                "captcha_err": recaptcha.KEY_AJAX_PATTERN
-            })
-
-            if check == "captcha_err":
+            if self.checkDownload({"captcha": recaptcha.KEY_AJAX_PATTERN}):
                 self.invalidCaptcha()
             else:
                 break
diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py
index aa381d712..fb9e7f457 100644
--- a/module/plugins/hoster/CzshareCom.py
+++ b/module/plugins/hoster/CzshareCom.py
@@ -12,7 +12,7 @@ from module.utils import parseFileSize
 class CzshareCom(SimpleHoster):
     __name__    = "CzshareCom"
     __type__    = "hoster"
-    __version__ = "0.96"
+    __version__ = "0.97"
 
     __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+'
 
@@ -63,7 +63,7 @@ class CzshareCom(SimpleHoster):
         return True
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
     # parse download link
         try:
             form = re.search(self.PREMIUM_FORM_PATTERN, self.html, re.S).group(1)
@@ -77,12 +77,14 @@ class CzshareCom(SimpleHoster):
         self.checkDownloadedFile()
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         # get free url
         m = re.search(self.FREE_URL_PATTERN, self.html)
         if m is None:
             self.error(_("FREE_URL_PATTERN not found"))
+
         parsed_url = "http://sdilej.cz" + m.group(1)
+
         self.logDebug("PARSED_URL:" + parsed_url)
 
         # get download ticket and parse html
@@ -93,7 +95,8 @@ class CzshareCom(SimpleHoster):
         try:
             form = re.search(self.FREE_FORM_PATTERN, self.html, re.S).group(1)
             inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form))
-            self.pyfile.size = int(inputs['size'])
+            pyfile.size = int(inputs['size'])
+
         except Exception, e:
             self.logError(e)
             self.error(_("Form"))
@@ -103,10 +106,13 @@ class CzshareCom(SimpleHoster):
         for _i in xrange(5):
             inputs['captchastring2'] = self.decryptCaptcha(captcha_url)
             self.html = self.load(parsed_url, cookies=True, post=inputs, decode=True)
+
             if u"<li>Zadaný ověřovací kód nesouhlasí!</li>" in self.html:
                 self.invalidCaptcha()
+
             elif re.search(self.MULTIDL_PATTERN, self.html):
                 self.longWait(5 * 60, 12)
+
             else:
                 self.correctCaptcha()
                 break
@@ -118,6 +124,7 @@ class CzshareCom(SimpleHoster):
 
         # download the file, destination is determined by pyLoad
         self.logDebug("WAIT URL", self.req.lastEffectiveURL)
+
         m = re.search("free_wait.php\?server=(.*?)&(.*)", self.req.lastEffectiveURL)
         if m is None:
             self.error(_("Download URL not found"))
@@ -132,19 +139,22 @@ class CzshareCom(SimpleHoster):
     def checkDownloadedFile(self):
         # check download
         check = self.checkDownload({
-            "temp_offline": re.compile(r"^Soubor je do.*asn.* nedostupn.*$"),
-            "credit": re.compile(r"^Nem.*te dostate.*n.* kredit.$"),
-            "multi_dl": re.compile(self.MULTIDL_PATTERN),
-            "captcha_err": "<li>Zadaný ověřovací kód nesouhlasí!</li>"
+            "temp offline" : re.compile(r"^Soubor je do.*asn.* nedostupn.*$"),
+            "credit"       : re.compile(r"^Nem.*te dostate.*n.* kredit.$"),
+            "multi-dl"     : re.compile(self.MULTIDL_PATTERN),
+            "captcha"      : "<li>Zadaný ověřovací kód nesouhlasí!</li>"
         })
 
-        if check == "temp_offline":
+        if check == "temp offline":
             self.fail(_("File not available - try later"))
-        if check == "credit":
+
+        elif check == "credit":
             self.resetAccount()
-        elif check == "multi_dl":
+
+        elif check == "multi-dl":
             self.longWait(5 * 60, 12)
-        elif check == "captcha_err":
+
+        elif check == "captcha":
             self.invalidCaptcha()
             self.retry()
 
diff --git a/module/plugins/hoster/DataHu.py b/module/plugins/hoster/DataHu.py
index 437fea7cd..f4b0692a8 100644
--- a/module/plugins/hoster/DataHu.py
+++ b/module/plugins/hoster/DataHu.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DataHu(SimpleHoster):
     __name__    = "DataHu"
     __type__    = "hoster"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?data\.hu/get/\w+'
 
@@ -23,7 +23,7 @@ class DataHu(SimpleHoster):
 
     INFO_PATTERN = ur'<title>(?P<N>.*) \((?P<S>[^)]+)\) let\xf6lt\xe9se</title>'
     OFFLINE_PATTERN = ur'Az adott f\xe1jl nem l\xe9tezik'
-    LINK_PATTERN = r'<div class="download_box_button"><a href="([^"]+)">'
+    LINK_FREE_PATTERN = r'<div class="download_box_button"><a href="([^"]+)">'
 
 
     def setup(self):
@@ -31,12 +31,4 @@ class DataHu(SimpleHoster):
         self.multiDL        = self.premium
 
 
-    def handleFree(self):
-        m = re.search(self.LINK_PATTERN, self.html)
-        if m is None:
-            self.error(_("LINK_PATTERN not found"))
-
-        self.download(m.group(1), disposition=True)
-
-
 getInfo = create_getInfo(DataHu)
diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py
index 8e74f5553..266199616 100644
--- a/module/plugins/hoster/DataportCz.py
+++ b/module/plugins/hoster/DataportCz.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DataportCz(SimpleHoster):
     __name__    = "DataportCz"
     __type__    = "hoster"
-    __version__ = "0.40"
+    __version__ = "0.41"
 
     __pattern__ = r'http://(?:www\.)?dataport\.cz/file/(.+)'
 
@@ -23,7 +23,7 @@ class DataportCz(SimpleHoster):
     FREE_SLOTS_PATTERN = ur'Počet volných slotů: <span class="darkblue">(\d+)</span><br />'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         captchas = {"1": "jkeG", "2": "hMJQ", "3": "vmEK", "4": "ePQM", "5": "blBd"}
 
         for _i in xrange(60):
@@ -40,14 +40,16 @@ class DataportCz(SimpleHoster):
             self.html = self.download("http://www.dataport.cz%s" % action, post=inputs)
 
             check = self.checkDownload({"captcha": 'alert("\u0160patn\u011b opsan\u00fd k\u00f3d z obr\u00e1zu");',
-                                        "slot": 'alert("Je n\u00e1m l\u00edto, ale moment\u00e1ln\u011b nejsou'})
+                                        "slot"   : 'alert("Je n\u00e1m l\u00edto, ale moment\u00e1ln\u011b nejsou'})
             if check == "captcha":
                 self.error(_("invalid captcha"))
+
             elif check == "slot":
                 self.logDebug("No free slots - wait 60s and retry")
                 self.wait(60, False)
-                self.html = self.load(self.pyfile.url, decode=True)
+                self.html = self.load(pyfile.url, decode=True)
                 continue
+
             else:
                 break
 
diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py
index e4bff8458..99b86e000 100644
--- a/module/plugins/hoster/DateiTo.py
+++ b/module/plugins/hoster/DateiTo.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DateiTo(SimpleHoster):
     __name__    = "DateiTo"
     __type__    = "hoster"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html'
 
@@ -28,7 +28,7 @@ class DateiTo(SimpleHoster):
     DATA_PATTERN = r'url: "(.*?)", data: "(.*?)",'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         url = 'http://datei.to/ajax/download.php'
         data = {'P': 'I', 'ID': self.info['pattern']['ID']}
         recaptcha = ReCaptcha(self)
diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py
index 11b6da918..8cda56c0c 100644
--- a/module/plugins/hoster/DebridItaliaCom.py
+++ b/module/plugins/hoster/DebridItaliaCom.py
@@ -8,11 +8,11 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class DebridItaliaCom(MultiHoster):
     __name__    = "DebridItaliaCom"
     __type__    = "hoster"
-    __version__ = "0.16"
+    __version__ = "0.17"
 
     __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+'
 
-    __description__ = """Debriditalia.com hoster plugin"""
+    __description__ = """Debriditalia.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
@@ -21,9 +21,9 @@ class DebridItaliaCom(MultiHoster):
     URL_REPLACEMENTS = [("https://", "http://")]
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         self.html = self.load("http://www.debriditalia.com/api.php",
-                              get={'generate': "on", 'link': self.pyfile.url, 'p': self.getPassword()})
+                              get={'generate': "on", 'link': pyfile.url, 'p': self.getPassword()})
 
         if "ERROR:" not in self.html:
             self.link = self.html.strip()
@@ -32,7 +32,7 @@ class DebridItaliaCom(MultiHoster):
 
             self.html = self.load("http://debriditalia.com/linkgen2.php",
                                   post={'xjxfun'   : "convertiLink",
-                                        'xjxargs[]': "S<![CDATA[%s]]>" % self.pyfile.url,
+                                        'xjxargs[]': "S<![CDATA[%s]]>" % pyfile.url,
                                         'xjxargs[]': "S%s" % self.getPassword()})
             try:
                 self.link = re.search(r'<a href="(.+?)"', self.html).group(1)
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 6588a3b37..9d060e75d 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DepositfilesCom(SimpleHoster):
     __name__    = "DepositfilesCom"
     __type__    = "hoster"
-    __version__ = "0.51"
+    __version__ = "0.52"
 
     __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)'
 
@@ -32,14 +32,12 @@ class DepositfilesCom(SimpleHoster):
 
     COOKIES = [("dfiles.eu", "lang_current", "en")]
 
-    FREE_LINK_PATTERN      = r'<form id="downloader_file_form" action="(http://.+?\.(dfiles\.eu|depositfiles\.com)/.+?)" method="post"'
-    PREMIUM_LINK_PATTERN   = r'class="repeat"><a href="(.+?)"'
-    PREMIUM_MIRROR_PATTERN = r'class="repeat_mirror"><a href="(.+?)"'
+    LINK_FREE_PATTERN    = r'<form id="downloader_file_form" action="(http://.+?\.(dfiles\.eu|depositfiles\.com)/.+?)" method="post"'
+    LINK_PREMIUM_PATTERN = r'class="repeat"><a href="(.+?)"'
+    LINK_MIRROR_PATTERN  = r'class="repeat_mirror"><a href="(.+?)"'
 
 
-    def handleFree(self):
-        self.html = self.load(self.pyfile.url, post={"gateway_result": "1"}, cookies=True)
-
+    def handleFree(self, pyfile):
         if re.search(r'File is checked, please try again in a minute.', self.html) is not None:
             self.logInfo(_("The file is being checked. Waiting 1 minute"))
             self.retry(wait_time=60)
@@ -83,7 +81,7 @@ class DepositfilesCom(SimpleHoster):
                 self.logDebug(params)
                 continue
 
-            m = re.search(self.FREE_LINK_PATTERN, self.html)
+            m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
                 if 'response' in params:
                     self.correctCaptcha()
@@ -101,7 +99,7 @@ class DepositfilesCom(SimpleHoster):
             self.retry(wait_time=60)
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         if '<span class="html_download_api-gold_traffic_limit">' in self.html:
             self.logWarning(_("Download limit reached"))
             self.retry(25, 60 * 60, "Download limit reached")
@@ -109,8 +107,8 @@ class DepositfilesCom(SimpleHoster):
             self.account.relogin(self.user)
             self.retry()
         else:
-            link = re.search(self.PREMIUM_LINK_PATTERN, self.html)
-            mirror = re.search(self.PREMIUM_MIRROR_PATTERN, self.html)
+            link = re.search(self.LINK_PREMIUM_PATTERN, self.html)
+            mirror = re.search(self.LINK_MIRROR_PATTERN, self.html)
             if link:
                 dlink = link.group(1)
             elif mirror:
diff --git a/module/plugins/hoster/DevhostSt.py b/module/plugins/hoster/DevhostSt.py
index 85e36edb3..2a8734655 100644
--- a/module/plugins/hoster/DevhostSt.py
+++ b/module/plugins/hoster/DevhostSt.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DevhostSt(SimpleHoster):
     __name__    = "DevhostSt"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}'
 
@@ -24,7 +24,7 @@ class DevhostSt(SimpleHoster):
     SIZE_PATTERN = r'>Size:</span> (?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN = r'>File Not Found<'
-    LINK_PATTERN = r'id="downloadfile" href="(.+?)"'
+    LINK_FREE_PATTERN = r'id="downloadfile" href="(.+?)"'
 
 
     def setup(self):
@@ -32,17 +32,4 @@ class DevhostSt(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self):
-        m = re.search(self.LINK_PATTERN, self.html)
-        if m is None:
-            self.error(_("Download link not found"))
-
-        dl_url = m.group(1)
-        self.download(dl_url, disposition=True)
-
-        check = self.checkDownload({'html': re.compile("html")})
-        if check == "html":
-            self.error(_("Downloaded file is an html page"))
-
-
 getInfo = create_getInfo(DevhostSt)
diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py
index 793c81b1c..ec40b64ce 100644
--- a/module/plugins/hoster/DlFreeFr.py
+++ b/module/plugins/hoster/DlFreeFr.py
@@ -36,7 +36,7 @@ class CustomBrowser(Browser):
 class DlFreeFr(SimpleHoster):
     __name__    = "DlFreeFr"
     __type__    = "hoster"
-    __version__ = "0.26"
+    __version__ = "0.27"
 
     __pattern__ = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)'
 
@@ -78,7 +78,7 @@ class DlFreeFr(SimpleHoster):
             if content_type and content_type.startswith("text/html"):
                 # Undirect acces to requested file, with a web page providing it (captcha)
                 self.html = self.load(valid_url)
-                self.handleFree()
+                self.handleFree(pyfile)
             else:
                 # Direct access to requested file for users using free.fr as Internet Service Provider.
                 self.download(valid_url, disposition=True)
@@ -88,7 +88,7 @@ class DlFreeFr(SimpleHoster):
             self.fail(_("Invalid return code: ") + str(headers.get('code')))
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         action, inputs = self.parseHtmlForm('action="getfile.pl"')
 
         adyoulike = AdYouLike(self)
diff --git a/module/plugins/hoster/DropboxCom.py b/module/plugins/hoster/DropboxCom.py
index 658974d13..a8ef5b4bc 100644
--- a/module/plugins/hoster/DropboxCom.py
+++ b/module/plugins/hoster/DropboxCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DropboxCom(SimpleHoster):
     __name__    = "DropboxCom"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+'
 
@@ -31,12 +31,8 @@ class DropboxCom(SimpleHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self):
-        self.download(self.pyfile.url, get={'dl': "1"})
-
-        check = self.checkDownload({'html': re.compile("html")})
-        if check == "html":
-            self.error(_("Downloaded file is an html page"))
+    def handleFree(self, pyfile):
+        self.download(pyfile.url, get={'dl': "1"})
 
 
 getInfo = create_getInfo(DropboxCom)
diff --git a/module/plugins/hoster/EdiskCz.py b/module/plugins/hoster/EdiskCz.py
index eb9338871..f8ccc972e 100644
--- a/module/plugins/hoster/EdiskCz.py
+++ b/module/plugins/hoster/EdiskCz.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class EdiskCz(SimpleHoster):
     __name__    = "EdiskCz"
     __type__    = "hoster"
-    __version__ = "0.22"
+    __version__ = "0.23"
 
     __pattern__ = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+'
 
@@ -21,7 +21,7 @@ class EdiskCz(SimpleHoster):
     OFFLINE_PATTERN = r'<h3>This file does not exist due to one of the following:</h3><ul><li>'
 
     ACTION_PATTERN = r'/en/download/(\d+/.*\.html)'
-    LINK_PATTERN = r'http://.*edisk\.cz.*\.html'
+    LINK_FREE_PATTERN = r'http://.*edisk\.cz.*\.html'
 
 
     def setup(self):
@@ -47,7 +47,7 @@ class EdiskCz(SimpleHoster):
             "action": action
         })
 
-        if not re.match(self.LINK_PATTERN, url):
+        if not re.match(self.LINK_FREE_PATTERN, url):
             self.fail(_("Unexpected server response"))
 
         self.download(url)
diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py
index 2ebdfb3ff..08d8a2e3e 100644
--- a/module/plugins/hoster/EuroshareEu.py
+++ b/module/plugins/hoster/EuroshareEu.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class EuroshareEu(SimpleHoster):
     __name__    = "EuroshareEu"
     __type__    = "hoster"
-    __version__ = "0.26"
+    __version__ = "0.27"
 
     __pattern__ = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+'
 
@@ -17,46 +17,52 @@ class EuroshareEu(SimpleHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    INFO_PATTERN = r'<span style="float: left;"><strong>(?P<N>.+?)</strong> \((?P<S>.+?)\)</span>'
+    INFO_PATTERN    = r'<span style="float: left;"><strong>(?P<N>.+?)</strong> \((?P<S>.+?)\)</span>'
     OFFLINE_PATTERN = ur'<h2>S.bor sa nena.iel</h2>|Požadovaná stránka neexistuje!'
 
-    FREE_URL_PATTERN = r'<a href="(/file/\d+/[^/]*/download/)"><div class="downloadButton"'
-    ERR_PARDL_PATTERN = r'<h2>Prebieha s.ahovanie</h2>|<p>Naraz je z jednej IP adresy mo.n. s.ahova. iba jeden s.bor'
+    LINK_FREE_PATTERN = r'<a href="(/file/\d+/[^/]*/download/)"><div class="downloadButton"'
+
+    ERR_PARDL_PATTERN         = r'<h2>Prebieha s.ahovanie</h2>|<p>Naraz je z jednej IP adresy mo.n. s.ahova. iba jeden s.bor'
     ERR_NOT_LOGGED_IN_PATTERN = r'href="/customer-zone/login/"'
 
     URL_REPLACEMENTS = [(r"(http://[^/]*\.)(sk|cz|hu|pl)/", r"\1eu/")]
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         if self.ERR_NOT_LOGGED_IN_PATTERN in self.html:
             self.account.relogin(self.user)
             self.retry(reason=_("User not logged in"))
 
-        self.download(self.pyfile.url.rstrip('/') + "/download/")
+        self.download(pyfile.url.rstrip('/') + "/download/")
 
         check = self.checkDownload({"login": re.compile(self.ERR_NOT_LOGGED_IN_PATTERN),
-                                    "json": re.compile(r'\{"status":"error".*?"message":"(.*?)"')})
+                                    "json" : re.compile(r'\{"status":"error".*?"message":"(.*?)"')})
+
         if check == "login" or (check == "json" and self.lastCheck.group(1) == "Access token expired"):
             self.account.relogin(self.user)
             self.retry(reason=_("Access token expired"))
+
         elif check == "json":
             self.fail(self.lastCheck.group(1))
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         if re.search(self.ERR_PARDL_PATTERN, self.html) is not None:
             self.longWait(5 * 60, 12)
 
-        m = re.search(self.FREE_URL_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("FREE_URL_PATTERN not found"))
+            self.error(_("LINK_FREE_PATTERN not found"))
         parsed_url = "http://euroshare.eu%s" % m.group(1)
         self.logDebug("URL", parsed_url)
         self.download(parsed_url, disposition=True)
 
-        check = self.checkDownload({"multi_dl": re.compile(self.ERR_PARDL_PATTERN)})
-        if check == "multi_dl":
+
+    def checkFile():
+        if self.checkDownload({"multi-dl": re.compile(self.ERR_PARDL_PATTERN)})
             self.longWait(5 * 60, 12)
 
+        return super(EuroshareEu, self).checkFile()
+
 
 getInfo = create_getInfo(EuroshareEu)
diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py
index 7609954d3..5c2976a29 100644
--- a/module/plugins/hoster/ExtabitCom.py
+++ b/module/plugins/hoster/ExtabitCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, s
 class ExtabitCom(SimpleHoster):
     __name__    = "ExtabitCom"
     __type__    = "hoster"
-    __version__ = "0.63"
+    __version__ = "0.64"
 
     __pattern__ = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)'
 
@@ -25,10 +25,10 @@ class ExtabitCom(SimpleHoster):
     OFFLINE_PATTERN = r'>File not found<'
     TEMP_OFFLINE_PATTERN = r'>(File is temporary unavailable|No download mirror)<'
 
-    LINK_PATTERN = r'[\'"](http://guest\d+\.extabit\.com/\w+/.*?)[\'"]'
+    LINK_FREE_PATTERN = r'[\'"](http://guest\d+\.extabit\.com/\w+/.*?)[\'"]'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         if r">Only premium users can download this file" in self.html:
             self.fail(_("Only premium users can download this file"))
 
@@ -41,7 +41,7 @@ class ExtabitCom(SimpleHoster):
 
         self.logDebug("URL: " + self.req.http.lastEffectiveURL)
         m = re.match(self.__pattern__, self.req.http.lastEffectiveURL)
-        fileID = m.group('ID') if m else self.info('ID')
+        fileID = m.group('ID') if m else self.info['pattern']['ID']
 
         m = re.search(r'recaptcha/api/challenge\?k=(\w+)', self.html)
         if m:
@@ -67,9 +67,9 @@ class ExtabitCom(SimpleHoster):
 
         self.html = self.load("http://extabit.com/file/%s%s" % (fileID, res['href']))
 
-        m = re.search(self.LINK_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("LINK_PATTERN not found"))
+            self.error(_("LINK_FREE_PATTERN not found"))
 
         url = m.group(1)
         self.download(url)
diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py
index b68c79ebc..9a38f5a72 100644
--- a/module/plugins/hoster/FastixRu.py
+++ b/module/plugins/hoster/FastixRu.py
@@ -12,11 +12,11 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class FastixRu(MultiHoster):
     __name__    = "FastixRu"
     __type__    = "hoster"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}'
 
-    __description__ = """Fastix hoster plugin"""
+    __description__ = """Fastix multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
 
@@ -35,12 +35,12 @@ class FastixRu(MultiHoster):
         self.chunkLimit = 3
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         api_key = self.account.getAccountData(self.user)
         api_key = api_key['api']
 
         page = self.load("http://fastix.ru/api_v2/",
-                         get={'apikey': api_key, 'sub': "getdirectlink", 'link': self.pyfile.url})
+                         get={'apikey': api_key, 'sub': "getdirectlink", 'link': pyfile.url})
         data = json_loads(page)
 
         self.logDebug("Json data", data)
@@ -50,19 +50,19 @@ class FastixRu(MultiHoster):
         else:
             self.link = data['downloadlink']
 
-        if self.link != self.pyfile.url:
+        if self.link != pyfile.url:
             self.logDebug("New URL: %s" % self.link)
 
-        if self.pyfile.name.startswith("http") or self.pyfile.name.startswith("Unknown"):
+        if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown"):
             #only use when name wasnt already set
-            self.pyfile.name = self.getFilename(self.link)
+            pyfile.name = self.getFilename(self.link)
 
 
     def checkFile(self):
-        super(FastixRu, self).checkFile()
-
-        if self.checkDownload({"error": "<title>An error occurred while processing your request</title>"}) is "error":
+        if self.checkDownload({"error": "<title>An error occurred while processing your request</title>"}):
             self.retry(wait_time=60, reason=_("An error occurred while generating link"))
 
+        return super(FastixRu, self).checkFile()
+
 
 getInfo = create_getInfo(FastixRu)
diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index 31437c6e7..6fe871ad4 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FastshareCz(SimpleHoster):
     __name__    = "FastshareCz"
     __type__    = "hoster"
-    __version__ = "0.26"
+    __version__ = "0.27"
 
     __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
 
@@ -45,7 +45,7 @@ class FastshareCz(SimpleHoster):
         self.info.pop('error', None)
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         m = re.search(self.FREE_URL_PATTERN, self.html)
         if m:
             action, captcha_src = m.groups()
@@ -58,22 +58,22 @@ class FastshareCz(SimpleHoster):
 
 
     def checkFile(self):
-        super(FastshareCz, self).checkFile()
-
         check = self.checkDownload({
-            'paralell_dl'  : re.compile(r"<title>FastShare.cz</title>|<script>alert\('Pres FREE muzete stahovat jen jeden soubor najednou.'\)"),
-            'wrong_captcha': re.compile(r'Download for FREE'),
+            'paralell-dl'  : re.compile(r"<title>FastShare.cz</title>|<script>alert\('Pres FREE muzete stahovat jen jeden soubor najednou.'\)"),
+            'wrong captcha': re.compile(r'Download for FREE'),
             'credit'       : re.compile(self.CREDIT_ERROR)
         })
 
-        if check == "paralell_dl":
+        if check == "paralell-dl":
             self.retry(6, 10 * 60, _("Paralell download"))
 
-        elif check == "wrong_captcha":
+        elif check == "wrong captcha":
             self.retry(max_tries=5, reason=_("Wrong captcha"))
 
         elif check == "credit":
             self.resetAccount()
 
+        return super(FastshareCz, self).checkFile()
+
 
 getInfo = create_getInfo(FastshareCz)
diff --git a/module/plugins/hoster/FileParadoxIn.py b/module/plugins/hoster/FileParadoxIn.py
deleted file mode 100644
index 0b5b57e22..000000000
--- a/module/plugins/hoster/FileParadoxIn.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
-
-
-class FileParadoxIn(XFSHoster):
-    __name__    = "FileParadoxIn"
-    __type__    = "hoster"
-    __version__ = "0.04"
-
-    __pattern__ = r'https?://(?:www\.)?fileparadox\.in/\w{12}'
-
-    __description__ = """FileParadox.in hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RazorWing", "muppetuk1@hotmail.com")]
-
-
-    HOSTER_DOMAIN = "fileparadox.in"
-
-
-getInfo = create_getInfo(FileParadoxIn)
diff --git a/module/plugins/hoster/FileSharkPl.py b/module/plugins/hoster/FileSharkPl.py
index 5250a92fe..d686be480 100644
--- a/module/plugins/hoster/FileSharkPl.py
+++ b/module/plugins/hoster/FileSharkPl.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FileSharkPl(SimpleHoster):
     __name__    = "FileSharkPl"
     __type__    = "hoster"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'http://(?:www\.)?fileshark\.pl/pobierz/\d{6}/\w{5}'
 
@@ -73,13 +73,13 @@ class FileSharkPl(SimpleHoster):
 
 
     #@NOTE: handlePremium method was never been tested
-    def handlePremium(self):
-        super(FilerNet, self).handlePremium()
+    def handlePremium(self, pyfile):
+        super(FilerNet, self).handlePremium(pyfile)
         if self.link:
             self.link = urljoin("http://fileshark.pl/", self.link)
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("Download url not found"))
@@ -116,8 +116,6 @@ class FileSharkPl(SimpleHoster):
 
 
     def checkFile(self):
-        super(FileSharkPl, self).checkFile()
-
         check = self.checkDownload({'wrong_captcha': re.compile(r'<label for="form_captcha" generated="true" class="error">(.*?)</label>'),
                                     'wait_pattern' : re.compile(self.SECONDS_PATTERN),
                                     'DL-found'     : re.compile('<a href="(.*)">')})
@@ -132,6 +130,8 @@ class FileSharkPl(SimpleHoster):
         elif check == "wait_pattern":
             self.retry()
 
+        return super(FileSharkPl, self).checkFile()
+
 
     def _decode64(self, data, *args, **kwargs):
         return data.decode("base64")
diff --git a/module/plugins/hoster/FileStoreTo.py b/module/plugins/hoster/FileStoreTo.py
index e1bd8da71..7b93c03f1 100644
--- a/module/plugins/hoster/FileStoreTo.py
+++ b/module/plugins/hoster/FileStoreTo.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FileStoreTo(SimpleHoster):
     __name__    = "FileStoreTo"
     __type__    = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)'
 
@@ -27,9 +27,9 @@ class FileStoreTo(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         self.wait(10)
-        ldc = re.search(r'wert="(\w+)"', self.html).group(1)
+        ldc  = re.search(r'wert="(\w+)"', self.html).group(1)
         link = self.load("http://filestore.to/ajax/download.php", get={"LDC": ldc})
         self.download(link)
 
diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py
index 8b6804a68..bc328ddbd 100644
--- a/module/plugins/hoster/FilecloudIo.py
+++ b/module/plugins/hoster/FilecloudIo.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FilecloudIo(SimpleHoster):
     __name__    = "FilecloudIo"
     __type__    = "hoster"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)'
 
@@ -20,17 +20,21 @@ class FilecloudIo(SimpleHoster):
                        ("stickell", "l.stickell@yahoo.it")]
 
 
-    SIZE_PATTERN = r'{var __ab1 = (?P<S>\d+);}'
-    NAME_PATTERN = r'id="aliasSpan">(?P<N>.*?)&nbsp;&nbsp;<'
-    OFFLINE_PATTERN = r'l10n\.(FILES__DOESNT_EXIST|REMOVED)'
+    LOGIN_ACCOUNT = True
+
+    NAME_PATTERN         = r'id="aliasSpan">(?P<N>.*?)&nbsp;&nbsp;<'
+    SIZE_PATTERN         = r'{var __ab1 = (?P<S>\d+);}'
+    OFFLINE_PATTERN      = r'l10n\.(FILES__DOESNT_EXIST|REMOVED)'
     TEMP_OFFLINE_PATTERN = r'l10n\.FILES__WARNING'
 
     UKEY_PATTERN = r'\'ukey\'\s*:\'(\w+)'
-    AB1_PATTERN = r'if\( __ab1 == \'(\w+)\' \)'
+    AB1_PATTERN  = r'if\( __ab1 == \'(\w+)\' \)'
+
     ERROR_MSG_PATTERN = r'var __error_msg\s*=\s*l10n\.(.*?);'
+
     RECAPTCHA_PATTERN = r'var __recaptcha_public\s*=\s*\'(.+?)\';'
 
-    LINK_PATTERN = r'"(http://s\d+\.filecloud\.io/%s/\d+/.*?)"'
+    LINK_FREE_PATTERN = r'"(http://s\d+\.filecloud\.io/%s/\d+/.*?)"'
 
 
     def setup(self):
@@ -39,7 +43,7 @@ class FilecloudIo(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         data = {"ukey": self.info['pattern']['ID']}
 
         m = re.search(self.AB1_PATTERN, self.html)
@@ -55,14 +59,11 @@ class FilecloudIo(SimpleHoster):
         if captcha_key is None:
             self.error(_("ReCaptcha key not found"))
 
-        if not self.account:
-            self.fail(_("User not logged in"))
-        elif not self.account.logged_in:
-            challenge, response = recaptcha.challenge(captcha_key)
-            self.account.form_data = {"recaptcha_challenge_field": challenge,
-                                      "recaptcha_response_field" : response}
-            self.account.relogin(self.user)
-            self.retry(2)
+        challenge, response = recaptcha.challenge(captcha_key)
+        self.account.form_data = {"recaptcha_challenge_field": challenge,
+                                  "recaptcha_response_field" : response}
+        self.account.relogin(self.user)
+        self.retry(2)
 
         json_url = "http://filecloud.io/download-request.json"
         res = self.load(json_url, post=data)
@@ -95,9 +96,9 @@ class FilecloudIo(SimpleHoster):
         if res['dl']:
             self.html = self.load('http://filecloud.io/download.html')
 
-            m = re.search(self.LINK_PATTERN % self.info['pattern']['ID'], self.html)
+            m = re.search(self.LINK_FREE_PATTERN % self.info['pattern']['ID'], self.html)
             if m is None:
-                self.error(_("LINK_PATTERN not found"))
+                self.error(_("LINK_FREE_PATTERN not found"))
 
             if "size" in self.info and self.info['size']:
                 self.check_data = {"size": int(self.info['size'])}
@@ -108,7 +109,7 @@ class FilecloudIo(SimpleHoster):
             self.fail(_("Unexpected server response"))
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         akey = self.account.getAccountData(self.user)['akey']
         ukey = self.info['pattern']['ID']
         self.logDebug("Akey: %s | Ukey: %s" % (akey, ukey))
diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py
index ada498a51..2c8ec58f4 100644
--- a/module/plugins/hoster/FilefactoryCom.py
+++ b/module/plugins/hoster/FilefactoryCom.py
@@ -21,7 +21,7 @@ def getInfo(urls):
 class FilefactoryCom(SimpleHoster):
     __name__    = "FilefactoryCom"
     __type__    = "hoster"
-    __version__ = "0.52"
+    __version__ = "0.53"
 
     __pattern__ = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+'
 
@@ -34,7 +34,7 @@ class FilefactoryCom(SimpleHoster):
     INFO_PATTERN = r'<div id="file_name"[^>]*>\s*<h2>(?P<N>[^<]+)</h2>\s*<div id="file_info">\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+) uploaded'
     OFFLINE_PATTERN = r'<h2>File Removed</h2>|This file is no longer available'
 
-    LINK_PATTERN = r'"([^"]+filefactory\.com/get.+?)"'
+    LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'"([^"]+filefactory\.com/get.+?)"'
 
     WAIT_PATTERN = r'<div id="countdown_clock" data-delay="(\d+)">'
     PREMIUM_ONLY_PATTERN = r'>Premium Account Required'
@@ -42,13 +42,13 @@ class FilefactoryCom(SimpleHoster):
     COOKIES = [("filefactory.com", "locale", "en_US.utf8")]
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         if "Currently only Premium Members can download files larger than" in self.html:
             self.fail(_("File too large for free download"))
         elif "All free download slots on this server are currently in use" in self.html:
             self.retry(50, 15 * 60, _("All free slots are busy"))
 
-        m = re.search(self.LINK_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("Free download link not found"))
 
@@ -61,30 +61,23 @@ class FilefactoryCom(SimpleHoster):
         self.download(dl_link, disposition=True)
 
         check = self.checkDownload({'multiple': "You are currently downloading too many files at once.",
-                                    'error': '<div id="errorMessage">'})
+                                    'error'   : '<div id="errorMessage">'})
 
         if check == "multiple":
             self.logDebug("Parallel downloads detected; waiting 15 minutes")
             self.retry(wait_time=15 * 60, reason=_("Parallel downloads"))
+
         elif check == "error":
             self.error(_("Unknown error"))
 
 
-    def handlePremium(self):
-        header = self.load(self.pyfile.url, just_header=True)
+    def handlePremium(self, pyfile):
+        self.link = self.directLink(self.load(pyfile.url, just_header=True))
 
-        if 'location' in header:
-            url = header['location'].strip()
-            if not url.startswith("http://"):
-                url = urljoin("http://www.filefactory.com", url)
-        elif 'content-disposition' in header:
-            url = self.pyfile.url
-        else:
-            html = self.load(self.pyfile.url)
-            m = re.search(self.LINK_PATTERN, html)
+        if not self.link:
+            html = self.load(pyfile.url)
+            m = re.search(self.LINK_PREMIUM_PATTERN, html)
             if m:
-                url = m.group(1)
+                self.link = m.group(1)
             else:
                 self.error(_("Premium download link not found"))
-
-        self.download(url, disposition=True)
diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py
index 66c040770..4dd36c6e4 100644
--- a/module/plugins/hoster/FilepostCom.py
+++ b/module/plugins/hoster/FilepostCom.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FilepostCom(SimpleHoster):
     __name__    = "FilepostCom"
     __type__    = "hoster"
-    __version__ = "0.31"
+    __version__ = "0.32"
 
     __pattern__ = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)'
 
@@ -29,7 +29,7 @@ class FilepostCom(SimpleHoster):
     FLP_TOKEN_PATTERN = r'set_store_options\({token: \'(.+?)\''
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         m = re.search(self.FLP_TOKEN_PATTERN, self.html)
         if m is None:
             self.error(_("Token"))
diff --git a/module/plugins/hoster/FilepupNet.py b/module/plugins/hoster/FilepupNet.py
index cc3e86bc9..a53773f81 100644
--- a/module/plugins/hoster/FilepupNet.py
+++ b/module/plugins/hoster/FilepupNet.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FilepupNet(SimpleHoster):
     __name__    = "FilepupNet"
     __type__    = "hoster"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?filepup\.net/files/\w+'
 
@@ -27,7 +27,7 @@ class FilepupNet(SimpleHoster):
 
     OFFLINE_PATTERN = r'>This file has been deleted'
 
-    LINK_PATTERN = r'(http://www\.filepup\.net/get/.+?)\''
+    LINK_FREE_PATTERN = r'(http://www\.filepup\.net/get/.+?)\''
 
 
     def setup(self):
@@ -35,17 +35,13 @@ class FilepupNet(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self):
-        m = re.search(self.LINK_PATTERN, self.html)
+    def handleFree(self, pyfile):
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("Download link not found"))
 
         dl_link = m.group(1)
         self.download(dl_link, post={'task': "download"})
 
-        check = self.checkDownload({'html': re.compile("html")})
-        if check == "html":
-            self.error(_("Downloaded file is an html page"))
-
 
 getInfo = create_getInfo(FilepupNet)
diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py
index 2a38ac470..159aab964 100644
--- a/module/plugins/hoster/FilerNet.py
+++ b/module/plugins/hoster/FilerNet.py
@@ -16,7 +16,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FilerNet(SimpleHoster):
     __name__    = "FilerNet"
     __type__    = "hoster"
-    __version__ = "0.12"
+    __version__ = "0.13"
 
     __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+'
 
@@ -42,12 +42,12 @@ class FilerNet(SimpleHoster):
         self.info.pop('error', None)
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         inputs = self.parseHtmlForm(input_names={'token': re.compile(r'.+')})[1]
         if 'token' not in inputs:
             self.error(_("Unable to detect token"))
 
-        self.html = self.load(self.pyfile.url, post={'token': inputs['token']}, decode=True)
+        self.html = self.load(pyfile.url, post={'token': inputs['token']}, decode=True)
 
         inputs = self.parseHtmlForm(input_names={'hash': re.compile(r'.+')})[1]
         if 'hash' not in inputs:
@@ -61,7 +61,7 @@ class FilerNet(SimpleHoster):
             #@NOTE: Work-around for v0.4.9 just_header issue
             #@TODO: Check for v0.4.10
             self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 0)
-            self.load(self.pyfile.url, post={'recaptcha_challenge_field': challenge,
+            self.load(pyfile.url, post={'recaptcha_challenge_field': challenge,
                                              'recaptcha_response_field' : response,
                                              'hash'                     : inputs['hash']})
             self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 1)
diff --git a/module/plugins/hoster/FilesMailRu.py b/module/plugins/hoster/FilesMailRu.py
index 9b39d818f..18fca7176 100644
--- a/module/plugins/hoster/FilesMailRu.py
+++ b/module/plugins/hoster/FilesMailRu.py
@@ -32,7 +32,7 @@ def getInfo(urls):
 class FilesMailRu(Hoster):
     __name__    = "FilesMailRu"
     __type__    = "hoster"
-    __version__ = "0.31"
+    __version__ = "0.32"
 
     __pattern__ = r'http://(?:www\.)?files\.mail\.ru/.+'
 
@@ -42,8 +42,7 @@ class FilesMailRu(Hoster):
 
 
     def setup(self):
-        if not self.account:
-            self.multiDL = False
+        self.multiDL = bool(self.account)
 
 
     def process(self, pyfile):
diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py
index 52a071b52..515ec9029 100644
--- a/module/plugins/hoster/FileserveCom.py
+++ b/module/plugins/hoster/FileserveCom.py
@@ -118,14 +118,16 @@ class FileserveCom(Hoster):
         self.logDebug(self.req.http.lastEffectiveURL)
 
         check = self.checkDownload({"expired": self.LINK_EXPIRED_PATTERN,
-                                    "wait": re.compile(self.LONG_WAIT_PATTERN),
-                                    "limit": self.DAILY_LIMIT_PATTERN})
+                                    "wait"   : re.compile(self.LONG_WAIT_PATTERN),
+                                    "limit"  : self.DAILY_LIMIT_PATTERN})
 
         if check == "expired":
             self.logDebug("Download link was expired")
             self.retry()
+
         elif check == "wait":
             self.doLongWait(self.lastCheck)
+
         elif check == "limit":
             self.logWarning(_("Download limited reached for today"))
             self.setWait(secondsToMidnight(gmt=2), True)
@@ -204,12 +206,9 @@ class FileserveCom(Hoster):
 
         self.download(premium_url or self.pyfile.url)
 
-        if not premium_url:
-            check = self.checkDownload({"login": re.compile(self.NOT_LOGGED_IN_PATTERN)})
-
-            if check == "login":
-                self.account.relogin(self.user)
-                self.retry(reason=_("Not logged in"))
+        if not premium_url and self.checkDownload({"login": re.compile(self.NOT_LOGGED_IN_PATTERN)}):
+            self.account.relogin(self.user)
+            self.retry(reason=_("Not logged in"))
 
 
 def getInfo(urls):
diff --git a/module/plugins/hoster/FourSharedCom.py b/module/plugins/hoster/FourSharedCom.py
deleted file mode 100644
index 0406df0c4..000000000
--- a/module/plugins/hoster/FourSharedCom.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-
-
-class FourSharedCom(SimpleHoster):
-    __name__    = "FourSharedCom"
-    __type__    = "hoster"
-    __version__ = "0.30"
-
-    __pattern__ = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+'
-
-    __description__ = """4Shared.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("jeix", "jeix@hasnomail.de"),
-                       ("zoidberg", "zoidberg@mujmail.cz")]
-
-
-    NAME_PATTERN = r'<meta name="title" content="(?P<N>.+?)"'
-    SIZE_PATTERN = r'<span title="Size: (?P<S>[\d.,]+) (?P<U>[\w^_]+)">'
-    OFFLINE_PATTERN = r'The file link that you requested is not valid\.|This file was deleted.'
-
-    NAME_REPLACEMENTS = [(r"&#(\d+).", lambda m: unichr(int(m.group(1))))]
-    SIZE_REPLACEMENTS = [(",", "")]
-
-    DOWNLOAD_URL_PATTERN = r'name="d3link" value="(.*?)"'
-    DOWNLOAD_BUTTON_PATTERN = r'id="btnLink" href="(.*?)"'
-    FID_PATTERN = r'name="d3fid" value="(.*?)"'
-
-
-    def handleFree(self):
-        if not self.account:
-            self.fail(_("User not logged in"))
-
-        m = re.search(self.DOWNLOAD_BUTTON_PATTERN, self.html)
-        if m:
-            link = m.group(1)
-        else:
-            link = re.sub(r'/(download|get|file|document|photo|video|audio)/', r'/get/', self.pyfile.url)
-
-        self.html = self.load(link)
-
-        m = re.search(self.DOWNLOAD_URL_PATTERN, self.html)
-        if m is None:
-            self.error(_("Download link"))
-        link = m.group(1)
-
-        try:
-            m = re.search(self.FID_PATTERN, self.html)
-            res = self.load('http://www.4shared.com/web/d2/getFreeDownloadLimitInfo?fileId=%s' % m.group(1))
-            self.logDebug(res)
-        except:
-            pass
-
-        self.wait(20)
-        self.download(link)
-
-
-getInfo = create_getInfo(FourSharedCom)
diff --git a/module/plugins/hoster/FreakshareCom.py b/module/plugins/hoster/FreakshareCom.py
index 2238f07ef..9a11f933d 100644
--- a/module/plugins/hoster/FreakshareCom.py
+++ b/module/plugins/hoster/FreakshareCom.py
@@ -43,23 +43,27 @@ class FreakshareCom(Hoster):
 
             self.download(pyfile.url, post=self.req_opts)
 
-            check = self.checkDownload({"bad": "bad try",
-                                        "paralell": "> Sorry, you cant download more then 1 files at time. <",
-                                        "empty": "Warning: Unknown: Filename cannot be empty",
-                                        "wrong_captcha": "Wrong Captcha!",
+            check = self.checkDownload({"bad"           : "bad try",
+                                        "paralell"      : "> Sorry, you cant download more then 1 files at time. <",
+                                        "empty"         : "Warning: Unknown: Filename cannot be empty",
+                                        "wrong_captcha" : "Wrong Captcha!",
                                         "downloadserver": "No Downloadserver. Please try again later!"})
 
             if check == "bad":
                 self.fail(_("Bad Try"))
+
             elif check == "paralell":
                 self.setWait(300, True)
                 self.wait()
                 self.retry()
+
             elif check == "empty":
                 self.fail(_("File not downloadable"))
+
             elif check == "wrong_captcha":
                 self.invalidCaptcha()
                 self.retry()
+
             elif check == "downloadserver":
                 self.retry(5, 15 * 60, _("No Download server"))
 
diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py
index 50131e28e..ffc8115d3 100644
--- a/module/plugins/hoster/FreeWayMe.py
+++ b/module/plugins/hoster/FreeWayMe.py
@@ -6,11 +6,11 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class FreeWayMe(MultiHoster):
     __name__    = "FreeWayMe"
     __type__    = "hoster"
-    __version__ = "0.14"
+    __version__ = "0.15"
 
     __pattern__ = r'https://(?:www\.)?free-way\.me/.+'
 
-    __description__ = """FreeWayMe hoster plugin"""
+    __description__ = """FreeWayMe multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Nicolas Giese", "james@free-way.me")]
 
@@ -21,14 +21,14 @@ class FreeWayMe(MultiHoster):
         self.chunkLimit     = 1
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         user, data = self.account.selectAccount()
 
         self.download("https://www.free-way.me/load.php",
                       get={'multiget': 7,
-                           'url'     : self.pyfile.url,
+                           'url'     : pyfile.url,
                            'user'    : user,
-                           'pw'      : self.account.getpw(user),
+                           'pw'      : self.account.getAccountData(user)['password'],
                            'json'    : ""},
                       disposition=True)
 
diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py
index a3f9703df..872511afc 100644
--- a/module/plugins/hoster/FshareVn.py
+++ b/module/plugins/hoster/FshareVn.py
@@ -3,6 +3,7 @@
 import re
 
 from time import strptime, mktime, gmtime
+from urlparse import urljoin
 
 from module.network.RequestFactory import getURL
 from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
@@ -24,7 +25,7 @@ def doubleDecode(m):
 class FshareVn(SimpleHoster):
     __name__    = "FshareVn"
     __type__    = "hoster"
-    __version__ = "0.18"
+    __version__ = "0.19"
 
     __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+'
 
@@ -38,31 +39,26 @@ class FshareVn(SimpleHoster):
 
     NAME_REPLACEMENTS = [("(.*)", doubleDecode)]
 
-    LINK_PATTERN = r'action="(http://download.*?)[#"]'
+    LINK_FREE_PATTERN = r'action="(http://download.*?)[#"]'
     WAIT_PATTERN = ur'Lượt tải xuống kế tiếp là:\s*(.*?)\s*<'
 
 
-    def process(self, pyfile):
-        self.html = self.load('http://www.fshare.vn/check_link.php', post={
-            "action": "check_link",
-            "arrlinks": pyfile.url
-        }, decode=True)
-        self.getFileInfo()
+    def preload(self):
+        self.html = self.load("http://www.fshare.vn/check_link.php",
+                              post={'action': "check_link", 'arrlinks': pyfile.url},
+                              decode=True)
 
-        if self.premium:
-            self.handlePremium()
-        else:
-            self.handleFree()
-        self.checkDownloadedFile()
+        if isinstance(self.TEXT_ENCODING, basestring):
+            self.html = unicode(self.html, self.TEXT_ENCODING)
 
 
-    def handleFree(self):
-        self.html = self.load(self.pyfile.url, decode=True)
+    def handleFree(self, pyfile):
+        self.html = self.load(pyfile.url, decode=True)
 
         self.checkErrors()
 
         action, inputs = self.parseHtmlForm('frm_download')
-        self.url = self.pyfile.url + action
+        self.url = urljoin(pyfile.url, action)
 
         if not inputs:
             self.error(_("No FORM"))
@@ -88,9 +84,9 @@ class FshareVn(SimpleHoster):
         m = re.search(r'var count = (\d+)', self.html)
         self.setWait(int(m.group(1)) if m else 30)
 
-        m = re.search(self.LINK_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("LINK_PATTERN not found"))
+            self.error(_("LINK_FREE_PATTERN not found"))
         self.url = m.group(1)
         self.logDebug("FREE DL URL: %s" % self.url)
 
@@ -98,10 +94,6 @@ class FshareVn(SimpleHoster):
         self.download(self.url)
 
 
-    def handlePremium(self):
-        self.download(self.pyfile.url)
-
-
     def checkErrors(self):
         if '/error.php?' in self.req.lastEffectiveURL or u"Liên kết bạn chọn không tồn" in self.html:
             self.offline()
@@ -118,13 +110,3 @@ class FshareVn(SimpleHoster):
             self.retry(30, 2 * 60, msg)
 
         self.info.pop('error', None)
-
-
-    def checkDownloadedFile(self):
-        # check download
-        check = self.checkDownload({
-            "not_found": "<head><title>404 Not Found</title></head>"
-        })
-
-        if check == "not_found":
-            self.fail(_("File not m on server"))
diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py
index c6ad68e49..3daf50bc5 100644
--- a/module/plugins/hoster/Ftp.py
+++ b/module/plugins/hoster/Ftp.py
@@ -12,7 +12,7 @@ from module.plugins.Hoster import Hoster
 class Ftp(Hoster):
     __name__    = "Ftp"
     __type__    = "hoster"
-    __version__ = "0.44"
+    __version__ = "0.45"
 
     __pattern__ = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+'
 
@@ -43,7 +43,7 @@ class Ftp(Hoster):
 
             if netloc in servers:
                 self.logDebug("Logging on to %s" % netloc)
-                self.req.addAuth(self.account.accounts[netloc]['password'])
+                self.req.addAuth(self.account.getAccountData(netloc)['password'])
             else:
                 pwd = self.getPassword()
                 if ':' in pwd:
diff --git a/module/plugins/hoster/GigapetaCom.py b/module/plugins/hoster/GigapetaCom.py
index 37af7f216..9d3ace3b2 100644
--- a/module/plugins/hoster/GigapetaCom.py
+++ b/module/plugins/hoster/GigapetaCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class GigapetaCom(SimpleHoster):
     __name__    = "GigapetaCom"
     __type__    = "hoster"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?gigapeta\.com/dl/\w+'
 
@@ -27,7 +27,7 @@ class GigapetaCom(SimpleHoster):
     COOKIES = [("gigapeta.com", "lang", "us")]
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         captcha_key = str(randint(1, 100000000))
         captcha_url = "http://gigapeta.com/img/captcha.gif?x=%s" % captcha_key
 
@@ -37,7 +37,7 @@ class GigapetaCom(SimpleHoster):
             self.checkErrors()
 
             captcha = self.decryptCaptcha(captcha_url)
-            self.html = self.load(self.pyfile.url, post={
+            self.html = self.load(pyfile.url, post={
                 "captcha_key": captcha_key,
                 "captcha": captcha,
                 "download": "Download"})
diff --git a/module/plugins/hoster/GooIm.py b/module/plugins/hoster/GooIm.py
index 436d825a9..2cb012e50 100644
--- a/module/plugins/hoster/GooIm.py
+++ b/module/plugins/hoster/GooIm.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class GooIm(SimpleHoster):
     __name__    = "GooIm"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'https?://(?:www\.)?goo\.im/.+'
 
@@ -29,11 +29,9 @@ class GooIm(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self):
-        url = self.pyfile.url
-        self.html = self.load(url, cookies=True)
+    def handleFree(self, pyfile):
         self.wait(10)
-        self.download(url, cookies=True)
+        self.download(pyfile.url, cookies=True)
 
 
 getInfo = create_getInfo(GooIm)
diff --git a/module/plugins/hoster/HellshareCz.py b/module/plugins/hoster/HellshareCz.py
index 4b44cc335..47b981dd7 100644
--- a/module/plugins/hoster/HellshareCz.py
+++ b/module/plugins/hoster/HellshareCz.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re
+from urlparse import urljoin
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
@@ -8,41 +8,34 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class HellshareCz(SimpleHoster):
     __name__    = "HellshareCz"
     __type__    = "hoster"
-    __version__ = "0.83"
+    __version__ = "0.84"
 
-    __pattern__ = r'(http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+)'
+    __pattern__ = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+'
 
     __description__ = """Hellshare.cz hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    NAME_PATTERN = r'<h1 id="filename"[^>]*>(?P<N>[^<]+)</h1>'
-    SIZE_PATTERN = r'<strong id="FileSize_master">(?P<S>[\d.,]+)&nbsp;(?P<U>[\w^_]+)</strong>'
+    CHECK_TRAFFIC = True
+    LOGIN_ACCOUNT = True
+
+    NAME_PATTERN    = r'<h1 id="filename"[^>]*>(?P<N>[^<]+)</h1>'
+    SIZE_PATTERN    = r'<strong id="FileSize_master">(?P<S>[\d.,]+)&nbsp;(?P<U>[\w^_]+)</strong>'
     OFFLINE_PATTERN = r'<h1>File not found.</h1>'
-    SHOW_WINDOW_PATTERN = r'<a href="([^?]+/(\d+)/\?do=(fileDownloadButton|relatedFileDownloadButton-\2)-showDownloadWindow)"'
+
+    LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'<a href="([^?]+/(\d+)/\?do=(fileDownloadButton|relatedFileDownloadButton-\2)-showDownloadWindow)"'
 
 
     def setup(self):
-        self.resumeDownload = self.multiDL = True if self.account else False
+        self.resumeDownload = self.multiDL = bool(self.account)
         self.chunkLimit = 1
 
 
-    def process(self, pyfile):
-        if not self.account:
-            self.fail(_("User not logged in"))
-        pyfile.url = re.match(self.__pattern__, pyfile.url).group(1)
-        self.html = self.load(pyfile.url, decode=True)
-        self.getFileInfo()
-        if not self.checkTrafficLeft():
-            self.fail(_("Not enough traffic left for user ") + self.user)
-
-        m = re.search(self.SHOW_WINDOW_PATTERN, self.html)
-        if m is None:
-            self.error(_("SHOW_WINDOW_PATTERN not found"))
-
-        self.url = "http://www.hellshare.com" + m.group(1)
-        self.download(self.url)
+    def downloadLink(self, link):
+        if link and isinstance(link, basestring):
+            self.correctCaptcha()
+            self.download(urljoin("http://www.hellshare.com/", link), disposition=True)
 
 
 getInfo = create_getInfo(HellshareCz)
diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py
deleted file mode 100644
index 317a49caf..000000000
--- a/module/plugins/hoster/HundredEightyUploadCom.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Test links:
-# http://180upload.com/js9qdm6kjnrs
-
-from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
-
-
-class HundredEightyUploadCom(XFSHoster):
-    __name__    = "HundredEightyUploadCom"
-    __type__    = "hoster"
-    __version__ = "0.04"
-
-    __pattern__ = r'http://(?:www\.)?180upload\.com/\w{12}'
-
-    __description__ = """180upload.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
-
-
-    HOSTER_DOMAIN = "180upload.com"
-
-
-getInfo = create_getInfo(HundredEightyUploadCom)
diff --git a/module/plugins/hoster/IfileIt.py b/module/plugins/hoster/IfileIt.py
index 2dae4cd80..056b05a65 100644
--- a/module/plugins/hoster/IfileIt.py
+++ b/module/plugins/hoster/IfileIt.py
@@ -1,16 +1,12 @@
 # -*- coding: utf-8 -*-
 
-import re
+from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
-from module.common.json_layer import json_loads
-from module.plugins.internal.CaptchaService import ReCaptcha
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
-
-class IfileIt(SimpleHoster):
+class IfileIt(DeadHoster):
     __name__    = "IfileIt"
     __type__    = "hoster"
-    __version__ = "0.28"
+    __version__ = "0.29"
 
     __pattern__ = r'^unmatchable$'
 
@@ -19,49 +15,4 @@ class IfileIt(SimpleHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    LINK_PATTERN = r'</span> If it doesn\'t, <a target="_blank" href="([^"]+)">'
-    RECAPTCHA_PATTERN = r'var __recaptcha_public\s*=\s*\'(.+?)\''
-    INFO_PATTERN = r'<span style="cursor: default;[^>]*>\s*(?P<N>.*?)\s*&nbsp;\s*<strong>\s*(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\s*</strong>\s*</span>'
-    OFFLINE_PATTERN = r'<span style="cursor: default;[^>]*>\s*&nbsp;\s*<strong>\s*</strong>\s*</span>'
-    TEMP_OFFLINE_PATTERN = r'<span class="msg_red">Downloading of this file is temporarily disabled</span>'
-
-
-    def handleFree(self):
-        ukey      = re.match(self.__pattern__, self.pyfile.url).group(1)
-        json_url  = 'http://ifile.it/new_download-request.json'
-        post_data = {"ukey": ukey, "ab": "0"}
-        res       = json_loads(self.load(json_url, post=post_data))
-
-        self.logDebug(res)
-
-        if res['status'] == 3:
-            self.offline()
-
-        if res['captcha']:
-            captcha_key = re.search(self.RECAPTCHA_PATTERN, self.html).group(1)
-
-            recaptcha = ReCaptcha(self)
-            post_data['ctype'] = "recaptcha"
-
-            for _i in xrange(5):
-                challenge, response = recaptcha.challenge(captcha_key)
-                post_data.update({'recaptcha_challenge': challenge,
-                                  'recaptcha_response' : response})
-                res = json_loads(self.load(json_url, post=post_data))
-                self.logDebug(res)
-
-                if res['retry']:
-                    self.invalidCaptcha()
-                else:
-                    self.correctCaptcha()
-                    break
-            else:
-                self.fail(_("Incorrect captcha"))
-
-        if not "ticket_url" in res:
-            self.error(_("No download URL"))
-
-        self.download(res['ticket_url'])
-
-
 getInfo = create_getInfo(IfileIt)
diff --git a/module/plugins/hoster/IfolderRu.py b/module/plugins/hoster/IfolderRu.py
index 255f10f45..249c2feb1 100644
--- a/module/plugins/hoster/IfolderRu.py
+++ b/module/plugins/hoster/IfolderRu.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class IfolderRu(SimpleHoster):
     __name__    = "IfolderRu"
     __type__    = "hoster"
-    __version__ = "0.38"
+    __version__ = "0.39"
 
     __pattern__ = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)'
 
@@ -18,25 +18,27 @@ class IfolderRu(SimpleHoster):
 
 
     SIZE_REPLACEMENTS = [(u'Кб', 'KB'), (u'Мб', 'MB'), (u'Гб', 'GB')]
-    NAME_PATTERN = ur'(?:<div><span>)?Название:(?:</span>)? <b>(?P<N>[^<]+)</b><(?:/div|br)>'
-    SIZE_PATTERN = ur'(?:<div><span>)?Размер:(?:</span>)? <b>(?P<S>[^<]+)</b><(?:/div|br)>'
+
+    NAME_PATTERN    = ur'(?:<div><span>)?Название:(?:</span>)? <b>(?P<N>[^<]+)</b><(?:/div|br)>'
+    SIZE_PATTERN    = ur'(?:<div><span>)?Размер:(?:</span>)? <b>(?P<S>[^<]+)</b><(?:/div|br)>'
     OFFLINE_PATTERN = ur'<p>Файл номер <b>[^<]*</b> (не найден|удален) !!!</p>'
 
     SESSION_ID_PATTERN = r'<a href=(http://ints\.(?:rusfolder\.com|ifolder\.ru)/ints/sponsor/\?bi=\d*&session=([^&]+)&u=[^>]+)>'
     INTS_SESSION_PATTERN = r'\(\'ints_session\'\);\s*if\(tag\)\{tag\.value = "([^"]+)";\}'
     HIDDEN_INPUT_PATTERN = r'var v = .*?name=\'(.+?)\' value=\'1\''
-    LINK_PATTERN = r'<a id="download_file_href" href="([^"]+)"'
+
+    LINK_FREE_PATTERN = r'<a id="download_file_href" href="([^"]+)"'
+
     WRONG_CAPTCHA_PATTERN = ur'<font color=Red>неверный код,<br>введите еще раз</font><br>'
 
 
     def setup(self):
-        self.resumeDownload = self.multiDL = True if self.account else False
-        self.chunkLimit = 1
+        self.resumeDownload = self.multiDL = bool(self.account)
+        self.chunkLimit     = 1
 
 
-    def process(self, pyfile):
-        file_id = re.match(self.__pattern__, pyfile.url).group('ID')
-        self.html = self.load("http://rusfolder.com/%s" % file_id, cookies=True, decode=True)
+    def handleFree(self, pyfile):
+        self.html = self.load("http://rusfolder.com/%s" % self.info['pattern']['ID'], cookies=True, decode=True)
         self.getFileInfo()
 
         url = re.search(r"location\.href = '(http://ints\..*?=)'", self.html).group(1)
@@ -68,9 +70,7 @@ class IfolderRu(SimpleHoster):
         else:
             self.fail(_("Invalid captcha"))
 
-        download_url = re.search(self.LINK_PATTERN, self.html).group(1)
-        self.correctCaptcha()
-        self.download(download_url)
+        self.link = re.search(self.LINK_PATTERN, self.html).group(1)
 
 
 getInfo = create_getInfo(IfolderRu)
diff --git a/module/plugins/hoster/JumbofilesCom.py b/module/plugins/hoster/JumbofilesCom.py
index cabc0f098..7adc1a029 100644
--- a/module/plugins/hoster/JumbofilesCom.py
+++ b/module/plugins/hoster/JumbofilesCom.py
@@ -8,9 +8,9 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class JumbofilesCom(SimpleHoster):
     __name__    = "JumbofilesCom"
     __type__    = "hoster"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(\w{12})'
+    __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})'
 
     __description__ = """JumboFiles.com hoster plugin"""
     __license__     = "GPLv3"
@@ -19,7 +19,7 @@ class JumbofilesCom(SimpleHoster):
 
     INFO_PATTERN = r'<TR><TD>(?P<N>[^<]+?)\s*<small>\((?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
     OFFLINE_PATTERN = r'Not Found or Deleted / Disabled due to inactivity or DMCA'
-    LINK_PATTERN = r'<meta http-equiv="refresh" content="10;url=(.+)">'
+    LINK_FREE_PATTERN = r'<meta http-equiv="refresh" content="10;url=(.+)">'
 
 
     def setup(self):
@@ -27,12 +27,10 @@ class JumbofilesCom(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self):
-        ukey = re.match(self.__pattern__, self.pyfile.url).group(1)
-        post_data = {"id": ukey, "op": "download3", "rand": ""}
+    def handleFree(self, pyfile):
+        post_data = {"id": self.info['pattern']['ID'], "op": "download3", "rand": ""}
         html = self.load(self.pyfile.url, post=post_data, decode=True)
-        url = re.search(self.LINK_PATTERN, html).group(1)
-        self.download(url)
+        self.link = re.search(self.LINK_FREE_PATTERN, html).group(1)
 
 
 getInfo = create_getInfo(JumbofilesCom)
diff --git a/module/plugins/hoster/KingfilesNet.py b/module/plugins/hoster/KingfilesNet.py
index 13cbf4781..a75ef5f3e 100644
--- a/module/plugins/hoster/KingfilesNet.py
+++ b/module/plugins/hoster/KingfilesNet.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class KingfilesNet(SimpleHoster):
     __name__    = "KingfilesNet"
     __type__    = "hoster"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})'
 
@@ -26,7 +26,7 @@ class KingfilesNet(SimpleHoster):
 
     RAND_ID_PATTERN = r'type=\"hidden\" name=\"rand\" value=\"(.+)\">'
 
-    LINK_PATTERN = r'var download_url = \'(.+)\';'
+    LINK_FREE_PATTERN = r'var download_url = \'(.+)\';'
 
 
     def setup(self):
@@ -34,16 +34,16 @@ class KingfilesNet(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         # Click the free user button
         post_data = {'op'         : "download1",
                      'usr_login'  : "",
                      'id'         : self.info['pattern']['ID'],
-                     'fname'      : self.pyfile.name,
+                     'fname'      : pyfile.name,
                      'referer'    : "",
                      'method_free': "+"}
 
-        self.html = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True)
+        self.html = self.load(pyfile.url, post=post_data, cookies=True, decode=True)
 
         solvemedia = SolveMedia(self)
         challenge, response = solvemedia.challenge()
@@ -59,24 +59,20 @@ class KingfilesNet(SimpleHoster):
         post_data = {'op'              : "download2",
                      'id'              : self.info['pattern']['ID'],
                      'rand'            : rand,
-                     'referer'         : self.pyfile.url,
+                     'referer'         : pyfile.url,
                      'method_free'     : "+",
                      'method_premium'  : "",
                      'adcopy_response' : response,
                      'adcopy_challenge': challenge,
                      'down_direct'     : "1"}
 
-        self.html = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True)
+        self.html = self.load(pyfile.url, post=post_data, cookies=True, decode=True)
 
-        m = re.search(self.LINK_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("Download url not found"))
 
         self.download(m.group(1), cookies=True, disposition=True)
 
-        check = self.checkDownload({'html': re.compile("<html>")})
-        if check == "html":
-            self.error(_("Downloaded file is an html page"))
-
 
 getInfo = create_getInfo(KingfilesNet)
diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py
index f3921fdb7..6d5641778 100644
--- a/module/plugins/hoster/LetitbitNet.py
+++ b/module/plugins/hoster/LetitbitNet.py
@@ -16,7 +16,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 from module.plugins.internal.SimpleHoster import SimpleHoster, secondsToMidnight
 
 
-def api_download_info(url):
+def api_response(url):
     json_data = ["yw7XQy2v9", ["download/info", {"link": url}]]
     api_rep   = getURL("http://api.letitbit.net/json",
                        post={'r': json_dumps(json_data)})
@@ -25,7 +25,7 @@ def api_download_info(url):
 
 def getInfo(urls):
     for url in urls:
-        api_rep = api_download_info(url)
+        api_rep = api_response(url)
         if api_rep['status'] == 'OK':
             info = api_rep['data'][0]
             yield (info['name'], info['size'], 2, url)
@@ -36,7 +36,7 @@ def getInfo(urls):
 class LetitbitNet(SimpleHoster):
     __name__    = "LetitbitNet"
     __type__    = "hoster"
-    __version__ = "0.28"
+    __version__ = "0.29"
 
     __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+'
 
@@ -57,7 +57,7 @@ class LetitbitNet(SimpleHoster):
 
 
     def getFileInfo(self):
-        api_rep = api_download_info(self.pyfile.url)
+        api_rep = api_response(self.pyfile.url)
         if api_rep['status'] == 'OK':
             self.api_data = api_rep['data'][0]
             self.pyfile.name = self.api_data['name']
@@ -66,12 +66,12 @@ class LetitbitNet(SimpleHoster):
             self.offline()
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         action, inputs = self.parseHtmlForm('id="ifree_form"')
         if not action:
             self.error(_("ifree_form"))
 
-        self.pyfile.size = float(inputs['sssize'])
+        pyfile.size = float(inputs['sssize'])
         self.logDebug(action, inputs)
         inputs['desc'] = ""
 
@@ -79,15 +79,20 @@ class LetitbitNet(SimpleHoster):
 
         m = re.search(self.SECONDS_PATTERN, self.html)
         seconds = int(m.group(1)) if m else 60
+
         self.logDebug("Seconds found", seconds)
+
         m = re.search(self.CAPTCHA_CONTROL_FIELD, self.html)
         recaptcha_control_field = m.group(1)
+
         self.logDebug("ReCaptcha control field found", recaptcha_control_field)
+
         self.wait(seconds)
 
         res = self.load("http://letitbit.net/ajax/download3.php", post=" ", cookies=True)
         if res != '1':
             self.error(_("Unknown response - ajax_check_url"))
+
         self.logDebug(res)
 
         recaptcha = ReCaptcha(self)
@@ -96,21 +101,30 @@ class LetitbitNet(SimpleHoster):
         post_data = {"recaptcha_challenge_field": challenge,
                      "recaptcha_response_field": response,
                      "recaptcha_control_field": recaptcha_control_field}
+
         self.logDebug("Post data to send", post_data)
+
         res = self.load("http://letitbit.net/ajax/check_recaptcha.php", post=post_data, cookies=True)
+
         self.logDebug(res)
+
         if not res:
             self.invalidCaptcha()
+
         if res == "error_free_download_blocked":
             self.logWarning(_("Daily limit reached"))
             self.wait(secondsToMidnight(gmt=2), True)
+
         if res == "error_wrong_captcha":
             self.invalidCaptcha()
             self.retry()
+
         elif res.startswith('['):
             urls = json_loads(res)
+
         elif res.startswith('http://'):
             urls = [res]
+
         else:
             self.error(_("Unknown response - captcha check"))
 
@@ -126,11 +140,11 @@ class LetitbitNet(SimpleHoster):
             self.fail(_("Download did not finish correctly"))
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         api_key = self.user
         premium_key = self.account.getAccountData(self.user)['password']
 
-        json_data = [api_key, ["download/direct_links", {"pass": premium_key, "link": self.pyfile.url}]]
+        json_data = [api_key, ["download/direct_links", {"pass": premium_key, "link": pyfile.url}]]
         api_rep = self.load('http://api.letitbit.net/json', post={'r': json_dumps(json_data)})
         self.logDebug("API Data: " + api_rep)
         api_rep = json_loads(api_rep)
diff --git a/module/plugins/hoster/LinestorageCom.py b/module/plugins/hoster/LinestorageCom.py
deleted file mode 100644
index a3caacc0c..000000000
--- a/module/plugins/hoster/LinestorageCom.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
-
-
-class LinestorageCom(XFSHoster):
-    __name__    = "LinestorageCom"
-    __type__    = "hoster"
-    __version__ = "0.01"
-
-    __pattern__ = r'http://(?:www\.)?linestorage\.com/\w{12}'
-
-    __description__ = """Linestorage.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    HOSTER_DOMAIN = "linestorage.com"
-
-
-getInfo = create_getInfo(LinestorageCom)
diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py
index b7127c066..aa3466036 100644
--- a/module/plugins/hoster/LinksnappyCom.py
+++ b/module/plugins/hoster/LinksnappyCom.py
@@ -11,11 +11,11 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class LinksnappyCom(MultiHoster):
     __name__    = "LinksnappyCom"
     __type__    = "hoster"
-    __version__ = "0.06"
+    __version__ = "0.07"
 
     __pattern__ = r'https?://(?:[^/]*\.)?linksnappy\.com'
 
-    __description__ = """Linksnappy.com hoster plugin"""
+    __description__ = """Linksnappy.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
@@ -23,9 +23,9 @@ class LinksnappyCom(MultiHoster):
     SINGLE_CHUNK_HOSTERS = ('easybytez.com')
 
 
-    def handlePremium(self):
-        host = self._get_host(self.pyfile.url)
-        json_params = json_dumps({'link': self.pyfile.url,
+    def handlePremium(self, pyfile):
+        host = self._get_host(pyfile.url)
+        json_params = json_dumps({'link': pyfile.url,
                                   'type': host,
                                   'username': self.user,
                                   'password': self.account.getAccountData(self.user)['password']})
@@ -40,7 +40,7 @@ class LinksnappyCom(MultiHoster):
             self.logError(msg, j['error'])
             self.fail(msg)
 
-        self.pyfile.name = j['filename']
+        pyfile.name = j['filename']
         self.link = j['generated']
 
         if host in self.SINGLE_CHUNK_HOSTERS:
@@ -48,19 +48,10 @@ class LinksnappyCom(MultiHoster):
         else:
             self.setup()
 
-        if self.link != self.pyfile.url:
+        if self.link != pyfile.url:
             self.logDebug("New URL: " + self.link)
 
 
-    def checkFile(self):
-        super(LinksnappyCom, self).checkFile()
-
-        check = self.checkDownload({"html302": "<title>302 Found</title>"})
-
-        if check == "html302":
-            self.retry(wait_time=5, reason=_("Linksnappy returns only HTML data"))
-
-
     @staticmethod
     def _get_host(url):
         host = urlsplit(url).netloc
diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py
index 0a5b26410..b21a69b5f 100644
--- a/module/plugins/hoster/LoadTo.py
+++ b/module/plugins/hoster/LoadTo.py
@@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class LoadTo(SimpleHoster):
     __name__    = "LoadTo"
     __type__    = "hoster"
-    __version__ = "0.18"
+    __version__ = "0.19"
 
     __pattern__ = r'http://(?:www\.)?load\.to/\w+'
 
@@ -27,7 +27,7 @@ class LoadTo(SimpleHoster):
     SIZE_PATTERN = r'Size: (?P<S>[\d.,]+) (?P<U>[\w^_]+)'
     OFFLINE_PATTERN = r'>Can\'t find file'
 
-    LINK_PATTERN = r'<form method="post" action="(.+?)"'
+    LINK_FREE_PATTERN = r'<form method="post" action="(.+?)"'
     WAIT_PATTERN = r'type="submit" value="Download \((\d+)\)"'
 
     URL_REPLACEMENTS = [(r'(\w)$', r'\1/')]
@@ -38,11 +38,11 @@ class LoadTo(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         # Search for Download URL
-        m = re.search(self.LINK_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("LINK_PATTERN not found"))
+            self.error(_("LINK_FREE_PATTERN not found"))
 
         download_url = m.group(1)
 
@@ -59,17 +59,7 @@ class LoadTo(SimpleHoster):
             self.download(download_url)
         else:
             challenge, response = solvemedia.challenge(captcha_key)
-
             self.download(download_url, post={"adcopy_challenge": challenge, "adcopy_response": response})
 
-            check = self.checkDownload({'404': re.compile("\A<h1>404 Not Found</h1>"), 'html': re.compile("html")})
-
-            if check == "404":
-                self.invalidCaptcha()
-                self.retry()
-            elif check == "html":
-                self.logWarning(_("Downloaded file is an html page, will retry"))
-                self.retry()
-
 
 getInfo = create_getInfo(LoadTo)
diff --git a/module/plugins/hoster/LuckyShareNet.py b/module/plugins/hoster/LuckyShareNet.py
index 2c33b57e7..09300a41a 100644
--- a/module/plugins/hoster/LuckyShareNet.py
+++ b/module/plugins/hoster/LuckyShareNet.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class LuckyShareNet(SimpleHoster):
     __name__    = "LuckyShareNet"
     __type__    = "hoster"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __pattern__ = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})'
 
@@ -41,11 +41,12 @@ class LuckyShareNet(SimpleHoster):
 
     # TODO: There should be a filesize limit for free downloads
     # TODO: Some files could not be downloaded in free mode
-    def handleFree(self):
+    def handleFree(self, pyfile):
         rep = self.load(r"http://luckyshare.net/download/request/type/time/file/" + self.info['pattern']['ID'], decode=True)
+
         self.logDebug("JSON: " + rep)
-        json = self.parseJson(rep)
 
+        json = self.parseJson(rep)
         self.wait(int(json['time']))
 
         recaptcha = ReCaptcha(self)
diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py
index 782d78ce1..81bd36f73 100644
--- a/module/plugins/hoster/MediafireCom.py
+++ b/module/plugins/hoster/MediafireCom.py
@@ -54,7 +54,7 @@ def getInfo(urls):
 class MediafireCom(SimpleHoster):
     __name__    = "MediafireCom"
     __type__    = "hoster"
-    __version__ = "0.82"
+    __version__ = "0.83"
 
     __pattern__ = r'http://(?:www\.)?mediafire\.com/(file/|(view/?|download\.php)?\?)(\w{11}|\w{15})($|/)'
 
@@ -88,9 +88,9 @@ class MediafireCom(SimpleHoster):
             self.check_data = self.getFileInfo()
 
             if self.account:
-                self.handlePremium()
+                self.handlePremium(pyfile)
             else:
-                self.handleFree()
+                self.handleFree(pyfile)
         elif result == 1:
             self.offline()
         else:
@@ -98,7 +98,7 @@ class MediafireCom(SimpleHoster):
             self.download(self.link, disposition=True)
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         if self.PASSWORD_PATTERN in self.html:
             password = self.getPassword()
 
diff --git a/module/plugins/hoster/MegaDebridEu.py b/module/plugins/hoster/MegaDebridEu.py
index 6e24cc7ba..8bbc733e0 100644
--- a/module/plugins/hoster/MegaDebridEu.py
+++ b/module/plugins/hoster/MegaDebridEu.py
@@ -11,11 +11,11 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class MegaDebridEu(MultiHoster):
     __name__    = "MegaDebridEu"
     __type__    = "hoster"
-    __version__ = "0.45"
+    __version__ = "0.46"
 
     __pattern__ = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+'
 
-    __description__ = """mega-debrid.eu hoster plugin"""
+    __description__ = """mega-debrid.eu multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")]
 
@@ -30,19 +30,19 @@ class MegaDebridEu(MultiHoster):
             return ""
 
 
-    def handlePremium(self):
-        if not self.connectToApi():
+    def handlePremium(self, pyfile):
+        if not self.api_load():
             self.exitOnFail("Unable to connect to Mega-debrid.eu")
 
-        self.link = self.debridLink(self.pyfile.url)
+        self.link = self.debridLink(pyfile.url)
         self.logDebug("New URL: " + self.link)
 
         filename = self.getFilename(self.link)
         if filename != "":
-            self.pyfile.name = filename
+            pyfile.name = filename
 
 
-    def connectToApi(self):
+    def api_load(self):
         """
         Connexion to the mega-debrid API
         Return True if succeed
diff --git a/module/plugins/hoster/MegaRapidCz.py b/module/plugins/hoster/MegaRapidCz.py
index 37732ade6..048561ac5 100644
--- a/module/plugins/hoster/MegaRapidCz.py
+++ b/module/plugins/hoster/MegaRapidCz.py
@@ -4,6 +4,7 @@ import re
 
 from pycurl import HTTPHEADER
 
+from module.network.HTTPRequest import BadHeader
 from module.network.RequestFactory import getRequest
 from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
 
@@ -22,7 +23,7 @@ def getInfo(urls):
 class MegaRapidCz(SimpleHoster):
     __name__    = "MegaRapidCz"
     __type__    = "hoster"
-    __version__ = "0.55"
+    __version__ = "0.56"
 
     __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+'
 
@@ -40,8 +41,9 @@ class MegaRapidCz(SimpleHoster):
 
     CHECK_TRAFFIC = True
 
-    LINK_PATTERN = r'<a href="([^"]+)" title="Stahnout">([^<]+)</a>'
-    ERR_LOGIN_PATTERN = ur'<div class="error_div"><strong>Stahování je přístupné pouze přihlášeným uživatelům'
+    LINK_PREMIUM_PATTERN = r'<a href="([^"]+)" title="Stahnout">([^<]+)</a>'
+
+    ERR_LOGIN_PATTERN  = ur'<div class="error_div"><strong>Stahování je přístupné pouze přihlášeným uživatelům'
     ERR_CREDIT_PATTERN = ur'<div class="error_div"><strong>Stahování zdarma je možné jen přes náš'
 
 
@@ -49,14 +51,8 @@ class MegaRapidCz(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handlePremium(self):
-        try:
-            self.html = self.load(self.pyfile.url, decode=True)
-        except BadHeader, e:
-            self.account.relogin(self.user)
-            self.retry(wait_time=60, reason=str(e))
-
-        m = re.search(self.LINK_PATTERN, self.html)
+    def handlePremium(self, pyfile):
+        m = re.search(self.LINK_PREMIUM_PATTERN, self.html)
         if m:
             link = m.group(1)
             self.logDebug("Premium link: %s" % link)
diff --git a/module/plugins/hoster/MegacrypterCom.py b/module/plugins/hoster/MegacrypterCom.py
index 4034f7d32..10a2eb025 100644
--- a/module/plugins/hoster/MegacrypterCom.py
+++ b/module/plugins/hoster/MegacrypterCom.py
@@ -10,9 +10,9 @@ from module.plugins.hoster.MegaCoNz import MegaCoNz
 class MegacrypterCom(MegaCoNz):
     __name__    = "MegacrypterCom"
     __type__    = "hoster"
-    __version__ = "0.21"
+    __version__ = "0.22"
 
-    __pattern__ = r'(https?://\w{0,10}\.?megacrypter\.com/[\w!-]+)'
+    __pattern__ = r'https?://\w{0,10}\.?megacrypter\.com/[\w!-]+'
 
     __description__ = """Megacrypter.com decrypter plugin"""
     __license__     = "GPLv3"
@@ -23,7 +23,7 @@ class MegacrypterCom(MegaCoNz):
     FILE_SUFFIX = ".crypted"
 
 
-    def callApi(self, **kwargs):
+    def api_response(self, **kwargs):
         """ Dispatch a call to the api, see megacrypter.com/api_doc """
         self.logDebug("JSON request: " + json_dumps(kwargs))
         res = self.load(self.API_URL, post=json_dumps(kwargs))
@@ -33,13 +33,13 @@ class MegacrypterCom(MegaCoNz):
 
     def process(self, pyfile):
         # match is guaranteed because plugin was chosen to handle url
-        node = re.match(self.__pattern__, pyfile.url).group(1)
+        node = re.match(self.__pattern__, pyfile.url).group(0)
 
         # get Mega.co.nz link info
-        info = self.callApi(link=node, m="info")
+        info = self.api_response(link=node, m="info")
 
         # get crypted file URL
-        dl = self.callApi(link=node, m="dl")
+        dl = self.api_response(link=node, m="dl")
 
         # TODO: map error codes, implement password protection
         # if info['pass'] is True:
@@ -50,6 +50,7 @@ class MegacrypterCom(MegaCoNz):
         pyfile.name = info['name'] + self.FILE_SUFFIX
 
         self.download(dl['url'])
+
         self.decryptFile(key)
 
         # Everything is finished and final name can be set
diff --git a/module/plugins/hoster/MegasharesCom.py b/module/plugins/hoster/MegasharesCom.py
index 9d8441c6f..bdb428143 100644
--- a/module/plugins/hoster/MegasharesCom.py
+++ b/module/plugins/hoster/MegasharesCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class MegasharesCom(SimpleHoster):
     __name__    = "MegasharesCom"
     __type__    = "hoster"
-    __version__ = "0.27"
+    __version__ = "0.28"
 
     __pattern__ = r'http://(?:www\.)?(d\d{2}\.)?megashares\.com/((index\.php)?\?d\d{2}=|dl/)\w+'
 
@@ -39,11 +39,11 @@ class MegasharesCom(SimpleHoster):
         self.multiDL        = self.premium
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         self.handleDownload(True)
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         if self.NO_SLOTS_PATTERN in self.html:
             self.retry(wait_time=5 * 60)
 
diff --git a/module/plugins/hoster/MultihostersCom.py b/module/plugins/hoster/MultihostersCom.py
index 04192cd8e..c5a48310e 100644
--- a/module/plugins/hoster/MultihostersCom.py
+++ b/module/plugins/hoster/MultihostersCom.py
@@ -1,41 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import re
-from module.plugins.Hoster import Hoster
+from module.plugins.hosters.ZeveraCom import ZeveraCom
 
-class MultihostersCom(Hoster):
-    __name__ = "MultihostersCom"
-    __version__ = "0.01"
-    __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?multihosters.com/.*'
-    __description__ = """Multihosters.com hoster plugin"""
-    __author_name__ = "tjeh"
-    __author_mail__ = "tjeh@gmx.net"
 
-    def setup(self):
-        self.resumeDownload = self.multiDL = True
-        self.chunkLimit = 1
+class MultihostersCom(ZeveraCom):
+    __name__    = "MultihostersCom"
+    __type__    = "hoster"
+    __version__ = "0.02"
 
-    def process(self, pyfile):
-        if re.match(self.__pattern__, pyfile.url):
-            new_url = pyfile.url
-        elif not self.account:
-            self.logError(("Please enter your %s account or deactivate this plugin") % "multihosters.com")
-            self.fail("No multihosters.com account provided")
-        else:
-            self.logDebug("Old URL: %s" % pyfile.url)
-            new_url = "http://multihosters.com/getFiles.aspx?ourl=" + pyfile.url
-            pyfile.url = new_url
-            self.logDebug("New URL: %s" % new_url)
+    __pattern__ = r'https?://(?:www\.)multihosters\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
 
-        if self.account.getAPIData(self.req, cmd="checklink", olink=pyfile.url) != "Alive":
-            self.fail("Offline or not downloadable - contact Multihosters support")
-
-        header = self.account.getAPIData(self.req, just_header=True, cmd="generatedownloaddirect", olink=pyfile.url)
-        if not "location" in header:
-            self.fail("Unable to initialize download - contact Multihosters support")
-        self.download(header['location'], disposition=True)
-
-        check = self.checkDownload({"error": 'action="ErrorDownload.aspx'})
-        if check == "error":
-            self.fail("Error response received - contact Multihosters support")
+    __description__ = """Multihosters.com multi-hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("tjeh", "tjeh@gmx.net")]
diff --git a/module/plugins/hoster/MultishareCz.py b/module/plugins/hoster/MultishareCz.py
index 421ad111b..7a6e73252 100644
--- a/module/plugins/hoster/MultishareCz.py
+++ b/module/plugins/hoster/MultishareCz.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class MultishareCz(SimpleHoster):
     __name__    = "MultishareCz"
     __type__    = "hoster"
-    __version__ = "0.39"
+    __version__ = "0.40"
 
     __pattern__ = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)'
 
@@ -28,12 +28,12 @@ class MultishareCz(SimpleHoster):
     OFFLINE_PATTERN = ur'<h1>Stáhnout soubor</h1><p><strong>Požadovaný soubor neexistuje.</strong></p>'
 
 
-    def handleFree(self):
-        self.download("http://www.multishare.cz/html/download_free.php?ID=%s" % self.info['pattern']['ID'])
+    def handleFree(self, pyfile):
+        self.download("http://www.multishare.cz/html/download_free.php", get={'ID': self.info['pattern']['ID']})
 
 
-    def handlePremium(self):
-        self.download("http://www.multishare.cz/html/download_premium.php?ID=%s" % self.info['pattern']['ID'])
+    def handlePremium(self, pyfile):
+        self.download("http://www.multishare.cz/html/download_premium.php", get={'ID': self.info['pattern']['ID']})
 
 
     def handleMulti(self, pyfile):
diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py
index 13ba2af21..5ea2639f1 100644
--- a/module/plugins/hoster/MyfastfileCom.py
+++ b/module/plugins/hoster/MyfastfileCom.py
@@ -9,11 +9,11 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class MyfastfileCom(MultiHoster):
     __name__    = "MyfastfileCom"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/'
 
-    __description__ = """Myfastfile.com hoster plugin"""
+    __description__ = """Myfastfile.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
@@ -22,19 +22,19 @@ class MyfastfileCom(MultiHoster):
         self.chunkLimit = -1
 
 
-    def handlePremium(self):
-        self.logDebug("Original URL: %s" % self.pyfile.url)
+    def handlePremium(self, pyfile):
+        self.logDebug("Original URL: %s" % pyfile.url)
 
         page = self.load('http://myfastfile.com/api.php',
                          get={'user': self.user, 'pass': self.account.getAccountData(self.user)['password'],
-                              'link': self.pyfile.url})
+                              'link': pyfile.url})
         self.logDebug("JSON data: " + page)
         page = json_loads(page)
         if page['status'] != 'ok':
             self.fail(_("Unable to unrestrict link"))
         self.link = page['link']
 
-        if self.link != self.pyfile.url:
+        if self.link != pyfile.url:
             self.logDebug("Unrestricted URL: " + self.link)
 
 
diff --git a/module/plugins/hoster/NarodRu.py b/module/plugins/hoster/NarodRu.py
index 21d4e3e3d..8b56c0908 100644
--- a/module/plugins/hoster/NarodRu.py
+++ b/module/plugins/hoster/NarodRu.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class NarodRu(SimpleHoster):
     __name__    = "NarodRu"
     __type__    = "hoster"
-    __version__ = "0.11"
+    __version__ = "0.12"
 
     __pattern__ = r'http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/\d+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+'
 
@@ -28,29 +28,35 @@ class NarodRu(SimpleHoster):
                              (r"/start/\d+\.\w+-narod\.yandex\.ru/(\d{6,15})/\w+/(\w+)", r"/disk/\1/\2")]
 
     CAPTCHA_PATTERN = r'<number url="(.*?)">(\w+)</number>'
-    LINK_PATTERN = r'<a class="h-link" rel="yandex_bar" href="(.+?)">'
+    LINK_FREE_PATTERN = r'<a class="h-link" rel="yandex_bar" href="(.+?)">'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         for _i in xrange(5):
             self.html = self.load('http://narod.ru/disk/getcapchaxml/?rnd=%d' % int(random() * 777))
+
             m = re.search(self.CAPTCHA_PATTERN, self.html)
             if m is None:
                 self.error(_("Captcha"))
+
             post_data = {"action": "sendcapcha"}
             captcha_url, post_data['key'] = m.groups()
             post_data['rep'] = self.decryptCaptcha(captcha_url)
 
-            self.html = self.load(self.pyfile.url, post=post_data, decode=True)
-            m = re.search(self.LINK_PATTERN, self.html)
+            self.html = self.load(pyfile.url, post=post_data, decode=True)
+
+            m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
                 url = 'http://narod.ru' + m.group(1)
                 self.correctCaptcha()
                 break
+
             elif u'<b class="error-msg"><strong>Ошиблись?</strong>' in self.html:
                 self.invalidCaptcha()
+
             else:
                 self.error(_("Download link"))
+
         else:
             self.fail(_("No valid captcha code entered"))
 
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index f5c5ee802..27fc08033 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -88,7 +88,7 @@ class NetloadIn(Hoster):
 
 
     def prepare(self):
-        self.download_api_data()
+        self.api_load()
 
         if self.api_data and self.api_data['filename']:
             self.pyfile.name = self.api_data['filename']
@@ -111,7 +111,7 @@ class NetloadIn(Hoster):
             return False
 
 
-    def download_api_data(self, n=0):
+    def api_load(self, n=0):
         url      = self.url
         id_regex = re.compile(self.__pattern__)
         match    = id_regex.search(url)
@@ -130,7 +130,7 @@ class NetloadIn(Hoster):
                              "md5": "1"}, decode=True).strip()
         if not html and n <= 3:
             sleep(0.2)
-            self.download_api_data(n + 1)
+            self.api_load(n + 1)
             return
 
         self.logDebug("APIDATA: " + html)
diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py
index c31431cc2..6356da428 100644
--- a/module/plugins/hoster/NitroflareCom.py
+++ b/module/plugins/hoster/NitroflareCom.py
@@ -1,86 +1,79 @@
 # -*- coding: utf-8 -*-
+#
+# Note:
+#   Right now premium support is not added
+#   Thus, any file that require premium support
+#   cannot be downloaded. Only the file that is free to
+#   download can be downloaded.
 
 import re
-import json
 
-from module.plugins.Hoster import Hoster
+from module.common.json_layer import json_loads
 from module.plugins.internal.CaptchaService import ReCaptcha
+from module.plugins.SimpleHoster import SimpleHoster
 
 
-"""
-    Right now premium support is not added
-    Thus, any file that require premium support
-    cannot be downloaded. Only the file that is free to
-    download can be downloaded.
-"""
-class NitroflareCom(Hoster):
-    __name__ = "NitroflareCom"
-    __type__ = "hoster"
-    __version__ = "0.01"
+class NitroflareCom(SimpleHoster):
+    __name__    = "NitroflareCom"
+    __type__    = "hoster"
+    __version__ = "0.02"
+
+    __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)'
 
-    __pattern__ = r'https?://(?:www\.)?(nitroflare\.com/view)/(?P<ID>[A-Z0-9]+)'
     __description__ = """Nitroflare.com hoster plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("sahil", None)]
+    __license__     = "GPLv3"
+    __authors__     = [("sahil", ""),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
 
-    BASE_URL = "https://nitroflare.com"
-    API_URL = "https://nitroflare.com/api/"
-    DOWNLOAD_PATTERN = "\"(https?://[a-z0-9\\-_]+\\.nitroflare\\.com/[^<>\"]*?)\""
+    # URL_REPLACEMENTS = [("http://", "https://")]
 
-    def process(self, pyfile):
+    LINK_FREE_PATTERN = r'(https?://[\w\\-]+\\.nitroflare\\.com/[^<>\"]*?)"'
 
-        if "https://" not in pyfile.url:
-            pyfile.url = self.correct_download_link(pyfile.url)
 
-        url_match = re.match(self.__pattern__, pyfile.url)
-        file_uid = url_match.group('ID')
-        if self.checkLink(file_uid):
-            file_info = self.load(self.API_URL + "getDownloadLink?file=" + file_uid)
-            self.logWarning(file_info[3:])
-            file_info = json.loads(file_info[3:])  # removing non ascii characters
-            if file_info['type'] == "success":
-                result = file_info['result']  # already a dict
-                if result['linkType'] == "free":
-                    delay = result['delay']  # Don't need the delay for free downloads
-                    captch_key = result['recaptchaPublic']
-                    filename = result['name']
-                    recaptcha = ReCaptcha(self)
-                    # try upto 3 times to solve reCaptcha
-                    for i in xrange(3):
-                        challenge, response = recaptcha.challenge(key=captch_key)
-                        res = self.load(self.BASE_URL + "/ajax/freeDownload.php",
-                                             post={"method": "fetchDownload",
-                                                   "recaptcha_challenge_field": challenge,
-                                                   "recaptcha_response_field": response})
-                        if self.handleCaptchaErrors(res):
-                            break
-                        if "The captcha wasn't entered correctly" or "You have to fill the captcha" in res:
-                            continue
-                        else:
-                            break
+    def handleFree(self, pyfile):
+        file_info = self.load("https://nitroflare.com/api/getDownloadLink",
+                              get={'file': self.info['pattern']['ID']})
 
+        self.logWarning(file_info[3:])
+        file_info = json_loads(file_info[3:])  # removing non ascii characters
+        if file_info['type'] == "success":
+            result = file_info['result']  # already a dict
+            if result['linkType'] == "free":
+                delay = result['delay']  # Don't need the delay for free downloads
+                captch_key = result['recaptchaPublic']
+                filename = result['name']
+                recaptcha = ReCaptcha(self)
+                # try upto 3 times to solve reCaptcha
+                for i in xrange(3):
+                    challenge, response = recaptcha.challenge(key=captch_key)
+                    res = self.load("https://nitroflare.com/ajax/freeDownload.php",
+                                         post={"method": "fetchDownload",
+                                               "recaptcha_challenge_field": challenge,
+                                               "recaptcha_response_field": response})
+                    if self.handleCaptchaErrors(res):
+                        break
                     if "The captcha wasn't entered correctly" or "You have to fill the captcha" in res:
-                        self.logError("Captcha Failed")
-                        self.offline()
-                        # Captcha failed
+                        continue
+                    else:
+                        break
+
+                if "The captcha wasn't entered correctly" or "You have to fill the captcha" in res:
+                    self.logError("Captcha Failed")
+                    self.offline()
+                    # Captcha failed
+                else:
+                    self.logInfo("result of the captcha is")
+                    self.logInfo(res)
+                    # self.offline()
+                    download_link = re.search(self.DOWNLOAD_PATTERN, res)
+                    if download_link is None:
+                        print "downloasd link failed"
+                        # Download link failed
                     else:
-                        self.logInfo("result of the captcha is")
-                        self.logInfo(res)
-                        # self.offline()
-                        download_link = re.search(self.DOWNLOAD_PATTERN, res)
-                        if download_link is None:
-                            print "downloasd link failed"
-                            # Download link failed
-                        else:
-                            self.download(download_link)
+                        self.download(download_link)
         else:
             print "link is invalid"
             self.offline()
             # Link is invalid
         # self.download()
-
-    def correct_download_link(self, url):
-        return url.replace("http://", "https://")
-
-    def checkLink(self, url):
-        return True
\ No newline at end of file
diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py
index feedd7651..361d48c2d 100644
--- a/module/plugins/hoster/NoPremiumPl.py
+++ b/module/plugins/hoster/NoPremiumPl.py
@@ -1,75 +1,74 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleHoster import SimpleHoster
-from module.common.json_layer import json_loads as loads
-
-
-class NoPremiumPl(SimpleHoster):
-    __name__ = "NoPremiumPl"
-    __version__ = "0.01"
-    __type__ = "hoster"
-
-    __pattern__ = r"https?://direct\.nopremium\.pl.*"
-    __description__ = "NoPremium.pl hoster plugin"
-    __license__ = "GPLv3"
-    __authors__ = [("goddie", "dev@nopremium.pl")]
-
-    _api_url = "http://crypt.nopremium.pl"
-
-    _api_query = {"site": "nopremium",
-                  "output": "json",
-                  "username": "",
-                  "password": "",
-                  "url": ""}
-
-    _error_codes = {
-        0: "[%s] Incorrect login credentials",
-        1: "[%s] Not enough transfer to download - top-up your account",
-        2: "[%s] Incorrect / dead link",
-        3: "[%s] Error connecting to hosting, try again later",
-        9: "[%s] Premium account has expired",
-        15: "[%s] Hosting no longer supported",
-        80: "[%s] Too many incorrect login attempts, account blocked for 24h"
-    }
-
-    _usr = False
-    _pwd = False
-
-    def setup(self):
-        self.resumeDownload = True
-        self.multiDL = True
-
-    def get_username_password(self):
-        if not self.account:
-            self.fail(_("Please enter your %s account or deactivate this plugin") % "NoPremium.pl")
-        else:
-            data = self.account.getAccountData(self.user)
-            self._usr = data['usr']
-            self._pwd = data['pwd']
+from module.common.json_layer import json_loads
+from module.plugins.internal.MultiHoster import MultiHoster
+
+
+class NoPremiumPl(MultiHoster):
+    __name__    = "NoPremiumPl"
+    __type__    = "hoster"
+    __version__ = "0.02"
+
+    __pattern__ = r'https?://direct\.nopremium\.pl.+'
+
+    __description__ = """NoPremium.pl multi-hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("goddie", "dev@nopremium.pl")]
+
+
+    API_URL = "http://crypt.nopremium.pl"
+
+    API_QUERY = {'site'    : "nopremium",
+                 'output'  : "json",
+                 'username': "",
+                 'password': "",
+                 'url'     : ""}
+
+    ERROR_CODES = {0 : "[%s] Incorrect login credentials",
+                   1 : "[%s] Not enough transfer to download - top-up your account",
+                   2 : "[%s] Incorrect / dead link",
+                   3 : "[%s] Error connecting to hosting, try again later",
+                   9 : "[%s] Premium account has expired",
+                   15: "[%s] Hosting no longer supported",
+                   80: "[%s] Too many incorrect login attempts, account blocked for 24h"}
+
+
+    def prepare(self):
+        super(NoPremiumPl, self).prepare()
+
+        data = self.account.getAccountData(self.user)
+
+        self.usr = data['usr']
+        self.pwd = data['pwd']
+
 
     def runFileQuery(self, url, mode=None):
-        query = self._api_query.copy()
-        query["username"] = self._usr
-        query["password"] = self._pwd
-        query["url"] = url
+        query = self.API_QUERY.copy()
+
+        query["username"] = self.usr
+        query["password"] = self.pwd
+        query["url"]      = url
 
         if mode == "fileinfo":
             query['check'] = 2
-            query['loc'] = 1
+            query['loc']   = 1
+
         self.logDebug(query)
 
-        return self.load(self._api_url, post=query)
+        return self.load(self.API_URL, post=query)
 
-    def process(self, pyfile):
-        self.get_username_password()
+
+    def handleFree(self, pyfile):
         try:
             data = self.runFileQuery(pyfile.url, 'fileinfo')
+
         except Exception:
             self.logDebug("runFileQuery error")
             self.tempOffline()
 
         try:
-            parsed = loads(data)
+            parsed = json_loads(data)
+
         except Exception:
             self.logDebug("loads error")
             self.tempOffline()
@@ -77,9 +76,9 @@ class NoPremiumPl(SimpleHoster):
         self.logDebug(parsed)
 
         if "errno" in parsed.keys():
-            if parsed["errno"] in self._error_codes:
+            if parsed["errno"] in self.ERROR_CODES:
                 # error code in known
-                self.fail(self._error_codes[parsed["errno"]] % self.__name__)
+                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name__)
             else:
                 # error code isn't yet added to plugin
                 self.fail(
@@ -97,9 +96,8 @@ class NoPremiumPl(SimpleHoster):
         pyfile.size = parsed["filesize"]
 
         try:
-            result_dl = self.runFileQuery(pyfile.url, 'filedownload')
+            self.link = self.runFileQuery(pyfile.url, 'filedownload')
+
         except Exception:
             self.logDebug("runFileQuery error #2")
             self.tempOffline()
-
-        self.download(result_dl, disposition=True)
diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py
index 0480b20bf..b69242a86 100644
--- a/module/plugins/hoster/NowDownloadSx.py
+++ b/module/plugins/hoster/NowDownloadSx.py
@@ -9,7 +9,7 @@ from module.utils import fixup
 class NowDownloadSx(SimpleHoster):
     __name__    = "NowDownloadSx"
     __type__    = "hoster"
-    __version__ = "0.06"
+    __version__ = "0.07"
 
     __pattern__ = r'http://(?:www\.)?(nowdownload\.(at|ch|co|eu|sx)/(dl/|download\.php\?id=)|likeupload\.org/)\w+'
 
@@ -25,7 +25,7 @@ class NowDownloadSx(SimpleHoster):
     TOKEN_PATTERN = r'"(/api/token\.php\?token=\w+)"'
     CONTINUE_PATTERN = r'"(/dl2/\w+/\w+)"'
     WAIT_PATTERN = r'\.countdown\(\{until: \+(\d+),'
-    LINK_PATTERN = r'(http://s\d+\.coolcdn\.info/nowdownload/.+?)["\']'
+    LINK_FREE_PATTERN = r'(http://s\d+\.coolcdn\.info/nowdownload/.+?)["\']'
 
     NAME_REPLACEMENTS = [("&#?\w+;", fixup), (r'<[^>]*>', '')]
 
@@ -36,7 +36,7 @@ class NowDownloadSx(SimpleHoster):
         self.chunkLimit     = -1
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         tokenlink = re.search(self.TOKEN_PATTERN, self.html)
         continuelink = re.search(self.CONTINUE_PATTERN, self.html)
         if tokenlink is None or continuelink is None:
@@ -54,7 +54,7 @@ class NowDownloadSx(SimpleHoster):
 
         self.html = self.load(baseurl + str(continuelink.group(1)))
 
-        url = re.search(self.LINK_PATTERN, self.html)
+        url = re.search(self.LINK_FREE_PATTERN, self.html)
         if url is None:
             self.error(_("Download link not found"))
 
diff --git a/module/plugins/hoster/NowVideoSx.py b/module/plugins/hoster/NowVideoSx.py
index 0dedfbd42..3f75a33f7 100644
--- a/module/plugins/hoster/NowVideoSx.py
+++ b/module/plugins/hoster/NowVideoSx.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class NowVideoSx(SimpleHoster):
     __name__    = "NowVideoSx"
     __type__    = "hoster"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __pattern__ = r'http://(?:www\.)?nowvideo\.(at|ch|co|eu|li|sx)/(video|mobile/#/videos)/(?P<ID>\w+)'
 
@@ -31,7 +31,7 @@ class NowVideoSx(SimpleHoster):
         self.multiDL        = True
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         self.html = self.load("http://www.nowvideo.sx/mobile/video.php", get={'id': self.info['pattern']['ID']})
 
         m = re.search(self.LINK_FREE_PATTERN, self.html)
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
deleted file mode 100644
index f0e16a101..000000000
--- a/module/plugins/hoster/OneFichierCom.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-
-
-class OneFichierCom(SimpleHoster):
-    __name__    = "OneFichierCom"
-    __type__    = "hoster"
-    __version__ = "0.75"
-
-    __pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?'
-
-    __description__ = """1fichier.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
-                       ("the-razer", "daniel_ AT gmx DOT net"),
-                       ("zoidberg", "zoidberg@mujmail.cz"),
-                       ("imclem", None),
-                       ("stickell", "l.stickell@yahoo.it"),
-                       ("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    NAME_PATTERN = r'>FileName :</td>\s*<td.*>(?P<N>.+?)<'
-    SIZE_PATTERN = r'>Size :</td>\s*<td.*>(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
-
-    OFFLINE_PATTERN = r'File not found !\s*<'
-
-    COOKIES = [("1fichier.com", "LG", "en")]
-
-    WAIT_PATTERN = r'>You must wait (\d+) minutes'
-
-
-    def setup(self):
-        self.multiDL        = self.premium
-        self.resumeDownload = True
-
-
-    def handleFree(self):
-        id = self.info['pattern']['ID1'] or self.info['pattern']['ID2']
-        url, inputs = self.parseHtmlForm('action="https://1fichier.com/\?%s' % id)
-
-        if not url:
-            self.fail(_("Download link not found"))
-
-        if "pass" in inputs:
-            inputs['pass'] = self.getPassword()
-
-        inputs['submit'] = "Download"
-
-        self.download(url, post=inputs)
-
-
-    def handlePremium(self):
-        return self.handleFree()
-
-
-getInfo = create_getInfo(OneFichierCom)
diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py
index cb6bb98ac..2d7506f0a 100644
--- a/module/plugins/hoster/OverLoadMe.py
+++ b/module/plugins/hoster/OverLoadMe.py
@@ -13,11 +13,11 @@ from module.utils import parseFileSize
 class OverLoadMe(MultiHoster):
     __name__    = "OverLoadMe"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __pattern__ = r'https?://.*overload\.me/.+'
 
-    __description__ = """Over-Load.me hoster plugin"""
+    __description__ = """Over-Load.me multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("marley", "marley@over-load.me")]
 
@@ -38,12 +38,12 @@ class OverLoadMe(MultiHoster):
         self.chunkLimit = 5
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         https = "https" if self.getConfig("https") else "http"
         data  = self.account.getAccountData(self.user)
         page  = self.load(https + "://api.over-load.me/getdownload.php",
                           get={'auth': data['password'],
-                               'link': self.pyfile.url})
+                               'link': pyfile.url})
 
         data = json_loads(page)
         self.logDebug(data)
@@ -52,30 +52,27 @@ class OverLoadMe(MultiHoster):
             self.logWarning(data['msg'])
             self.tempOffline()
         else:
-            if self.pyfile.name is not None and self.pyfile.name.endswith('.tmp') and data['filename']:
-                self.pyfile.name = data['filename']
-                self.pyfile.size = parseFileSize(data['filesize'])
+            if pyfile.name is not None and pyfile.name.endswith('.tmp') and data['filename']:
+                pyfile.name = data['filename']
+                pyfile.size = parseFileSize(data['filesize'])
 
             http_repl = ["http://", "https://"]
             self.link = data['downloadlink'].replace(*http_repl if self.getConfig("https") else *http_repl[::-1])
 
-        if self.link != self.pyfile.url:
+        if self.link != pyfile.url:
             self.logDebug("New URL: %s" % self.link)
 
-        if self.pyfile.name.startswith("http") or self.pyfile.name.startswith("Unknown") or self.pyfile.name.endswith('..'):
+        if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown") or pyfile.name.endswith('..'):
             # only use when name wasn't already set
-            self.pyfile.name = self.getFilename(self.link)
+            pyfile.name = self.getFilename(self.link)
 
 
     def checkFile(self):
-        super(OverLoadMe, self).checkFile()
-
-        check = self.checkDownload(
-            {"error": "<title>An error occured while processing your request</title>"})
-
-        if check == "error":
+        if self.checkDownload({"error": "<title>An error occured while processing your request</title>"})
             # usual this download can safely be retried
             self.retry(wait_time=60, reason=_("An error occured while generating link."))
 
+        return super(OverLoadMe, self).checkFile()
+
 
 getInfo = create_getInfo(OverLoadMe)
diff --git a/module/plugins/hoster/PremiumTo.py b/module/plugins/hoster/PremiumTo.py
index 11d4e9541..665005ec3 100644
--- a/module/plugins/hoster/PremiumTo.py
+++ b/module/plugins/hoster/PremiumTo.py
@@ -11,35 +11,28 @@ from module.utils import fs_encode
 class PremiumTo(MultiHoster):
     __name__    = "PremiumTo"
     __type__    = "hoster"
-    __version__ = "0.19"
+    __version__ = "0.20"
 
     __pattern__ = r'^unmatchable$'
 
-    __description__ = """Premium.to hoster plugin"""
+    __description__ = """Premium.to multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
-    CHECK_TRAFFIC = True
-
-
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         #raise timeout to 2min
         self.download("http://premium.to/api/getfile.php",
                       get={'username': self.account.username,
                            'password': self.account.password,
-                           'link'    : self.pyfile.url},
+                           'link'    : pyfile.url},
                       disposition=True)
 
 
     def checkFile(self):
-        super(PremiumTo, self).checkFile()
-
-        check = self.checkDownload({'nopremium': "No premium account available"})
-
-        if check == "nopremium":
+        if self.checkDownload({'nopremium': "No premium account available"}):
             self.retry(60, 5 * 60, "No premium account available")
 
         err = ''
@@ -53,5 +46,7 @@ class PremiumTo(MultiHoster):
         if err:
             self.fail(err)
 
+        return super(PremiumTo, self).checkFile()
+
 
 getInfo = create_getInfo(PremiumTo)
diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py
index 07536062f..3d19c88ac 100644
--- a/module/plugins/hoster/PremiumizeMe.py
+++ b/module/plugins/hoster/PremiumizeMe.py
@@ -7,25 +7,25 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class PremiumizeMe(MultiHoster):
     __name__    = "PremiumizeMe"
     __type__    = "hoster"
-    __version__ = "0.15"
+    __version__ = "0.16"
 
     __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady
 
-    __description__ = """Premiumize.me hoster plugin"""
+    __description__ = """Premiumize.me multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         # In some cases hostsers do not supply us with a filename at download, so we
         # are going to set a fall back filename (e.g. for freakshare or xfileshare)
-        self.pyfile.name = self.pyfile.name.split('/').pop()  # Remove everthing before last slash
+        pyfile.name = pyfile.name.split('/').pop()  # Remove everthing before last slash
 
         # Correction for automatic assigned filename: Removing html at end if needed
         suffix_to_remove = ["html", "htm", "php", "php3", "asp", "shtm", "shtml", "cfml", "cfm"]
-        temp = self.pyfile.name.split('.')
+        temp = pyfile.name.split('.')
         if temp.pop() in suffix_to_remove:
-            self.pyfile.name = ".".join(temp)
+            pyfile.name = ".".join(temp)
 
         # Get account data
         user, data = self.account.selectAccount()
@@ -35,7 +35,7 @@ class PremiumizeMe(MultiHoster):
                                     get={'method'       : "directdownloadlink",
                                          'params[login]': user,
                                          'params[pass]' : data['password'],
-                                         'params[link]' : self.pyfile.url}))
+                                         'params[link]' : pyfile.url}))
 
         # Check status and decide what to do
         status = data['status']
diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py
index af38c4e15..ce0a384e3 100644
--- a/module/plugins/hoster/PromptfileCom.py
+++ b/module/plugins/hoster/PromptfileCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class PromptfileCom(SimpleHoster):
     __name__    = "PromptfileCom"
     __type__    = "hoster"
-    __version__ = "0.12"
+    __version__ = "0.13"
 
     __pattern__ = r'https?://(?:www\.)?promptfile\.com/'
 
@@ -21,10 +21,10 @@ class PromptfileCom(SimpleHoster):
     OFFLINE_PATTERN = r'<span style="[^"]*" title="File Not Found">File Not Found</span>'
 
     CHASH_PATTERN = r'<input type="hidden" name="chash" value="([^"]*)" />'
-    LINK_PATTERN = r'<a href=\"(.+)\" target=\"_blank\" class=\"view_dl_link\">Download File</a>'
+    LINK_FREE_PATTERN = r'<a href=\"(.+)\" target=\"_blank\" class=\"view_dl_link\">Download File</a>'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         # STAGE 1: get link to continue
         m = re.search(self.CHASH_PATTERN, self.html)
         if m is None:
@@ -32,12 +32,12 @@ class PromptfileCom(SimpleHoster):
         chash = m.group(1)
         self.logDebug("Read chash %s" % chash)
         # continue to stage2
-        self.html = self.load(self.pyfile.url, decode=True, post={'chash': chash})
+        self.html = self.load(pyfile.url, decode=True, post={'chash': chash})
 
         # STAGE 2: get the direct link
-        m = re.search(self.LINK_PATTERN, self.html)
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("LINK_PATTERN not found"))
+            self.error(_("LINK_FREE_PATTERN not found"))
 
         self.download(m.group(1), disposition=True)
 
diff --git a/module/plugins/hoster/PutdriveCom.py b/module/plugins/hoster/PutdriveCom.py
new file mode 100644
index 000000000..67732a4cd
--- /dev/null
+++ b/module/plugins/hoster/PutdriveCom.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.hosters.ZeveraCom import ZeveraCom
+
+
+class PutdriveCom(ZeveraCom):
+    __name__    = "PutdriveCom"
+    __type__    = "hoster"
+    __version__ = "0.01"
+
+    __pattern__ = r'https?://(?:www\.)putdrive\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
+
+    __description__ = """Multihosters.com multi-hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py
index 85c25f6f0..210bf4cb2 100644
--- a/module/plugins/hoster/QuickshareCz.py
+++ b/module/plugins/hoster/QuickshareCz.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class QuickshareCz(SimpleHoster):
     __name__    = "QuickshareCz"
     __type__    = "hoster"
-    __version__ = "0.55"
+    __version__ = "0.56"
 
     __pattern__ = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+'
 
@@ -45,16 +45,15 @@ class QuickshareCz(SimpleHoster):
                     self.premium = False
 
         if self.premium:
-            self.handlePremium()
+            self.handlePremium(pyfile)
         else:
-            self.handleFree()
+            self.handleFree(pyfile)
 
-        check = self.checkDownload({"err": re.compile(r"\AChyba!")}, max_size=100)
-        if check == "err":
+        if self.checkDownload({"error": re.compile(r"\AChyba!")}, max_size=100):
             self.fail(_("File not m or plugin defect"))
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         # get download url
         download_url = '%s/download.php' % self.jsvars['server']
         data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ("ID1", "ID2", "ID3", "ID4"))
@@ -85,7 +84,7 @@ class QuickshareCz(SimpleHoster):
         self.download(download_url)
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         download_url = '%s/download_premium.php' % self.jsvars['server']
         data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ("ID1", "ID2", "ID4", "ID5"))
         self.download(download_url, get=data)
diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py
index efd5d54ee..13c2f8776 100644
--- a/module/plugins/hoster/RPNetBiz.py
+++ b/module/plugins/hoster/RPNetBiz.py
@@ -9,9 +9,9 @@ from module.common.json_layer import json_loads
 class RPNetBiz(MultiHoster):
     __name__    = "RPNetBiz"
     __type__    = "hoster"
-    __version__ = "0.13"
+    __version__ = "0.14"
 
-    __description__ = """RPNet.biz hoster plugin"""
+    __description__ = """RPNet.biz multi-hoster plugin"""
     __license__     = "GPLv3"
 
     __pattern__ = r'https?://.+rpnet\.biz'
@@ -22,16 +22,16 @@ class RPNetBiz(MultiHoster):
         self.chunkLimit = -1
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         user, data = self.account.selectAccount()
 
-        self.logDebug("Original URL: %s" % self.pyfile.url)
+        self.logDebug("Original URL: %s" % pyfile.url)
         # Get the download link
         res = self.load("https://premium.rpnet.biz/client_api.php",
                         get={"username": user,
                              "password": data['password'],
-                             "action": "generate",
-                             "links": self.pyfile.url})
+                             "action"  : "generate",
+                             "links"   : pyfile.url})
 
         self.logDebug("JSON data: %s" % res)
         link_status = json_loads(res)['links'][0]  # get the first link... since we only queried one
diff --git a/module/plugins/hoster/RapideoPl.py b/module/plugins/hoster/RapideoPl.py
index 7260ebbe3..2f7365e3b 100644
--- a/module/plugins/hoster/RapideoPl.py
+++ b/module/plugins/hoster/RapideoPl.py
@@ -1,73 +1,74 @@
 # -*- coding: utf-8 -*-
 
-from module.common.json_layer import json_loads as loads
-from module.plugins.internal.SimpleHoster import SimpleHoster
-
-
-class RapideoPl(SimpleHoster):
-    __name__ = "RapideoPl"
-    __version__ = "0.01"
-    __type__ = "hoster"
-    __description__ = "Rapideo.pl hoster plugin"
-    __license__ = "GPLv3"
-    __authors__ = [("goddie", "dev@rapideo.pl")]
-
-    _api_url = "http://enc.rapideo.pl"
-
-    _api_query = {"site": "newrd",
-                  "output": "json",
-                  "username": "",
-                  "password": "",
-                  "url": ""}
-
-    _error_codes = {
-        0: "[%s] Incorrect login credentials",
-        1: "[%s] Not enough transfer to download - top-up your account",
-        2: "[%s] Incorrect / dead link",
-        3: "[%s] Error connecting to hosting, try again later",
-        9: "[%s] Premium account has expired",
-        15: "[%s] Hosting no longer supported",
-        80: "[%s] Too many incorrect login attempts, account blocked for 24h"
-    }
-
-    _usr = False
-    _pwd = False
-
-    def setup(self):
-        self.resumeDownload = True
-        self.multiDL = True
-
-    def get_username_password(self):
-        if not self.account:
-            self.fail(_("Please enter your %s account or deactivate this plugin") % "Rapideo.pl")
-        else:
-            data = self.account.getAccountData(self.user)
-            self._usr = data['usr']
-            self._pwd = data['pwd']
+from module.common.json_layer import json_loads
+from module.plugins.internal.MultiHoster import MultiHoster
+
+
+class RapideoPl(MultiHoster):
+    __name__    = "RapideoPl"
+    __type__    = "hoster"
+    __version__ = "0.02"
+
+    __pattern__ = r'^unmatchable$'
+
+    __description__ = """Rapideo.pl multi-hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("goddie", "dev@rapideo.pl")]
+
+
+    API_URL = "http://enc.rapideo.pl"
+
+    API_QUERY = {'site'    : "newrd",
+                 'output'  : "json",
+                 'username': "",
+                 'password': "",
+                 'url'     : ""}
+
+    ERROR_CODES = {0 : "[%s] Incorrect login credentials",
+                   1 : "[%s] Not enough transfer to download - top-up your account",
+                   2 : "[%s] Incorrect / dead link",
+                   3 : "[%s] Error connecting to hosting, try again later",
+                   9 : "[%s] Premium account has expired",
+                   15: "[%s] Hosting no longer supported",
+                   80: "[%s] Too many incorrect login attempts, account blocked for 24h"}
+
+
+    def prepare(self):
+        super(RapideoPl, self).prepare()
+
+        data = self.account.getAccountData(self.user)
+
+        self.usr = data['usr']
+        self.pwd = data['pwd']
+
 
     def runFileQuery(self, url, mode=None):
-        query = self._api_query.copy()
-        query["username"] = self._usr
-        query["password"] = self._pwd
-        query["url"] = url
+        query = self.API_QUERY.copy()
+
+        query["username"] = self.usr
+        query["password"] = self.pwd
+        query["url"]      = url
 
         if mode == "fileinfo":
             query['check'] = 2
-            query['loc'] = 1
+            query['loc']   = 1
 
         self.logDebug(query)
-        return self.load(self._api_url, post=query)
 
-    def process(self, pyfile):
-        self.get_username_password()
+        return self.load(self.API_URL, post=query)
+
+
+    def handleFree(self, pyfile):
         try:
             data = self.runFileQuery(pyfile.url, 'fileinfo')
+
         except Exception:
             self.logDebug("RunFileQuery error")
             self.tempOffline()
 
         try:
-            parsed = loads(data)
+            parsed = json_loads(data)
+
         except Exception:
             self.logDebug("Loads error")
             self.tempOffline()
@@ -75,9 +76,9 @@ class RapideoPl(SimpleHoster):
         self.logDebug(parsed)
 
         if "errno" in parsed.keys():
-            if parsed["errno"] in self._error_codes:
+            if parsed["errno"] in self.ERROR_CODES:
                 # error code in known
-                self.fail(self._error_codes[parsed["errno"]] % self.__name__)
+                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name__)
             else:
                 # error code isn't yet added to plugin
                 self.fail(
@@ -95,9 +96,8 @@ class RapideoPl(SimpleHoster):
         pyfile.size = parsed["filesize"]
 
         try:
-            result_dl = self.runFileQuery(pyfile.url, 'filedownload')
+            self.link = self.runFileQuery(pyfile.url, 'filedownload')
+
         except Exception:
             self.logDebug("runFileQuery error #2")
             self.tempOffline()
-
-        self.download(result_dl, disposition=True)
diff --git a/module/plugins/hoster/RapidfileshareNet.py b/module/plugins/hoster/RapidfileshareNet.py
index 14d62ee74..3473b1c7c 100644
--- a/module/plugins/hoster/RapidfileshareNet.py
+++ b/module/plugins/hoster/RapidfileshareNet.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class RapidfileshareNet(XFSHoster):
     __name__    = "RapidfileshareNet"
     __type__    = "hoster"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/\w{12}'
 
@@ -24,8 +24,4 @@ class RapidfileshareNet(XFSHoster):
     TEMP_OFFLINE_PATTERN = r'The page may have been renamed, removed or be temporarily unavailable.<'
 
 
-    def handlePremium(self):
-        self.fail(_("Premium download not implemented"))
-
-
 getInfo = create_getInfo(RapidfileshareNet)
diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py
index ba6cfcd5c..4d192d602 100644
--- a/module/plugins/hoster/RapidgatorNet.py
+++ b/module/plugins/hoster/RapidgatorNet.py
@@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, s
 class RapidgatorNet(SimpleHoster):
     __name__    = "RapidgatorNet"
     __type__    = "hoster"
-    __version__ = "0.27"
+    __version__ = "0.28"
 
     __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+'
 
@@ -37,7 +37,7 @@ class RapidgatorNet(SimpleHoster):
     PREMIUM_ONLY_ERROR_PATTERN = r'You can download files up to|This file can be downloaded by premium only<'
     DOWNLOAD_LIMIT_ERROR_PATTERN = r'You have reached your (daily|hourly) downloads limit'
     WAIT_PATTERN = r'(?:Delay between downloads must be not less than|Try again in)\s*(\d+)\s*(hour|min)'
-    LINK_PATTERN = r'return \'(http://\w+.rapidgator.net/.*)\';'
+    LINK_FREE_PATTERN = r'return \'(http://\w+.rapidgator.net/.*)\';'
 
     RECAPTCHA_PATTERN = r'"http://api\.recaptcha\.net/challenge\?k=(.*?)"'
     ADSCAPTCHA_PATTERN = r'(http://api\.adscaptcha\.com/Get\.aspx[^"\']*)'
@@ -84,23 +84,24 @@ class RapidgatorNet(SimpleHoster):
             self.retry(wait_time=60)
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         #self.logDebug("ACCOUNT_DATA", self.account.getAccountData(self.user))
         self.api_data = self.api_response('info')
         self.api_data['md5'] = self.api_data['hash']
-        self.pyfile.name = self.api_data['filename']
-        self.pyfile.size = self.api_data['size']
-        url = self.api_response('download')['url']
-        self.download(url)
 
+        pyfile.name = self.api_data['filename']
+        pyfile.size = self.api_data['size']
 
-    def handleFree(self):
+        self.link = self.api_response('download')['url']
+
+
+    def handleFree(self, pyfile):
         self.checkFree()
 
         jsvars = dict(re.findall(self.JSVARS_PATTERN, self.html))
         self.logDebug(jsvars)
 
-        self.req.http.lastURL = self.pyfile.url
+        self.req.http.lastURL = pyfile.url
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
 
         url = "http://rapidgator.net%s?fid=%s" % (
@@ -113,14 +114,14 @@ class RapidgatorNet(SimpleHoster):
             jsvars.get('getDownloadUrl', '/download/AjaxGetDownload'), jsvars['sid'])
         jsvars.update(self.getJsonResponse(url))
 
-        self.req.http.lastURL = self.pyfile.url
+        self.req.http.lastURL = pyfile.url
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With:"])
 
         url = "http://rapidgator.net%s" % jsvars.get('captchaUrl', '/download/captcha')
         self.html = self.load(url)
 
         for _i in xrange(5):
-            m = re.search(self.LINK_PATTERN, self.html)
+            m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
                 link = m.group(1)
                 self.logDebug(link)
diff --git a/module/plugins/hoster/RapiduNet.py b/module/plugins/hoster/RapiduNet.py
index 163edfe34..34e71b5f2 100644
--- a/module/plugins/hoster/RapiduNet.py
+++ b/module/plugins/hoster/RapiduNet.py
@@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class RapiduNet(SimpleHoster):
     __name__    = "RapiduNet"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})'
 
@@ -37,8 +37,8 @@ class RapiduNet(SimpleHoster):
         self.multiDL        = self.premium
 
 
-    def handleFree(self):
-        self.req.http.lastURL = self.pyfile.url
+    def handleFree(self, pyfile):
+        self.req.http.lastURL = pyfile.url
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
 
         jsvars = self.getJsonResponse("https://rapidu.net/ajax.php",
@@ -78,7 +78,7 @@ class RapiduNet(SimpleHoster):
         if not res.startswith('{'):
             self.retry()
 
-        self.logDebug(url, res)
+        self.logDebug(res)
 
         return json_loads(res)
 
diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py
index 5a31cc388..abab95a3d 100644
--- a/module/plugins/hoster/RealdebridCom.py
+++ b/module/plugins/hoster/RealdebridCom.py
@@ -14,11 +14,11 @@ from module.utils import parseFileSize
 class RealdebridCom(MultiHoster):
     __name__    = "RealdebridCom"
     __type__    = "hoster"
-    __version__ = "0.62"
+    __version__ = "0.63"
 
     __pattern__ = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+'
 
-    __description__ = """Real-Debrid.com hoster plugin"""
+    __description__ = """Real-Debrid.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
 
@@ -37,10 +37,10 @@ class RealdebridCom(MultiHoster):
         self.chunkLimit = 3
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         data = json_loads(self.load("https://real-debrid.com/ajax/unrestrict.php",
                                     get={'lang'    : "en",
-                                         'link'    : self.pyfile.url,
+                                         'link'    : pyfile.url,
                                          'password': self.getPassword(),
                                          'time'    : int(time() * 1000)}))
 
@@ -53,9 +53,9 @@ class RealdebridCom(MultiHoster):
                 self.logWarning(data['message'])
                 self.tempOffline()
         else:
-            if self.pyfile.name is not None and self.pyfile.name.endswith('.tmp') and data['file_name']:
-                self.pyfile.name = data['file_name']
-            self.pyfile.size = parseFileSize(data['file_size'])
+            if pyfile.name is not None and pyfile.name.endswith('.tmp') and data['file_name']:
+                pyfile.name = data['file_name']
+            pyfile.size = parseFileSize(data['file_size'])
             self.link = data['generated_links'][0][-1]
 
         if self.getConfig("https"):
@@ -63,23 +63,20 @@ class RealdebridCom(MultiHoster):
         else:
             self.link = self.link.replace("https://", "http://")
 
-        if self.link != self.pyfile.url:
+        if self.link != pyfile.url:
             self.logDebug("New URL: %s" % self.link)
 
-        if self.pyfile.name.startswith("http") or self.pyfile.name.startswith("Unknown") or self.pyfile.name.endswith('..'):
+        if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown") or pyfile.name.endswith('..'):
             #only use when name wasnt already set
-            self.pyfile.name = self.getFilename(self.link)
+            pyfile.name = self.getFilename(self.link)
 
 
     def checkFile(self):
-        super(RealdebridCom, self).checkFile()
-
-        check = self.checkDownload(
-            {"error": "<title>An error occured while processing your request</title>"})
-
-        if check == "error":
+        if self.checkDownload({"error": "<title>An error occured while processing your request</title>"}):
             #usual this download can safely be retried
             self.retry(wait_time=60, reason=_("An error occured while generating link"))
 
+        return super(RealdebridCom, self).checkFile()
+
 
 getInfo = create_getInfo(RealdebridCom)
diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py
index 96443d5f5..f87c7f3ff 100644
--- a/module/plugins/hoster/RehostTo.py
+++ b/module/plugins/hoster/RehostTo.py
@@ -8,26 +8,22 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class RehostTo(MultiHoster):
     __name__    = "RehostTo"
     __type__    = "hoster"
-    __version__ = "0.18"
+    __version__ = "0.19"
 
     __pattern__ = r'https?://.*rehost\.to\..+'
 
-    __description__ = """Rehost.com hoster plugin"""
+    __description__ = """Rehost.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
-    def getFilename(self, url):
-        return unquote(url.rsplit("/", 1)[1])
-
-
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         data = self.account.getAccountData(self.user)
 
         self.download("http://rehost.to/process_download.php",
                       get={'user': "cookie",
                            'pass': data['long_ses'],
-                           'dl'  : self.pyfile.url},
+                           'dl'  : pyfile.url},
                       disposition=True)
 
 
diff --git a/module/plugins/hoster/RemixshareCom.py b/module/plugins/hoster/RemixshareCom.py
index ed171895e..11c9f3b0f 100644
--- a/module/plugins/hoster/RemixshareCom.py
+++ b/module/plugins/hoster/RemixshareCom.py
@@ -16,7 +16,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class RemixshareCom(SimpleHoster):
     __name__    = "RemixshareCom"
     __type__    = "hoster"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'https?://remixshare\.com/(download|dl)/\w+'
 
@@ -29,7 +29,7 @@ class RemixshareCom(SimpleHoster):
     INFO_PATTERN = r'title=\'.+?\'>(?P<N>.+?)</span><span class=\'light2\'>&nbsp;\((?P<S>\d+)&nbsp;(?P<U>[\w^_]+)\)<'
     OFFLINE_PATTERN = r'<h1>Ooops!<'
 
-    LINK_PATTERN = r'(http://remixshare\.com/downloadfinal/.+?)"'
+    LINK_FREE_PATTERN = r'(http://remixshare\.com/downloadfinal/.+?)"'
     TOKEN_PATTERN = r'var acc = (\d+)'
     WAIT_PATTERN = r'var XYZ = r"(\d+)"'
 
@@ -39,13 +39,15 @@ class RemixshareCom(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self):
-        b = re.search(self.LINK_PATTERN, self.html)
+    def handleFree(self, pyfile):
+        b = re.search(self.LINK_FREE_PATTERN, self.html)
         if not b:
             self.error(_("Cannot parse download url"))
+
         c = re.search(self.TOKEN_PATTERN, self.html)
         if not c:
             self.error(_("Cannot parse file token"))
+
         dl_url = b.group(1) + c.group(1)
 
         #Check if we have to wait
diff --git a/module/plugins/hoster/SendmywayCom.py b/module/plugins/hoster/SendmywayCom.py
deleted file mode 100644
index 637098b88..000000000
--- a/module/plugins/hoster/SendmywayCom.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
-
-
-class SendmywayCom(XFSHoster):
-    __name__    = "SendmywayCom"
-    __type__    = "hoster"
-    __version__ = "0.04"
-
-    __pattern__ = r'http://(?:www\.)?sendmyway\.com/\w{12}'
-
-    __description__ = """SendMyWay.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
-
-
-    HOSTER_DOMAIN = "sendmyway.com"
-
-
-getInfo = create_getInfo(SendmywayCom)
diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py
index 12f966e31..ffd2995b8 100644
--- a/module/plugins/hoster/SendspaceCom.py
+++ b/module/plugins/hoster/SendspaceCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class SendspaceCom(SimpleHoster):
     __name__    = "SendspaceCom"
     __type__    = "hoster"
-    __version__ = "0.16"
+    __version__ = "0.17"
 
     __pattern__ = r'https?://(?:www\.)?sendspace\.com/file/\w+'
 
@@ -21,16 +21,16 @@ class SendspaceCom(SimpleHoster):
     SIZE_PATTERN    = r'<div class="file_description reverse margin_center">\s*<b>File Size:</b>\s*(?P<S>[\d.,]+)(?P<U>[\w^_]+)\s*</div>'
     OFFLINE_PATTERN = r'<div class="msg error" style="cursor: default">Sorry, the file you requested is not available.</div>'
 
-    LINK_PATTERN = r'<a id="download_button" href="([^"]+)"'
+    LINK_FREE_PATTERN = r'<a id="download_button" href="([^"]+)"'
 
     CAPTCHA_PATTERN      = r'<td><img src="(/captchas/captcha\.php?captcha=([^"]+))"></td>'
     USER_CAPTCHA_PATTERN = r'<td><img src="/captchas/captcha\.php?user=([^"]+))"></td>'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         params = {}
         for _i in xrange(3):
-            m = re.search(self.LINK_PATTERN, self.html)
+            m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
                 if 'captcha_hash' in params:
                     self.correctCaptcha()
@@ -51,7 +51,7 @@ class SendspaceCom(SimpleHoster):
                 params = {'download': "Regular Download"}
 
             self.logDebug(params)
-            self.html = self.load(self.pyfile.url, post=params)
+            self.html = self.load(pyfile.url, post=params)
         else:
             self.fail(_("Download link not found"))
 
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index bbf75c94a..636e5824d 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -14,7 +14,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ShareonlineBiz(SimpleHoster):
     __name__    = "ShareonlineBiz"
     __type__    = "hoster"
-    __version__ = "0.46"
+    __version__ = "0.47"
 
     __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)'
 
@@ -32,7 +32,7 @@ class ShareonlineBiz(SimpleHoster):
 
     RECAPTCHA_KEY = "6LdatrsSAAAAAHZrB70txiV5p-8Iv8BtVxlTtjKX"
 
-    ERROR_INFO_PATTERN = r'<p class="b">Information:</p>\s*<div>\s*<strong>(.*?)</strong>'
+    ERROR_PATTERN = r'<p class="b">Information:</p>\s*<div>\s*<strong>(.*?)</strong>'
 
 
     @classmethod
@@ -88,12 +88,12 @@ class ShareonlineBiz(SimpleHoster):
             self.fail(_("No valid captcha solution received"))
 
 
-    def handleFree(self):
-        self.html = self.load(self.pyfile.url, cookies=True)  #: refer, stuff
-
+    def handleFree(self, pyfile):
         self.wait(3)
 
-        self.html = self.load("%s/free/" % self.pyfile.url, post={"dl_free": "1", "choice": "free"}, decode=True)
+        self.html = self.load("%s/free/" % pyfile.url,
+                              post={'dl_free': "1", 'choice': "free"},
+                              decode=True)
 
         self.checkErrors()
 
@@ -110,12 +110,8 @@ class ShareonlineBiz(SimpleHoster):
 
 
     def checkFile(self):
-        super(ShareonlineBiz, self).checkFile()
-
-        check = self.checkDownload({
-            'cookie': re.compile(r'<div id="dl_failure"'),
-            'fail'  : re.compile(r"<title>Share-Online")
-        })
+        check = self.checkDownload({'cookie': re.compile(r'<div id="dl_failure"'),
+                                    'fail'  : re.compile(r"<title>Share-Online")})
 
         if check == "cookie":
             self.invalidCaptcha()
@@ -125,11 +121,15 @@ class ShareonlineBiz(SimpleHoster):
             self.invalidCaptcha()
             self.retry(5, 5 * 60, _("Download failed"))
 
+        return super(ShareonlineBiz, self).checkFile()
+
 
-    def handlePremium(self):  #: should be working better loading (account) api internally
+    def handlePremium(self, pyfile):  #: should be working better loading (account) api internally
         html = self.load("http://api.share-online.biz/account.php",
-                        {"username": self.user, "password": self.account.accounts[self.user]['password'],
-                         "act": "download", "lid": self.info['fileid']})
+                         get={'username': self.user,
+                              'password': self.account.getAccountData(self.user)['password'],
+                              'act'     : "download",
+                              'lid'     : self.info['fileid']})
 
         self.api_data = dlinfo = {}
 
@@ -142,8 +142,8 @@ class ShareonlineBiz(SimpleHoster):
         if not dlinfo['status'] == "online":
             self.offline()
         else:
-            self.pyfile.name = dlinfo['name']
-            self.pyfile.size = int(dlinfo['size'])
+            pyfile.name = dlinfo['name']
+            pyfile.size = int(dlinfo['size'])
 
             dlLink = dlinfo['url']
 
@@ -163,7 +163,7 @@ class ShareonlineBiz(SimpleHoster):
         errmsg = m.group(1).lower()
 
         try:
-            self.logError(errmsg, re.search(self.ERROR_INFO_PATTERN, self.html).group(1))
+            self.logError(errmsg, re.search(self.ERROR_PATTERN, self.html).group(1))
         except:
             self.logError("Unknown error occurred", errmsg)
 
diff --git a/module/plugins/hoster/ShareplaceCom.py b/module/plugins/hoster/ShareplaceCom.py
index ccf4bcda5..07724a9d1 100644
--- a/module/plugins/hoster/ShareplaceCom.py
+++ b/module/plugins/hoster/ShareplaceCom.py
@@ -10,9 +10,9 @@ from module.plugins.Hoster import Hoster
 class ShareplaceCom(Hoster):
     __name__    = "ShareplaceCom"
     __type__    = "hoster"
-    __version__ = "0.11"
+    __version__ = "0.12"
 
-    __pattern__ = r'(http://)?(?:www\.)?shareplace\.(com|org)/\?\w+'
+    __pattern__ = r'http://(?:www\.)?shareplace\.(com|org)/\?\w+'
 
     __description__ = """Shareplace.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/SimplyPremiumCom.py b/module/plugins/hoster/SimplyPremiumCom.py
index fe38cff6e..39e8a6aeb 100644
--- a/module/plugins/hoster/SimplyPremiumCom.py
+++ b/module/plugins/hoster/SimplyPremiumCom.py
@@ -11,11 +11,11 @@ from module.plugins.internal.SimpleHoster import secondsToMidnight
 class SimplyPremiumCom(MultiHoster):
     __name__    = "SimplyPremiumCom"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __pattern__ = r'https?://.+simply-premium\.com'
 
-    __description__ = """Simply-Premium.com hoster plugin"""
+    __description__ = """Simply-Premium.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
 
@@ -24,7 +24,7 @@ class SimplyPremiumCom(MultiHoster):
         self.chunkLimit = 16
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         for i in xrange(5):
             page = self.load("http://www.simply-premium.com/premium.php", get={'info': "", 'link': self.pyfile.url})
             self.logDebug("JSON data: " + page)
diff --git a/module/plugins/hoster/SimplydebridCom.py b/module/plugins/hoster/SimplydebridCom.py
index 0be9bfa12..a26bc5751 100644
--- a/module/plugins/hoster/SimplydebridCom.py
+++ b/module/plugins/hoster/SimplydebridCom.py
@@ -8,18 +8,18 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class SimplydebridCom(MultiHoster):
     __name__    = "SimplydebridCom"
     __type__    = "hoster"
-    __version__ = "0.14"
+    __version__ = "0.15"
 
     __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php'
 
-    __description__ = """Simply-debrid.com hoster plugin"""
+    __description__ = """Simply-debrid.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         #fix the links for simply-debrid.com!
-        self.link = self.pyfile.url
+        self.link = pyfile.url
         self.link = self.link.replace("clz.to", "cloudzer.net/file")
         self.link = self.link.replace("http://share-online", "http://www.share-online")
         self.link = self.link.replace("ul.to", "uploaded.net/file")
@@ -46,12 +46,10 @@ class SimplydebridCom(MultiHoster):
 
 
     def checkFile(self):
-        super(SimplydebridCom, self).checkFile()
-
-        check = self.checkDownload({"bad1": "No address associated with hostname", "bad2": "<html"})
-
-        if check == "bad1" or check == "bad2":
+        if self.checkDownload({"error": "No address associated with hostname"}):
             self.retry(24, 3 * 60, "Bad file downloaded")
 
+        return super(SimplydebridCom, self).checkFile()
+
 
 getInfo = create_getInfo(SimplydebridCom)
diff --git a/module/plugins/hoster/SmoozedCom.py b/module/plugins/hoster/SmoozedCom.py
index ce0eeedda..a5116db16 100644
--- a/module/plugins/hoster/SmoozedCom.py
+++ b/module/plugins/hoster/SmoozedCom.py
@@ -1,70 +1,63 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.Hoster import Hoster
-
 from module.common.json_layer import json_loads
+from module.plugins.internal.MultiHoster import MultiHoster
 
 
-class SmoozedCom(Hoster):
+class SmoozedCom(MultiHoster):
     __name__    = "SmoozedCom"
     __type__    = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady
 
     __description__ = """Smoozed.com hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = []
-
+    __authors__     = [("", "")]
 
-    def process(self, pyfile):
-        # Check account
-        if not self.account or not self.account.canUse():
-            self.logError(_("Please enter your %s account or deactivate this plugin") % "smoozed.com")
-            self.fail(_("No valid smoozed.com account provided"))
 
+    def handlePremium(self, pyfile):
         # In some cases hostsers do not supply us with a filename at download, so we
         # are going to set a fall back filename (e.g. for freakshare or xfileshare)
         pyfile.name = pyfile.name.split('/').pop()  # Remove everthing before last slash
 
         # Correction for automatic assigned filename: Removing html at end if needed
         suffix_to_remove = ["html", "htm", "php", "php3", "asp", "shtm", "shtml", "cfml", "cfm"]
-        temp = pyfile.name.split('.')
+        temp             = pyfile.name.split('.')
+
         if temp.pop() in suffix_to_remove:
             pyfile.name = ".".join(temp)
 
-        # Get account data
-        (user, data) = self.account.selectAccount()
-        account_info = self.account.getAccountInfo(user, True)
-
         # Check the link
-        get_data = {
-            "session_key": account_info['session_key'],
-            "url": pyfile.url
-        }
-        answer = self.load("http://www2.smoozed.com/api/check", get=get_data)
-        data = json_loads(answer)
+        get_data = {'session_key': self.account.getAccountData(self.user)['session_key'],
+                    'url'        : pyfile.url}
+
+        data = json_loads(self.load("http://www2.smoozed.com/api/check", get=get_data))
+
         if data["state"] != "ok":
-            self.fail(_(data["message"]))
+            self.fail(data["message"])
+
         if data["data"].get("state", "ok") != "ok":
             if data["data"] == "Offline":
                 self.offline()
             else:
-                self.fail(_(data["data"]["message"]))
+                self.fail(data["data"]["message"])
+
         pyfile.name = data["data"]["name"]
         pyfile.size = int(data["data"]["size"])
 
         # Start the download
         header = self.load("http://www2.smoozed.com/api/download", get=get_data, just_header=True)
+
         if not "location" in header:
             self.fail(_("Unable to initialize download"))
-
-        if isinstance(header["location"], list):
-            url = header["location"][-1]
         else:
-            url = header["location"]
-        self.download(url, disposition=True)
+            self.link = header["location"][-1] if isinstance(header["location"], list) else header["location"]
+
+
+    def checkFile(self):
+        if self.checkDownload({'error': '{"state":"error"}',
+                               'retry': '{"state":"retry"}'}):
+            self.fail(_("Error response received"))
 
-        check = self.checkDownload({"error": '{"state":"error"}', "retry": '{"state":"retry"}'})
-        if check == "error" or check == "retry":
-            self.fail(_("Error response received - contact Smoozed support"))
+        return super(SmoozedCom, self).checkFile()
diff --git a/module/plugins/hoster/SpeedyshareCom.py b/module/plugins/hoster/SpeedyshareCom.py
index fa54d6060..0acdb7647 100644
--- a/module/plugins/hoster/SpeedyshareCom.py
+++ b/module/plugins/hoster/SpeedyshareCom.py
@@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class SpeedyshareCom(SimpleHoster):
     __name__    = "SpeedyshareCom"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+'
 
@@ -27,7 +27,7 @@ class SpeedyshareCom(SimpleHoster):
 
     OFFLINE_PATTERN = r'class=downloadfilenamenotfound>.*</span>'
 
-    LINK_PATTERN = r'<a href=\'(.*)\'><img src=/gf/slowdownload\.png alt=\'Slow Download\' border=0'
+    LINK_FREE_PATTERN = r'<a href=\'(.*)\'><img src=/gf/slowdownload\.png alt=\'Slow Download\' border=0'
 
 
     def setup(self):
@@ -35,17 +35,13 @@ class SpeedyshareCom(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self):
-        m = re.search(self.LINK_PATTERN, self.html)
+    def handleFree(self, pyfile):
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("Download link not found"))
 
         dl_link = urljoin("http://www.speedyshare.com", m.group(1))
         self.download(dl_link, disposition=True)
 
-        check = self.checkDownload({'html': re.compile("html")})
-        if check == "html":
-            self.error(_("Downloaded file is an html page"))
-
 
 getInfo = create_getInfo(SpeedyshareCom)
diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py
index 258ec7d3e..ccca76018 100644
--- a/module/plugins/hoster/TurbobitNet.py
+++ b/module/plugins/hoster/TurbobitNet.py
@@ -17,7 +17,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, t
 class TurbobitNet(SimpleHoster):
     __name__    = "TurbobitNet"
     __type__    = "hoster"
-    __version__ = "0.16"
+    __version__ = "0.17"
 
     __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)'
 
@@ -36,24 +36,28 @@ class TurbobitNet(SimpleHoster):
     OFFLINE_PATTERN = r'<h2>File Not Found</h2>|html\(\'File (?:was )?not found'
 
     LINK_PATTERN = r'(/download/redirect/[^"\']+)'
-    LIMIT_WAIT_PATTERN = r'<div id=\'timeout\'>(\d+)<'
 
-    CAPTCHA_PATTERN = r'<img alt="Captcha" src="(.+?)"'
+    LIMIT_WAIT_PATTERN = r'<div id=\'timeout\'>(\d+)<'
+    CAPTCHA_PATTERN    = r'<img alt="Captcha" src="(.+?)"'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         self.url = "http://turbobit.net/download/free/%s" % self.info['pattern']['ID']
         self.html = self.load(self.url, ref=True, decode=True)
 
         rtUpdate = self.getRtUpdate()
 
         self.solveCaptcha()
+
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
+
         self.url = self.getDownloadUrl(rtUpdate)
 
         self.wait()
         self.html = self.load(self.url)
+
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With:"])
+
         self.downloadFile()
 
 
@@ -157,7 +161,7 @@ class TurbobitNet(SimpleHoster):
         return "%s GMT%+03d%02d" % (time.strftime("%a %b %d %Y %H:%M:%S", lt), -tz // 3600, tz % 3600)
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         self.logDebug("Premium download as user %s" % self.user)
         self.downloadFile()
 
diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py
index a4e352956..9d0a86fe9 100644
--- a/module/plugins/hoster/TusfilesNet.py
+++ b/module/plugins/hoster/TusfilesNet.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 
+from module.network.HTTPRequest import BadHeader
 from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 
 
 class TusfilesNet(XFSHoster):
     __name__    = "TusfilesNet"
     __type__    = "hoster"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}'
 
@@ -23,13 +24,19 @@ class TusfilesNet(XFSHoster):
 
 
     def setup(self):
-        self.multiDL        = False
         self.chunkLimit     = -1
+        self.multiDL        = True
         self.resumeDownload = True
 
 
-    def handlePremium(self):
-        return self.handleFree()
+    def downloadLink(self, link):
+        try:
+            return super(TusfilesNet, self).downloadLink(link)
+
+        except BadHeader, e:
+            if e.code is 503:
+                self.multiDL = False
+                raise Retry("503")
 
 
 getInfo = create_getInfo(TusfilesNet)
diff --git a/module/plugins/hoster/TwoSharedCom.py b/module/plugins/hoster/TwoSharedCom.py
deleted file mode 100644
index 1dd67f974..000000000
--- a/module/plugins/hoster/TwoSharedCom.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-
-
-class TwoSharedCom(SimpleHoster):
-    __name__    = "TwoSharedCom"
-    __type__    = "hoster"
-    __version__ = "0.12"
-
-    __pattern__ = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+'
-
-    __description__ = """2Shared.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
-
-
-    NAME_PATTERN = r'<h1>(?P<N>.*)</h1>'
-    SIZE_PATTERN = r'<span class="dtitle">File size:</span>\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
-    OFFLINE_PATTERN = r'The file link that you requested is not valid\.|This file was deleted\.'
-
-    LINK_PATTERN = r'window.location =\'(.+?)\';'
-
-
-    def setup(self):
-        self.resumeDownload = True
-        self.multiDL        = True
-
-
-    def handleFree(self):
-        m = re.search(self.LINK_PATTERN, self.html)
-        if m is None:
-            self.error(_("Download link"))
-
-        link = m.group(1)
-        self.download(link)
-
-
-getInfo = create_getInfo(TwoSharedCom)
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index 6b84a5e1b..cadd51149 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -15,7 +15,7 @@ def convertDecimalPrefix(m):
 class UlozTo(SimpleHoster):
     __name__    = "UlozTo"
     __type__    = "hoster"
-    __version__ = "1.01"
+    __version__ = "1.02"
 
     __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)'
 
@@ -37,9 +37,6 @@ class UlozTo(SimpleHoster):
     VIPLINK_PATTERN = r'<a href="[^"]*\?disclaimer=1" class="linkVip">'
     TOKEN_PATTERN   = r'<input type="hidden" name="_token_" .*?value="(.+?)"'
 
-    FREE_URL_PATTERN    = r'<div class="freeDownloadForm"><form action="([^"]+)"'
-    PREMIUM_URL_PATTERN = r'<div class="downloadForm"><form action="([^"]+)"'
-
 
     def setup(self):
         self.multiDL        = self.premium
@@ -80,14 +77,14 @@ class UlozTo(SimpleHoster):
         self.getFileInfo()
 
         if self.premium and self.checkTrafficLeft():
-            self.handlePremium()
+            self.handlePremium(pyfile)
         else:
-            self.handleFree()
+            self.handleFree(pyfile)
 
         self.doCheckDownload()
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         action, inputs = self.parseHtmlForm('id="frm-downloadDialog-freeDownloadForm"')
         if not action or not inputs:
             self.error(_("Free download form not found"))
@@ -122,29 +119,17 @@ class UlozTo(SimpleHoster):
         self.download("http://www.ulozto.net" + action, post=inputs, cookies=True, disposition=True)
 
 
-    def handlePremium(self):
-        self.download(self.pyfile.url + "?do=directDownload", disposition=True)
-        #parsed_url = self.findDownloadURL(premium=True)
-        #self.download(parsed_url, post={"download": "Download"})
-
-
-    def findDownloadURL(self, premium=False):
-        msg = _("%s link" % ("Premium" if premium else "Free"))
-        m = re.search(self.PREMIUM_URL_PATTERN if premium else self.FREE_URL_PATTERN, self.html)
-        if m is None:
-            self.error(msg)
-        parsed_url = "http://www.ulozto.net" + m.group(1)
-        self.logDebug("%s: %s" % (msg, parsed_url))
-        return parsed_url
+    def handlePremium(self, pyfile):
+        self.download(pyfile.url, get={'do': directDownload}, disposition=True)
 
 
     def doCheckDownload(self):
         check = self.checkDownload({
             "wrong_captcha": re.compile(r'<ul class="error">\s*<li>Error rewriting the text.</li>'),
-            "offline": re.compile(self.OFFLINE_PATTERN),
-            "passwd": self.PASSWD_PATTERN,
-            "server_error": 'src="http://img.ulozto.cz/error403/vykricnik.jpg"',  # paralell dl, server overload etc.
-            "not_found": "<title>Ulož.to</title>"
+            "offline"      : re.compile(self.OFFLINE_PATTERN),
+            "passwd"       : self.PASSWD_PATTERN,
+            "server_error" : 'src="http://img.ulozto.cz/error403/vykricnik.jpg"',  # paralell dl, server overload etc.
+            "not_found"    : "<title>Ulož.to</title>"
         })
 
         if check == "wrong_captcha":
@@ -152,15 +137,19 @@ class UlozTo(SimpleHoster):
             #self.delStorage("captcha_text")
             self.invalidCaptcha()
             self.retry(reason=_("Wrong captcha code"))
+
         elif check == "offline":
             self.offline()
+
         elif check == "passwd":
             self.fail(_("Wrong password"))
+
         elif check == "server_error":
             self.logError(_("Server error, try downloading later"))
             self.multiDL = False
             self.wait(1 * 60 * 60, True)
             self.retry()
+
         elif check == "not_found":
             self.fail(_("Server error - file not downloadable"))
 
diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py
index 0afa4e5a5..0267d4b61 100644
--- a/module/plugins/hoster/UloziskoSk.py
+++ b/module/plugins/hoster/UloziskoSk.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class UloziskoSk(SimpleHoster):
     __name__    = "UloziskoSk"
     __type__    = "hoster"
-    __version__ = "0.24"
+    __version__ = "0.25"
 
     __pattern__ = r'http://(?:www\.)?ulozisko\.sk/.+'
 
@@ -21,7 +21,7 @@ class UloziskoSk(SimpleHoster):
     SIZE_PATTERN = ur'Veľkosť súboru: <strong>(?P<S>[\d.,]+) (?P<U>[\w^_]+)</strong><br />'
     OFFLINE_PATTERN = ur'<span class = "red">Zadaný súbor neexistuje z jedného z nasledujúcich dôvodov:</span>'
 
-    LINK_PATTERN = r'<form name = "formular" action = "([^"]+)" method = "post">'
+    LINK_FREE_PATTERN = r'<form name = "formular" action = "([^"]+)" method = "post">'
     ID_PATTERN = r'<input type = "hidden" name = "id" value = "([^"]+)" />'
     CAPTCHA_PATTERN = r'<img src="(/obrazky/obrazky\.php\?fid=[^"]+)" alt="" />'
     IMG_PATTERN = ur'<strong>PRE ZVÄČŠENIE KLIKNITE NA OBRÁZOK</strong><br /><a href = "([^"]+)">'
@@ -36,13 +36,13 @@ class UloziskoSk(SimpleHoster):
             url = "http://ulozisko.sk" + m.group(1)
             self.download(url)
         else:
-            self.handleFree()
+            self.handleFree(pyfile)
 
 
-    def handleFree(self):
-        m = re.search(self.LINK_PATTERN, self.html)
+    def handleFree(self, pyfile):
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("LINK_PATTERN not found"))
+            self.error(_("LINK_FREE_PATTERN not found"))
         parsed_url = 'http://www.ulozisko.sk' + m.group(1)
 
         m = re.search(self.ID_PATTERN, self.html)
@@ -61,12 +61,11 @@ class UloziskoSk(SimpleHoster):
 
         self.logDebug("CAPTCHA_URL:" + captcha_url + ' CAPTCHA:' + captcha)
 
-        self.download(parsed_url, post={
-            "antispam": captcha,
-            "id": id,
-            "name": self.pyfile.name,
-            "but": "++++STIAHNI+S%DABOR++++"
-        })
+        self.download(parsed_url,
+                      post={"antispam": captcha,
+                            "id"      : id,
+                            "name"    : pyfile.name,
+                            "but"     : "++++STIAHNI+S%DABOR++++"})
 
 
 getInfo = create_getInfo(UloziskoSk)
diff --git a/module/plugins/hoster/UnibytesCom.py b/module/plugins/hoster/UnibytesCom.py
index 8c39cce82..cd4e506c4 100644
--- a/module/plugins/hoster/UnibytesCom.py
+++ b/module/plugins/hoster/UnibytesCom.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class UnibytesCom(SimpleHoster):
     __name__    = "UnibytesCom"
     __type__    = "hoster"
-    __version__ = "0.11"
+    __version__ = "0.12"
 
     __pattern__ = r'https?://(?:www\.)?unibytes\.com/[\w .-]{11}B'
 
@@ -26,12 +26,13 @@ class UnibytesCom(SimpleHoster):
     INFO_PATTERN = r'<span[^>]*?id="fileName"[^>]*>(?P<N>[^>]+)</span>\s*\((?P<S>\d.*?)\)'
 
     WAIT_PATTERN = r'Wait for <span id="slowRest">(\d+)</span> sec'
-    LINK_PATTERN = r'<a href="([^"]+)">Download</a>'
+    LINK_FREE_PATTERN = r'<a href="([^"]+)">Download</a>'
 
 
-    def handleFree(self):
-        domain = "http://www.%s/" % self.HOSTER_DOMAIN
+    def handleFree(self, pyfile):
+        domain            = "http://www.%s/" % self.HOSTER_DOMAIN
         action, post_data = self.parseHtmlForm('id="startForm"')
+
         self.req.http.c.setopt(FOLLOWLOCATION, 0)
 
         for _i in xrange(8):
@@ -48,7 +49,7 @@ class UnibytesCom(SimpleHoster):
                 self.retry()
 
             if post_data['step'] == 'last':
-                m = re.search(self.LINK_PATTERN, self.html)
+                m = re.search(self.LINK_FREE_PATTERN, self.html)
                 if m:
                     url = m.group(1)
                     self.correctCaptcha()
@@ -62,12 +63,15 @@ class UnibytesCom(SimpleHoster):
             if last_step == 'timer':
                 m = re.search(self.WAIT_PATTERN, self.html)
                 self.wait(int(m.group(1)) if m else 60, False)
+
             elif last_step in ("captcha", "last"):
                 post_data['captcha'] = self.decryptCaptcha(urljoin(domain, "/captcha.jpg"))
+
         else:
             self.fail(_("No valid captcha code entered"))
 
         self.req.http.c.setopt(FOLLOWLOCATION, 1)
+
         self.download(url)
 
 
diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py
index c84f1daa7..52f12b5b8 100644
--- a/module/plugins/hoster/UnrestrictLi.py
+++ b/module/plugins/hoster/UnrestrictLi.py
@@ -12,11 +12,11 @@ from module.plugins.internal.SimpleHoster import secondsToMidnight
 class UnrestrictLi(MultiHoster):
     __name__    = "UnrestrictLi"
     __type__    = "hoster"
-    __version__ = "0.20"
+    __version__ = "0.21"
 
     __pattern__ = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+'
 
-    __description__ = """Unrestrict.li hoster plugin"""
+    __description__ = """Unrestrict.li multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
@@ -29,10 +29,10 @@ class UnrestrictLi(MultiHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         for _i in xrange(5):
             page = self.load('https://unrestrict.li/unrestrict.php',
-                             post={'link': self.pyfile.url, 'domain': 'long'})
+                             post={'link': pyfile.url, 'domain': 'long'})
             self.logDebug("JSON data: " + page)
             if page != '':
                 break
@@ -63,7 +63,7 @@ class UnrestrictLi(MultiHoster):
         self.link = page.keys()[0]
         self.api_data = page[self.link]
 
-        if self.link != self.pyfile.url:
+        if self.link != pyfile.url:
             self.logDebug("New URL: " + self.link)
 
         if hasattr(self, 'api_data'):
diff --git a/module/plugins/hoster/UpleaCom.py b/module/plugins/hoster/UpleaCom.py
index 7ae46ef38..4ea4e345f 100644
--- a/module/plugins/hoster/UpleaCom.py
+++ b/module/plugins/hoster/UpleaCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class UpleaCom(XFSHoster):
     __name__    = "UpleaCom"
     __type__    = "hoster"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'https?://(?:www\.)?uplea\.com/dl/\w{15}'
 
@@ -38,7 +38,7 @@ class UpleaCom(XFSHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         m = re.search(self.STEP_PATTERN, self.html)
         if m is None:
             self.error("STEP_PATTERN not found")
@@ -52,7 +52,7 @@ class UpleaCom(XFSHoster):
 
         m = re.search(self.LINK_PATTERN, self.html)
         if m is None:
-            self.error("LINK_PATTERN not found")
+            self.error(_("LINK_PATTERN not found"))
 
         self.wait(15)
         self.download(m.group(1), disposition=True)
diff --git a/module/plugins/hoster/UploadableCh.py b/module/plugins/hoster/UploadableCh.py
index b09e3ded4..e28944ab9 100644
--- a/module/plugins/hoster/UploadableCh.py
+++ b/module/plugins/hoster/UploadableCh.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class UploadableCh(SimpleHoster):
     __name__    = "UploadableCh"
     __type__    = "hoster"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)'
 
@@ -33,15 +33,15 @@ class UploadableCh(SimpleHoster):
     RECAPTCHA_KEY = "6LdlJuwSAAAAAPJbPIoUhyqOJd7-yrah5Nhim5S3"
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         # Click the "free user" button and wait
-        a = self.load(self.pyfile.url, cookies=True, post={'downloadLink': "wait"}, decode=True)
+        a = self.load(pyfile.url, cookies=True, post={'downloadLink': "wait"}, decode=True)
         self.logDebug(a)
 
         self.wait(30)
 
         # Make the recaptcha appear and show it the pyload interface
-        b = self.load(self.pyfile.url, cookies=True, post={'checkDownload': "check"}, decode=True)
+        b = self.load(pyfile.url, cookies=True, post={'checkDownload': "check"}, decode=True)
         self.logDebug(b)  #: Expected output: {"success":"showCaptcha"}
 
         recaptcha = ReCaptcha(self)
@@ -59,27 +59,21 @@ class UploadableCh(SimpleHoster):
         self.wait(3)
 
         # Get ready for downloading
-        self.load(self.pyfile.url, cookies=True, post={'downloadLink': "show"}, decode=True)
+        self.load(pyfile.url, cookies=True, post={'downloadLink': "show"}, decode=True)
 
         self.wait(3)
 
         # Download the file
-        self.download(self.pyfile.url, cookies=True, post={'download': "normal"}, disposition=True)
+        self.download(pyfile.url, cookies=True, post={'download': "normal"}, disposition=True)
 
 
     def checkFile(self):
-        super(UploadableCh, self).checkFile()
-
-        check = self.checkDownload({'wait_or_reconnect': re.compile("Please wait for"),
-                                    'is_html'          : re.compile("<head>")})
-
-        if check == "wait_or_reconnect":
+        if self.checkDownload({'wait': re.compile("Please wait for")}):
             self.logInfo("Downloadlimit reached, please wait or reconnect")
             self.wait(60 * 60, True)
             self.retry()
 
-        elif check == "is_html":
-            self.error("Downloaded file is an html file")
+        return super(UploadableCh, self).checkFile()
 
 
 getInfo = create_getInfo(UploadableCh)
diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index 189079017..ac0b4b562 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class UploadheroCom(SimpleHoster):
     __name__    = "UploadheroCom"
     __type__    = "hoster"
-    __version__ = "0.16"
+    __version__ = "0.17"
 
     __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+'
 
@@ -31,11 +31,12 @@ class UploadheroCom(SimpleHoster):
     IP_WAIT_PATTERN = r'<span id="minutes">(\d+)</span>.*\s*<span id="seconds">(\d+)</span>'
 
     CAPTCHA_PATTERN = r'"(/captchadl\.php\?\w+)"'
-    FREE_URL_PATTERN = r'var magicomfg = \'<a href="(http://[^<>"]*?)"|"(http://storage\d+\.uploadhero\.co/\?d=\w+/[^<>"/]+)"'
-    PREMIUM_URL_PATTERN = r'<a href="([^"]+)" id="downloadnow"'
 
+    LINK_FREE_PATTERN    = r'var magicomfg = \'<a href="(http://[^<>"]*?)"|"(http://storage\d+\.uploadhero\.co/\?d=\w+/[^<>"/]+)"'
+    LINK_PREMIUM_PATTERN = r'<a href="([^"]+)" id="downloadnow"'
 
-    def handleFree(self):
+
+    def handleFree(self, pyfile):
         self.checkErrors()
 
         m = re.search(self.CAPTCHA_PATTERN, self.html)
@@ -45,8 +46,8 @@ class UploadheroCom(SimpleHoster):
 
         for _i in xrange(5):
             captcha = self.decryptCaptcha(captcha_url)
-            self.html = self.load(self.pyfile.url, get={"code": captcha})
-            m = re.search(self.FREE_URL_PATTERN, self.html)
+            self.html = self.load(pyfile.url, get={"code": captcha})
+            m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
                 self.correctCaptcha()
                 download_url = m.group(1) or m.group(2)
@@ -59,12 +60,6 @@ class UploadheroCom(SimpleHoster):
         self.download(download_url)
 
 
-    def handlePremium(self):
-        self.logDebug("%s: Use Premium Account" % self.__name__)
-        link = re.search(self.PREMIUM_URL_PATTERN, self.html).group(1)
-        self.download(link)
-
-
     def checkErrors(self):
         m = re.search(self.IP_BLOCKED_PATTERN, self.html)
         if m:
diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py
index b163f2252..164b7b243 100644
--- a/module/plugins/hoster/UploadingCom.py
+++ b/module/plugins/hoster/UploadingCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, t
 class UploadingCom(SimpleHoster):
     __name__    = "UploadingCom"
     __type__    = "hoster"
-    __version__ = "0.39"
+    __version__ = "0.40"
 
     __pattern__ = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)'
 
@@ -40,15 +40,15 @@ class UploadingCom(SimpleHoster):
         self.getFileInfo()
 
         if self.premium:
-            self.handlePremium()
+            self.handlePremium(pyfile)
         else:
-            self.handleFree()
+            self.handleFree(pyfile)
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         postData = {'action': 'get_link',
-                    'code': self.info['pattern']['ID'],
-                    'pass': 'undefined'}
+                    'code'  : self.info['pattern']['ID'],
+                    'pass'  : 'undefined'}
 
         self.html = self.load('http://uploading.com/files/get/?JsHttpRequest=%d-xml' % timestamp(), post=postData)
         url = re.search(r'"link"\s*:\s*"(.*?)"', self.html)
@@ -59,16 +59,16 @@ class UploadingCom(SimpleHoster):
         raise Exception("Plugin defect")
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         m = re.search('<h2>((Daily )?Download Limit)</h2>', self.html)
         if m:
-            self.pyfile.error = m.group(1)
-            self.logWarning(self.pyfile.error)
-            self.retry(6, (6 * 60 if m.group(2) else 15) * 60, self.pyfile.error)
+            pyfile.error = m.group(1)
+            self.logWarning(pyfile.error)
+            self.retry(6, (6 * 60 if m.group(2) else 15) * 60, pyfile.error)
 
         ajax_url = "http://uploading.com/files/get/?ajax"
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
-        self.req.http.lastURL = self.pyfile.url
+        self.req.http.lastURL = pyfile.url
 
         res = json_loads(self.load(ajax_url, post={'action': 'second_page', 'code': self.info['pattern']['ID']}))
 
@@ -95,10 +95,5 @@ class UploadingCom(SimpleHoster):
 
         self.download(url)
 
-        check = self.checkDownload({"html": re.compile("\A<!DOCTYPE html PUBLIC")})
-        if check == "html":
-            self.logWarning(_("Redirected to a HTML page, wait 10 minutes and retry"))
-            self.wait(10 * 60, True)
-
 
 getInfo = create_getInfo(UploadingCom)
diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py
index 25c424f1f..f287a2b51 100644
--- a/module/plugins/hoster/UpstoreNet.py
+++ b/module/plugins/hoster/UpstoreNet.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class UpstoreNet(SimpleHoster):
     __name__    = "UpstoreNet"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'https?://(?:www\.)?upstore\.net/'
 
@@ -23,10 +23,10 @@ class UpstoreNet(SimpleHoster):
 
     WAIT_PATTERN = r'var sec = (\d+)'
     CHASH_PATTERN = r'<input type="hidden" name="hash" value="([^"]*)">'
-    LINK_PATTERN = r'<a href="(https?://.*?)" target="_blank"><b>'
+    LINK_FREE_PATTERN = r'<a href="(https?://.*?)" target="_blank"><b>'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         # STAGE 1: get link to continue
         m = re.search(self.CHASH_PATTERN, self.html)
         if m is None:
@@ -35,7 +35,7 @@ class UpstoreNet(SimpleHoster):
         self.logDebug("Read hash " + chash)
         # continue to stage2
         post_data = {'hash': chash, 'free': 'Slow download'}
-        self.html = self.load(self.pyfile.url, post=post_data, decode=True)
+        self.html = self.load(pyfile.url, post=post_data, decode=True)
 
         # STAGE 2: solv captcha and wait
         # first get the infos we need: recaptcha key and wait time
@@ -56,10 +56,10 @@ class UpstoreNet(SimpleHoster):
             post_data.update({'recaptcha_challenge_field': challenge,
                               'recaptcha_response_field' : response})
 
-            self.html = self.load(self.pyfile.url, post=post_data, decode=True)
+            self.html = self.load(pyfile.url, post=post_data, decode=True)
 
             # STAGE 3: get direct link
-            m = re.search(self.LINK_PATTERN, self.html, re.S)
+            m = re.search(self.LINK_FREE_PATTERN, self.html, re.S)
             if m:
                 break
 
diff --git a/module/plugins/hoster/VeohCom.py b/module/plugins/hoster/VeohCom.py
index 6dbac397b..219efa8e1 100644
--- a/module/plugins/hoster/VeohCom.py
+++ b/module/plugins/hoster/VeohCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class VeohCom(SimpleHoster):
     __name__    = "VeohCom"
     __type__    = "hoster"
-    __version__ = "0.21"
+    __version__ = "0.22"
 
     __pattern__ = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)'
     __config__ = [("quality", "Low;High;Auto", "Quality", "Auto")]
@@ -32,15 +32,16 @@ class VeohCom(SimpleHoster):
         self.chunkLimit     = -1
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         quality = self.getConfig("quality")
         if quality == "Auto":
             quality = ("High", "Low")
+
         for q in quality:
             pattern = r'"fullPreviewHash%sPath":"(.+?)"' % q
             m = re.search(pattern, self.html)
             if m:
-                self.pyfile.name += ".mp4"
+                pyfile.name += ".mp4"
                 link = m.group(1).replace("\\", "")
                 self.download(link)
                 return
diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py
index 0e42c1674..f7485f025 100644
--- a/module/plugins/hoster/VimeoCom.py
+++ b/module/plugins/hoster/VimeoCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class VimeoCom(SimpleHoster):
     __name__    = "VimeoCom"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)'
     __config__ = [("quality", "Lowest;Mobile;SD;HD;Highest", "Quality", "Highest"),
@@ -34,15 +34,14 @@ class VimeoCom(SimpleHoster):
         self.chunkLimit     = -1
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         password = self.getPassword()
 
         if self.js and 'class="btn iconify_down_b"' in self.html:
-            html = self.js.eval(self.load(self.pyfile.url, get={'action': "download", 'password': password}, decode=True))
+            html    = self.js.eval(self.load(pyfile.url, get={'action': "download", 'password': password}, decode=True))
             pattern = r'href="(?P<URL>http://vimeo\.com.+?)".*?\>(?P<QL>.+?) '
         else:
-            id = re.match(self.__pattern__, self.pyfile.url).group('ID')
-            html = self.load("https://player.vimeo.com/video/" + id, get={'password': password})
+            html    = self.load("https://player.vimeo.com/video/" + self.info['pattern']['ID'], get={'password': password})
             pattern = r'"(?P<QL>\w+)":{"profile".*?"(?P<URL>http://pdl\.vimeocdn\.com.+?)"'
 
         link = dict([(l.group('QL').lower(), l.group('URL')) for l in re.finditer(pattern, html)])
diff --git a/module/plugins/hoster/WebshareCz.py b/module/plugins/hoster/WebshareCz.py
index a08341ff3..e3424fc21 100644
--- a/module/plugins/hoster/WebshareCz.py
+++ b/module/plugins/hoster/WebshareCz.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class WebshareCz(SimpleHoster):
     __name__    = "WebshareCz"
     __type__    = "hoster"
-    __version__ = "0.14"
+    __version__ = "0.15"
 
     __pattern__ = r'https?://(?:www\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)'
 
@@ -40,12 +40,11 @@ class WebshareCz(SimpleHoster):
         return info
 
 
-    def handleFree(self):
-        fid = re.match(self.__pattern__, self.pyfile.url).group('ID')
+    def handleFree(self, pyfile):
         wst = self.account.infos['wst'] if self.account and 'wst' in self.account.infos else ""
 
         api_data = getURL('https://webshare.cz/api/file_link/',
-                          post={'ident': fid, 'wst': wst},
+                          post={'ident': self.info['pattern']['ID'], 'wst': wst},
                           decode=True)
 
         self.logDebug("API data: " + api_data)
@@ -57,8 +56,8 @@ class WebshareCz(SimpleHoster):
         self.link = m.group(1)
 
 
-    def handlePremium(self):
-        return self.handleFree()
+    def handlePremium(self, pyfile):
+        return self.handleFree(pyfile)
 
 
 getInfo = create_getInfo(WebshareCz)
diff --git a/module/plugins/hoster/WrzucTo.py b/module/plugins/hoster/WrzucTo.py
index 8e9653307..457e72865 100644
--- a/module/plugins/hoster/WrzucTo.py
+++ b/module/plugins/hoster/WrzucTo.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class WrzucTo(SimpleHoster):
     __name__    = "WrzucTo"
     __type__    = "hoster"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))'
 
@@ -29,16 +29,16 @@ class WrzucTo(SimpleHoster):
         self.multiDL = True
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         data = dict(re.findall(r'(md5|file): "(.*?)"', self.html))
         if len(data) != 2:
             self.error(_("No file ID"))
 
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
-        self.req.http.lastURL = self.pyfile.url
+        self.req.http.lastURL = pyfile.url
         self.load("http://www.wrzuc.to/ajax/server/prepair", post={"md5": data['md5']})
 
-        self.req.http.lastURL = self.pyfile.url
+        self.req.http.lastURL = pyfile.url
         self.html = self.load("http://www.wrzuc.to/ajax/server/download_link", post={"file": data['file']})
 
         data.update(re.findall(r'"(download_link|server_id)":"(.*?)"', self.html))
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index 0acad3dba..8d9ec9871 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class XFileSharingPro(XFSHoster):
     __name__    = "XFileSharingPro"
     __type__    = "hoster"
-    __version__ = "0.43"
+    __version__ = "0.44"
 
     __pattern__ = r'^unmatchable$'
 
@@ -31,27 +31,32 @@ class XFileSharingPro(XFSHoster):
 
         self.__pattern__ = self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
 
-        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group(1).lower()
-        self.HOSTER_NAME = "".join([str.capitalize() for str in self.HOSTER_DOMAIN.split('.')])
+        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
+        self.HOSTER_NAME   = "".join([part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.'])
+
+        if self.HOSTER_NAME[0].isdigit():
+            self.HOSTER_NAME = '_' + self.HOSTER_NAME
 
         account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME)
 
         if account and account.canUse():
             self.account = account
+
         elif self.account:
             self.account.HOSTER_DOMAIN = self.HOSTER_DOMAIN
+
         else:
             return
 
         self.user, data = self.account.selectAccount()
-        self.req = self.account.getAccountRequest(self.user)
-        self.premium = self.account.isPremium(self.user)
+        self.req        = self.account.getAccountRequest(self.user)
+        self.premium    = self.account.isPremium(self.user)
 
 
     def setup(self):
-        self.chunkLimit = 1
+        self.chunkLimit     = 1
         self.resumeDownload = self.premium
-        self.multiDL = True
+        self.multiDL        = True
 
 
 getInfo = create_getInfo(XFileSharingPro)
diff --git a/module/plugins/hoster/YibaishiwuCom.py b/module/plugins/hoster/YibaishiwuCom.py
index 3b4692933..adc403de4 100644
--- a/module/plugins/hoster/YibaishiwuCom.py
+++ b/module/plugins/hoster/YibaishiwuCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class YibaishiwuCom(SimpleHoster):
     __name__    = "YibaishiwuCom"
     __type__    = "hoster"
-    __version__ = "0.13"
+    __version__ = "0.14"
 
     __pattern__ = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)'
 
@@ -22,21 +22,25 @@ class YibaishiwuCom(SimpleHoster):
     SIZE_PATTERN = r'file_size: \'(?P<S>.+?)\''
     OFFLINE_PATTERN = ur'<h3><i style="color:red;">哎呀！提取码不存在！不妨搜搜看吧！</i></h3>'
 
-    LINK_PATTERN = r'(/\?ct=(pickcode|download)[^"\']+)'
+    LINK_FREE_PATTERN = r'(/\?ct=(pickcode|download)[^"\']+)'
 
 
-    def handleFree(self):
-        m = re.search(self.LINK_PATTERN, self.html)
+    def handleFree(self, pyfile):
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("LINK_PATTERN not found"))
+            self.error(_("LINK_FREE_PATTERN not found"))
+
         url = m.group(1)
+
         self.logDebug(('FREEUSER' if m.group(2) == 'download' else 'GUEST') + ' URL', url)
 
         res = json_loads(self.load("http://115.com" + url, decode=False))
         if "urls" in res:
             mirrors = res['urls']
+
         elif "data" in res:
             mirrors = res['data']
+
         else:
             mirrors = None
 
diff --git a/module/plugins/hoster/YourfilesTo.py b/module/plugins/hoster/YourfilesTo.py
index 83ab89110..e0def108e 100644
--- a/module/plugins/hoster/YourfilesTo.py
+++ b/module/plugins/hoster/YourfilesTo.py
@@ -10,9 +10,9 @@ from module.plugins.Hoster import Hoster
 class YourfilesTo(Hoster):
     __name__    = "YourfilesTo"
     __type__    = "hoster"
-    __version__ = "0.21"
+    __version__ = "0.22"
 
-    __pattern__ = r'(http://)?(?:www\.)?yourfiles\.(to|biz)/\?d=\w+'
+    __pattern__ = r'http://(?:www\.)?yourfiles\.(to|biz)/\?d=\w+'
 
     __description__ = """Youfiles.to hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py
index 60fc2a12b..83ff16357 100644
--- a/module/plugins/hoster/ZeveraCom.py
+++ b/module/plugins/hoster/ZeveraCom.py
@@ -1,36 +1,39 @@
 # -*- coding: utf-8 -*-
 
+import re
+
+from urlparse import urljoin
+
 from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 
 
 class ZeveraCom(MultiHoster):
     __name__    = "ZeveraCom"
     __type__    = "hoster"
-    __version__ = "0.25"
+    __version__ = "0.26"
 
-    __pattern__ = r'http://(?:www\.)?zevera\.com/.+'
+    __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+'
 
-    __description__ = """Zevera.com hoster plugin"""
+    __description__ = """Zevera.com multi-hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
-
-
-    def handlePremium(self):
-        if self.account.getAPIData(self.req, cmd="checklink", olink=self.pyfile.url) != "Alive":
-            self.fail(_("Offline or not downloadable"))
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
 
-        header = self.account.getAPIData(self.req, just_header=True, cmd="generatedownloaddirect", olink=self.pyfile.url)
-        if not "location" in header:
-            self.fail(_("Unable to initialize download"))
 
-        self.link = header['location']
+    def handlePremium(self, pyfile):
+        html = self.account.api_response(self.req, cmd="checklink", olink=pyfile.url)
+        if "Alive" in html:
+            header    = self.account.api_response(self.req, just_header=True, cmd="generatedownloaddirect", olink=pyfile.url)
+            self.link = self.directLink(header['location'])
+        else:
+            self.fail(re.search(r'Error: (.+)', html).group(1))
 
 
     def checkFile(self):
-        super(ZeveraCom, self).checkFile()
+        if self.checkDownload({"error": 'action="ErrorDownload.aspx'}):
+            self.fail(_("Error response received"))
 
-        if self.checkDownload({"error": 'action="ErrorDownload.aspx'}) is "error":
-            self.fail(_("Error response received - contact Zevera support"))
+        return super(ZeveraCom, self).checkFile()
 
 
 getInfo = create_getInfo(ZeveraCom)
diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 73dd1f22d..2648f532f 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.65"
+    __version__ = "0.66"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -33,9 +33,11 @@ class ZippyshareCom(SimpleHoster):
         self.resumeDownload = True
 
 
-    def handleFree(self):
-        url = self.get_link()
-        self.download(url)
+    def handleFree(self, pyfile):
+        checksum = self.get_checksum()
+        p_url    = '/'.join(("d", self.info['pattern']['KEY'], str(checksum), self.pyfile.name))
+
+        self.link = urljoin(self.info['pattern']['HOST'], p_url)
 
 
     def get_checksum(self):
@@ -56,11 +58,4 @@ class ZippyshareCom(SimpleHoster):
             return b
 
 
-    def get_link(self):
-        checksum = self.get_checksum()
-        p_url    = '/'.join(("d", self.info['pattern']['KEY'], str(checksum), self.pyfile.name))
-        dl_link  = urljoin(self.info['pattern']['HOST'], p_url)
-        return dl_link
-
-
 getInfo = create_getInfo(ZippyshareCom)
diff --git a/module/plugins/hoster/_1FichierCom.py b/module/plugins/hoster/_1FichierCom.py
new file mode 100644
index 000000000..528ad0f48
--- /dev/null
+++ b/module/plugins/hoster/_1FichierCom.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class _1FichierCom(SimpleHoster):
+    __name__    = "1FichierCom"
+    __type__    = "hoster"
+    __version__ = "0.76"
+
+    __pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?'
+
+    __description__ = """1fichier.com hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
+                       ("the-razer", "daniel_ AT gmx DOT net"),
+                       ("zoidberg", "zoidberg@mujmail.cz"),
+                       ("imclem", None),
+                       ("stickell", "l.stickell@yahoo.it"),
+                       ("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    NAME_PATTERN = r'>FileName :</td>\s*<td.*>(?P<N>.+?)<'
+    SIZE_PATTERN = r'>Size :</td>\s*<td.*>(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+
+    OFFLINE_PATTERN = r'File not found !\s*<'
+
+    COOKIES = [("1fichier.com", "LG", "en")]
+
+    WAIT_PATTERN = r'>You must wait (\d+) minutes'
+
+
+    def setup(self):
+        self.multiDL        = self.premium
+        self.resumeDownload = True
+
+
+    def handleFree(self, pyfile):
+        id = self.info['pattern']['ID1'] or self.info['pattern']['ID2']
+        url, inputs = self.parseHtmlForm('action="https://1fichier.com/\?%s' % id)
+
+        if not url:
+            self.fail(_("Download link not found"))
+
+        if "pass" in inputs:
+            inputs['pass'] = self.getPassword()
+
+        inputs['submit'] = "Download"
+
+        self.download(url, post=inputs)
+
+
+    def handlePremium(self, pyfile):
+        return self.handleFree(pyfile)
+
+
+getInfo = create_getInfo(_1FichierCom)
diff --git a/module/plugins/hoster/_2SharedCom.py b/module/plugins/hoster/_2SharedCom.py
new file mode 100644
index 000000000..a974fac58
--- /dev/null
+++ b/module/plugins/hoster/_2SharedCom.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class _2SharedCom(SimpleHoster):
+    __name__    = "2SharedCom"
+    __type__    = "hoster"
+    __version__ = "0.13"
+
+    __pattern__ = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+'
+
+    __description__ = """2Shared.com hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+
+
+    NAME_PATTERN    = r'<h1>(?P<N>.*)</h1>'
+    SIZE_PATTERN    = r'<span class="dtitle">File size:</span>\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    OFFLINE_PATTERN = r'The file link that you requested is not valid\.|This file was deleted\.'
+
+    LINK_FREE_PATTERN = r'window.location =\'(.+?)\';'
+
+
+    def setup(self):
+        self.resumeDownload = True
+        self.multiDL        = True
+
+
+getInfo = create_getInfo(_2SharedCom)
diff --git a/module/plugins/hoster/_4SharedCom.py b/module/plugins/hoster/_4SharedCom.py
new file mode 100644
index 000000000..a3504e405
--- /dev/null
+++ b/module/plugins/hoster/_4SharedCom.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class _4SharedCom(SimpleHoster):
+    __name__    = "4SharedCom"
+    __type__    = "hoster"
+    __version__ = "0.31"
+
+    __pattern__ = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+'
+
+    __description__ = """4Shared.com hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("jeix", "jeix@hasnomail.de"),
+                       ("zoidberg", "zoidberg@mujmail.cz")]
+
+
+    NAME_PATTERN = r'<meta name="title" content="(?P<N>.+?)"'
+    SIZE_PATTERN = r'<span title="Size: (?P<S>[\d.,]+) (?P<U>[\w^_]+)">'
+    OFFLINE_PATTERN = r'The file link that you requested is not valid\.|This file was deleted.'
+
+    NAME_REPLACEMENTS = [(r"&#(\d+).", lambda m: unichr(int(m.group(1))))]
+    SIZE_REPLACEMENTS = [(",", "")]
+
+    DIRECT_LINK   = False
+    LOGIN_ACCOUNT = True
+
+    LINK_FREE_PATTERN = r'name="d3link" value="(.*?)"'
+    LINK_BTN_PATTERN  = r'id="btnLink" href="(.*?)"'
+
+    ID_PATTERN = r'name="d3fid" value="(.*?)"'
+
+
+    def handleFree(self, pyfile):
+        m = re.search(self.LINK_BTN_PATTERN, self.html)
+        if m:
+            link = m.group(1)
+        else:
+            link = re.sub(r'/(download|get|file|document|photo|video|audio)/', r'/get/', pyfile.url)
+
+        self.html = self.load(link)
+
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
+        if m is None:
+            self.error(_("Download link"))
+
+        self.link = m.group(1)
+
+        try:
+            m = re.search(self.ID_PATTERN, self.html)
+            res = self.load('http://www.4shared.com/web/d2/getFreeDownloadLimitInfo?fileId=%s' % m.group(1))
+            self.logDebug(res)
+        except:
+            pass
+
+        self.wait(20)
+
+
+getInfo = create_getInfo(_4SharedCom)
-- 
cgit v1.2.3