Fix XFS plugins

32 files changed, 119 insertions, 55 deletions

diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py
index c497dbe01..75ad74791 100644
--- a/module/plugins/crypter/CloudzillaToFolder.py
+++ b/module/plugins/crypter/CloudzillaToFolder.py
@@ -5,10 +5,10 @@ import re
 from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
-class CloudzillaToFolder(SimpleHoster):
+class CloudzillaToFolder(SimpleCrypter):
     __name__    = "CloudzillaToFolder"
     __type__    = "crypter"
-    __version__ = "0.06"
+    __version__ = "0.07"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)'
diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py
index 47f7797b2..de9d50f31 100644
--- a/module/plugins/crypter/EasybytezComFolder.py
+++ b/module/plugins/crypter/EasybytezComFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 class EasybytezComFolder(XFSCrypter):
     __name__    = "EasybytezComFolder"
     __type__    = "crypter"
-    __version__ = "0.13"
+    __version__ = "0.14"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+'
@@ -19,6 +19,8 @@ class EasybytezComFolder(XFSCrypter):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
+    PLUGIN_DOMAIN = "easybytez.com"
+
     LOGIN_ACCOUNT = True
 
 
diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py
index 7bd7fac6b..aa0d68ffe 100644
--- a/module/plugins/crypter/LetitbitNetFolder.py
+++ b/module/plugins/crypter/LetitbitNetFolder.py
@@ -5,10 +5,10 @@ import re
 from module.plugins.internal.Crypter import Crypter, create_getInfo
 
 
-class LinkCryptWs(Crypter):
+class LetitbitNetFolder(Crypter):
     __name__    = "LetitbitNet"
     __type__    = "crypter"
-    __version__ = "0.13"
+    __version__ = "0.14"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+'
@@ -36,4 +36,4 @@ class LinkCryptWs(Crypter):
         self.urls.extend(re.findall(self.LINK_PATTERN, folder.group(0)))
 
 
-getInfo = create_getInfo(LinkCryptWs)
+getInfo = create_getInfo(LetitbitNetFolder)
diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py
index 2bbaee37d..0a38d38a9 100644
--- a/module/plugins/crypter/MediafireComFolder.py
+++ b/module/plugins/crypter/MediafireComFolder.py
@@ -3,14 +3,13 @@
 import re
 
 from module.plugins.internal.Crypter import Crypter, create_getInfo
-from module.plugins.hoster.MediafireCom import checkHTMLHeader
 from module.plugins.internal.utils import json
 
 
 class MediafireComFolder(Crypter):
     __name__    = "MediafireComFolder"
     __type__    = "crypter"
-    __version__ = "0.18"
+    __version__ = "0.19"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))'
@@ -27,11 +26,39 @@ class MediafireComFolder(Crypter):
     LINK_PATTERN = r'<meta property="og:url" content="http://www\.mediafire\.com/\?(\w+)"/>'
 
 
+    def _get_url(url):
+        try:
+            for _i in xrange(3):
+                header = self.load(url, just_header=True)
+
+                for line in header.splitlines():
+                    line = line.lower()
+
+                    if 'location' in line:
+                        url = line.split(':', 1)[1].strip()
+                        if 'error.php?errno=320' in url:
+                            return url, 1
+
+                        elif not url.startswith('http://'):
+                            url = 'http://www.mediafire.com' + url
+
+                        break
+
+                    elif 'content-disposition' in line:
+                        return url, 2
+
+        except Exception:
+            return url, 3
+
+        else:
+            return url, 0
+
+
     def decrypt(self, pyfile):
-        url, result = checkHTMLHeader(pyfile.url)
+        url, result = self._get_url(pyfile.url)
         self.log_debug("Location (%d): %s" % (result, url))
 
-        if result == 0:
+        if result is 0:
             #: Load and parse html
             html = self.load(pyfile.url)
             m = re.search(self.LINK_PATTERN, html)
@@ -55,8 +82,10 @@ class MediafireComFolder(Crypter):
                             self.urls.append("http://www.mediafire.com/file/%s" % link['quickkey'])
                     else:
                         self.fail(json_resp['response']['message'])
-        elif result == 1:
+
+        elif result is 1:
             self.offline()
+
         else:
             self.urls.append(url)
 
diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py
index 703061c76..5bb68b2c4 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -10,7 +10,7 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 class TusfilesNetFolder(XFSCrypter):
     __name__    = "TusfilesNetFolder"
     __type__    = "crypter"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
@@ -24,6 +24,7 @@ class TusfilesNetFolder(XFSCrypter):
                        ("stickell", "l.stickell@yahoo.it")]
 
 
+    PLUGIN_DOMAIN = "tusfiles.net"
     PAGES_PATTERN = r'>\((\d+) \w+\)<'
 
     URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')]
diff --git a/module/plugins/hooks/XFileSharing.py b/module/plugins/hooks/XFileSharing.py
index 2677fbd04..20a3af4c1 100644
--- a/module/plugins/hooks/XFileSharing.py
+++ b/module/plugins/hooks/XFileSharing.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Addon import Addon
 class XFileSharing(Addon):
     __name__    = "XFileSharing"
     __type__    = "hook"
-    __version__ = "0.48"
+    __version__ = "0.50"
     __status__  = "testing"
 
     __config__ = [("activated"       , "bool", "Activated"                     , True ),
@@ -92,8 +92,8 @@ class XFileSharing(Addon):
 
             for p in self.pyload.pluginManager.plugins[type].values():
                 klass = self.pyload.pluginManager.loadClass(type, p['name'])
-                if hasattr(klass, "HOSTER_DOMAIN") and klass.HOSTER_DOMAIN and isXFS(klass):
-                    plugin_list.append(klass.HOSTER_DOMAIN)
+                if hasattr(klass, "PLUGIN_DOMAIN") and klass.PLUGIN_DOMAIN and isXFS(klass):
+                    plugin_list.append(klass.PLUGIN_DOMAIN)
 
             if plugin_list:
                 unmatch_list = '|'.join(sorted(plugin_list)).replace('.', '\.')
diff --git a/module/plugins/hoster/CramitIn.py b/module/plugins/hoster/CramitIn.py
index e41ff0dd2..bf3c7cd54 100644
--- a/module/plugins/hoster/CramitIn.py
+++ b/module/plugins/hoster/CramitIn.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class CramitIn(XFSHoster):
     __name__    = "CramitIn"
     __type__    = "hoster"
-    __version__ = "0.09"
+    __version__ = "0.10"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?cramit\.in/\w{12}'
@@ -17,8 +17,9 @@ class CramitIn(XFSHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)'
+    PLUGIN_DOMAIN = "cramit.in"
 
+    INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)'
     LINK_PATTERN = r'href="(http://cramit\.in/file_download/.*?)"'
 
 
diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index b89e69104..3773a1f9f 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class EasybytezCom(XFSHoster):
     __name__    = "EasybytezCom"
     __type__    = "hoster"
-    __version__ = "0.25"
+    __version__ = "0.26"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?easybytez\.com/\w{12}'
@@ -18,6 +18,8 @@ class EasybytezCom(XFSHoster):
                        ("stickell", "l.stickell@yahoo.it")]
 
 
+    PLUGIN_DOMAIN = "easybytez.com"
+
     OFFLINE_PATTERN = r'>File not available'
 
     LINK_PATTERN = r'(http://(\w+\.(easybytez|easyload|ezbytez|zingload)\.(com|to)|\d+\.\d+\.\d+\.\d+)/files/\d+/\w+/.+?)["\'<]'
diff --git a/module/plugins/hoster/ExashareCom.py b/module/plugins/hoster/ExashareCom.py
index ac8ed999b..c25e20d1c 100644
--- a/module/plugins/hoster/ExashareCom.py
+++ b/module/plugins/hoster/ExashareCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class ExashareCom(XFSHoster):
     __name__    = "ExashareCom"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?exashare\.com/\w{12}'
@@ -19,7 +19,9 @@ class ExashareCom(XFSHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    INFO_PATTERN      = r'>(?P<NAME>.+?)<small>\( (?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    PLUGIN_DOMAIN = "exashare.com"
+
+    INFO_PATTERN = r'>(?P<NAME>.+?)<small>\( (?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
 
     def setup(self):
diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py
index ab886992a..e29cbe4ba 100644
--- a/module/plugins/hoster/FileomCom.py
+++ b/module/plugins/hoster/FileomCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class FileomCom(XFSHoster):
     __name__    = "FileomCom"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}'
