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, 4 insertions, 42 deletions

diff --git a/pyload/plugins/crypter/WiiReloadedOrg.py b/pyload/plugins/crypter/WiiReloadedOrg.py
index 31c041bf0..df70c5aea 100644
--- a/pyload/plugins/crypter/WiiReloadedOrg.py
+++ b/pyload/plugins/crypter/WiiReloadedOrg.py
@@ -1,51 +1,13 @@
-import re
+# -*- coding: utf-8 -*-
 
-from module.plugins.Crypter import Crypter
+from module.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class WiiReloadedOrg(Crypter):
+class WiiReloadedOrg(DeadCrypter):
     __name__ = "WiiReloadedOrg"
     __type__ = "crypter"
     __pattern__ = r"http://www\.wii-reloaded\.org/protect/get\.php\?i=.+"
-    __config__ = [("changeName", "bool", "Use Wii-Reloaded.org folder name", "True")]
-    __version__ = "0.1"
+    __version__ = "0.11"
     __description__ = """Wii-Reloaded.org Crypter Plugin"""
     __author_name__ = ("hzpz")
     __author_mail__ = ("none")
-
-    def decrypt(self, pyfile):
-        url = pyfile.url
-        src = self.req.load(str(url))
-
-        ids = re.findall(r"onClick=\"popup_dl\((.+)\)\"", src)
-        if len(ids) == 0:
-            self.fail("Unable to decrypt links, this plugin probably needs to be updated")
-
-        packageName = self.pyfile.package().name
-        if self.getConfig("changeName"):
-            packageNameMatch = re.search(r"<div id=\"foldername\">(.+)</div>", src)
-            if not packageNameMatch:
-                self.logWarning("Unable to get folder name, this plugin probably needs to be updated")
-            else:
-                packageName = packageNameMatch.group(1)
-
-        self.pyfile.package().password = "wii-reloaded.info"
-
-        self.logDebug("Processing %d links" % len(ids))
-        links = []
-        for id in ids:
-            self.req.lastURL = str(url)
-            header = self.req.load("http://www.wii-reloaded.org/protect/hastesosiehtsaus.php?i=" + id, just_header=True)
-            self.logDebug("Header:\n" + header)
-            redirectLocationMatch = re.search(r"^Location: (.+)$", header, flags=re.MULTILINE)
-            if not redirectLocationMatch:
-                self.offline()
-            redirectLocation = redirectLocationMatch.group(1)
-            self.logDebug(len(redirectLocation))
-            if not redirectLocation.startswith("http"):
-                self.offline()
-            self.logDebug("Decrypted link: %s" % redirectLocation)
-            links.append(redirectLocation)
-
-        self.logDebug("Decrypted %d links" % len(links))
-        self.packages.append((packageName, links, packageName))