Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/internal/CaptchaService.py
	pyload/plugins/account/EasybytezCom.py
	pyload/plugins/account/TusfilesNet.py
	pyload/plugins/base/OCR.py
	pyload/plugins/crypter/MultiuploadCom.py
	pyload/plugins/crypter/UploadableChFolder.py
	pyload/plugins/hoster/DuploadOrg.py
	pyload/plugins/hoster/EpicShareNet.py
	pyload/plugins/hoster/LemUploadsCom.py
	pyload/plugins/hoster/LoadTo.py
	pyload/plugins/hoster/LomafileCom.py
	pyload/plugins/hoster/MegaFilesSe.py
	pyload/plugins/hoster/MegareleaseOrg.py
	pyload/plugins/hoster/PandaPlanet.py
	pyload/plugins/hoster/PotloadCom.py
	pyload/plugins/hoster/PremiumTo.py
	pyload/plugins/hoster/TurbobitNet.py
	pyload/plugins/internal/DeadCrypter.py
	pyload/plugins/internal/DeadHoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/UpdateManager.py
	pyload/plugins/ocr/LinksaveIn.py

66 files changed, 167 insertions, 193 deletions

diff --git a/pyload/plugins/account/AlldebridCom.py b/pyload/plugins/account/AlldebridCom.py
index 71905d8ef..7183b8e6e 100644
--- a/pyload/plugins/account/AlldebridCom.py
+++ b/pyload/plugins/account/AlldebridCom.py
@@ -17,8 +17,7 @@ class AlldebridCom(Account):
     __version__ = "0.22"
 
     __description__ = """AllDebrid.com account plugin"""