@@ -20,6 +20,8 @@ class FileomCom(XFSHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
+    PLUGIN_DOMAIN = "fileom.com"
+
     NAME_PATTERN = r'Filename: <span>(?P<N>.+?)<'
     SIZE_PATTERN = r'File Size: <span class="size">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
diff --git a/module/plugins/hoster/FilerioCom.py b/module/plugins/hoster/FilerioCom.py
index a943b4cad..cbaa18468 100644
--- a/module/plugins/hoster/FilerioCom.py
+++ b/module/plugins/hoster/FilerioCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class FilerioCom(XFSHoster):
     __name__    = "FilerioCom"
     __type__    = "hoster"
-    __version__ = "0.09"
+    __version__ = "0.10"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}'
@@ -17,6 +17,8 @@ class FilerioCom(XFSHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
+    PLUGIN_DOMAIN = "filerio.com"
+
     URL_REPLACEMENTS = [(r'filekeen\.com', "filerio.in")]
 
     OFFLINE_PATTERN = r'>&quot;File Not Found|File has been removed'
diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py
index cf6a8b9c0..156a44128 100644
--- a/module/plugins/hoster/FshareVn.py
+++ b/module/plugins/hoster/FshareVn.py
@@ -23,7 +23,7 @@ def double_decode(m):
 class FshareVn(SimpleHoster):
     __name__    = "FshareVn"
     __type__    = "hoster"
-    __version__ = "0.22"
+    __version__ = "0.23"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+'
@@ -38,7 +38,7 @@ class FshareVn(SimpleHoster):
     INFO_PATTERN = r'<p>(?P<N>[^<]+)<\\/p>[\\trn\s]*<p>(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)<\\/p>'
     OFFLINE_PATTERN = r'<div class=\\"f_left file_w\\"|<\\/p>\\t\\t\\t\\t\\r\\n\\t\\t<p><\\/p>\\t\\t\\r\\n\\t\\t<p>0 KB<\\/p>'
 
-    NAME_REPLACEMENTS = [("(.*)", doubleDecode)]
+    NAME_REPLACEMENTS = [("(.*)", double_decode)]
 
     LINK_FREE_PATTERN = r'action="(http://download.*?)[#"]'
     WAIT_PATTERN = ur'Lượt tải xuống kế tiếp là:\s*(.*?)\s*<'
diff --git a/module/plugins/hoster/HugefilesNet.py b/module/plugins/hoster/HugefilesNet.py
index 90391a4e2..c9b39603d 100644
--- a/module/plugins/hoster/HugefilesNet.py
+++ b/module/plugins/hoster/HugefilesNet.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class HugefilesNet(XFSHoster):
     __name__    = "HugefilesNet"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?hugefiles\.net/\w{12}'
@@ -19,6 +19,8 @@ class HugefilesNet(XFSHoster):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
+    PLUGIN_DOMAIN = "hugefiles.net"
+
     SIZE_PATTERN = r'File Size:</span>\s*<span.*?>(?P<S>[^<]+)</span></div>'
 
     FORM_INPUTS_MAP = {'ctype': re.compile(r'\d+')}
diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py
index 00bd9d0cc..6cc9cd9f1 100644
--- a/module/plugins/hoster/HundredEightyUploadCom.py
+++ b/module/plugins/hoster/HundredEightyUploadCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class HundredEightyUploadCom(XFSHoster):
     __name__    = "HundredEightyUploadCom"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?180upload\.com/\w{12}'
@@ -17,6 +17,8 @@ class HundredEightyUploadCom(XFSHoster):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
+    PLUGIN_DOMAIN = "180upload.com"
+
     OFFLINE_PATTERN = r'>File Not Found'
 
 
diff --git a/module/plugins/hoster/JunocloudMe.py b/module/plugins/hoster/JunocloudMe.py
index 63b430f2b..ad8c5b1c4 100644
--- a/module/plugins/hoster/JunocloudMe.py
+++ b/module/plugins/hoster/JunocloudMe.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class JunocloudMe(XFSHoster):
     __name__    = "JunocloudMe"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:\w+\.)?junocloud\.me/\w{12}'
@@ -17,6 +17,8 @@ class JunocloudMe(XFSHoster):
     __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
