Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py

1 files changed, 7 insertions, 1 deletions

diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py
index cd0902ab3..969007a8a 100644
--- a/module/plugins/hoster/FilezyNet.py
+++ b/module/plugins/hoster/FilezyNet.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
 
 
@@ -8,8 +9,12 @@ class FilezyNet(XFileSharingPro):
     __name__ = "FilezyNet"
     __type__ = "hoster"
     __version__ = "0.1"
+
     __pattern__ = r'http://(?:www\.)?filezy.net/.*/.*.html'
+
     __description__ = """Filezy.net hoster plugin"""
+    __author_name__ = None
+    __author_mail__ = None
 
     HOSTER_NAME = "filezy.net"
 
@@ -17,6 +22,7 @@ class FilezyNet(XFileSharingPro):
     WAIT_PATTERN = r'<div id="countdown_str" class="seconds">\n<!--Wait--> <span id=".*?">(\d+)</span>'
     DOWNLOAD_JS_PATTERN = r"<script type='text/javascript'>eval(.*)"
 
+
     def setup(self):
         self.resumeDownload = True
         self.multiDL = self.premium
@@ -29,7 +35,7 @@ class FilezyNet(XFileSharingPro):
 
         obfuscated_js = re.search(self.DOWNLOAD_JS_PATTERN, self.html)
         dl_file_now = self.js.eval(obfuscated_js.group(1))
-        link = re.search(self.DIRECT_LINK_PATTERN, dl_file_now)
+        link = re.search(self.LINK_PATTERN, dl_file_now)
         return link.group(1)