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, 3 insertions, 41 deletions

diff --git a/pyload/plugins/crypter/LofCc.py b/pyload/plugins/crypter/LofCc.py
index 5fee776c7..458609881 100644
--- a/pyload/plugins/crypter/LofCc.py
+++ b/pyload/plugins/crypter/LofCc.py
@@ -1,51 +1,13 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import re
-from os.path import join
+from module.plugins.internal.DeadCrypter import DeadCrypter
 
-from module.plugins.Crypter import Crypter
-from module.plugins.internal.CaptchaService import ReCaptcha
 
-
-class LofCc(Crypter):
+class LofCc(DeadCrypter):
     __name__ = "LofCc"
     __type__ = "container"
     __pattern__ = r"http://lof.cc/(.*)"
-    __version__ = "0.2"
+    __version__ = "0.21"
     __description__ = """lof.cc Plugin"""
     __author_name__ = ("mkaay")
     __author_mail__ = ("mkaay@mkaay.de")
-
-    def setup(self):
-        self.multiDL = False
-
-    def decrypt(self, pyfile):
-        html = self.req.load(self.pyfile.url, cookies=True)
-
-        m = re.search(r"src=\"http://www.google.com/recaptcha/api/challenge\?k=(.*?)\"></script>", html)
-        if not m:
-            self.offline()
-
-        recaptcha = ReCaptcha(self)
-        challenge, code = recaptcha.challenge(m.group(1))
-
-        resultHTML = self.req.load(self.pyfile.url,
-                                   post={"recaptcha_challenge_field": challenge, "recaptcha_response_field": code},
-                                   cookies=True)
-
-        if re.search("class=\"error\"", resultHTML):
-            self.retry()
-
-        self.correctCaptcha()
-
-        dlc = self.req.load(self.pyfile.url + "/dlc", cookies=True)
-
-        name = re.search(self.__pattern__, self.pyfile.url).group(1) + ".dlc"
-
-        dlcFile = join(self.config["general"]["download_folder"], name)
-        f = open(dlcFile, "wb")
-        f.write(dlc)
-        f.close()
-
-        self.packages.append((self.pyfile.package().name, [dlcFile], self.pyfile.package().folder))