+    PLUGIN_DOMAIN = "junocloud.me"
+
     URL_REPLACEMENTS = [(r'//(www\.)?junocloud', "//dl3.junocloud")]
 
     OFFLINE_PATTERN      = r'>No such file with this filename<'
diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py
index 5eac08291..4870a10cd 100644
--- a/module/plugins/hoster/MediafireCom.py
+++ b/module/plugins/hoster/MediafireCom.py
@@ -34,7 +34,7 @@ class MediafireCom(SimpleHoster):
 
     def setup(self):
         self.resume_download = True
-        self.multiDL        = True
+        self.multiDL         = True
 
 
     def handle_captcha(self):
diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py
index 86d1b2106..ab114240f 100644
--- a/module/plugins/hoster/MovReelCom.py
+++ b/module/plugins/hoster/MovReelCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class MovReelCom(XFSHoster):
     __name__    = "MovReelCom"
     __type__    = "hoster"
-    __version__ = "1.26"
+    __version__ = "1.27"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}'
@@ -17,6 +17,8 @@ class MovReelCom(XFSHoster):
     __authors__     = [("JorisV83", "jorisv83-pyload@yahoo.com")]
 
 
+    PLUGIN_DOMAIN = "movreel.com"
+
     LINK_PATTERN = r'<a href="(.+?)">Download Link'
 
 
diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py
index 3b726b904..43eb9f5a1 100644
--- a/module/plugins/hoster/NosuploadCom.py
+++ b/module/plugins/hoster/NosuploadCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class NosuploadCom(XFSHoster):
     __name__    = "NosuploadCom"
     __type__    = "hoster"
-    __version__ = "0.33"
+    __version__ = "0.34"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}'
@@ -19,6 +19,8 @@ class NosuploadCom(XFSHoster):
     __authors__     = [("igel", "igelkun@myopera.com")]
 
 
+    PLUGIN_DOMAIN = "nosupload.com"
+
     SIZE_PATTERN = r'<p><strong>Size:</strong> (?P<S>[\d.,]+) (?P<U>[\w^_]+)</p>'
     LINK_PATTERN = r'<a class="select" href="(http://.+?)">Download</a>'
 
diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py
index 0d83a8aee..6d07bbc1a 100644
--- a/module/plugins/hoster/NovafileCom.py
+++ b/module/plugins/hoster/NovafileCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class NovafileCom(XFSHoster):
     __name__    = "NovafileCom"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}'
@@ -22,6 +22,8 @@ class NovafileCom(XFSHoster):
                        ("stickell", "l.stickell@yahoo.it")]
 
 
+    PLUGIN_DOMAIN = "novafile.com"
+
     ERROR_PATTERN = r'class="alert.+?alert-separate".*?>\s*(?:<p>)?(.*?)\s*</'
     WAIT_PATTERN  = r'<p>Please wait <span id="count".*?>(\d+)</span> seconds</p>'
 
diff --git a/module/plugins/hoster/RapidfileshareNet.py b/module/plugins/hoster/RapidfileshareNet.py
index 4f139d443..a0580ba23 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.05"
+    __version__ = "0.06"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/\w{12}'
@@ -17,6 +17,8 @@ class RapidfileshareNet(XFSHoster):
     __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
+    PLUGIN_DOMAIN = "rapidfileshare.net"
+
     NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>.+?)">'
     SIZE_PATTERN = r'>http://www.rapidfileshare.net/\w+?</font> \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</font>'
 
diff --git a/module/plugins/hoster/RarefileNet.py b/module/plugins/hoster/RarefileNet.py
index 339bcdf6f..2ca48e818 100644
--- a/module/plugins/hoster/RarefileNet.py
+++ b/module/plugins/hoster/RarefileNet.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class RarefileNet(XFSHoster):
     __name__    = "RarefileNet"
     __type__    = "hoster"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?rarefile\.net/\w{12}'