-    __author_name__ = "Andy Voigt"
-    __author_mail__ = "spamsales@online.de"
+    __authors__ = [("Andy Voigt", "spamsales@online.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/BayfilesCom.py b/pyload/plugins/account/BayfilesCom.py
index 221d1615d..af4f791cf 100644
--- a/pyload/plugins/account/BayfilesCom.py
+++ b/pyload/plugins/account/BayfilesCom.py
@@ -12,8 +12,7 @@ class BayfilesCom(Account):
     __version__ = "0.03"
 
     __description__ = """Bayfiles.com account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/BitshareCom.py b/pyload/plugins/account/BitshareCom.py
index ad44424b3..a91c25982 100644
--- a/pyload/plugins/account/BitshareCom.py
+++ b/pyload/plugins/account/BitshareCom.py
@@ -9,8 +9,7 @@ class BitshareCom(Account):
     __version__ = "0.12"
 
     __description__ = """Bitshare account plugin"""
-    __author_name__ = "Paul King"
-    __author_mail__ = None
+    __authors__ = [("Paul King", None)]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/CramitIn.py b/pyload/plugins/account/CramitIn.py
index ee61310ef..24acd2488 100644
--- a/pyload/plugins/account/CramitIn.py
+++ b/pyload/plugins/account/CramitIn.py
@@ -9,7 +9,7 @@ class CramitIn(XFSPAccount):
     __version__ = "0.02"
 
     __description__ = """Cramit.in account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
-    HOSTER_URL = "http://cramit.in/"
+
+    HOSTER_URL = "http://www.cramit.in/"
diff --git a/pyload/plugins/account/CzshareCom.py b/pyload/plugins/account/CzshareCom.py
index d22def156..dc8d513a5 100644
--- a/pyload/plugins/account/CzshareCom.py
+++ b/pyload/plugins/account/CzshareCom.py
@@ -12,8 +12,9 @@ class CzshareCom(Account):
     __version__ = "0.14"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
     CREDIT_LEFT_PATTERN = r'<tr class="active">\s*<td>([0-9 ,]+) (KiB|MiB|GiB)</td>\s*<td>([^<]*)</td>\s*</tr>'
 
diff --git a/pyload/plugins/account/DebridItaliaCom.py b/pyload/plugins/account/DebridItaliaCom.py
index 79a98599e..850a9e60e 100644
--- a/pyload/plugins/account/DebridItaliaCom.py
+++ b/pyload/plugins/account/DebridItaliaCom.py
@@ -12,8 +12,8 @@ class DebridItaliaCom(Account):
     __version__ = "0.1"
 
     __description__ = """Debriditalia.com account plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     WALID_UNTIL_PATTERN = r"Premium valid till: (?P<D>[^|]+) \|"
 
diff --git a/pyload/plugins/account/DepositfilesCom.py b/pyload/plugins/account/DepositfilesCom.py
index 9fc0772c4..8d75c6344 100644
--- a/pyload/plugins/account/DepositfilesCom.py
+++ b/pyload/plugins/account/DepositfilesCom.py
@@ -13,8 +13,9 @@ class DepositfilesCom(Account):
     __version__ = "0.3"
 
     __description__ = """Depositfiles.com account plugin"""
-    __author_name__ = ("mkaay", "stickell", "Walter Purcaro")
-    __author_mail__ = ("mkaay@mkaay.de", "l.stickell@yahoo.it", "vuolter@gmail.com")
+    __authors__ = [("mkaay", "mkaay@mkaay.de"),
+                   ("stickell", "l.stickell@yahoo.it"),
+                   ("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/DevhostSt.py b/pyload/plugins/account/DevhostSt.py
index 03d7d9964..4d615cc68 100644
--- a/pyload/plugins/account/DevhostSt.py
+++ b/pyload/plugins/account/DevhostSt.py
@@ -9,15 +9,14 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class DevhostSt(SimpleHoster):
-    __name__ = "Devhost"
+    __name__ = "DevhostSt"
     __type__ = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?d-h\.st/\w+'
+    __pattern__ = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}'
 
     __description__ = """d-h.st hoster plugin"""
-    __author_name__ = "zapp-brannigan"
-    __author_mail__ = "fuerst.reinje@web.de"
+    __authors__ = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     FILE_NAME_PATTERN = r'>Filename:</span> <div title="(?P<N>.+?)"'
@@ -41,8 +40,8 @@ class DevhostSt(SimpleHoster):
         self.logDebug("Download URL = " + dl_url)
         self.download(dl_url, disposition=True)
 
-        check = self.checkDownload({'is_html': re.compile("html")})
-        if check == "is_html":
+        check = self.checkDownload({'html': re.compile("html")})
+        if check == "html":
             self.parseError("Downloaded file is an html file")
 
 
diff --git a/pyload/plugins/account/DevhostStFolder.py b/pyload/plugins/account/DevhostStFolder.py
index 1c9bd3889..59d293182 100644
--- a/pyload/plugins/account/DevhostStFolder.py
+++ b/pyload/plugins/account/DevhostStFolder.py
@@ -13,16 +13,39 @@ from pyload.plugins.internal.SimpleCrypter import SimpleCrypter
 class DevhostStFolder(SimpleCrypter):
     __name__ = "DevhostStFolder"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?d-h\.st/users/\w+/\?fld_id=\d+'
+    __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?'
 
-    __description__ = """d-h.st decrypter plugin"""
-    __author_name_ = "zapp-brannigan"
-    __author_mail_ = "fuerst.reinje@web.de"
+    __description__ = """d-h.st folder decrypter plugin"""
+    __authors__ = [("zapp-brannigan", "fuerst.reinje@web.de"),
+                   ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    LINK_PATTERN = r';"><a href="/(\w+)'
+    LINK_PATTERN = r'(?:/> |;">)<a href="(.+?)"(?!>Back to \w+<)'
+    OFFLINE_PATTERN = r'"/cHP">test\.png<'
+
+
+    def getPackageNameAndFolder(self):
+        try:
+            id = re.match(self.__pattern__, self.pyfile.url).group('ID')
+            if id == "0":
+                raise
+
+            p = r'href="(.+?)">Back to \w+<'
+            m = re.search(p, self.html)
+            html = self.load(urljoin("http://d-h.st", m.group(1)),
+                             cookies=False)
+
+            p = '\?fld_id=%s.*?">(.+?)<' % id
+            m = re.search(p, html)
+            name = folder = m.group(1)
+
+        except Exception, e:
+            self.logDebug(str(e))
+            name = folder = re.match(self.__pattern__, self.pyfile.url).group('USER')
+
+        return name, folder
 
 
     def getLinks(self):
diff --git a/pyload/plugins/account/DropboxCom.py b/pyload/plugins/account/DropboxCom.py
index 15e95d46d..639e2be9c 100644
--- a/pyload/plugins/account/DropboxCom.py
+++ b/pyload/plugins/account/DropboxCom.py
@@ -13,8 +13,7 @@ class DropboxCom(SimpleHoster):
     __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+'
 
     __description__ = """Dropbox.com hoster plugin"""
-    __author_name__ = "zapp-brannigan"
-    __author_mail__ = "fuerst.reinje@web.de"
+    __authors__ = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     FILE_NAME_PATTERN = r'<title>Dropbox - (?P<N>.+?)<'
@@ -34,8 +33,8 @@ class DropboxCom(SimpleHoster):
     def handleFree(self):
         self.download(self.pyfile.url, get={'dl': "1"})
 
-        check = self.checkDownload({'is_html': re.compile("html")})
-        if check == "is_html":
+        check = self.checkDownload({'html': re.compile("html")})
+        if check == "html":
             self.parseError("Downloaded file is an html file")
 
 
diff --git a/pyload/plugins/account/EasybytezCom.py b/pyload/plugins/account/EasybytezCom.py
index 7634594e4..0fcc187dc 100644
--- a/pyload/plugins/account/EasybytezCom.py
+++ b/pyload/plugins/account/EasybytezCom.py
@@ -1,28 +1,28 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from time import mktime, strptime, gmtime
 
-from pyload.plugins.base.Account import Account
-from pyload.plugins.internal.SimpleHoster import parseHtmlForm
+from module.plugins.internal.XFSPAccount import XFSPAccount
 from pyload.utils import parseFileSize
 
 
-class EasybytezCom(Account):
+class EasybytezCom(XFSPAccount):
     __name__ = "EasybytezCom"
     __type__ = "account"
-    __version__ = "0.06"
+    __version__ = "0.07"
 
     __description__ = """EasyBytez.com account plugin"""
-    __author_name__ = ("zoidberg", "guidobelix")
-    __author_mail__ = ("zoidberg@mujmail.cz", "guidobelix@hotmail.it")
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("guidobelix", "guidobelix@hotmail.it")]
+
 
-    VALID_UNTIL_PATTERN = r'Premium account expire:</TD><TD><b>([^<]+)</b>'
-    TRAFFIC_LEFT_PATTERN = r'<TR><TD>Traffic available today:</TD><TD><b>(?P<S>[^<]+)</b>'
+    HOSTER_URL = "http://www.easybytez.com/"
 
 
     def loadAccountInfo(self, user, req):
-        html = req.load("http://www.easybytez.com/?op=my_account", decode=True)
+        html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True)
 
         validuntil = None
         trafficleft = None
@@ -54,16 +54,3 @@ class EasybytezCom(Account):
                 trafficleft = parseFileSize(trafficleft) / 1024
 
         return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
-
-
-    def login(self, user, data, req):
-        html = req.load('http://www.easybytez.com/login.html', decode=True)
-        action, inputs = parseHtmlForm('name="FL"', html)
-        inputs.update({"login": user,
-                       "password": data['password'],
-                       "redirect": "http://www.easybytez.com/"})
-
-        html = req.load(action, post=inputs, decode=True)
-
-        if 'Incorrect Login or Password' in html or '>Error<' in html:
-            self.wrongPassword()
diff --git a/pyload/plugins/account/EuroshareEu.py b/pyload/plugins/account/EuroshareEu.py
index 7481bceac..c1103afba 100644
--- a/pyload/plugins/account/EuroshareEu.py
+++ b/pyload/plugins/account/EuroshareEu.py
@@ -12,8 +12,7 @@ class EuroshareEu(Account):
     __version__ = "0.01"
 
     __description__ = """Euroshare.eu account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/FastixRu.py b/pyload/plugins/account/FastixRu.py
index 953ba0c1e..2c7353920 100644
--- a/pyload/plugins/account/FastixRu.py
+++ b/pyload/plugins/account/FastixRu.py
@@ -10,8 +10,7 @@ class FastixRu(Account):
     __version__ = "0.02"
 
     __description__ = """Fastix account plugin"""
-    __author_name__ = "Massimo Rosamilia"
-    __author_mail__ = "max@spiritix.eu"
+    __authors__ = [("Massimo Rosamilia", "max@spiritix.eu")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/FastshareCz.py b/pyload/plugins/account/FastshareCz.py
index 0feca4198..d4ef08c2b 100644
--- a/pyload/plugins/account/FastshareCz.py
+++ b/pyload/plugins/account/FastshareCz.py
@@ -11,8 +11,9 @@ class FastshareCz(Account):
     __version__ = "0.03"
 
     __description__ = """Fastshare.cz account plugin"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
     CREDIT_PATTERN = r'(?:Kredit|Credit)\s*</td>\s*<td[^>]*>([\d. \w]+)&nbsp;'
 
diff --git a/pyload/plugins/account/File4safeCom.py b/pyload/plugins/account/File4safeCom.py
index 4429b917b..ffc2fc26d 100644
--- a/pyload/plugins/account/File4safeCom.py
+++ b/pyload/plugins/account/File4safeCom.py
@@ -9,10 +9,10 @@ class File4safeCom(XFSPAccount):
     __version__ = "0.02"
 
     __description__ = """File4safe.com account plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
-    HOSTER_URL = "http://file4safe.com/"
+
+    HOSTER_URL = "http://www.file4safe.com/"
 
     LOGIN_FAIL_PATTERN = r'input_login'
     PREMIUM_PATTERN = r'Extend Premium'
diff --git a/pyload/plugins/account/FilecloudIo.py b/pyload/plugins/account/FilecloudIo.py
index 504c10be2..49c74b93d 100644
--- a/pyload/plugins/account/FilecloudIo.py
+++ b/pyload/plugins/account/FilecloudIo.py
@@ -10,8 +10,8 @@ class FilecloudIo(Account):
     __version__ = "0.02"
 
     __description__ = """FilecloudIo account plugin"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/FilefactoryCom.py b/pyload/plugins/account/FilefactoryCom.py
index 047e7bb36..cf42f2666 100644
--- a/pyload/plugins/account/FilefactoryCom.py
+++ b/pyload/plugins/account/FilefactoryCom.py
@@ -14,8 +14,9 @@ class FilefactoryCom(Account):
     __version__ = "0.14"
 
     __description__ = """Filefactory.com account plugin"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
     VALID_UNTIL_PATTERN = r'Premium valid until: <strong>(?P<d>\d{1,2})\w{1,2} (?P<m>\w{3}), (?P<y>\d{4})</strong>'
 
diff --git a/pyload/plugins/account/FilejungleCom.py b/pyload/plugins/account/FilejungleCom.py
index 596e928ed..d63b0c273 100644
--- a/pyload/plugins/account/FilejungleCom.py
+++ b/pyload/plugins/account/FilejungleCom.py
@@ -12,8 +12,8 @@ class FilejungleCom(Account):
     __version__ = "0.11"
 
     __description__ = """Filejungle.com account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     login_timeout = 60
 
diff --git a/pyload/plugins/account/FilerNet.py b/pyload/plugins/account/FilerNet.py
index 67bab6ba8..1f08d2c1a 100644
--- a/pyload/plugins/account/FilerNet.py
+++ b/pyload/plugins/account/FilerNet.py
@@ -13,8 +13,8 @@ class FilerNet(Account):
     __version__ = "0.01"
 
     __description__ = """Filer.net account plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />'
     WALID_UNTIL_PATTERN = r"Der Premium-Zugang ist gültig bis (.+)\.\s*</td>"
diff --git a/pyload/plugins/account/FilerioCom.py b/pyload/plugins/account/FilerioCom.py
index c86fa7e1f..badc14a56 100644
--- a/pyload/plugins/account/FilerioCom.py
+++ b/pyload/plugins/account/FilerioCom.py
@@ -9,7 +9,7 @@ class FilerioCom(XFSPAccount):
     __version__ = "0.02"
 
     __description__ = """FileRio.in account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
-    HOSTER_URL = "http://filerio.in/"
+
+    HOSTER_URL = "http://www.filerio.in/"
diff --git a/pyload/plugins/account/FilesMailRu.py b/pyload/plugins/account/FilesMailRu.py
index b0375f6d2..f258ead2f 100644
--- a/pyload/plugins/account/FilesMailRu.py
+++ b/pyload/plugins/account/FilesMailRu.py
@@ -9,8 +9,7 @@ class FilesMailRu(Account):
     __version__ = "0.1"
 
     __description__ = """Filesmail.ru account plugin"""
-    __author_name__ = "RaNaN"
-    __author_mail__ = "RaNaN@pyload.org"
+    __authors__ = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/FileserveCom.py b/pyload/plugins/account/FileserveCom.py
index ea678f87b..dd5132734 100644
--- a/pyload/plugins/account/FileserveCom.py
+++ b/pyload/plugins/account/FileserveCom.py
@@ -12,8 +12,7 @@ class FileserveCom(Account):
     __version__ = "0.2"
 
     __description__ = """Fileserve.com account plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/FourSharedCom.py b/pyload/plugins/account/FourSharedCom.py
index c973f4d65..6cc69a88d 100644
--- a/pyload/plugins/account/FourSharedCom.py
+++ b/pyload/plugins/account/FourSharedCom.py
@@ -10,8 +10,9 @@ class FourSharedCom(Account):
     __version__ = "0.03"
 
     __description__ = """FourShared.com account plugin"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/FreakshareCom.py b/pyload/plugins/account/FreakshareCom.py
index 9bc68e6b4..85d813e58 100644
--- a/pyload/plugins/account/FreakshareCom.py
+++ b/pyload/plugins/account/FreakshareCom.py
@@ -12,8 +12,7 @@ class FreakshareCom(Account):
     __version__ = "0.1"
 
     __description__ = """Freakshare.com account plugin"""
-    __author_name__ = "RaNaN"
-    __author_mail__ = "RaNaN@pyload.org"
+    __authors__ = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/FreeWayMe.py b/pyload/plugins/account/FreeWayMe.py
index c40d4486d..28e5c7b80 100644
--- a/pyload/plugins/account/FreeWayMe.py
+++ b/pyload/plugins/account/FreeWayMe.py
@@ -10,8 +10,7 @@ class FreeWayMe(Account):
     __version__ = "0.11"
 
     __description__ = """FreeWayMe account plugin"""
-    __author_name__ = "Nicolas Giese"
-    __author_mail__ = "james@free-way.me"
+    __authors__ = [("Nicolas Giese", "james@free-way.me")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/FshareVn.py b/pyload/plugins/account/FshareVn.py
index 6a357f4bc..84130c11b 100644
--- a/pyload/plugins/account/FshareVn.py
+++ b/pyload/plugins/account/FshareVn.py
@@ -13,8 +13,9 @@ class FshareVn(Account):
     __version__ = "0.07"
 
     __description__ = """Fshare.vn account plugin"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
     VALID_UNTIL_PATTERN = ur'<dt>Thời hạn dùng:</dt>\s*<dd>([^<]+)</dd>'
     LIFETIME_PATTERN = ur'<dt>Lần đăng nhập trước:</dt>\s*<dd>[^<]+</dd>'
diff --git a/pyload/plugins/account/Ftp.py b/pyload/plugins/account/Ftp.py
index e331e4389..3917b59e8 100644
--- a/pyload/plugins/account/Ftp.py
+++ b/pyload/plugins/account/Ftp.py
@@ -9,8 +9,7 @@ class Ftp(Account):
     __version__ = "0.01"
 
     __description__ = """Ftp dummy account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout = info_threshold = -1  #: Unlimited
diff --git a/pyload/plugins/account/HellshareCz.py b/pyload/plugins/account/HellshareCz.py
index 6b5d0a87b..1d033e9f3 100644
--- a/pyload/plugins/account/HellshareCz.py
+++ b/pyload/plugins/account/HellshareCz.py
@@ -12,8 +12,8 @@ class HellshareCz(Account):
     __version__ = "0.14"
 
     __description__ = """Hellshare.cz account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     CREDIT_LEFT_PATTERN = r'<div class="credit-link">\s*<table>\s*<tr>\s*<th>(\d+|\d\d\.\d\d\.)</th>'
 
diff --git a/pyload/plugins/account/Http.py b/pyload/plugins/account/Http.py
index 647af44fe..798d154e0 100644
--- a/pyload/plugins/account/Http.py
+++ b/pyload/plugins/account/Http.py
@@ -9,8 +9,7 @@ class Http(Account):
     __version__ = "0.01"
 
     __description__ = """Http dummy account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout = info_threshold = -1  #: Unlimited
diff --git a/pyload/plugins/account/KingfilesNet.py b/pyload/plugins/account/KingfilesNet.py
index 44c01f770..1ec0f8d8a 100644
--- a/pyload/plugins/account/KingfilesNet.py
+++ b/pyload/plugins/account/KingfilesNet.py
@@ -14,8 +14,8 @@ class KingfilesNet(SimpleHoster):
     __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})'
 
     __description__ = """Kingfiles.net hoster plugin"""
-    __author_name__ = ("zapp-brannigan", "Walter Purcaro")
-    __author_mail__ = ("fuerst.reinje@web.de", "vuolter@gmail.com")
+    __authors__ = [("zapp-brannigan", "fuerst.reinje@web.de"),
+                   ("Walter Purcaro", "vuolter@gmail.com")]
 
 
     FILE_NAME_PATTERN = r'name="fname" value="(?P<N>.+?)">'
@@ -78,8 +78,8 @@ class KingfilesNet(SimpleHoster):
         dl_url = m.group(1)
         self.download(dl_url, cookies=True, disposition=True)
 
-        check = self.checkDownload({'is_html': re.compile("<html>")})
-        if check == "is_html":
+        check = self.checkDownload({'html': re.compile("<html>")})
+        if check == "html":
             self.parseError("Downloaded file is an html file")
 
 
diff --git a/pyload/plugins/account/LetitbitNet.py b/pyload/plugins/account/LetitbitNet.py
index 7c43fff94..a914693fd 100644
--- a/pyload/plugins/account/LetitbitNet.py
+++ b/pyload/plugins/account/LetitbitNet.py
@@ -10,8 +10,7 @@ class LetitbitNet(Account):
     __version__ = "0.01"
 
     __description__ = """Letitbit.net account plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/LinksnappyCom.py b/pyload/plugins/account/LinksnappyCom.py
index 9dc1a8b36..3d0ef7bca 100644
--- a/pyload/plugins/account/LinksnappyCom.py
+++ b/pyload/plugins/account/LinksnappyCom.py
@@ -12,8 +12,7 @@ class LinksnappyCom(Account):
     __version__ = "0.02"
 
     __description__ = """Linksnappy.com account plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/MegaDebridEu.py b/pyload/plugins/account/MegaDebridEu.py
index 5c58505f3..a408690c6 100644
--- a/pyload/plugins/account/MegaDebridEu.py
+++ b/pyload/plugins/account/MegaDebridEu.py
@@ -10,8 +10,8 @@ class MegaDebridEu(Account):
     __version__ = "0.2"
 
     __description__ = """mega-debrid.eu account plugin"""
-    __author_name__ = "D.Ducatel"
-    __author_mail__ = "dducatel@je-geek.fr"
+    __authors__ = [("D.Ducatel", "dducatel@je-geek.fr")]
+
 
     # Define the base URL of MegaDebrid api
     API_URL = "https://www.mega-debrid.eu/api.php"
diff --git a/pyload/plugins/account/MegasharesCom.py b/pyload/plugins/account/MegasharesCom.py
index da0dd7ae7..f9bd6553d 100644
--- a/pyload/plugins/account/MegasharesCom.py
+++ b/pyload/plugins/account/MegasharesCom.py
@@ -12,8 +12,8 @@ class MegasharesCom(Account):
     __version__ = "0.02"
 
     __description__ = """Megashares.com account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>'
 
diff --git a/pyload/plugins/account/MovReelCom.py b/pyload/plugins/account/MovReelCom.py
index 71766427f..ba71bec2a 100644
--- a/pyload/plugins/account/MovReelCom.py
+++ b/pyload/plugins/account/MovReelCom.py
@@ -9,13 +9,10 @@ class MovReelCom(XFSPAccount):
     __version__ = "0.02"
 
     __description__ = """Movreel.com account plugin"""
-    __author_name__ = "t4skforce"
-    __author_mail__ = "t4skforce1337[AT]gmail[DOT]com"
+    __authors__ = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+
 
     login_timeout = 60
     info_threshold = 30
 
-    HOSTER_URL = "http://movreel.com/"
-
-    TRAFFIC_LEFT_PATTERN = r'Traffic.*?<b>([^<]+)</b>'
-    LOGIN_FAIL_PATTERN = r'<b[^>]*>Incorrect Login or Password</b><br>'
+    HOSTER_URL = "http://www.movreel.com/"
diff --git a/pyload/plugins/account/MultishareCz.py b/pyload/plugins/account/MultishareCz.py
index fb6677a51..e882d0eab 100644
--- a/pyload/plugins/account/MultishareCz.py
+++ b/pyload/plugins/account/MultishareCz.py
@@ -13,8 +13,8 @@ class MultishareCz(Account):
     __version__ = "0.02"
 
     __description__ = """Multishare.cz account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[0-9,]+)&nbsp;(?P<U>\w+)</strong>'
     ACCOUNT_INFO_PATTERN = r'<input type="hidden" id="(u_ID|u_hash)" name="[^"]*" value="([^"]+)">'
diff --git a/pyload/plugins/account/MyfastfileCom.py b/pyload/plugins/account/MyfastfileCom.py
index 6c90793d0..559b1bd3b 100644
--- a/pyload/plugins/account/MyfastfileCom.py
+++ b/pyload/plugins/account/MyfastfileCom.py
@@ -12,8 +12,8 @@ class MyfastfileCom(Account):
     __version__ = "0.02"
 
     __description__ = """Myfastfile.com account plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/NetloadIn.py b/pyload/plugins/account/NetloadIn.py
index 01b09c5d8..fc3c0ac60 100644
--- a/pyload/plugins/account/NetloadIn.py
+++ b/pyload/plugins/account/NetloadIn.py
@@ -12,8 +12,8 @@ class NetloadIn(Account):
     __version__ = "0.22"
 
     __description__ = """Netload.in account plugin"""
-    __author_name__ = ("RaNaN", "CryNickSystems")
-    __author_mail__ = ("RaNaN@pyload.org", "webmaster@pcProfil.de")
+    __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+                   ("CryNickSystems", "webmaster@pcProfil.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/OboomCom.py b/pyload/plugins/account/OboomCom.py
index b304e210c..205edad32 100644
--- a/pyload/plugins/account/OboomCom.py
+++ b/pyload/plugins/account/OboomCom.py
@@ -14,8 +14,7 @@ class OboomCom(Account):
     __version__ = "0.2"
 
     __description__ = """Oboom.com account plugin"""
-    __author_name__ = "stanley"
-    __author_mail__ = "stanley.foerster@gmail.com"
+    __authors__ = [("stanley", "stanley.foerster@gmail.com")]
 
 
     def loadAccountData(self, user, req):
diff --git a/pyload/plugins/account/OneFichierCom.py b/pyload/plugins/account/OneFichierCom.py
index efb563a60..5d106a72a 100644
--- a/pyload/plugins/account/OneFichierCom.py
+++ b/pyload/plugins/account/OneFichierCom.py
@@ -13,8 +13,8 @@ class OneFichierCom(Account):
     __version__ = "0.1"
 
     __description__ = """1fichier.com account plugin"""
-    __author_name__ = "Elrick69"
-    __author_mail__ = "elrick69[AT]rocketmail[DOT]com"
+    __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")]
+
 
     VALID_UNTIL_PATTERN = r'You are a premium user until (?P<d>\d{2})/(?P<m>\d{2})/(?P<y>\d{4})'
 
diff --git a/pyload/plugins/account/OverLoadMe.py b/pyload/plugins/account/OverLoadMe.py
index 4fe59706c..514573dfb 100644
--- a/pyload/plugins/account/OverLoadMe.py
+++ b/pyload/plugins/account/OverLoadMe.py
@@ -10,8 +10,7 @@ class OverLoadMe(Account):
     __version__ = "0.01"
 
     __description__ = """Over-Load.me account plugin"""
-    __author_name__ = "marley"
-    __author_mail__ = "marley@over-load.me"
+    __authors__ = [("marley", "marley@over-load.me")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/PremiumTo.py b/pyload/plugins/account/PremiumTo.py
index 75c950263..ccb5c4c87 100644
--- a/pyload/plugins/account/PremiumTo.py
+++ b/pyload/plugins/account/PremiumTo.py
@@ -9,8 +9,10 @@ class PremiumTo(Account):
     __version__ = "0.04"
 
     __description__ = """Premium.to account plugin"""
-    __author_name__ = ("RaNaN", "zoidberg", "stickell")
-    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+                   ("zoidberg", "zoidberg@mujmail.cz"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/PremiumizeMe.py b/pyload/plugins/account/PremiumizeMe.py
index 1beb950ae..ebc488226 100644
--- a/pyload/plugins/account/PremiumizeMe.py
+++ b/pyload/plugins/account/PremiumizeMe.py
@@ -11,8 +11,7 @@ class PremiumizeMe(Account):
     __version__ = "0.11"
 
     __description__ = """Premiumize.me account plugin"""
-    __author_name__ = "Florian Franzen"
-    __author_mail__ = "FlorianFranzen@gmail.com"
+    __authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/QuickshareCz.py b/pyload/plugins/account/QuickshareCz.py
index 0d677eecb..32d7f2d8e 100644
--- a/pyload/plugins/account/QuickshareCz.py
+++ b/pyload/plugins/account/QuickshareCz.py
@@ -11,8 +11,7 @@ class QuickshareCz(Account):
     __version__ = "0.01"
 
     __description__ = """Quickshare.cz account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/RPNetBiz.py b/pyload/plugins/account/RPNetBiz.py
index c10122053..6cd6b6d76 100644
--- a/pyload/plugins/account/RPNetBiz.py
+++ b/pyload/plugins/account/RPNetBiz.py
@@ -10,8 +10,7 @@ class RPNetBiz(Account):
     __version__ = "0.1"
 
     __description__ = """RPNet.biz account plugin"""
-    __author_name__ = "Dman"
-    __author_mail__ = "dmanugm@gmail.com"
+    __authors__ = [("Dman", "dmanugm@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/RapidgatorNet.py b/pyload/plugins/account/RapidgatorNet.py
index 2c2fd493e..8e26a9df4 100644
--- a/pyload/plugins/account/RapidgatorNet.py
+++ b/pyload/plugins/account/RapidgatorNet.py
@@ -10,8 +10,8 @@ class RapidgatorNet(Account):
     __version__ = "0.04"
 
     __description__ = """Rapidgator.net account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     API_URL = 'http://rapidgator.net/api/user'
 
diff --git a/pyload/plugins/account/RapidshareCom.py b/pyload/plugins/account/RapidshareCom.py
index 9f1670cb8..cd4e313a1 100644
--- a/pyload/plugins/account/RapidshareCom.py
+++ b/pyload/plugins/account/RapidshareCom.py
@@ -9,8 +9,7 @@ class RapidshareCom(Account):
     __version__ = "0.22"
 
     __description__ = """Rapidshare.com account plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/RarefileNet.py b/pyload/plugins/account/RarefileNet.py
index e715d0fe0..ba2c7b95a 100644
--- a/pyload/plugins/account/RarefileNet.py
+++ b/pyload/plugins/account/RarefileNet.py
@@ -9,7 +9,7 @@ class RarefileNet(XFSPAccount):
     __version__ = "0.03"
 
     __description__ = """RareFile.net account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
-    HOSTER_URL = "http://rarefile.net/"
+
+    HOSTER_URL = "http://www.rarefile.net/"
diff --git a/pyload/plugins/account/RealdebridCom.py b/pyload/plugins/account/RealdebridCom.py
index 737f22acf..70b99c906 100644
--- a/pyload/plugins/account/RealdebridCom.py
+++ b/pyload/plugins/account/RealdebridCom.py
@@ -11,8 +11,7 @@ class RealdebridCom(Account):
     __version__ = "0.43"
 
     __description__ = """Real-Debrid.com account plugin"""
-    __author_name__ = "Devirex Hazzard"
-    __author_mail__ = "naibaf_11@yahoo.de"
+    __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/RehostTo.py b/pyload/plugins/account/RehostTo.py
index 0414ad581..0ade81540 100644
--- a/pyload/plugins/account/RehostTo.py
+++ b/pyload/plugins/account/RehostTo.py
@@ -9,8 +9,7 @@ class RehostTo(Account):
     __version__ = "0.1"
 
     __description__ = """Rehost.to account plugin"""
-    __author_name__ = "RaNaN"
-    __author_mail__ = "RaNaN@pyload.org"
+    __authors__ = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/RyushareCom.py b/pyload/plugins/account/RyushareCom.py
index 032132537..9c83dabec 100644
--- a/pyload/plugins/account/RyushareCom.py
+++ b/pyload/plugins/account/RyushareCom.py
@@ -9,10 +9,11 @@ class RyushareCom(XFSPAccount):
     __version__ = "0.04"
 
     __description__ = """Ryushare.com account plugin"""
-    __author_name__ = ("zoidberg", "trance4us")
-    __author_mail__ = ("zoidberg@mujmail.cz", "")
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("trance4us", None)]
 
-    HOSTER_URL = "http://ryushare.com/"
+
+    HOSTER_URL = "http://www.ryushare.com/"
 
 
     def login(self, user, data, req):
diff --git a/pyload/plugins/account/ShareRapidCom.py b/pyload/plugins/account/ShareRapidCom.py
index 2cd955bbe..4c20770f4 100644
--- a/pyload/plugins/account/ShareRapidCom.py
+++ b/pyload/plugins/account/ShareRapidCom.py
@@ -12,8 +12,9 @@ class ShareRapidCom(Account):
     __version__ = "0.34"
 
     __description__ = """MegaRapid.cz account plugin"""
-    __author_name__ = ("MikyWoW", "zoidberg")
-    __author_mail__ = ("mikywow@seznam.cz", "zoidberg@mujmail.cz")
+    __authors__ = [("MikyWoW", "mikywow@seznam.cz"),
+                   ("zoidberg", "zoidberg@mujmail.cz")]
+
 
     login_timeout = 60
 
diff --git a/pyload/plugins/account/ShareonlineBiz.py b/pyload/plugins/account/ShareonlineBiz.py
index ff0cb1c58..681f1b5a8 100644
--- a/pyload/plugins/account/ShareonlineBiz.py
+++ b/pyload/plugins/account/ShareonlineBiz.py
@@ -9,8 +9,8 @@ class ShareonlineBiz(Account):
     __version__ = "0.24"
 
     __description__ = """Share-online.biz account plugin"""
-    __author_name__ = ("mkaay", "zoidberg")
-    __author_mail__ = ("mkaay@mkaay.de", "zoidberg@mujmail.cz")
+    __authors__ = [("mkaay", "mkaay@mkaay.de"),
+                   ("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def getUserAPI(self, user, req):
diff --git a/pyload/plugins/account/SimplyPremiumCom.py b/pyload/plugins/account/SimplyPremiumCom.py
index e9126a5cb..a601aa533 100644
--- a/pyload/plugins/account/SimplyPremiumCom.py
+++ b/pyload/plugins/account/SimplyPremiumCom.py
@@ -10,8 +10,7 @@ class SimplyPremiumCom(Account):
     __version__ = "0.01"
 
     __description__ = """Simply-Premium.com account plugin"""
-    __author_name__ = "EvolutionClip"
-    __author_mail__ = "evolutionclip@live.de"
+    __authors__ = [("EvolutionClip", "evolutionclip@live.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/SimplydebridCom.py b/pyload/plugins/account/SimplydebridCom.py
index 4af8eaa31..bf49b652b 100644
--- a/pyload/plugins/account/SimplydebridCom.py
+++ b/pyload/plugins/account/SimplydebridCom.py
@@ -11,8 +11,7 @@ class SimplydebridCom(Account):
     __version__ = "0.1"
 
     __description__ = """Simply-Debrid.com account plugin"""
-    __author_name__ = "Kagenoshin"
-    __author_mail__ = "kagenoshin@gmx.ch"
+    __authors__ = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/StahnuTo.py b/pyload/plugins/account/StahnuTo.py
index ba4a3fcdd..fa08b234d 100644
--- a/pyload/plugins/account/StahnuTo.py
+++ b/pyload/plugins/account/StahnuTo.py
@@ -12,8 +12,7 @@ class StahnuTo(Account):
     __version__ = "0.02"
 
     __description__ = """StahnuTo account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/TurbobitNet.py b/pyload/plugins/account/TurbobitNet.py
index ba172d67e..48ed17d73 100644
--- a/pyload/plugins/account/TurbobitNet.py
+++ b/pyload/plugins/account/TurbobitNet.py
@@ -12,8 +12,7 @@ class TurbobitNet(Account):
     __version__ = "0.01"
 
     __description__ = """TurbobitNet account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/TusfilesNet.py b/pyload/plugins/account/TusfilesNet.py
index b00770a59..6a80105be 100644
--- a/pyload/plugins/account/TusfilesNet.py
+++ b/pyload/plugins/account/TusfilesNet.py
@@ -4,26 +4,27 @@ import re
 
 from time import mktime, strptime, gmtime
 
-from pyload.plugins.base.Account import Account
-from pyload.plugins.internal.SimpleHoster import parseHtmlForm
+from module.plugins.internal.XFSPAccount import XFSPAccount
 from pyload.utils import parseFileSize
 
 
-class TusfilesNet(Account):
+class TusfilesNet(XFSPAccount):
     __name__ = "TusfilesNet"
     __type__ = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Tusfile.net account plugin"""
-    __author_name__ = "guidobelix"
-    __author_mail__ = "guidobelix@hotmail.it"
+    __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
+
+
+    HOSTER_URL = "http://www.tusfiles.net/"
 
     VALID_UNTIL_PATTERN = r'<span class="label label-default">([^<]+)</span>'
     TRAFFIC_LEFT_PATTERN = r'<td><img src="//www.tusfiles.net/i/icon/meter.png" alt=""/></td>\n<td>&nbsp;(?P<S>[^<]+)</td>'
 
 
     def loadAccountInfo(self, user, req):
-        html = req.load("http://www.tusfiles.net/?op=my_account", decode=True)
+        html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True)
 
         validuntil = None
         trafficleft = None
@@ -54,16 +55,3 @@ class TusfilesNet(Account):
                 trafficleft = parseFileSize(trafficleft) * 1024
 
         return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
-
-
-    def login(self, user, data, req):
-        html = req.load("http://www.tusfiles.net/login.html", decode=True)
-        action, inputs = parseHtmlForm('name="FL"', html)
-        inputs.update({'login': user,
-                       'password': data['password'],
-                       'redirect': "http://www.tusfiles.net/"})
-
-        html = req.load("http://www.tusfiles.net/", post=inputs, decode=True)
-
-        if 'Incorrect Login or Password' in html or '>Error<' in html:
-            self.wrongPassword()
diff --git a/pyload/plugins/account/UlozTo.py b/pyload/plugins/account/UlozTo.py
index 214607998..913ddc56f 100644
--- a/pyload/plugins/account/UlozTo.py
+++ b/pyload/plugins/account/UlozTo.py
@@ -11,8 +11,9 @@ class UlozTo(Account):
     __version__ = "0.06"
 
     __description__ = """Uloz.to account plugin"""
-    __author_name__ = ("zoidberg", "pulpe")
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("pulpe", None)]
+
 
     TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="/kredit" title="[^"]*?GB = ([0-9.]+) MB"'
 
diff --git a/pyload/plugins/account/UnrestrictLi.py b/pyload/plugins/account/UnrestrictLi.py
index a93e88e2d..179d2bd8a 100644
--- a/pyload/plugins/account/UnrestrictLi.py
+++ b/pyload/plugins/account/UnrestrictLi.py
@@ -10,8 +10,7 @@ class UnrestrictLi(Account):
     __version__ = "0.03"
 
     __description__ = """Unrestrict.li account plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/UploadedTo.py b/pyload/plugins/account/UploadedTo.py
index 2ef0117f7..145205530 100644
--- a/pyload/plugins/account/UploadedTo.py
+++ b/pyload/plugins/account/UploadedTo.py
@@ -12,8 +12,7 @@ class UploadedTo(Account):
     __version__ = "0.26"
 
     __description__ = """Uploaded.to account plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/UploadheroCom.py b/pyload/plugins/account/UploadheroCom.py
index 4cea86e35..ec3cdf906 100644
--- a/pyload/plugins/account/UploadheroCom.py
+++ b/pyload/plugins/account/UploadheroCom.py
@@ -13,8 +13,7 @@ class UploadheroCom(Account):
     __version__ = "0.2"
 
     __description__ = """Uploadhero.co account plugin"""
-    __author_name__ = "mcmyst"
-    __author_mail__ = "mcmyst@hotmail.fr"
+    __authors__ = [("mcmyst", "mcmyst@hotmail.fr")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/UploadingCom.py b/pyload/plugins/account/UploadingCom.py
index 0f7d33ec8..a25281ca4 100644
--- a/pyload/plugins/account/UploadingCom.py
+++ b/pyload/plugins/account/UploadingCom.py
@@ -12,8 +12,7 @@ class UploadingCom(Account):
     __version__ = "0.1"
 
     __description__ = """Uploading.com account plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugins/account/UptoboxCom.py b/pyload/plugins/account/UptoboxCom.py
index 94c32e753..917663d63 100644
--- a/pyload/plugins/account/UptoboxCom.py
+++ b/pyload/plugins/account/UptoboxCom.py
@@ -9,9 +9,9 @@ class UptoboxCom(XFSPAccount):
     __version__ = "0.03"
 
     __description__ = """DDLStorage.com account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
-    HOSTER_URL = "http://uptobox.com/"
+
+    HOSTER_URL = "http://www.uptobox.com/"
 
     VALID_UNTIL_PATTERN = r'>Premium.[Aa]ccount expire: ([^<]+)</strong>'
diff --git a/pyload/plugins/account/YibaishiwuCom.py b/pyload/plugins/account/YibaishiwuCom.py
index 6cb595d06..e9fe0facf 100644
--- a/pyload/plugins/account/YibaishiwuCom.py
+++ b/pyload/plugins/account/YibaishiwuCom.py
@@ -11,8 +11,8 @@ class YibaishiwuCom(Account):
     __version__ = "0.01"
 
     __description__ = """115.com account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}'
 
diff --git a/pyload/plugins/account/ZeveraCom.py b/pyload/plugins/account/ZeveraCom.py
index 6d70a2e6b..17bfb114c 100644
--- a/pyload/plugins/account/ZeveraCom.py
+++ b/pyload/plugins/account/ZeveraCom.py
@@ -11,8 +11,7 @@ class ZeveraCom(Account):
     __version__ = "0.21"
 
     __description__ = """Zevera.com account plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):