Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/config/default.conf
	module/plugins/accounts/DdlstorageCom.py
	module/plugins/accounts/RealdebridCom.py
	module/plugins/accounts/UploadheroCom.py
	module/plugins/crypter/DownloadVimeoCom.py
	module/plugins/crypter/FilebeerInfoFolder.py
	module/plugins/crypter/Movie2kTo.py
	module/plugins/hooks/AlldebridCom.py
	module/plugins/hooks/DebridItaliaCom.py
	module/plugins/hooks/MultishareCz.py
	module/plugins/hooks/Premium4Me.py
	module/plugins/hooks/PremiumizeMe.py
	module/plugins/hooks/RealdebridCom.py
	module/plugins/hooks/XFileSharingPro.py
	module/plugins/hooks/ZeveraCom.py
	module/plugins/hoster/ChipDe.py
	module/plugins/hoster/DdlstorageCom.py
	module/plugins/hoster/MovReelCom.py
	module/plugins/hoster/RyushareCom.py
	module/plugins/hoster/ShareRapidCom.py
	module/plugins/hoster/SpeedLoadOrg.py
	module/plugins/hoster/ZeveraCom.py
	module/web/media/default/css/default.css
	module/web/media/default/css/window.css
	module/web/templates/default/base.html
	module/web/templates/default/captcha.html
	module/web/templates/default/home.html
	module/web/templates/default/queue.html
	module/web/templates/default/window.html
	pyload/plugins/accounts/AlldebridCom.py
	pyload/plugins/accounts/Http.py
	pyload/plugins/accounts/MultishareCz.py
	pyload/plugins/accounts/Premium4Me.py
	pyload/plugins/accounts/PremiumizeMe.py
	pyload/plugins/accounts/ZeveraCom.py
	pyload/plugins/addons/Captcha9kw.py
	pyload/plugins/addons/CaptchaTrader.py
	pyload/plugins/addons/ClickAndLoad.py
	pyload/plugins/addons/Ev0InFetcher.py
	pyload/plugins/addons/ExternalScripts.py
	pyload/plugins/addons/ExtractArchive.py
	pyload/plugins/addons/HotFolder.py
	pyload/plugins/addons/MergeFiles.py
	pyload/plugins/addons/MultiHome.py
	pyload/plugins/addons/XMPPInterface.py
	pyload/plugins/crypter/C1neonCom.py
	pyload/plugins/crypter/CryptItCom.py
	pyload/plugins/crypter/ILoadTo.py
	pyload/plugins/crypter/LofCc.py
	pyload/plugins/crypter/NCryptIn.py
	pyload/plugins/crypter/OronComFolder.py
	pyload/plugins/crypter/RSLayerCom.py
	pyload/plugins/crypter/SecuredIn.py
	pyload/plugins/crypter/TrailerzoneInfo.py
	pyload/plugins/crypter/WiiReloadedOrg.py
	pyload/plugins/hoster/AlldebridCom.py
	pyload/plugins/hoster/BasePlugin.py
	pyload/plugins/hoster/CzshareCom.py
	pyload/plugins/hoster/DepositfilesCom.py
	pyload/plugins/hoster/EgoFilesCom.py
	pyload/plugins/hoster/FastshareCz.py
	pyload/plugins/hoster/FreakshareCom.py
	pyload/plugins/hoster/MegasharesCom.py
	pyload/plugins/hoster/MultishareCz.py
	pyload/plugins/hoster/MyvideoDe.py
	pyload/plugins/hoster/NetloadIn.py
	pyload/plugins/hoster/NovafileCom.py
	pyload/plugins/hoster/NowDownloadEu.py
	pyload/plugins/hoster/PornhostCom.py
	pyload/plugins/hoster/Premium4Me.py
	pyload/plugins/hoster/PremiumizeMe.py
	pyload/plugins/hoster/PutlockerCom.py
	pyload/plugins/hoster/RapidshareCom.py
	pyload/plugins/hoster/RealdebridCom.py
	pyload/plugins/hoster/ShareplaceCom.py
	pyload/plugins/hoster/TusfilesNet.py
	pyload/plugins/hoster/UnrestrictLi.py
	pyload/plugins/hoster/UploadedTo.py
	pyload/plugins/hoster/WebshareCz.py
	pyload/plugins/hoster/X7To.py
	pyload/plugins/hoster/XHamsterCom.py
	pyload/plugins/hoster/YoupornCom.py
	pyload/plugins/hoster/YourfilesTo.py
	pyload/plugins/hoster/YoutubeCom.py
	pyload/plugins/hoster/ZippyshareCom.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/SimpleHoster.py

1 files changed, 5 insertions, 56 deletions

diff --git a/pyload/plugins/crypter/ILoadTo.py b/pyload/plugins/crypter/ILoadTo.py
index 61869fdc0..d155f4bb6 100644
--- a/pyload/plugins/crypter/ILoadTo.py
+++ b/pyload/plugins/crypter/ILoadTo.py
@@ -1,64 +1,13 @@
-import re
-import urllib
+# -*- coding: utf-8 -*-
 
-from module.plugins.Crypter import Crypter
-from module.lib.BeautifulSoup import BeautifulSoup
+from module.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class ILoadTo(Crypter):
+class ILoadTo(DeadCrypter):
     __name__ = "ILoadTo"
     __type__ = "crypter"
     __pattern__ = r"http://iload\.to/go/\d+-[\w\.-]+/"
-    __config__ = []
-    __version__ = "0.1"
+    __version__ = "0.11"
     __description__ = """iload.to Crypter Plugin"""
     __author_name__ = ("hzpz")
-    __author_mail__ = ("none")
-
-
-    def decrypt(self, pyfile):
-        url = pyfile.url
-        src = self.req.load(str(url))
-        soup = BeautifulSoup(src)
-
-        # find captcha URL and decrypt            
-        captchaTag = soup.find("img", attrs={"id": "Captcha"})
-        if not captchaTag:
-            self.fail("Cannot find Captcha")
-
-        captchaUrl = "http://iload.to" + captchaTag["src"]
-        self.logDebug("Captcha URL: %s" % captchaUrl)
-        result = self.decryptCaptcha(str(captchaUrl))
-
-        # find captcha form URL 
-        formTag = soup.find("form", attrs={"id": "CaptchaForm"})
-        formUrl = "http://iload.to" + formTag["action"]
-        self.logDebug("Form URL: %s" % formUrl)
-
-        # submit decrypted captcha
-        self.req.lastURL = url
-        src = self.req.load(str(formUrl), post={'captcha': result})
-
-        # find decrypted links
-        links = re.findall(
-            r"<a href=\"(.+)\" style=\"text-align:center;font-weight:bold;\" class=\"button\" target=\"_blank\" onclick=\"this.className\+=' success';\">",
-            src)
-
-        if not len(links) > 0:
-            self.retry()
-
-        self.correctCaptcha()
-
-        cleanedLinks = []
-        for link in links:
-            if link.startswith("http://dontknow.me/at/?"):
-                cleanedLink = urllib.unquote(link[23:])
-            else:
-                cleanedLink = link
-            self.logDebug("Link: %s" % cleanedLink)
-            cleanedLinks.append(cleanedLink)
-
-        self.logDebug("Decrypted %d links" % len(links))
-
-        self.pyfile.package().password = "iload.to"
-        self.packages.append((self.pyfile.package().name, cleanedLinks, self.pyfile.package().folder))
+    __author_mail__ = ("")