@@ -19,6 +19,8 @@ class RarefileNet(XFSHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
+    PLUGIN_DOMAIN = "rarefile.net"
+
     LINK_PATTERN = r'<a href="(.+?)">\1</a>'
 
 
diff --git a/module/plugins/hoster/SafesharingEu.py b/module/plugins/hoster/SafesharingEu.py
index 73d458e24..62c7c21b9 100644
--- a/module/plugins/hoster/SafesharingEu.py
+++ b/module/plugins/hoster/SafesharingEu.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class SafesharingEu(XFSHoster):
     __name__    = "SafesharingEu"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?safesharing\.eu/\w{12}'
@@ -17,6 +17,8 @@ class SafesharingEu(XFSHoster):
     __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
+    PLUGIN_DOMAIN = "safesharing.eu"
+
     ERROR_PATTERN = r'(?:<div class="alert alert-danger">)(.+?)(?:</div>)'
 
 
diff --git a/module/plugins/hoster/SecureUploadEu.py b/module/plugins/hoster/SecureUploadEu.py
index af59f5f3a..7d11107da 100644
--- a/module/plugins/hoster/SecureUploadEu.py
+++ b/module/plugins/hoster/SecureUploadEu.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class SecureUploadEu(XFSHoster):
     __name__    = "SecureUploadEu"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?secureupload\.eu/\w{12}'
@@ -17,6 +17,8 @@ class SecureUploadEu(XFSHoster):
     __authors__     = [("z00nx", "z00nx0@gmail.com")]
 
 
+    PLUGIN_DOMAIN = "secureupload.eu"
+
     INFO_PATTERN = r'<h3>Downloading (?P<N>[^<]+) \((?P<S>[^<]+)\)</h3>'
 
 
diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index a440ebc88..be72b8a26 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class StreamcloudEu(XFSHoster):
     __name__    = "StreamcloudEu"
     __type__    = "hoster"
-    __version__ = "0.12"
+    __version__ = "0.13"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?streamcloud\.eu/\w{12}'
@@ -19,6 +19,8 @@ class StreamcloudEu(XFSHoster):
     __authors__     = [("seoester", "seoester@googlemail.com")]
 
 
+    PLUGIN_DOMAIN = "streamcloud.eu"
+
     WAIT_PATTERN = r'var count = (\d+)'
 
 
diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py
index 58b0c79f5..c63e72983 100644
--- a/module/plugins/hoster/TusfilesNet.py
+++ b/module/plugins/hoster/TusfilesNet.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class TusfilesNet(XFSHoster):
     __name__    = "TusfilesNet"
     __type__    = "hoster"
-    __version__ = "0.14"
+    __version__ = "0.15"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}'
@@ -19,6 +19,7 @@ class TusfilesNet(XFSHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
                        ("guidobelix", "guidobelix@hotmail.it")]
 
+    PLUGIN_DOMAIN = "tusfiles.net"
 
     INFO_PATTERN    = r'\](?P<N>.+) - (?P<S>[\d.,]+) (?P<U>[\w^_]+)\['
 
diff --git a/module/plugins/hoster/UpleaCom.py b/module/plugins/hoster/UpleaCom.py
index 4b3b488c2..68b754b69 100644
--- a/module/plugins/hoster/UpleaCom.py
+++ b/module/plugins/hoster/UpleaCom.py
@@ -17,7 +17,7 @@ class UpleaCom(XFSHoster):
 
     __description__ = """Uplea.com hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Redleon", None),
+    __authors__     = [("Redleon"  , None),
                        ("GammaC0de", None)]
 
 
diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py
index a0024a56f..da8cef036 100644
--- a/module/plugins/hoster/UptoboxCom.py
+++ b/module/plugins/hoster/UptoboxCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class UptoboxCom(XFSHoster):
     __name__    = "UptoboxCom"
     __type__    = "hoster"
-    __version__ = "0.23"
+    __version__ = "0.24"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?(uptobox|uptostream)\.com/\w{12}'
@@ -17,6 +17,8 @@ class UptoboxCom(XFSHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
+    PLUGIN_DOMAIN = "uptobox.com"
+
     INFO_PATTERN         = r'"para_title">(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)'
     OFFLINE_PATTERN      = r'>(File not found|Access Denied|404 Not Found)'
     TEMP_OFFLINE_PATTERN = r'>Service Unavailable'
diff --git a/module/plugins/hoster/VidPlayNet.py b/module/plugins/hoster/VidPlayNet.py
index 8b69e6e98..a10e2672c 100644
--- a/module/plugins/hoster/VidPlayNet.py
+++ b/module/plugins/hoster/VidPlayNet.py
@@ -9,7 +9,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class VidPlayNet(XFSHoster):
     __name__    = "VidPlayNet"
     __type__    = "hoster"
-    __version__ = "0.06"
+    __version__ = "0.07"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?vidplay\.net/\w{12}'
@@ -20,6 +20,8 @@ class VidPlayNet(XFSHoster):
     __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
 
 
+    PLUGIN_DOMAIN = "vidplay.net"
+
     NAME_PATTERN = r'<b>Password:</b></div>\s*<h[1-6]>(?P<N>[^<]+)</h[1-6]>'
 
 
diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py
index c58231b71..333602e29 100644
--- a/module/plugins/internal/Captcha.py
+++ b/module/plugins/internal/Captcha.py
@@ -107,7 +107,7 @@ class Captcha(Plugin):
             except OSError, e:
                 self.log_warning(_("Error removing `%s`") % tmp_img.name, e)
 
-        #self.log_info(_("Captcha result: ") + result)  #@TODO: Remove from here?
+        # self.log_info(_("Captcha result: ") + result)  #@TODO: Remove from here?
 
         return result
 
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 66052df09..02d94b9a3 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -57,7 +57,7 @@ class XFSAccount(MultiAccount):
 
     def setup(self):
         if not self.PLUGIN_DOMAIN:
-            self.fail_login(_("Missing PLUGIN_DOMAIN"))
+            self.fail_login(_("Missing PLUGIN DOMAIN"))
 
         if not self.PLUGIN_URL:
             self.PLUGIN_URL = "http://www.%s/" % self.PLUGIN_DOMAIN
@@ -109,7 +109,7 @@ class XFSAccount(MultiAccount):
                     premium    = False
                     validuntil = None  #: Registered account type (not premium)
         else:
-            self.log_debug("VALID_UNTIL_PATTERN not found")
+            self.log_debug("VALID UNTIL PATTERN not found")
 
         m = re.search(self.TRAFFIC_LEFT_PATTERN, self.html)
         if m is not None:
@@ -137,7 +137,7 @@ class XFSAccount(MultiAccount):
             except Exception, e:
                 self.log_error(e)
         else:
-            self.log_debug("TRAFFIC_LEFT_PATTERN not found")
+            self.log_debug("TRAFFIC LEFT PATTERN not found")
 
         leech = [m.groupdict() for m in re.finditer(self.LEECH_TRAFFIC_PATTERN, self.html)]
         if leech:
@@ -164,7 +164,7 @@ class XFSAccount(MultiAccount):
             except Exception, e:
                 self.log_error(e)
         else:
-            self.log_debug("LEECH_TRAFFIC_PATTERN not found")
+            self.log_debug("LEECH TRAFFIC PATTERN not found")
 
         return {'validuntil'  : validuntil,
                 'trafficleft' : trafficleft,
diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 13757fa1f..09511097b 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -7,7 +7,7 @@ from module.plugins.internal.utils import set_cookie
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.21"
+    __version__ = "0.22"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -41,10 +41,8 @@ class XFSCrypter(SimpleCrypter):
 
 
     def prepare(self):
-        if not self.PLUGIN_DOMAIN and self.account and self.account.PLUGIN_DOMAIN:
-            self.PLUGIN_DOMAIN = self.account.PLUGIN_DOMAIN
-        else:
-            self.fail(_("Missing PLUGIN_DOMAIN"))
+        if not self.PLUGIN_DOMAIN:
+            self.fail(_("Missing PLUGIN DOMAIN"))
 
         if self.COOKIES:
             self._set_xfs_cookie()
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index f63ee8755..37afdbce0 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -12,7 +12,7 @@ from module.plugins.internal.utils import html_unescape, seconds_to_midnight, se
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.69"
+    __version__ = "0.70"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -70,10 +70,8 @@ class XFSHoster(SimpleHoster):
 
 
     def prepare(self):
-        if not self.PLUGIN_DOMAIN and self.account and self.account.PLUGIN_DOMAIN:
-            self.PLUGIN_DOMAIN = self.account.PLUGIN_DOMAIN
-        else:
-            self.fail(_("Missing PLUGIN_DOMAIN"))
+        if not self.PLUGIN_DOMAIN:
+            self.fail(_("Missing PLUGIN DOMAIN"))
 
         if self.COOKIES:
             self._set_xfs_cookie()